svn commit: r1936610 - subversion/trunk/subversion/po
[email protected] Mon, 27 Jul 2026 03:45:43 -0000
| Newsgroups | gmane.comp.version-control.subversion.svn |
|---|---|
| Message-ID | <178512394346.2852208.2245458484272020052@svn03-he-fi> |
Author: dongsheng Date: Mon Jul 27 03:45:43 2026 New Revision: 1936610 Log: Update and verify Chinese translation * subversion/po/zh_CN.po Modified: subversion/trunk/subversion/po/zh_CN.po Modified: subversion/trunk/subversion/po/zh_CN.po ============================================================================== --- subversion/trunk/subversion/po/zh_CN.po Mon Jul 27 02:47:19 2026 (r1936609) +++ subversion/trunk/subversion/po/zh_CN.po Mon Jul 27 03:45:43 2026 (r1936610) @@ -38,7 +38,7 @@ # HEAD revision ææ°çæ¬ # Obliteration ç迹 # overlay éè½½ -# peg éé +# peg éå® # remove å é¤ # rename æ¹å # repository çæ¬åº @@ -53,9 +53,9 @@ # msgid "" msgstr "" -"Project-Id-Version: subversion 1.9\n" +"Project-Id-Version: subversion 1.15\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2014-11-29 01:59+0800\n" +"POT-Creation-Date: 2026-07-21 12:00+0800\n" "PO-Revision-Date: 2014-04-26 16:08+0800\n" "Last-Translator: \n" "Language-Team: Simplified Chinese <[email protected]>\n" @@ -69,1423 +69,1596 @@ msgstr "" #. Constructing nice error messages for roots. #. Build an SVN_ERR_FS_NOT_FOUND error, with a detailed error text, #. for PATH in ROOT. ROOT is of type svn_fs_root_t *. -#: ../include/private/svn_fs_util.h:81 +#: ../include/private/svn_fs_util.h:86 #, c-format msgid "File not found: transaction '%s', path '%s'" -msgstr "没ææ¾å°æ件: äºå¡â%sâï¼è·¯å¾ â%sâ" +msgstr "没ææ¾å°æ件: äºå¡'%s'ï¼è·¯å¾ '%s'" -#: ../include/private/svn_fs_util.h:86 +#: ../include/private/svn_fs_util.h:91 #, c-format msgid "File not found: revision %ld, path '%s'" -msgstr "没ææ¾å°æ件: çæ¬â%ldâï¼è·¯å¾ â%sâ" +msgstr "没ææ¾å°æ件: çæ¬'%ld'ï¼è·¯å¾ '%s'" #. Build a detailed `file already exists' message for PATH in ROOT. #. ROOT is of type svn_fs_root_t *. -#: ../include/private/svn_fs_util.h:97 +#: ../include/private/svn_fs_util.h:102 #, c-format msgid "File already exists: filesystem '%s', transaction '%s', path '%s'" -msgstr "æ件已ç»åå¨: æ件系ç»â%sâï¼äºå¡â%sâï¼è·¯å¾â%sâ" +msgstr "æ件已ç»åå¨: æ件系ç»'%s'ï¼äºå¡'%s'ï¼è·¯å¾'%s'" -#: ../include/private/svn_fs_util.h:102 +#: ../include/private/svn_fs_util.h:107 #, c-format msgid "File already exists: filesystem '%s', revision %ld, path '%s'" -msgstr "æ件已ç»åå¨: æ件系ç»â%sâï¼çæ¬â%ldâï¼è·¯å¾â%sâ" +msgstr "æ件已ç»åå¨: æ件系ç»'%s'ï¼çæ¬'%ld'ï¼è·¯å¾'%s'" #. ROOT is of type svn_fs_root_t *. -#: ../include/private/svn_fs_util.h:110 +#: ../include/private/svn_fs_util.h:115 msgid "Root object must be a transaction root" msgstr "æ ¹å¯¹è±¡å¿ é¡»æ¯äºå¡çæ ¹" #. SVN_FS__ERR_NOT_MUTABLE: the caller attempted to change a node #. outside of a transaction. FS is of type "svn_fs_t *". -#: ../include/private/svn_fs_util.h:117 +#: ../include/private/svn_fs_util.h:122 #, c-format msgid "File is not mutable: filesystem '%s', revision %ld, path '%s'" -msgstr "æ件ä¸æ¯å¯åç: æ件系ç»â%sâï¼çæ¬â%ldâï¼è·¯å¾ â%sâ" +msgstr "æ件ä¸æ¯å¯åç: æ件系ç»'%s'ï¼çæ¬'%ld'ï¼è·¯å¾ '%s'" #. FS is of type "svn_fs_t *". -#: ../include/private/svn_fs_util.h:124 +#: ../include/private/svn_fs_util.h:129 #, c-format msgid "'%s' is not a directory in filesystem '%s'" -msgstr "â%sâå¨æ件系ç»â%sâä¸ä¸æ¯ç®å½" +msgstr "'%s'å¨æ件系ç»'%s'ä¸ä¸æ¯ç®å½" #. FS is of type "svn_fs_t *". -#: ../include/private/svn_fs_util.h:131 +#: ../include/private/svn_fs_util.h:136 #, c-format msgid "'%s' is not a file in filesystem '%s'" -msgstr "â%sâå¨æ件系ç»â%sâä¸ä¸æ¯æ件" +msgstr "'%s'å¨æ件系ç»'%s'ä¸ä¸æ¯æ件" #. FS is of type "svn_fs_t *", LOCK is of type "svn_lock_t *". -#: ../include/private/svn_fs_util.h:139 +#: ../include/private/svn_fs_util.h:144 #, c-format msgid "Path '%s' is already locked by user '%s' in filesystem '%s'" -msgstr "è·¯å¾â%sâå·²ç»è¢«ç¨æ·â%sâéå®ï¼å ¶æ件系ç»æ¯â%sâ" +msgstr "è·¯å¾'%s'å·²ç»è¢«ç¨æ·'%s'éå®ï¼å ¶æ件系ç»æ¯'%s'" #. FS is of type "svn_fs_t *". -#: ../include/private/svn_fs_util.h:146 +#: ../include/private/svn_fs_util.h:151 #, c-format msgid "No lock on path '%s' in filesystem '%s'" -msgstr "è·¯å¾â%sâ没æ被éå®ï¼å ¶æ件系ç»æ¯â%sâ" +msgstr "è·¯å¾'%s'没æ被éå®ï¼å ¶æ件系ç»æ¯'%s'" #. FS is of type "svn_fs_t *". -#: ../include/private/svn_fs_util.h:153 +#: ../include/private/svn_fs_util.h:158 #, c-format msgid "Lock has expired: lock-token '%s' in filesystem '%s'" -msgstr "éå·²ç»è¿æï¼ä»¤ç â%sâï¼æä»¶ç³»ç» â%sâ" +msgstr "éå·²ç»è¿æ: 令ç '%s'ï¼æä»¶ç³»ç» '%s'" #. FS is of type "svn_fs_t *". -#: ../include/private/svn_fs_util.h:160 +#: ../include/private/svn_fs_util.h:165 #, c-format msgid "No username is currently associated with filesystem '%s'" -msgstr "å½å没æç¨æ·å称ä¸æ件系ç»â%sâå ³è" +msgstr "å½å没æç¨æ·å称ä¸æ件系ç»'%s'å ³è" #. SVN_FS__ERR_LOCK_OWNER_MISMATCH: trying to use a lock whose #. LOCK_OWNER doesn't match the USERNAME associated with FS. #. FS is of type "svn_fs_t *". -#: ../include/private/svn_fs_util.h:169 +#: ../include/private/svn_fs_util.h:174 #, c-format msgid "User '%s' is trying to use a lock owned by '%s' in filesystem '%s'" -msgstr "ç¨æ·â%sâè¯å¾ä½¿ç¨â%sâçéï¼å ¶æ件系ç»æ¯â%sâ" +msgstr "ç¨æ·'%s'è¯å¾ä½¿ç¨'%s'çéï¼å ¶æ件系ç»æ¯'%s'" -#: ../include/svn_error_codes.h:164 +#: ../include/svn_error_codes.h:166 msgid "Bad parent pool passed to svn_make_pool()" msgstr "æ æçç¶å åæ± ä¼ éå° svn_make_pool()" -#: ../include/svn_error_codes.h:168 +#: ../include/svn_error_codes.h:170 msgid "Bogus filename" msgstr "éæ³çæ件å" -#: ../include/svn_error_codes.h:172 +#: ../include/svn_error_codes.h:174 msgid "Bogus URL" msgstr "éæ³ URL" -#: ../include/svn_error_codes.h:176 +#: ../include/svn_error_codes.h:178 msgid "Bogus date" msgstr "éæ³æ¥æ" -#: ../include/svn_error_codes.h:180 +#: ../include/svn_error_codes.h:182 msgid "Bogus mime-type" msgstr "éæ³ mime-type" -#: ../include/svn_error_codes.h:190 +#: ../include/svn_error_codes.h:192 msgid "Wrong or unexpected property value" msgstr "é误æä¸ææçå±æ§å¼" -#: ../include/svn_error_codes.h:194 +#: ../include/svn_error_codes.h:196 msgid "Version file format not correct" msgstr "çæ¬æä»¶æ ¼å¼ä¸æ£ç¡®" -#: ../include/svn_error_codes.h:198 +#: ../include/svn_error_codes.h:200 msgid "Path is not an immediate child of the specified directory" msgstr "è·¯å¾ä¸æ¯æå®ç®å½çç´æ¥åå" -#: ../include/svn_error_codes.h:202 +#: ../include/svn_error_codes.h:204 msgid "Bogus UUID" msgstr "éæ³ UUID" -#: ../include/svn_error_codes.h:207 ../include/svn_error_codes.h:1024 +#: ../include/svn_error_codes.h:209 ../include/svn_error_codes.h:1072 msgid "Invalid configuration value" msgstr "æ æçé ç½®åå¼" -#: ../include/svn_error_codes.h:211 +#: ../include/svn_error_codes.h:213 msgid "Bogus server specification" msgstr "åçæå¡å¨è§æ ¼" -#: ../include/svn_error_codes.h:215 +#: ../include/svn_error_codes.h:217 msgid "Unsupported checksum type" msgstr "ä¸æ¯æçæ ¡éªåç±»å" -#: ../include/svn_error_codes.h:219 +#: ../include/svn_error_codes.h:221 msgid "Invalid character in hex checksum" msgstr "å¨ 16 è¿å¶çæ ¡éªåä¸åç°æ æå符" -#: ../include/svn_error_codes.h:224 +#: ../include/svn_error_codes.h:226 msgid "Unknown string value of token" msgstr "æªç¥çå符串令çå¼" -#: ../include/svn_error_codes.h:229 +#: ../include/svn_error_codes.h:231 msgid "Invalid changelist name" msgstr "æ æçä¿®æ¹å表å称" -#: ../include/svn_error_codes.h:234 +#: ../include/svn_error_codes.h:236 msgid "Invalid atomic" msgstr "æ æåå" -#: ../include/svn_error_codes.h:239 +#: ../include/svn_error_codes.h:241 msgid "Invalid compression method" msgstr "æ æçå缩æ¹æ³" -#: ../include/svn_error_codes.h:245 +#: ../include/svn_error_codes.h:246 +msgid "Unexpected line ending in the property value" +msgstr "å±æ§å¼ä¸ææå¤çè¡ç»å°¾" + +#: ../include/svn_error_codes.h:252 msgid "No such XML tag attribute" msgstr "没æè¿ç§ XML æ ç¾å±æ§" -#: ../include/svn_error_codes.h:249 +#: ../include/svn_error_codes.h:256 msgid "<delta-pkg> is missing ancestry" msgstr "<delta-pkg> 没æç¥å " -#: ../include/svn_error_codes.h:253 +#: ../include/svn_error_codes.h:260 msgid "Unrecognized binary data encoding; can't decode" msgstr "æ æ³è¯å«çäºè¿å¶æ°æ®ç¼ç : æ æ³è§£ç " -#: ../include/svn_error_codes.h:257 +#: ../include/svn_error_codes.h:264 msgid "XML data was not well-formed" msgstr "XML æ°æ®è¯æ³é误" -#: ../include/svn_error_codes.h:261 +#: ../include/svn_error_codes.h:268 msgid "Data cannot be safely XML-escaped" msgstr "XML æ°æ®ä¸è½æ£ç¡®è§£ç " -#: ../include/svn_error_codes.h:266 +#: ../include/svn_error_codes.h:273 msgid "Unexpected XML element found" msgstr "åç°æå¤ç XML å ç´ " -#: ../include/svn_error_codes.h:272 +#: ../include/svn_error_codes.h:279 msgid "Inconsistent line ending style" msgstr "ä¸ä¸è´çè¡ç»ææ ·å¼" -#: ../include/svn_error_codes.h:276 +#: ../include/svn_error_codes.h:283 msgid "Unrecognized line ending style" msgstr "æ æ³è¯å«çè¡ç»ææ ·å¼" -#: ../include/svn_error_codes.h:281 +#: ../include/svn_error_codes.h:288 msgid "Line endings other than expected" msgstr "è¡æå¤ç»æ" -#: ../include/svn_error_codes.h:285 +#: ../include/svn_error_codes.h:292 msgid "Ran out of unique names" msgstr "å¯ä¸å称èå°½" -#: ../include/svn_error_codes.h:290 +#: ../include/svn_error_codes.h:297 msgid "Framing error in pipe protocol" msgstr "管éåè®®ä¸å¸§é误" -#: ../include/svn_error_codes.h:295 +#: ../include/svn_error_codes.h:302 msgid "Read error in pipe" msgstr "管é读åé误" #. is errno on POSIX -#: ../include/svn_error_codes.h:299 ../libsvn_subr/cmdline.c:417 -#: ../libsvn_subr/cmdline.c:448 ../libsvn_subr/cmdline.c:471 ../svn/util.c:564 -#: ../svnlook/svnlook.c:2025 +#: ../include/svn_error_codes.h:306 ../libsvn_subr/cmdline.c:442 +#: ../libsvn_subr/cmdline.c:473 ../libsvn_subr/cmdline.c:496 ../svn/util.c:573 +#: ../svnlook/svnlook.c:2034 #, c-format msgid "Write error" msgstr "åå ¥é误" -#: ../include/svn_error_codes.h:304 +#: ../include/svn_error_codes.h:311 msgid "Write error in pipe" msgstr "管éåå ¥é误" -#: ../include/svn_error_codes.h:310 +#: ../include/svn_error_codes.h:317 msgid "Unexpected EOF on stream" msgstr "æµæå¤ç»æ" -#: ../include/svn_error_codes.h:314 +#: ../include/svn_error_codes.h:321 msgid "Malformed stream data" msgstr "éæ³æµæ°æ®" -#: ../include/svn_error_codes.h:318 +#: ../include/svn_error_codes.h:325 msgid "Unrecognized stream data" msgstr "æ æ³è¯å«çæµæ°æ®" -#: ../include/svn_error_codes.h:323 +#: ../include/svn_error_codes.h:330 msgid "Stream doesn't support seeking" msgstr "æµä¸æ¯æå®ä½æä½" -#: ../include/svn_error_codes.h:328 +#: ../include/svn_error_codes.h:335 msgid "Stream doesn't support this capability" msgstr "æµä¸æ¯ææ¤ç¹æ§" -#: ../include/svn_error_codes.h:334 +#: ../include/svn_error_codes.h:341 msgid "Unknown svn_node_kind" msgstr "æªç¥ç svn_node_kind" -#: ../include/svn_error_codes.h:338 +#: ../include/svn_error_codes.h:345 msgid "Unexpected node kind found" msgstr "åç°æå¤èç¹ç§ç±»" -#: ../include/svn_error_codes.h:344 +#: ../include/svn_error_codes.h:351 msgid "Can't find an entry" msgstr "æ æ³æ¾å°æ¡ç®" -#: ../include/svn_error_codes.h:350 +#: ../include/svn_error_codes.h:357 msgid "Entry already exists" msgstr "æ¡ç®å·²åå¨" -#: ../include/svn_error_codes.h:354 +#: ../include/svn_error_codes.h:361 msgid "Entry has no revision" msgstr "æ¡ç®æ²¡æçæ¬" -#: ../include/svn_error_codes.h:358 +#: ../include/svn_error_codes.h:365 msgid "Entry has no URL" msgstr "å ¥å£æ²¡æ URL" -#: ../include/svn_error_codes.h:362 +#: ../include/svn_error_codes.h:369 msgid "Entry has an invalid attribute" msgstr "æ¡ç®ææ æå±æ§" -#: ../include/svn_error_codes.h:366 +#: ../include/svn_error_codes.h:373 msgid "Can't create an entry for a forbidden name" msgstr "ä¸è½ä¸ºç¦ç¨çå称å建æ¡ç®" -#: ../include/svn_error_codes.h:372 +#: ../include/svn_error_codes.h:379 msgid "Obstructed update" msgstr "æ´æ°é»å¡" -#: ../include/svn_error_codes.h:377 +#: ../include/svn_error_codes.h:384 msgid "Mismatch popping the WC unwind stack" msgstr "ä¸å¹é çå¼¹åºå·¥ä½å¯æ¬å±å¼å æ " -#: ../include/svn_error_codes.h:382 +#: ../include/svn_error_codes.h:389 msgid "Attempt to pop empty WC unwind stack" msgstr "è¯å¾å¼¹åºç©ºçå·¥ä½å¯æ¬å±å¼å æ " -#: ../include/svn_error_codes.h:387 +#: ../include/svn_error_codes.h:394 msgid "Attempt to unlock with non-empty unwind stack" msgstr "è¯å¾è§£éé空å±å¼å æ " -#: ../include/svn_error_codes.h:391 +#: ../include/svn_error_codes.h:398 msgid "Attempted to lock an already-locked dir" msgstr "è¯å¾éå®å·²å éçç®å½" -#: ../include/svn_error_codes.h:395 +#: ../include/svn_error_codes.h:402 msgid "Working copy not locked; this is probably a bug, please report" msgstr "å·¥ä½å¯æ¬æ²¡æéå®ï¼è¿å¯è½æ¯ä¸ä¸ªæ¼æ´ï¼è¯·æ¥å" -#: ../include/svn_error_codes.h:400 +#: ../include/svn_error_codes.h:407 msgid "Invalid lock" msgstr "æ æé" -#: ../include/svn_error_codes.h:406 ../include/svn_error_codes.h:412 +#: ../include/svn_error_codes.h:413 ../include/svn_error_codes.h:419 msgid "Path is not a working copy directory" msgstr "è·¯å¾ä¸æ¯å·¥ä½å¯æ¬ç®å½" -#: ../include/svn_error_codes.h:416 +#: ../include/svn_error_codes.h:423 msgid "Path is not a working copy file" msgstr "è·¯å¾ä¸æ¯å·¥ä½å¯æ¬æ件" -#: ../include/svn_error_codes.h:420 +#: ../include/svn_error_codes.h:427 msgid "Problem running log" msgstr "æ§è¡æ¥å¿åºé" -#: ../include/svn_error_codes.h:424 +#: ../include/svn_error_codes.h:431 msgid "Can't find a working copy path" msgstr "æ¾ä¸å°å·¥ä½å¯æ¬è·¯å¾" -#: ../include/svn_error_codes.h:428 +#: ../include/svn_error_codes.h:435 msgid "Working copy is not up-to-date" msgstr "å·¥ä½å¯æ¬æ²¡ææ´æ°å°ææ°çæ¬" -#: ../include/svn_error_codes.h:432 +#: ../include/svn_error_codes.h:439 msgid "Left locally modified or unversioned files" msgstr "ä¿çæ¬å°ä¿®æ¹ææªçº³å ¥çæ¬æ§å¶çæ件" -#: ../include/svn_error_codes.h:436 +#: ../include/svn_error_codes.h:443 msgid "Unmergeable scheduling requested on an entry" msgstr "æ¡ç®ææ æ³å并çè°åº¦" -#: ../include/svn_error_codes.h:440 +#: ../include/svn_error_codes.h:447 msgid "Found a working copy path" msgstr "æ¾å°ä¸ä¸ªå·¥ä½å¯æ¬è·¯å¾" -#: ../include/svn_error_codes.h:444 +#: ../include/svn_error_codes.h:451 msgid "A conflict in the working copy obstructs the current operation" msgstr "å·¥ä½å¯æ¬ä¸çå²çªé»æ¢äºå½åæä½" -#: ../include/svn_error_codes.h:448 +#: ../include/svn_error_codes.h:455 msgid "Working copy is corrupt" msgstr "å·¥ä½å¯æ¬å·²æå" -#: ../include/svn_error_codes.h:452 +#: ../include/svn_error_codes.h:459 msgid "Working copy text base is corrupt" msgstr "å·¥ä½å¯æ¬çåèæ件æå" -#: ../include/svn_error_codes.h:456 +#: ../include/svn_error_codes.h:463 msgid "Cannot change node kind" msgstr "æ æ³ä¿®æ¹èç¹ç±»å" -#: ../include/svn_error_codes.h:460 +#: ../include/svn_error_codes.h:467 msgid "Invalid operation on the current working directory" msgstr "æä½å¯¹å½åå·¥ä½ç®å½æ æ" -#: ../include/svn_error_codes.h:464 +#: ../include/svn_error_codes.h:471 msgid "Problem on first log entry in a working copy" msgstr "æä½å·¥ä½å¯æ¬ç第ä¸ä¸ªæ¥å¿æ¡ç®åºé" -#: ../include/svn_error_codes.h:468 +#: ../include/svn_error_codes.h:475 msgid "Unsupported working copy format" msgstr "ä¸æ¯ææ¤å·¥ä½å¯æ¬æ ¼å¼" -#: ../include/svn_error_codes.h:472 +#: ../include/svn_error_codes.h:479 msgid "Path syntax not supported in this context" msgstr "æ¤ä¸ä¸æä¸æ¯æè·¯å¾è¯æ³" -#: ../include/svn_error_codes.h:477 +#: ../include/svn_error_codes.h:484 msgid "Invalid schedule" msgstr "æ æçè°åº¦" -#: ../include/svn_error_codes.h:482 +#: ../include/svn_error_codes.h:489 msgid "Invalid relocation" msgstr "æ æéå®ä½" -#: ../include/svn_error_codes.h:487 +#: ../include/svn_error_codes.h:494 msgid "Invalid switch" msgstr "æ æçåæ¢" -#: ../include/svn_error_codes.h:492 +#: ../include/svn_error_codes.h:499 msgid "Changelist doesn't match" msgstr "ä¿®æ¹å表ä¸å¹é " -#: ../include/svn_error_codes.h:497 +#: ../include/svn_error_codes.h:504 msgid "Conflict resolution failed" msgstr "解å³å²çªå¤±è´¥" -#: ../include/svn_error_codes.h:501 +#: ../include/svn_error_codes.h:508 msgid "Failed to locate 'copyfrom' path in working copy" -msgstr "å¨å·¥ä½å¯æ¬ä¸å®ä½ âcopyfromâ çè·¯å¾å¤±è´¥ã" +msgstr "å¨å·¥ä½å¯æ¬ä¸å®ä½ 'copyfrom' çè·¯å¾å¤±è´¥ã" -#: ../include/svn_error_codes.h:509 +#: ../include/svn_error_codes.h:516 msgid "Moving a path from one changelist to another" msgstr "å°è·¯å¾ä»ä¸ä¸ªä¿®æ¹å表移å°å¦ä¸ä¸ª" -#: ../include/svn_error_codes.h:514 +#: ../include/svn_error_codes.h:521 msgid "Cannot delete a file external" -msgstr "æ æ³å é¤å¤é¨æ件" +msgstr "æ æ³å é¤å¤é¨å¼ç¨æ件" -#: ../include/svn_error_codes.h:519 +#: ../include/svn_error_codes.h:526 msgid "Cannot move a file external" -msgstr "æ æ³ç§»å¨å¤é¨æ件" +msgstr "æ æ³ç§»å¨å¤é¨å¼ç¨æ件" -#: ../include/svn_error_codes.h:524 +#: ../include/svn_error_codes.h:531 msgid "Something's amiss with the wc sqlite database" msgstr "å·¥ä½å¯æ¬ç SQLite æ°æ®åºæé误" -#: ../include/svn_error_codes.h:529 +#: ../include/svn_error_codes.h:536 msgid "The working copy is missing" msgstr "å·¥ä½å¯æ¬ä¸¢å¤±" -#: ../include/svn_error_codes.h:534 +#: ../include/svn_error_codes.h:541 msgid "The specified node is not a symlink" msgstr "æå®çèç¹ä¸æ¯ç¬¦å·è¿æ¥" -#: ../include/svn_error_codes.h:539 +#: ../include/svn_error_codes.h:546 msgid "The specified path has an unexpected status" msgstr "æå®çè·¯å¾æä¸ææçç¶æ" -#: ../include/svn_error_codes.h:544 +#: ../include/svn_error_codes.h:551 msgid "The working copy needs to be upgraded" msgstr "å·¥ä½å¯æ¬éè¦å级" -#: ../include/svn_error_codes.h:549 +#: ../include/svn_error_codes.h:556 msgid "Previous operation has not finished; run 'cleanup' if it was interrupted" -msgstr "以åçæä½æ²¡æå®æï¼å¦æå®è¢«ä¸æï¼è¯·æ§è¡âsvn cleanupâ" +msgstr "以åçæä½æ²¡æå®æï¼å¦æå®è¢«ä¸æï¼è¯·æ§è¡'svn cleanup'" -#: ../include/svn_error_codes.h:555 +#: ../include/svn_error_codes.h:562 msgid "The operation cannot be performed with the specified depth" msgstr "å¨æå®ç深度ä¸è½æ§è¡æ¤æä½" -#: ../include/svn_error_codes.h:560 +#: ../include/svn_error_codes.h:567 msgid "Couldn't open a working copy file because access was denied" msgstr "ä¸è½æå¼å·¥ä½å¯æ¬æ件ï¼è®¿é®è¢«æç»" -#: ../include/svn_error_codes.h:565 +#: ../include/svn_error_codes.h:572 msgid "Mixed-revision working copy was found but not expected" msgstr "åç°äºä¸ææçæ··åçæ¬çå·¥ä½å¯æ¬" -#: ../include/svn_error_codes.h:570 +#: ../include/svn_error_codes.h:577 msgid "Duplicate targets in svn:externals property" msgstr "svn:externals å±æ§å å«éå¤çç®æ " -#: ../include/svn_error_codes.h:576 +#: ../include/svn_error_codes.h:582 +msgid "Incompatible working copy settings" +msgstr "ä¸å ¼å®¹çå·¥ä½å¯æ¬è®¾ç½®" + +#: ../include/svn_error_codes.h:587 +msgid "This client uses a deprecated API that does not support working copies without local pristines" +msgstr "æ¤å®¢æ·ç«¯ä½¿ç¨äºå·²åºå¼ç APIï¼ä¸æ¯æ没ææ¬å°åå§å¯æ¬çå·¥ä½å¯æ¬" + +#: ../include/svn_error_codes.h:593 +msgid "No local pristine contents for a file" +msgstr "æ件没ææ¬å°åå§å 容" + +#: ../include/svn_error_codes.h:599 msgid "General filesystem error" msgstr "æ®éæ件系ç»é误" -#: ../include/svn_error_codes.h:580 +#: ../include/svn_error_codes.h:603 msgid "Error closing filesystem" msgstr "å ³éæ件系ç»åºé" -#: ../include/svn_error_codes.h:584 +#: ../include/svn_error_codes.h:607 msgid "Filesystem is already open" msgstr "æ件系ç»å·²ç»æå¼" -#: ../include/svn_error_codes.h:588 +#: ../include/svn_error_codes.h:611 msgid "Filesystem is not open" msgstr "æ件系ç»å°æªæå¼" -#: ../include/svn_error_codes.h:592 +#: ../include/svn_error_codes.h:615 msgid "Filesystem is corrupt" msgstr "æ件系ç»æå" -#: ../include/svn_error_codes.h:596 +#: ../include/svn_error_codes.h:619 msgid "Invalid filesystem path syntax" msgstr "æ ææ件系ç»è·¯å¾è¯æ³" -#: ../include/svn_error_codes.h:600 +#: ../include/svn_error_codes.h:623 msgid "Invalid filesystem revision number" msgstr "æ ææ件系ç»çæ¬å·" -#: ../include/svn_error_codes.h:604 +#: ../include/svn_error_codes.h:627 msgid "Invalid filesystem transaction name" msgstr "æ æçæ件系ç»äºå¡å称" -#: ../include/svn_error_codes.h:608 +#: ../include/svn_error_codes.h:631 msgid "Filesystem directory has no such entry" msgstr "æ件系ç»ç®å½æ²¡ææ¤æ¡ç®" -#: ../include/svn_error_codes.h:612 +#: ../include/svn_error_codes.h:635 msgid "Filesystem has no such representation" -msgstr "æ件系ç»æ²¡ææ¤ä¿®è®¢ç" +msgstr "æ件系ç»æ²¡ææ¤è¡¨ç¤º" -#: ../include/svn_error_codes.h:616 +#: ../include/svn_error_codes.h:639 msgid "Filesystem has no such string" msgstr "æ件系ç»æ²¡ææ¤å符串" -#: ../include/svn_error_codes.h:620 +#: ../include/svn_error_codes.h:643 msgid "Filesystem has no such copy" msgstr "æ件系ç»æ¤å¯æ¬" -#: ../include/svn_error_codes.h:624 +#: ../include/svn_error_codes.h:647 msgid "The specified transaction is not mutable" msgstr "æå®çäºå¡ä¸å¯æ¹å" -#: ../include/svn_error_codes.h:628 +#: ../include/svn_error_codes.h:651 msgid "Filesystem has no item" msgstr "æ件系ç»æ²¡ææ¡ç®" -#: ../include/svn_error_codes.h:632 +#: ../include/svn_error_codes.h:655 msgid "Filesystem has no such node-rev-id" msgstr "æ件系ç»æ²¡ææ¤ node-rev-id" -#: ../include/svn_error_codes.h:636 +#: ../include/svn_error_codes.h:659 msgid "String does not represent a node or node-rev-id" msgstr "å符串ä¸æ¯èç¹æ node-rev-id" -#: ../include/svn_error_codes.h:640 +#: ../include/svn_error_codes.h:663 msgid "Name does not refer to a filesystem directory" msgstr "æ件系ç»æ æ¤ç®å½" -#: ../include/svn_error_codes.h:644 +#: ../include/svn_error_codes.h:667 msgid "Name does not refer to a filesystem file" msgstr "æ件系ç»æ æ¤æ件" -#: ../include/svn_error_codes.h:648 +#: ../include/svn_error_codes.h:671 msgid "Name is not a single path component" msgstr "å称ä¸æ¯åä¸è·¯å¾" -#: ../include/svn_error_codes.h:652 +#: ../include/svn_error_codes.h:675 msgid "Attempt to change immutable filesystem node" msgstr "è¯å¾ä¿®æ¹ä¸åçæ件系ç»èç¹" -#: ../include/svn_error_codes.h:656 +#: ../include/svn_error_codes.h:679 msgid "Item already exists in filesystem" msgstr "æ件系ç»å·²ææ¤æ¡ç®" -#: ../include/svn_error_codes.h:660 +#: ../include/svn_error_codes.h:683 msgid "Attempt to remove or recreate fs root dir" msgstr "è¯å¾å é¤æé建æ件系ç»æ ¹ç®å½" -#: ../include/svn_error_codes.h:664 +#: ../include/svn_error_codes.h:687 msgid "Object is not a transaction root" msgstr "对象ä¸æ¯äºå¡çæ ¹" -#: ../include/svn_error_codes.h:668 +#: ../include/svn_error_codes.h:691 msgid "Object is not a revision root" msgstr "对象ä¸æ¯çæ¬çæ ¹" -#: ../include/svn_error_codes.h:672 +#: ../include/svn_error_codes.h:695 msgid "Merge conflict during commit" msgstr "æ交æ¶åçå并å²çª" -#: ../include/svn_error_codes.h:676 +#: ../include/svn_error_codes.h:699 msgid "A representation vanished or changed between reads" -msgstr "读åæ¶ä¿®è®¢çæ¶å¤±ææ¹å" +msgstr "读åæ¶è¡¨ç¤ºæ¶å¤±ææ¹å" -#: ../include/svn_error_codes.h:680 +#: ../include/svn_error_codes.h:703 msgid "Tried to change an immutable representation" -msgstr "è¯å¾ä¿®æ¹ä¸åç修订ç" +msgstr "è¯å¾ä¿®æ¹ä¸åç表示" -#: ../include/svn_error_codes.h:684 +#: ../include/svn_error_codes.h:707 msgid "Malformed skeleton data" msgstr "éæ³éª¨æ¶æ°æ®" -#: ../include/svn_error_codes.h:688 +#: ../include/svn_error_codes.h:711 msgid "Transaction is out of date" msgstr "äºå¡è¿æ¶" -#: ../include/svn_error_codes.h:692 +#: ../include/svn_error_codes.h:715 msgid "Berkeley DB error" msgstr "BDB é误" -#: ../include/svn_error_codes.h:696 +#: ../include/svn_error_codes.h:719 msgid "Berkeley DB deadlock error" msgstr "BDB æ»é" -#: ../include/svn_error_codes.h:700 +#: ../include/svn_error_codes.h:723 msgid "Transaction is dead" msgstr "äºå¡å·²ç»ç»æ" -#: ../include/svn_error_codes.h:704 +#: ../include/svn_error_codes.h:727 msgid "Transaction is not dead" msgstr "äºå¡å°æªç»æ" -#: ../include/svn_error_codes.h:709 +#: ../include/svn_error_codes.h:732 msgid "Unknown FS type" msgstr "æªç¥çFSç±»å" -#: ../include/svn_error_codes.h:714 +#: ../include/svn_error_codes.h:737 msgid "No user associated with filesystem" msgstr "没æç¨æ·ä¸æ件系ç»å ³è" -#: ../include/svn_error_codes.h:719 +#: ../include/svn_error_codes.h:742 msgid "Path is already locked" msgstr "å·²ç»éå®è·¯å¾" -#: ../include/svn_error_codes.h:724 ../include/svn_error_codes.h:961 +#: ../include/svn_error_codes.h:747 ../include/svn_error_codes.h:1009 msgid "Path is not locked" msgstr "è·¯å¾æ²¡æå é" -#: ../include/svn_error_codes.h:729 +#: ../include/svn_error_codes.h:752 msgid "Lock token is incorrect" msgstr "ä¸æ£ç¡®çéå®ä»¤ç" -#: ../include/svn_error_codes.h:734 +#: ../include/svn_error_codes.h:757 msgid "No lock token provided" msgstr "没ææä¾éå®ä»¤ç" -#: ../include/svn_error_codes.h:739 +#: ../include/svn_error_codes.h:762 msgid "Username does not match lock owner" msgstr "ç¨æ·ä¸æ¯éææè " -#: ../include/svn_error_codes.h:744 +#: ../include/svn_error_codes.h:767 msgid "Filesystem has no such lock" msgstr "æ件系ç»æ²¡ææ¤é" -#: ../include/svn_error_codes.h:749 +#: ../include/svn_error_codes.h:772 msgid "Lock has expired" msgstr "éè¿æ" -#: ../include/svn_error_codes.h:754 ../include/svn_error_codes.h:948 +#: ../include/svn_error_codes.h:777 ../include/svn_error_codes.h:996 msgid "Item is out of date" msgstr "æ¡ç®è¿æ¶" -#: ../include/svn_error_codes.h:766 +#: ../include/svn_error_codes.h:789 msgid "Unsupported FS format" msgstr "ä¸æ¯æçæ件系ç»æ ¼å¼" -#: ../include/svn_error_codes.h:771 +#: ../include/svn_error_codes.h:794 msgid "Representation is being written" -msgstr "æ£å¨å修订ç" +msgstr "æ£å¨å表示" -#: ../include/svn_error_codes.h:776 +#: ../include/svn_error_codes.h:799 msgid "The generated transaction name is too long" msgstr "产ççäºå¡å称太é¿" -#: ../include/svn_error_codes.h:781 +#: ../include/svn_error_codes.h:804 msgid "Filesystem has no such node origin record" msgstr "æ件系ç»æ²¡ææ¤èç¹çåå§è®°å½" -#: ../include/svn_error_codes.h:786 +#: ../include/svn_error_codes.h:809 msgid "Filesystem upgrade is not supported" msgstr "ä¸æ¯ææ件系ç»å级" -#: ../include/svn_error_codes.h:791 +#: ../include/svn_error_codes.h:814 msgid "Filesystem has no such checksum-representation index record" -msgstr "æ件系ç»æ²¡ææ¤æ ¡éªåå±ç°ç´¢å¼è®°å½" +msgstr "æ件系ç»æ²¡ææ¤æ ¡éªå表示索å¼è®°å½" -#: ../include/svn_error_codes.h:796 +#: ../include/svn_error_codes.h:819 msgid "Property value in filesystem differs from the provided base value" msgstr "æ件系ç»ä¸çå±æ§å¼ä¸æä¾çåºç¡å¼ä¸å" -#: ../include/svn_error_codes.h:802 +#: ../include/svn_error_codes.h:825 msgid "The filesystem editor completion process was not followed" msgstr "没æè¿è¡æ件系ç»ç¼è¾å¨å®æè¿ç¨" -#: ../include/svn_error_codes.h:807 +#: ../include/svn_error_codes.h:830 msgid "A packed revprop could not be read" msgstr "ä¸è½è¯»åæå ç revprop" -#: ../include/svn_error_codes.h:812 +#: ../include/svn_error_codes.h:835 msgid "Could not initialize the revprop caching infrastructure." msgstr "ä¸è½åå§å revprop ç¼å" -#: ../include/svn_error_codes.h:817 +#: ../include/svn_error_codes.h:840 msgid "Malformed transaction ID string." msgstr "ç¸å½¢çäºå¡ ID å符串ã" -#: ../include/svn_error_codes.h:822 +#: ../include/svn_error_codes.h:845 msgid "Corrupt index file." msgstr "æåçç´¢å¼æ件" -#: ../include/svn_error_codes.h:827 +#: ../include/svn_error_codes.h:850 msgid "Revision not covered by index." msgstr "ç´¢å¼ä¸æ²¡ææ¤çæ¬ã" -#: ../include/svn_error_codes.h:832 +#: ../include/svn_error_codes.h:855 msgid "Item index too large for this revision." msgstr "æ¤çæ¬çæ¡ç®ç´¢å¼å¤ªå¤§ã" -#: ../include/svn_error_codes.h:837 +#: ../include/svn_error_codes.h:860 msgid "Container index out of range." msgstr "容å¨ç´¢å¼è¶çã" -#: ../include/svn_error_codes.h:842 +#: ../include/svn_error_codes.h:865 msgid "Index files are inconsistent." msgstr "ç´¢å¼æ件ä¸ä¸è´ã" -#: ../include/svn_error_codes.h:847 +#: ../include/svn_error_codes.h:870 msgid "Lock operation failed" msgstr "éæä½å¤±è´¥" -#: ../include/svn_error_codes.h:852 +#: ../include/svn_error_codes.h:875 msgid "Unsupported FS type" msgstr "ä¸æ¯æçæ件系ç»ç±»å" -#: ../include/svn_error_codes.h:857 +#: ../include/svn_error_codes.h:880 msgid "Container capacity exceeded." -msgstr "" +msgstr "容å¨å®¹éå·²è¶ åºã" -#: ../include/svn_error_codes.h:862 +#: ../include/svn_error_codes.h:885 msgid "Malformed node revision ID string." msgstr "ç¸å½¢çèç¹çæ¬ ID å符串ã" -#: ../include/svn_error_codes.h:867 ../libsvn_fs_x/revprops.c:291 +#: ../include/svn_error_codes.h:890 msgid "Invalid generation number data." msgstr "æ æççæç¼å·æ°æ®ã" -#: ../include/svn_error_codes.h:873 +#: ../include/svn_error_codes.h:895 +msgid "Revprop manifest corrupt." +msgstr "çæ¬å±æ§æ¸ åæåã" + +#: ../include/svn_error_codes.h:900 +msgid "Property list is corrupt." +msgstr "å±æ§å表æåã" + +#: ../include/svn_error_codes.h:905 +msgid "Content checksums supposedly match but content does not." +msgstr "æ ¡éªååºå½å¹é ä½å 容ä¸åã" + +#: ../include/svn_error_codes.h:910 +msgid "Unrecognized filesystem I/O control code" +msgstr "æ æ³è¯å«çæä»¶ç³»ç» I/O æ§å¶ç " + +#: ../include/svn_error_codes.h:915 +msgid "Rep-sharing is not allowed." +msgstr "ä¸å è®¸å ±äº«è¡¨ç¤ºã" + +#: ../include/svn_error_codes.h:920 +msgid "Rep-sharing is not supported." +msgstr "ä¸æ¯æå ±äº«è¡¨ç¤ºã" + +#: ../include/svn_error_codes.h:926 msgid "The repository is locked, perhaps for db recovery" msgstr "çæ¬åºè¢«éï¼å¯è½æ£å¨æ¢å¤" -#: ../include/svn_error_codes.h:877 +#: ../include/svn_error_codes.h:930 msgid "A repository hook failed" msgstr "çæ¬åºé©åé误" -#: ../include/svn_error_codes.h:881 +#: ../include/svn_error_codes.h:934 msgid "Incorrect arguments supplied" msgstr "æä¾äºä¸æ£ç¡®çåæ°" -#: ../include/svn_error_codes.h:885 +#: ../include/svn_error_codes.h:938 msgid "A report cannot be generated because no data was supplied" msgstr "没ææ°æ®ï¼æ æ³äº§çæ¥å" -#: ../include/svn_error_codes.h:889 +#: ../include/svn_error_codes.h:942 msgid "Bogus revision report" msgstr "çæ¬æ¥åéæ³" -#: ../include/svn_error_codes.h:898 +#: ../include/svn_error_codes.h:951 msgid "Unsupported repository version" msgstr "ä¸æ¯ææ¤çæ¬åºçæ¬" -#: ../include/svn_error_codes.h:902 +#: ../include/svn_error_codes.h:955 msgid "Disabled repository feature" msgstr "å ³éçæ¬åºç¹æ§" -#: ../include/svn_error_codes.h:906 +#: ../include/svn_error_codes.h:959 msgid "Error running post-commit hook" msgstr "æ§è¡ post-commit é©åé误" -#: ../include/svn_error_codes.h:911 +#: ../include/svn_error_codes.h:964 msgid "Error running post-lock hook" msgstr "æ§è¡ post-lock é©åé误" -#: ../include/svn_error_codes.h:916 +#: ../include/svn_error_codes.h:969 msgid "Error running post-unlock hook" msgstr "æ§è¡ post-unlock é©åé误" -#: ../include/svn_error_codes.h:921 +#: ../include/svn_error_codes.h:974 msgid "Repository upgrade is not supported" msgstr "ä¸æ¯æçæ¬åºå级" -#: ../include/svn_error_codes.h:926 -msgid "Repository is corrupt" -msgstr "çæ¬åºå·²æå" - -#: ../include/svn_error_codes.h:932 +#: ../include/svn_error_codes.h:980 msgid "Bad URL passed to RA layer" msgstr "ä¼ éè³ RA å±ç URL é误" -#: ../include/svn_error_codes.h:936 +#: ../include/svn_error_codes.h:984 msgid "Authorization failed" msgstr "认è¯å¤±è´¥" -#: ../include/svn_error_codes.h:940 +#: ../include/svn_error_codes.h:988 msgid "Unknown authorization method" msgstr "æªç¥è®¤è¯" -#: ../include/svn_error_codes.h:944 +#: ../include/svn_error_codes.h:992 msgid "Repository access method not implemented" msgstr "çæ¬åºæªå®ç°ååæ¹æ³" -#: ../include/svn_error_codes.h:952 +#: ../include/svn_error_codes.h:1000 msgid "Repository has no UUID" msgstr "çæ¬åºæ²¡æ UUID" -#: ../include/svn_error_codes.h:956 +#: ../include/svn_error_codes.h:1004 msgid "Unsupported RA plugin ABI version" msgstr "ä¸æ¯ææ¤ RA æ件ç ABI çæ¬" -#: ../include/svn_error_codes.h:966 +#: ../include/svn_error_codes.h:1014 msgid "Server can only replay from the root of a repository" msgstr "æå¡å¨åªè½ä»çæ¬åºçæ ¹éæ¾" -#: ../include/svn_error_codes.h:971 +#: ../include/svn_error_codes.h:1019 msgid "Repository UUID does not match expected UUID" msgstr "çæ¬åºç UUID ä¸ææç UUID ä¸å¹é " -#: ../include/svn_error_codes.h:976 +#: ../include/svn_error_codes.h:1024 msgid "Repository root URL does not match expected root URL" msgstr "çæ¬åºæ ¹ URL ä¸ææçæ ¹ URL ä¸å¹é " -#: ../include/svn_error_codes.h:981 +#: ../include/svn_error_codes.h:1029 msgid "Session URL does not match expected session URL" msgstr "ä¼è¯ URL ä¸ææçä¼è¯ URL ä¸å¹é " -#: ../include/svn_error_codes.h:986 ../libsvn_ra_svn/client.c:503 +#: ../include/svn_error_codes.h:1034 ../libsvn_ra_svn/client.c:507 #, c-format msgid "Can't create tunnel" msgstr "æ æ³å建é§é" -#: ../include/svn_error_codes.h:991 +#: ../include/svn_error_codes.h:1039 msgid "Can't create session" msgstr "æ æ³å建åè¯" -#: ../include/svn_error_codes.h:997 +#: ../include/svn_error_codes.h:1045 msgid "RA layer failed to init socket layer" msgstr "RA å±æ æ³åå§å socket å±" -#: ../include/svn_error_codes.h:1001 +#: ../include/svn_error_codes.h:1049 msgid "RA layer failed to create HTTP request" msgstr "RA å±å建 HTTP 请æ±å¤±è´¥" -#: ../include/svn_error_codes.h:1005 +#: ../include/svn_error_codes.h:1053 msgid "RA layer request failed" msgstr "RA å±è¯·æ±å¤±è´¥" -#: ../include/svn_error_codes.h:1009 +#: ../include/svn_error_codes.h:1057 msgid "RA layer didn't receive requested OPTIONS info" msgstr "RA å±æ æ³åå¾è¯·æ±ç OPTIONS ä¿¡æ¯" -#: ../include/svn_error_codes.h:1013 +#: ../include/svn_error_codes.h:1061 msgid "RA layer failed to fetch properties" msgstr "RA å±æ æ³åå¾å±æ§" -#: ../include/svn_error_codes.h:1017 +#: ../include/svn_error_codes.h:1065 msgid "RA layer file already exists" msgstr "RA å±æ件已ç»åå¨" -#: ../include/svn_error_codes.h:1031 +#: ../include/svn_error_codes.h:1079 msgid "HTTP Path Not Found" msgstr "æ¾ä¸å° HTTP è·¯å¾" -#: ../include/svn_error_codes.h:1035 +#: ../include/svn_error_codes.h:1083 msgid "Failed to execute WebDAV PROPPATCH" msgstr "æ§è¡ WebDAV PROPPATCH 失败" #. If condition COND is not met, return a "malformed network data" error. #. -#: ../include/svn_error_codes.h:1040 ../include/svn_error_codes.h:1513 -#: ../libsvn_ra_svn/marshal.c:1129 ../libsvn_ra_svn/marshal.c:1381 -#: ../libsvn_ra_svn/marshal.c:1411 ../libsvn_ra_svn/marshal.c:2495 +#: ../include/svn_error_codes.h:1088 ../include/svn_error_codes.h:1596 +#: ../libsvn_ra_svn/marshal.c:1459 ../libsvn_ra_svn/marshal.c:1716 +#: ../libsvn_ra_svn/marshal.c:1745 ../libsvn_ra_svn/marshal.c:2997 msgid "Malformed network data" msgstr "éæ³ç½ç»æ°æ®" -#: ../include/svn_error_codes.h:1045 +#: ../include/svn_error_codes.h:1093 msgid "Unable to extract data from response header" msgstr "ä¸è½ä»ååºç头信æ¯ä¸è·åæ°æ®" -#: ../include/svn_error_codes.h:1050 +#: ../include/svn_error_codes.h:1098 msgid "Repository has been moved" msgstr "çæ¬åºå·²ç»ç§»å¨" -#: ../include/svn_error_codes.h:1055 ../libsvn_ra_serf/util.c:886 +#: ../include/svn_error_codes.h:1103 ../libsvn_ra_serf/util.c:945 msgid "Connection timed out" msgstr "è¿æ¥è¶ æ¶" -#: ../include/svn_error_codes.h:1060 +#: ../include/svn_error_codes.h:1108 msgid "URL access forbidden for unknown reason" msgstr "å 为æªç¥ççç±ï¼ç¦æ¢è®¿é® URL" -#: ../include/svn_error_codes.h:1065 +#: ../include/svn_error_codes.h:1113 msgid "The server state conflicts with the requested preconditions" msgstr "æå¡å¨ç¶æä¸è¯·æ±çåç½®æ¡ä»¶å²çªã" -#: ../include/svn_error_codes.h:1071 ../include/svn_error_codes.h:1517 +#: ../include/svn_error_codes.h:1118 +msgid "The URL doesn't allow the requested method" +msgstr "URL ä¸å 许请æ±çæ¹æ³" + +#: ../include/svn_error_codes.h:1124 ../include/svn_error_codes.h:1600 msgid "Couldn't find a repository" msgstr "æ æ³æ¾å°çæ¬åº" -#: ../include/svn_error_codes.h:1075 +#: ../include/svn_error_codes.h:1128 msgid "Couldn't open a repository" msgstr "æ æ³æå¼çæ¬åº" -#: ../include/svn_error_codes.h:1081 +#: ../include/svn_error_codes.h:1134 msgid "Svndiff data has invalid header" msgstr "svndiff æ°æ®å å«æ æ头" -#: ../include/svn_error_codes.h:1085 +#: ../include/svn_error_codes.h:1138 msgid "Svndiff data contains corrupt window" msgstr "Svndiff æ°æ®å å«æåçªå£" -#: ../include/svn_error_codes.h:1089 +#: ../include/svn_error_codes.h:1142 msgid "Svndiff data contains backward-sliding source view" msgstr "Svndiff æ°æ®å å«ååååçèµæºè§å¾" -#: ../include/svn_error_codes.h:1093 +#: ../include/svn_error_codes.h:1146 msgid "Svndiff data contains invalid instruction" msgstr "svndiff æ°æ®å å«æ ææ令" -#: ../include/svn_error_codes.h:1097 +#: ../include/svn_error_codes.h:1150 msgid "Svndiff data ends unexpectedly" msgstr "svndiff æ°æ®æå¤ç»æ" -#: ../include/svn_error_codes.h:1101 +#: ../include/svn_error_codes.h:1154 msgid "Svndiff compressed data is invalid" msgstr "éæ³ svndiff å缩æ°æ®" -#: ../include/svn_error_codes.h:1107 +#: ../include/svn_error_codes.h:1160 msgid "Apache has no path to an SVN filesystem" msgstr "Apache 没ææå SVN æ件系ç»çè·¯å¾" -#: ../include/svn_error_codes.h:1111 +#: ../include/svn_error_codes.h:1164 msgid "Apache got a malformed URI" msgstr "Apache å¾å°éæ³ URI" -#: ../include/svn_error_codes.h:1115 +#: ../include/svn_error_codes.h:1168 msgid "Activity not found" msgstr "没ææ¾å°æ´»å¨é¡¹" -#: ../include/svn_error_codes.h:1119 +#: ../include/svn_error_codes.h:1172 msgid "Baseline incorrect" msgstr "åºçº¿é误" -#: ../include/svn_error_codes.h:1123 +#: ../include/svn_error_codes.h:1176 msgid "Input/output error" msgstr "è¾åº/è¾åºé误" -#: ../include/svn_error_codes.h:1129 +#: ../include/svn_error_codes.h:1182 msgid "A path under version control is needed for this operation" msgstr "åªè½å¯¹çº³å ¥çæ¬æ§å¶çè·¯å¾æ§è¡æ¤æä½" -#: ../include/svn_error_codes.h:1133 +#: ../include/svn_error_codes.h:1186 msgid "Repository access is needed for this operation" msgstr "æ¤æä½éè¦ååçæ¬åº" -#: ../include/svn_error_codes.h:1137 +#: ../include/svn_error_codes.h:1190 msgid "Bogus revision information given" msgstr "ç»åºççæ¬ä¿¡æ¯éæ³" -#: ../include/svn_error_codes.h:1141 +#: ../include/svn_error_codes.h:1194 msgid "Attempting to commit to a URL more than once" msgstr "è¯å¾å¯¹ URL è¿è¡å¤æ¬¡æ交" -#: ../include/svn_error_codes.h:1145 +#: ../include/svn_error_codes.h:1198 msgid "Operation does not apply to binary file" msgstr "ä¸è½å¯¹äºè¿å¶æ件æ§è¡æ¤æä½" -#: ../include/svn_error_codes.h:1151 +#: ../include/svn_error_codes.h:1204 msgid "Format of an svn:externals property was invalid" msgstr "svn:externals å±æ§æ ¼å¼éæ³" -#: ../include/svn_error_codes.h:1155 +#: ../include/svn_error_codes.h:1208 msgid "Attempting restricted operation for modified resource" msgstr "è¯å¾å¯¹å·²ä¿®æ¹çèµæºè¿è¡åéæä½" -#: ../include/svn_error_codes.h:1159 +#: ../include/svn_error_codes.h:1212 msgid "Operation does not apply to directory" msgstr "ä¸è½å¯¹ç®å½æ§è¡æ¤æä½" -#: ../include/svn_error_codes.h:1163 +#: ../include/svn_error_codes.h:1216 ../svnadmin/svnadmin.c:1842 +#, c-format msgid "Revision range is not allowed" msgstr "ä¸å 许ççæ¬èå´" -#: ../include/svn_error_codes.h:1167 +#: ../include/svn_error_codes.h:1220 msgid "Inter-repository relocation not allowed" msgstr "ä¸æ¯æçæ¬åºä¹é´çéæ°å®ä½" -#: ../include/svn_error_codes.h:1171 +#: ../include/svn_error_codes.h:1224 msgid "Author name cannot contain a newline" msgstr "ä½è å称ä¸è½æ¢è¡" -#: ../include/svn_error_codes.h:1175 +#: ../include/svn_error_codes.h:1228 msgid "Bad property name" msgstr "å±æ§å称é误" -#: ../include/svn_error_codes.h:1180 +#: ../include/svn_error_codes.h:1233 msgid "Two versioned resources are unrelated" msgstr "ä¸¤ä¸ªçº³å ¥çæ¬æ§å¶çèµæºä¸ç¸å ³" -#: ../include/svn_error_codes.h:1185 +#: ../include/svn_error_codes.h:1238 msgid "Path has no lock token" msgstr "è·¯å¾æ²¡æéå®ä»¤ç" -#: ../include/svn_error_codes.h:1190 +#: ../include/svn_error_codes.h:1243 msgid "Operation does not support multiple sources" msgstr "æ¤æä½ä¸æ¯æå¤ä¸ªæºå¯¹è±¡" -#: ../include/svn_error_codes.h:1195 +#: ../include/svn_error_codes.h:1248 msgid "No versioned parent directories" msgstr "没æåçæ¬æ§å¶çç¶ç®å½" -#: ../include/svn_error_codes.h:1200 ../include/svn_error_codes.h:1220 +#: ../include/svn_error_codes.h:1253 ../include/svn_error_codes.h:1273 msgid "Working copy and merge source not ready for reintegration" -msgstr "å·¥ä½å¯æ¬ä¸å并æ¥æºæ²¡æåå¤å¥½å¤å ´" +msgstr "å·¥ä½å¯æ¬ä¸å并æºå°æªåå¤å¥½å reintegrate å并" -#: ../include/svn_error_codes.h:1205 +#: ../include/svn_error_codes.h:1258 msgid "A file external cannot overwrite an existing versioned item" msgstr "å¤é¨å¼ç¨çæ件ä¸è½è¦åå·²åççæ¬æ§å¶çæ¡ç®" -#: ../include/svn_error_codes.h:1210 +#: ../include/svn_error_codes.h:1263 msgid "Invalid path component strip count specified" msgstr "æå®äºæ æçè·¯å¾ç»ä»¶ä¿®åªè®¡æ°" -#: ../include/svn_error_codes.h:1215 +#: ../include/svn_error_codes.h:1268 msgid "Detected a cycle while processing the operation" msgstr "å½å¤çæ¤æä½æ¯ï¼æ£æµå°æ»å¾ªç¯" -#: ../include/svn_error_codes.h:1225 +#: ../include/svn_error_codes.h:1278 msgid "Invalid mergeinfo detected in merge target" msgstr "å¨å并ç®æ æ£æµå°äºå并信æ¯" -#: ../include/svn_error_codes.h:1230 +#: ../include/svn_error_codes.h:1283 msgid "Can't perform this operation without a valid lock token" msgstr "ä¸è½å¨æ²¡æåæ³çé令çæ¶æ§è¡æ¤æä½" -#: ../include/svn_error_codes.h:1235 +#: ../include/svn_error_codes.h:1288 msgid "The operation is forbidden by the server" msgstr "æä½è¢«æå¡å¨ç¦æ¢" -#: ../include/svn_error_codes.h:1241 +#: ../include/svn_error_codes.h:1293 +msgid "The conflict resolution option is not applicable" +msgstr "å²çªè§£å³é项ä¸éç¨" + +#: ../include/svn_error_codes.h:1299 msgid "A problem occurred; see other errors for details" msgstr "åçé®é¢ï¼è¯·åé å ¶å®é误信æ¯" -#: ../include/svn_error_codes.h:1245 +#: ../include/svn_error_codes.h:1303 msgid "Failure loading plugin" msgstr "å è½½æ件失败" -#: ../include/svn_error_codes.h:1249 +#: ../include/svn_error_codes.h:1307 msgid "Malformed file" msgstr "æä»¶æ ¼å¼é误" -#: ../include/svn_error_codes.h:1253 +#: ../include/svn_error_codes.h:1311 msgid "Incomplete data" msgstr "æ°æ®ä¸å®æ´" -#: ../include/svn_error_codes.h:1257 +#: ../include/svn_error_codes.h:1315 msgid "Incorrect parameters given" msgstr "åæ°ä¸æ£ç¡®" -#: ../include/svn_error_codes.h:1261 +#: ../include/svn_error_codes.h:1319 msgid "Tried a versioning operation on an unversioned resource" msgstr "è¯å¾å¯¹æªçº³å ¥çæ¬æ§å¶çèµæºè¿è¡çæ¬æä½" -#: ../include/svn_error_codes.h:1265 +#: ../include/svn_error_codes.h:1323 msgid "Test failed" msgstr "æµè¯å¤±è´¥" -#: ../include/svn_error_codes.h:1269 +#: ../include/svn_error_codes.h:1327 msgid "Trying to use an unsupported feature" msgstr "è¯å¾ä½¿ç¨ä¸æ¯æçç¹æ§" -#: ../include/svn_error_codes.h:1273 +#: ../include/svn_error_codes.h:1331 msgid "Unexpected or unknown property kind" msgstr "æå¤ææªç¥çå±æ§ç±»å" -#: ../include/svn_error_codes.h:1277 +#: ../include/svn_error_codes.h:1335 msgid "Illegal target for the requested operation" msgstr "æ¤è¯·æ±æä½çç®æ éæ³" -#: ../include/svn_error_codes.h:1281 +#: ../include/svn_error_codes.h:1339 msgid "MD5 checksum is missing" msgstr "没æ MD5 æ ¡éªå" -#: ../include/svn_error_codes.h:1285 +#: ../include/svn_error_codes.h:1343 msgid "Directory needs to be empty but is not" msgstr "å¿ é¡»ä¸ºç©ºçç®å½æå 容" -#: ../include/svn_error_codes.h:1289 +#: ../include/svn_error_codes.h:1347 msgid "Error calling external program" -msgstr "è°ç¨å¤é¨ç¨åºé误" +msgstr "è°ç¨å¤é¨ç¨åºåºé" -#: ../include/svn_error_codes.h:1293 +#: ../include/svn_error_codes.h:1351 msgid "Python exception has been set with the error" msgstr "Python å¼å¸¸è¢«è®¾ä¸ºé误" -#: ../include/svn_error_codes.h:1297 +#: ../include/svn_error_codes.h:1355 msgid "A checksum mismatch occurred" msgstr "æ ¡éªåé误" -#: ../include/svn_error_codes.h:1301 +#: ../include/svn_error_codes.h:1359 msgid "The operation was interrupted" msgstr "æä½è¢«ä¸æ" -#: ../include/svn_error_codes.h:1305 +#: ../include/svn_error_codes.h:1363 msgid "The specified diff option is not supported" msgstr "ä¸æ¯ææå®ç diff é项" -#: ../include/svn_error_codes.h:1309 +#: ../include/svn_error_codes.h:1367 msgid "Property not found" msgstr "æ¾ä¸å°å±æ§" -#: ../include/svn_error_codes.h:1313 +#: ../include/svn_error_codes.h:1371 msgid "No auth file path available" msgstr "æªæä¾ auth æ件路å¾" -#: ../include/svn_error_codes.h:1318 +#: ../include/svn_error_codes.h:1376 msgid "Incompatible library version" msgstr "ä¸å ¼å®¹çåºçæ¬" -#: ../include/svn_error_codes.h:1323 +#: ../include/svn_error_codes.h:1381 msgid "Mergeinfo parse error" msgstr "åæå并信æ¯åºé" -#: ../include/svn_error_codes.h:1328 +#: ../include/svn_error_codes.h:1386 msgid "Cease invocation of this API" msgstr "åæ¢è°ç¨æ¤ API" -#: ../include/svn_error_codes.h:1333 +#: ../include/svn_error_codes.h:1391 msgid "Error parsing revision number" msgstr "解æçæ¬å·åºé" -#: ../include/svn_error_codes.h:1338 +#: ../include/svn_error_codes.h:1396 msgid "Iteration terminated before completion" msgstr "è¿ä»£å¨å®æåç»æ¢" -#: ../include/svn_error_codes.h:1343 +#: ../include/svn_error_codes.h:1401 msgid "Unknown changelist" msgstr "æªç¥ä¿®æ¹å表" -#: ../include/svn_error_codes.h:1348 +#: ../include/svn_error_codes.h:1406 msgid "Reserved directory name in command line arguments" msgstr "å¨å½ä»¤è¡åæ°ä¸å å«ä¿ççç®å½å称" -#: ../include/svn_error_codes.h:1353 +#: ../include/svn_error_codes.h:1411 msgid "Inquiry about unknown capability" msgstr "æ¥è¯¢æªç¥ç¹æ§" -#: ../include/svn_error_codes.h:1358 +#: ../include/svn_error_codes.h:1416 msgid "Test skipped" msgstr "è·³è¿æµè¯" -#: ../include/svn_error_codes.h:1363 +#: ../include/svn_error_codes.h:1421 msgid "APR memcache library not available" msgstr "APR memcache åºä¸å¯ç¨" -#: ../include/svn_error_codes.h:1368 +#: ../include/svn_error_codes.h:1426 msgid "Couldn't perform atomic initialization" msgstr "ä¸è½å®æååçåå§å" -#: ../include/svn_error_codes.h:1373 +#: ../include/svn_error_codes.h:1431 msgid "SQLite error" msgstr "SQLite é误" -#: ../include/svn_error_codes.h:1378 +#: ../include/svn_error_codes.h:1436 msgid "Attempted to write to readonly SQLite db" msgstr "è¯å¾åè³åªè¯» SQLite æ°æ®åº" -#: ../include/svn_error_codes.h:1385 +#: ../include/svn_error_codes.h:1443 msgid "Unsupported schema found in SQLite db" msgstr "ä¸æ¯æ SQLite æ°æ®åºä¸çæ¹æ¡" -#: ../include/svn_error_codes.h:1390 +#: ../include/svn_error_codes.h:1448 msgid "The SQLite db is busy" msgstr "SQLite æ°æ®åºç¹å¿" -#: ../include/svn_error_codes.h:1395 +#: ../include/svn_error_codes.h:1453 msgid "SQLite busy at transaction rollback; resetting all busy SQLite statements to allow rollback" msgstr "SQLite å¿äºåæ»äºå¡; 请éç½®ææç¹å¿ç SQLite è¯å¥ï¼ä»¥ä¾¿å 许åæ»" -#: ../include/svn_error_codes.h:1401 +#: ../include/svn_error_codes.h:1459 msgid "Constraint error in SQLite db" msgstr "å¨ SQLite æ°æ®åºä¸ç约æåºé" -#: ../include/svn_error_codes.h:1406 +#: ../include/svn_error_codes.h:1464 msgid "Too many memcached servers configured" msgstr "é ç½®äºå¤ªå¤ç memcached æå¡å¨" -#: ../include/svn_error_codes.h:1411 +#: ../include/svn_error_codes.h:1469 msgid "Failed to parse version number string" msgstr "解æçæ¬å·å符串失败" -#: ../include/svn_error_codes.h:1416 +#: ../include/svn_error_codes.h:1474 msgid "Atomic data storage is corrupt" msgstr "ååæ°æ®åå¨æå" -#: ../include/svn_error_codes.h:1421 +#: ../include/svn_error_codes.h:1479 msgid "utf8proc library error" msgstr "UTF8 å¤çåºé误" -#: ../include/svn_error_codes.h:1426 +#: ../include/svn_error_codes.h:1484 msgid "Bad arguments to SQL operators GLOB or LIKE" msgstr "ä¼ éç» SQL æä½ç¬¦ GBLOB æ LIKE çåæ°é误" -#: ../include/svn_error_codes.h:1431 +#: ../include/svn_error_codes.h:1489 msgid "Packed data stream is corrupt" msgstr "æå æ°æ®æµæå" -#: ../include/svn_error_codes.h:1436 +#: ../include/svn_error_codes.h:1494 msgid "Additional errors:" msgstr "é¢å¤é误:" -#: ../include/svn_error_codes.h:1441 +#: ../include/svn_error_codes.h:1499 msgid "Parser error: invalid input" msgstr "解æé误: éæ³è¾å ¥" -#: ../include/svn_error_codes.h:1447 +#: ../include/svn_error_codes.h:1504 +msgid "SQLite transaction rollback failed" +msgstr "SQLite äºå¡åæ»å¤±è´¥" + +#: ../include/svn_error_codes.h:1509 +msgid "LZ4 compression failed" +msgstr "LZ4 å缩失败" + +#: ../include/svn_error_codes.h:1514 +msgid "LZ4 decompression failed" +msgstr "LZ4 解å失败" + +#: ../include/svn_error_codes.h:1519 +msgid "Could not canonicalize path or URI" +msgstr "æ æ³è§èåè·¯å¾æ URI" + +#: ../include/svn_error_codes.h:1525 msgid "Error parsing arguments" msgstr "解æåæ°åºé" -#: ../include/svn_error_codes.h:1451 +#: ../include/svn_error_codes.h:1529 msgid "Not enough arguments provided" msgstr "没ææä¾è¶³å¤çåæ°" -#: ../include/svn_error_codes.h:1455 +#: ../include/svn_error_codes.h:1533 msgid "Mutually exclusive arguments specified" msgstr "åæ°å²çª" -#: ../include/svn_error_codes.h:1459 +#: ../include/svn_error_codes.h:1537 msgid "Attempted command in administrative dir" msgstr "è¯å¾å¨ç®¡çç®å½ä¸æ§è¡å½ä»¤" -#: ../include/svn_error_codes.h:1463 +#: ../include/svn_error_codes.h:1541 msgid "The log message file is under version control" msgstr "æ¥å¿ä¿¡æ¯æä»¶è¢«çº³å ¥çæ¬æ§å¶" -#: ../include/svn_error_codes.h:1467 +#: ../include/svn_error_codes.h:1545 msgid "The log message is a pathname" msgstr "æ¥å¿ä¿¡æ¯æ¯è·¯å¾å" -#: ../include/svn_error_codes.h:1471 +#: ../include/svn_error_codes.h:1549 msgid "Committing in directory scheduled for addition" msgstr "å¨è°åº¦å¢å çç®å½ä¸è¿è¡æ交" -#: ../include/svn_error_codes.h:1475 +#: ../include/svn_error_codes.h:1553 msgid "No external editor available" -msgstr "没æå¤é¨ç¼è¾å¨å¯ç¨" +msgstr "没æå¯ç¨çå¤é¨ç¼è¾å¨" -#: ../include/svn_error_codes.h:1479 +#: ../include/svn_error_codes.h:1557 msgid "Something is wrong with the log message's contents" msgstr "æ¥å¿ä¿¡æ¯å 容ä¸å¦¥" -#: ../include/svn_error_codes.h:1483 +#: ../include/svn_error_codes.h:1561 msgid "A log message was given where none was necessary" msgstr "å¨ä¸éè¦æ¶ç»åºæ¥å¿ä¿¡æ¯" -#: ../include/svn_error_codes.h:1487 +#: ../include/svn_error_codes.h:1565 msgid "No external merge tool available" -msgstr "没æå¤é¨åå¹¶å·¥å ·å¯ç¨" +msgstr "没æå¯ç¨çå¤é¨åå¹¶å·¥å ·" -#: ../include/svn_error_codes.h:1491 +#: ../include/svn_error_codes.h:1569 msgid "Failed processing one or more externals definitions" -msgstr "å¤çä¸ä¸ªææ´å¤çå¤é¨å®ä¹å¤±è´¥" +msgstr "å¤çä¸ä¸ªææ´å¤çå¤é¨å¼ç¨å®ä¹å¤±è´¥" -#: ../include/svn_error_codes.h:1497 +#: ../include/svn_error_codes.h:1574 +msgid "Repository verification failed" +msgstr "çæ¬åºæ ¡éªå¤±è´¥" + +#: ../include/svn_error_codes.h:1580 msgid "Special code for wrapping server errors to report to client" msgstr "ç¨ä¸ç¨ä»£ç å°è£ æå¡å¨é误以便æ¥å客æ·ç«¯" -#: ../include/svn_error_codes.h:1501 +#: ../include/svn_error_codes.h:1584 msgid "Unknown svn protocol command" msgstr "æªç¥ç svn åè®®å½ä»¤" -#: ../include/svn_error_codes.h:1505 +#: ../include/svn_error_codes.h:1588 msgid "Network connection closed unexpectedly" msgstr "ç½ç»è¿æ¥æå¤å ³é" -#: ../include/svn_error_codes.h:1509 +#: ../include/svn_error_codes.h:1592 msgid "Network read/write error" msgstr "ç½ç»è¯»åé误" -#: ../include/svn_error_codes.h:1521 +#: ../include/svn_error_codes.h:1604 msgid "Client/server version mismatch" msgstr "客æ·ç«¯/æå¡å¨çæ¬ä¸å¹é " -#: ../include/svn_error_codes.h:1526 +#: ../include/svn_error_codes.h:1609 msgid "Cannot negotiate authentication mechanism" msgstr "æ æ³åå认è¯æºå¶" -#: ../include/svn_error_codes.h:1531 +#: ../include/svn_error_codes.h:1614 msgid "Editor drive was aborted" msgstr "ç¼è¾å¨ä¸æ¢" -#: ../include/svn_error_codes.h:1539 +#: ../include/svn_error_codes.h:1619 +msgid "Client request too long" +msgstr "客æ·ç«¯è¯·æ±è¿é¿" + +#: ../include/svn_error_codes.h:1624 +msgid "Server response too long" +msgstr "æå¡å¨ååºè¿é¿" + +#: ../include/svn_error_codes.h:1632 msgid "Credential data unavailable" -msgstr "æ æ³åå¾åè¯æ°æ®" +msgstr "æ æ³åå¾åæ®æ°æ®" -#: ../include/svn_error_codes.h:1543 +#: ../include/svn_error_codes.h:1636 msgid "No authentication provider available" msgstr "没æå¯ç¨ç认è¯æä¾è " -#: ../include/svn_error_codes.h:1547 +#: ../include/svn_error_codes.h:1640 msgid "All authentication providers exhausted" msgstr "ææç认è¯æä¾è é½ä¸å¯ç¨" -#: ../include/svn_error_codes.h:1551 +#: ../include/svn_error_codes.h:1644 msgid "Credentials not saved" -msgstr "没æä¿ååè¯æ°æ®" +msgstr "没æä¿ååæ®" -#: ../include/svn_error_codes.h:1556 ../libsvn_subr/gpg_agent.c:416 +#: ../include/svn_error_codes.h:1649 ../libsvn_subr/gpg_agent.c:512 msgid "Authentication failed" msgstr "认è¯å¤±è´¥" -#: ../include/svn_error_codes.h:1562 +#: ../include/svn_error_codes.h:1655 msgid "Read access denied for root of edit" msgstr "ç¼è¾æ ¹ç®å½æ¶æç»è¯»å" -#: ../include/svn_error_codes.h:1567 +#: ../include/svn_error_codes.h:1660 msgid "Item is not readable" msgstr "æ¡ç®ä¸å¯è¯»" -#: ../include/svn_error_codes.h:1572 +#: ../include/svn_error_codes.h:1665 msgid "Item is partially readable" msgstr "æ¡ç®é¨åå¯è¯»" -#: ../include/svn_error_codes.h:1576 +#: ../include/svn_error_codes.h:1669 msgid "Invalid authz configuration" msgstr "认è¯é ç½®æ æ" -#: ../include/svn_error_codes.h:1581 +#: ../include/svn_error_codes.h:1674 msgid "Item is not writable" msgstr "æ¡ç®ä¸è½å" -#: ../include/svn_error_codes.h:1588 +#: ../include/svn_error_codes.h:1681 msgid "Diff data source modified unexpectedly" msgstr "svndiff æ°æ®è¢«æå¤ä¿®æ¹" -#: ../include/svn_error_codes.h:1594 +#: ../include/svn_error_codes.h:1686 +msgid "Diff data unexpected" +msgstr "å·®å¼æ°æ®å¼å¸¸" + +#: ../include/svn_error_codes.h:1693 msgid "Initialization of SSPI library failed" msgstr "åå§å SSPI åºå¤±è´¥" -#: ../include/svn_error_codes.h:1598 +#: ../include/svn_error_codes.h:1699 msgid "Server SSL certificate untrusted" msgstr "æå¡å¨ç SSL è¯ä¹¦ä¸è¢«ä¿¡ä»»" -#: ../include/svn_error_codes.h:1603 +#: ../include/svn_error_codes.h:1704 msgid "Initialization of the GSSAPI context failed" msgstr "åå§å GSSAPI 失败" -#: ../include/svn_error_codes.h:1608 +#: ../include/svn_error_codes.h:1709 msgid "While handling serf response:" msgstr "å½å¤ç serf çååºæ¶:" -#: ../include/svn_error_codes.h:1614 +#: ../include/svn_error_codes.h:1714 +msgid "Can't read from stream" +msgstr "æ æ³è¯»åæµ" + +#: ../include/svn_error_codes.h:1720 msgid "Assertion failure" msgstr "æè¨å¤±è´¥" -#: ../include/svn_error_codes.h:1618 +#: ../include/svn_error_codes.h:1724 msgid "No non-tracing links found in the error chain" msgstr "没æåç°é误é¾ä¸çéè·è¸ªé¾æ¥" -#: ../libsvn_auth_gnome_keyring/gnome_keyring.c:152 +#: ../include/svn_error_codes.h:1732 +msgid "Unexpected end of ASN1 data" +msgstr "ASN1 æ°æ®æå¤ç»æ" + +#: ../include/svn_error_codes.h:1736 +msgid "Unexpected ASN1 tag" +msgstr "æå¤ç ASN1 æ è®°" + +#: ../include/svn_error_codes.h:1740 +msgid "Invalid ASN1 length" +msgstr "æ æç ASN1 é¿åº¦" + +#: ../include/svn_error_codes.h:1744 +msgid "ASN1 length mismatch" +msgstr "ASN1 é¿åº¦ä¸å¹é " + +#: ../include/svn_error_codes.h:1748 +msgid "Invalid ASN1 data" +msgstr "æ æç ASN1 æ°æ®" + +#: ../include/svn_error_codes.h:1752 +msgid "Unavailable X509 feature" +msgstr "ä¸å¯ç¨ç X509 ç¹æ§" + +#: ../include/svn_error_codes.h:1756 +msgid "Invalid PEM certificate" +msgstr "æ æç PEM è¯ä¹¦" + +#: ../include/svn_error_codes.h:1760 +msgid "Invalid certificate format" +msgstr "æ æçè¯ä¹¦æ ¼å¼" + +#: ../include/svn_error_codes.h:1764 +msgid "Invalid certificate version" +msgstr "æ æçè¯ä¹¦çæ¬" + +#: ../include/svn_error_codes.h:1768 +msgid "Invalid certificate serial number" +msgstr "æ æçè¯ä¹¦åºåå·" + +#: ../include/svn_error_codes.h:1772 +msgid "Found invalid algorithm in certificate" +msgstr "è¯ä¹¦ä¸åç°æ æçç®æ³" + +#: ../include/svn_error_codes.h:1776 +msgid "Found invalid name in certificate" +msgstr "è¯ä¹¦ä¸åç°æ æçå称" + +#: ../include/svn_error_codes.h:1780 +msgid "Found invalid date in certificate" +msgstr "è¯ä¹¦ä¸åç°æ æçæ¥æ" + +#: ../include/svn_error_codes.h:1784 +msgid "Found invalid public key in certificate" +msgstr "è¯ä¹¦ä¸åç°æ æçå ¬é¥" + +#: ../include/svn_error_codes.h:1788 +msgid "Found invalid signature in certificate" +msgstr "è¯ä¹¦ä¸åç°æ æçç¾å" + +#: ../include/svn_error_codes.h:1792 +msgid "Found invalid extensions in certificate" +msgstr "è¯ä¹¦ä¸åç°æ æçæ©å±" + +#: ../include/svn_error_codes.h:1796 +msgid "Unknown certificate version" +msgstr "æªç¥çè¯ä¹¦çæ¬" + +#: ../include/svn_error_codes.h:1800 +msgid "Certificate uses unknown public key algorithm" +msgstr "è¯ä¹¦ä½¿ç¨äºæªç¥çå ¬é¥ç®æ³" + +#: ../include/svn_error_codes.h:1804 +msgid "Certificate signature mismatch" +msgstr "è¯ä¹¦ç¾åä¸å¹é " + +#: ../include/svn_error_codes.h:1808 +msgid "Certificate verification failed" +msgstr "è¯ä¹¦éªè¯å¤±è´¥" + +#: ../libsvn_auth_gnome_keyring/gnome_keyring.c:296 msgid "GNOME Keyring is locked and we are non-interactive" msgstr "GNOME Keyring 被éå®ï¼å¹¶ä¸æ们å¤äºé交äºæ¹å¼" #: ../libsvn_client/add.c:609 ../libsvn_client/cmdline.c:365 -#: ../libsvn_subr/opt.c:932 +#: ../libsvn_subr/opt.c:302 #, c-format msgid "'%s' ends in a reserved name" -msgstr "â%sâ以ä¿çå称ç»æ" +msgstr "'%s'以ä¿çå称ç»æ" -#: ../libsvn_client/add.c:875 +#: ../libsvn_client/add.c:822 #, c-format msgid "'%s' prevents creating parent of '%s'" msgstr "'%s' é»æ¢å建 '%s' çç¶äº²" -#: ../libsvn_client/add.c:915 ../libsvn_wc/adm_ops.c:445 +#: ../libsvn_client/add.c:862 ../libsvn_wc/adm_ops.c:446 #, c-format msgid "'%s' is an existing item in conflict; please mark the conflict as resolved before adding a new item here" -msgstr "æ¡ç®â%sâå¤äºå²çªç¶æï¼è¯·å¨æ°å¢ä¹åæ è®°å²çªä¸ºå·²ç»è§£å³" +msgstr "æ¡ç®'%s'å¤äºå²çªç¶æï¼è¯·å¨æ°å¢ä¹åæ è®°å²çªä¸ºå·²ç»è§£å³" -#: ../libsvn_client/add.c:922 ../libsvn_wc/adm_ops.c:400 -#: ../libsvn_wc/workqueue.c:874 ../libsvn_wc/workqueue.c:968 +#: ../libsvn_client/add.c:869 ../libsvn_wc/adm_ops.c:401 +#: ../libsvn_wc/workqueue.c:908 ../libsvn_wc/workqueue.c:1002 #, c-format msgid "'%s' not found" -msgstr "æ¾ä¸å° â%sâ" +msgstr "æ¾ä¸å° '%s'" -#: ../libsvn_client/add.c:928 ../libsvn_wc/adm_ops.c:405 +#: ../libsvn_client/add.c:875 ../libsvn_wc/adm_ops.c:406 #: ../libsvn_wc/delete.c:98 #, c-format msgid "Unsupported node kind for path '%s'" -msgstr "è·¯å¾ â%sâ æä¸æ¯æçèç¹ç§ç±»" +msgstr "è·¯å¾ '%s' æä¸æ¯æçèç¹ç§ç±»" -#: ../libsvn_client/add.c:961 ../libsvn_client/changelist.c:65 -#: ../libsvn_client/changelist.c:104 ../libsvn_client/deprecated.c:3055 -#: ../libsvn_client/export.c:1394 ../libsvn_client/import.c:831 -#: ../libsvn_client/patch.c:3124 ../libsvn_client/relocate.c:153 -#: ../libsvn_client/resolved.c:119 ../libsvn_client/revert.c:139 -#: ../libsvn_client/status.c:368 ../libsvn_client/switch.c:471 -#: ../libsvn_client/update.c:701 ../libsvn_client/upgrade.c:109 -#: ../svn-bench/util.c:76 ../svn/util.c:979 +#: ../libsvn_client/add.c:908 ../libsvn_client/changelist.c:65 +#: ../libsvn_client/changelist.c:104 ../libsvn_client/deprecated.c:3271 +#: ../libsvn_client/export.c:1388 ../libsvn_client/import.c:861 +#: ../libsvn_client/patch.c:3747 ../libsvn_client/patch.c:3812 +#: ../libsvn_client/relocate.c:155 ../libsvn_client/resolved.c:160 +#: ../libsvn_client/revert.c:149 ../libsvn_client/shelf2.c:1131 +#: ../libsvn_client/status.c:445 ../libsvn_client/switch.c:477 +#: ../libsvn_client/update.c:755 ../libsvn_client/upgrade.c:119 +#: ../svn/shelf-cmd.c:1032 ../svn/shelf2-cmd.c:1032 ../svn/util.c:992 +#: ../svnbench/util.c:76 #, c-format msgid "'%s' is not a local path" -msgstr "â%sâä¸æ¯æ¬å°è·¯å¾" +msgstr "'%s'ä¸æ¯æ¬å°è·¯å¾" -#: ../libsvn_client/add.c:1002 ../libsvn_client/copy_foreign.c:491 -#: ../libsvn_wc/adm_ops.c:479 ../libsvn_wc/copy.c:784 +#: ../libsvn_client/add.c:949 ../libsvn_wc/adm_ops.c:480 +#: ../libsvn_wc/copy.c:837 #, c-format msgid "'%s' is already under version control" -msgstr "â%sâå·²çº³å ¥çæ¬æ§å¶" +msgstr "'%s'å·²çº³å ¥çæ¬æ§å¶" -#: ../libsvn_client/add.c:1135 ../libsvn_client/add.c:1162 +#: ../libsvn_client/add.c:1083 ../libsvn_client/add.c:1110 #, c-format msgid "There is no valid URI above '%s'" msgstr "å¨ '%s' çä¸çº§æ²¡æåæ³ç URI" -#: ../libsvn_client/blame.c:696 +#: ../libsvn_client/blame.c:457 ../libsvn_client/blame.c:770 #, c-format msgid "Cannot calculate blame information for binary file '%s'" -msgstr "æ æ³ä¸ºäºè¿å¶æ件 â%sâ 计ç®è¿½æº¯ä¿¡æ¯" +msgstr "æ æ³ä¸ºäºè¿å¶æ件 '%s' 计ç®è¿½æº¯ä¿¡æ¯" -#: ../libsvn_client/cat.c:77 ../libsvn_client/commit_util.c:613 -#: ../libsvn_client/delete.c:81 ../libsvn_client/prop_commands.c:837 -#: ../libsvn_client/prop_commands.c:1417 ../libsvn_client/revisions.c:105 -#: ../libsvn_wc/adm_ops.c:912 ../libsvn_wc/adm_ops.c:966 -#: ../libsvn_wc/copy.c:626 ../libsvn_wc/copy.c:687 ../libsvn_wc/entries.c:1301 -#: ../libsvn_wc/entries.c:2681 ../libsvn_wc/entries.c:2712 -#: ../svn-bench/notify.c:968 ../svn/notify.c:1026 +#: ../libsvn_client/cat.c:77 ../libsvn_client/commit_util.c:612 +#: ../libsvn_client/delete.c:81 ../libsvn_client/prop_commands.c:817 +#: ../libsvn_client/prop_commands.c:1398 ../libsvn_client/revisions.c:107 +#: ../libsvn_wc/adm_ops.c:979 ../libsvn_wc/adm_ops.c:1033 +#: ../libsvn_wc/copy.c:679 ../libsvn_wc/copy.c:740 ../libsvn_wc/entries.c:1407 +#: ../libsvn_wc/entries.c:2803 ../libsvn_wc/entries.c:2834 ../svn/notify.c:1169 +#: ../svnbench/notify.c:968 #, c-format msgid "'%s' is not under version control" -msgstr "â%sâ å°æªçº³å ¥çæ¬æ§å¶" +msgstr "'%s' å°æªçº³å ¥çæ¬æ§å¶" #: ../libsvn_client/cat.c:82 #, c-format msgid "'%s' refers to a directory" -msgstr "â%sâ å¼ç¨ä¸ä¸ªç®å½" +msgstr "'%s' å¼ç¨ä¸ä¸ªç®å½" #: ../libsvn_client/cat.c:92 #, c-format msgid "'%s' has no pristine version until it is committed" -msgstr "å¨æ交ä¹åï¼â%sâ没æåºç¡çæ¬" +msgstr "å¨æ交ä¹åï¼'%s'没æåºç¡çæ¬" -#: ../libsvn_client/cat.c:147 ../libsvn_client/export.c:390 +#: ../libsvn_client/cat.c:147 ../libsvn_client/export.c:383 msgid "(local)" msgstr "(æ¬å°)" -#: ../libsvn_client/cat.c:255 +#: ../libsvn_client/cat.c:265 #, c-format msgid "URL '%s' refers to a directory" -msgstr "URL â%sâ æåç®å½" +msgstr "URL '%s' æåç®å½" #: ../libsvn_client/changelist.c:57 msgid "Target changelist name must not be empty" msgstr "ç®æ ä¿®æ¹å表çå称ä¸è½ä¸ºç©º" -#: ../libsvn_client/checkout.c:131 ../libsvn_client/export.c:1447 -#: ../svn-bench/null-export-cmd.c:275 +#: ../libsvn_client/checkout.c:196 ../libsvn_client/export.c:1445 +#: ../svnbench/null-export-cmd.c:293 #, c-format msgid "URL '%s' doesn't exist" -msgstr "URL â%sâ ä¸åå¨" +msgstr "URL '%s' ä¸åå¨" -#: ../libsvn_client/checkout.c:135 +#: ../libsvn_client/checkout.c:200 #, c-format msgid "URL '%s' refers to a file, not a directory" -msgstr "URL â%sâ æåä¸ä¸ªæ件ï¼ä¸æ¯ç®å½" +msgstr "URL '%s' æåä¸ä¸ªæ件ï¼ä¸æ¯ç®å½" + +#: ../libsvn_client/checkout.c:238 ../libsvn_wc/adm_files.c:325 +#, c-format +msgid "'%s' is an existing working copy with different '%s' setting" +msgstr "'%s' æ¯ä¸ä¸ªå ·æä¸å '%s' 设置çç°æå·¥ä½å¯æ¬" -#: ../libsvn_client/checkout.c:173 +#: ../libsvn_client/checkout.c:253 #, c-format msgid "'%s' is already a working copy for a different URL" -msgstr "â%sâ å·²ç»æ¯æåä¸å URL çå·¥ä½å¯æ¬" +msgstr "'%s' å·²ç»æ¯æåä¸å URL çå·¥ä½å¯æ¬" + +#: ../libsvn_client/checkout.c:259 +#, c-format +msgid "'%s' is already a working copy for the same URL but its format is %d instead of the expected %d" +msgstr "'%s' å·²ç»æ¯ç¸å URL çå·¥ä½å¯æ¬ï¼ä½å ¶æ ¼å¼ä¸º %d èä¸æ¯ææç %d" -#: ../libsvn_client/checkout.c:181 +#: ../libsvn_client/checkout.c:268 #, c-format msgid "'%s' already exists and is not a directory" -msgstr "â%sâ å·²ç»åå¨å¹¶ä¸ä¸æ¯ç®å½" +msgstr "'%s' å·²ç»åå¨å¹¶ä¸ä¸æ¯ç®å½" #: ../libsvn_client/cmdline.c:104 #, c-format @@ -1495,34 +1668,29 @@ msgstr "ææéç¸å¯¹ç®æ å¿ é¡»æç #: ../libsvn_client/cmdline.c:207 #, c-format msgid "'%s' is just a peg revision. Maybe try '%s@' instead?" -msgstr "â%sâ æ¯ééçæ¬ãæè®¸ä½ åºè¯¥ä½¿ç¨ â%s@â ?" +msgstr "'%s' æ¯éå®çæ¬ãæè®¸ä½ åºè¯¥ä½¿ç¨ '%s@' ?" #: ../libsvn_client/cmdline.c:321 msgid "Resolving '^/': no repository root found in the target arguments or in the current directory" -msgstr "解æâ^/â: å¨ç®æ åæ°æå½åç®å½ä¸æ¾ä¸å°çæ¬åºçæ ¹" +msgstr "解æ'^/': å¨ç®æ åæ°æå½åç®å½ä¸æ¾ä¸å°çæ¬åºçæ ¹" -#: ../libsvn_client/commit.c:157 ../libsvn_client/copy.c:1541 +#: ../libsvn_client/commit.c:157 ../libsvn_client/copy.c:2294 msgid "Commit failed (details follow):" -msgstr "æ交失败(ç»èå¦ä¸): " +msgstr "æ交失败(ç»èå¦ä¸):" #: ../libsvn_client/commit.c:165 msgid "Commit succeeded, but other errors follow:" -msgstr "æ交æåï¼ä½æ¯åçäºå ¶å®é误ï¼ç»èå¦ä¸: " +msgstr "æ交æåï¼ä½æ¯åçäºå ¶å®é误ï¼ç»èå¦ä¸:" #: ../libsvn_client/commit.c:172 msgid "Error unlocking locked dirs (details follow):" -msgstr "解é¤éå®ç®å½åºé(ç»èå¦ä¸): " +msgstr "解é¤éå®ç®å½åºé(ç»èå¦ä¸):" #: ../libsvn_client/commit.c:183 msgid "Error bumping revisions post-commit (details follow):" -msgstr "æ§è¡ post-commit åºé (ç»èå¦ä¸): " - -#: ../libsvn_client/commit.c:551 -#, c-format -msgid "'%s' is a URL, but URLs cannot be commit targets" -msgstr "â%sâ æ¯ URLï¼ä½æ¯ URL ä¸å¯ä½ä¸ºæ交ç®æ " +msgstr "æ§è¡ post-commit åºé (ç»èå¦ä¸):" -#: ../libsvn_client/commit.c:653 +#: ../libsvn_client/commit.c:544 msgid "" "Commit can only commit to a single repository at a time.\n" "Are all targets part of the same working copy?" @@ -1530,438 +1698,2536 @@ msgstr "" "æ¯æ¬¡æ交åªè½é对ä¸ä¸ªçæ¬åºã\n" "æ¯å¦ææç®æ é½å±äºåä¸å·¥ä½å¯æ¬ï¼" -#: ../libsvn_client/commit.c:769 +#: ../libsvn_client/commit.c:677 +#, c-format +msgid "'%s' is a URL, but URLs cannot be commit targets" +msgstr "'%s' æ¯ URLï¼ä½æ¯ URL ä¸å¯ä½ä¸ºæ交ç®æ " + +#: ../libsvn_client/commit.c:821 #, c-format msgid "Cannot commit '%s' because it was moved from '%s' which is not part of the commit; both sides of the move must be committed together" msgstr "ä¸è½æ交 '%s'ï¼å 为å®æ¯èª '%s' ç§»å ¥çï¼å¹¶ä¸ä¸æ¯æ¤æ交çä¸é¨åï¼å®ä»¬å¿ é¡»åæ¶æ交" -#: ../libsvn_client/commit.c:813 +#: ../libsvn_client/commit.c:876 #, c-format msgid "Cannot commit '%s' because it was moved to '%s' which is not part of the commit; both sides of the move must be committed together" msgstr "ä¸è½æ交 '%s'ï¼å 为已ç»ç§»å° '%s'ï¼å¹¶ä¸ä¸æ¯æ¤æ交çä¸é¨åï¼å®ä»¬å¿ é¡»åæ¶æ交" -#: ../libsvn_client/commit_util.c:96 ../libsvn_repos/commit.c:167 +#: ../libsvn_client/commit_util.c:96 ../libsvn_repos/commit.c:169 #, c-format msgid "Directory '%s' is out of date" -msgstr "ç®å½ â%sâ å·²ç»è¿æ¶" +msgstr "ç®å½ '%s' å·²ç»è¿æ¶" -#: ../libsvn_client/commit_util.c:97 ../libsvn_repos/commit.c:169 +#: ../libsvn_client/commit_util.c:97 ../libsvn_repos/commit.c:171 #, c-format msgid "File '%s' is out of date" -msgstr "æ件 â%sâ å·²ç»è¿æ¶" +msgstr "æ件 '%s' å·²ç»è¿æ¶" #: ../libsvn_client/commit_util.c:133 #, c-format msgid "Directory '%s' is locked in another working copy" -msgstr "ç®å½â%sâå¨å ¶å®å·¥ä½å¯æ¬ä¸è¢«éå®" +msgstr "ç®å½'%s'å¨å ¶å®å·¥ä½å¯æ¬ä¸è¢«éå®" #: ../libsvn_client/commit_util.c:134 #, c-format msgid "File '%s' is locked in another working copy" -msgstr "æ件â%sâ å¨å ¶å®å·¥ä½å¯æ¬ä¸è¢«éå®" +msgstr "æ件'%s' å¨å ¶å®å·¥ä½å¯æ¬ä¸è¢«éå®" #: ../libsvn_client/commit_util.c:169 #, c-format msgid "Changing directory '%s' is forbidden by the server" -msgstr "æå¡å¨ç¦æ¢ä¿®æ¹ç®å½â%sâ" +msgstr "æå¡å¨ç¦æ¢ä¿®æ¹ç®å½'%s'" #: ../libsvn_client/commit_util.c:170 #, c-format msgid "Changing file '%s' is forbidden by the server" -msgstr "æå¡å¨ç¦æ¢ä¿®æ¹æ件â%sâ" +msgstr "æå¡å¨ç¦æ¢ä¿®æ¹æ件'%s'" #: ../libsvn_client/commit_util.c:318 #, c-format msgid "Aborting commit: '%s' remains in tree-conflict" -msgstr "æ交ç»æ¢: â%sâ ä»å¤äºæ å²çªç¶æ" +msgstr "æ交ç»æ¢: '%s' ä»å¤äºæ å²çªç¶æ" -#: ../libsvn_client/commit_util.c:669 +#: ../libsvn_client/commit_util.c:668 #, c-format msgid "Aborting commit: '%s' remains in conflict" -msgstr "æ交ç»æ¢: â%sâ å¤äºå²çªç¶æ" +msgstr "æ交ç»æ¢: '%s' å¤äºå²çªç¶æ" -#: ../libsvn_client/commit_util.c:688 +#: ../libsvn_client/commit_util.c:687 #, c-format msgid "Node '%s' has unexpectedly changed kind" -msgstr "èç¹ â%sâ çç±»åæå¤æ¹å" +msgstr "èç¹ '%s' çç±»åæå¤æ¹å" -#: ../libsvn_client/commit_util.c:729 +#: ../libsvn_client/commit_util.c:728 #, c-format msgid "'%s' is scheduled for addition, but is missing" -msgstr "丢失äºé¢å®å¢å çâ%sâ" +msgstr "丢失äºé¢å®å¢å ç'%s'" -#: ../libsvn_client/commit_util.c:1280 +#: ../libsvn_client/commit_util.c:1279 #, c-format msgid "'%s' is not known to exist in the repository and is not part of the commit, yet its child '%s' is part of the commit" -msgstr "â%sâ ä¸å¨çæ¬åºä¸ï¼ä¹ä¸æ¯æ交çä¸é¨åï¼ä½æ¯å®çåè·¯å¾ â%sâ æ¯æ交çä¸é¨å" +msgstr "'%s' ä¸å¨çæ¬åºä¸ï¼ä¹ä¸æ¯æ交çä¸é¨åï¼ä½æ¯å®çåè·¯å¾ '%s' æ¯æ交çä¸é¨å" -#: ../libsvn_client/commit_util.c:1419 +#: ../libsvn_client/commit_util.c:1444 #, c-format msgid "Cannot commit both '%s' and '%s' as they refer to the same URL" -msgstr "æ æ³åæ¶æ交 â%sâ ä¸ â%sâï¼å 为å®ä»¬é½æååä¸ä¸ª URL" +msgstr "æ æ³åæ¶æ交 '%s' ä¸ '%s'ï¼å 为å®ä»¬é½æååä¸ä¸ª URL" -#: ../libsvn_client/commit_util.c:1574 +#: ../libsvn_client/commit_util.c:1598 #, c-format msgid "Commit item '%s' has copy flag but no copyfrom URL" -msgstr "æäº¤é¡¹ç® â%sâ æå¤å¶æ è®°ï¼ä½æ¯æ²¡ææºå°å(copyfrom URL)" +msgstr "æäº¤é¡¹ç® '%s' æå¤å¶æ è®°ï¼ä½æ¯æ²¡ææºå°å(copyfrom URL)" -#: ../libsvn_client/commit_util.c:1579 +#: ../libsvn_client/commit_util.c:1603 #, c-format msgid "Commit item '%s' has copy flag but an invalid revision" -msgstr "æäº¤é¡¹ç® â%sâ æå¤å¶æ å¿ï¼ä½æ¯çæ¬æ æ" +msgstr "æäº¤é¡¹ç® '%s' æå¤å¶æ å¿ï¼ä½æ¯çæ¬æ æ" -#: ../libsvn_client/commit_util.c:2054 +#: ../libsvn_client/commit_util.c:2076 msgid "Standard properties can't be set explicitly as revision properties" msgstr "æ åå±æ§ä¸è½è®¾ç½®ä¸ºçæ¬å±æ§" -#: ../libsvn_client/copy.c:439 +#: ../libsvn_client/conflicts.c:735 ../libsvn_client/conflicts.c:1101 +#: ../libsvn_client/conflicts.c:1694 ../libsvn_client/conflicts.c:5004 +#: ../libsvn_client/conflicts.c:5378 ../libsvn_client/conflicts.c:5400 +#: ../libsvn_client/conflicts.c:5452 ../libsvn_client/conflicts.c:5932 +msgid "unknown author" +msgstr "æªç¥ä½è " + +#: ../libsvn_client/conflicts.c:1132 +msgid "A file containing uncommitted changes was found in the working copy." +msgstr "å·¥ä½å¯æ¬ä¸åç°å å«æªæ交修æ¹çæ件ã" + +#: ../libsvn_client/conflicts.c:1135 +msgid "A file which differs from the corresponding file on the merge source branch was found in the working copy." +msgstr "å·¥ä½å¯æ¬ä¸åç°ä¸å并æºåæ¯å¯¹åºæ件ä¸åçæ件ã" + +#: ../libsvn_client/conflicts.c:1140 +msgid "A file which already occupies this path was found in the working copy." +msgstr "å·¥ä½å¯æ¬ä¸åç°æ¤è·¯å¾å·²è¢«æ件å ç¨ã" + +#: ../libsvn_client/conflicts.c:1144 +msgid "An unversioned file was found in the working copy." +msgstr "å·¥ä½å¯æ¬ä¸åç°æªçæ¬æ§å¶çæ件ã" + +#: ../libsvn_client/conflicts.c:1148 +msgid "A deleted file was found in the working copy." +msgstr "å·¥ä½å¯æ¬ä¸åç°å·²å é¤çæ件ã" + +#: ../libsvn_client/conflicts.c:1153 +msgid "No such file was found in the working copy." +msgstr "å·¥ä½å¯æ¬ä¸æ¾ä¸å°è¯¥æ件ã" + +#. ### display deleted revision +#: ../libsvn_client/conflicts.c:1157 +msgid "" +"No such file was found in the merge target working copy.\n" +"Perhaps the file has been deleted or moved away in the repository's history?" +msgstr "" +"å¨å并ç®æ å·¥ä½å¯æ¬ä¸æ¾ä¸å°è¯¥æ件ã\n" +"ä¹è®¸è¯¥æ件å¨çæ¬åºåå²ä¸å·²è¢«å é¤æ移走ï¼" + +#. ### show more details about copies or replacements? +#: ../libsvn_client/conflicts.c:1167 +msgid "A file scheduled to be added to the repository in the next commit was found in the working copy." +msgstr "å·¥ä½å¯æ¬ä¸åç°è®¡åå¨ä¸æ¬¡æ交æ¶æ·»å å°çæ¬åºçæ件ã" + +#. The move no longer exists. +#. The move probably happened in branch history. +#. * This case cannot happen until we detect incoming +#. * moves, which we currently don't do. +#. ### find deleted/moved revision? +#: ../libsvn_client/conflicts.c:1198 ../libsvn_client/conflicts.c:1230 +msgid "The file in the working copy had been moved away at the time this conflict was recorded." +msgstr "è®°å½æ¤å²çªæ¶ï¼å·¥ä½å¯æ¬ä¸çæ件已被移走ã" + +#: ../libsvn_client/conflicts.c:1213 ../libsvn_client/conflicts.c:1246 +#, c-format +msgid "" +"The file in the working copy was moved away to\n" +"'%s'." +msgstr "" +"å·¥ä½å¯æ¬ä¸çæ件已被移走å°\n" +"'%s'ã" + +#. The move no longer exists. +#. The move probably happened in branch history. +#. * This case cannot happen until we detect incoming +#. * moves, which we currently don't do. +#. ### find deleted/moved revision? +#: ../libsvn_client/conflicts.c:1272 ../libsvn_client/conflicts.c:1304 +msgid "A file had been moved here in the working copy at the time this conflict was recorded." +msgstr "è®°å½æ¤å²çªæ¶ï¼å·¥ä½å¯æ¬ä¸ææ件被移å¨å°æ¤å¤ã" + +#: ../libsvn_client/conflicts.c:1287 ../libsvn_client/conflicts.c:1320 +#, c-format +msgid "" +"A file was moved here in the working copy from\n" +"'%s'." +msgstr "" +"å·¥ä½å¯æ¬ä¸ææ件ä»\n" +"'%s' 移å¨å°æ¤å¤ã" + +#: ../libsvn_client/conflicts.c:1356 +msgid "A directory containing uncommitted changes was found in the working copy." +msgstr "å·¥ä½å¯æ¬ä¸åç°å å«æªæ交修æ¹çç®å½ã" + +#: ../libsvn_client/conflicts.c:1359 +msgid "A directory which differs from the corresponding directory on the merge source branch was found in the working copy." +msgstr "å·¥ä½å¯æ¬ä¸åç°ä¸å并æºåæ¯å¯¹åºç®å½ä¸åçç®å½ã" + +#: ../libsvn_client/conflicts.c:1364 +msgid "A directory which already occupies this path was found in the working copy." +msgstr "å·¥ä½å¯æ¬ä¸åç°æ¤è·¯å¾å·²è¢«ç®å½å ç¨ã" + +#: ../libsvn_client/conflicts.c:1368 +msgid "An unversioned directory was found in the working copy." +msgstr "å·¥ä½å¯æ¬ä¸åç°æªçæ¬æ§å¶çç®å½ã" + +#: ../libsvn_client/conflicts.c:1372 +msgid "A deleted directory was found in the working copy." +msgstr "å·¥ä½å¯æ¬ä¸åç°å·²å é¤çç®å½ã" + +#: ../libsvn_client/conflicts.c:1378 +msgid "No such directory was found in the working copy." +msgstr "å·¥ä½å¯æ¬ä¸æ¾ä¸å°è¯¥ç®å½ã" + +#. ### display deleted revision +#: ../libsvn_client/conflicts.c:1382 +msgid "" +"No such directory was found in the merge target working copy.\n" +"Perhaps the directory has been deleted or moved away in the repository's history?" +msgstr "" +"å¨å并ç®æ å·¥ä½å¯æ¬ä¸æ¾ä¸å°è¯¥ç®å½ã\n" +"ä¹è®¸è¯¥ç®å½å¨çæ¬åºåå²ä¸å·²è¢«å é¤æ移走ï¼" + +#. ### show more details about copies or replacements? +#: ../libsvn_client/conflicts.c:1392 +msgid "A directory scheduled to be added to the repository in the next commit was found in the working copy." +msgstr "å·¥ä½å¯æ¬ä¸åç°è®¡åå¨ä¸æ¬¡æ交æ¶æ·»å å°çæ¬åºçç®å½ã" + +#. The move no longer exists. +#: ../libsvn_client/conflicts.c:1424 +msgid "The directory in the working copy had been moved away at the time this conflict was recorded." +msgstr "è®°å½æ¤å²çªæ¶ï¼å·¥ä½å¯æ¬ä¸çç®å½å·²è¢«ç§»èµ°ã" + +#: ../libsvn_client/conflicts.c:1439 +#, c-format +msgid "" +"The directory in the working copy was moved away to\n" +"'%s'." +msgstr "" +"å·¥ä½å¯æ¬ä¸çç®å½å·²è¢«ç§»èµ°å°\n" +"'%s'ã" + +#. The move probably happened in branch history. +#. * This case cannot happen until we detect incoming +#. * moves, which we currently don't do. +#. ### find deleted/moved revision? +#: ../libsvn_client/conflicts.c:1456 +msgid "The directory had been moved away at the time this conflict was recorded." +msgstr "è®°å½æ¤å²çªæ¶ï¼è¯¥ç®å½å·²è¢«ç§»èµ°ã" + +#: ../libsvn_client/conflicts.c:1472 +#, c-format +msgid "" +"The directory was moved away to\n" +"'%s'." +msgstr "" +"该ç®å½è¢«ç§»èµ°å°\n" +"'%s'ã" + +#. The move no longer exists. +#. The move probably happened in branch history. +#. * This case cannot happen until we detect incoming +#. * moves, which we currently don't do. +#. ### find deleted/moved revision? +#: ../libsvn_client/conflicts.c:1498 ../libsvn_client/conflicts.c:1530 +msgid "A directory had been moved here at the time this conflict was recorded." +msgstr "è®°å½æ¤å²çªæ¶ï¼æç®å½è¢«ç§»å¨å°æ¤å¤ã" + +#: ../libsvn_client/conflicts.c:1513 +#, c-format +msgid "" +"A directory was moved here from\n" +"'%s'." +msgstr "" +"æç®å½ä»\n" +"'%s' 移å¨å°æ¤å¤ã" + +#: ../libsvn_client/conflicts.c:1546 +#, c-format +msgid "" +"A directory was moved here in the working copy from\n" +"'%s'." +msgstr "" +"å·¥ä½å¯æ¬ä¸æç®å½ä»\n" +"'%s' 移å¨å°æ¤å¤ã" + +#: ../libsvn_client/conflicts.c:3131 +msgid "An item containing uncommitted changes was found in the working copy." +msgstr "å·¥ä½å¯æ¬ä¸åç°å å«æªæ交修æ¹ç项ç®ã" + +#: ../libsvn_client/conflicts.c:3135 +msgid "An item which already occupies this path was found in the working copy." +msgstr "å·¥ä½å¯æ¬ä¸åç°æ¤è·¯å¾å·²è¢«é¡¹ç®å ç¨ã" + +#: ../libsvn_client/conflicts.c:3139 +msgid "A deleted item was found in the working copy." +msgstr "å·¥ä½å¯æ¬ä¸åç°å·²å é¤ç项ç®ã" + +#: ../libsvn_client/conflicts.c:3144 +msgid "No such file or directory was found in the working copy." +msgstr "å·¥ä½å¯æ¬ä¸æ¾ä¸å°è¯¥æ件æç®å½ã" + +#. ### display deleted revision +#: ../libsvn_client/conflicts.c:3149 +msgid "" +"No such file or directory was found in the merge target working copy.\n" +"The item may have been deleted or moved away in the repository's history." +msgstr "" +"å¨å并ç®æ å·¥ä½å¯æ¬ä¸æ¾ä¸å°è¯¥æ件æç®å½ã\n" +"该项ç®å¯è½å¨çæ¬åºåå²ä¸å·²è¢«å é¤æ移走ã" + +#: ../libsvn_client/conflicts.c:3156 +msgid "An unversioned item was found in the working copy." +msgstr "å·¥ä½å¯æ¬ä¸åç°æªçæ¬æ§å¶ç项ç®ã" + +#: ../libsvn_client/conflicts.c:3161 +msgid "An item scheduled to be added to the repository in the next commit was found in the working copy." +msgstr "å·¥ä½å¯æ¬ä¸åç°è®¡åå¨ä¸æ¬¡æ交æ¶æ·»å å°çæ¬åºç项ç®ã" + +#: ../libsvn_client/conflicts.c:3166 +msgid "The item in the working copy had been moved away at the time this conflict was recorded." +msgstr "è®°å½æ¤å²çªæ¶ï¼å·¥ä½å¯æ¬ä¸ç项ç®å·²è¢«ç§»èµ°ã" + +#: ../libsvn_client/conflicts.c:3170 +msgid "An item had been moved here in the working copy at the time this conflict was recorded." +msgstr "è®°å½æ¤å²çªæ¶ï¼å·¥ä½å¯æ¬ä¸æ项ç®è¢«ç§»å¨å°æ¤å¤ã" + +#: ../libsvn_client/conflicts.c:3198 +#, c-format +msgid "" +"%s\n" +"And then moved away to '^/%s' by %s in r%ld." +msgstr "" +"%s\n" +"ç¶åè¢«ç§»èµ°å° '^/%s'ï¼ç± %s å¨ r%ldã" + +#: ../libsvn_client/conflicts.c:3263 +msgid "No such file or directory was found in the merge target working copy.\n" +msgstr "å¨å并ç®æ å·¥ä½å¯æ¬ä¸æ¾ä¸å°è¯¥æ件æç®å½ã\n" + +#: ../libsvn_client/conflicts.c:3272 +#, c-format +msgid "%sThe file was moved to '^/%s' in r%ld by %s." +msgstr "%sæ件被移å¨å° '^/%s'ï¼å¨ r%ld ç± %sã" + +#: ../libsvn_client/conflicts.c:3278 +#, c-format +msgid "%sThe directory was moved to '^/%s' in r%ld by %s." +msgstr "%sç®å½è¢«ç§»å¨å° '^/%s'ï¼å¨ r%ld ç± %sã" + +#: ../libsvn_client/conflicts.c:3285 +#, c-format +msgid "%sThe item was moved to '^/%s' in r%ld by %s." +msgstr "%s项ç®è¢«ç§»å¨å° '^/%s'ï¼å¨ r%ld ç± %sã" + +#: ../libsvn_client/conflicts.c:3301 +#, c-format +msgid "%sThe file '^/%s' was moved to '^/%s' in r%ld by %s." +msgstr "%sæ件 '^/%s' 被移å¨å° '^/%s'ï¼å¨ r%ld ç± %sã" + +#: ../libsvn_client/conflicts.c:3309 +#, c-format +msgid "%sThe directory '^/%s' was moved to '^/%s' in r%ld by %s." +msgstr "%sç®å½ '^/%s' 被移å¨å° '^/%s'ï¼å¨ r%ld ç± %sã" + +#: ../libsvn_client/conflicts.c:3317 +#, c-format +msgid "%sThe item '^/%s' was moved to '^/%s' in r%ld by %s." +msgstr "%sé¡¹ç® '^/%s' 被移å¨å° '^/%s'ï¼å¨ r%ld ç± %sã" + +#: ../libsvn_client/conflicts.c:3331 +#, c-format +msgid "" +"No such file or directory was found in the merge target working copy.\n" +"'^/%s' was deleted in r%ld by %s." +msgstr "" +"å¨å并ç®æ å·¥ä½å¯æ¬ä¸æ¾ä¸å°è¯¥æ件æç®å½ã\n" +"'^/%s' å¨ r%ld ç± %s å é¤ã" + +#: ../libsvn_client/conflicts.c:3355 +msgid "An update operation tried to edit a file." +msgstr "æ´æ°æä½è¯å¾ç¼è¾æ件ã" + +#: ../libsvn_client/conflicts.c:3357 +msgid "An update operation tried to add a file." +msgstr "æ´æ°æä½è¯å¾æ·»å æ件ã" + +#: ../libsvn_client/conflicts.c:3359 +msgid "An update operation tried to delete or move a file." +msgstr "æ´æ°æä½è¯å¾å é¤æ移å¨æ件ã" + +#: ../libsvn_client/conflicts.c:3362 +msgid "An update operation tried to replace a file." +msgstr "æ´æ°æä½è¯å¾æ¿æ¢æ件ã" + +#: ../libsvn_client/conflicts.c:3370 +msgid "A switch operation tried to edit a file." +msgstr "åæ¢æä½è¯å¾ç¼è¾æ件ã" + +#: ../libsvn_client/conflicts.c:3372 +msgid "A switch operation tried to add a file." +msgstr "åæ¢æä½è¯å¾æ·»å æ件ã" + +#: ../libsvn_client/conflicts.c:3374 +msgid "A switch operation tried to delete or move a file." +msgstr "åæ¢æä½è¯å¾å é¤æ移å¨æ件ã" + +#: ../libsvn_client/conflicts.c:3377 +msgid "A switch operation tried to replace a file." +msgstr "åæ¢æä½è¯å¾æ¿æ¢æ件ã" + +#: ../libsvn_client/conflicts.c:3385 +msgid "A merge operation tried to edit a file." +msgstr "å并æä½è¯å¾ç¼è¾æ件ã" + +#: ../libsvn_client/conflicts.c:3387 +msgid "A merge operation tried to add a file." +msgstr "å并æä½è¯å¾æ·»å æ件ã" + +#: ../libsvn_client/conflicts.c:3389 +msgid "A merge operation tried to delete or move a file." +msgstr "å并æä½è¯å¾å é¤æ移å¨æ件ã" + +#: ../libsvn_client/conflicts.c:3392 +msgid "A merge operation tried to replace a file." +msgstr "å并æä½è¯å¾æ¿æ¢æ件ã" + +#: ../libsvn_client/conflicts.c:3402 +msgid "An update operation tried to change a directory." +msgstr "æ´æ°æä½è¯å¾ä¿®æ¹ç®å½ã" + +#: ../libsvn_client/conflicts.c:3404 +msgid "An update operation tried to add a directory." +msgstr "æ´æ°æä½è¯å¾æ·»å ç®å½ã" + +#: ../libsvn_client/conflicts.c:3406 +msgid "An update operation tried to delete or move a directory." +msgstr "æ´æ°æä½è¯å¾å é¤æ移å¨ç®å½ã" + +#: ../libsvn_client/conflicts.c:3409 +msgid "An update operation tried to replace a directory." +msgstr "æ´æ°æä½è¯å¾æ¿æ¢ç®å½ã" + +#: ../libsvn_client/conflicts.c:3417 +msgid "A switch operation tried to edit a directory." +msgstr "åæ¢æä½è¯å¾ç¼è¾ç®å½ã" + +#: ../libsvn_client/conflicts.c:3419 +msgid "A switch operation tried to add a directory." +msgstr "åæ¢æä½è¯å¾æ·»å ç®å½ã" + +#: ../libsvn_client/conflicts.c:3421 +msgid "A switch operation tried to delete or move a directory." +msgstr "åæ¢æä½è¯å¾å é¤æ移å¨ç®å½ã" + +#: ../libsvn_client/conflicts.c:3424 +msgid "A switch operation tried to replace a directory." +msgstr "åæ¢æä½è¯å¾æ¿æ¢ç®å½ã" + +#: ../libsvn_client/conflicts.c:3432 +msgid "A merge operation tried to edit a directory." +msgstr "å并æä½è¯å¾ç¼è¾ç®å½ã" + +#: ../libsvn_client/conflicts.c:3434 +msgid "A merge operation tried to add a directory." +msgstr "å并æä½è¯å¾æ·»å ç®å½ã" + +#: ../libsvn_client/conflicts.c:3436 +msgid "A merge operation tried to delete or move a directory." +msgstr "å并æä½è¯å¾å é¤æ移å¨ç®å½ã" + +#: ../libsvn_client/conflicts.c:3439 +msgid "A merge operation tried to replace a directory." +msgstr "å并æä½è¯å¾æ¿æ¢ç®å½ã" + +#: ../libsvn_client/conflicts.c:3450 +msgid "An update operation tried to edit an item." +msgstr "æ´æ°æä½è¯å¾ç¼è¾é¡¹ç®ã" + +#: ../libsvn_client/conflicts.c:3452 +msgid "An update operation tried to add an item." +msgstr "æ´æ°æä½è¯å¾æ·»å 项ç®ã" + +#: ../libsvn_client/conflicts.c:3454 +msgid "An update operation tried to delete or move an item." +msgstr "æ´æ°æä½è¯å¾å é¤æ移å¨é¡¹ç®ã" + +#: ../libsvn_client/conflicts.c:3457 +msgid "An update operation tried to replace an item." +msgstr "æ´æ°æä½è¯å¾æ¿æ¢é¡¹ç®ã" + +#: ../libsvn_client/conflicts.c:3465 +msgid "A switch operation tried to edit an item." +msgstr "åæ¢æä½è¯å¾ç¼è¾é¡¹ç®ã" + +#: ../libsvn_client/conflicts.c:3467 +msgid "A switch operation tried to add an item." +msgstr "åæ¢æä½è¯å¾æ·»å 项ç®ã" + +#: ../libsvn_client/conflicts.c:3469 +msgid "A switch operation tried to delete or move an item." +msgstr "åæ¢æä½è¯å¾å é¤æ移å¨é¡¹ç®ã" + +#: ../libsvn_client/conflicts.c:3472 +msgid "A switch operation tried to replace an item." +msgstr "åæ¢æä½è¯å¾æ¿æ¢é¡¹ç®ã" + +#: ../libsvn_client/conflicts.c:3480 +msgid "A merge operation tried to edit an item." +msgstr "å并æä½è¯å¾ç¼è¾é¡¹ç®ã" + +#: ../libsvn_client/conflicts.c:3482 +msgid "A merge operation tried to add an item." +msgstr "å并æä½è¯å¾æ·»å 项ç®ã" + +#: ../libsvn_client/conflicts.c:3484 +msgid "A merge operation tried to delete or move an item." +msgstr "å并æä½è¯å¾å é¤æ移å¨é¡¹ç®ã" + +#: ../libsvn_client/conflicts.c:3487 +msgid "A merge operation tried to replace an item." +msgstr "å并æä½è¯å¾æ¿æ¢é¡¹ç®ã" + +#: ../libsvn_client/conflicts.c:3503 ../svn/cl-conflicts.c:212 +msgid "upon update" +msgstr "å¨æ´æ°æ¶" + +#: ../libsvn_client/conflicts.c:3504 ../svn/cl-conflicts.c:213 +msgid "upon switch" +msgstr "å¨åæ¢æ¶" + +#: ../libsvn_client/conflicts.c:3505 ../svn/cl-conflicts.c:214 +msgid "upon merge" +msgstr "å¨å并æ¶" + +#: ../libsvn_client/conflicts.c:3506 ../svn/cl-conflicts.c:215 +msgid "upon none" +msgstr "æ " + +#: ../libsvn_client/conflicts.c:3525 ../svn/cl-conflicts.c:127 +#: ../svn/cl-conflicts.c:234 +msgid "local edit" +msgstr "æ¬å°ç¼è¾" + +#: ../libsvn_client/conflicts.c:3528 ../svn/cl-conflicts.c:140 +#: ../svn/cl-conflicts.c:237 +msgid "local add" +msgstr "æ¬å°æ·»å " + +#: ../libsvn_client/conflicts.c:3531 ../svn/cl-conflicts.c:131 +#: ../svn/cl-conflicts.c:240 +msgid "local delete" +msgstr "æ¬å°å é¤" + +#: ../libsvn_client/conflicts.c:3534 ../svn/cl-conflicts.c:129 +#: ../svn/cl-conflicts.c:243 +msgid "local obstruction" +msgstr "æ¬å°éç¢" + +#: ../libsvn_client/conflicts.c:3538 ../svn/cl-conflicts.c:247 +#, c-format +msgid "local %s" +msgstr "æ¬å° %s" + +#: ../libsvn_client/conflicts.c:3547 ../svn/cl-conflicts.c:192 +#: ../svn/cl-conflicts.c:256 +msgid "incoming edit" +msgstr "ä¼ å ¥çç¼è¾" + +#: ../libsvn_client/conflicts.c:3550 ../svn/cl-conflicts.c:194 +#: ../svn/cl-conflicts.c:259 +msgid "incoming add" +msgstr "ä¼ å ¥çå¢å " + +#: ../libsvn_client/conflicts.c:3553 ../svn/cl-conflicts.c:262 +msgid "incoming delete" +msgstr "ä¼ å ¥çå é¤" + +#: ../libsvn_client/conflicts.c:3557 ../svn/cl-conflicts.c:266 +#, c-format +msgid "incoming %s" +msgstr "ä¼ å ¥ç %s" + +#: ../libsvn_client/conflicts.c:3565 ../svn/cl-conflicts.c:273 +#: ../svn/cl-conflicts.c:326 +#, c-format +msgid "%s, %s %s" +msgstr "%s, %s %s" + +#: ../libsvn_client/conflicts.c:3624 +#, c-format +msgid "incoming %s %s" +msgstr "ä¼ å ¥ %s %s" + +#: ../libsvn_client/conflicts.c:3727 +#, c-format +msgid "Directory updated from r%ld to r%ld was replaced with a file by %s in r%ld." +msgstr "ä» r%ld æ´æ°å° r%ld çç®å½ç± %s å¨ r%ld æ¿æ¢ä¸ºæ件ã" + +#: ../libsvn_client/conflicts.c:3738 ../libsvn_client/conflicts.c:3818 +#: ../libsvn_client/conflicts.c:4072 ../libsvn_client/conflicts.c:4159 +#: ../libsvn_client/conflicts.c:4459 ../libsvn_client/conflicts.c:4527 +#, c-format +msgid "" +"%s\n" +"The replaced directory was moved to '^/%s'." +msgstr "" +"%s\n" +"被æ¿æ¢çç®å½å·²ç§»å¨å° '^/%s'ã" + +#: ../libsvn_client/conflicts.c:3753 +#, c-format +msgid "File updated from r%ld to r%ld was replaced with a file from another line of history by %s in r%ld." +msgstr "ä» r%ld æ´æ°å° r%ld çæä»¶ç± %s å¨ r%ld æ¿æ¢ä¸ºå¦ä¸åå²çº¿çæ件ã" + +#: ../libsvn_client/conflicts.c:3765 ../libsvn_client/conflicts.c:3844 +#: ../libsvn_client/conflicts.c:4101 ../libsvn_client/conflicts.c:4187 +#: ../libsvn_client/conflicts.c:4488 ../libsvn_client/conflicts.c:4555 +#, c-format +msgid "" +"%s\n" +"The replaced file was moved to '^/%s'." +msgstr "" +"%s\n" +"被æ¿æ¢çæ件已移å¨å° '^/%s'ã" + +#: ../libsvn_client/conflicts.c:3779 +#, c-format +msgid "Item updated from r%ld to r%ld was replaced with a file by %s in r%ld." +msgstr "ä» r%ld æ´æ°å° r%ld ç项ç®ç± %s å¨ r%ld æ¿æ¢ä¸ºæ件ã" + +#: ../libsvn_client/conflicts.c:3789 ../libsvn_client/conflicts.c:3868 +#: ../libsvn_client/conflicts.c:4128 ../libsvn_client/conflicts.c:4214 +#: ../libsvn_client/conflicts.c:4582 +#, c-format +msgid "" +"%s\n" +"The replaced item was moved to '^/%s'." +msgstr "" +"%s\n" +"被æ¿æ¢ç项ç®å·²ç§»å¨å° '^/%s'ã" + +#: ../libsvn_client/conflicts.c:3806 +#, c-format +msgid "Directory updated from r%ld to r%ld was replaced with a directory from another line of history by %s in r%ld." +msgstr "ä» r%ld æ´æ°å° r%ld çç®å½ç± %s å¨ r%ld æ¿æ¢ä¸ºå¦ä¸åå²çº¿çç®å½ã" + +#: ../libsvn_client/conflicts.c:3833 +#, c-format +msgid "File updated from r%ld to r%ld was replaced with a directory by %s in r%ld." +msgstr "ä» r%ld æ´æ°å° r%ld çæä»¶ç± %s å¨ r%ld æ¿æ¢ä¸ºç®å½ã" + +#: ../libsvn_client/conflicts.c:3858 +#, c-format +msgid "Item updated from r%ld to r%ld was replaced by %s in r%ld." +msgstr "ä» r%ld æ´æ°å° r%ld ç项ç®ç± %s å¨ r%ld æ¿æ¢ã" + +#: ../libsvn_client/conflicts.c:3891 +#, c-format +msgid "Directory updated from r%ld to r%ld was moved to '^/%s' by %s in r%ld." +msgstr "ä» r%ld æ´æ°å° r%ld çç®å½è¢«ç§»å¨å° '^/%s'ï¼ç± %s å¨ r%ldã" + +#: ../libsvn_client/conflicts.c:3903 +#, c-format +msgid "Directory updated from r%ld to r%ld was deleted by %s in r%ld." +msgstr "ä» r%ld æ´æ°å° r%ld çç®å½ç± %s å¨ r%ld å é¤ã" + +#: ../libsvn_client/conflicts.c:3919 +#, c-format +msgid "File updated from r%ld to r%ld was moved to '^/%s' by %s in r%ld." +msgstr "ä» r%ld æ´æ°å° r%ld çæ件被移å¨å° '^/%s'ï¼ç± %s å¨ r%ldã" + +#: ../libsvn_client/conflicts.c:3930 +#, c-format +msgid "File updated from r%ld to r%ld was deleted by %s in r%ld." +msgstr "ä» r%ld æ´æ°å° r%ld çæä»¶ç± %s å¨ r%ld å é¤ã" + +#: ../libsvn_client/conflicts.c:3944 +#, c-format +msgid "Item updated from r%ld to r%ld was moved to '^/%s' by %s in r%ld." +msgstr "ä» r%ld æ´æ°å° r%ld ç项ç®è¢«ç§»å¨å° '^/%s'ï¼ç± %s å¨ r%ldã" + +#: ../libsvn_client/conflicts.c:3955 +#, c-format +msgid "Item updated from r%ld to r%ld was deleted by %s in r%ld." +msgstr "ä» r%ld æ´æ°å° r%ld ç项ç®ç± %s å¨ r%ld å é¤ã" + +#: ../libsvn_client/conflicts.c:3975 +#, c-format +msgid "Directory updated backwards from r%ld to r%ld was a file before the replacement made by %s in r%ld." +msgstr "ä» r%ld ååæ´æ°å° r%ld çç®å½å¨ %s äº r%ld æ¿æ¢åæ¯æ件ã" + +#: ../libsvn_client/conflicts.c:3982 +#, c-format +msgid "File updated backwards from r%ld to r%ld was a file from another line of history before the replacement made by %s in r%ld." +msgstr "ä» r%ld ååæ´æ°å° r%ld çæä»¶å¨ %s äº r%ld æ¿æ¢åæ¯å¦ä¸åå²çº¿çæ件ã" + +#: ../libsvn_client/conflicts.c:3989 +#, c-format +msgid "Item updated backwards from r%ld to r%ld was replaced with a file by %s in r%ld." +msgstr "ä» r%ld ååæ´æ°å° r%ld ç项ç®ç± %s å¨ r%ld æ¿æ¢ä¸ºæ件ã" + +#: ../libsvn_client/conflicts.c:3998 +#, c-format +msgid "Directory updated backwards from r%ld to r%ld was a directory from another line of history before the replacement made by %s in r%ld." +msgstr "ä» r%ld ååæ´æ°å° r%ld çç®å½å¨ %s äº r%ld æ¿æ¢åæ¯å¦ä¸åå²çº¿çç®å½ã" + +#: ../libsvn_client/conflicts.c:4006 +#, c-format +msgid "File updated backwards from r%ld to r%ld was a directory before the replacement made by %s in r%ld." +msgstr "ä» r%ld ååæ´æ°å° r%ld çæä»¶å¨ %s äº r%ld æ¿æ¢åæ¯ç®å½ã" + +#: ../libsvn_client/conflicts.c:4012 +#, c-format +msgid "Item updated backwards from r%ld to r%ld was replaced with a directory by %s in r%ld." +msgstr "ä» r%ld ååæ´æ°å° r%ld ç项ç®ç± %s å¨ r%ld æ¿æ¢ä¸ºç®å½ã" + +#: ../libsvn_client/conflicts.c:4021 +#, c-format +msgid "Directory updated backwards from r%ld to r%ld did not exist before it was added by %s in r%ld." +msgstr "ä» r%ld ååæ´æ°å° r%ld çç®å½å¨ %s äº r%ld æ·»å åä¸åå¨ã" + +#: ../libsvn_client/conflicts.c:4028 +#, c-format +msgid "File updated backwards from r%ld to r%ld did not exist before it was added by %s in r%ld." +msgstr "ä» r%ld ååæ´æ°å° r%ld çæä»¶å¨ %s äº r%ld æ·»å åä¸åå¨ã" + +#: ../libsvn_client/conflicts.c:4034 +#, c-format +msgid "Item updated backwards from r%ld to r%ld did not exist before it was added by %s in r%ld." +msgstr "ä» r%ld ååæ´æ°å° r%ld ç项ç®å¨ %s äº r%ld æ·»å åä¸åå¨ã" + +#: ../libsvn_client/conflicts.c:4059 +#, c-format +msgid "" +"Directory switched from\n" +"'^/%s@%ld'\n" +"to\n" +"'^/%s@%ld'\n" +"was replaced with a file by %s in r%ld." +msgstr "" +"ä»\n" +"'^/%s@%ld'\n" +"åæ¢å°\n" +"'^/%s@%ld'\n" +"çç®å½ç± %s å¨ r%ld æ¿æ¢ä¸ºæ件ã" + +#: ../libsvn_client/conflicts.c:4087 +#, c-format +msgid "" +"File switched from\n" +"'^/%s@%ld'\n" +"to\n" +"'^/%s@%ld'\n" +"was replaced with a file from another line of history by %s in r%ld." +msgstr "" +"ä»\n" +"'^/%s@%ld'\n" +"åæ¢å°\n" +"'^/%s@%ld'\n" +"çæä»¶ç± %s å¨ r%ld æ¿æ¢ä¸ºå¦ä¸åå²çº¿çæ件ã" + +#: ../libsvn_client/conflicts.c:4115 ../libsvn_client/conflicts.c:4358 +#, c-format +msgid "" +"Item switched from\n" +"'^/%s@%ld'\n" +"to\n" +"'^/%s@%ld'\n" +"was replaced with a file by %s in r%ld." +msgstr "" +"ä»\n" +"'^/%s@%ld'\n" +"åæ¢å°\n" +"'^/%s@%ld'\n" +"ç项ç®ç± %s å¨ r%ld æ¿æ¢ä¸ºæ件ã" + +#: ../libsvn_client/conflicts.c:4145 +#, c-format +msgid "" +"Directory switched from\n" +"'^/%s@%ld'\n" +"to\n" +"'^/%s@%ld'\n" +"was replaced with a directory from another line of history by %s in r%ld." +msgstr "" +"ä»\n" +"'^/%s@%ld'\n" +"åæ¢å°\n" +"'^/%s@%ld'\n" +"çç®å½ç± %s å¨ r%ld æ¿æ¢ä¸ºå¦ä¸åå²çº¿çç®å½ã" + +#: ../libsvn_client/conflicts.c:4174 +#, c-format +msgid "" +"File switched from\n" +"'^/%s@%ld'\n" +"to\n" +"'^/%s@%ld'\n" +"was replaced with a directory by %s in r%ld." +msgstr "" +"ä»\n" +"'^/%s@%ld'\n" +"åæ¢å°\n" +"'^/%s@%ld'\n" +"çæä»¶ç± %s å¨ r%ld æ¿æ¢ä¸ºç®å½ã" + +#: ../libsvn_client/conflicts.c:4201 ../libsvn_client/conflicts.c:4388 +#, c-format +msgid "" +"Item switched from\n" +"'^/%s@%ld'\n" +"to\n" +"'^/%s@%ld'\n" +"was replaced with a directory by %s in r%ld." +msgstr "" +"ä»\n" +"'^/%s@%ld'\n" +"åæ¢å°\n" +"'^/%s@%ld'\n" +"ç项ç®ç± %s å¨ r%ld æ¿æ¢ä¸ºç®å½ã" + +#: ../libsvn_client/conflicts.c:4237 +#, c-format +msgid "" +"Directory switched from\n" +"'^/%s@%ld'\n" +"to\n" +"'^/%s@%ld'\n" +"was moved to '^/%s' by %s in r%ld." +msgstr "" +"ä»\n" +"'^/%s@%ld'\n" +"åæ¢å°\n" +"'^/%s@%ld'\n" +"çç®å½è¢«ç§»å¨å° '^/%s'ï¼ç± %s å¨ r%ldã" + +#: ../libsvn_client/conflicts.c:4251 +#, c-format +msgid "" +"Directory switched from\n" +"'^/%s@%ld'\n" +"to\n" +"'^/%s@%ld'\n" +"was deleted by %s in r%ld." +msgstr "" +"ä»\n" +"'^/%s@%ld'\n" +"åæ¢å°\n" +"'^/%s@%ld'\n" +"çç®å½ç± %s å¨ r%ld å é¤ã" + +#: ../libsvn_client/conflicts.c:4269 +#, c-format +msgid "" +"File switched from\n" +"'^/%s@%ld'\n" +"to\n" +"'^/%s@%ld'\n" +"was moved to '^/%s' by %s in r%ld." +msgstr "" +"ä»\n" +"'^/%s@%ld'\n" +"åæ¢å°\n" +"'^/%s@%ld'\n" +"çæ件被移å¨å° '^/%s'ï¼ç± %s å¨ r%ldã" + +#: ../libsvn_client/conflicts.c:4283 +#, c-format +msgid "" +"File switched from\n" +"'^/%s@%ld'\n" +"to\n" +"'^/%s@%ld'\n" +"was deleted by %s in r%ld." +msgstr "" +"ä»\n" +"'^/%s@%ld'\n" +"åæ¢å°\n" +"'^/%s@%ld'\n" +"çæä»¶ç± %s å¨ r%ld å é¤ã" + +#: ../libsvn_client/conflicts.c:4300 +#, c-format +msgid "" +"Item switched from\n" +"'^/%s@%ld'\n" +"to\n" +"'^/%s@%ld'\n" +"was moved to '^/%s' by %s in r%ld." +msgstr "" +"ä»\n" +"'^/%s@%ld'\n" +"åæ¢å°\n" +"'^/%s@%ld'\n" +"ç项ç®è¢«ç§»å¨å° '^/%s'ï¼ç± %s å¨ r%ldã" + +#: ../libsvn_client/conflicts.c:4314 +#, c-format +msgid "" +"Item switched from\n" +"'^/%s@%ld'\n" +"to\n" +"'^/%s@%ld'\n" +"was deleted by %s in r%ld." +msgstr "" +"ä»\n" +"'^/%s@%ld'\n" +"åæ¢å°\n" +"'^/%s@%ld'\n" +"ç项ç®ç± %s å¨ r%ld å é¤ã" + +#: ../libsvn_client/conflicts.c:4339 ../libsvn_client/conflicts.c:4379 +#, c-format +msgid "" +"Directory switched from\n" +"'^/%s@%ld'\n" +"to\n" +"'^/%s@%ld'\n" +"was a file before the replacement made by %s in r%ld." +msgstr "" +"ä»\n" +"'^/%s@%ld'\n" +"åæ¢å°\n" +"'^/%s@%ld'\n" +"çç®å½å¨ %s äº r%ld æ¿æ¢åæ¯æ件ã" + +#: ../libsvn_client/conflicts.c:4349 +#, c-format +msgid "" +"File switched from\n" +"'^/%s@%ld'\n" +"to\n" +"'^/%s@%ld'\n" +"was a file from another line of history before the replacement made by %s in r%ld." +msgstr "" +"ä»\n" +"'^/%s@%ld'\n" +"åæ¢å°\n" +"'^/%s@%ld'\n" +"çæä»¶å¨ %s äº r%ld æ¿æ¢åæ¯å¦ä¸åå²çº¿çæ件ã" + +#: ../libsvn_client/conflicts.c:4369 +#, c-format +msgid "" +"Directory switched from\n" +"'^/%s@%ld'\n" +"to\n" +"'^/%s@%ld'\n" +"was a directory from another line of history before the replacement made by %s in r%ld." +msgstr "" +"ä»\n" +"'^/%s@%ld'\n" +"åæ¢å°\n" +"'^/%s@%ld'\n" +"çç®å½å¨ %s äº r%ld æ¿æ¢åæ¯å¦ä¸åå²çº¿çç®å½ã" + +#: ../libsvn_client/conflicts.c:4399 +#, c-format +msgid "" +"Directory switched from\n" +"'^/%s@%ld'\n" +"to\n" +"'^/%s@%ld'\n" +"did not exist before it was added by %s in r%ld." +msgstr "" +"ä»\n" +"'^/%s@%ld'\n" +"åæ¢å°\n" +"'^/%s@%ld'\n" +"çç®å½å¨ %s äº r%ld æ·»å åä¸åå¨ã" + +#: ../libsvn_client/conflicts.c:4409 +#, c-format +msgid "" +"File switched from\n" +"'^/%s@%ld'\n" +"to\n" +"'^/%s@%ld'\n" +"did not exist before it was added by %s in r%ld." +msgstr "" +"ä»\n" +"'^/%s@%ld'\n" +"åæ¢å°\n" +"'^/%s@%ld'\n" +"çæä»¶å¨ %s äº r%ld æ·»å åä¸åå¨ã" + +#: ../libsvn_client/conflicts.c:4418 +#, c-format +msgid "" +"Item switched from\n" +"'^/%s@%ld'\n" +"to\n" +"'^/%s@%ld'\n" +"did not exist before it was added by %s in r%ld." +msgstr "" +"ä»\n" +"'^/%s@%ld'\n" +"åæ¢å°\n" +"'^/%s@%ld'\n" +"ç项ç®å¨ %s äº r%ld æ·»å åä¸åå¨ã" + +#: ../libsvn_client/conflicts.c:4446 +#, c-format +msgid "" +"Directory merged from\n" +"'^/%s@%ld'\n" +"to\n" +"'^/%s@%ld'\n" +"was replaced with a file by %s in r%ld." +msgstr "" +"ä»\n" +"'^/%s@%ld'\n" +"å并å°\n" +"'^/%s@%ld'\n" +"çç®å½ç± %s å¨ r%ld æ¿æ¢ä¸ºæ件ã" + +#: ../libsvn_client/conflicts.c:4474 +#, c-format +msgid "" +"File merged from\n" +"'^/%s@%ld'\n" +"to\n" +"'^/%s@%ld'\n" +"was replaced with a file from another line of history by %s in r%ld." +msgstr "" +"ä»\n" +"'^/%s@%ld'\n" +"å并å°\n" +"'^/%s@%ld'\n" +"çæä»¶ç± %s å¨ r%ld æ¿æ¢ä¸ºå¦ä¸åå²çº¿çæ件ã" + +#: ../libsvn_client/conflicts.c:4500 +#, c-format +msgid "" +"Item merged from\n" +"'^/%s@%ld'\n" +"to\n" +"'^/%s@%ld'\n" +"was replaced with a file by %s in r%ld." +msgstr "" +"ä»\n" +"'^/%s@%ld'\n" +"å并å°\n" +"'^/%s@%ld'\n" +"ç项ç®ç± %s å¨ r%ld æ¿æ¢ä¸ºæ件ã" + +#: ../libsvn_client/conflicts.c:4513 +#, c-format +msgid "" +"Directory merged from\n" +"'^/%s@%ld'\n" +"to\n" +"'^/%s@%ld'\n" +"was replaced with a directory from another line of history by %s in r%ld." +msgstr "" +"ä»\n" +"'^/%s@%ld'\n" +"å并å°\n" +"'^/%s@%ld'\n" +"çç®å½ç± %s å¨ r%ld æ¿æ¢ä¸ºå¦ä¸åå²çº¿çç®å½ã" + +#: ../libsvn_client/conflicts.c:4542 +#, c-format +msgid "" +"File merged from\n" +"'^/%s@%ld'\n" +"to\n" +"'^/%s@%ld'\n" +"was replaced with a directory by %s in r%ld." +msgstr "" +"ä»\n" +"'^/%s@%ld'\n" +"å并å°\n" +"'^/%s@%ld'\n" +"çæä»¶ç± %s å¨ r%ld æ¿æ¢ä¸ºç®å½ã" + +#: ../libsvn_client/conflicts.c:4569 +#, c-format +msgid "" +"Item merged from\n" +"'^/%s@%ld'\n" +"to\n" +"'^/%s@%ld'\n" +"was replaced with a directory by %s in r%ld." +msgstr "" +"ä»\n" +"'^/%s@%ld'\n" +"å并å°\n" +"'^/%s@%ld'\n" +"ç项ç®ç± %s å¨ r%ld æ¿æ¢ä¸ºç®å½ã" + +#: ../libsvn_client/conflicts.c:4605 +#, c-format +msgid "" +"Directory merged from\n" +"'^/%s@%ld'\n" +"to\n" +"'^/%s@%ld'\n" +"was moved to '^/%s' by %s in r%ld." +msgstr "" +"ä»\n" +"'^/%s@%ld'\n" +"å并å°\n" +"'^/%s@%ld'\n" +"çç®å½è¢«ç§»å¨å° '^/%s'ï¼ç± %s å¨ r%ldã" + +#: ../libsvn_client/conflicts.c:4619 +#, c-format +msgid "" +"Directory merged from\n" +"'^/%s@%ld'\n" +"to\n" +"'^/%s@%ld'\n" +"was deleted by %s in r%ld." +msgstr "" +"ä»\n" +"'^/%s@%ld'\n" +"å并å°\n" +"'^/%s@%ld'\n" +"çç®å½ç± %s å¨ r%ld å é¤ã" + +#: ../libsvn_client/conflicts.c:4637 +#, c-format +msgid "" +"File merged from\n" +"'^/%s@%ld'\n" +"to\n" +"'^/%s@%ld'\n" +"was moved to '^/%s' by %s in r%ld." +msgstr "" +"ä»\n" +"'^/%s@%ld'\n" +"å并å°\n" +"'^/%s@%ld'\n" +"çæ件被移å¨å° '^/%s'ï¼ç± %s å¨ r%ldã" + +#: ../libsvn_client/conflicts.c:4651 +#, c-format +msgid "" +"File merged from\n" +"'^/%s@%ld'\n" +"to\n" +"'^/%s@%ld'\n" +"was deleted by %s in r%ld." +msgstr "" +"ä»\n" +"'^/%s@%ld'\n" +"å并å°\n" +"'^/%s@%ld'\n" +"çæä»¶ç± %s å¨ r%ld å é¤ã" + +#: ../libsvn_client/conflicts.c:4668 +#, c-format +msgid "" +"Item merged from\n" +"'^/%s@%ld'\n" +"to\n" +"'^/%s@%ld'\n" +"was moved to '^/%s' by %s in r%ld." +msgstr "" +"ä»\n" +"'^/%s@%ld'\n" +"å并å°\n" +"'^/%s@%ld'\n" +"ç项ç®è¢«ç§»å¨å° '^/%s'ï¼ç± %s å¨ r%ldã" + +#: ../libsvn_client/conflicts.c:4682 +#, c-format +msgid "" +"Item merged from\n" +"'^/%s@%ld'\n" +"to\n" +"'^/%s@%ld'\n" +"was deleted by %s in r%ld." +msgstr "" +"ä»\n" +"'^/%s@%ld'\n" +"å并å°\n" +"'^/%s@%ld'\n" +"ç项ç®ç± %s å¨ r%ld å é¤ã" + +#: ../libsvn_client/conflicts.c:4707 ../libsvn_client/conflicts.c:4746 +#, c-format +msgid "" +"Directory reverse-merged from\n" +"'^/%s@%ld'\n" +"to ^/%s@%ld was a file before the replacement made by %s in r%ld." +msgstr "" +"ä»\n" +"'^/%s@%ld'\n" +"åååå¹¶å° ^/%s@%ld çç®å½å¨ %s äº r%ld æ¿æ¢åæ¯æ件ã" + +#: ../libsvn_client/conflicts.c:4716 +#, c-format +msgid "" +"File reverse-merged from\n" +"'^/%s@%ld'\n" +"to\n" +"'^/%s@%ld'\n" +"was a file from another line of history before the replacement made by %s in r%ld." +msgstr "" +"ä»\n" +"'^/%s@%ld'\n" +"ååå并å°\n" +"'^/%s@%ld'\n" +"çæä»¶å¨ %s äº r%ld æ¿æ¢åæ¯å¦ä¸åå²çº¿çæ件ã" + +#: ../libsvn_client/conflicts.c:4725 +#, c-format +msgid "" +"Item reverse-merged from\n" +"'^/%s@%ld'\n" +"to\n" +"'^/%s@%ld'\n" +"was replaced with a file by %s in r%ld." +msgstr "" +"ä»\n" +"'^/%s@%ld'\n" +"ååå并å°\n" +"'^/%s@%ld'\n" +"ç项ç®ç± %s å¨ r%ld æ¿æ¢ä¸ºæ件ã" + +#: ../libsvn_client/conflicts.c:4736 +#, c-format +msgid "" +"Directory reverse-merged from\n" +"'^/%s@%ld'\n" +"to ^/%s@%ld was a directory from another line of history before the replacement made by %s in r%ld." +msgstr "" +"ä»\n" +"'^/%s@%ld'\n" +"åååå¹¶å° ^/%s@%ld çç®å½å¨ %s äº r%ld æ¿æ¢åæ¯å¦ä¸åå²çº¿çç®å½ã" + +#: ../libsvn_client/conflicts.c:4754 +#, c-format +msgid "" +"Item reverse-merged from\n" +"'^/%s@%ld'\n" +"to\n" +"'^/%s@%ld'\n" +"was replaced with a directory by %s in r%ld." +msgstr "" +"ä»\n" +"'^/%s@%ld'\n" +"ååå并å°\n" +"'^/%s@%ld'\n" +"ç项ç®ç± %s å¨ r%ld æ¿æ¢ä¸ºç®å½ã" + +#: ../libsvn_client/conflicts.c:4765 +#, c-format +msgid "" +"Directory reverse-merged from\n" +"'^/%s@%ld'\n" +"to ^/%s@%ld did not exist before it was added by %s in r%ld." +msgstr "" +"ä»\n" +"'^/%s@%ld'\n" +"åååå¹¶å° ^/%s@%ld çç®å½å¨ %s äº r%ld æ·»å åä¸åå¨ã" + +#: ../libsvn_client/conflicts.c:4774 +#, c-format +msgid "" +"File reverse-merged from\n" +"'^/%s@%ld'\n" +"to\n" +"'^/%s@%ld'\n" +"did not exist before it was added by %s in r%ld." +msgstr "" +"ä»\n" +"'^/%s@%ld'\n" +"ååå并å°\n" +"'^/%s@%ld'\n" +"çæä»¶å¨ %s äº r%ld æ·»å åä¸åå¨ã" + +#: ../libsvn_client/conflicts.c:4783 +#, c-format +msgid "" +"Item reverse-merged from\n" +"'^/%s@%ld'\n" +"to\n" +"'^/%s@%ld'\n" +"did not exist before it was added by %s in r%ld." +msgstr "" +"ä»\n" +"'^/%s@%ld'\n" +"ååå并å°\n" +"'^/%s@%ld'\n" +"ç项ç®å¨ %s äº r%ld æ·»å åä¸åå¨ã" + +#: ../libsvn_client/conflicts.c:5514 +#, c-format +msgid "A new directory appeared during update to r%ld; it was added by %s in r%ld and later deleted by %s in r%ld." +msgstr "æ´æ°å° r%ld æ¶åºç°æ°ç®å½ï¼å®ç± %s å¨ r%ld æ·»å ï¼åç± %s å¨ r%ld å é¤ã" + +#: ../libsvn_client/conflicts.c:5521 +#, c-format +msgid "A new directory appeared during update to r%ld; it was added by %s in r%ld." +msgstr "æ´æ°å° r%ld æ¶åºç°æ°ç®å½ï¼å®ç± %s å¨ r%ld æ·»å ã" + +#: ../libsvn_client/conflicts.c:5526 +#, c-format +msgid "A new directory appeared during update to r%ld; it was deleted by %s in r%ld." +msgstr "æ´æ°å° r%ld æ¶åºç°æ°ç®å½ï¼å®ç± %s å¨ r%ld å é¤ã" + +#: ../libsvn_client/conflicts.c:5536 +#, c-format +msgid "A new file appeared during update to r%ld; it was added by %s in r%ld and later deleted by %s in r%ld." +msgstr "æ´æ°å° r%ld æ¶åºç°æ°æ件ï¼å®ç± %s å¨ r%ld æ·»å ï¼åç± %s å¨ r%ld å é¤ã" + +#: ../libsvn_client/conflicts.c:5543 +#, c-format +msgid "A new file appeared during update to r%ld; it was added by %s in r%ld." +msgstr "æ´æ°å° r%ld æ¶åºç°æ°æ件ï¼å®ç± %s å¨ r%ld æ·»å ã" + +#: ../libsvn_client/conflicts.c:5548 +#, c-format +msgid "A new file appeared during update to r%ld; it was deleted by %s in r%ld." +msgstr "æ´æ°å° r%ld æ¶åºç°æ°æ件ï¼å®ç± %s å¨ r%ld å é¤ã" + +#: ../libsvn_client/conflicts.c:5557 +#, c-format +msgid "A new item appeared during update to r%ld; it was added by %s in r%ld and later deleted by %s in r%ld." +msgstr "æ´æ°å° r%ld æ¶åºç°æ°é¡¹ç®ï¼å®ç± %s å¨ r%ld æ·»å ï¼åç± %s å¨ r%ld å é¤ã" + +#: ../libsvn_client/conflicts.c:5564 +#, c-format +msgid "A new item appeared during update to r%ld; it was added by %s in r%ld." +msgstr "æ´æ°å° r%ld æ¶åºç°æ°é¡¹ç®ï¼å®ç± %s å¨ r%ld æ·»å ã" + +#: ../libsvn_client/conflicts.c:5569 +#, c-format +msgid "A new item appeared during update to r%ld; it was deleted by %s in r%ld." +msgstr "æ´æ°å° r%ld æ¶åºç°æ°é¡¹ç®ï¼å®ç± %s å¨ r%ld å é¤ã" + +#: ../libsvn_client/conflicts.c:5588 +#, c-format +msgid "" +"A new directory appeared during switch to\n" +"'^/%s@%ld'.\n" +"It was added by %s in r%ld and later deleted by %s in r%ld." +msgstr "" +"åæ¢å°\n" +"'^/%s@%ld' æ¶åºç°æ°ç®å½ã\n" +"å®ç± %s å¨ r%ld æ·»å ï¼åç± %s å¨ r%ld å é¤ã" + +#: ../libsvn_client/conflicts.c:5596 +#, c-format +msgid "" +"A new directory appeared during switch to\n" +"'^/%s@%ld'.\n" +"It was added by %s in r%ld." +msgstr "" +"åæ¢å°\n" +"'^/%s@%ld' æ¶åºç°æ°ç®å½ã\n" +"å®ç± %s å¨ r%ld æ·»å ã" + +#: ../libsvn_client/conflicts.c:5602 +#, c-format +msgid "" +"A new directory appeared during switch to\n" +"'^/%s@%ld'.\n" +"It was deleted by %s in r%ld." +msgstr "" +"åæ¢å°\n" +"'^/%s@%ld' æ¶åºç°æ°ç®å½ã\n" +"å®ç± %s å¨ r%ld å é¤ã" + +#: ../libsvn_client/conflicts.c:5613 +#, c-format +msgid "" +"A new file appeared during switch to\n" +"'^/%s@%ld'.\n" +"It was added by %s in r%ld and later deleted by %s in r%ld." +msgstr "" +"åæ¢å°\n" +"'^/%s@%ld' æ¶åºç°æ°æ件ã\n" +"å®ç± %s å¨ r%ld æ·»å ï¼åç± %s å¨ r%ld å é¤ã" + +#: ../libsvn_client/conflicts.c:5621 +#, c-format +msgid "" +"A new file appeared during switch to\n" +"'^/%s@%ld'.\n" +"It was added by %s in r%ld." +msgstr "" +"åæ¢å°\n" +"'^/%s@%ld' æ¶åºç°æ°æ件ã\n" +"å®ç± %s å¨ r%ld æ·»å ã" + +#: ../libsvn_client/conflicts.c:5628 +#, c-format +msgid "" +"A new file appeared during switch to\n" +"'^/%s@%ld'.\n" +"It was deleted by %s in r%ld." +msgstr "" +"åæ¢å°\n" +"'^/%s@%ld' æ¶åºç°æ°æ件ã\n" +"å®ç± %s å¨ r%ld å é¤ã" + +#: ../libsvn_client/conflicts.c:5639 +#, c-format +msgid "" +"A new item appeared during switch to\n" +"'^/%s@%ld'.\n" +"It was added by %s in r%ld and later deleted by %s in r%ld." +msgstr "" +"åæ¢å°\n" +"'^/%s@%ld' æ¶åºç°æ°é¡¹ç®ã\n" +"å®ç± %s å¨ r%ld æ·»å ï¼åç± %s å¨ r%ld å é¤ã" + +#: ../libsvn_client/conflicts.c:5647 +#, c-format +msgid "" +"A new item appeared during switch to\n" +"'^/%s@%ld'.\n" +"It was added by %s in r%ld." +msgstr "" +"åæ¢å°\n" +"'^/%s@%ld' æ¶åºç°æ°é¡¹ç®ã\n" +"å®ç± %s å¨ r%ld æ·»å ã" + +#: ../libsvn_client/conflicts.c:5654 +#, c-format +msgid "" +"A new item appeared during switch to\n" +"'^/%s@%ld'.\n" +"It was deleted by %s in r%ld." +msgstr "" +"åæ¢å°\n" +"'^/%s@%ld' æ¶åºç°æ°é¡¹ç®ã\n" +"å®ç± %s å¨ r%ld å é¤ã" + +#: ../libsvn_client/conflicts.c:5675 +#, c-format +msgid "" +"A new directory appeared during merge of\n" +"'^/%s:%ld'.\n" +"It was added by %s in r%ld." +msgstr "" +"å并\n" +"'^/%s:%ld' æ¶åºç°æ°ç®å½ã\n" +"å®ç± %s å¨ r%ld æ·»å ã" + +#: ../libsvn_client/conflicts.c:5681 +#, c-format +msgid "" +"A new directory appeared during merge of\n" +"'^/%s:%ld-%ld'.\n" +"It was added by %s in r%ld." +msgstr "" +"å并\n" +"'^/%s:%ld-%ld' æ¶åºç°æ°ç®å½ã\n" +"å®ç± %s å¨ r%ld æ·»å ã" + +#: ../libsvn_client/conflicts.c:5691 +#, c-format +msgid "" +"A new file appeared during merge of\n" +"'^/%s:%ld'.\n" +"It was added by %s in r%ld." +msgstr "" +"å并\n" +"'^/%s:%ld' æ¶åºç°æ°æ件ã\n" +"å®ç± %s å¨ r%ld æ·»å ã" + +#: ../libsvn_client/conflicts.c:5697 +#, c-format +msgid "" +"A new file appeared during merge of\n" +"'^/%s:%ld-%ld'.\n" +"It was added by %s in r%ld." +msgstr "" +"å并\n" +"'^/%s:%ld-%ld' æ¶åºç°æ°æ件ã\n" +"å®ç± %s å¨ r%ld æ·»å ã" + +#: ../libsvn_client/conflicts.c:5706 +#, c-format +msgid "" +"A new item appeared during merge of\n" +"'^/%s:%ld'.\n" +"It was added by %s in r%ld." +msgstr "" +"å并\n" +"'^/%s:%ld' æ¶åºç°æ°é¡¹ç®ã\n" +"å®ç± %s å¨ r%ld æ·»å ã" + +#: ../libsvn_client/conflicts.c:5712 +#, c-format +msgid "" +"A new item appeared during merge of\n" +"'^/%s:%ld-%ld'.\n" +"It was added by %s in r%ld." +msgstr "" +"å并\n" +"'^/%s:%ld-%ld' æ¶åºç°æ°é¡¹ç®ã\n" +"å®ç± %s å¨ r%ld æ·»å ã" + +#: ../libsvn_client/conflicts.c:5732 +#, c-format +msgid "" +"A new directory appeared during reverse-merge of\n" +"'^/%s:%ld'.\n" +"It was deleted by %s in r%ld." +msgstr "" +"ååå并\n" +"'^/%s:%ld' æ¶åºç°æ°ç®å½ã\n" +"å®ç± %s å¨ r%ld å é¤ã" + +#: ../libsvn_client/conflicts.c:5739 +#, c-format +msgid "" +"A new directory appeared during reverse-merge of\n" +"'^/%s:%ld-%ld'.\n" +"It was deleted by %s in r%ld." +msgstr "" +"ååå并\n" +"'^/%s:%ld-%ld' æ¶åºç°æ°ç®å½ã\n" +"å®ç± %s å¨ r%ld å é¤ã" + +#: ../libsvn_client/conflicts.c:5751 +#, c-format +msgid "" +"A new file appeared during reverse-merge of\n" +"'^/%s:%ld'.\n" +"It was deleted by %s in r%ld." +msgstr "" +"ååå并\n" +"'^/%s:%ld' æ¶åºç°æ°æ件ã\n" +"å®ç± %s å¨ r%ld å é¤ã" + +#: ../libsvn_client/conflicts.c:5758 +#, c-format +msgid "" +"A new file appeared during reverse-merge of\n" +"'^/%s:%ld-%ld'.\n" +"It was deleted by %s in r%ld." +msgstr "" +"ååå并\n" +"'^/%s:%ld-%ld' æ¶åºç°æ°æ件ã\n" +"å®ç± %s å¨ r%ld å é¤ã" + +#: ../libsvn_client/conflicts.c:5768 +#, c-format +msgid "" +"A new item appeared during reverse-merge of\n" +"'^/%s:%ld'.\n" +"It was deleted by %s in r%ld." +msgstr "" +"ååå并\n" +"'^/%s:%ld' æ¶åºç°æ°é¡¹ç®ã\n" +"å®ç± %s å¨ r%ld å é¤ã" + +#: ../libsvn_client/conflicts.c:5775 +#, c-format +msgid "" +"A new item appeared during reverse-merge of\n" +"'^/%s:%ld-%ld'.\n" +"It was deleted by %s in r%ld." +msgstr "" +"ååå并\n" +"'^/%s:%ld-%ld' æ¶åºç°æ°é¡¹ç®ã\n" +"å®ç± %s å¨ r%ld å é¤ã" + +#: ../libsvn_client/conflicts.c:6103 +#, c-format +msgid "Changes destined for a directory arrived via the following revisions during update from r%ld to r%ld." +msgstr "ä» r%ld æ´æ°å° r%ld æ¶ï¼ä»¥ä¸çæ¬å¸¦æ¥äºé对ç®å½çä¿®æ¹ã" + +#: ../libsvn_client/conflicts.c:6109 +#, c-format +msgid "Changes destined for a file arrived via the following revisions during update from r%ld to r%ld" +msgstr "ä» r%ld æ´æ°å° r%ld æ¶ï¼ä»¥ä¸çæ¬å¸¦æ¥äºé对æ件çä¿®æ¹" + +#: ../libsvn_client/conflicts.c:6114 +#, c-format +msgid "Changes from the following revisions arrived during update from r%ld to r%ld" +msgstr "ä» r%ld æ´æ°å° r%ld æ¶ï¼ä»¥ä¸çæ¬å¸¦æ¥äºä¿®æ¹" + +#: ../libsvn_client/conflicts.c:6122 +#, c-format +msgid "Changes destined for a directory arrived via the following revisions during backwards update from r%ld to r%ld" +msgstr "ä» r%ld ååæ´æ°å° r%ld æ¶ï¼ä»¥ä¸çæ¬å¸¦æ¥äºé对ç®å½çä¿®æ¹" + +#: ../libsvn_client/conflicts.c:6129 +#, c-format +msgid "Changes destined for a file arrived via the following revisions during backwards update from r%ld to r%ld" +msgstr "ä» r%ld ååæ´æ°å° r%ld æ¶ï¼ä»¥ä¸çæ¬å¸¦æ¥äºé对æ件çä¿®æ¹" + +#: ../libsvn_client/conflicts.c:6135 +#, c-format +msgid "Changes from the following revisions arrived during backwards update from r%ld to r%ld" +msgstr "ä» r%ld ååæ´æ°å° r%ld æ¶ï¼ä»¥ä¸çæ¬å¸¦æ¥äºä¿®æ¹" + +#: ../libsvn_client/conflicts.c:6149 ../libsvn_client/conflicts.c:6156 +#, c-format +msgid "" +"Changes destined for a directory arrived via the following revisions during switch to\n" +"'^/%s@r%ld'" +msgstr "" +"åæ¢å°\n" +"'^/%s@r%ld' æ¶ï¼ä»¥ä¸çæ¬å¸¦æ¥äºé对ç®å½çä¿®æ¹" + +#: ../libsvn_client/conflicts.c:6162 +#, c-format +msgid "" +"Changes from the following revisions arrived during switch to\n" +"'^/%s@r%ld'" +msgstr "" +"åæ¢å°\n" +"'^/%s@r%ld' æ¶ï¼ä»¥ä¸çæ¬å¸¦æ¥äºä¿®æ¹" + +#: ../libsvn_client/conflicts.c:6180 +msgid " (no revisions found)" +msgstr " (æªæ¾å°çæ¬)" + +#: ../libsvn_client/conflicts.c:6208 ../libsvn_client/conflicts.c:6225 +#: ../libsvn_client/conflicts.c:6231 +#, c-format +msgid "%s r%ld by %s%s" +msgstr "%s r%ldï¼ç± %s%s" + +#: ../libsvn_client/conflicts.c:6218 +#, c-format +msgid "" +"%s\n" +" [%d revision omitted for brevity],\n" +msgid_plural "" +"%s\n" +" [%d revisions omitted for brevity],\n" +msgstr[0] "" +"%s\n" +" [为ç®æ´çç¥äº %d 个çæ¬],\n" + +#: ../libsvn_client/conflicts.c:6290 +#, c-format +msgid "" +"Changes destined for a directory arrived during merge of\n" +"'^/%s:%ld'." +msgstr "" +"å并\n" +"'^/%s:%ld' æ¶å¸¦æ¥äºé对ç®å½çä¿®æ¹ã" + +#: ../libsvn_client/conflicts.c:6297 +#, c-format +msgid "" +"Changes destined for a file arrived during merge of\n" +"'^/%s:%ld'." +msgstr "" +"å并\n" +"'^/%s:%ld' æ¶å¸¦æ¥äºé对æ件çä¿®æ¹ã" + +#: ../libsvn_client/conflicts.c:6303 +#, c-format +msgid "" +"Changes arrived during merge of\n" +"'^/%s:%ld'." +msgstr "" +"å并\n" +"'^/%s:%ld' æ¶å¸¦æ¥äºä¿®æ¹ã" + +#: ../libsvn_client/conflicts.c:6315 +#, c-format +msgid "" +"Changes destined for a directory arrived via the following revisions during merge of\n" +"'^/%s:%ld-%ld'" +msgstr "" +"å并\n" +"'^/%s:%ld-%ld' æ¶ï¼ä»¥ä¸çæ¬å¸¦æ¥äºé对ç®å½çä¿®æ¹" + +#: ../libsvn_client/conflicts.c:6322 +#, c-format +msgid "" +"Changes destined for a file arrived via the following revisions during merge of\n" +"'^/%s:%ld-%ld'" +msgstr "" +"å并\n" +"'^/%s:%ld-%ld' æ¶ï¼ä»¥ä¸çæ¬å¸¦æ¥äºé对æ件çä¿®æ¹" + +#: ../libsvn_client/conflicts.c:6328 +#, c-format +msgid "" +"Changes from the following revisions arrived during merge of\n" +"'^/%s:%ld-%ld'" +msgstr "" +"å并\n" +"'^/%s:%ld-%ld' æ¶ï¼ä»¥ä¸çæ¬å¸¦æ¥äºä¿®æ¹" + +#: ../libsvn_client/conflicts.c:6340 +#, c-format +msgid "" +"Changes destined for a directory arrived during reverse-merge of\n" +"'^/%s:%ld'." +msgstr "" +"ååå并\n" +"'^/%s:%ld' æ¶å¸¦æ¥äºé对ç®å½çä¿®æ¹ã" + +#: ../libsvn_client/conflicts.c:6347 +#, c-format +msgid "" +"Changes destined for a file arrived during reverse-merge of\n" +"'^/%s:%ld'." +msgstr "" +"ååå并\n" +"'^/%s:%ld' æ¶å¸¦æ¥äºé对æ件çä¿®æ¹ã" + +#: ../libsvn_client/conflicts.c:6353 +#, c-format +msgid "" +"Changes arrived during reverse-merge of\n" +"'^/%s:%ld'." +msgstr "" +"ååå并\n" +"'^/%s:%ld' æ¶å¸¦æ¥äºä¿®æ¹ã" + +#: ../libsvn_client/conflicts.c:6365 +#, c-format +msgid "" +"Changes destined for a directory arrived via the following revisions during reverse-merge of\n" +"'^/%s:%ld-%ld'" +msgstr "" +"ååå并\n" +"'^/%s:%ld-%ld' æ¶ï¼ä»¥ä¸çæ¬å¸¦æ¥äºé对ç®å½çä¿®æ¹" + +#: ../libsvn_client/conflicts.c:6373 +#, c-format +msgid "" +"Changes destined for a file arrived via the following revisions during reverse-merge of\n" +"'^/%s:%ld-%ld'" +msgstr "" +"ååå并\n" +"'^/%s:%ld-%ld' æ¶ï¼ä»¥ä¸çæ¬å¸¦æ¥äºé对æ件çä¿®æ¹" + +#: ../libsvn_client/conflicts.c:6381 +#, c-format +msgid "" +"Changes from the following revisions arrived during reverse-merge of\n" +"'^/%s:%ld-%ld'" +msgstr "" +"ååå并\n" +"'^/%s:%ld-%ld' æ¶ï¼ä»¥ä¸çæ¬å¸¦æ¥äºä¿®æ¹" + +#: ../libsvn_client/conflicts.c:6620 +#, c-format +msgid "Tree conflict on '%s' can only be resolved to the current working copy state" +msgstr "å¨ '%s' ä¸çæ å²çªåªè½è§£å³ä¸ºå·¥ä½å¯æ¬çå½åç¶æ" + +#: ../libsvn_client/conflicts.c:6789 ../libsvn_client/conflicts.c:6795 +#, c-format +msgid "Cannot resolve tree conflict on '%s' (expected a base node but found none)" +msgstr "æ æ³è§£å³ '%s' ä¸çæ å²çª(ææåºç¡èç¹ä½æªæ¾å°)" + +#: ../libsvn_client/conflicts.c:6800 ../libsvn_client/conflicts.c:6826 +#: ../libsvn_client/conflicts.c:6853 ../libsvn_client/conflicts.c:6876 +#: ../libsvn_client/conflicts.c:12519 +#, c-format +msgid "Unexpected option id '%d'" +msgstr "æå¤çé项 ID '%d'" + +#: ../libsvn_client/conflicts.c:6809 ../libsvn_client/conflicts.c:6818 +#, c-format +msgid "Cannot resolve tree conflict on '%s' (expected base node kind '%s', but found '%s')" +msgstr "æ æ³è§£å³ '%s' ä¸çæ å²çª(ææåºç¡èç¹ç±»å为 '%s'ï¼ä½æ¾å° '%s')" + +#: ../libsvn_client/conflicts.c:6834 ../libsvn_client/conflicts.c:6844 +#, c-format +msgid "Cannot resolve tree conflict on '%s' (expected base node from '^/%s@%ld', but found '^/%s@%ld')" +msgstr "æ æ³è§£å³ '%s' ä¸çæ å²çª(ææåºç¡èç¹æ¥èª '^/%s@%ld'ï¼ä½æ¾å° '^/%s@%ld')" + +#: ../libsvn_client/conflicts.c:6862 ../libsvn_client/conflicts.c:6870 +#, c-format +msgid "Cannot resolve tree conflict on '%s' (expected an added item, but the item is not added)" +msgstr "æ æ³è§£å³ '%s' ä¸çæ å²çª(ææ已添å ç项ï¼ä½è¯¥é¡¹æªè¢«æ·»å )" + +#: ../libsvn_client/conflicts.c:7049 ../libsvn_client/conflicts.c:8837 +#, c-format +msgid "If needed, a backup copy of '%s' can be found at '%s'" +msgstr "å¦æéè¦ï¼'%s' çå¤ä»½å¯æ¬å¯ä»¥å¨ '%s' ä¸æ¾å°" + +#: ../libsvn_client/conflicts.c:7899 +#, c-format +msgid "Conflict resolution option '%d' requires details for tree conflict at '%s' to be fetched from the repository" +msgstr "å²çªè§£å³é项 '%d' éè¦å ä»çæ¬åºè·å '%s' ä¸æ å²çªç详ç»ä¿¡æ¯" + +#: ../libsvn_client/conflicts.c:7923 +#, c-format +msgid "Could not determine when '%s' was added to the repository" +msgstr "æ æ³ç¡®å® '%s' ä½æ¶è¢«æ·»å å°çæ¬åº" + +#: ../libsvn_client/conflicts.c:7938 +#, c-format +msgid "Could not determine when '%s' was deleted from the repository" +msgstr "æ æ³ç¡®å® '%s' ä½æ¶ä»çæ¬åºä¸å é¤" + +#: ../libsvn_client/conflicts.c:8150 +#, c-format +msgid "Could not determine the revision in which '^/%s' was added to the repository.\n" +msgstr "æ æ³ç¡®å® '^/%s' 被添å å°çæ¬åºççæ¬ã\n" + +#: ../libsvn_client/conflicts.c:8244 +#, c-format +msgid "Cannot resolve tree conflict on '%s' (expected a copied item, but the item is not a copy)" +msgstr "æ æ³è§£å³ '%s' ä¸çæ å²çª(ææå·²å¤å¶ç项ï¼ä½è¯¥é¡¹ä¸æ¯å¯æ¬)" + +#: ../libsvn_client/conflicts.c:8255 +#, c-format +msgid "Cannot resolve tree conflict on '%s' (expected an item copied from a revision smaller than r%ld, but the item was copied from r%ld)" +msgstr "æ æ³è§£å³ '%s' ä¸çæ å²çª(ææä»å°äº r%ld ççæ¬å¤å¶ç项ï¼ä½è¯¥é¡¹å¤å¶èª r%ld)" + +#: ../libsvn_client/conflicts.c:8267 +#, c-format +msgid "Cannot resolve tree conflict on '%s' (expected an item copied from a revision larger than r%ld, but the item was copied from r%ld)" +msgstr "æ æ³è§£å³ '%s' ä¸çæ å²çª(ææä»å¤§äº r%ld ççæ¬å¤å¶ç项ï¼ä½è¯¥é¡¹å¤å¶èª r%ld)" + +#: ../libsvn_client/conflicts.c:8286 +#, c-format +msgid "Cannot resolve tree conflict on '%s' (expected an item copied from '^/%s' or from '^/%s' but the item was copied from '^/%s@%ld')" +msgstr "æ æ³è§£å³ '%s' ä¸çæ å²çª(ææä» '^/%s' æ '^/%s' å¤å¶ç项ï¼ä½è¯¥é¡¹å¤å¶èª '^/%s@%ld')" + +#: ../libsvn_client/conflicts.c:8308 +#, c-format +msgid "Cannot resolve tree conflict on '%s' (expected an item copied from '^/%s', but the item was copied from '^/%s@%ld')" +msgstr "æ æ³è§£å³ '%s' ä¸çæ å²çª(ææä» '^/%s' å¤å¶ç项ï¼ä½è¯¥é¡¹å¤å¶èª '^/%s@%ld')" + +#: ../libsvn_client/conflicts.c:8357 +#, c-format +msgid "Conflict resolution option '%d' requires details for tree conflict at '%s' to be fetched from the repository." +msgstr "å²çªè§£å³é项 '%d' éè¦å ä»çæ¬åºè·å '%s' ä¸æ å²çªç详ç»ä¿¡æ¯" + +#: ../libsvn_client/conflicts.c:8367 +#, c-format +msgid "Could not find the revision in which '%s' was deleted from the repository" +msgstr "æ æ³æ¾å° '%s' ä»çæ¬åºä¸å é¤ççæ¬" + +#: ../libsvn_client/conflicts.c:8392 +#, c-format +msgid "Cannot resolve tree conflict on '%s' (expected node kind '%s' but found '%s')" +msgstr "æ æ³è§£å³ '%s' ä¸çæ å²çª(ææèç¹ç±»å为 '%s'ï¼ä½æ¾å° '%s')" + +#: ../libsvn_client/conflicts.c:8554 ../libsvn_client/conflicts.c:8889 +#: ../libsvn_client/conflicts.c:9083 ../libsvn_client/conflicts.c:9227 +#: ../libsvn_client/conflicts.c:9384 ../libsvn_client/conflicts.c:11157 +#: ../libsvn_client/conflicts.c:11363 +#, c-format +msgid "The specified conflict resolution option requires details for tree conflict at '%s' to be fetched from the repository first." +msgstr "æå®çå²çªè§£å³é项éè¦å ä»çæ¬åºè·å '%s' ä¸æ å²çªç详ç»ä¿¡æ¯ã" + +#: ../libsvn_client/conflicts.c:8561 ../libsvn_client/conflicts.c:8896 +#: ../libsvn_client/conflicts.c:9091 ../libsvn_client/conflicts.c:9235 +#: ../libsvn_client/conflicts.c:11164 ../libsvn_client/conflicts.c:11370 +#, c-format +msgid "Invalid operation code '%d' recorded for conflict at '%s'" +msgstr "æ æçæä½ä»£ç '%d' è®°å½å¨ '%s' ä¸çå²çªä¸" + +#: ../libsvn_client/conflicts.c:9444 +#, c-format +msgid "Cannot resolve tree conflict on '%s' (expected a copied item at '%s', but the item is not a copy)" +msgstr "æ æ³è§£å³ '%s' ä¸çæ å²çª(ææ '%s' å¤çå·²å¤å¶é¡¹ï¼ä½è¯¥é¡¹ä¸æ¯å¯æ¬)" + +#: ../libsvn_client/conflicts.c:9457 +#, c-format +msgid "Cannot resolve tree conflict on '%s' (could not determine origin of '%s')" +msgstr "æ æ³è§£å³ '%s' ä¸çæ å²çª(æ æ³ç¡®å® '%s' çæ¥æº)" + +#: ../libsvn_client/conflicts.c:9643 +#, c-format +msgid "Corresponding working copy node not found for '%s'" +msgstr "æ¾ä¸å° '%s' 对åºçå·¥ä½å¯æ¬èç¹" + +#: ../libsvn_client/conflicts.c:9950 ../libsvn_client/conflicts.c:10033 +#: ../libsvn_client/conflicts.c:12596 +msgid "Postpone" +msgstr "æ¨è¿" + +#: ../libsvn_client/conflicts.c:9951 ../libsvn_client/conflicts.c:10034 +#: ../libsvn_client/conflicts.c:12597 +msgid "skip this conflict and leave it unresolved" +msgstr "è·³è¿æ¤å²çªï¼ä¿ææªè§£å³ç¶æ" + +#: ../libsvn_client/conflicts.c:9960 ../libsvn_client/conflicts.c:9981 +#: ../libsvn_client/conflicts.c:10039 +msgid "Accept base" +msgstr "æ¥ååºç¡çæ¬" + +#: ../libsvn_client/conflicts.c:9961 +msgid "discard local and incoming changes for this binary file" +msgstr "丢å¼æ¤äºè¿å¶æ件çæ¬å°ä¿®æ¹åä¼ å ¥ä¿®æ¹" + +#: ../libsvn_client/conflicts.c:9966 ../libsvn_client/conflicts.c:9987 +#: ../libsvn_client/conflicts.c:10045 +msgid "Accept incoming" +msgstr "æ¥åä¼ å ¥" + +#: ../libsvn_client/conflicts.c:9967 +msgid "accept incoming version of binary file" +msgstr "æ¥åäºè¿å¶æ件çä¼ å ¥çæ¬" + +#: ../libsvn_client/conflicts.c:9972 ../libsvn_client/conflicts.c:10011 +#: ../libsvn_client/conflicts.c:10051 ../libsvn_client/conflicts.c:10108 +msgid "Mark as resolved" +msgstr "æ 记为已解å³" + +#: ../libsvn_client/conflicts.c:9973 +msgid "accept binary file as it appears in the working copy" +msgstr "æ¥åå·¥ä½å¯æ¬ä¸äºè¿å¶æ件çå½åç¶æ" + +#: ../libsvn_client/conflicts.c:9982 +msgid "discard local and incoming changes for this file" +msgstr "丢å¼æ¤æ件çæ¬å°ä¿®æ¹åä¼ å ¥ä¿®æ¹" + +#: ../libsvn_client/conflicts.c:9988 +msgid "accept incoming version of entire file" +msgstr "æ¥åæ´ä¸ªæ件çä¼ å ¥çæ¬" + +#: ../libsvn_client/conflicts.c:9993 +msgid "Reject incoming" +msgstr "æç»ä¼ å ¥" + +#: ../libsvn_client/conflicts.c:9994 +msgid "reject all incoming changes for this file" +msgstr "æç»æ¤æ件çææä¼ å ¥ä¿®æ¹" + +#: ../libsvn_client/conflicts.c:9999 ../libsvn_client/conflicts.c:10057 +msgid "Accept incoming for conflicts" +msgstr "æ¥åå²çªé¨åçä¼ å ¥ä¿®æ¹" + +#: ../libsvn_client/conflicts.c:10000 ../libsvn_client/conflicts.c:10058 +msgid "accept incoming changes only where they conflict" +msgstr "ä» å¨å²çªå¤æ¥åä¼ å ¥ä¿®æ¹" + +#: ../libsvn_client/conflicts.c:10005 ../libsvn_client/conflicts.c:10063 +msgid "Reject conflicts" +msgstr "æç»å²çª" + +#: ../libsvn_client/conflicts.c:10006 +msgid "reject incoming changes which conflict and accept the rest" +msgstr "æç»å²çªçä¼ å ¥ä¿®æ¹ï¼æ¥åå ¶ä½é¨å" + +#: ../libsvn_client/conflicts.c:10012 +msgid "accept the file as it appears in the working copy" +msgstr "æ¥åå·¥ä½å¯æ¬ä¸æ件çå½åç¶æ" + +#: ../libsvn_client/conflicts.c:10040 +msgid "discard local and incoming changes for this property" +msgstr "丢å¼æ¤å±æ§çæ¬å°ä¿®æ¹åä¼ å ¥ä¿®æ¹" + +#: ../libsvn_client/conflicts.c:10046 +msgid "accept incoming version of entire property value" +msgstr "æ¥åæ´ä¸ªå±æ§å¼çä¼ å ¥çæ¬" + +#: ../libsvn_client/conflicts.c:10052 +msgid "accept working copy version of entire property value" +msgstr "æ¥åæ´ä¸ªå±æ§å¼çå·¥ä½å¯æ¬çæ¬" + +#: ../libsvn_client/conflicts.c:10064 +msgid "reject changes which conflict and accept the rest" +msgstr "æç»å²çªçä¿®æ¹ï¼æ¥åå ¶ä½é¨å" + +#: ../libsvn_client/conflicts.c:10069 +msgid "Accept merged" +msgstr "æ¥åå并ç»æ" + +#: ../libsvn_client/conflicts.c:10070 +msgid "accept merged version of property value" +msgstr "æ¥åå±æ§å¼çå并çæ¬" + +#: ../libsvn_client/conflicts.c:10109 +msgid "accept current working copy state" +msgstr "æ¥åå·¥ä½å¯æ¬çå½åç¶æ" + +#: ../libsvn_client/conflicts.c:10136 +msgid "Update move destination" +msgstr "æ´æ°ç§»å¨ç®æ " + +#: ../libsvn_client/conflicts.c:10137 +msgid "apply incoming changes to move destination" +msgstr "å°ä¼ å ¥ä¿®æ¹åºç¨å°ç§»å¨ç®æ " + +#: ../libsvn_client/conflicts.c:10171 +msgid "Update any moved-away children" +msgstr "æ´æ°ææ已移走çå项" + +#: ../libsvn_client/conflicts.c:10172 +msgid "prepare for updating moved-away children, if any" +msgstr "åå¤æ´æ°å·²ç§»èµ°çå项(å¦ææ)" + +#: ../libsvn_client/conflicts.c:10217 +#, c-format +msgid "ignore and do not add '^/%s@%ld' here" +msgstr "忽ç¥ä¸ä¸å¨æ¤å¤æ·»å '^/%s@%ld'" + +#: ../libsvn_client/conflicts.c:10225 +#, c-format +msgid "replace '^/%s@%ld' with the locally added file" +msgstr "ç¨æ¬å°æ·»å çæ件æ¿æ¢ '^/%s@%ld'" + +#: ../libsvn_client/conflicts.c:10230 +#, c-format +msgid "replace '^/%s@%ld' with the locally added directory" +msgstr "ç¨æ¬å°æ·»å çç®å½æ¿æ¢ '^/%s@%ld'" + +#: ../libsvn_client/conflicts.c:10236 +#, c-format +msgid "replace '^/%s@%ld' with the locally added item" +msgstr "ç¨æ¬å°æ·»å ç项æ¿æ¢ '^/%s@%ld'" + +#: ../libsvn_client/conflicts.c:10241 +#, c-format +msgid "unexpected operation code '%d'" +msgstr "æå¤çæä½ä»£ç '%d'" + +#: ../libsvn_client/conflicts.c:10245 +msgid "Ignore incoming addition" +msgstr "忽ç¥ä¼ å ¥çæ·»å " + +#: ../libsvn_client/conflicts.c:10292 ../libsvn_client/conflicts.c:10422 +#, c-format +msgid "merge '^/%s@%ld' into '%s'" +msgstr "å° '^/%s@%ld' åå¹¶å° '%s'" + +#: ../libsvn_client/conflicts.c:10300 ../libsvn_client/conflicts.c:10431 +#, c-format +msgid "merge local '%s' and '^/%s@%ld'" +msgstr "å并æ¬å° '%s' å '^/%s@%ld'" + +#: ../libsvn_client/conflicts.c:10310 +msgid "Merge the files" +msgstr "å并æ件" + +#: ../libsvn_client/conflicts.c:10359 +#, c-format +msgid "delete '%s', copy '^/%s@%ld' here, and merge the files" +msgstr "å é¤ '%s'ï¼å° '^/%s@%ld' å¤å¶å°æ¤å¤ï¼ç¶åå并æ件" + +#: ../libsvn_client/conflicts.c:10369 ../libsvn_client/conflicts.c:10553 +msgid "Replace and merge" +msgstr "æ¿æ¢å¹¶å并" + +#: ../libsvn_client/conflicts.c:10440 +msgid "Merge the directories" +msgstr "å并ç®å½" + +#: ../libsvn_client/conflicts.c:10487 +#, c-format +msgid "delete '%s' and copy '^/%s@%ld' here" +msgstr "å é¤ '%s' å¹¶å° '^/%s@%ld' å¤å¶å°æ¤å¤" + +#: ../libsvn_client/conflicts.c:10496 +msgid "Delete my directory and replace it with incoming directory" +msgstr "å é¤æçç®å½å¹¶ç¨ä¼ å ¥çç®å½æ¿æ¢" + +#: ../libsvn_client/conflicts.c:10543 +#, c-format +msgid "delete '%s', copy '^/%s@%ld' here, and merge the directories" +msgstr "å é¤ '%s'ï¼å° '^/%s@%ld' å¤å¶å°æ¤å¤ï¼ç¶åå并ç®å½" + +#: ../libsvn_client/conflicts.c:10623 +#, c-format +msgid "ignore the deletion of '^/%s@%ld'" +msgstr "å¿½ç¥ '^/%s@%ld' çå é¤" + +#: ../libsvn_client/conflicts.c:10628 +msgid "Ignore incoming deletion" +msgstr "忽ç¥ä¼ å ¥çå é¤" + +#: ../libsvn_client/conflicts.c:10682 +#, c-format +msgid "accept the deletion of '%s'" +msgstr "æ¥å '%s' çå é¤" + +#: ../libsvn_client/conflicts.c:10689 +msgid "Accept incoming deletion" +msgstr "æ¥åä¼ å ¥çå é¤" + +#: ../libsvn_client/conflicts.c:10750 ../libsvn_client/conflicts.c:10763 +#, c-format +msgid "move '%s' to '%s' and merge" +msgstr "å° '%s' 移å¨å° '%s' 并å并" + +#: ../libsvn_client/conflicts.c:10775 +#, c-format +msgid "move and merge local changes from '%s' into '%s'" +msgstr "å°æ¬å°ä¿®æ¹ä» '%s' 移å¨å¹¶åå¹¶å° '%s'" + +#: ../libsvn_client/conflicts.c:10848 ../libsvn_client/conflicts.c:10916 +#: ../libsvn_client/conflicts.c:11798 ../libsvn_client/conflicts.c:11901 +msgid "Move and merge" +msgstr "移å¨å¹¶å并" + +#: ../libsvn_client/conflicts.c:10980 +#, c-format +msgid "apply changes to move destination '%s'" +msgstr "å°æ´æ¹åºç¨å°ç§»å¨ç®æ '%s'" + +#: ../libsvn_client/conflicts.c:10993 ../libsvn_client/conflicts.c:11001 +msgid "Apply to move destination" +msgstr "åºç¨å°ç§»å¨ç®æ " + +#: ../libsvn_client/conflicts.c:11064 ../libsvn_client/conflicts.c:12443 +#, c-format +msgid "apply changes to '%s'" +msgstr "å°æ´æ¹åºç¨å° '%s'" + +#: ../libsvn_client/conflicts.c:11077 ../libsvn_client/conflicts.c:11085 +msgid "Apply to corresponding local location" +msgstr "åºç¨å°å¯¹åºçæ¬å°ä½ç½®" + +#: ../libsvn_client/conflicts.c:11650 ../libsvn_client/conflicts.c:11884 +#, c-format +msgid "apply changes to '%s' and revert addition of '%s'" +msgstr "å°æ´æ¹åºç¨å° '%s' 并æ¢å¤ '%s' çæ·»å " + +#: ../libsvn_client/conflicts.c:11664 +#, c-format +msgid "override incoming move and merge incoming changes from '%s' to '%s'" +msgstr "è¦çä¼ å ¥ç§»å¨å¹¶å°ä¼ å ¥æ´æ¹ä» '%s' åå¹¶å° '%s'" + +#: ../libsvn_client/conflicts.c:11715 +#, c-format +msgid "accept incoming move and merge local changes from '%s' to '%s'" +msgstr "æ¥åä¼ å ¥ç§»å¨å¹¶å°æ¬å°æ´æ¹ä» '%s' åå¹¶å° '%s'" + +#: ../libsvn_client/conflicts.c:11787 ../libsvn_client/conflicts.c:11893 +msgid "Merge to corresponding local location" +msgstr "å并å°å¯¹åºçæ¬å°ä½ç½®" + +#: ../libsvn_client/conflicts.c:11986 ../libsvn_client/conflicts.c:12006 +#: ../libsvn_client/conflicts.c:12296 ../libsvn_client/conflicts.c:12324 +#, c-format +msgid "Getting a list of possible move targets requires details for tree conflict at '%s' to be fetched from the repository first" +msgstr "è·åå¯è½ç移å¨ç®æ å表éè¦å ä»çæ¬åºè·å '%s' ä¸æ å²çªç详ç»ä¿¡æ¯" + +#: ../libsvn_client/conflicts.c:12051 ../libsvn_client/conflicts.c:12458 +#: ../libsvn_client/conflicts.c:12492 ../libsvn_client/conflicts.c:12543 +#, c-format +msgid "Index '%d' is out of bounds of the possible move target list for '%s'" +msgstr "ç´¢å¼ '%d' è¶ åºäº '%s' çå¯è½ç§»å¨ç®æ å表èå´" + +#: ../libsvn_client/conflicts.c:12079 +#, c-format +msgid "Repository path '%s' not found in list of possible move targets for '%s'" +msgstr "çæ¬åºè·¯å¾ '%s' ä¸å¨ '%s' çå¯è½ç§»å¨ç®æ å表ä¸" + +#: ../libsvn_client/conflicts.c:12127 ../libsvn_client/conflicts.c:12153 +#: ../libsvn_client/conflicts.c:12418 ../libsvn_client/conflicts.c:12483 +#: ../libsvn_client/conflicts.c:12530 +#, c-format +msgid "Setting a move target requires details for tree conflict at '%s' to be fetched from the repository first" +msgstr "设置移å¨ç®æ éè¦å ä»çæ¬åºè·å '%s' ä¸æ å²çªç详ç»ä¿¡æ¯" + +#: ../libsvn_client/conflicts.c:12246 +#, c-format +msgid "Getting a list of possible move siblings requires details for tree conflict at '%s' to be fetched from the repository first" +msgstr "è·åå¯è½ç移å¨å级å表éè¦å ä»çæ¬åºè·å '%s' ä¸æ å²çªç详ç»ä¿¡æ¯" + +#: ../libsvn_client/conflicts.c:12429 +#, c-format +msgid "Index '%d' is out of bounds of the possible move sibling list for '%s'" +msgstr "ç´¢å¼ '%d' è¶ åºäº '%s' çå¯è½ç§»å¨å级å表èå´" + +#: ../libsvn_client/conflicts.c:12787 ../libsvn_client/conflicts.c:12836 +#: ../libsvn_client/conflicts.c:12889 +#, c-format +msgid "Inapplicable conflict resolution option given for conflicted path '%s'" +msgstr "为å²çªè·¯å¾ '%s' æå®äºä¸éç¨çå²çªè§£å³é项" + +#: ../libsvn_client/conflicts.c:13109 +#, c-format +msgid "Property '%s' is not in conflict." +msgstr "å±æ§ '%s' 没æå²çªã" + +#: ../libsvn_client/conflicts.c:13507 ../libsvn_wc/conflicts.c:3327 +#, c-format +msgid "Unable to resolve pending conflict on '%s'" +msgstr "æ æ³è§£å³ '%s' ä¸çæªå³å²çª" + +#: ../libsvn_client/copy.c:295 +#, c-format +msgid "%s property defined at '%s' is using an unsupported syntax" +msgstr "%s å±æ§å®ä¹å¨ '%s' ä¸ä½¿ç¨äºä¸æ¯æçè¯æ³" + +#: ../libsvn_client/copy.c:460 +#, c-format +msgid "Cannot pin external '%s' defined in %s at '%s' because it is not checked out in the working copy at '%s'" +msgstr "æ æ³åºå®å®ä¹å¨ %s ç '%s' ä¸çå¤é¨å¼ç¨ '%s'ï¼å 为å®æªæ£åºå° '%s' çå·¥ä½å¯æ¬ä¸" + +#: ../libsvn_client/copy.c:485 +#, c-format +msgid "Cannot pin external '%s' defined in %s at '%s' because '%s' has switched subtrees (switches cannot be represented in %s)" +msgstr "æ æ³åºå®å®ä¹å¨ %s ç '%s' ä¸çå¤é¨å¼ç¨ '%s'ï¼å 为 '%s' æåæ¢çåæ (åæ¢æ æ³å¨ %s ä¸è¡¨ç¤º)" + +#: ../libsvn_client/copy.c:504 +#, c-format +msgid "Cannot pin external '%s' defined in %s at '%s' because '%s' has local modifications (local modifications cannot be represented in %s)" +msgstr "æ æ³åºå®å®ä¹å¨ %s ç '%s' ä¸çå¤é¨å¼ç¨ '%s'ï¼å 为 '%s' ææ¬å°ä¿®æ¹(æ¬å°ä¿®æ¹æ æ³å¨ %s ä¸è¡¨ç¤º)" + +#: ../libsvn_client/copy.c:522 +#, c-format +msgid "Cannot pin external '%s' defined in %s at '%s' because '%s' is a mixed-revision working copy (mixed-revisions cannot be represented in %s)" +msgstr "æ æ³åºå®å®ä¹å¨ %s ç '%s' ä¸çå¤é¨å¼ç¨ '%s'ï¼å 为 '%s' æ¯æ··åçæ¬å·¥ä½å¯æ¬(æ··åçæ¬æ æ³å¨ %s ä¸è¡¨ç¤º)" + +#: ../libsvn_client/copy.c:985 #, c-format msgid "Path '%s' exists, but is excluded" -msgstr "è·¯å¾ â%sâ åå¨ï¼ä½è¢«æé¤" +msgstr "è·¯å¾ '%s' åå¨ï¼ä½è¢«æé¤" -#: ../libsvn_client/copy.c:445 ../libsvn_client/copy.c:1062 -#: ../libsvn_client/copy.c:1340 ../libsvn_client/copy.c:1914 -#: ../libsvn_client/import.c:879 ../libsvn_client/mtcc.c:454 -#: ../libsvn_client/mtcc.c:471 ../libsvn_ra_serf/util.c:1819 +#: ../libsvn_client/copy.c:991 ../libsvn_client/copy.c:1708 +#: ../libsvn_client/copy.c:2081 ../libsvn_client/import.c:911 +#: ../libsvn_client/mtcc.c:474 ../libsvn_ra_serf/util.c:1925 #, c-format msgid "Path '%s' already exists" -msgstr "è·¯å¾ â%sâ å·²ç»åå¨" +msgstr "è·¯å¾ '%s' å·²ç»åå¨" -#: ../libsvn_client/copy.c:500 +#: ../libsvn_client/copy.c:1046 #, c-format msgid "Path '%s' already exists as unversioned node" -msgstr "è·¯å¾ â%sâ å·²ç»ä½ä¸ºéçæ¬æ§å¶èç¹åå¨" +msgstr "è·¯å¾ '%s' å·²ç»ä½ä¸ºéçæ¬æ§å¶èç¹åå¨" + +#: ../libsvn_client/copy.c:1071 +#, c-format +msgid "Directory '%s' is not under version control" +msgstr "ç®å½ '%s' ä¸å¨çæ¬æ§å¶ä¹ä¸" -#: ../libsvn_client/copy.c:522 ../libsvn_client/copy.c:532 -#: ../libsvn_client/copy.c:1930 +#: ../libsvn_client/copy.c:1073 ../libsvn_client/copy.c:1082 +#: ../libsvn_client/copy.c:1092 #, c-format msgid "Path '%s' is not a directory" -msgstr "è·¯å¾ â%sâ ä¸æ¯ç®å½" +msgstr "è·¯å¾ '%s' ä¸æ¯ç®å½" -#: ../libsvn_client/copy.c:571 ../libsvn_client/merge.c:10189 -#: ../svnlook/svnlook.c:1435 +#: ../libsvn_client/copy.c:1130 ../libsvn_client/merge.c:10351 +#: ../svnlook/svnlook.c:1445 #, c-format msgid "Path '%s' does not exist" -msgstr "è·¯å¾ â%sâ ä¸åå¨" +msgstr "è·¯å¾ '%s' ä¸åå¨" -#: ../libsvn_client/copy.c:741 ../libsvn_client/copy.c:782 +#: ../libsvn_client/copy.c:1308 ../libsvn_client/copy.c:1349 #, c-format msgid "Path '%s' already exists, but is not a directory" -msgstr "è·¯å¾ â%sâ å·²ç»åå¨ï¼ä½ä¸æ¯ç®å½" +msgstr "è·¯å¾ '%s' å·²ç»åå¨ï¼ä½ä¸æ¯ç®å½" -#: ../libsvn_client/copy.c:843 +#: ../libsvn_client/copy.c:1486 msgid "Source and destination URLs appear not to point to the same repository." msgstr "æ¥æºä¸ç®æ URL ä¼¼ä¹ä¸å¨åä¸çæ¬åºã" -#: ../libsvn_client/copy.c:1052 ../libsvn_client/prop_commands.c:167 +#: ../libsvn_client/copy.c:1698 ../libsvn_client/prop_commands.c:167 #, c-format msgid "Path '%s' does not exist in revision %ld" -msgstr "è·¯å¾ â%sâ ä¸å¨çæ¬ %ld ä¸" +msgstr "è·¯å¾ '%s' ä¸å¨çæ¬ %ld ä¸" -#: ../libsvn_client/copy.c:1898 ../libsvn_client/mtcc.c:548 +#: ../libsvn_client/copy.c:2929 ../libsvn_client/mtcc.c:551 #, c-format msgid "Path '%s' not found in revision %ld" -msgstr "è·¯å¾ â%sâ ä¸å¨çæ¬ %ld ä¸" +msgstr "è·¯å¾ '%s' ä¸å¨çæ¬ %ld ä¸" -#: ../libsvn_client/copy.c:1903 +#: ../libsvn_client/copy.c:2934 #, c-format msgid "Path '%s' not found in head revision" -msgstr "HEAD çæ¬ä¸æ¾ä¸å°è·¯å¾ â%sâ" +msgstr "HEAD çæ¬ä¸æ¾ä¸å°è·¯å¾ '%s'" -#: ../libsvn_client/copy.c:2034 +#: ../libsvn_client/copy.c:3042 msgid "Cannot mix repository and working copy sources" msgstr "ä¸è½å¨æºä¸æ··åçæ¬åºåå·¥ä½å¯æ¬" -#: ../libsvn_client/copy.c:2086 +#: ../libsvn_client/copy.c:3096 +#, c-format +msgid "Cannot move path '%s' into its own child '%s'" +msgstr "æ æ³å°è·¯å¾ '%s' 移å¨å°å®èªèº«çåç®å½ '%s' ä¸" + +#: ../libsvn_client/copy.c:3097 #, c-format msgid "Cannot copy path '%s' into its own child '%s'" -msgstr "æ æ³å¤å¶è·¯å¾ â%sâ å°å ¶åç®å½ â%sâ ä¸" +msgstr "æ æ³å¤å¶è·¯å¾ '%s' å°å ¶åç®å½ '%s' ä¸" -#: ../libsvn_client/copy.c:2122 +#: ../libsvn_client/copy.c:3137 #, c-format msgid "Cannot move the external at '%s'; please edit the svn:externals property on '%s'." -msgstr "ä¸è½ç§»å¨å¨â%sâçå¤é¨å¼ç¨ï¼è¯·å¨â%sâä¿®æ¹å±æ§ svn:externals property ã" +msgstr "ä¸è½ç§»å¨å¨ '%s' çå¤é¨å¼ç¨ï¼è¯·ä¿®æ¹ '%s' ä¸ç svn:externals å±æ§ã" -#: ../libsvn_client/copy.c:2137 +#: ../libsvn_client/copy.c:3152 msgid "Moves between the working copy and the repository are not supported" msgstr "ä¸æ¯æå¨å·¥ä½å¯æ¬åçæ¬åºä¹é´ç§»å¨" -#: ../libsvn_client/copy.c:2152 +#: ../libsvn_client/copy.c:3167 #, c-format msgid "Cannot move URL '%s' into itself" -msgstr "æ æ³ç§»å¨ URL â%sâ å°æ¬èº«" +msgstr "æ æ³ç§»å¨ URL '%s' å°æ¬èº«" -#: ../libsvn_client/copy.c:2153 +#: ../libsvn_client/copy.c:3168 #, c-format msgid "Cannot move path '%s' into itself" -msgstr "æ æ³ç§»å¨è·¯å¾ â%sâ å°æ¬èº«" +msgstr "æ æ³ç§»å¨è·¯å¾ '%s' å°æ¬èº«" -#: ../libsvn_client/copy.c:2220 +#: ../libsvn_client/copy.c:3235 #, c-format msgid "'%s' does not have a URL associated with it" -msgstr "â%sâ 没æå ³èç URL" - -#: ../libsvn_client/copy_foreign.c:131 ../libsvn_client/copy_foreign.c:283 -#: ../libsvn_client/externals.c:960 ../libsvn_client/externals.c:1171 -#: ../libsvn_wc/update_editor.c:1103 -#, c-format -msgid "Path '%s' is not in the working copy" -msgstr "è·¯å¾ â%sâ ä¸å¨å·¥ä½å¯æ¬ä¸" - -#: ../libsvn_client/copy_foreign.c:373 ../libsvn_client/export.c:814 -#: ../libsvn_client/repos_diff.c:998 ../libsvn_fs_fs/dag.c:1068 -#: ../libsvn_fs_x/dag.c:1067 ../libsvn_ra_svn/client.c:1327 -#: ../libsvn_wc/diff_editor.c:1983 ../libsvn_wc/diff_editor.c:2069 -#: ../libsvn_wc/externals.c:650 ../libsvn_wc/update_editor.c:4294 -#, c-format -msgid "Checksum mismatch for '%s'" -msgstr "'%s' çæ ¡éªåä¸å¹é " - -#: ../libsvn_client/copy_foreign.c:481 -#, c-format -msgid "'%s' is not a valid location inside a repository" -msgstr "â%sâå¨çæ¬åºä¸ä¸æ¯åæ³çä½ç½®" - -#: ../libsvn_client/copy_foreign.c:512 -#, c-format -msgid "Can't add '%s', because no parent directory is found" -msgstr "ä¸è½å¢å â%sâï¼å 为没æåç°å®çç¶ç®å½" +msgstr "'%s' 没æå ³èç URL" #: ../libsvn_client/delete.c:76 #, c-format msgid "'%s' is in the way of the resource actually under version control" -msgstr "â%sâ é»ç¢èµæºçº³å ¥çæ¬æ§å¶" +msgstr "'%s' æ¡ä½äºçæ£åçæ¬æ§å¶çèµæº" #: ../libsvn_client/delete.c:95 #, c-format msgid "'%s' has local modifications -- commit or revert them first" -msgstr "â%sâ å·²ææ¬å°ä¿®æ¹ -- 请å æ交ææ¤é" +msgstr "'%s' å·²ææ¬å°ä¿®æ¹ -- 请å æ交ææ¤é" #: ../libsvn_client/delete.c:127 #, c-format msgid "Cannot remove the external at '%s'; please edit or delete the svn:externals property on '%s'" -msgstr "ä¸è½å¨â%sâå é¤å¤é¨å¼ç¨ï¼è¯·å¨â%sâä¿®æ¹æå é¤å±æ§ svn:externals" +msgstr "ä¸è½å¨'%s'å é¤å¤é¨å¼ç¨ï¼è¯·å¨'%s'ä¿®æ¹æå é¤å±æ§ svn:externals" -#: ../libsvn_client/delete.c:358 +#: ../libsvn_client/delete.c:359 #, c-format msgid "URL '%s' not within a repository" msgstr "URL '%s' ä¸å¨çæ¬åºä¸" -#: ../libsvn_client/delete.c:365 +#: ../libsvn_client/delete.c:366 #, c-format msgid "URL '%s' does not exist" -msgstr "URL â%sâ ä¸åå¨" +msgstr "URL '%s' ä¸åå¨" -#: ../libsvn_client/deprecated.c:862 ../svn/move-cmd.c:65 +#: ../libsvn_client/deprecated.c:939 ../svn/move-cmd.c:65 msgid "Cannot specify revisions (except HEAD) with move operations" msgstr "移å¨æä½ä¸è½æå®çæ¬" -#: ../libsvn_client/deprecated.c:1625 +#: ../libsvn_client/deprecated.c:1805 msgid "No commits in repository" msgstr "çæ¬åºä¸æ²¡ææ交" -#: ../libsvn_client/deprecated.c:3009 ../libsvn_wc/deprecated.c:4171 +#: ../libsvn_client/deprecated.c:3225 ../libsvn_wc/deprecated.c:4468 msgid "Non-recursive relocation not supported" msgstr "ä¸æ¯æééå½çéæ°å®ä½" -#: ../libsvn_client/diff.c:65 -#, c-format -msgid "Path '%s' must be an immediate child of the directory '%s'" -msgstr "è·¯å¾ â%sâ å¿ é¡»æ¯ç®å½ â%sâ çç´æ¥åå" - -#: ../libsvn_client/diff.c:243 -#, c-format -msgid "%s\t(revision %ld)" -msgstr "%s\t(çæ¬ %ld)" - -#: ../libsvn_client/diff.c:245 -#, c-format -msgid "%s\t(nonexistent)" -msgstr "%s\t(ä¸åå¨ç)" - -#. SVN_INVALID_REVNUM -#: ../libsvn_client/diff.c:247 -#, c-format -msgid "%s\t(working copy)" -msgstr "%s\t(å·¥ä½å¯æ¬)" - -#: ../libsvn_client/diff.c:501 ../svnlook/svnlook.c:802 -#, c-format -msgid "%sProperty changes on: %s%s" -msgstr "%s å±æ§æ¹å: %s%s" - -#: ../libsvn_client/diff.c:756 -#, c-format -msgid "Cannot display: file marked as a binary type.%s" -msgstr "æ æ³æ¾ç¤º: æ件æ 记为äºè¿å¶ç±»åã%s" - -#: ../libsvn_client/diff.c:1287 ../libsvn_client/merge.c:7239 -#: ../libsvn_client/merge.c:10591 +#: ../libsvn_client/diff.c:104 ../libsvn_client/merge.c:7417 +#: ../libsvn_client/merge.c:10773 msgid "Not all required revisions are specified" msgstr "没æå ¨é¨æä¾éè¦ççæ¬" -#: ../libsvn_client/diff.c:1301 +#: ../libsvn_client/diff.c:118 msgid "At least one revision must be something other than BASE or WORKING when diffing a URL" msgstr "è¦æ¯è¾ URL çæ¶åï¼å¿ é¡»æä¸ä¸ªçæ¬ï¼æ¢ä¸æ¯åºç¡çæ¬ï¼åä¸æ¯å·¥ä½çæ¬" -#: ../libsvn_client/diff.c:1338 +#: ../libsvn_client/diff.c:155 #, c-format msgid "Diff target '%s' was not found in the repository at revision '%ld'" msgstr "å·®å¼ç®æ '%s' ä¸å¨çæ¬åºççæ¬ '%ld' ä¸" -#: ../libsvn_client/diff.c:1343 +#: ../libsvn_client/diff.c:160 #, c-format msgid "Diff target '%s' was not found in the repository at revision '%ld' or '%ld'" msgstr "å·®å¼ç®æ '%s' ä¸å¨çæ¬åºççæ¬ '%ld' æ '%ld' ä¸" -#: ../libsvn_client/diff.c:1519 +#: ../libsvn_client/diff.c:347 #, c-format msgid "Diff target '%s' was not found in the repository at revisions '%ld' and '%ld'" msgstr "å·®å¼ç®æ '%s' ä¸å¨çæ¬åºççæ¬ '%ld' å '%ld' ä¸" -#: ../libsvn_client/diff.c:1524 +#: ../libsvn_client/diff.c:352 #, c-format msgid "Diff targets '%s' and '%s' were not found in the repository at revisions '%ld' and '%ld'" msgstr "å·®å¼ç®æ '%s' ä¸ '%s' ä¸å¨çæ¬åºççæ¬ '%ld' å '%ld' ä¸" -#: ../libsvn_client/diff.c:1623 -msgid "Sorry, svn_client_diff6 was called in a way that is not yet supported" -msgstr "æ±æï¼svn_client_diff6 å°ä¸æ¯æè¿ç§è°ç¨æ¹å¼" - -#: ../libsvn_client/diff.c:1663 -msgid "Only diffs between a path's text-base and its working files are supported at this time" -msgstr "å½ååªæ¯æ纯ææ¬ç±»åçåèæ件ä¸å ¶å·¥ä½æ件æ¯è¾æ¯è¾å·®å¼" +#: ../libsvn_client/diff.c:451 +msgid "Sorry, svn_client_diff7 was called in a way that is not yet supported" +msgstr "æ±æï¼svn_client_diff7 以å°ä¸æ¯æçæ¹å¼è¢«è°ç¨" + +#: ../libsvn_client/diff.c:493 +msgid "A non-URL diff at this time must be either from a path's base to the same path's working version or between the working versions of two paths" +msgstr "æ¤æ¶é URL å·®å¼æ¯è¾å¿ é¡»æ¯ä»è·¯å¾çåºç¡çæ¬å°ç¸åè·¯å¾çå·¥ä½çæ¬ï¼æè å¨å·¥ä½çæ¬ä¹é´è¿è¡" -#: ../libsvn_client/diff.c:2369 ../libsvn_client/diff.c:2455 +#: ../libsvn_client/diff.c:1265 ../libsvn_client/diff.c:1331 msgid "Cannot ignore properties and show only properties at the same time" msgstr "ä¸è½å¨å¿½ç¥å±æ§çåæ¶ï¼åªæ¾ç¤ºå±æ§" -#: ../libsvn_client/diff_local.c:792 ../libsvn_wc/props.c:1673 +#: ../libsvn_client/diff_local.c:733 ../libsvn_wc/props.c:1675 #, c-format msgid "'%s' is not a file or directory" -msgstr "â%sâä¸æ¯æ件æç®å½" +msgstr "'%s'ä¸æ¯æ件æç®å½" + +#: ../libsvn_client/diff_patch.c:60 +#, c-format +msgid "Path '%s' must be an immediate child of the directory '%s'" +msgstr "è·¯å¾ '%s' å¿ é¡»æ¯ç®å½ '%s' çç´æ¥åå" + +#: ../libsvn_client/diff_patch.c:261 +#, c-format +msgid "%s\t(revision %ld)" +msgstr "%s\t(çæ¬ %ld)" + +#: ../libsvn_client/diff_patch.c:263 +#, c-format +msgid "%s\t(nonexistent)" +msgstr "%s\t(ä¸åå¨ç)" + +#. SVN_INVALID_REVNUM +#: ../libsvn_client/diff_patch.c:265 +#, c-format +msgid "%s\t(working copy)" +msgstr "%s\t(å·¥ä½å¯æ¬)" + +#: ../libsvn_client/diff_patch.c:947 +#, c-format +msgid "Cannot display: file marked as a binary type.%s" +msgstr "æ æ³æ¾ç¤º: æ件æ 记为äºè¿å¶ç±»åã%s" #: ../libsvn_client/export.c:102 #, c-format msgid "'%s' is not a valid EOL value" -msgstr "â%sâ ä¸æ¯ä¸ä¸ªææç EOL å¼" +msgstr "'%s' ä¸æ¯ä¸ä¸ªææç EOL å¼" -#: ../libsvn_client/export.c:240 +#: ../libsvn_client/export.c:242 msgid "Destination directory exists, and will not be overwritten unless forced" msgstr "ç®çç®å½å·²åå¨ï¼é¤é强迫为ä¹ï¼å¦åä¸ä¼è¦ç" -#: ../libsvn_client/export.c:265 ../libsvn_client/export.c:1527 -#: ../libsvn_wc/adm_crawler.c:1216 ../libsvn_wc/conflicts.c:1173 -#: ../libsvn_wc/copy.c:649 ../libsvn_wc/crop.c:236 ../libsvn_wc/crop.c:327 -#: ../libsvn_wc/info.c:403 ../libsvn_wc/node.c:667 ../libsvn_wc/props.c:202 -#: ../libsvn_wc/status.c:2713 ../libsvn_wc/wc_db.c:2133 -#: ../libsvn_wc/wc_db.c:2574 ../libsvn_wc/wc_db.c:2803 -#: ../libsvn_wc/wc_db.c:2827 ../libsvn_wc/wc_db.c:2985 -#: ../libsvn_wc/wc_db.c:3983 ../libsvn_wc/wc_db.c:6042 -#: ../libsvn_wc/wc_db.c:6362 ../libsvn_wc/wc_db.c:6531 -#: ../libsvn_wc/wc_db.c:6697 ../libsvn_wc/wc_db.c:7748 -#: ../libsvn_wc/wc_db.c:8707 ../libsvn_wc/wc_db.c:9400 -#: ../libsvn_wc/wc_db.c:10031 ../libsvn_wc/wc_db.c:10178 -#: ../libsvn_wc/wc_db.c:10318 ../libsvn_wc/wc_db.c:10668 -#: ../libsvn_wc/wc_db.c:12136 ../libsvn_wc/wc_db.c:12204 -#: ../libsvn_wc/wc_db.c:12530 ../libsvn_wc/wc_db.c:13623 -#: ../libsvn_wc/wc_db.c:13683 ../libsvn_wc/wc_db.c:13821 -#: ../libsvn_wc/wc_db.c:13980 ../libsvn_wc/wc_db.c:14421 -#: ../libsvn_wc/wc_db.c:15202 +#: ../libsvn_client/export.c:267 ../libsvn_client/export.c:1525 +#: ../libsvn_wc/adm_crawler.c:1291 ../libsvn_wc/copy.c:702 +#: ../libsvn_wc/crop.c:239 ../libsvn_wc/crop.c:342 ../libsvn_wc/info.c:381 +#: ../libsvn_wc/node.c:529 ../libsvn_wc/props.c:202 ../libsvn_wc/status.c:2728 +#: ../libsvn_wc/wc_db.c:2183 ../libsvn_wc/wc_db.c:2724 +#: ../libsvn_wc/wc_db.c:2963 ../libsvn_wc/wc_db.c:2996 +#: ../libsvn_wc/wc_db.c:3154 ../libsvn_wc/wc_db.c:4167 +#: ../libsvn_wc/wc_db.c:6468 ../libsvn_wc/wc_db.c:6788 +#: ../libsvn_wc/wc_db.c:7032 ../libsvn_wc/wc_db.c:7172 +#: ../libsvn_wc/wc_db.c:8211 ../libsvn_wc/wc_db.c:9211 +#: ../libsvn_wc/wc_db.c:9943 ../libsvn_wc/wc_db.c:10590 +#: ../libsvn_wc/wc_db.c:10815 ../libsvn_wc/wc_db.c:11191 +#: ../libsvn_wc/wc_db.c:11531 ../libsvn_wc/wc_db.c:12808 +#: ../libsvn_wc/wc_db.c:12877 ../libsvn_wc/wc_db.c:14210 +#: ../libsvn_wc/wc_db.c:14259 ../libsvn_wc/wc_db.c:14380 +#: ../libsvn_wc/wc_db.c:14539 ../libsvn_wc/wc_db.c:14980 +#: ../libsvn_wc/wc_db.c:15844 #, c-format msgid "The node '%s' was not found." msgstr "æ¾ä¸å°èç¹ '%s'ã" -#: ../libsvn_client/export.c:285 ../libsvn_client/export.c:1184 -#: ../libsvn_client/export.c:1241 +#: ../libsvn_client/export.c:287 ../libsvn_client/export.c:1168 +#: ../libsvn_client/export.c:1224 #, c-format msgid "Destination file '%s' exists, and will not be overwritten unless forced" -msgstr "ç®æ æ件â%sâå·²åå¨ï¼é¤é强迫为ä¹ï¼å¦åä¸ä¼è¢«è¦ç" +msgstr "ç®æ æ件'%s'å·²åå¨ï¼é¤é强迫为ä¹ï¼å¦åä¸ä¼è¢«è¦ç" -#: ../libsvn_client/export.c:291 ../libsvn_client/export.c:1189 -#: ../libsvn_client/export.c:1246 +#: ../libsvn_client/export.c:293 ../libsvn_client/export.c:1173 +#: ../libsvn_client/export.c:1229 #, c-format msgid "Destination '%s' exists. Cannot overwrite directory with non-directory" -msgstr "ç®æ â%sâå·²åå¨ãä¸è½ç¨éç®å½è¦çç®å½" +msgstr "ç®æ '%s'å·²åå¨ãä¸è½ç¨éç®å½è¦çç®å½" -#: ../libsvn_client/export.c:473 ../libsvn_client/export.c:622 -#: ../libsvn_client/export.c:1078 +#: ../libsvn_client/export.c:460 ../libsvn_client/export.c:604 +#: ../libsvn_client/export.c:1065 #, c-format msgid "'%s' exists and is not a directory" -msgstr "â%sâ å·²åå¨ä¸ä¸æ¯ç®å½" +msgstr "'%s' å·²åå¨ä¸ä¸æ¯ç®å½" -#: ../libsvn_client/export.c:477 ../libsvn_client/export.c:626 -#: ../libsvn_client/export.c:1082 +#: ../libsvn_client/export.c:464 ../libsvn_client/export.c:608 +#: ../libsvn_client/export.c:1069 #, c-format msgid "'%s' already exists" -msgstr "â%sâ å·²åå¨" +msgstr "'%s' å·²åå¨" + +#: ../libsvn_client/export.c:834 ../libsvn_client/repos_diff.c:999 +#: ../libsvn_client/wc_editor.c:539 ../libsvn_fs_fs/dag.c:1107 +#: ../libsvn_fs_x/dag.c:904 ../libsvn_ra_serf/commit.c:2229 +#: ../libsvn_ra_svn/client.c:1512 ../libsvn_wc/diff_editor.c:2114 +#: ../libsvn_wc/diff_editor.c:2202 ../libsvn_wc/externals.c:714 +#: ../libsvn_wc/update_editor.c:4466 +#, c-format +msgid "Checksum mismatch for '%s'" +msgstr "'%s' çæ ¡éªåä¸å¹é " -#: ../libsvn_client/externals.c:440 +#: ../libsvn_client/externals.c:202 ../libsvn_client/externals.c:259 +#, c-format +msgid "The external '%s' defined in %s at '%s' cannot be checked out because '%s' is already a versioned path." +msgstr "å®ä¹å¨ %s ç '%s' ä¸çå¤é¨å¼ç¨ '%s' æ æ³æ£åºï¼å 为 '%s' å·²ç»æ¯ä¸ä¸ªçæ¬æ§å¶è·¯å¾ã" + +#: ../libsvn_client/externals.c:502 #, c-format msgid "Cannot insert a file external defined on '%s' into the working copy '%s'." -msgstr "ä¸è½å°å¨â%sâå®ä¹çæ件å¤é¨å¼ç¨æå ¥å°å·¥ä½å¯æ¬â%sâã" +msgstr "ä¸è½å°å¨'%s'å®ä¹çæ件å¤é¨å¼ç¨æå ¥å°å·¥ä½å¯æ¬'%s'ã" -#: ../libsvn_client/externals.c:465 +#: ../libsvn_client/externals.c:527 #, c-format msgid "The file external from '%s' cannot overwrite the existing versioned item at '%s'" -msgstr "æ¥æºäº â%sâ çå¤é¨å¼ç¨çæ件ä¸è½è¦åä½äº â%sâ çå·²åçæ¬æ§å¶æ¡ç®" +msgstr "æ¥æºäº '%s' çå¤é¨å¼ç¨çæ件ä¸è½è¦åä½äº '%s' çå·²åçæ¬æ§å¶æ¡ç®" -#: ../libsvn_client/externals.c:479 +#: ../libsvn_client/externals.c:541 #, c-format msgid "The file external '%s' can not be created because the node exists." msgstr "ä¸è½å建æ件å¤é¨å¼ç¨ '%s'ï¼èç¹å·²ç»åå¨ã" -#: ../libsvn_client/externals.c:757 +#: ../libsvn_client/externals.c:821 #, c-format msgid "URL '%s' at revision %ld doesn't exist" -msgstr "URL â%sâ å¨çæ¬ %ld ä¸ä¸åå¨" +msgstr "URL '%s' å¨çæ¬ %ld ä¸ä¸åå¨" -#: ../libsvn_client/externals.c:762 +#: ../libsvn_client/externals.c:826 #, c-format msgid "URL '%s' at revision %ld is not a file or a directory" -msgstr "URL â%sâ å¨çæ¬ %ld ä¸ä¸æ¯æ件æç®å½" +msgstr "URL '%s' å¨çæ¬ %ld ä¸ä¸æ¯æ件æç®å½" -#: ../libsvn_client/externals.c:840 +#: ../libsvn_client/externals.c:905 #, c-format msgid "Unsupported external: URL of file external '%s' is not in repository '%s'" -msgstr "ä¸æ¯æçå¤é¨å¯¹è±¡ï¼æ件å¤é¨å¯¹è±¡â%sâç URL ä¸å¨çæ¬åºâ%sâä¸" +msgstr "ä¸æ¯æçå¤é¨å¼ç¨å¯¹è±¡: æ件å¤é¨å¼ç¨å¯¹è±¡'%s'ç URL ä¸å¨çæ¬åº'%s'ä¸" + +#: ../libsvn_client/externals.c:1025 ../libsvn_client/externals.c:1236 +#: ../libsvn_client/wc_editor.c:121 ../libsvn_wc/update_editor.c:1149 +#, c-format +msgid "Path '%s' is not in the working copy" +msgstr "è·¯å¾ '%s' ä¸å¨å·¥ä½å¯æ¬ä¸" -#: ../libsvn_client/externals.c:1036 +#: ../libsvn_client/externals.c:1101 #, c-format msgid "Traversal of '%s' found no ambient depth" -msgstr "å¨ â%sâ ä¸æ¾ä¸å°æ·±åº¦" +msgstr "å¨ '%s' ä¸æ¾ä¸å°æ·±åº¦" -#: ../libsvn_client/import.c:149 +#: ../libsvn_client/import.c:172 #, c-format msgid "%s property on '%s' contains unrecognized EOL-style '%s'" msgstr "å±æ§ %s (对象 '%s') å å«ä¸å¯è¯å«çè¡ç»æç¬¦å· '%s'" -#: ../libsvn_client/import.c:479 +#: ../libsvn_client/import.c:507 #, c-format msgid "Unknown or unversionable type for '%s'" -msgstr "â%sâ æ¯æªç¥ç±»åæä¸å¯çº³å ¥çæ¬æ§å¶" +msgstr "'%s' æ¯æªç¥ç±»åæä¸å¯çº³å ¥çæ¬æ§å¶" -#: ../libsvn_client/import.c:706 +#: ../libsvn_client/import.c:736 msgid "New entry name required when importing a file" msgstr "å¯¼å ¥æ件æ¶ï¼éè¦ä¸ä¸ªæ°çæ¡ç®å称" -#: ../libsvn_client/import.c:757 ../libsvn_client/patch.c:3131 -#: ../libsvn_client/patch.c:3143 ../libsvn_wc/delete.c:93 -#: ../libsvn_wc/lock.c:121 ../libsvn_wc/wc_db_wcroot.c:77 +#: ../libsvn_client/import.c:787 ../libsvn_client/patch.c:3754 +#: ../libsvn_client/patch.c:3766 ../libsvn_client/patch.c:3819 +#: ../libsvn_wc/delete.c:93 ../libsvn_wc/lock.c:121 +#: ../libsvn_wc/wc_db_wcroot.c:78 #, c-format msgid "'%s' does not exist" -msgstr "â%sâ ä¸åå¨" +msgstr "'%s' ä¸åå¨" -#: ../libsvn_client/import.c:907 +#: ../libsvn_client/import.c:939 #, c-format msgid "'%s' is a reserved name and cannot be imported" -msgstr "â%sâ æ¯ä¿çå称ï¼æ æ³è¢«å¯¼å ¥" +msgstr "'%s' æ¯ä¿çå称ï¼æ æ³è¢«å¯¼å ¥" -#: ../libsvn_client/info.c:398 ../libsvn_client/list.c:272 -#: ../svn-bench/null-info-cmd.c:148 +#: ../libsvn_client/info.c:400 ../libsvn_client/list.c:389 +#: ../svnbench/null-info-cmd.c:148 #, c-format msgid "URL '%s' non-existent in revision %ld" -msgstr "URL â%sâ ä¸å¨çæ¬ %ld ä¸" +msgstr "URL '%s' ä¸å¨çæ¬ %ld ä¸" #: ../libsvn_client/locking_commands.c:273 msgid "No common parent found, unable to operate on disjoint arguments" @@ -1976,26 +4242,26 @@ msgstr "èç¹ '%s' ä¸æ¯æ件" msgid "Unable to lock/unlock across multiple repositories" msgstr "ä¸è½è·¨è¶å¤ä¸ªçæ¬åºè¿è¡éå®/解é" -#: ../libsvn_client/locking_commands.c:443 +#: ../libsvn_client/locking_commands.c:442 #, c-format msgid "'%s' is not locked in this working copy" -msgstr "â%sâ 没æå¨å·¥ä½å¯æ¬ä¸éå®" +msgstr "'%s' 没æå¨å·¥ä½å¯æ¬ä¸éå®" -#: ../libsvn_client/locking_commands.c:496 +#: ../libsvn_client/locking_commands.c:495 #, c-format msgid "'%s' is not locked" -msgstr "â%sâ 没æ被éå®" +msgstr "'%s' 没æ被éå®" -#: ../libsvn_client/locking_commands.c:530 ../libsvn_fs/fs-loader.c:1596 -#: ../libsvn_ra/ra_loader.c:1219 +#: ../libsvn_client/locking_commands.c:529 ../libsvn_fs/fs-loader.c:1847 +#: ../libsvn_ra/ra_loader.c:1094 msgid "Lock comment contains illegal characters" msgstr "éå®æ³¨éå å«éæ³å符" -#: ../libsvn_client/log.c:134 ../libsvn_client/ra.c:529 -#: ../libsvn_client/ra.c:864 +#: ../libsvn_client/log.c:134 ../libsvn_client/ra.c:542 +#: ../libsvn_client/ra.c:877 #, c-format msgid "'%s' has no URL" -msgstr "â%sâ 没æ URL" +msgstr "'%s' 没æ URL" #: ../libsvn_client/log.c:347 msgid "No valid target found" @@ -2010,47 +4276,57 @@ msgstr "'%s' ä¸æ¯ç¸å¯¹è·¯å¾" msgid "When specifying working copy paths, only one target may be given" msgstr "å½æå®å·¥ä½å¯æ¬è·¯å¾æ¶ï¼åªè½ç»åºä¸ä¸ªç®æ " -#: ../libsvn_client/log.c:428 ../libsvn_client/revisions.c:190 +#: ../libsvn_client/log.c:428 ../libsvn_client/revisions.c:93 +#: ../libsvn_client/revisions.c:135 msgid "PREV, BASE, or COMMITTED revision keywords are invalid for URL" msgstr "å¯¹äº URLï¼çæ¬å ³é®å PREVï¼BASEï¼æ COMMITTED éæ³" -#: ../libsvn_client/log.c:561 ../libsvn_client/log.c:868 +#: ../libsvn_client/log.c:561 ../libsvn_client/log.c:870 msgid "Missing required revision specification" msgstr "æªæä¾è¯·æ±ççæ¬" -#: ../libsvn_client/merge.c:442 +#: ../libsvn_client/merge.c:434 +msgid "In Subversion 1.16 this warning will become a fatal error" +msgstr "å¨ Subversion 1.16 ä¸æ¤è¦åå°å为è´å½é误" + +#: ../libsvn_client/merge.c:452 #, c-format msgid "URL '%s' of '%s' is not in repository '%s'" -msgstr "URLâ%sâ(æ¬å°è·¯å¾â%sâ)ä¸å¨çæ¬åºâ%sâä¸" +msgstr "URL'%s'(æ¬å°è·¯å¾'%s')ä¸å¨çæ¬åº'%s'ä¸" + +#: ../libsvn_client/merge.c:487 +#, c-format +msgid "The locations '%s' and '%s' point to repositories with the same repository UUID using different repository root URLs ('%s' and '%s')" +msgstr "ä½ç½® '%s' å '%s' æåå ·æç¸åçæ¬åº UUID ä½ä½¿ç¨ä¸åçæ¬åºæ ¹ URL('%s' å '%s')ççæ¬åº" -#: ../libsvn_client/merge.c:479 +#: ../libsvn_client/merge.c:518 #, c-format -msgid "'%s' must be from the same repository as '%s'" -msgstr "â%sâå¿ é¡»ä¸â%sâå¨åä¸ä¸ªçæ¬åºä¸" +msgid "The locations '%s' and '%s' point to different repositories (root URLs '%s' and '%s', and differing UUIDs)" +msgstr "ä½ç½® '%s' å '%s' æåä¸åççæ¬åº(æ ¹ URL '%s' å '%s'ï¼ä»¥åä¸åç UUID)" #. xgettext: the '.working', '.merge-left.r%ld' and #. '.merge-right.r%ld' strings are used to tag onto a file #. name in case of a merge conflict -#: ../libsvn_client/merge.c:2081 +#: ../libsvn_client/merge.c:2194 #, c-format msgid ".working%s%s" msgstr ".working%s%s" -#: ../libsvn_client/merge.c:2084 +#: ../libsvn_client/merge.c:2197 #, c-format msgid ".merge-left.r%ld%s%s" msgstr ".merge-left.r%ld%s%s" -#: ../libsvn_client/merge.c:2088 +#: ../libsvn_client/merge.c:2201 #, c-format msgid ".merge-right.r%ld%s%s" msgstr ".merge-right.r%ld%s%s" -#: ../libsvn_client/merge.c:4743 +#: ../libsvn_client/merge.c:4918 msgid "Cannot reverse-merge a range from a path's own future history; try updating first" msgstr "ä¸è½ä»è·¯å¾çæªæ¥åå²ä¸ååå并èå´ï¼è¯·å æ´æ°" -#: ../libsvn_client/merge.c:5478 +#: ../libsvn_client/merge.c:5642 #, c-format msgid "" "One or more conflicts were produced while merging r%ld:%ld into\n" @@ -2058,110 +4334,136 @@ msgid "" "resolve all conflicts and rerun the merge to apply the remaining\n" "unmerged revisions" msgstr "" -"å½å并 r%ld:%ld å° â%sâ æ¶åºç°äºä¸ä¸ªææ´å¤çå²çª\n" +"å½å并 r%ld:%ld å° '%s' æ¶åºç°äºä¸ä¸ªææ´å¤çå²çª\n" "请解å³ææå²çªåï¼å次è¿è¡å并ï¼å¤çå©ä½çæªå并çæ¬" -#: ../libsvn_client/merge.c:6293 +#: ../libsvn_client/merge.c:6465 #, c-format msgid "Invalid mergeinfo detected on '%s', merge tracking not possible" -msgstr "å¨â%sâåç°äºéæ³çå并信æ¯ï¼å并è·è¸ªæ¯ä¸å¯è½ç" +msgstr "å¨'%s'åç°äºéæ³çå并信æ¯ï¼å并è·è¸ªæ¯ä¸å¯è½ç" -#: ../libsvn_client/merge.c:6442 +#: ../libsvn_client/merge.c:6616 msgid "Merge tracking not allowed with missing subtrees; try restoring these items first:\n" msgstr "å并è·è¸ªä¸å 许丢失åæ ; 请å æ¢å¤è¿äºé¡¹ç®:\n" -#: ../libsvn_client/merge.c:7443 +#: ../libsvn_client/merge.c:7621 #, c-format msgid "Invalid mergeinfo detected on merge target '%s', merge tracking not possible" -msgstr "å¨å并ç®æ â%sâåç°äºéæ³çå并信æ¯ï¼å并è·è¸ªæ¯ä¸å¯è½ç" +msgstr "å¨å并ç®æ '%s'åç°äºéæ³çå并信æ¯ï¼å并è·è¸ªæ¯ä¸å¯è½ç" -#: ../libsvn_client/merge.c:9761 +#: ../libsvn_client/merge.c:9936 msgid "Use of two URLs is not compatible with mergeinfo modification" msgstr "使ç¨ä¸¤ä¸ª URL ä¸å并信æ¯ä¿®æ¹ä¸å ¼å®¹" -#: ../libsvn_client/merge.c:9768 ../libsvn_client/merge.c:10103 +#: ../libsvn_client/merge.c:9943 ../libsvn_client/merge.c:10265 msgid "Merge from foreign repository is not compatible with mergeinfo modification" msgstr "ä»å¤é¨çæ¬åºå并ä¸å并信æ¯ä¿®æ¹ä¸å ¼å®¹" -#: ../libsvn_client/merge.c:10196 ../libsvn_client/merge.c:10339 +#: ../libsvn_client/merge.c:10358 ../libsvn_client/merge.c:10501 #, c-format msgid "Merge target '%s' does not exist in the working copy" -msgstr "å并ç®æ â%sâ ä¸å¨å·¥ä½å¯æ¬ä¸" +msgstr "å并ç®æ '%s' ä¸å¨å·¥ä½å¯æ¬ä¸" -#: ../libsvn_client/merge.c:10219 +#: ../libsvn_client/merge.c:10381 msgid "Cannot determine revision of working copy" msgstr "ä¸è½ç¡®å®å·¥ä½å¯æ¬ççæ¬" -#: ../libsvn_client/merge.c:10225 +#: ../libsvn_client/merge.c:10387 #, c-format msgid "Cannot merge into mixed-revision working copy [%ld:%ld]; try updating first" msgstr "ä¸è½å并å°ææ··åçæ¬çå·¥ä½å¯æ¬ [%ld:%ld] ä¸ï¼è¯·å æ´æ°" -#: ../libsvn_client/merge.c:10240 +#: ../libsvn_client/merge.c:10402 msgid "Cannot merge into a working copy with a switched subtree" msgstr "ä¸è½å并å°å·²ç»åæ¢åç®å½çå·¥ä½å¯æ¬ä¸" -#: ../libsvn_client/merge.c:10256 +#: ../libsvn_client/merge.c:10418 msgid "Cannot merge into a working copy that has local modifications" msgstr "ä¸è½å并å°ææ¬å°ä¿®æ¹çå·¥ä½å¯æ¬ä¸" -#: ../libsvn_client/merge.c:10276 ../svn/merge-cmd.c:56 +#: ../libsvn_client/merge.c:10438 ../svn/merge-cmd.c:56 #, c-format msgid "Invalid merge source '%s'; a working copy path can only be used with a repository revision (a number, a date, or head)" -msgstr "" +msgstr "æ æçåå¹¶æº '%s'ï¼å·¥ä½å¯æ¬è·¯å¾åªè½ä¸çæ¬åºçæ¬(æ°åãæ¥ææ head)ä¸èµ·ä½¿ç¨" + +#: ../libsvn_client/merge.c:10584 +msgid "The repository root URLs of the two sources must be identical in a two-URL merge" +msgstr "å URL å并ä¸ä¸¤ä¸ªæºççæ¬åºæ ¹ URL å¿ é¡»ç¸å" -#: ../libsvn_client/merge.c:10594 ../svn/merge-cmd.c:123 +#: ../libsvn_client/merge.c:10589 ../libsvn_ra/ra_loader.c:498 +#, c-format +msgid "'%s' isn't in the same repository as '%s'" +msgstr "'%s'ä¸'%s'并ä¸å¨åä¸ä¸ªçæ¬åºä¸" + +#: ../libsvn_client/merge.c:10595 ../libsvn_client/merge.c:11987 +msgid "The given merge source must have the same repository root URL as the target WC, in the usual case; or, if a foreign repository merge is intended, the repositories must have different root URLs and different UUIDs" +msgstr "ç»å®çå并æºå¨é常æ åµä¸å¿ é¡»ä¸ç®æ å·¥ä½å¯æ¬å ·æç¸åççæ¬åºæ ¹ URLï¼å¦ææç®è·¨çæ¬åºå并ï¼å两个çæ¬åºå¿ é¡»æä¸åçæ ¹ URL åä¸åç UUID" + +#: ../libsvn_client/merge.c:10776 ../svn/merge-cmd.c:123 msgid "Merge sources must both be either paths or URLs" msgstr "å并æºå¿ é¡»åæ¶æ¯è·¯å¾æ URL" -#: ../libsvn_client/merge.c:11355 ../libsvn_client/merge.c:11517 -#: ../libsvn_client/merge.c:12413 +#: ../libsvn_client/merge.c:11546 ../libsvn_client/merge.c:11708 +#: ../libsvn_client/merge.c:12627 #, c-format msgid "'%s@%ld' must be ancestrally related to '%s@%ld'" -msgstr "â%s@%ldâå¿ é¡»ä¸â%s@%ldâæç¥å å ³ç³»" +msgstr "'%s@%ld'å¿ é¡»ä¸'%s@%ld'æç¥å å ³ç³»" -#: ../libsvn_client/merge.c:11467 +#: ../libsvn_client/merge.c:11658 #, c-format msgid "Neither the reintegrate source nor target can be the root of the repository" -msgstr "å¤å ´æºæç®æ é½ä¸è½æ¯çæ¬åºçæ ¹ã" +msgstr "å并çæºåç®æ é½ä¸è½æ¯çæ¬åºçæ ¹" -#: ../libsvn_client/merge.c:11477 +#: ../libsvn_client/merge.c:11668 msgid "Reintegrate merge not possible" -msgstr "å¤å ´å并æ¯ä¸å¯è½ç" +msgstr "æ æ³è¿è¡ reintegrate å并" -#: ../libsvn_client/merge.c:11547 +#: ../libsvn_client/merge.c:11738 msgid " Missing ranges: " msgstr " 丢失çèå´: " -#: ../libsvn_client/merge.c:11550 +#: ../libsvn_client/merge.c:11741 #, c-format msgid "" "Reintegrate can only be used if revisions %ld through %ld were previously merged from %s to the reintegrate source, but this is not the case:\n" "%s" msgstr "" -"å¤å ´åªè½ç¨äºçæ¬ %ld å° %ld 以åæ¾ç»ä» %s å并å°å¤å ´æºçæ åµï¼ä½æ¯ç°å¨ä¸æ¯è¿ç§æ åµï¼\n" +"reintegrate å并åªè½ç¨äºçæ¬ %ld å° %ld 以åæ¾ç»ä» %s å并å°å并æºçæ åµï¼ä½ç°å¨ä¸æ¯è¿ç§æ åµ:\n" "%s" -#: ../libsvn_client/merge.c:11612 +#: ../libsvn_client/merge.c:11800 #, c-format msgid "Can't reintegrate into '%s' because it is locally added and therefore not related to the merge source" -msgstr "" +msgstr "æ æ³ reintegrate åå¹¶å° '%s'ï¼å 为å®æ¯æ¬å°æ·»å çï¼ä¸å并æºæ å ³" -#: ../libsvn_client/merge.c:11880 +#: ../libsvn_client/merge.c:11821 +msgid "The repository root URLs of the source and the target WC must be identical in a reintegrate merge" +msgstr "reintegrate å并ä¸æºåç®æ å·¥ä½å¯æ¬ççæ¬åºæ ¹ URL å¿ é¡»ç¸å" + +#: ../libsvn_client/merge.c:12089 msgid "Cannot merge automatically while ignoring mergeinfo" -msgstr "" +msgstr "忽ç¥å并信æ¯æ¶æ æ³èªå¨å并" + +#: ../libsvn_client/merge.c:12757 +#, c-format +msgid "Can't perform automatic merge into '%s' because it is locally added and therefore not related to the merge source" +msgstr "æ æ³èªå¨åå¹¶å° '%s'ï¼å 为å®æ¯æ¬å°æ·»å çï¼ä¸å并æºæ å ³" + +#: ../libsvn_client/merge.c:12778 +msgid "The repository root URLs of the source and the target WC must be identical in an automatic merge" +msgstr "èªå¨å并ä¸æºåç®æ å·¥ä½å¯æ¬ççæ¬åºæ ¹ URL å¿ é¡»ç¸å" -#: ../libsvn_client/merge.c:12635 +#: ../libsvn_client/merge.c:12859 msgid "The required merge is reintegrate-like, and the record-only option cannot be used with this kind of merge" -msgstr "" +msgstr "æéçå并类似 reintegrate å并ï¼record-only é项ä¸è½ç¨äºæ¤ç±»å并" -#: ../libsvn_client/merge.c:12641 +#: ../libsvn_client/merge.c:12865 msgid "The required merge is reintegrate-like, and the depth option cannot be used with this kind of merge" -msgstr "" +msgstr "æéçå并类似 reintegrate å并ï¼depth é项ä¸è½ç¨äºæ¤ç±»å并" -#: ../libsvn_client/merge.c:12647 +#: ../libsvn_client/merge.c:12871 msgid "The required merge is reintegrate-like, and the force_delete option cannot be used with this kind of merge" -msgstr "" +msgstr "æéçå并类似 reintegrate å并ï¼force_delete é项ä¸è½ç¨äºæ¤ç±»å并" #: ../libsvn_client/mergeinfo.c:1715 msgid "Only depths 'infinity' and 'empty' are currently supported" @@ -2170,247 +4472,295 @@ msgstr "å½åä» æ¯æ深度 'infinity' #: ../libsvn_client/mtcc.c:166 #, c-format msgid "Can't operate on '%s' because '%s' is not a directory" -msgstr "ä¸è½é对â%sâæä½ï¼å 为â%sâä¸æ¯ç®å½" +msgstr "ä¸è½é对'%s'æä½ï¼å 为'%s'ä¸æ¯ç®å½" #: ../libsvn_client/mtcc.c:319 #, c-format msgid "No origin found for node at '%s'" -msgstr "" +msgstr "æ¾ä¸å° '%s' èç¹çæ¥æº" -#: ../libsvn_client/mtcc.c:357 +#: ../libsvn_client/mtcc.c:359 ../libsvn_repos/commit.c:430 #, c-format msgid "No such revision %ld (HEAD is %ld)" msgstr "没æçæ¬ %ld (HEAD æ¯ %ld)" -#: ../libsvn_client/mtcc.c:405 +#: ../libsvn_client/mtcc.c:407 #, c-format msgid "'%s' is not an ancestor of '%s'" -msgstr "â%sâä¸æ¯â%sâçç¥å " +msgstr "'%s'ä¸æ¯'%s'çç¥å " -#: ../libsvn_client/mtcc.c:504 +#: ../libsvn_client/mtcc.c:456 +#, c-format +msgid "Path '%s' already exists, or was created by an earlier operation" +msgstr "è·¯å¾ '%s' å·²åå¨ï¼æç±å åçæä½å建" + +#: ../libsvn_client/mtcc.c:507 #, c-format msgid "Can't add file at '%s'" -msgstr "ä¸è½å¨â%sâå¢å æ件" +msgstr "ä¸è½å¨'%s'å¢å æ件" -#: ../libsvn_client/mtcc.c:536 ../libsvn_client/ra.c:705 -#: ../libsvn_fs_fs/fs_fs.c:1365 ../libsvn_fs_fs/rev_file.c:177 -#: ../libsvn_fs_fs/rev_file.c:189 ../libsvn_fs_x/fs_x.c:667 -#: ../libsvn_fs_x/rev_file.c:190 ../libsvn_repos/log.c:2343 -#: ../libsvn_repos/log.c:2347 +#: ../libsvn_client/mtcc.c:539 ../libsvn_client/ra.c:718 +#: ../libsvn_fs_base/lock.c:274 ../libsvn_fs_fs/fs_fs.c:1507 +#: ../libsvn_fs_fs/lock.c:759 ../libsvn_fs_fs/rev_file.c:177 +#: ../libsvn_fs_fs/rev_file.c:189 ../libsvn_fs_x/fs_x.c:724 +#: ../libsvn_fs_x/lock.c:779 ../libsvn_fs_x/rev_file.c:245 +#: ../libsvn_repos/commit.c:193 ../libsvn_repos/log.c:2362 +#: ../libsvn_repos/log.c:2366 ../libsvn_repos/rev_hunt.c:850 +#: ../libsvn_repos/rev_hunt.c:857 ../libsvn_repos/rev_hunt.c:864 #, c-format msgid "No such revision %ld" msgstr "没æçæ¬ %ld" -#: ../libsvn_client/mtcc.c:558 +#: ../libsvn_client/mtcc.c:561 #, c-format msgid "Can't add node at '%s'" -msgstr "ä¸è½å¨â%sâå¢å èç¹" +msgstr "ä¸è½å¨'%s'å¢å èç¹" -#: ../libsvn_client/mtcc.c:585 +#: ../libsvn_client/mtcc.c:622 #, c-format msgid "Can't delete node at '%s' as it does not exist" -msgstr "ä¸è½å¨â%sâå é¤èç¹ï¼å 为å®å¹¶ä¸åå¨" +msgstr "ä¸è½å¨'%s'å é¤èç¹ï¼å 为å®å¹¶ä¸åå¨" -#: ../libsvn_client/mtcc.c:602 +#: ../libsvn_client/mtcc.c:653 #, c-format msgid "Can't delete node at '%s'" -msgstr "ä¸è½å¨â%sâå é¤èç¹" +msgstr "ä¸è½å¨'%s'å é¤èç¹" -#: ../libsvn_client/mtcc.c:639 +#: ../libsvn_client/mtcc.c:698 #, c-format msgid "Can't create directory at '%s'" -msgstr "ä¸è½å¨â%sâå建ç®å½" +msgstr "ä¸è½å¨'%s'å建ç®å½" -#: ../libsvn_client/mtcc.c:778 ../libsvn_client/prop_commands.c:281 -#: ../libsvn_client/prop_commands.c:476 +#: ../libsvn_client/mtcc.c:837 ../libsvn_client/prop_commands.c:282 +#: ../libsvn_client/prop_commands.c:477 #, c-format msgid "Bad property name: '%s'" -msgstr "å±æ§å称é误: â%sâ" +msgstr "å±æ§å称é误: '%s'" -#: ../libsvn_client/mtcc.c:782 ../libsvn_client/prop_commands.c:274 +#: ../libsvn_client/mtcc.c:841 ../libsvn_client/prop_commands.c:275 #, c-format msgid "Revision property '%s' not allowed in this context" -msgstr "æ¤ä¸ä¸æä¸ä¸å 许çæ¬å±æ§ â%sâ" +msgstr "æ¤ä¸ä¸æä¸ä¸å 许çæ¬å±æ§ '%s'" -#: ../libsvn_client/mtcc.c:787 ../libsvn_client/prop_commands.c:60 +#: ../libsvn_client/mtcc.c:846 ../libsvn_client/prop_commands.c:60 #, c-format msgid "'%s' is a wcprop, thus not accessible to clients" -msgstr "â%sâ æ¯ä¸ä¸ªå·¥ä½å¯æ¬å±æ§ï¼åºæ¤ä¸è½è¢«å®¢æ·ç«¯åå" +msgstr "'%s' æ¯ä¸ä¸ªå·¥ä½å¯æ¬å±æ§ï¼åºæ¤ä¸è½è¢«å®¢æ·ç«¯åå" -#: ../libsvn_client/mtcc.c:797 +#: ../libsvn_client/mtcc.c:856 msgid "Error normalizing property value" msgstr "è§æ ¼åå±æ§å¼åºé" -#: ../libsvn_client/mtcc.c:832 ../libsvn_client/mtcc.c:855 +#: ../libsvn_client/mtcc.c:891 ../libsvn_client/mtcc.c:914 #, c-format msgid "Can't set properties at not existing '%s'" -msgstr "ä¸è½å¨ä¸åå¨çâ%sâä¸è®¾ç½®å±æ§" +msgstr "ä¸è½å¨ä¸åå¨ç'%s'ä¸è®¾ç½®å±æ§" -#: ../libsvn_client/mtcc.c:903 +#: ../libsvn_client/mtcc.c:962 #, c-format msgid "Can't update '%s' because it is not a file" msgstr "ä¸è½æ´æ° '%s'ï¼å 为å®ä¸æ¯æ件" -#: ../libsvn_client/mtcc.c:914 +#: ../libsvn_client/mtcc.c:973 #, c-format msgid "Can't update file at '%s'" -msgstr "ä¸è½å¨â%sâæ´æ°æ件" +msgstr "ä¸è½å¨'%s'æ´æ°æ件" -#: ../libsvn_client/mtcc.c:979 +#: ../libsvn_client/mtcc.c:1038 #, c-format -msgid "Can't perform directory operation on '%s' as it is not a directory" -msgstr "ä¸è½å¯¹â%sâæ§è¡ç®å½æä½ï¼å 为å®ä¸æ¯ç®å½" +msgid "Can't perform file operation on '%s' as it is not a file" +msgstr "ä¸è½å¯¹'%s'æ§è¡æ件æä½ï¼å 为å®ä¸æ¯æ件" -#: ../libsvn_client/mtcc.c:989 +#: ../libsvn_client/mtcc.c:1048 #, c-format -msgid "Can't perform file operation on '%s' as it is not a file" -msgstr "ä¸è½å¯¹â%sâæ§è¡æ件æä½ï¼å 为å®ä¸æ¯æ件" +msgid "Can't perform directory operation on '%s' as it is not a directory" +msgstr "ä¸è½å¯¹'%s'æ§è¡ç®å½æä½ï¼å 为å®ä¸æ¯ç®å½" -#: ../libsvn_client/mtcc.c:996 +#: ../libsvn_client/mtcc.c:1055 #, c-format msgid "Can't open '%s' as it does not exist" -msgstr "ä¸è½æå¼â%sâï¼å 为å®ä¸åå¨" +msgstr "ä¸è½æå¼'%s'ï¼å 为å®ä¸åå¨" -#: ../libsvn_client/mtcc.c:1388 +#: ../libsvn_client/mtcc.c:1447 #, c-format msgid "Can't commit to '%s' because it is not a directory" -msgstr "ä¸è½æ交å°â%sâï¼å 为ä¸æ¯ç®å½" +msgstr "ä¸è½æ交å°'%s'ï¼å 为ä¸æ¯ç®å½" -#: ../libsvn_client/patch.c:283 +#: ../libsvn_client/patch.c:346 #, c-format -msgid "Cannot strip %u components from '%s'" -msgstr "ä¸è½ä¿®åª %u 个ç»ä»¶äºâ%sâ" +msgid "Cannot strip %u component from '%s'" +msgid_plural "Cannot strip %u components from '%s'" +msgstr[0] "æ æ³å»é¤ %u 个路å¾ç»ä»¶(æ¥èª '%s')" -#: ../libsvn_client/patch.c:914 -msgid "Invalid link representation" -msgstr "éæ³é¾æ¥è¡¨ç¤º" +#: ../libsvn_client/patch.c:1301 ../libsvn_client/patch.c:1347 +#, c-format +msgid "Invalid patch: specifies contradicting mode changes and %s changes (for '%s')" +msgstr "æ æçè¡¥ä¸: 为 '%s' æå®äºçç¾ç模å¼æ´æ¹å %s æ´æ¹" -#: ../libsvn_client/patch.c:3120 +#: ../libsvn_client/patch.c:3743 ../libsvn_client/patch.c:3808 msgid "strip count must be positive" msgstr "ä¿®åªè®¡æ°åå¼å¿ 须为æ£" -#: ../libsvn_client/patch.c:3136 ../libsvn_fs_base/tree.c:4081 -#: ../libsvn_fs_base/tree.c:4086 ../libsvn_fs_fs/tree.c:3176 -#: ../libsvn_fs_fs/tree.c:3181 ../libsvn_fs_x/tree.c:3105 -#: ../libsvn_fs_x/tree.c:3110 ../libsvn_ra/compat.c:677 -#: ../libsvn_ra_local/ra_plugin.c:1196 +#: ../libsvn_client/patch.c:3759 ../libsvn_fs_base/tree.c:4113 +#: ../libsvn_fs_base/tree.c:4118 ../libsvn_fs_fs/tree.c:3262 +#: ../libsvn_fs_fs/tree.c:3268 ../libsvn_fs_x/tree.c:2214 +#: ../libsvn_fs_x/tree.c:2220 ../libsvn_ra/compat.c:677 +#: ../libsvn_ra_local/ra_plugin.c:1294 #, c-format msgid "'%s' is not a file" -msgstr "â%sâä¸æ¯ä¸ä¸ªæ件" +msgstr "'%s'ä¸æ¯ä¸ä¸ªæ件" -#: ../libsvn_client/patch.c:3148 ../libsvn_wc/util.c:59 +#: ../libsvn_client/patch.c:3771 ../libsvn_client/patch.c:3824 +#: ../libsvn_wc/util.c:60 #, c-format msgid "'%s' is not a directory" -msgstr "â%sâä¸æ¯ç®å½" +msgstr "'%s'ä¸æ¯ç®å½" #: ../libsvn_client/prop_commands.c:155 #, c-format msgid "Property '%s' is not a regular property" -msgstr "å±æ§ â%sâ ä¸æ¯å¸¸è§å±æ§" +msgstr "å±æ§ '%s' ä¸æ¯å¸¸è§å±æ§" -#: ../libsvn_client/prop_commands.c:309 +#: ../libsvn_client/prop_commands.c:310 msgid "Targets must be working copy paths" msgstr "ç®æ å¿ é¡»æ¯å·¥ä½å¯æ¬è·¯å¾" -#: ../libsvn_client/prop_commands.c:370 +#: ../libsvn_client/prop_commands.c:371 msgid "Targets must be URLs" msgstr "ç®æ å¿ é¡»æ¯ URL" -#: ../libsvn_client/prop_commands.c:380 +#: ../libsvn_client/prop_commands.c:381 msgid "Setting property on non-local targets needs a base revision" msgstr "设å®éæ¬å°ç®æ çå±æ§éè¦çæ¬åæ°" -#: ../libsvn_client/prop_commands.c:395 +#: ../libsvn_client/prop_commands.c:396 #, c-format msgid "Setting property '%s' on non-local targets is not supported" -msgstr "ä¸æ¯æ对éæ¬å°ç®æ 设置å±æ§â%sâ" +msgstr "ä¸æ¯æ对éæ¬å°ç®æ 设置å±æ§'%s'" -#: ../libsvn_client/prop_commands.c:423 +#: ../libsvn_client/prop_commands.c:424 #, c-format msgid "revprop '%s' in r%ld is unexpectedly absent in repository (maybe someone else deleted it?)" -msgstr "revprop â%sâ äºçæ¬ r%ld åºä¹ææå°ä¸å¨çæ¬åºä¸(å¯è½æ人å é¤äºï¼)" +msgstr "revprop '%s' äºçæ¬ r%ld åºä¹ææå°ä¸å¨çæ¬åºä¸(å¯è½æ人å é¤äºï¼)" -#: ../libsvn_client/prop_commands.c:432 +#: ../libsvn_client/prop_commands.c:433 #, c-format msgid "revprop '%s' in r%ld has unexpected value in repository (maybe someone else changed it?)" -msgstr "revprop â%sâ äºçæ¬ r%ld å¨çæ¬åºä¸åºä¹ææå°åå¼(å¯è½æ人修æ¹äºï¼)" +msgstr "revprop '%s' äºçæ¬ r%ld å¨çæ¬åºä¸åºä¹ææå°åå¼(å¯è½æ人修æ¹äºï¼)" -#: ../libsvn_client/prop_commands.c:440 +#: ../libsvn_client/prop_commands.c:441 #, c-format msgid "revprop '%s' in r%ld is unexpectedly present in repository (maybe someone else set it?)" -msgstr "revprop â%sâ äºçæ¬ r%ld åºä¹ææå°å¨çæ¬åºä¸(å¯è½æ人设置äºï¼)" +msgstr "revprop '%s' äºçæ¬ r%ld åºä¹ææå°å¨çæ¬åºä¸(å¯è½æ人设置äºï¼)" -#: ../libsvn_client/prop_commands.c:471 +#: ../libsvn_client/prop_commands.c:472 msgid "Author name should not contain a newline; value will not be set unless forced" msgstr "ä½è å称ä¸è½å å«æ¢è¡ï¼é¤é强迫为ä¹ï¼å¦åå ¶å¼ä¸ä¼è¢«è®¾å®" -#: ../libsvn_client/prop_commands.c:585 +#: ../libsvn_client/prop_commands.c:565 #, c-format msgid "'%s' does not exist in revision %ld" -msgstr "没æè·¯å¾ â%sâ å¨çæ¬ %ld ä¸" +msgstr "没æè·¯å¾ '%s' å¨çæ¬ %ld ä¸" -#: ../libsvn_client/prop_commands.c:591 ../libsvn_client/prop_commands.c:1100 -#: ../libsvn_wc/crop.c:168 +#: ../libsvn_client/prop_commands.c:571 ../libsvn_client/prop_commands.c:1081 #, c-format msgid "Unknown node kind for '%s'" -msgstr "â%sâ æ¯æªç¥çèç¹ç±»å" +msgstr "'%s' æ¯æªç¥çèç¹ç±»å" #: ../libsvn_client/ra.c:164 #, c-format msgid "Attempt to set wcprop '%s' on '%s' in a non-commit operation" -msgstr "è¯å¾å¨éæ交æä½ä¸ï¼è®¾å®å·¥ä½å¯æ¬å±æ§ â%sâ äº â%sâ" +msgstr "è¯å¾å¨éæ交æä½ä¸ï¼è®¾å®å·¥ä½å¯æ¬å±æ§ '%s' äº '%s'" -#: ../libsvn_client/ra.c:443 +#: ../libsvn_client/ra.c:447 #, c-format msgid "Redirect cycle detected for URL '%s'" msgstr "zå¨ URL '%s' æ£æµå°å¾ªç¯éå®å" -#: ../libsvn_client/ra.c:731 ../libsvn_ra/compat.c:397 +#: ../libsvn_client/ra.c:744 ../libsvn_ra/compat.c:397 #, c-format msgid "Unable to find repository location for '%s' in revision %ld" -msgstr "â%sâ ççæ¬åºä½ç½®ä¸å¨çæ¬ %ld ä¸" +msgstr "'%s' ççæ¬åºä½ç½®ä¸å¨çæ¬ %ld ä¸" -#: ../libsvn_client/ra.c:743 +#: ../libsvn_client/ra.c:756 #, c-format msgid "The location for '%s' for revision %ld does not exist in the repository or refers to an unrelated object" -msgstr "â%sâ ä¸å¨çæ¬åºççæ¬ %ld ä¸ï¼ææ¯æåä¸ä¸ªæ å ³å¯¹è±¡" +msgstr "'%s' ä¸å¨çæ¬åºççæ¬ %ld ä¸ï¼ææ¯æåä¸ä¸ªæ å ³å¯¹è±¡" #: ../libsvn_client/relocate.c:117 #, c-format msgid "'%s' is not the root of the repository" -msgstr "â%sâ ä¸æ¯çæ¬åºçæ ¹" +msgstr "'%s' ä¸æ¯çæ¬åºçæ ¹" #: ../libsvn_client/relocate.c:124 #, c-format msgid "The repository at '%s' has uuid '%s', but the WC has '%s'" -msgstr "çæ¬åº â%sâ ç uuid æ¯ â%sâï¼ä½æ¯å·¥ä½å¯æ¬çæ¯ â%sâ" +msgstr "çæ¬åº '%s' ç uuid æ¯ '%s'ï¼ä½æ¯å·¥ä½å¯æ¬çæ¯ '%s'" -#: ../libsvn_client/repos_diff.c:931 ../libsvn_wc/externals.c:568 +#: ../libsvn_client/repos_diff.c:931 ../libsvn_wc/externals.c:630 #, c-format msgid "Base checksum mismatch for '%s'" -msgstr "â%sâçæ ¡éªåé误" +msgstr "'%s'çæ ¡éªåé误" -#: ../libsvn_client/revisions.c:114 ../libsvn_client/revisions.c:139 +#: ../libsvn_client/revisions.c:116 ../libsvn_client/revisions.c:143 #, c-format msgid "Path '%s' has no committed revision" -msgstr "è·¯å¾ â%sâ 没ææ交è¿" +msgstr "è·¯å¾ '%s' 没ææ交è¿" -#: ../libsvn_client/revisions.c:167 +#: ../libsvn_client/revisions.c:153 +#, c-format +msgid "Path '%s' has no previous revision" +msgstr "è·¯å¾ '%s' 没æå åççæ¬" + +#: ../libsvn_client/revisions.c:178 #, c-format msgid "Unrecognized revision type requested for '%s'" -msgstr "â%sâ ç请æ±çæ¬ç±»åæ æ³è¯å«" +msgstr "'%s' ç请æ±çæ¬ç±»åæ æ³è¯å«" + +#: ../libsvn_client/shelf.c:62 ../libsvn_client/shelf2.c:62 +msgid "Shelf name cannot be the empty string" +msgstr "æç½®å称ä¸è½ä¸ºç©ºå符串" -#: ../libsvn_client/status.c:422 ../libsvn_client/status.c:601 -#: ../libsvn_wc/lock.c:564 ../libsvn_wc/lock.c:856 ../libsvn_wc/lock.c:1542 -#: ../libsvn_wc/wc_db.c:13235 ../libsvn_wc/wc_db_wcroot.c:638 +#: ../libsvn_client/shelf.c:90 ../libsvn_client/shelf2.c:90 +#, c-format +msgid "Shelve: Bad encoded name '%s'" +msgstr "æç½®: é误çç¼ç å称 '%s'" + +#: ../libsvn_client/shelf.c:595 ../libsvn_client/shelf2.c:1233 +#, c-format +msgid "Shelf '%s' not found" +msgstr "æç½® '%s' æªæ¾å°" + +#: ../libsvn_client/shelf.c:1232 ../libsvn_client/shelf2.c:2080 +#, c-format +msgid "Shelf '%s' version %d not found" +msgstr "æç½® '%s' çæ¬ %d æªæ¾å°" + +#. xgettext: the '.working', '.merge-left' and '.merge-right' strings +#. are used to tag onto a file name in case of a merge conflict +#: ../libsvn_client/shelf2.c:1411 ../libsvn_wc/wc_db_update_move.c:1671 +msgid ".working" +msgstr ".working" + +#: ../libsvn_client/shelf2.c:1412 +msgid ".merge-left" +msgstr ".merge-left" + +#: ../libsvn_client/shelf2.c:1413 +msgid ".merge-right" +msgstr ".merge-right" + +#: ../libsvn_client/status.c:499 ../libsvn_client/status.c:681 +#: ../libsvn_wc/lock.c:564 ../libsvn_wc/lock.c:858 ../libsvn_wc/lock.c:1544 +#: ../libsvn_wc/wc_db.c:13768 ../libsvn_wc/wc_db_wcroot.c:769 #, c-format msgid "'%s' is not a working copy" -msgstr "â%sâä¸æ¯å·¥ä½å¯æ¬" +msgstr "'%s'ä¸æ¯å·¥ä½å¯æ¬" -#: ../libsvn_client/status.c:469 +#: ../libsvn_client/status.c:546 #, c-format msgid "Entry '%s' has no URL" -msgstr "æ¡ç®â%sâ没æURL" +msgstr "æ¡ç®'%s'没æURL" #: ../libsvn_client/switch.c:129 #, c-format @@ -2420,132 +4770,161 @@ msgstr "ä¸è½åæ¶æé¤ååæ¢åä¸ #: ../libsvn_client/switch.c:150 #, c-format msgid "Cannot switch '%s' because it is not in the repository yet" -msgstr "ä¸è½åæ¢â%sâï¼å 为è¿ä¸å¨çæ¬åºä¸" +msgstr "ä¸è½åæ¢'%s'ï¼å 为è¿ä¸å¨çæ¬åºä¸" #: ../libsvn_client/switch.c:175 #, c-format msgid "Directory '%s' has no URL" -msgstr "ç®å½ â%sâ 没æ URL" +msgstr "ç®å½ '%s' 没æ URL" -#: ../libsvn_client/switch.c:215 ../libsvn_ra_local/ra_plugin.c:235 -#: ../libsvn_ra_local/ra_plugin.c:325 ../libsvn_wc/update_editor.c:4983 +#: ../libsvn_client/switch.c:215 ../libsvn_ra_local/ra_plugin.c:237 +#: ../libsvn_ra_local/ra_plugin.c:327 ../libsvn_wc/update_editor.c:5165 #, c-format msgid "" "'%s'\n" "is not the same repository as\n" "'%s'" msgstr "" -"â%sâ\n" +"'%s'\n" "ä¸\n" -"â%sâ\n" +"'%s'\n" "并ä¸å¨åä¸ä¸ªçæ¬åºä¸" #: ../libsvn_client/switch.c:240 #, c-format msgid "'%s' shares no common ancestry with '%s'" -msgstr "â%sâä¸â%sâ没æå ±åçç¥å " +msgstr "'%s'ä¸'%s'没æå ±åçç¥å " -#: ../libsvn_client/update.c:762 +#: ../libsvn_client/update.c:816 msgid "None of the targets are working copies" -msgstr "" +msgstr "ææç®æ é½ä¸æ¯å·¥ä½å¯æ¬" -#: ../libsvn_client/util.c:341 +#: ../libsvn_client/upgrade.c:234 +#, c-format +msgid "Working copy '%s' is already at version %s (format %d) and cannot be downgraded to version %s (format %d)" +msgstr "å·¥ä½å¯æ¬ '%s' å·²ç»æ¯çæ¬ %s (æ ¼å¼ %d)ï¼æ æ³é级å°çæ¬ %s (æ ¼å¼ %d)" + +#: ../libsvn_client/util.c:371 #, c-format msgid "Cannot mix repository and working copy targets" msgstr "ä¸è½æ··åçæ¬åºåå·¥ä½å¯æ¬ç®æ " -#: ../libsvn_delta/svndiff.c:436 +#: ../libsvn_delta/svndiff.c:495 #, c-format msgid "Invalid diff stream: insn %d cannot be decoded" msgstr "æ æçå·®å¼æµ: insn %d ä¸è½è§£ç " -#: ../libsvn_delta/svndiff.c:440 +#: ../libsvn_delta/svndiff.c:499 #, c-format msgid "Invalid diff stream: insn %d has length zero" msgstr "æ æçå·®å¼æµ: insn %d åºç° 0 é¿åº¦" -#: ../libsvn_delta/svndiff.c:444 +#: ../libsvn_delta/svndiff.c:503 #, c-format msgid "Invalid diff stream: insn %d overflows the target view" msgstr "æ æçå·®å¼æµ: insn %d 溢åºç®æ è§å¾" -#: ../libsvn_delta/svndiff.c:453 +#: ../libsvn_delta/svndiff.c:512 #, c-format msgid "Invalid diff stream: [src] insn %d overflows the source view" msgstr "æ æçå·®å¼æµ: [src] insn %d 溢åºæºè§å¾" -#: ../libsvn_delta/svndiff.c:460 +#: ../libsvn_delta/svndiff.c:519 #, c-format msgid "Invalid diff stream: [tgt] insn %d starts beyond the target view position" msgstr "æ æçå·®å¼æµ: [tgt] insn %d èµ·ç¹è¶ è¿ç®æ è§å¾ä½ç½®" -#: ../libsvn_delta/svndiff.c:467 +#: ../libsvn_delta/svndiff.c:526 #, c-format msgid "Invalid diff stream: [new] insn %d overflows the new data section" msgstr "æ æçå·®å¼æµ: [new] insn %d 溢åºæ°æ°æ®åºå" -#: ../libsvn_delta/svndiff.c:477 +#: ../libsvn_delta/svndiff.c:536 msgid "Delta does not fill the target window" msgstr "Delta 没æå¡«å ç®æ çªå£" -#: ../libsvn_delta/svndiff.c:480 +#: ../libsvn_delta/svndiff.c:539 msgid "Delta does not contain enough new data" msgstr "Delta 没æå å«è¶³å¤æ°æ°æ®" -#: ../libsvn_delta/svndiff.c:608 +#: ../libsvn_delta/svndiff.c:658 msgid "Svndiff has invalid header" msgstr "Svndiff æ°æ®å å«æ æ头" -#: ../libsvn_delta/svndiff.c:664 ../libsvn_delta/svndiff.c:853 +#: ../libsvn_delta/svndiff.c:720 ../libsvn_delta/svndiff.c:930 msgid "Svndiff contains a too-large window" msgstr "Svndiff æ°æ®å å«å¤ªå¤§ççªå£" -#: ../libsvn_delta/svndiff.c:671 ../libsvn_delta/svndiff.c:860 +#: ../libsvn_delta/svndiff.c:728 ../libsvn_delta/svndiff.c:937 msgid "Svndiff contains corrupt window header" msgstr "Svndiff æ°æ®å å«æ æçªå£" -#: ../libsvn_delta/svndiff.c:680 +#: ../libsvn_delta/svndiff.c:737 msgid "Svndiff has backwards-sliding source views" msgstr "Svndiff æ°æ®å å«ååååçèµæºè§å¾" -#: ../libsvn_delta/svndiff.c:737 ../libsvn_delta/svndiff.c:794 -#: ../libsvn_delta/svndiff.c:882 +#: ../libsvn_delta/svndiff.c:786 +msgid "Svndiff contains a too-large window header" +msgstr "Svndiff å å«è¿å¤§ççªå£å¤´" + +#: ../libsvn_delta/svndiff.c:811 ../libsvn_delta/svndiff.c:871 +#: ../libsvn_delta/svndiff.c:959 msgid "Unexpected end of svndiff input" msgstr "svndiff è¾å ¥ææç»æ" +#: ../libsvn_diff/binary_diff.c:104 +msgid "Invalid base85 value" +msgstr "æ æç base85 å¼" + +#: ../libsvn_diff/binary_diff.c:124 +msgid "Unexpected base85 line length" +msgstr "æå¤ç base85 è¡é¿åº¦" + #: ../libsvn_diff/diff_file.c:186 #, c-format msgid "File '%s' is too large to be read in to memory" -msgstr "" +msgstr "æ件 '%s' 太大ï¼æ æ³è¯»å ¥å å" -#: ../libsvn_diff/diff_file.c:1106 +#: ../libsvn_diff/diff_file.c:976 #, c-format msgid "The file '%s' changed unexpectedly during diff" -msgstr "æ件â%sâå¨æ¯è¾æé´æå¤æ¹å" +msgstr "æ件'%s'å¨æ¯è¾æé´æå¤æ¹å" -#: ../libsvn_diff/diff_file.c:1280 +#: ../libsvn_diff/diff_file.c:1153 msgid "Error in options to internal diff" msgstr "å é¨æ¯è¾çé项é误" -#: ../libsvn_diff/diff_file.c:1309 +#: ../libsvn_diff/diff_file.c:1182 #, c-format msgid "Invalid argument '%s' in diff options" msgstr "diff é项ä¸åæ°'%s'æ æ" #. Order of date components can be different in different languages -#: ../libsvn_diff/diff_file.c:1808 +#: ../libsvn_diff/diff_file.c:1703 msgid "%a %b %e %H:%M:%S %Y" msgstr "%a %b %e %H:%M:%S %Y" -#: ../libsvn_diff/diff_file.c:1889 ../libsvn_diff/diff_file.c:1905 +#: ../libsvn_diff/diff_file.c:1786 ../libsvn_diff/diff_file.c:1802 #, c-format msgid "Path '%s' must be inside the directory '%s'" -msgstr "è·¯å¾â%sâå¿ é¡»å¨ç®å½â%sâä¸" +msgstr "è·¯å¾'%s'å¿ é¡»å¨ç®å½'%s'ä¸" -#: ../libsvn_diff/diff_file.c:2451 +#: ../libsvn_diff/diff_file.c:2348 #, c-format msgid "Failed to delete mmap '%s'" -msgstr "å é¤ mmapâ%sâ失败" +msgstr "å é¤ mmap'%s'失败" + +#: ../libsvn_diff/parse-diff.c:373 +msgid "Unexpected data in base85 section" +msgstr "base85 èä¸ææå¤æ°æ®" + +#: ../libsvn_diff/parse-diff.c:442 +msgid "Base85 data expands to longer than declared filesize" +msgstr "Base85 æ°æ®å±å¼åé¿äºå£°æçæ件大å°" + +#: ../libsvn_diff/parse-diff.c:446 +msgid "Base85 data expands to smaller than declared filesize" +msgstr "Base85 æ°æ®å±å¼åçäºå£°æçæ件大å°" #: ../libsvn_diff/util.c:477 #, c-format @@ -2560,102 +4939,113 @@ msgstr " å·²ç»å并 %s:r%s%s" #: ../libsvn_fs/editor.c:217 #, c-format msgid "Revision for modifying '%s' is required" -msgstr "" +msgstr "ä¿®æ¹ '%s' éè¦æå®çæ¬" #: ../libsvn_fs/editor.c:226 #, c-format msgid "'%s' is out of date; try updating" -msgstr "â%sâ å·²ç»è¿æ¶ï¼è¯·å æ´æ°" +msgstr "'%s' å·²ç»è¿æ¶ï¼è¯·å æ´æ°" #: ../libsvn_fs/editor.c:258 #, c-format msgid "'%s' has been modified since the commit began (restart the commit)" -msgstr "èªæ交å¼å§ï¼â%sâ å·²ææ¬å°ä¿®æ¹ (éæ°æ交)" +msgstr "èªæ交å¼å§ï¼'%s' å·²ææ¬å°ä¿®æ¹ (éæ°æ交)" #: ../libsvn_fs/editor.c:316 #, c-format msgid "'%s' already exists, so may be out of date; try updating" -msgstr "â%sâ å·²ç»åå¨ï¼å æ¤å¯è½è¿æ¶ï¼è¯·å æ´æ°" +msgstr "'%s' å·²ç»åå¨ï¼å æ¤å¯è½è¿æ¶ï¼è¯·å æ´æ°" #: ../libsvn_fs/editor.c:449 msgid "The filesystem does not support 'absent' nodes" msgstr "æ¤æ件系ç»ä¸æ¯æ 'absent' èç¹" -#: ../libsvn_fs/fs-loader.c:140 +#: ../libsvn_fs/fs-loader.c:167 #, c-format msgid "Invalid name for FS type '%s'" -msgstr "æ件类åâ%sâçå称æ æ" +msgstr "æ件类å'%s'çå称æ æ" -#: ../libsvn_fs/fs-loader.c:157 ../libsvn_ra/ra_loader.c:162 -#: ../libsvn_ra/ra_loader.c:175 +#: ../libsvn_fs/fs-loader.c:184 ../libsvn_ra/ra_loader.c:166 +#: ../libsvn_ra/ra_loader.c:179 #, c-format msgid "'%s' does not define '%s()'" -msgstr "â%sâ æªå®ä¹ â%s()â" +msgstr "'%s' æªå®ä¹ '%s()'" -#: ../libsvn_fs/fs-loader.c:190 +#: ../libsvn_fs/fs-loader.c:217 #, c-format msgid "Failed to load module for FS type '%s'" -msgstr "å è½½ â%sâ æ件系ç»æ¨¡å失败" +msgstr "å è½½ '%s' æ件系ç»æ¨¡å失败" -#: ../libsvn_fs/fs-loader.c:211 +#: ../libsvn_fs/fs-loader.c:238 #, c-format msgid "Mismatched FS module version for '%s': found %d.%d.%d%s, expected %d.%d.%d%s" -msgstr "æ件系ç»æ¨¡å â%sâ çæ¬ä¸å¹é : æ¾å° %d.%d.%d%sï¼ææ %d.%d.%d%s" +msgstr "æ件系ç»æ¨¡å '%s' çæ¬ä¸å¹é : æ¾å° %d.%d.%d%sï¼ææ %d.%d.%d%s" -#: ../libsvn_fs/fs-loader.c:301 +#: ../libsvn_fs/fs-loader.c:328 #, c-format msgid "Unknown FS type '%s'" -msgstr "æªç¥çæ件系ç»ç±»å â%sâ" +msgstr "æªç¥çæ件系ç»ç±»å '%s'" -#: ../libsvn_fs/fs-loader.c:443 +#: ../libsvn_fs/fs-loader.c:477 #, c-format msgid "Path '%s' is not in UTF-8" -msgstr "è·¯å¾ â%sâ ä¸æ¯ UTF-8 ç¼ç " +msgstr "è·¯å¾ '%s' ä¸æ¯ UTF-8 ç¼ç " -#: ../libsvn_fs/fs-loader.c:451 +#: ../libsvn_fs/fs-loader.c:485 #, c-format msgid "Path '%s' contains '.' or '..' element" -msgstr "è·¯å¾ â%sâ å å« â.â æ â..â å ç´ " +msgstr "è·¯å¾ '%s' å å« '.' æ '..' å ç´ " + +#: ../libsvn_fs/fs-loader.c:497 ../libsvn_fs_fs/tree.c:2492 +#: ../libsvn_subr/path.c:1240 +#, c-format +msgid "Invalid control character '0x%02x' in path '%s'" +msgstr "æ ææ§å¶å符 '0x%02x' å¨è·¯å¾ '%s' ä¸" -#: ../libsvn_fs/fs-loader.c:636 ../libsvn_repos/repos.c:2175 +#: ../libsvn_fs/fs-loader.c:677 ../libsvn_repos/repos.c:1990 msgid "Hotcopy source and destination are equal" -msgstr "" +msgstr "hotcopy æºåç®æ ç¸å" -#: ../libsvn_fs/fs-loader.c:646 +#: ../libsvn_fs/fs-loader.c:687 #, c-format msgid "'%s' already exists and is a file" -msgstr "â%sâå·²åå¨ï¼å®æ¯æ件" +msgstr "'%s'å·²åå¨ï¼å®æ¯æ件" -#: ../libsvn_fs/fs-loader.c:651 +#: ../libsvn_fs/fs-loader.c:692 #, c-format msgid "'%s' already exists and has an unknown node kind" -msgstr "â%sâå·²åå¨ï¼å ·ææªç¥çèç¹ç±»å" +msgstr "'%s'å·²åå¨ï¼å ·ææªç¥çèç¹ç±»å" -#: ../libsvn_fs/fs-loader.c:669 +#: ../libsvn_fs/fs-loader.c:710 #, c-format msgid "The filesystem type of the hotcopy source ('%s') does not match the filesystem type of the hotcopy destination ('%s')" -msgstr "" +msgstr "hotcopy æº('%s')çæ件系ç»ç±»åä¸ hotcopy ç®æ ('%s')çæ件系ç»ç±»åä¸å¹é " + +#: ../libsvn_fs/fs-loader.c:981 ../libsvn_fs/fs-loader.c:999 +#, c-format +msgid "Attempt to modify internal transaction property '%s'" +msgstr "è¯å¾ä¿®æ¹å é¨äºå¡å±æ§ '%s'" -#: ../libsvn_fs/fs-loader.c:1571 +#: ../libsvn_fs/fs-loader.c:1822 #, c-format msgid "Malformed UUID '%s'" -msgstr "éæ³ UUID â%sâ" +msgstr "éæ³ UUID '%s'" -#: ../libsvn_fs/fs-loader.c:1600 +#: ../libsvn_fs/fs-loader.c:1851 msgid "Negative expiration date passed to svn_fs_lock" msgstr "ä¼ éå° svn_fs_lock çæææéæ³" -#: ../libsvn_fs/fs-loader.c:1615 +#: ../libsvn_fs/fs-loader.c:1866 #, c-format msgid "Lock token URI '%s' has bad scheme; expected '%s'" msgstr "é令ç URI '%s' çæ¹æ¡é误ï¼æææ¯ '%s'" -#: ../libsvn_fs/fs-loader.c:1624 +#: ../libsvn_fs/fs-loader.c:1876 #, c-format msgid "Lock token '%s' is not ASCII or is a control character at byte %u" msgstr "é令ç '%s' å¨åè %u å¤ï¼ä¸æ¯ ASCII å符æè æ¯ä¸ä¸ªæ§å¶å符" -#: ../libsvn_fs/fs-loader.c:1632 +#: ../libsvn_fs/fs-loader.c:1886 #, c-format msgid "Lock token URI '%s' is not XML-safe" msgstr "é令ç URI '%s' ä¸æ¯ XML å®å ¨ç" @@ -2663,7 +5053,7 @@ msgstr "é令ç URI '%s' ä¸æ¯ XML å® #: ../libsvn_fs_base/bdb/bdb-err.c:104 #, c-format msgid "Berkeley DB error for filesystem '%s' while %s:\n" -msgstr "å½ %s å ³éæä»¶ç³»ç» â%sâ ç BDB ç¯å¢å¥ææ¶åºé: \n" +msgstr "å½ %s å ³éæä»¶ç³»ç» '%s' ç BDB ç¯å¢å¥ææ¶åºé: \n" #: ../libsvn_fs_base/bdb/changes-table.c:94 msgid "creating change" @@ -2673,23 +5063,21 @@ msgstr "æ£å¨å建修æ¹" msgid "deleting changes" msgstr "æ£å¨å é¤ä¿®æ¹" -#: ../libsvn_fs_base/bdb/changes-table.c:170 ../libsvn_fs_fs/transaction.c:665 -#: ../libsvn_fs_x/transaction.c:902 +#: ../libsvn_fs_base/bdb/changes-table.c:170 ../libsvn_fs_fs/transaction.c:703 msgid "Missing required node revision ID" msgstr "缺å°å¿ é¡»çèç¹çæ¬ ID" -#: ../libsvn_fs_base/bdb/changes-table.c:181 ../libsvn_fs_fs/transaction.c:675 -#: ../libsvn_fs_x/transaction.c:912 +#: ../libsvn_fs_base/bdb/changes-table.c:181 ../libsvn_fs_fs/transaction.c:713 msgid "Invalid change ordering: new node revision ID without delete" msgstr "æ æçæ¹å顺åº: 没æå é¤æ°èç¹çæ¬ ID" -#: ../libsvn_fs_base/bdb/changes-table.c:191 ../libsvn_fs_fs/transaction.c:686 -#: ../libsvn_fs_x/transaction.c:923 +#: ../libsvn_fs_base/bdb/changes-table.c:191 ../libsvn_fs_fs/transaction.c:724 +#: ../libsvn_fs_x/transaction.c:985 msgid "Invalid change ordering: non-add change on deleted path" msgstr "æ æçæ¹å顺åº: å¨å·²ç»å é¤çè·¯å¾æ§è¡éå¢å ä¿®æ¹" -#: ../libsvn_fs_base/bdb/changes-table.c:200 ../libsvn_fs_fs/transaction.c:695 -#: ../libsvn_fs_x/transaction.c:932 +#: ../libsvn_fs_base/bdb/changes-table.c:200 ../libsvn_fs_fs/transaction.c:733 +#: ../libsvn_fs_x/transaction.c:993 msgid "Invalid change ordering: add change on preexisting path" msgstr "æ æçæ¹å顺åº: å¨å·²æè·¯å¾å¢å ä¿®æ¹" @@ -2702,7 +5090,7 @@ msgstr "æ£å¨ä¸ºè¯»åä¿®æ¹å建æé #: ../libsvn_fs_base/bdb/changes-table.c:441 #, c-format msgid "Error reading changes for key '%s'" -msgstr "读åé® â%sâ çä¿®æ¹æ¶åºé" +msgstr "读åé® '%s' çä¿®æ¹æ¶åºé" #: ../libsvn_fs_base/bdb/changes-table.c:381 #: ../libsvn_fs_base/bdb/changes-table.c:464 @@ -2723,7 +5111,7 @@ msgstr "å¨æ ¡éªåå±ç°è¡¨ä¸ï¼åªæ #: ../libsvn_fs_base/bdb/checksum-reps-table.c:135 #, c-format msgid "Representation key for checksum '%s' exists in filesystem '%s'." -msgstr "æ ¡éªå â%sâ çå±ç°é®å·²ç»åå¨äºæä»¶ç³»ç» â%sâ ä¸ã" +msgstr "æ ¡éªå '%s' ç表示é®å·²ç»åå¨äºæä»¶ç³»ç» '%s' ä¸ã" #: ../libsvn_fs_base/bdb/checksum-reps-table.c:142 msgid "storing checksum-reps record" @@ -2731,15 +5119,15 @@ msgstr "æ£å¨åå¨æ ¡éªåå±ç°è®°å½ #: ../libsvn_fs_base/bdb/checksum-reps-table.c:164 msgid "deleting entry from 'checksum-reps' table" -msgstr "æ£å¨ä» âchecksum-repsâ 表ä¸å é¤æ¡ç®" +msgstr "æ£å¨ä» 'checksum-reps' 表ä¸å é¤æ¡ç®" #: ../libsvn_fs_base/bdb/checksum-reps-table.c:186 msgid "allocating new representation reuse ID (getting 'next-key')" -msgstr "æ£å¨åé æ°å±ç°çå¤ç¨ ID(æ£å¨è·å ânext-keyâ)" +msgstr "æ£å¨åé æ°è¡¨ç¤ºçå¤ç¨ ID(æ£å¨è·å 'next-key')" #: ../libsvn_fs_base/bdb/checksum-reps-table.c:207 msgid "bumping next representation reuse ID" -msgstr "è·³å°ä¸ä¸ªå±ç°å¤ç¨ ID" +msgstr "è·³å°ä¸ä¸ªè¡¨ç¤ºå¤ç¨ ID" #: ../libsvn_fs_base/bdb/copies-table.c:92 msgid "storing copy record" @@ -2747,7 +5135,7 @@ msgstr "æ£å¨åå¨å¯æ¬è®°å½" #: ../libsvn_fs_base/bdb/copies-table.c:115 msgid "allocating new copy ID (getting 'next-key')" -msgstr "æ£å¨åé æ°å¯æ¬ ID(æ£å¨è·å ânext-keyâ)" +msgstr "æ£å¨åé æ°å¯æ¬ ID(æ£å¨è·å 'next-key')" #: ../libsvn_fs_base/bdb/copies-table.c:133 msgid "bumping next copy key" @@ -2755,7 +5143,7 @@ msgstr "æ£å¨æåä¸ä¸ä¸ªå¯æ¬é®" #: ../libsvn_fs_base/bdb/copies-table.c:171 msgid "deleting entry from 'copies' table" -msgstr "æ£å¨ä» âcopiesâ 表ä¸å é¤æ¡ç®" +msgstr "æ£å¨ä» 'copies' 表ä¸å é¤æ¡ç®" #: ../libsvn_fs_base/bdb/copies-table.c:199 msgid "reading copy" @@ -2767,7 +5155,7 @@ msgstr "æ£å¨åå¨å é令çè®°å½" #: ../libsvn_fs_base/bdb/lock-tokens-table.c:108 msgid "deleting entry from 'lock-tokens' table" -msgstr "æ£å¨ä» âlock-tokensâ 表ä¸å é¤æ¡ç®" +msgstr "æ£å¨ä» 'lock-tokens' 表ä¸å é¤æ¡ç®" #: ../libsvn_fs_base/bdb/lock-tokens-table.c:135 msgid "reading lock token" @@ -2779,7 +5167,7 @@ msgstr "æ£å¨åå¨å éè®°å½" #: ../libsvn_fs_base/bdb/locks-table.c:116 msgid "deleting lock from 'locks' table" -msgstr "æ£å¨ä»âlocksâ表å é¤é" +msgstr "æ£å¨ä»'locks'表å é¤é" #: ../libsvn_fs_base/bdb/locks-table.c:143 msgid "reading lock" @@ -2799,7 +5187,7 @@ msgstr "æ£å¨ååºå é令ç (æ£å¨ #: ../libsvn_fs_base/bdb/miscellaneous-table.c:95 msgid "deleting record from 'miscellaneous' table" -msgstr "æ£å¨ä»âmiscellaneousâ表å é¤æ¡ç®" +msgstr "æ£å¨ä»'miscellaneous'表å é¤æ¡ç®" #: ../libsvn_fs_base/bdb/miscellaneous-table.c:103 msgid "storing miscellaneous record" @@ -2812,7 +5200,7 @@ msgstr "æ£å¨ååºæ项记å½" #: ../libsvn_fs_base/bdb/node-origins-table.c:117 #, c-format msgid "Node origin for '%s' exists in filesystem '%s' with a different value (%s) than what we were about to store (%s)" -msgstr "â%sâ çåå§èç¹å¨æä»¶ç³»ç» â%sâ ä¸ï¼åå¼(%s)ä¸æ们è¦åå¨çå¼(%s)ä¸å" +msgstr "'%s' çåå§èç¹å¨æä»¶ç³»ç» '%s' ä¸ï¼åå¼(%s)ä¸æ们è¦åå¨çå¼(%s)ä¸å" #: ../libsvn_fs_base/bdb/node-origins-table.c:127 msgid "storing node-origins record" @@ -2820,11 +5208,11 @@ msgstr "æ£å¨åå¨èç¹åå§è®°å½" #: ../libsvn_fs_base/bdb/node-origins-table.c:142 msgid "deleting entry from 'node-origins' table" -msgstr "æ£å¨ä»ânode-originsâ表å é¤æ¡ç®" +msgstr "æ£å¨ä»'node-origins'表å é¤æ¡ç®" #: ../libsvn_fs_base/bdb/nodes-table.c:102 msgid "allocating new node ID (getting 'next-key')" -msgstr "æ£å¨åé æ°çèç¹ ID (æ£å¨è·åânext-keyâ)" +msgstr "æ£å¨åé æ°çèç¹ ID (æ£å¨è·å'next-key')" #: ../libsvn_fs_base/bdb/nodes-table.c:120 msgid "bumping next node ID key" @@ -2833,11 +5221,11 @@ msgstr "æ£å¨æåä¸ä¸ä¸ªèç¹ ID é #: ../libsvn_fs_base/bdb/nodes-table.c:156 #, c-format msgid "Successor id '%s' (for '%s') already exists in filesystem '%s'" -msgstr "åç» id â%sâ(å¯¹äº %s)å·²ç»å¨æä»¶ç³»ç» â%sâ ä¸" +msgstr "åç» id '%s'(å¯¹äº %s)å·²ç»å¨æä»¶ç³»ç» '%s' ä¸" #: ../libsvn_fs_base/bdb/nodes-table.c:182 msgid "deleting entry from 'nodes' table" -msgstr "æ£å¨ä»ânodesâ表å é¤æ¡ç®" +msgstr "æ£å¨ä»'nodes'表å é¤æ¡ç®" #. Handle any other error conditions. #: ../libsvn_fs_base/bdb/nodes-table.c:220 @@ -2848,54 +5236,53 @@ msgstr "æ£å¨è¯»åèç¹çæ¬" msgid "storing node revision" msgstr "æ£å¨åå¨èç¹çæ¬" -#: ../libsvn_fs_base/bdb/reps-table.c:98 -#: ../libsvn_fs_base/bdb/reps-table.c:200 +#: ../libsvn_fs_base/bdb/reps-table.c:98 ../libsvn_fs_base/bdb/reps-table.c:200 #, c-format msgid "No such representation '%s'" -msgstr "没æ修订çâ%sâ" +msgstr "没æ表示'%s'" #. Handle any other error conditions. #: ../libsvn_fs_base/bdb/reps-table.c:101 msgid "reading representation" -msgstr "æ£å¨è¯»å修订ç" +msgstr "æ£å¨è¯»å表示" #: ../libsvn_fs_base/bdb/reps-table.c:128 msgid "storing representation" -msgstr "æ£å¨åå¨ä¿®è®¢ç" +msgstr "æ£å¨åå¨è¡¨ç¤º" #: ../libsvn_fs_base/bdb/reps-table.c:156 msgid "allocating new representation (getting next-key)" -msgstr "æ£å¨åé æ°ä¿®è®¢ç(æ£å¨è·å next-key)" +msgstr "æ£å¨åé æ°è¡¨ç¤º(æ£å¨è·å next-key)" #: ../libsvn_fs_base/bdb/reps-table.c:177 msgid "bumping next representation key" -msgstr "æ£å¨æåä¸ä¸ä¸ªä¿®è®¢çé®" +msgstr "æ£å¨æåä¸ä¸ä¸ªè¡¨ç¤ºé®" #. Handle any other error conditions. #: ../libsvn_fs_base/bdb/reps-table.c:203 msgid "deleting representation" -msgstr "æ£å¨å é¤ä¿®è®¢ç" +msgstr "æ£å¨å é¤è¡¨ç¤º" #. Handle any other error conditions. -#: ../libsvn_fs_base/bdb/rev-table.c:95 +#: ../libsvn_fs_base/bdb/rev-table.c:98 msgid "reading filesystem revision" msgstr "æ£å¨è¯»åæ件系ç»çæ¬" -#: ../libsvn_fs_base/bdb/rev-table.c:141 +#: ../libsvn_fs_base/bdb/rev-table.c:144 msgid "updating filesystem revision" msgstr "æ£å¨æ´æ°æ件系ç»çæ¬" -#: ../libsvn_fs_base/bdb/rev-table.c:149 +#: ../libsvn_fs_base/bdb/rev-table.c:152 msgid "storing filesystem revision" msgstr "æ£å¨åå¨æ件系ç»çæ¬" -#: ../libsvn_fs_base/bdb/rev-table.c:179 +#: ../libsvn_fs_base/bdb/rev-table.c:182 msgid "getting youngest revision (creating cursor)" -msgstr "" +msgstr "è·åææ°çæ¬(å建游æ )" -#: ../libsvn_fs_base/bdb/rev-table.c:203 +#: ../libsvn_fs_base/bdb/rev-table.c:206 msgid "getting youngest revision (finding last entry)" -msgstr "" +msgstr "è·åææ°çæ¬(æ¥æ¾æåæ¡ç®)" #. You can't commit a transaction with open cursors, because: #. 1) key/value pairs don't get deleted until the cursors referring @@ -2903,9 +5290,9 @@ msgstr "" #. reasons, and txn_commit shouldn't fail that way, and #. 2) using a cursor after committing its transaction can cause #. undetectable database corruption. -#: ../libsvn_fs_base/bdb/rev-table.c:213 +#: ../libsvn_fs_base/bdb/rev-table.c:216 msgid "getting youngest revision (closing cursor)" -msgstr "" +msgstr "è·åææ°çæ¬(å ³é游æ )" #: ../libsvn_fs_base/bdb/strings-table.c:94 #: ../libsvn_fs_base/bdb/strings-table.c:300 @@ -2919,7 +5306,7 @@ msgstr "æ£å¨ç§»å¨æé" #: ../libsvn_fs_base/bdb/strings-table.c:136 msgid "rerunning cursor move" -msgstr "" +msgstr "éæ°ç§»å¨æ¸¸æ " #: ../libsvn_fs_base/bdb/strings-table.c:228 #: ../libsvn_fs_base/bdb/strings-table.c:247 @@ -2973,7 +5360,7 @@ msgstr "æ£å¨åå ¥å·²å¤å¶çæ°æ®" #: ../libsvn_fs_base/bdb/strings-table.c:535 msgid "fetching string data for a copy" -msgstr "" +msgstr "è·åå¤å¶æéçå符串æ°æ®" #: ../libsvn_fs_base/bdb/txn-table.c:99 msgid "storing transaction record" @@ -2981,7 +5368,7 @@ msgstr "æ£å¨åå¨äºå¡è®°å½" #: ../libsvn_fs_base/bdb/txn-table.c:123 msgid "allocating new transaction ID (getting 'next-key')" -msgstr "æ£å¨åé æ°äºå¡ ID(æ£å¨è·å ânext-keyâ)" +msgstr "æ£å¨åé æ°äºå¡ ID(æ£å¨è·å 'next-key')" #: ../libsvn_fs_base/bdb/txn-table.c:142 msgid "bumping next transaction key" @@ -2989,7 +5376,7 @@ msgstr "æ£å¨è·³å°ä¸ä¸ä¸ªäºå¡é®" #: ../libsvn_fs_base/bdb/txn-table.c:188 msgid "deleting entry from 'transactions' table" -msgstr "æ£å¨ä»âtransactionsâ表å é¤æ¡ç®" +msgstr "æ£å¨ä»'transactions'表å é¤æ¡ç®" #: ../libsvn_fs_base/bdb/txn-table.c:218 msgid "reading transaction" @@ -3018,35 +5405,35 @@ msgstr "设置çæ¬åº UUID" #: ../libsvn_fs_base/dag.c:228 #, c-format msgid "Corrupt DB: initial transaction id not '0' in filesystem '%s'" -msgstr "æåçæ°æ®åº: åå§çäºå¡ç¼å·å¨æ件系ç»â%sâä¸ä¸æ¯â0â" +msgstr "æåçæ°æ®åº: åå§çäºå¡ç¼å·å¨æ件系ç»'%s'ä¸ä¸æ¯'0'" #: ../libsvn_fs_base/dag.c:236 #, c-format msgid "Corrupt DB: initial copy id not '0' in filesystem '%s'" -msgstr "æåçæ°æ®åº: åå§çå¯æ¬ç¼å·å¨æ件系ç»â%sâä¸ä¸æ¯â0â" +msgstr "æåçæ°æ®åº: åå§çå¯æ¬ç¼å·å¨æ件系ç»'%s'ä¸ä¸æ¯'0'" #: ../libsvn_fs_base/dag.c:245 #, c-format msgid "Corrupt DB: initial revision number is not '0' in filesystem '%s'" -msgstr "æåçæ°æ®åº: åå§ççæ¬å·å¨æ件系ç»â%sâä¸ä¸æ¯â0â" +msgstr "æåçæ°æ®åº: åå§ççæ¬å·å¨æ件系ç»'%s'ä¸ä¸æ¯'0'" #: ../libsvn_fs_base/dag.c:294 msgid "Attempted to get entries of a non-directory node" msgstr "è¯å¾ä»éç®å½èç¹ä¸è·åæ¡ç®" #: ../libsvn_fs_base/dag.c:461 ../libsvn_fs_fs/dag.c:377 -#: ../libsvn_fs_x/dag.c:377 +#: ../libsvn_fs_x/dag.c:331 #, c-format msgid "Attempted to create a node with an illegal name '%s'" -msgstr "è¯å¾ç¨éæ³çååâ%sâå建èç¹" +msgstr "è¯å¾ç¨éæ³çåå'%s'å建èç¹" #: ../libsvn_fs_base/dag.c:467 ../libsvn_fs_fs/dag.c:383 -#: ../libsvn_fs_x/dag.c:383 +#: ../libsvn_fs_x/dag.c:337 msgid "Attempted to create entry in non-directory parent" msgstr "è¯å¾å¨éç®å½çç¶èç¹å建æ¡ç®" #: ../libsvn_fs_base/dag.c:473 ../libsvn_fs_base/dag.c:737 -#: ../libsvn_fs_fs/dag.c:389 ../libsvn_fs_x/dag.c:389 +#: ../libsvn_fs_fs/dag.c:389 ../libsvn_fs_x/dag.c:343 #, c-format msgid "Attempted to clone child of non-mutable node" msgstr "è¯å¾å ééå¯åèç¹çåèç¹" @@ -3057,12 +5444,12 @@ msgid "Attempted to create entry that al msgstr "è¯å¾å建已ç»åå¨çæ¡ç®" #: ../libsvn_fs_base/dag.c:529 ../libsvn_fs_fs/dag.c:468 -#: ../libsvn_fs_x/dag.c:468 +#: ../libsvn_fs_x/dag.c:403 msgid "Attempted to set entry in non-directory node" msgstr "è¯å¾å¨éç®å½èç¹ä¸è®¾ç½®æ¡ç®" #: ../libsvn_fs_base/dag.c:535 ../libsvn_fs_fs/dag.c:474 -#: ../libsvn_fs_x/dag.c:474 +#: ../libsvn_fs_x/dag.c:409 msgid "Attempted to set entry in immutable node" msgstr "è¯å¾å¨ä¸åèç¹è®¾ç½®æ¡ç®" @@ -3074,84 +5461,84 @@ msgstr "ä¸è½å¨*ä¸å*èç¹çæ¬ %s #: ../libsvn_fs_base/dag.c:743 #, c-format msgid "Attempted to make a child clone with an illegal name '%s'" -msgstr "è¯å¾ä»¥éæ³ååâ%sâå建åå é" +msgstr "è¯å¾ä»¥éæ³åå'%s'å建åå é" #: ../libsvn_fs_base/dag.c:860 #, c-format msgid "Attempted to delete entry '%s' from *non*-directory node" -msgstr "è¯å¾ä»*é*ç®å½èç¹å é¤æ¡ç®â%sâ" +msgstr "è¯å¾ä»*é*ç®å½èç¹å é¤æ¡ç®'%s'" #: ../libsvn_fs_base/dag.c:866 #, c-format msgid "Attempted to delete entry '%s' from immutable directory node" -msgstr "è¯å¾ä»ä¸åç®å½èç¹å é¤æ¡ç®â%sâ" +msgstr "è¯å¾ä»ä¸åç®å½èç¹å é¤æ¡ç®'%s'" #: ../libsvn_fs_base/dag.c:873 #, c-format msgid "Attempted to delete a node with an illegal name '%s'" -msgstr "è¯å¾å é¤ä¸ä¸ªéæ³ååâ%sâçèç¹" +msgstr "è¯å¾å é¤ä¸ä¸ªéæ³åå'%s'çèç¹" #: ../libsvn_fs_base/dag.c:888 ../libsvn_fs_base/dag.c:921 #, c-format msgid "Delete failed: directory has no entry '%s'" -msgstr "å é¤å¤±è´¥: ç®å½æ²¡ææ¡ç®â%sâ" +msgstr "å é¤å¤±è´¥: ç®å½æ²¡ææ¡ç®'%s'" #: ../libsvn_fs_base/dag.c:970 #, c-format msgid "Attempted removal of immutable node" msgstr "è¯å¾å é¤ä¸åèç¹" -#: ../libsvn_fs_base/dag.c:1088 +#: ../libsvn_fs_base/dag.c:1090 #, c-format msgid "Attempted to get textual contents of a *non*-file node" msgstr "è¯å¾è·å*é*æ件èç¹çææ¬å 容" -#: ../libsvn_fs_base/dag.c:1121 +#: ../libsvn_fs_base/dag.c:1123 #, c-format msgid "Attempted to get length of a *non*-file node" msgstr "è¯å¾è·å*é*æ件èç¹çé¿åº¦" -#: ../libsvn_fs_base/dag.c:1148 +#: ../libsvn_fs_base/dag.c:1150 #, c-format msgid "Attempted to get checksum of a *non*-file node" msgstr "è¯å¾è·å*é*æ件èç¹çæ ¡éªå" -#: ../libsvn_fs_base/dag.c:1187 ../libsvn_fs_base/dag.c:1244 +#: ../libsvn_fs_base/dag.c:1189 ../libsvn_fs_base/dag.c:1246 #, c-format msgid "Attempted to set textual contents of a *non*-file node" msgstr "è¯å¾è®¾ç½®*é*æ件èç¹çææ¬å 容" -#: ../libsvn_fs_base/dag.c:1193 ../libsvn_fs_base/dag.c:1250 +#: ../libsvn_fs_base/dag.c:1195 ../libsvn_fs_base/dag.c:1252 #, c-format msgid "Attempted to set textual contents of an immutable node" msgstr "è¯å¾è®¾ç½®ä¸åèç¹çææ¬å 容" -#: ../libsvn_fs_base/dag.c:1279 ../libsvn_fs_base/reps-strings.c:829 +#: ../libsvn_fs_base/dag.c:1281 ../libsvn_fs_base/reps-strings.c:829 #, c-format msgid "Checksum mismatch on representation '%s'" msgstr "'%s' çæ ¡éªåä¸å¹é " -#: ../libsvn_fs_base/dag.c:1373 +#: ../libsvn_fs_base/dag.c:1375 #, c-format msgid "Attempted to open non-existent child node '%s'" -msgstr "è¯å¾æå¼ä¸åå¨çåèç¹â%sâ" +msgstr "è¯å¾æå¼ä¸åå¨çåèç¹'%s'" -#: ../libsvn_fs_base/dag.c:1379 +#: ../libsvn_fs_base/dag.c:1381 #, c-format msgid "Attempted to open node with an illegal name '%s'" -msgstr "è¯å¾ä»¥éæ³ååâ%sâæå¼èç¹" +msgstr "è¯å¾ä»¥éæ³åå'%s'æå¼èç¹" -#: ../libsvn_fs_base/dag.c:1705 +#: ../libsvn_fs_base/dag.c:1713 #, c-format msgid "Attempted merge tracking info change on immutable node" msgstr "è¯å¾å¨ä¸åèç¹å并è·è¸ªä¿¡æ¯çä¿®æ¹" -#: ../libsvn_fs_base/dag.c:1745 +#: ../libsvn_fs_base/dag.c:1753 #, c-format msgid "Attempted mergeinfo count change on immutable node" msgstr "è¯å¾å¨ä¸åèç¹ä¿®æ¹å并信æ¯è®¡æ°" -#: ../libsvn_fs_base/dag.c:1757 +#: ../libsvn_fs_base/dag.c:1765 #, c-format msgid "Invalid value (%%%s) for node revision mergeinfo count" msgstr "èç¹å并信æ¯è®¡æ°çå¼éæ³(%%%s)" @@ -3159,214 +5546,214 @@ msgstr "èç¹å并信æ¯è®¡æ°çå¼é #: ../libsvn_fs_base/err.c:46 #, c-format msgid "Corrupt filesystem revision %ld in filesystem '%s'" -msgstr "æ件系ç»çæ¬ %ld æåï¼å ¶æ件系ç»æ¯ â%sâ" +msgstr "æ件系ç»çæ¬ %ld æåï¼å ¶æ件系ç»æ¯ '%s'" -#: ../libsvn_fs_base/err.c:57 ../libsvn_fs_fs/cached_data.c:276 +#: ../libsvn_fs_base/err.c:57 ../libsvn_fs_fs/cached_data.c:281 #: ../libsvn_fs_x/cached_data.c:261 #, c-format msgid "Reference to non-existent node '%s' in filesystem '%s'" -msgstr "å¼ç¨ä¸åå¨çèç¹ â%sâï¼å ¶æ件系ç»æ¯ â%sâ" +msgstr "å¼ç¨ä¸åå¨çèç¹ '%s'ï¼å ¶æ件系ç»æ¯ '%s'" #: ../libsvn_fs_base/err.c:68 #, c-format msgid "No such revision %ld in filesystem '%s'" -msgstr "没æçæ¬ %ldï¼å ¶æ件系ç»æ¯â%sâ" +msgstr "没æçæ¬ %ldï¼å ¶æ件系ç»æ¯'%s'" #: ../libsvn_fs_base/err.c:80 #, c-format msgid "Corrupt entry in 'transactions' table for '%s' in filesystem '%s'" -msgstr "â%sâ ç âtransactionsâ 表ææ æå ¥å£ï¼å ¶æ件系ç»æ¯ â%sâ" +msgstr "'%s' ç 'transactions' 表ææ æå ¥å£ï¼å ¶æ件系ç»æ¯ '%s'" #: ../libsvn_fs_base/err.c:91 #, c-format msgid "Corrupt entry in 'copies' table for '%s' in filesystem '%s'" -msgstr "â%sâ ç âcopiesâ 表ææ æå ¥å£ï¼å ¶æ件系ç»æ¯ â%sâ" +msgstr "'%s' ç 'copies' 表ææ æå ¥å£ï¼å ¶æ件系ç»æ¯ '%s'" #: ../libsvn_fs_base/err.c:102 #, c-format msgid "No transaction named '%s' in filesystem '%s'" -msgstr "äºå¡ â%sâ ä¸å¨æä»¶ç³»ç» â%sâ ä¸" +msgstr "äºå¡ '%s' ä¸å¨æä»¶ç³»ç» '%s' ä¸" #: ../libsvn_fs_base/err.c:113 #, c-format msgid "Cannot modify transaction named '%s' in filesystem '%s'" -msgstr "æ æ³ä¿®æ¹å为 â%sâ çäºå¡ï¼å ¶æ件系ç»æ¯ â%sâ" +msgstr "æ æ³ä¿®æ¹å为 '%s' çäºå¡ï¼å ¶æ件系ç»æ¯ '%s'" #: ../libsvn_fs_base/err.c:124 #, c-format msgid "No copy with id '%s' in filesystem '%s'" -msgstr "没ææ è¯ â%sâ çå¯æ¬ï¼å ¶æ件系ç»æ¯ â%sâ" +msgstr "没ææ è¯ '%s' çå¯æ¬ï¼å ¶æ件系ç»æ¯ '%s'" #: ../libsvn_fs_base/err.c:134 #, c-format msgid "Token '%s' does not point to any existing lock in filesystem '%s'" -msgstr "æ è¯â%sâ没ææåæ件系ç»â%sâä¸åå¨çé" +msgstr "æ è¯'%s'没ææåæ件系ç»'%s'ä¸åå¨çé" #: ../libsvn_fs_base/err.c:144 #, c-format msgid "No token given for path '%s' in filesystem '%s'" -msgstr "è·¯å¾ â%sâ 没æ令çï¼å ¶æ件系ç»æ¯ â%sâ" +msgstr "è·¯å¾ '%s' 没æ令çï¼å ¶æ件系ç»æ¯ '%s'" #: ../libsvn_fs_base/err.c:153 #, c-format msgid "Corrupt lock in 'locks' table for '%s' in filesystem '%s'" -msgstr "â%sâ ç âlocksâ 表éæåï¼å ¶æ件系ç»æ¯ â%sâ" +msgstr "'%s' ç 'locks' 表éæåï¼å ¶æ件系ç»æ¯ '%s'" #: ../libsvn_fs_base/err.c:163 #, c-format msgid "No record in 'node-origins' table for node id '%s' in filesystem '%s'" -msgstr "å¨ ânode-originsâ 表ä¸ï¼æ²¡æèç¹ â%sâ çè®°å½ï¼å ¶æ件系ç»æ¯ â%sâ" +msgstr "å¨ 'node-origins' 表ä¸ï¼æ²¡æèç¹ '%s' çè®°å½ï¼å ¶æ件系ç»æ¯ '%s'" #: ../libsvn_fs_base/err.c:173 #, c-format msgid "No record in 'checksum-reps' table for checksum '%s' in filesystem '%s'" -msgstr "å¨ âchecksum-repsâ 表ä¸ï¼æ²¡ææ ¡éªå â%sâ çè®°å½ï¼å ¶æ件系ç»æ¯ â%sâ" +msgstr "å¨ 'checksum-reps' 表ä¸ï¼æ²¡ææ ¡éªå '%s' çè®°å½ï¼å ¶æ件系ç»æ¯ '%s'" -#: ../libsvn_fs_base/fs.c:87 +#: ../libsvn_fs_base/fs.c:88 #, c-format msgid "Bad database version: got %d.%d.%d, should be at least %d.%d.%d" msgstr "ä¸æ£ç¡®çæ°æ®åºçæ¬: å¾å° %d.%d.%dï¼åºè¯¥æä½æ¯ %d.%d.%d" -#: ../libsvn_fs_base/fs.c:98 +#: ../libsvn_fs_base/fs.c:99 #, c-format msgid "Bad database version: compiled with %d.%d.%d, running against %d.%d.%d" msgstr "ä¸æ£ç¡®çæ°æ®åºçæ¬: ç¨ %d.%d.%d çæ¬ç¼è¯ï¼æ£å¨è¿è¡çæ¬ %d.%d.%d" -#: ../libsvn_fs_base/fs.c:188 +#: ../libsvn_fs_base/fs.c:189 #, c-format msgid "Berkeley DB error for filesystem '%s' while closing environment:\n" -msgstr "å ³éæ件系ç»â%sâçBDBç¯å¢å¥ææ¶åºé: \n" +msgstr "å ³éæ件系ç»'%s'çBDBç¯å¢å¥ææ¶åºé: \n" -#: ../libsvn_fs_base/fs.c:607 +#: ../libsvn_fs_base/fs.c:616 #, c-format msgid "Berkeley DB error for filesystem '%s' while creating environment:\n" -msgstr "å建æ件系ç»â%sâçBDBç¯å¢å¥ææ¶åºé: \n" +msgstr "å建æ件系ç»'%s'çBDBç¯å¢å¥ææ¶åºé: \n" -#: ../libsvn_fs_base/fs.c:613 +#: ../libsvn_fs_base/fs.c:622 #, c-format msgid "Berkeley DB error for filesystem '%s' while opening environment:\n" -msgstr "æå¼æ件系ç»â%sâçBDBç¯å¢å¥ææ¶åºé: \n" +msgstr "æå¼æ件系ç»'%s'çBDBç¯å¢å¥ææ¶åºé: \n" -#: ../libsvn_fs_base/fs.c:628 +#: ../libsvn_fs_base/fs.c:637 msgid "creating 'nodes' table" -msgstr "æ£å¨å建ânodesâ表" +msgstr "æ£å¨å建'nodes'表" -#: ../libsvn_fs_base/fs.c:629 +#: ../libsvn_fs_base/fs.c:638 msgid "opening 'nodes' table" -msgstr "æ£å¨æå¼ânodesâ表" +msgstr "æ£å¨æå¼'nodes'表" -#: ../libsvn_fs_base/fs.c:634 +#: ../libsvn_fs_base/fs.c:643 msgid "creating 'revisions' table" -msgstr "æ£å¨å建ârevisionsâ表" +msgstr "æ£å¨å建'revisions'表" -#: ../libsvn_fs_base/fs.c:635 +#: ../libsvn_fs_base/fs.c:644 msgid "opening 'revisions' table" -msgstr "æ£å¨æå¼ârevisionsâ表" +msgstr "æ£å¨æå¼'revisions'表" -#: ../libsvn_fs_base/fs.c:640 +#: ../libsvn_fs_base/fs.c:649 msgid "creating 'transactions' table" -msgstr "æ£å¨å建âtransactionsâ表" +msgstr "æ£å¨å建'transactions'表" -#: ../libsvn_fs_base/fs.c:641 +#: ../libsvn_fs_base/fs.c:650 msgid "opening 'transactions' table" -msgstr "æ£å¨æå¼âtransactionsâ表" +msgstr "æ£å¨æå¼'transactions'表" -#: ../libsvn_fs_base/fs.c:646 +#: ../libsvn_fs_base/fs.c:655 msgid "creating 'copies' table" -msgstr "æ£å¨å建âcopiesâ表" +msgstr "æ£å¨å建'copies'表" -#: ../libsvn_fs_base/fs.c:647 +#: ../libsvn_fs_base/fs.c:656 msgid "opening 'copies' table" -msgstr "æ£å¨æå¼âcopiesâ表" +msgstr "æ£å¨æå¼'copies'表" -#: ../libsvn_fs_base/fs.c:652 +#: ../libsvn_fs_base/fs.c:661 msgid "creating 'changes' table" -msgstr "æ£å¨å建âchangesâ表" +msgstr "æ£å¨å建'changes'表" -#: ../libsvn_fs_base/fs.c:653 +#: ../libsvn_fs_base/fs.c:662 msgid "opening 'changes' table" -msgstr "æ£å¨æå¼âchangesâ表" +msgstr "æ£å¨æå¼'changes'表" -#: ../libsvn_fs_base/fs.c:658 +#: ../libsvn_fs_base/fs.c:667 msgid "creating 'representations' table" -msgstr "æ£å¨å建ârepresentationsâ表" +msgstr "æ£å¨å建'representations'表" -#: ../libsvn_fs_base/fs.c:659 +#: ../libsvn_fs_base/fs.c:668 msgid "opening 'representations' table" -msgstr "æ£å¨æå¼ârepresentationsâ表" +msgstr "æ£å¨æå¼'representations'表" -#: ../libsvn_fs_base/fs.c:664 +#: ../libsvn_fs_base/fs.c:673 msgid "creating 'strings' table" -msgstr "æ£å¨å建âstringsâ表" +msgstr "æ£å¨å建'strings'表" -#: ../libsvn_fs_base/fs.c:665 +#: ../libsvn_fs_base/fs.c:674 msgid "opening 'strings' table" -msgstr "æ£å¨æå¼âstringsâ表" +msgstr "æ£å¨æå¼'strings'表" -#: ../libsvn_fs_base/fs.c:670 +#: ../libsvn_fs_base/fs.c:679 msgid "creating 'uuids' table" -msgstr "æ£å¨å建âuuidsâ表" +msgstr "æ£å¨å建'uuids'表" -#: ../libsvn_fs_base/fs.c:671 +#: ../libsvn_fs_base/fs.c:680 msgid "opening 'uuids' table" -msgstr "æ£å¨æå¼âuuidsâ表" +msgstr "æ£å¨æå¼'uuids'表" -#: ../libsvn_fs_base/fs.c:676 +#: ../libsvn_fs_base/fs.c:685 msgid "creating 'locks' table" -msgstr "æ£å¨å建âlocksâ表" +msgstr "æ£å¨å建'locks'表" -#: ../libsvn_fs_base/fs.c:677 +#: ../libsvn_fs_base/fs.c:686 msgid "opening 'locks' table" -msgstr "æ£å¨æå¼âlocksâ表" +msgstr "æ£å¨æå¼'locks'表" -#: ../libsvn_fs_base/fs.c:682 +#: ../libsvn_fs_base/fs.c:691 msgid "creating 'lock-tokens' table" -msgstr "æ£å¨å建âlock-tokensâ表" +msgstr "æ£å¨å建'lock-tokens'表" -#: ../libsvn_fs_base/fs.c:683 +#: ../libsvn_fs_base/fs.c:692 msgid "opening 'lock-tokens' table" -msgstr "æ£å¨æå¼âlock-tokensâ表" +msgstr "æ£å¨æå¼'lock-tokens'表" -#: ../libsvn_fs_base/fs.c:691 +#: ../libsvn_fs_base/fs.c:700 msgid "creating 'node-origins' table" -msgstr "æ£å¨å建ânode-originsâ表" +msgstr "æ£å¨å建'node-origins'表" -#: ../libsvn_fs_base/fs.c:692 +#: ../libsvn_fs_base/fs.c:701 msgid "opening 'node-origins' table" -msgstr "æ£å¨æå¼ânode-originsâ表" +msgstr "æ£å¨æå¼'node-origins'表" -#: ../libsvn_fs_base/fs.c:701 +#: ../libsvn_fs_base/fs.c:710 msgid "creating 'miscellaneous' table" -msgstr "æ£å¨å建âmiscellaneousâ表" +msgstr "æ£å¨å建'miscellaneous'表" -#: ../libsvn_fs_base/fs.c:702 +#: ../libsvn_fs_base/fs.c:711 msgid "opening 'miscellaneous' table" -msgstr "æ£å¨æå¼âmiscellaneousâ表" +msgstr "æ£å¨æå¼'miscellaneous'表" -#: ../libsvn_fs_base/fs.c:711 +#: ../libsvn_fs_base/fs.c:720 msgid "creating 'checksum-reps' table" -msgstr "æ£å¨å建âchecksum-repsâ表" +msgstr "æ£å¨å建'checksum-reps'表" -#: ../libsvn_fs_base/fs.c:712 +#: ../libsvn_fs_base/fs.c:721 msgid "opening 'checksum-reps' table" -msgstr "æ£å¨æå¼âchecksum-repsâ表" +msgstr "æ£å¨æå¼'checksum-reps'表" -#: ../libsvn_fs_base/fs.c:802 +#: ../libsvn_fs_base/fs.c:812 #, c-format msgid "The '%s' feature requires version %d of the filesystem schema; filesystem '%s' uses only version %d" -msgstr "â%sâç¹æ§éè¦æ件系ç»æ¹æ¡çæ¬ %dï¼æ件系ç»â%sâçæ¬ä» 为 %d" +msgstr "'%s'ç¹æ§éè¦æ件系ç»æ¹æ¡çæ¬ %dï¼æ件系ç»'%s'çæ¬ä» 为 %d" -#: ../libsvn_fs_base/fs.c:821 +#: ../libsvn_fs_base/fs.c:831 #, c-format msgid "Expected FS format '%d'; found format '%d'" -msgstr "æææ件系ç»æ ¼å¼â%dâï¼åç°æ ¼å¼â%dâ" +msgstr "æææ件系ç»æ ¼å¼'%d'ï¼åç°æ ¼å¼'%d'" -#: ../libsvn_fs_base/fs.c:1309 +#: ../libsvn_fs_base/fs.c:1321 #, c-format msgid "BDB repositories do not support incremental hotcopy" -msgstr "" +msgstr "BDB çæ¬åºä¸æ¯æå¢é hotcopy" -#: ../libsvn_fs_base/fs.c:1413 +#: ../libsvn_fs_base/fs.c:1425 msgid "" "Error copying logfile; the DB_LOG_AUTOREMOVE feature\n" "may be interfering with the hotcopy algorithm. If\n" @@ -3376,61 +5763,62 @@ msgstr "" "å¤å¶æ¥å¿æ件åºéï¼DB_LOG_AUTOREMOVE ç¹æ§å¯è½å¦¨ç¢çå¤å¶ãå¦æé®é¢ä¸ç´åå¨ï¼è¯·\n" "å°è¯å¨ DB_CONFIG ä¸ç¦ç¨æ¤ç¹æ§ã" -#: ../libsvn_fs_base/fs.c:1432 +#: ../libsvn_fs_base/fs.c:1444 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" -"åå¨ï¼è¯·å°è¯å¨ DB_CONFIG ä¸ç¦ç¨æ¤ç¹æ§ã" +"çå¤å¶æ¶æ§è¡ç¾é¾æ¢å¤åºéï¼DB_LOG_AUTOREMOVE ç¹æ§å¯è½\n" +"妨ç¢çå¤å¶ç®æ³ãå¦æé®é¢æç»åå¨ï¼è¯·å°è¯å¨ DB_CONFIG\n" +"ä¸ç¦ç¨æ¤ç¹æ§" -#: ../libsvn_fs_base/fs.c:1477 +#: ../libsvn_fs_base/fs.c:1489 msgid "Module for working with a Berkeley DB repository." msgstr "模ååªè½æä½BDBçæ¬åºã" -#: ../libsvn_fs_base/fs.c:1526 +#: ../libsvn_fs_base/fs.c:1540 #, c-format msgid "Unsupported FS loader version (%d) for bdb" msgstr "ä¸æ¯æçBDBä¹FSå è½½å¨çæ¬ (%d)" -#: ../libsvn_fs_base/lock.c:121 ../libsvn_fs_base/lock.c:126 -#: ../libsvn_fs_fs/lock.c:758 ../libsvn_fs_fs/lock.c:763 -#: ../libsvn_fs_fs/lock.c:784 ../libsvn_fs_x/lock.c:758 -#: ../libsvn_fs_x/lock.c:763 ../libsvn_fs_x/lock.c:784 +#: ../libsvn_fs_base/lock.c:122 ../libsvn_fs_base/lock.c:127 +#: ../libsvn_fs_fs/lock.c:740 ../libsvn_fs_fs/lock.c:745 +#: ../libsvn_fs_fs/lock.c:775 ../libsvn_fs_x/lock.c:760 +#: ../libsvn_fs_x/lock.c:765 ../libsvn_fs_x/lock.c:795 #, c-format msgid "Path '%s' doesn't exist in HEAD revision" -msgstr "HEADä¸æ²¡æè·¯å¾â%sâ" +msgstr "HEADä¸æ²¡æè·¯å¾'%s'" -#: ../libsvn_fs_base/lock.c:598 ../libsvn_fs_fs/lock.c:661 -#: ../libsvn_fs_x/lock.c:661 +#: ../libsvn_fs_base/lock.c:616 ../libsvn_fs_fs/lock.c:613 +#: ../libsvn_fs_x/lock.c:631 #, c-format msgid "Cannot verify lock on path '%s'; no username available" -msgstr "ä¸è½æ ¡éªè·¯å¾â%sâä¸çéï¼æ²¡æç¨æ·å" +msgstr "ä¸è½æ ¡éªè·¯å¾'%s'ä¸çéï¼æ²¡æç¨æ·å" -#: ../libsvn_fs_base/lock.c:604 ../libsvn_fs_fs/lock.c:667 -#: ../libsvn_fs_x/lock.c:667 +#: ../libsvn_fs_base/lock.c:622 ../libsvn_fs_fs/lock.c:619 +#: ../libsvn_fs_x/lock.c:637 #, c-format msgid "User '%s' does not own lock on path '%s' (currently locked by '%s')" -msgstr "ç¨æ· â%sâ ä¸æ¯è·¯å¾ â%sâ çéçææè (å½åç±ç¨æ· â%sâ éå®)" +msgstr "ç¨æ· '%s' ä¸æ¯è·¯å¾ '%s' çéçææè (å½åç±ç¨æ· '%s' éå®)" -#: ../libsvn_fs_base/lock.c:610 ../libsvn_fs_fs/lock.c:673 -#: ../libsvn_fs_x/lock.c:673 +#: ../libsvn_fs_base/lock.c:628 ../libsvn_fs_fs/lock.c:625 +#: ../libsvn_fs_x/lock.c:643 #, c-format msgid "Cannot verify lock on path '%s'; no matching lock-token available" -msgstr "ä¸è½æ ¡éªè·¯å¾â%sâçéï¼æ²¡æå¹é çå¯ç¨é令ç" +msgstr "ä¸è½æ ¡éªè·¯å¾'%s'çéï¼æ²¡æå¹é çå¯ç¨é令ç" #. 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:58 #, c-format msgid "Unknown node kind for representation '%s'" -msgstr "修订çâ%sâçèç¹ç±»åæªç¥" +msgstr "表示'%s'çèç¹ç±»åæªç¥" #: ../libsvn_fs_base/reps-strings.c:110 msgid "Representation is not of type 'delta'" -msgstr "修订çä¸æ¯âdeltaâç±»å" +msgstr "表示ä¸æ¯'delta'ç±»å" #: ../libsvn_fs_base/reps-strings.c:380 msgid "Svndiff source length inconsistency" @@ -3439,12 +5827,12 @@ 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 "ä»ä¿®è®¢çâ%sâå°â%sâ读差å¼é¾æ¶æ£æµå°æ°æ®æå" +msgstr "ä»è¡¨ç¤º'%s'å°'%s'读差å¼é¾æ¶æ£æµå°æ°æ®æå" #: ../libsvn_fs_base/reps-strings.c:798 #, c-format @@ -3454,17 +5842,17 @@ msgstr "çæ¬å 容太大: å¾å° %sï¼ #: ../libsvn_fs_base/reps-strings.c:814 #, c-format msgid "Failure reading representation '%s'" -msgstr "读å修订çâ%sâ失败" +msgstr "读å表示'%s'失败" #: ../libsvn_fs_base/reps-strings.c:924 #, c-format msgid "MD5 checksum mismatch on representation '%s'" -msgstr "â%sâ ç MD5 æ ¡éªåä¸å¹é " +msgstr "'%s' ç MD5 æ ¡éªåä¸å¹é " #: ../libsvn_fs_base/reps-strings.c:934 #, c-format msgid "SHA1 checksum mismatch on representation '%s'" -msgstr "â%sâ ç SHA1 æ ¡éªåä¸å¹é " +msgstr "'%s' ç SHA1 æ ¡éªåä¸å¹é " #: ../libsvn_fs_base/reps-strings.c:945 msgid "Null rep, but offset past zero already" @@ -3473,12 +5861,12 @@ msgstr "空ççæ¬ï¼ä½æ¯åç§»å·²ç» #: ../libsvn_fs_base/reps-strings.c:1062 ../libsvn_fs_base/reps-strings.c:1254 #, c-format msgid "Rep '%s' is not mutable" -msgstr "çæ¬â%sâæ¯ä¸å¯åç" +msgstr "çæ¬'%s'æ¯ä¸å¯åç" #: ../libsvn_fs_base/reps-strings.c:1077 #, c-format msgid "Rep '%s' both mutable and non-fulltext" -msgstr "çæ¬ â%sâ å¯å并ä¸éå ¨ææ¬" +msgstr "çæ¬ '%s' å¯å并ä¸éå ¨ææ¬" #: ../libsvn_fs_base/reps-strings.c:1373 msgid "Failed to get new string key" @@ -3487,344 +5875,390 @@ msgstr "åæ°çå符串é®å¤±è´¥" #: ../libsvn_fs_base/reps-strings.c:1450 #, c-format msgid "Attempt to deltify '%s' against itself" -msgstr "â%sâè¯å¾ä¸èªèº«æ¯è¾" +msgstr "'%s'è¯å¾ä¸èªèº«æ¯è¾" #: ../libsvn_fs_base/reps-strings.c:1523 #, c-format msgid "Failed to calculate MD5 digest for '%s'" -msgstr "计ç®â%sâçMD5æè¦å¤±è´¥" +msgstr "计ç®'%s'çMD5æè¦å¤±è´¥" #: ../libsvn_fs_base/revs-txns.c:72 #, c-format msgid "Transaction is not dead: '%s'" -msgstr "äºå¡æªç»æ: â%sâ" +msgstr "äºå¡æªç»æ: '%s'" #: ../libsvn_fs_base/revs-txns.c:75 #, c-format msgid "Transaction is dead: '%s'" -msgstr "äºå¡å·²ç»æ: â%sâ" +msgstr "äºå¡å·²ç»æ: '%s'" -#: ../libsvn_fs_base/revs-txns.c:272 ../libsvn_fs_fs/fs_fs.c:2079 -#: ../libsvn_fs_x/fs_x.c:1141 +#: ../libsvn_fs_base/revs-txns.c:277 ../libsvn_fs_fs/fs_fs.c:2248 +#: ../libsvn_fs_x/fs_x.c:1210 #, c-format msgid "revprop '%s' has unexpected value in filesystem" -msgstr "revpropâ%sâå¨æ件系ç»ä¸æä¸ææçå¼" +msgstr "revprop'%s'å¨æ件系ç»ä¸æä¸ææçå¼" -#: ../libsvn_fs_base/revs-txns.c:1045 +#: ../libsvn_fs_base/revs-txns.c:1065 msgid "Transaction aborted, but cleanup failed" msgstr "äºå¡ç»æ¢ï¼ä½æ¸ é¤å¤±è´¥" #: ../libsvn_fs_base/trail.c:99 msgid "beginning Berkeley DB transaction" -msgstr "" +msgstr "å¼å§ Berkeley DB äºå¡" #: ../libsvn_fs_base/trail.c:134 msgid "aborting Berkeley DB transaction" -msgstr "" +msgstr "ä¸æ¢ Berkeley DB äºå¡" #: ../libsvn_fs_base/trail.c:158 msgid "committing Berkeley DB transaction" -msgstr "" +msgstr "æ交 Berkeley DB äºå¡" -#: ../libsvn_fs_base/tree.c:773 ../libsvn_fs_fs/tree.c:1104 -#: ../libsvn_fs_x/tree.c:1083 +#: ../libsvn_fs_base/tree.c:774 #, c-format msgid "Failure opening '%s'" -msgstr "æå¼â%sâ失败" +msgstr "æå¼'%s'失败" -#: ../libsvn_fs_base/tree.c:1445 ../libsvn_fs_fs/tree.c:1623 -#: ../libsvn_fs_x/tree.c:1601 +#: ../libsvn_fs_base/tree.c:1461 ../libsvn_fs_fs/tree.c:1686 +#: ../libsvn_fs_x/tree.c:602 msgid "Cannot compare property value between two different filesystems" msgstr "ä¸è½å¨ä¸¤ä¸ªä¸åçæ件系ç»ä¹é´æ¯è¾å±æ§å¼" -#: ../libsvn_fs_base/tree.c:1909 ../libsvn_fs_base/tree.c:1979 +#: ../libsvn_fs_base/tree.c:1927 ../libsvn_fs_base/tree.c:1997 msgid "Corrupt DB: faulty predecessor count" msgstr "æåçæ°æ®åº: å åçæ°ç®ä¸å®æ´" -#: ../libsvn_fs_base/tree.c:2036 +#: ../libsvn_fs_base/tree.c:2054 #, c-format msgid "Unexpected immutable node at '%s'" -msgstr "â%sâææå¤çä¸åèç¹" +msgstr "'%s'ææå¤çä¸åèç¹" -#: ../libsvn_fs_base/tree.c:2057 ../libsvn_fs_fs/tree.c:1653 -#: ../libsvn_fs_x/tree.c:1631 ../libsvn_repos/commit.c:1241 +#: ../libsvn_fs_base/tree.c:2075 ../libsvn_fs_fs/tree.c:1716 +#: ../libsvn_fs_x/tree.c:638 ../libsvn_repos/commit.c:1306 #, c-format msgid "Conflict at '%s'" -msgstr "å¨â%sâå²çª" +msgstr "å¨'%s'å²çª" -#: ../libsvn_fs_base/tree.c:2110 ../libsvn_fs_base/tree.c:2862 -#: ../libsvn_fs_fs/tree.c:1751 ../libsvn_fs_fs/tree.c:2305 -#: ../libsvn_fs_x/tree.c:1721 ../libsvn_fs_x/tree.c:2260 +#: ../libsvn_fs_base/tree.c:2128 ../libsvn_fs_base/tree.c:2892 +#: ../libsvn_fs_fs/tree.c:1814 ../libsvn_fs_fs/tree.c:2391 +#: ../libsvn_fs_x/tree.c:759 ../libsvn_fs_x/tree.c:1317 msgid "Bad merge; ancestor, source, and target not all in same fs" msgstr "é误çå并ï¼åå§ï¼åå§ï¼ç®æ ä¸å¨åä¸ä¸ªæ件系ç»" -#: ../libsvn_fs_base/tree.c:2126 ../libsvn_fs_fs/tree.c:1767 -#: ../libsvn_fs_x/tree.c:1737 +#: ../libsvn_fs_base/tree.c:2144 ../libsvn_fs_fs/tree.c:1830 +#: ../libsvn_fs_x/tree.c:775 #, c-format msgid "Bad merge; target '%s' has id '%s', same as ancestor" -msgstr "é误çå并: ç®æ â%sâæ¥ææ è¯â%sâï¼ä¸åå§ç¸å" +msgstr "é误çå并: ç®æ '%s'æ¥ææ è¯'%s'ï¼ä¸åå§ç¸å" -#: ../libsvn_fs_base/tree.c:2670 +#: ../libsvn_fs_base/tree.c:2687 #, c-format msgid "Transaction '%s' out-of-date with respect to revision '%s'" -msgstr "äºå¡ â%sâ è¿æ¶ï¼å¯¹äºçæ¬ â%sâ " +msgstr "äºå¡ '%s' è¿æ¶ï¼å¯¹äºçæ¬ '%s'" -#: ../libsvn_fs_base/tree.c:2946 +#: ../libsvn_fs_base/tree.c:2976 #, c-format msgid "Cannot deltify revisions prior to r%ld" msgstr "ä¸è½å¨ r%ld ä¹å计ç®å¢éåå" -#: ../libsvn_fs_base/tree.c:3064 ../libsvn_fs_fs/tree.c:2485 -#: ../libsvn_fs_x/tree.c:2423 +#: ../libsvn_fs_base/tree.c:3094 ../libsvn_fs_fs/tree.c:2573 +#: ../libsvn_fs_x/tree.c:1503 msgid "The root directory cannot be deleted" msgstr "ä¸è½å é¤æ ¹ç®å½" -#: ../libsvn_fs_base/tree.c:3277 ../libsvn_fs_fs/tree.c:2555 -#: ../libsvn_fs_x/tree.c:2492 +#: ../libsvn_fs_base/tree.c:3308 ../libsvn_fs_fs/tree.c:2643 +#: ../libsvn_fs_x/tree.c:1573 #, c-format msgid "Cannot copy between two different filesystems ('%s' and '%s')" -msgstr "ä¸è½å¨ä¸¤ä¸ªä¸åçæ件系ç»(â%sâåâ%sâ)ä¹é´å¤å¶" +msgstr "ä¸è½å¨ä¸¤ä¸ªä¸åçæ件系ç»('%s'å'%s')ä¹é´å¤å¶" -#: ../libsvn_fs_base/tree.c:3286 ../libsvn_fs_fs/tree.c:2562 -#: ../libsvn_fs_x/tree.c:2499 +#: ../libsvn_fs_base/tree.c:3317 ../libsvn_fs_fs/tree.c:2650 +#: ../libsvn_fs_x/tree.c:1580 msgid "Copy from mutable tree not currently supported" msgstr "å½åä¸æ¯æä»å¯åçæ å¤å¶" -#: ../libsvn_fs_base/tree.c:3796 ../libsvn_fs_fs/tree.c:2957 -#: ../libsvn_fs_x/tree.c:2886 +#: ../libsvn_fs_base/tree.c:3827 ../libsvn_fs_fs/tree.c:3045 +#: ../libsvn_fs_x/tree.c:1989 #, c-format msgid "Base checksum mismatch on '%s'" msgstr "'%s' çæ ¡éªåé误" -#: ../libsvn_fs_base/tree.c:4072 ../libsvn_fs_fs/tree.c:3167 -#: ../libsvn_fs_x/tree.c:3096 +#: ../libsvn_fs_base/tree.c:4104 ../libsvn_fs_fs/tree.c:3256 +#: ../libsvn_fs_x/tree.c:2208 msgid "Cannot compare file contents between two different filesystems" msgstr "ä¸è½å¨ä¸¤ä¸ªä¸åçæ件系ç»é´æ¯è¾æ件å 容" -#: ../libsvn_fs_base/tree.c:5121 ../libsvn_fs_base/tree.c:5296 +#: ../libsvn_fs_base/tree.c:5153 ../libsvn_fs_base/tree.c:5332 #, c-format msgid "Node-revision '%s' claims to have mergeinfo but doesn't" -msgstr "èç¹çæ¬â%sâ声称èªå·±æå并信æ¯ï¼å®é ä¸å´æ²¡æ" +msgstr "èç¹çæ¬'%s'声称èªå·±æå并信æ¯ï¼å®é ä¸å´æ²¡æ" -#: ../libsvn_fs_base/tree.c:5157 +#: ../libsvn_fs_base/tree.c:5191 #, c-format msgid "Node-revision '%s' claims to sit atop a tree containing mergeinfo but is not a directory" -msgstr "èç¹çæ¬â%sâ声称èªå·±æ¯å å«å并信æ¯çæ 顶ï¼å®é ä¸å´ä¸æ¯ç®å½" +msgstr "èç¹çæ¬'%s'声称èªå·±æ¯å å«å并信æ¯çæ 顶ï¼å®é ä¸å´ä¸æ¯ç®å½" -#: ../libsvn_fs_fs/cached_data.c:709 ../libsvn_fs_x/cached_data.c:584 +#: ../libsvn_fs_fs/cached_data.c:819 ../libsvn_fs_x/cached_data.c:538 msgid "Malformed svndiff data in representation" -msgstr "修订çç svndiff æ°æ®éæ³" +msgstr "表示ç svndiff æ°æ®éæ³" -#: ../libsvn_fs_fs/cached_data.c:956 ../libsvn_fs_x/cached_data.c:844 +#: ../libsvn_fs_fs/cached_data.c:1064 ../libsvn_fs_x/cached_data.c:799 #, c-format msgid "No representation found at offset %s for item %s in revision %ld" -msgstr "å¨å移 %s åç°éå±ç°æ°æ®ï¼é¡¹ç® %sï¼çæ¬ %ld" +msgstr "å¨å移 %s åç°é表示æ°æ®ï¼é¡¹ç® %sï¼çæ¬ %ld" -#: ../libsvn_fs_fs/cached_data.c:1522 ../libsvn_fs_fs/cached_data.c:1535 -#: ../libsvn_fs_fs/cached_data.c:2930 ../libsvn_fs_x/cached_data.c:1415 -#: ../libsvn_fs_x/cached_data.c:1428 ../libsvn_fs_x/cached_data.c:1702 +#: ../libsvn_fs_fs/cached_data.c:1612 ../libsvn_fs_fs/cached_data.c:1625 +#: ../libsvn_fs_fs/cached_data.c:3361 ../libsvn_fs_x/cached_data.c:1356 +#: ../libsvn_fs_x/cached_data.c:1370 ../libsvn_fs_x/cached_data.c:1645 msgid "Reading one svndiff window read beyond the end of the representation" -msgstr "读svndiffçªå£æ¶è¶ åºäºç»å°¾" +msgstr "读å svndiff çªå£æ¶è¶ åºäºè¡¨ç¤ºçç»å°¾" -#: ../libsvn_fs_fs/cached_data.c:1642 ../libsvn_fs_x/cached_data.c:1556 +#: ../libsvn_fs_fs/cached_data.c:1754 ../libsvn_fs_x/cached_data.c:1496 msgid "svndiff window length is corrupt" msgstr "svndiff ççªä½é¿åº¦å·²æå" -#: ../libsvn_fs_fs/cached_data.c:2038 ../libsvn_fs_x/cached_data.c:2130 +#: ../libsvn_fs_fs/cached_data.c:2164 +#, c-format +msgid "Length mismatch while reading representation: expected %s, got %s" +msgstr "读å表示æ¶é¿åº¦ä¸å¹é : ææ %sï¼å®é %s" + +#: ../libsvn_fs_fs/cached_data.c:2197 ../libsvn_fs_x/cached_data.c:2095 msgid "Checksum mismatch while reading representation" -msgstr "读å修订çæ¶æ ¡éªåä¸å¹é " +msgstr "读å表示æ¶æ ¡éªåä¸å¹é " -#: ../libsvn_fs_fs/cached_data.c:2389 ../libsvn_fs_fs/cached_data.c:2403 -#: ../libsvn_fs_fs/cached_data.c:2410 ../libsvn_fs_x/cached_data.c:2486 -#: ../libsvn_fs_x/cached_data.c:2500 ../libsvn_fs_x/cached_data.c:2507 +#: ../libsvn_fs_fs/cached_data.c:2616 +#, c-format +msgid "Directory representation corrupt in '%s'" +msgstr "ç®å½è¡¨ç¤ºå¨ '%s' ä¸æå" + +#: ../libsvn_fs_fs/cached_data.c:2646 ../libsvn_fs_fs/cached_data.c:2660 +#: ../libsvn_fs_fs/cached_data.c:2667 #, c-format msgid "Directory entry corrupt in '%s'" msgstr "'%s' çç®å½å ¥å£æå" -#: ../libsvn_fs_fs/cached_data.c:3111 +#: ../libsvn_fs_fs/cached_data.c:2991 +#, c-format +msgid "malformed property list for node-revision '%s' in '%s'" +msgstr "'%s' ä¸èç¹çæ¬ '%s' çå±æ§åè¡¨æ ¼å¼é误" + +#: ../libsvn_fs_fs/cached_data.c:3024 +#, c-format +msgid "malformed property list for node-revision '%s'" +msgstr "èç¹çæ¬ '%s' çå±æ§åè¡¨æ ¼å¼é误" + +#: ../libsvn_fs_fs/cached_data.c:3540 #, c-format msgid "" "Low-level checksum mismatch while reading\n" "%s bytes of meta data at offset %s for item %s in revision %ld" msgstr "" +"读å\n" +"%s åèå æ°æ®æ¶ä½çº§æ ¡éªåä¸å¹é ï¼å移é %sï¼é¡¹ %sï¼çæ¬ %ld" -#: ../libsvn_fs_fs/dag.c:431 ../libsvn_fs_fs/dag.c:448 -#: ../libsvn_fs_x/dag.c:431 ../libsvn_fs_x/dag.c:448 -#: ../libsvn_ra_serf/stat.c:583 +#: ../libsvn_fs_fs/dag.c:431 ../libsvn_fs_fs/dag.c:448 ../libsvn_fs_x/dag.c:257 +#: ../libsvn_fs_x/dag.c:384 ../libsvn_ra_serf/stat.c:553 msgid "Can't get entries of non-directory" msgstr "ä¸è½è·åéç®å½çæ¡ç®" -#: ../libsvn_fs_fs/dag.c:557 ../libsvn_fs_x/dag.c:556 +#: ../libsvn_fs_fs/dag.c:591 ../libsvn_fs_x/dag.c:497 #, c-format msgid "Can't increment mergeinfo count on node-revision %%s to negative value %%%s" msgstr "ä¸è½å¨èç¹çæ¬ %%s å¢å å并信æ¯è®¡æ°ï¼å 为ä¼æº¢åºå°è´å¼ %%%s" -#: ../libsvn_fs_fs/dag.c:568 ../libsvn_fs_x/dag.c:567 +#: ../libsvn_fs_fs/dag.c:602 ../libsvn_fs_x/dag.c:509 #, c-format msgid "Can't increment mergeinfo count on *file* node-revision %%s to %%%s (> 1)" msgstr "ä¸è½å¨*æ件*修订èç¹å¢å å并信æ¯è®¡æ° %%s å° %%%s (> 1)" -#: ../libsvn_fs_fs/dag.c:1151 ../libsvn_fs_x/dag.c:1150 +#: ../libsvn_fs_fs/dag.c:1190 msgid "Empty noderev in cache" msgstr "ç¼åä¸ noderev 为空" -#: ../libsvn_fs_fs/dag.c:1355 ../libsvn_fs_x/dag.c:1352 +#: ../libsvn_fs_fs/dag.c:1417 ../libsvn_fs_x/dag.c:1076 #, c-format msgid "Attempted to update ancestry of non-mutable node" msgstr "è¯å¾æ´æ°éå¯åèç¹çå驱" -#: ../libsvn_fs_fs/fs.c:101 +#: ../libsvn_fs_fs/fs.c:102 #, c-format msgid "Can't fetch FSFS shared data" msgstr "ä¸è½è·åæ件系ç»äºæ¥ä½" -#: ../libsvn_fs_fs/fs.c:130 +#: ../libsvn_fs_fs/fs.c:131 #, c-format msgid "Can't store FSFS shared data" msgstr "ä¸è½åå¨æ件系ç»å ±äº«æ°æ®" -#: ../libsvn_fs_fs/fs.c:546 +#: ../libsvn_fs_fs/fs.c:642 msgid "Module for working with a plain file (FSFS) repository." msgstr "模åä¸ææ¬æ件(FSFS)çæ¬åºä¸èµ·å·¥ä½ã" -#: ../libsvn_fs_fs/fs.c:607 +#: ../libsvn_fs_fs/fs.c:705 #, c-format msgid "Unsupported FS loader version (%d) for fsfs" msgstr "ä¸æ¯æçFSFSä¹FSå è½½å¨çæ¬ (%d)" -#: ../libsvn_fs_fs/fs_fs.c:443 +#: ../libsvn_fs_fs/fs_fs.c:445 #, c-format msgid "Found format '%d', only created by unreleased dev builds; see https://subversion.apache.org/docs/release-notes/1.7#revprop-packing" -msgstr "åç°äºæ件系ç»æ ¼å¼â%dâï¼å®æ¯ç±æªåå¸çå¼åçæ¬å建çï¼åè§ https://subversion.apache.org/docs/release-notes/1.7#revprop-packing" +msgstr "åç°äºæ件系ç»æ ¼å¼'%d'ï¼å®æ¯ç±æªåå¸çå¼åçæ¬å建çï¼åè§ https://subversion.apache.org/docs/release-notes/1.7#revprop-packing" -#: ../libsvn_fs_fs/fs_fs.c:454 ../libsvn_fs_x/fs_x.c:101 +#: ../libsvn_fs_fs/fs_fs.c:456 #, c-format msgid "Expected FS format between '1' and '%d'; found format '%d'" -msgstr "æææ件系ç»æ ¼å¼å¨â1âå°â%dâä¹é´ï¼åç°æ ¼å¼â%dâ" +msgstr "æææ件系ç»æ ¼å¼å¨'1'å°'%d'ä¹é´ï¼åç°æ ¼å¼'%d'" -#: ../libsvn_fs_fs/fs_fs.c:505 ../libsvn_fs_x/fs_x.c:121 +#: ../libsvn_fs_fs/fs_fs.c:508 ../libsvn_fs_x/fs_x.c:143 #, c-format msgid "Can't read first line of format file '%s'" -msgstr "ä¸è½è¯»åæ ¼å¼æ件â%sâçé¦è¡" +msgstr "ä¸è½è¯»åæ ¼å¼æ件'%s'çé¦è¡" -#: ../libsvn_fs_fs/fs_fs.c:562 ../libsvn_fs_x/fs_x.c:142 +#: ../libsvn_fs_fs/fs_fs.c:565 ../libsvn_fs_x/fs_x.c:165 #, c-format msgid "'%s' contains invalid filesystem format option '%s'" -msgstr "â%sâå å«éæ³æ件系ç»æ ¼å¼é项â%sâ" +msgstr "'%s'å å«éæ³æ件系ç»æ ¼å¼é项'%s'" -#: ../libsvn_fs_fs/fs_fs.c:572 +#: ../libsvn_fs_fs/fs_fs.c:575 #, c-format msgid "'%s' specifies logical addressing for a non-sharded repository" -msgstr "" +msgstr "'%s' 为éåççæ¬åºæå®äºé»è¾å¯»å" -#: ../libsvn_fs_fs/fs_fs.c:654 ../libsvn_fs_x/fs_x.c:201 +#: ../libsvn_fs_fs/fs_fs.c:658 ../libsvn_fs_x/fs_x.c:225 #, c-format msgid "%s is too small for fsfs.conf setting '%s'." -msgstr "" +msgstr "%s å¯¹äº fsfs.conf 设置 '%s' æ¥è¯´å¤ªå°ã" -#: ../libsvn_fs_fs/fs_fs.c:662 ../libsvn_fs_x/fs_x.c:209 +#: ../libsvn_fs_fs/fs_fs.c:666 ../libsvn_fs_x/fs_x.c:233 #, c-format msgid "%s is too large for fsfs.conf setting '%s'." -msgstr "" +msgstr "%s å¯¹äº fsfs.conf 设置 '%s' æ¥è¯´å¤ªå¤§ã" -#: ../libsvn_fs_fs/fs_fs.c:673 ../libsvn_fs_x/fs_x.c:220 +#: ../libsvn_fs_fs/fs_fs.c:677 ../libsvn_fs_x/fs_x.c:244 #, c-format msgid "%s is invalid for fsfs.conf setting '%s' because it is not a power of 2." -msgstr "" +msgstr "%s å¯¹äº fsfs.conf 设置 '%s' æ æï¼å 为å®ä¸æ¯ 2 çå¹ã" -#: ../libsvn_fs_fs/fs_fs.c:1185 +#: ../libsvn_fs_fs/fs_fs.c:733 +#, c-format +msgid "Invalid 'compression' value '%s' in the config" +msgstr "é ç½®ä¸æ æç 'compression' å¼ '%s'" + +#: ../libsvn_fs_fs/fs_fs.c:879 +msgid "The 'compression' and 'compression-level' config options are mutually exclusive" +msgstr "'compression' å 'compression-level' é ç½®é项äºæ¥" + +#: ../libsvn_fs_fs/fs_fs.c:891 +msgid "Compression type 'lz4' requires filesystem format 8 or higher" +msgstr "å缩类å 'lz4' éè¦æ件系ç»æ ¼å¼ 8 ææ´é«" + +#: ../libsvn_fs_fs/fs_fs.c:1324 #, c-format msgid "'%s' is not a regular file. Please move it out of the way and try again" msgstr "'%s' ä¸æ¯æ®éæ件ã请移é¤åéè¯" -#: ../libsvn_fs_fs/fs_fs.c:1350 ../libsvn_fs_x/fs_x.c:652 +#: ../libsvn_fs_fs/fs_fs.c:1492 ../libsvn_fs_x/fs_x.c:709 #, c-format msgid "Invalid revision number '%ld'" -msgstr "æ æççæ¬å·â%ldâ" +msgstr "æ æççæ¬å·'%ld'" -#: ../libsvn_fs_fs/fs_fs.c:1776 +#: ../libsvn_fs_fs/fs_fs.c:1933 msgid "FSFS is not compatible with Subversion prior to 1.1" msgstr "FSFS ä¸ Subversion 1.1 ä¹åççæ¬ä¸å ¼å®¹" -#: ../libsvn_fs_fs/fs_fs.c:1978 +#: ../libsvn_fs_fs/fs_fs.c:2072 +#, c-format +msgid "malformed node origin data in '%s'" +msgstr "'%s' ä¸èç¹æ¥æºæ°æ®æ ¼å¼é误" + +#: ../libsvn_fs_fs/fs_fs.c:2140 #, c-format msgid "Node origin for '%s' exists with a different value (%s) than what we were about to store (%s)" -msgstr "â%sâ ç origin èç¹åå¼(%s)ä¸æ们è¦åå¨çå¼(%s)ä¸å" +msgstr "'%s' ç origin èç¹åå¼(%s)ä¸æ们è¦åå¨çå¼(%s)ä¸å" + +#: ../libsvn_fs_fs/fs_fs.c:2470 +#, c-format +msgid "FSFS format (%d) too old for rep-sharing; please upgrade the filesystem." +msgstr "FSFS æ ¼å¼ (%d) 太æ§ï¼ä¸æ¯æè¡¨ç¤ºå ±äº«ï¼è¯·å级æ件系ç»ã" + +#: ../libsvn_fs_fs/fs_fs.c:2478 +msgid "Filesystem does not allow rep-sharing." +msgstr "æ件系ç»ä¸å è®¸è¡¨ç¤ºå ±äº«ã" #: ../libsvn_fs_fs/hotcopy.c:107 ../libsvn_fs_x/hotcopy.c:108 -#: ../libsvn_subr/io.c:270 +#: ../libsvn_subr/io.c:319 #, c-format msgid "Error converting entry in directory '%s' to UTF-8" -msgstr "ç®å½ â%sâ ä¸çæ¡ç®ä»æ¬å°ç¼ç 转æ¢å° UTF8 失败" +msgstr "ç®å½ '%s' ä¸çæ¡ç®ä»æ¬å°ç¼ç 转æ¢å° UTF8 失败" #: ../libsvn_fs_fs/hotcopy.c:147 ../libsvn_fs_x/hotcopy.c:148 -#: ../libsvn_subr/io.c:1045 +#: ../libsvn_subr/io.c:1140 #, c-format msgid "Source '%s' is not a directory" -msgstr "æº â%sâ ä¸æ¯ç®å½" +msgstr "æº '%s' ä¸æ¯ç®å½" #: ../libsvn_fs_fs/hotcopy.c:153 ../libsvn_fs_x/hotcopy.c:154 -#: ../libsvn_subr/io.c:1051 +#: ../libsvn_subr/io.c:1146 #, c-format msgid "Destination '%s' is not a directory" -msgstr "ç®ç â%sâ ä¸æ¯ç®å½" +msgstr "ç®ç '%s' ä¸æ¯ç®å½" -#: ../libsvn_fs_fs/hotcopy.c:226 ../libsvn_fs_x/hotcopy.c:227 -#: ../libsvn_subr/io.c:1128 ../libsvn_subr/io.c:2678 +#: ../libsvn_fs_fs/hotcopy.c:226 ../libsvn_fs_x/hotcopy.c:228 +#: ../libsvn_subr/io.c:1223 ../libsvn_subr/io.c:3184 #, c-format msgid "Can't read directory '%s'" -msgstr "æ æ³è¯»åç®å½ â%sâ" +msgstr "æ æ³è¯»åç®å½ '%s'" -#: ../libsvn_fs_fs/hotcopy.c:231 ../libsvn_fs_x/hotcopy.c:232 -#: ../libsvn_subr/io.c:1133 ../libsvn_subr/io.c:2683 ../libsvn_subr/io.c:4374 +#: ../libsvn_fs_fs/hotcopy.c:231 ../libsvn_fs_x/hotcopy.c:233 +#: ../libsvn_subr/io.c:1228 ../libsvn_subr/io.c:3189 ../libsvn_subr/io.c:5010 #, c-format msgid "Error closing directory '%s'" -msgstr "å ³éç®å½ â%sâ åºé" +msgstr "å ³éç®å½ '%s' åºé" #: ../libsvn_fs_fs/hotcopy.c:490 #, c-format msgid "The FSFS format (%d) of the hotcopy source does not match the FSFS format (%d) of the hotcopy destination; please upgrade both repositories to the same format" -msgstr "" +msgstr "hotcopy æºç FSFS æ ¼å¼ (%d) ä¸ hotcopy ç®æ ç FSFS æ ¼å¼ (%d) ä¸å¹é ï¼è¯·å°ä¸¤ä¸ªçæ¬åºå级å°ç¸åæ ¼å¼" -#: ../libsvn_fs_fs/hotcopy.c:499 ../libsvn_fs_x/hotcopy.c:495 +#: ../libsvn_fs_fs/hotcopy.c:499 ../libsvn_fs_x/hotcopy.c:363 msgid "The UUID of the hotcopy source does not match the UUID of the hotcopy destination" -msgstr "" +msgstr "hotcopy æºç UUID ä¸ hotcopy ç®æ ç UUID ä¸å¹é " -#: ../libsvn_fs_fs/hotcopy.c:506 ../libsvn_fs_x/hotcopy.c:502 +#: ../libsvn_fs_fs/hotcopy.c:506 ../libsvn_fs_x/hotcopy.c:370 msgid "The sharding layout configuration of the hotcopy source does not match the sharding layout configuration of the hotcopy destination" -msgstr "" +msgstr "hotcopy æºçåçå¸å±é ç½®ä¸ hotcopy ç®æ çåçå¸å±é ç½®ä¸å¹é " -#: ../libsvn_fs_fs/hotcopy.c:581 ../libsvn_fs_x/hotcopy.c:574 +#: ../libsvn_fs_fs/hotcopy.c:581 ../libsvn_fs_x/hotcopy.c:418 #, c-format msgid "The hotcopy destination already contains more packed revisions (%lu) than the hotcopy source contains (%lu)" -msgstr "" +msgstr "hotcopy ç®æ å·²å å«æ¯ hotcopy æºæ´å¤çå·²æå çæ¬ (%lu 对 %lu)" -#: ../libsvn_fs_fs/hotcopy.c:878 +#: ../libsvn_fs_fs/hotcopy.c:877 #, c-format msgid "Failed to create hotcopy at '%s'. The file '%s' is missing from the source repository. Please create this file, for instance by running 'svnadmin upgrade %s'" -msgstr "å¨â%sâå建çå¤ä»½å¤±è´¥ãæºçæ¬åºä¸¢å¤±äºæ件â%sâã请å建æ¤æ件ï¼ä¾å¦éè¿æ§è¡âsvnadmin upgrade %sâæ¥å建å®ã" +msgstr "å¨'%s'å建çå¤ä»½å¤±è´¥ãæºçæ¬åºä¸¢å¤±äºæ件'%s'ã请å建æ¤æ件ï¼ä¾å¦éè¿æ§è¡'svnadmin upgrade %s'æ¥å建å®ã" -#: ../libsvn_fs_fs/hotcopy.c:905 ../libsvn_fs_x/hotcopy.c:784 +#: ../libsvn_fs_fs/hotcopy.c:903 ../libsvn_fs_x/hotcopy.c:610 #, c-format msgid "The hotcopy destination already contains more revisions (%lu) than the hotcopy source contains (%lu); are source and destination swapped?" -msgstr "" +msgstr "hotcopy ç®æ å·²å å«æ¯ hotcopy æºæ´å¤ççæ¬ (%lu 对 %lu)ï¼æºåç®æ æ¯å¦äº¤æ¢äºï¼" -#: ../libsvn_fs_fs/index.c:288 +#: ../libsvn_fs_fs/index.c:289 #, c-format msgid "Can't read index file '%s' at offset 0x%s" -msgstr "ä¸è½è¯»åç´¢å¼æ件â%sâï¼å移 0x%s" +msgstr "ä¸è½è¯»åç´¢å¼æ件'%s'ï¼å移 0x%s" -#: ../libsvn_fs_fs/index.c:298 +#: ../libsvn_fs_fs/index.c:299 #, c-format msgid "Unexpected end of index file %s at offset 0x%s" -msgstr "ç´¢å¼æ件â%sâå¨å移 0x%s å¤æå¤ç»æ" +msgstr "ç´¢å¼æ件'%s'å¨å移 0x%s å¤æå¤ç»æ" -#: ../libsvn_fs_fs/index.c:333 ../libsvn_fs_x/index.c:339 +#: ../libsvn_fs_fs/index.c:334 ../libsvn_fs_x/index.c:334 #, c-format msgid "Corrupt index: number too large" msgstr "æåçç´¢å¼: æ°å太大" -#: ../libsvn_fs_fs/index.c:376 ../libsvn_fs_x/index.c:382 +#: ../libsvn_fs_fs/index.c:377 ../libsvn_fs_x/index.c:372 #, c-format msgid "" "Index stream header prefix mismatch.\n" @@ -3833,179 +6267,178 @@ msgstr "" "ç´¢å¼å¤´åç¼ä¸å¹é \n" " ææ: %s åç°: %s" -#: ../libsvn_fs_fs/index.c:603 ../libsvn_fs_x/index.c:561 +#: ../libsvn_fs_fs/index.c:604 ../libsvn_fs_x/index.c:551 #, c-format msgid "UINT32 0x%s too large, max = 0x%s" msgstr "UINT32 0x%s 太大ï¼æ大å¼æ¯ 0x%s" -#: ../libsvn_fs_fs/index.c:635 ../libsvn_fs_x/index.c:593 +#: ../libsvn_fs_fs/index.c:636 ../libsvn_fs_x/index.c:583 #, c-format msgid "File offset 0x%s too large, max = 0x%s" msgstr "æ件å移 0x%s 太大ï¼æ大å¼æ¯ 0x%s" -#: ../libsvn_fs_fs/index.c:809 ../libsvn_fs_x/index.c:942 +#: ../libsvn_fs_fs/index.c:810 ../libsvn_fs_x/index.c:936 #, c-format msgid "L2P index page size %s exceeds current limit of 2G entries" msgstr "L2P ç´¢å¼é¡µå¤§å° %s è¶ åºå½å 2G ç页éå¶" -#: ../libsvn_fs_fs/index.c:870 ../libsvn_fs_x/index.c:1005 +#: ../libsvn_fs_fs/index.c:871 ../libsvn_fs_x/index.c:999 #, c-format msgid "Item index %s too large in l2p proto index for revision %ld" msgstr "å¨ L2P å议索å¼ä¸ç项ç®ç´¢å¼ %s 太大ï¼çæ¬ %ld" -#: ../libsvn_fs_fs/index.c:891 ../libsvn_fs_x/index.c:1029 +#: ../libsvn_fs_fs/index.c:892 ../libsvn_fs_x/index.c:1023 #, c-format msgid "L2P index page count %d exceeds current limit of 2G pages" msgstr "L2P ç´¢å¼é¡µè®¡æ° %d 大äºå½å 2G ç页éå¶" -#: ../libsvn_fs_fs/index.c:994 ../libsvn_fs_fs/index.c:2197 -#: ../libsvn_fs_x/index.c:1296 ../libsvn_fs_x/index.c:2542 +#: ../libsvn_fs_fs/index.c:995 ../libsvn_fs_fs/index.c:2198 +#: ../libsvn_fs_x/index.c:1272 ../libsvn_fs_x/index.c:2489 msgid "Index rev / pack file revision numbers do not match" msgstr "ç´¢å¼çæ¬ä¸æå æ件çæ¬å·ä¸å¹é " -#: ../libsvn_fs_fs/index.c:1000 ../libsvn_fs_x/index.c:1309 +#: ../libsvn_fs_fs/index.c:1001 ../libsvn_fs_x/index.c:1285 msgid "L2P index page size is not a power of two" msgstr "L2P ç´¢å¼é¡µå¤§å°ä¸æ¯2çå¹" -#: ../libsvn_fs_fs/index.c:1007 ../libsvn_fs_x/index.c:1303 +#: ../libsvn_fs_fs/index.c:1008 ../libsvn_fs_x/index.c:1279 msgid "Invalid number of revisions in L2P index" msgstr "å¨ L2P ç´¢å¼ä¸ï¼çæ¬æ°åéæ³" -#: ../libsvn_fs_fs/index.c:1013 ../libsvn_fs_x/index.c:1315 -#, +#: ../libsvn_fs_fs/index.c:1014 ../libsvn_fs_x/index.c:1291 msgid "Fewer L2P index pages than revisions" msgstr "L2P ç´¢å¼é¡µå°äºçæ¬æ°ç®" -#: ../libsvn_fs_fs/index.c:1016 ../libsvn_fs_x/index.c:1318 +#: ../libsvn_fs_fs/index.c:1017 ../libsvn_fs_x/index.c:1294 msgid "L2P index page count implausibly large" msgstr "L2P ç´¢å¼é¡µæ°éé¾ä»¥ç½®ä¿¡ç大" -#: ../libsvn_fs_fs/index.c:1021 ../libsvn_fs_x/index.c:1323 +#: ../libsvn_fs_fs/index.c:1022 ../libsvn_fs_x/index.c:1299 #, c-format msgid "Corrupt L2P index for r%ld only covers r%ld:%ld" msgstr "r%ld ç L2P ç´¢å¼æåï¼åªè¦çäº r%ld:%ld" -#: ../libsvn_fs_fs/index.c:1040 ../libsvn_fs_x/index.c:1343 -#, +#: ../libsvn_fs_fs/index.c:1041 ../libsvn_fs_x/index.c:1318 msgid "Revision with no L2P index pages" msgstr "çæ¬æ²¡æ L2P ç´¢å¼é¡µ" -#: ../libsvn_fs_fs/index.c:1045 ../libsvn_fs_x/index.c:1348 +#: ../libsvn_fs_fs/index.c:1046 ../libsvn_fs_x/index.c:1323 msgid "L2P page table exceeded" msgstr "L2P 页表溢åº" -#: ../libsvn_fs_fs/index.c:1052 ../libsvn_fs_x/index.c:1355 -#, +#: ../libsvn_fs_fs/index.c:1053 ../libsvn_fs_x/index.c:1330 msgid "Revisions do not cover the full L2P index page table" msgstr "çæ¬æ²¡æè¦çå ¨é¨ L2P ç´¢å¼é¡µè¡¨" -#: ../libsvn_fs_fs/index.c:1060 ../libsvn_fs_x/index.c:1363 +#: ../libsvn_fs_fs/index.c:1061 ../libsvn_fs_x/index.c:1338 msgid "Empty L2P index page" msgstr "空ç L2P ç´¢å¼é¡µ" -#: ../libsvn_fs_fs/index.c:1066 ../libsvn_fs_x/index.c:1369 +#: ../libsvn_fs_fs/index.c:1067 ../libsvn_fs_x/index.c:1344 msgid "Page exceeds L2P index page size" msgstr "é¡µè¶ åº L2P ç´¢å¼é¡µå¤§å°" -#: ../libsvn_fs_fs/index.c:1125 ../libsvn_fs_x/index.c:1124 +#: ../libsvn_fs_fs/index.c:1126 ../libsvn_fs_x/index.c:1119 #, c-format msgid "Revision %ld not covered by item index" msgstr "çæ¬ %ld 没æ被项ç®ç´¢å¼è¦ç" -#: ../libsvn_fs_fs/index.c:1151 ../libsvn_fs_x/index.c:1150 -#, c-format +#: ../libsvn_fs_fs/index.c:1152 ../libsvn_fs_x/index.c:1145 +#, c-format msgid "Item index %s exceeds l2p limit of %s for revision %ld" msgstr "项ç®ç´¢å¼ %s è¶ åº %s ç L2P éå¶ï¼çæ¬ %ld" -#: ../libsvn_fs_fs/index.c:1358 ../libsvn_fs_x/index.c:1527 +#: ../libsvn_fs_fs/index.c:1359 ../libsvn_fs_x/index.c:1501 msgid "L2P actual page size does not match page table value." msgstr "L2P å®é 页大å°ä¸é¡µè¡¨å¼ä¸å¹é " -#: ../libsvn_fs_fs/index.c:1491 ../libsvn_fs_x/index.c:1570 -#, c-format +#: ../libsvn_fs_fs/index.c:1492 ../libsvn_fs_x/index.c:1545 +#, c-format msgid "Item index %s too large in revision %ld" msgstr "项ç®ç´¢å¼ %s 太大ï¼çæ¬ %ld" -#: ../libsvn_fs_fs/index.c:1910 ../libsvn_fs_x/index.c:2148 -#, c-format +#: ../libsvn_fs_fs/index.c:1911 ../libsvn_fs_x/index.c:2115 +#, c-format msgid "Revision 0x%s too large, max = 0x%s" msgstr "çæ¬ 0x%s 太大ï¼æ大å¼æ¯ 0x%s" -#: ../libsvn_fs_fs/index.c:2203 ../libsvn_fs_x/index.c:2548 +#: ../libsvn_fs_fs/index.c:2204 ../libsvn_fs_x/index.c:2495 msgid "Index offset and rev / pack file size do not match" msgstr "ç´¢å¼å移ä¸çæ¬/æå æ件大å°ä¸å¹é " -#: ../libsvn_fs_fs/index.c:2209 ../libsvn_fs_x/index.c:2554 +#: ../libsvn_fs_fs/index.c:2210 ../libsvn_fs_x/index.c:2501 msgid "P2L index page size is not a power of two" msgstr "P2L ç´¢å¼é¡µå¤§å°ä¸æ¯2çå¹" -#: ../libsvn_fs_fs/index.c:2215 ../libsvn_fs_x/index.c:2560 +#: ../libsvn_fs_fs/index.c:2216 ../libsvn_fs_x/index.c:2507 msgid "P2L page count does not match rev / pack file size" msgstr "P2L 页计æ°ä¸çæ¬/æå æ件大å°ä¸å¹é " -#: ../libsvn_fs_fs/index.c:2395 ../libsvn_fs_x/index.c:2649 -#, +#: ../libsvn_fs_fs/index.c:2396 ../libsvn_fs_x/index.c:2596 msgid "Invalid item type in P2L index" msgstr "å¨ P2L ç´¢å¼ä¸ç项ç®ç±»åéæ³" -#: ../libsvn_fs_fs/index.c:2399 ../libsvn_fs_x/index.c:2702 +#: ../libsvn_fs_fs/index.c:2400 ../libsvn_fs_x/index.c:2649 msgid "Changed path list must have item number 1" msgstr "è·¯å¾ä¿®æ¹åè¡¨å¿ é¡»å ·æé¡¹ç® 1" -#: ../libsvn_fs_fs/index.c:2413 ../libsvn_fs_x/index.c:2659 +#: ../libsvn_fs_fs/index.c:2414 ../libsvn_fs_x/index.c:2606 msgid "Invalid FNV1 checksum in P2L index" msgstr "å¨ P2L ç´¢å¼ä¸ç FNV1 æ ¡éªåéæ³" -#: ../libsvn_fs_fs/index.c:2422 +#: ../libsvn_fs_fs/index.c:2423 msgid "Empty regions must have item number 0 and checksum 0" msgstr "空åºåå¿ é¡»å ·æé¡¹ç® 0 åæ ¡éªå 0" -#: ../libsvn_fs_fs/index.c:2492 ../libsvn_fs_x/index.c:2768 +#: ../libsvn_fs_fs/index.c:2430 ../libsvn_fs_x/index.c:2658 +msgid "P2L index entry size overflow." +msgstr "P2L ç´¢å¼æ¡ç®å¤§å°æº¢åºã" + +#: ../libsvn_fs_fs/index.c:2500 ../libsvn_fs_x/index.c:2721 msgid "P2L page description overlaps with next page description" msgstr "P2L 页æè¿°ä¸ä¸é¡µçæè¿°éå " -#: ../libsvn_fs_fs/index.c:2608 ../libsvn_fs_x/index.c:2883 -#, c-format +#: ../libsvn_fs_fs/index.c:2616 ../libsvn_fs_x/index.c:2836 +#, c-format msgid "Offset %s too large in revision %ld" msgstr "å移 %s 太大ï¼çæ¬ %ld" -#: ../libsvn_fs_fs/index.c:2798 ../libsvn_fs_x/index.c:3086 -#, c-format +#: ../libsvn_fs_fs/index.c:2806 ../libsvn_fs_x/index.c:3039 +#, c-format msgid "Last P2L index entry extends beyond the last page in revision %ld." msgstr "æåç P2L ç´¢å¼å ¥å£å»¶ä¼¸è¶ åºæåç页ï¼çæ¬ %ld." -#: ../libsvn_fs_fs/lock.c:121 ../libsvn_fs_x/lock.c:121 +#: ../libsvn_fs_fs/lock.c:120 ../libsvn_fs_x/lock.c:122 #, c-format msgid "Corrupt lockfile for path '%s' in filesystem '%s'" -msgstr "è·¯å¾ â%sâçéæ件æåï¼å ¶æ件系ç»æ¯ â%sâ" +msgstr "è·¯å¾ '%s'çéæ件æåï¼å ¶æ件系ç»æ¯ '%s'" -#: ../libsvn_fs_fs/lock.c:229 ../libsvn_fs_x/lock.c:229 +#: ../libsvn_fs_fs/lock.c:228 ../libsvn_fs_x/lock.c:241 #, c-format msgid "Cannot write lock/entries hashfile '%s'" -msgstr "æ æ³åå ¥é/æ¡ç®çåå¸æ件â%sâ" +msgstr "æ æ³åå ¥é/æ¡ç®çåå¸æ件'%s'" -#: ../libsvn_fs_fs/lock.c:280 ../libsvn_fs_x/lock.c:280 +#: ../libsvn_fs_fs/lock.c:279 ../libsvn_fs_x/lock.c:293 #, c-format msgid "Can't parse lock/entries hashfile '%s'" -msgstr "ä¸è½è§£æé/æ¡ç®çåå¸æ件â%sâ" +msgstr "ä¸è½è§£æé/æ¡ç®çåå¸æ件'%s'" -#: ../libsvn_fs_fs/lock.c:793 ../libsvn_fs_x/lock.c:793 +#: ../libsvn_fs_fs/lock.c:784 ../libsvn_fs_x/lock.c:804 #, c-format msgid "Lock failed: newer version of '%s' exists" -msgstr "å é失败: â%sâçæ°çæ¬å·²ç»åå¨" +msgstr "å é失败: '%s'çæ°çæ¬å·²ç»åå¨" -#: ../libsvn_fs_fs/lock.c:1259 ../libsvn_fs_x/lock.c:1259 -#, c-format +#: ../libsvn_fs_fs/lock.c:1164 ../libsvn_fs_x/lock.c:1186 +#, c-format msgid "Failed to lock '%s'" -msgstr "éå®â%sâ失败" +msgstr "éå®'%s'失败" -#: ../libsvn_fs_fs/lock.c:1347 ../libsvn_fs_x/lock.c:1347 -#, c-format +#: ../libsvn_fs_fs/lock.c:1258 ../libsvn_fs_x/lock.c:1279 +#, c-format msgid "Failed to unlock '%s'" -msgstr "解éâ%sâ失败" +msgstr "解é'%s'失败" #: ../libsvn_fs_fs/low_level.c:97 ../libsvn_fs_x/low_level.c:99 -#, msgid "Invalid character in revision number" msgstr "çæ¬æ°åä¸å å«éæ³å符" @@ -4024,622 +6457,686 @@ msgstr "çæ¬æ件 (r%ld) çæåä¸ msgid "Final line in revision file r%ld missing space" msgstr "çæ¬æ件 (r%ld) çæåä¸è¡ç¼ºå°ç©ºç½å符" -#: ../libsvn_fs_fs/low_level.c:208 ../libsvn_fs_fs/low_level.c:217 -#: ../libsvn_fs_fs/low_level.c:226 ../libsvn_fs_fs/low_level.c:235 -#: ../libsvn_fs_x/low_level.c:121 ../libsvn_fs_x/low_level.c:130 -#: ../libsvn_fs_x/low_level.c:139 ../libsvn_fs_x/low_level.c:148 -#, -msgid "Invalid revision footer" -msgstr "éæ³çæ¬é¡µè" - -#: ../libsvn_fs_fs/low_level.c:293 ../libsvn_fs_fs/low_level.c:298 -#: ../libsvn_fs_fs/low_level.c:304 ../libsvn_fs_fs/low_level.c:321 -#: ../libsvn_fs_fs/low_level.c:354 ../libsvn_fs_fs/low_level.c:374 -#: ../libsvn_fs_fs/low_level.c:399 ../libsvn_fs_x/low_level.c:780 -#: ../libsvn_fs_x/low_level.c:785 ../libsvn_fs_x/low_level.c:791 -#: ../libsvn_fs_x/low_level.c:808 ../libsvn_fs_x/low_level.c:841 -#: ../libsvn_fs_x/low_level.c:861 ../libsvn_fs_x/low_level.c:881 +#: ../libsvn_fs_fs/low_level.c:326 ../libsvn_fs_fs/low_level.c:331 +#: ../libsvn_fs_fs/low_level.c:337 ../libsvn_fs_fs/low_level.c:354 +#: ../libsvn_fs_fs/low_level.c:387 ../libsvn_fs_fs/low_level.c:407 +#: ../libsvn_fs_fs/low_level.c:432 ../libsvn_fs_x/low_level.c:836 +#: ../libsvn_fs_x/low_level.c:853 ../libsvn_fs_x/low_level.c:882 +#: ../libsvn_fs_x/low_level.c:902 ../libsvn_fs_x/low_level.c:922 msgid "Invalid changes line in rev-file" msgstr "rev-file ä¸æéæ³ä¿®æ¹è¡" -#: ../libsvn_fs_fs/low_level.c:347 ../libsvn_fs_x/low_level.c:834 +#: ../libsvn_fs_fs/low_level.c:380 ../libsvn_fs_x/low_level.c:875 msgid "Invalid change kind in rev file" msgstr "rev æ件ä¸ææ æçæ¹åç§ç±»" -#: ../libsvn_fs_fs/low_level.c:367 ../libsvn_fs_x/low_level.c:854 +#: ../libsvn_fs_fs/low_level.c:400 ../libsvn_fs_x/low_level.c:895 msgid "Invalid text-mod flag in rev-file" msgstr "rev-file ä¸ææ æç text-mod æ å¿" -#: ../libsvn_fs_fs/low_level.c:387 ../libsvn_fs_x/low_level.c:874 +#: ../libsvn_fs_fs/low_level.c:420 ../libsvn_fs_x/low_level.c:915 msgid "Invalid prop-mod flag in rev-file" msgstr "rev-file ä¸ææ æç prop-mod æ å¿" -#: ../libsvn_fs_fs/low_level.c:412 ../libsvn_fs_x/low_level.c:894 -#, +#: ../libsvn_fs_fs/low_level.c:445 ../libsvn_fs_x/low_level.c:935 msgid "Invalid mergeinfo-mod flag in rev-file" msgstr "rev-file ä¸ææ æç mergeinfo-mod æ å¿" -#: ../libsvn_fs_fs/low_level.c:419 ../libsvn_fs_x/low_level.c:900 -#, +#: ../libsvn_fs_fs/low_level.c:452 ../libsvn_fs_x/low_level.c:941 msgid "Invalid path in changes line" msgstr "ä¿®æ¹è¡ä¸å å«æ æçè·¯å¾" -#: ../libsvn_fs_fs/low_level.c:439 ../libsvn_fs_x/low_level.c:923 -#, +#: ../libsvn_fs_fs/low_level.c:472 ../libsvn_fs_x/low_level.c:964 msgid "Invalid copy-from path in changes line" msgstr "ä¿®æ¹è¡ä¸å å«æ æç copy-from è·¯å¾" -#: ../libsvn_fs_fs/low_level.c:545 ../libsvn_fs_x/low_level.c:1024 +#: ../libsvn_fs_fs/low_level.c:581 ../libsvn_fs_x/low_level.c:1063 #, c-format msgid "Invalid change type %d" msgstr "æ æçä¿®æ¹ç±»å %d" -#: ../libsvn_fs_fs/low_level.c:673 ../libsvn_fs_fs/low_level.c:690 -#: ../libsvn_fs_x/low_level.c:203 ../libsvn_fs_x/low_level.c:220 +#: ../libsvn_fs_fs/low_level.c:709 ../libsvn_fs_fs/low_level.c:726 +#: ../libsvn_fs_x/low_level.c:236 ../libsvn_fs_x/low_level.c:253 #, c-format msgid "Found malformed header '%s' in revision file" -msgstr "å¨çæ¬æ件ä¸æ¾å°éæ³æ件头â%sâ" +msgstr "å¨çæ¬æ件ä¸æ¾å°éæ³æ件头'%s'" -#: ../libsvn_fs_fs/low_level.c:737 ../libsvn_fs_fs/low_level.c:746 -#: ../libsvn_fs_fs/low_level.c:754 ../libsvn_fs_fs/low_level.c:763 -#: ../libsvn_fs_fs/low_level.c:777 ../libsvn_fs_fs/low_level.c:788 -#: ../libsvn_fs_fs/low_level.c:795 ../libsvn_fs_fs/low_level.c:802 -#: ../libsvn_fs_x/low_level.c:256 ../libsvn_fs_x/low_level.c:271 -#: ../libsvn_fs_x/low_level.c:280 ../libsvn_fs_x/low_level.c:288 -#: ../libsvn_fs_x/low_level.c:297 ../libsvn_fs_x/low_level.c:312 +#: ../libsvn_fs_fs/low_level.c:776 ../libsvn_fs_fs/low_level.c:785 +#: ../libsvn_fs_fs/low_level.c:793 ../libsvn_fs_fs/low_level.c:802 +#: ../libsvn_fs_fs/low_level.c:827 ../libsvn_fs_fs/low_level.c:846 +#: ../libsvn_fs_fs/low_level.c:861 ../libsvn_fs_fs/low_level.c:868 +#: ../libsvn_fs_fs/low_level.c:876 ../libsvn_fs_x/low_level.c:289 +#: ../libsvn_fs_x/low_level.c:304 ../libsvn_fs_x/low_level.c:313 +#: ../libsvn_fs_x/low_level.c:321 ../libsvn_fs_x/low_level.c:330 +#: ../libsvn_fs_x/low_level.c:345 msgid "Malformed text representation offset line in node-rev" -msgstr "node-rev ä¸æéæ³çææ¬ä¿®è®¢çå移è¡" +msgstr "node-rev ä¸æéæ³çææ¬è¡¨ç¤ºå移è¡" -#: ../libsvn_fs_fs/low_level.c:829 ../libsvn_fs_x/low_level.c:345 +#: ../libsvn_fs_fs/low_level.c:903 ../libsvn_fs_x/low_level.c:378 #, c-format msgid "While reading representation offsets for node-revision '%s':" -msgstr "读åèç¹çæ¬â%sâçå移失败ï¼" +msgstr "读åèç¹çæ¬ '%s' ç表示å移æ¶:" -#: ../libsvn_fs_fs/low_level.c:863 ../libsvn_fs_x/low_level.c:427 +#: ../libsvn_fs_fs/low_level.c:937 msgid "Missing id field in node-rev" msgstr "node-rev ä¸æ²¡æ id" -#: ../libsvn_fs_fs/low_level.c:878 ../libsvn_fs_x/low_level.c:442 +#: ../libsvn_fs_fs/low_level.c:952 ../libsvn_fs_x/low_level.c:494 #, c-format msgid "Missing kind field in node-rev '%s'" msgstr "node-rev '%s' ä¸æ²¡æ kind å段" -#: ../libsvn_fs_fs/low_level.c:913 ../libsvn_fs_x/low_level.c:477 +#: ../libsvn_fs_fs/low_level.c:987 ../libsvn_fs_x/low_level.c:531 #, c-format msgid "Missing cpath field in node-rev '%s'" msgstr "node-rev '%s' ä¸æ²¡æ cpath å段" -#: ../libsvn_fs_fs/low_level.c:920 ../libsvn_fs_x/low_level.c:484 -#, c-format +#: ../libsvn_fs_fs/low_level.c:994 ../libsvn_fs_x/low_level.c:538 +#, c-format msgid "Non-canonical cpath field in node-rev '%s'" msgstr "node-rev '%s' ä¸å å«éæ£å cpath å段" -#: ../libsvn_fs_fs/low_level.c:945 ../libsvn_fs_x/low_level.c:511 +#: ../libsvn_fs_fs/low_level.c:1019 ../libsvn_fs_x/low_level.c:567 #, c-format msgid "Malformed copyroot line in node-rev '%s'" msgstr "node-rev '%s' ä¸ç copyroot è¡éæ³" -#: ../libsvn_fs_fs/low_level.c:963 ../libsvn_fs_x/low_level.c:531 +#: ../libsvn_fs_fs/low_level.c:1037 ../libsvn_fs_x/low_level.c:587 #, c-format msgid "Malformed copyfrom line in node-rev '%s'" msgstr "node-rev '%s' ä¸ç copyfrom è¡éæ³" -#: ../libsvn_fs_fs/low_level.c:1168 ../libsvn_fs_x/low_level.c:722 -#, c-format +#: ../libsvn_fs_fs/low_level.c:1302 ../libsvn_fs_x/low_level.c:780 +#, c-format msgid "Malformed representation header" -msgstr "éæ³å±ç°å¤´" +msgstr "éæ³è¡¨ç¤ºå¤´" -#: ../libsvn_fs_fs/pack.c:1946 +#: ../libsvn_fs_fs/pack.c:2118 #, c-format msgid "FSFS format (%d) too old to pack; please upgrade the filesystem." msgstr "è¦æå ç FSFS æ ¼å¼ (%d) 太æ§ï¼è¯·å级ã" -#: ../libsvn_fs_fs/recovery.c:171 +#: ../libsvn_fs_fs/recovery.c:172 msgid "Recovery encountered a non-directory node" msgstr "ä¿®å¤æ¶éå°éç®å½èç¹" -#: ../libsvn_fs_fs/recovery.c:192 +#: ../libsvn_fs_fs/recovery.c:193 msgid "Recovery encountered a deltified directory representation" msgstr "ä¿®å¤æ¶éå°å·®å¼ç®å½è¡¨ç¤º" -#: ../libsvn_fs_fs/recovery.c:232 ../libsvn_fs_fs/recovery.c:241 -#: ../libsvn_fs_fs/recovery.c:247 +#: ../libsvn_fs_fs/recovery.c:214 +#, c-format +msgid "malformed representation for node-revision '%s'" +msgstr "èç¹çæ¬ '%s' çè¡¨ç¤ºæ ¼å¼é误" + +#: ../libsvn_fs_fs/recovery.c:240 ../libsvn_fs_fs/recovery.c:249 +#: ../libsvn_fs_fs/recovery.c:255 msgid "Directory entry corrupt" msgstr "ç®å½æ¡ç®æå" -#: ../libsvn_fs_fs/recovery.c:393 ../libsvn_fs_x/recovery.c:174 +#: ../libsvn_fs_fs/recovery.c:401 ../libsvn_fs_x/recovery.c:266 #, c-format msgid "Expected current rev to be <= %ld but found %ld" msgstr "ææå½åçæ¬ <= %ldï¼ä½å®æ¯ %ld" -#: ../libsvn_fs_fs/recovery.c:444 ../libsvn_fs_x/recovery.c:189 +#: ../libsvn_fs_fs/recovery.c:452 ../libsvn_fs_x/recovery.c:303 #, c-format msgid "Revision %ld has a revs file but no revprops file" msgstr "çæ¬ %ld æçæ¬æ件ï¼ä½æ¯æ²¡æçæ¬å±æ§æ件" -#: ../libsvn_fs_fs/recovery.c:451 ../libsvn_fs_x/recovery.c:196 +#: ../libsvn_fs_fs/recovery.c:459 ../libsvn_fs_x/recovery.c:310 #, c-format msgid "Revision %ld has a revs file but the revprops file is inaccessible" msgstr "çæ¬ %ld æçæ¬æ件ï¼ä½æ¯çæ¬å±æ§æ件ä¸å¯è®¿é®" -#: ../libsvn_fs_fs/recovery.c:460 ../libsvn_fs_x/recovery.c:205 +#: ../libsvn_fs_fs/recovery.c:468 ../libsvn_fs_x/recovery.c:292 #, c-format msgid "Revision %ld has a non-file where its revprops file should be" msgstr "çæ¬ %ld æéæ件项ç®ï¼ä¸å ¶å±æ§æ件çè®°å½çç¾" -#: ../libsvn_fs_fs/rep-cache.c:124 ../libsvn_fs_x/rep-cache.c:124 -msgid "Couldn't open rep-cache database" -msgstr "æ æ³æå¼ç¼åæ°æ®åº" +#: ../libsvn_fs_fs/rep-cache.c:130 ../libsvn_fs_x/rep-cache.c:130 +#, c-format +msgid "Couldn't open rep-cache database '%s'" +msgstr "æ æ³æå¼ rep-cache æ°æ®åº '%s'" -#: ../libsvn_fs_fs/rep-cache.c:257 ../libsvn_fs_fs/rep-cache.c:316 -#: ../libsvn_fs_x/rep-cache.c:253 ../libsvn_fs_x/rep-cache.c:311 +#: ../libsvn_fs_fs/rep-cache.c:281 ../libsvn_fs_fs/rep-cache.c:342 +#: ../libsvn_fs_x/rep-cache.c:280 ../libsvn_fs_x/rep-cache.c:338 msgid "Only SHA1 checksums can be used as keys in the rep_cache table.\n" msgstr "å¨è¡¨ rep_cache ä¸ï¼åªæ SHA1 æ ¡éªåæè½ç¨ä½é®ã\n" -#: ../libsvn_fs_fs/revprops.c:319 ../libsvn_fs_x/revprops.c:795 -#, c-format +#: ../libsvn_fs_fs/revprops.c:372 +#, c-format msgid "Packed revprop manifest for r%ld not properly terminated" msgstr "r%ld çæå ç revprop æ¸ å没ææ£ç¡®ç»æ" -#: ../libsvn_fs_fs/revprops.c:361 ../libsvn_fs_x/revprops.c:837 +#: ../libsvn_fs_fs/revprops.c:414 #, c-format msgid "Packed revprop manifest for r%ld has too many entries" msgstr "r%ld çæå ç revprop æ¸ åå å«äºå¤ªå¤ç项ç®" -#: ../libsvn_fs_fs/revprops.c:366 ../libsvn_fs_x/revprops.c:842 +#: ../libsvn_fs_fs/revprops.c:419 #, c-format msgid "Packed revprop manifest for r%ld has too few entries" msgstr "r%ld çæå ç revprop æ¸ åå å«ç项ç®å¤ªå°" -#: ../libsvn_fs_fs/revprops.c:430 ../libsvn_fs_x/revprops.c:905 +#: ../libsvn_fs_fs/revprops.c:489 ../libsvn_fs_x/revprops.c:798 #, c-format msgid "Revprop pack for revision r%ld contains revprops for r%ld .. r%ld" -msgstr "" +msgstr "çæ¬ r%ld ç Revprop å å å« r%ld .. r%ld ççæ¬å±æ§" -#: ../libsvn_fs_fs/revprops.c:441 ../libsvn_fs_x/revprops.c:916 -#, c-format +#: ../libsvn_fs_fs/revprops.c:500 ../libsvn_fs_x/revprops.c:809 +#, c-format msgid "Revprop pack for revision r%ld starts at non-packed revisions r%ld" msgstr "r%ld çæå ç revprop èµ·å§äºéæå çæ¬ r%ld" -#: ../libsvn_fs_fs/revprops.c:450 ../libsvn_fs_x/revprops.c:925 +#: ../libsvn_fs_fs/revprops.c:509 msgid "Header end not found" msgstr "æ¾ä¸å° Header çç»ææ è®°" -#: ../libsvn_fs_fs/revprops.c:482 ../libsvn_fs_x/revprops.c:957 +#: ../libsvn_fs_fs/revprops.c:544 msgid "Packed revprop size exceeds pack file size" msgstr "æå ç revprop 大å°è¶ åºæå æ件大å°" -#: ../libsvn_fs_fs/revprops.c:540 ../libsvn_fs_x/revprops.c:1015 +#: ../libsvn_fs_fs/revprops.c:628 ../libsvn_fs_x/revprops.c:887 #, c-format msgid "No such packed revision %ld" msgstr "没ææ¤æå çæ¬ %ld" -#: ../libsvn_fs_fs/revprops.c:573 ../libsvn_fs_x/revprops.c:1056 -#, c-format +#: ../libsvn_fs_fs/revprops.c:660 ../libsvn_fs_x/revprops.c:936 +#, c-format msgid "Failed to read revprop pack file for r%ld" msgstr "读å r%ld ç revprop æå æ件失败" -#: ../libsvn_fs_fs/revprops.c:580 ../libsvn_fs_x/revprops.c:1063 -#, c-format +#: ../libsvn_fs_fs/revprops.c:668 +#, c-format msgid "Revprop pack file for r%ld is corrupt" msgstr "r%ld ç revprop æå æ件æå" -#: ../libsvn_fs_fs/revprops.c:637 ../libsvn_fs_x/revprops.c:1136 +#: ../libsvn_fs_fs/revprops.c:816 ../libsvn_fs_x/revprops.c:1009 #, c-format msgid "Could not read revprops for revision %ld" msgstr "æ æ³æ¾å°çæ¬ %ld ççæ¬å±æ§" -#: ../libsvn_fs_fs/revprops.c:862 ../libsvn_fs_x/revprops.c:1374 +#: ../libsvn_fs_fs/revprops.c:1051 #, c-format msgid "Packed file '%s' misses a tag" msgstr "æå æ件 '%s' 缺å°ä¸ä¸ªæ ç¾" -#: ../libsvn_fs_fs/transaction.c:258 ../libsvn_fs_x/transaction.c:503 +#: ../libsvn_fs_fs/transaction.c:250 ../libsvn_fs_x/transaction.c:529 #, c-format msgid "Can't unlock unknown transaction '%s'" -msgstr "ä¸è½è§£éæªç¥äºå¡â%sâ" +msgstr "ä¸è½è§£éæªç¥äºå¡'%s'" -#: ../libsvn_fs_fs/transaction.c:262 ../libsvn_fs_x/transaction.c:507 +#: ../libsvn_fs_fs/transaction.c:254 ../libsvn_fs_x/transaction.c:533 #, c-format msgid "Can't unlock nonlocked transaction '%s'" -msgstr "ä¸è½è§£éæªéäºå¡â%sâ" +msgstr "ä¸è½è§£éæªéäºå¡'%s'" -#: ../libsvn_fs_fs/transaction.c:269 ../libsvn_fs_x/transaction.c:514 +#: ../libsvn_fs_fs/transaction.c:261 ../libsvn_fs_x/transaction.c:540 #, c-format msgid "Can't unlock prototype revision lockfile for transaction '%s'" -msgstr "ä¸è½ä¸ºäºå¡â%sâ解éååçæ¬éæ件" +msgstr "ä¸è½ä¸ºäºå¡'%s'解éååçæ¬éæ件" -#: ../libsvn_fs_fs/transaction.c:275 ../libsvn_fs_x/transaction.c:520 +#: ../libsvn_fs_fs/transaction.c:267 ../libsvn_fs_x/transaction.c:546 #, c-format msgid "Can't close prototype revision lockfile for transaction '%s'" -msgstr "ä¸è½ä¸ºäºå¡â%sâå ³éååçæ¬éæ件" +msgstr "ä¸è½ä¸ºäºå¡'%s'å ³éååçæ¬éæ件" -#: ../libsvn_fs_fs/transaction.c:321 ../libsvn_fs_x/transaction.c:566 +#: ../libsvn_fs_fs/transaction.c:313 ../libsvn_fs_x/transaction.c:594 #, c-format msgid "Cannot write to the prototype revision file of transaction '%s' because a previous representation is currently being written by this process" -msgstr "å 为å½åè¿ç¨æ£å¨åå ¥ä»¥åçæ¬ï¼æ以ä¸è½ä¸ºäºå¡ '%s' åå ¥ååçæ¬æ件ã" +msgstr "æ æ³åå ¥äºå¡ '%s' çååçæ¬æ件ï¼å 为å½åè¿ç¨æ£å¨åå ¥å åç表示" -#: ../libsvn_fs_fs/transaction.c:358 ../libsvn_fs_x/transaction.c:603 +#: ../libsvn_fs_fs/transaction.c:350 ../libsvn_fs_x/transaction.c:632 #, c-format msgid "Cannot write to the prototype revision file of transaction '%s' because a previous representation is currently being written by another process" -msgstr "å ä¸ºå ¶å®è¿ç¨æ£å¨åå ¥ä»¥åçæ¬ï¼æ以ä¸è½ä¸ºäºå¡ '%s' åå ¥ååçæ¬æ件ã" +msgstr "æ æ³åå ¥äºå¡ '%s' çååçæ¬æ件ï¼å 为å¦ä¸ä¸ªè¿ç¨æ£å¨åå ¥å åç表示" -#: ../libsvn_fs_fs/transaction.c:366 ../libsvn_fs_x/transaction.c:610 -#: ../libsvn_subr/io.c:2168 +#: ../libsvn_fs_fs/transaction.c:358 ../libsvn_fs_x/transaction.c:640 +#: ../libsvn_subr/io.c:2681 #, c-format msgid "Can't get exclusive lock on file '%s'" -msgstr "ä¸è½è·åæ件â%sâçæå®é" +msgstr "ä¸è½è·åæ件'%s'çæå®é" -#: ../libsvn_fs_fs/transaction.c:414 ../libsvn_fs_x/transaction.c:655 +#: ../libsvn_fs_fs/transaction.c:406 ../libsvn_fs_x/transaction.c:686 #, c-format msgid "p2l proto index offset %s beyond protorev file size %s for TXN %s" -msgstr "" +msgstr "äºå¡ %s ç p2l ååç´¢å¼å移é %s è¶ åº protorev æä»¶å¤§å° %s" -#: ../libsvn_fs_fs/transaction.c:523 ../libsvn_fs_fs/transaction.c:2348 -#: ../libsvn_fs_x/transaction.c:760 ../libsvn_fs_x/transaction.c:2408 +#: ../libsvn_fs_fs/transaction.c:515 ../libsvn_fs_fs/transaction.c:2618 +#: ../libsvn_fs_x/transaction.c:816 ../libsvn_fs_x/transaction.c:2686 #, c-format msgid "Attempted to write to non-transaction '%s'" msgstr "è¯å¾åè³éäºå¡ '%s'" -#: ../libsvn_fs_fs/transaction.c:932 ../libsvn_fs_x/transaction.c:1169 +#: ../libsvn_fs_fs/transaction.c:986 ../libsvn_fs_x/transaction.c:1198 msgid "Copying from transactions not allowed" msgstr "ä¸å 许ä»äºå¡å¤å¶" -#: ../libsvn_fs_fs/transaction.c:1065 +#: ../libsvn_fs_fs/transaction.c:1120 #, c-format msgid "Unable to create transaction directory in '%s' for revision %ld" -msgstr "æ æ³å¨â%sâä¸ä¸ºçæ¬ %ld å建äºå¡ç®å½" +msgstr "æ æ³å¨'%s'ä¸ä¸ºçæ¬ %ld å建äºå¡ç®å½" -#: ../libsvn_fs_fs/transaction.c:1135 ../libsvn_fs_x/transaction.c:1312 +#: ../libsvn_fs_fs/transaction.c:1191 ../libsvn_fs_x/transaction.c:1383 msgid "Internal error: a null transaction id was passed to get_txn_proplist()" msgstr "å é¨é误: å get_txn_proplist() ä¼ éäºç©ºäºå¡æ è¯" -#: ../libsvn_fs_fs/transaction.c:1312 ../libsvn_fs_fs/transaction.c:1318 -#: ../libsvn_fs_x/transaction.c:1570 ../libsvn_fs_x/transaction.c:1576 +#: ../libsvn_fs_fs/transaction.c:1204 ../libsvn_fs_x/transaction.c:1397 +#, c-format +msgid "malformed property list in transaction '%s'" +msgstr "äºå¡ '%s' ä¸çå±æ§åè¡¨æ ¼å¼é误" + +#: ../libsvn_fs_fs/transaction.c:1372 ../libsvn_fs_fs/transaction.c:1378 +#: ../libsvn_fs_x/transaction.c:1657 ../libsvn_fs_x/transaction.c:1663 msgid "next-id file corrupt" msgstr "next-id æ件æå" -#: ../libsvn_fs_fs/transaction.c:1431 ../libsvn_fs_x/transaction.c:1689 +#: ../libsvn_fs_fs/transaction.c:1491 ../libsvn_fs_x/transaction.c:1776 #, c-format msgid "Transaction '%s' cleanup failed" msgstr "äºå¡ '%s' æ¸ ç失败" -#: ../libsvn_fs_fs/transaction.c:2368 ../libsvn_fs_x/transaction.c:2428 +#: ../libsvn_fs_fs/transaction.c:1819 ../libsvn_fs_x/transaction.c:1583 +msgid "Unexpected itemidx file length" +msgstr "æå¤ç itemidx æ件é¿åº¦" + +#: ../libsvn_fs_fs/transaction.c:2638 ../libsvn_fs_x/transaction.c:2707 msgid "Can't set text contents of a directory" msgstr "æ æ³è®¾å®ç®å½çææ¬å 容" -#: ../libsvn_fs_fs/transaction.c:2774 ../libsvn_fs_x/transaction.c:2764 +#: ../libsvn_fs_fs/transaction.c:3067 ../libsvn_fs_x/transaction.c:3046 #, c-format msgid "predecessor count for the root node-revision is wrong: found (%d+%ld != %d), committing r%ld" msgstr "æ ¹èç¹çæ¬çå任计æ°é误: åç° (%d+%ld != %d), æ£å¨æ交 r%ld" -#: ../libsvn_fs_fs/transaction.c:2931 +#: ../libsvn_fs_fs/transaction.c:3249 msgid "Truncated protorev file detected" msgstr "æ£æµå°æ件 protorev 被æªæ" -#: ../libsvn_fs_fs/transaction.c:3418 ../libsvn_fs_x/transaction.c:3319 +#: ../libsvn_fs_fs/transaction.c:3786 ../libsvn_fs_x/transaction.c:3806 msgid "Transaction out of date" msgstr "äºå¡è¿æ¶" -#: ../libsvn_fs_fs/transaction.c:3693 ../libsvn_fs_x/transaction.c:3578 +#: ../libsvn_fs_fs/transaction.c:4085 ../libsvn_fs_x/transaction.c:4053 #, c-format msgid "No such transaction '%s'" msgstr "没æäºå¡ '%s'" -#: ../libsvn_fs_fs/tree.c:2404 ../libsvn_subr/path.c:1229 +#: ../libsvn_fs_fs/tree.c:902 #, c-format -msgid "Invalid control character '0x%02x' in path '%s'" -msgstr "æ ææ§å¶å符 â0x%02xâ å¨è·¯å¾ â%sâ ä¸" +msgid "Failure opening '%s' in transaction '%s'" +msgstr "å¨äºå¡ '%s' ä¸æå¼ '%s' 失败" + +#: ../libsvn_fs_fs/tree.c:905 +#, c-format +msgid "Failure opening '%s' in revision %ld" +msgstr "æå¼ '%s'(çæ¬ %ld) 失败" -#: ../libsvn_fs_fs/tree.c:2567 ../libsvn_fs_x/tree.c:2504 -#, fuzzy +#: ../libsvn_fs_fs/tree.c:2655 ../libsvn_fs_x/tree.c:1585 msgid "Copy immutable tree not supported" -msgstr "å½åä¸æ¯æä»å¯åçæ å¤å¶" +msgstr "ä¸æ¯æå¤å¶ä¸å¯åæ " -#: ../libsvn_fs_fs/tree.c:3882 ../libsvn_fs_x/tree.c:3666 +#: ../libsvn_fs_fs/tree.c:4212 ../libsvn_fs_x/tree.c:2984 #, c-format msgid "Node-revision #'%s' claims to have mergeinfo but doesn't" -msgstr "èç¹çæ¬ #â%sâ 声称æå并信æ¯ï¼å®é ä¸å´æ²¡æ" +msgstr "èç¹çæ¬ #'%s' 声称æå并信æ¯ï¼å®é ä¸å´æ²¡æ" -#: ../libsvn_fs_fs/tree.c:3998 ../libsvn_fs_x/tree.c:3782 +#: ../libsvn_fs_fs/tree.c:4327 ../libsvn_fs_x/tree.c:3076 #, c-format msgid "Node-revision '%s@%ld' claims to have mergeinfo but doesn't" -msgstr "èç¹çæ¬â%s@%ldâ声称æå并信æ¯ï¼å®é ä¸å´æ²¡æ" +msgstr "èç¹çæ¬'%s@%ld'声称æå并信æ¯ï¼å®é ä¸å´æ²¡æ" -#: ../libsvn_fs_fs/tree.c:4198 +#: ../libsvn_fs_fs/tree.c:4526 #, c-format msgid "Querying mergeinfo requires version %d of the FSFS filesystem schema; filesystem '%s' uses only version %d" -msgstr "æ¥è¯¢å并信æ¯éè¦ FSFS æ件系ç»æ¹æ¡çæ¬ %dï¼æ件系ç»â%sâåªä½¿ç¨çæ¬ %d" +msgstr "æ¥è¯¢å并信æ¯éè¦ FSFS æ件系ç»æ¹æ¡çæ¬ %dï¼æ件系ç»'%s'åªä½¿ç¨çæ¬ %d" -#: ../libsvn_fs_fs/util.c:387 ../libsvn_fs_x/util.c:437 +#: ../libsvn_fs_fs/util.c:387 ../libsvn_fs_x/util.c:491 #, c-format msgid "%s file '%s' contains unexpected non-digit '%c' within '%s'" -msgstr "%s æ件â%sâå å«æå¤çéæ°åå符 '%c' å¨ '%s' ä¸" +msgstr "%s æ件'%s'å å«æå¤çéæ°åå符 '%c' å¨ '%s' ä¸" -#: ../libsvn_fs_fs/util.c:477 ../libsvn_fs_fs/util.c:482 -#: ../libsvn_fs_fs/util.c:487 ../libsvn_fs_x/util.c:508 +#: ../libsvn_fs_fs/util.c:479 ../libsvn_fs_fs/util.c:484 +#: ../libsvn_fs_fs/util.c:489 ../libsvn_fs_x/util.c:566 msgid "Corrupt 'current' file" -msgstr "æ件 âcurrentâ æå" +msgstr "æ件 'current' æå" -#: ../libsvn_fs_fs/util.c:598 ../libsvn_fs_x/util.c:619 +#: ../libsvn_fs_fs/util.c:585 ../libsvn_fs_x/util.c:662 #, c-format msgid "Can't read '%s'" -msgstr "ä¸è½è¯»åâ%sâ" +msgstr "ä¸è½è¯»å'%s'" -#: ../libsvn_fs_fs/util.c:619 ../libsvn_fs_x/util.c:646 +#: ../libsvn_fs_fs/util.c:606 ../libsvn_fs_x/util.c:689 msgid "Unexpected EOF" msgstr "æµæå¤ç»æ" -#: ../libsvn_fs_fs/util.c:626 ../libsvn_fs_x/util.c:653 +#: ../libsvn_fs_fs/util.c:613 ../libsvn_fs_x/util.c:696 #, c-format msgid "Number '%s' invalid or too large" -msgstr "" +msgstr "æ°å '%s' æ ææ太大" -#: ../libsvn_fs_fs/verify.c:208 ../libsvn_fs_x/verify.c:181 -#, fuzzy, c-format +#: ../libsvn_fs_fs/verify.c:209 ../libsvn_fs_x/verify.c:183 +#, c-format msgid "%s checksum mismatch in file %s" -msgstr "'%s' çæ ¡éªåé误" +msgstr "æ件 %s ä¸ %s æ ¡éªåä¸å¹é " -#: ../libsvn_fs_fs/verify.c:303 +#: ../libsvn_fs_fs/verify.c:304 #, c-format msgid "p2l index entry not found for PHYS %s returned by l2p index for LOG r%ld:i%ld" -msgstr "" +msgstr "æ¾ä¸å° PHYS %s ç p2l ç´¢å¼æ¡ç®(ç± l2p ç´¢å¼ä¸º LOG r%ld:i%ld è¿å)" -#: ../libsvn_fs_fs/verify.c:313 ../libsvn_fs_x/verify.c:289 +#: ../libsvn_fs_fs/verify.c:314 ../libsvn_fs_x/verify.c:288 #, c-format msgid "p2l index info LOG r%ld:i%ld does not match l2p index for LOG r%ld:i%ld" -msgstr "" +msgstr "p2l ç´¢å¼ä¿¡æ¯ LOG r%ld:i%ld ä¸ LOG r%ld:i%ld ç l2p ç´¢å¼ä¸å¹é " -#: ../libsvn_fs_fs/verify.c:379 ../libsvn_fs_x/verify.c:355 -#, fuzzy, c-format +#: ../libsvn_fs_fs/verify.c:380 ../libsvn_fs_x/verify.c:356 +#, c-format msgid "p2l does not cover offset %s for revision %ld" -msgstr "没æè·¯å¾ â%sâ å¨çæ¬ %ld ä¸" +msgstr "p2l æªè¦çå移é %s(çæ¬ %ld)" -#: ../libsvn_fs_fs/verify.c:404 +#: ../libsvn_fs_fs/verify.c:405 #, c-format msgid "Empty P2L entry for PHYS %s refers to revision %ld outside the rev / pack file (%ld-%ld)" -msgstr "" +msgstr "PHYS %s å¤ç空 P2L æ¡ç®å¼ç¨äº rev / pack æ件 (%ld-%ld) ä¹å¤ççæ¬ %ld" -#: ../libsvn_fs_fs/verify.c:421 +#: ../libsvn_fs_fs/verify.c:422 #, c-format msgid "l2p index entry PHYS %sdoes not match p2l index value LOG r%ld:i%ld for PHYS %s" -msgstr "" +msgstr "l2p ç´¢å¼æ¡ç® PHYS %sä¸ p2l ç´¢å¼å¼ LOG r%ld:i%ld ä¸å¹é (PHYS %s)" -#: ../libsvn_fs_fs/verify.c:485 ../libsvn_fs_x/verify.c:451 +#: ../libsvn_fs_fs/verify.c:487 ../libsvn_fs_x/verify.c:456 #, c-format msgid "Empty section in file %s contains non-NUL data at offset %s" -msgstr "" +msgstr "æ件 %s ä¸å移é %s å¤ç空èå«æé NUL æ°æ®" -#: ../libsvn_fs_fs/verify.c:526 ../libsvn_fs_x/verify.c:493 +#: ../libsvn_fs_fs/verify.c:528 ../libsvn_fs_x/verify.c:498 #, c-format msgid "Checksum mismatch in item at offset %s of length %s bytes in file %s" -msgstr "" +msgstr "æ件 %s ä¸å移é %s å¤é¿åº¦ä¸º %s åèçé¡¹æ ¡éªåä¸å¹é " -#: ../libsvn_fs_fs/verify.c:622 ../libsvn_fs_x/verify.c:589 +#: ../libsvn_fs_fs/verify.c:624 ../libsvn_fs_x/verify.c:594 #, c-format msgid "File size of %s for revision r%ld does not match p2l index size of %s" -msgstr "" +msgstr "æä»¶å¤§å° %s(çæ¬ r%ld)ä¸ p2l ç´¢å¼å¤§å° %s ä¸å¹é " -#: ../libsvn_fs_fs/verify.c:667 ../libsvn_fs_x/verify.c:634 +#: ../libsvn_fs_fs/verify.c:669 ../libsvn_fs_x/verify.c:640 #, c-format msgid "p2l index entry for revision r%ld is non-contiguous between offsets %s and %s" -msgstr "" +msgstr "çæ¬ r%ld ç p2l ç´¢å¼æ¡ç®å¨å移é %s å %s ä¹é´ä¸è¿ç»" + +#: ../libsvn_fs_fs/verify.c:682 +#, c-format +msgid "p2l index entry for revision r%ld at offset %s contains invalid item type %u" +msgstr "çæ¬ r%ld å¨å移é %s å¤ç p2l ç´¢å¼æ¡ç®å å«æ æç项类å %u" -#: ../libsvn_fs_util/fs-util.c:156 +#: ../libsvn_fs_fs/verify.c:700 +#, c-format +msgid "p2l index entry for changes in revision r%ld is item %s of type %u at offset %s" +msgstr "çæ¬ r%ld çæ´æ¹ç p2l ç´¢å¼æ¡ç®æ¯å移é %s å¤ç±»å %u ç项 %s" + +#: ../libsvn_fs_util/fs-util.c:164 msgid "Filesystem object has not been opened yet" msgstr "æ件系ç»å¯¹è±¡å°æªæå¼" -#: ../libsvn_fs_util/fs-util.c:159 +#: ../libsvn_fs_util/fs-util.c:167 msgid "Filesystem object already open" msgstr "æ件系ç»å¯¹è±¡å·²ç»æå¼" -#: ../libsvn_fs_x/cached_data.c:2918 -#, fuzzy, c-format +#: ../libsvn_fs_x/batch_fsync.c:142 +msgid "Can't create fsync thread pool in FSX" +msgstr "æ æ³å¨ FSX ä¸å建 fsync 线ç¨æ± " + +#: ../libsvn_fs_x/batch_fsync.c:414 ../svnserve/svnserve.c:1416 +#, c-format +msgid "Can't push task" +msgstr "ä¸è½å建线ç¨æ± ä»»å¡" + +#: ../libsvn_fs_x/cached_data.c:2508 +#, c-format +msgid "Directory for '%s' is too large" +msgstr "'%s' çç®å½å¤ªå¤§" + +#: ../libsvn_fs_x/cached_data.c:2530 +#, c-format +msgid "Directory entry missing kind in '%s'" +msgstr "'%s' ä¸çç®å½æ¡ç®ç¼ºå°ç±»å" + +#: ../libsvn_fs_x/cached_data.c:2536 +#, c-format +msgid "Directory entry missing change set in '%s'" +msgstr "'%s' ä¸çç®å½æ¡ç®ç¼ºå°åæ´é" + +#: ../libsvn_fs_x/cached_data.c:2542 +#, c-format +msgid "Directory entry missing item number in '%s'" +msgstr "'%s' ä¸çç®å½æ¡ç®ç¼ºå°é¡¹ç¼å·" + +#: ../libsvn_fs_x/cached_data.c:2578 +#, c-format +msgid "Directory length mismatch in '%s'" +msgstr "'%s' ä¸çç®å½é¿åº¦ä¸å¹é " + +#: ../libsvn_fs_x/cached_data.c:3083 +#, c-format msgid "" "Low-level checksum mismatch while reading\n" "%s bytes of meta data at offset %s " -msgstr "读å修订çæ¶æ ¡éªåä¸å¹é " +msgstr "" +"å¨å移é %s å¤è¯»å\n" +"%s åèçå æ°æ®æ¶ä½çº§æ ¡éªåä¸å¹é " -#: ../libsvn_fs_x/changes.c:252 +#: ../libsvn_fs_x/changes.c:232 #, c-format msgid "Changes list index %%%s exceeds container size %%d" -msgstr "" +msgstr "åæ´åè¡¨ç´¢å¼ %%%s è¶ åºå®¹å¨å¤§å° %%d" -#: ../libsvn_fs_x/changes.c:519 +#: ../libsvn_fs_x/changes.c:485 #, c-format msgid "Changes list index %u exceeds container size %d" -msgstr "" +msgstr "åæ´åè¡¨ç´¢å¼ %u è¶ åºå®¹å¨å¤§å° %d" -#: ../libsvn_fs_x/fs.c:100 -#, fuzzy, c-format +#: ../libsvn_fs_x/fs.c:104 +#, c-format msgid "Can't fetch FSX shared data" -msgstr "ä¸è½è·åæ件系ç»äºæ¥ä½" +msgstr "æ æ³è·å FSX å ±äº«æ°æ®" -#: ../libsvn_fs_x/fs.c:129 -#, fuzzy, c-format +#: ../libsvn_fs_x/fs.c:133 +#, c-format msgid "Can't store FSX shared data" -msgstr "ä¸è½åå¨æ件系ç»å ±äº«æ°æ®" +msgstr "æ æ³åå¨ FSX å ±äº«æ°æ®" -#: ../libsvn_fs_x/fs.c:550 -#, fuzzy +#: ../libsvn_fs_x/fs.c:603 msgid "Module for working with an experimental (FSX) repository." -msgstr "模åä¸ææ¬æ件(FSFS)çæ¬åºä¸èµ·å·¥ä½ã" +msgstr "ç¨äºæä½å®éªæ§ (FSX) çæ¬åºç模åã" -#: ../libsvn_fs_x/fs.c:611 -#, fuzzy, c-format +#: ../libsvn_fs_x/fs.c:667 +#, c-format msgid "Unsupported FS loader version (%d) for fsx" -msgstr "ä¸æ¯æçFSFSä¹FSå è½½å¨çæ¬ (%d)" +msgstr "fsx ç FS å è½½å¨çæ¬ (%d) ä¸æ¯æ" + +#: ../libsvn_fs_x/fs_x.c:108 +#, c-format +msgid "Unsupported experimental FSX format '%d' found; current format is '%d'" +msgstr "åç°ä¸æ¯æçå®éªæ§ FSX æ ¼å¼ '%d'ï¼å½åæ ¼å¼ä¸º '%d'" -#: ../libsvn_fs_x/fs_x.c:1017 -#, fuzzy +#: ../libsvn_fs_x/fs_x.c:117 +#, c-format +msgid "Expected FSX format between '%d' and '%d'; found format '%d'" +msgstr "ææ FSX æ ¼å¼å¨ '%d' å '%d' ä¹é´ï¼æ¾å°æ ¼å¼ '%d'" + +#: ../libsvn_fs_x/fs_x.c:1063 msgid "FSX is not compatible with Subversion prior to 1.9" -msgstr "â%sâä¸æ¯ææç Subversion å±æ§å称" +msgstr "FSX ä¸ 1.9 ä¹åç Subversion ä¸å ¼å®¹" -#: ../libsvn_fs_x/hotcopy.c:486 +#: ../libsvn_fs_x/hotcopy.c:354 #, c-format msgid "The FSX format (%d) of the hotcopy source does not match the FSX format (%d) of the hotcopy destination; please upgrade both repositories to the same format" -msgstr "" +msgstr "hotcopy æºç FSX æ ¼å¼ (%d) ä¸ hotcopy ç®æ ç FSX æ ¼å¼ (%d) ä¸å¹é ï¼è¯·å°ä¸¤ä¸ªçæ¬åºå级å°ç¸åæ ¼å¼" -#: ../libsvn_fs_x/index.c:294 -#, fuzzy +#: ../libsvn_fs_x/index.c:289 msgid "Can't read index file '%s' at offset 0x%" -msgstr "ä¸è½è¯»åæ件â%sâ" +msgstr "æ æ³å¨å移é 0x% å¤è¯»åç´¢å¼æ件 '%s'" -#: ../libsvn_fs_x/index.c:304 -#, fuzzy +#: ../libsvn_fs_x/index.c:299 msgid "Unexpected end of index file %s at offset 0x%" -msgstr "svndiff è¾å ¥ææç»æ" +msgstr "ç´¢å¼æ件 %s å¨å移é 0x% å¤æå¤ç»æ" -#: ../libsvn_fs_x/index.c:2668 +#: ../libsvn_fs_x/index.c:2615 msgid "Unused regions must be empty and have checksum 0" -msgstr "" +msgstr "æªä½¿ç¨çåºåå¿ é¡»ä¸ºç©ºä¸æ ¡éªå为 0" -#: ../libsvn_fs_x/index.c:2682 +#: ../libsvn_fs_x/index.c:2629 msgid "Only containers may have more than one sub-item" -msgstr "" +msgstr "åªæ容å¨å¯ä»¥æå¤ä¸ªå项" + +#: ../libsvn_fs_x/low_level.c:455 +#, c-format +msgid "Missing %s field in node-rev" +msgstr "èç¹çæ¬ä¸ç¼ºå° %s å段" + +#: ../libsvn_fs_x/noderevs.c:320 +#, c-format +msgid "ID part index %d exceeds container size %d" +msgstr "ID é¨åç´¢å¼ %d è¶ åºå®¹å¨å¤§å° %d" -#: ../libsvn_fs_x/noderevs.c:367 ../libsvn_fs_x/noderevs.c:402 +#: ../libsvn_fs_x/noderevs.c:348 #, c-format msgid "Node revision ID index %d exceeds container size %d" -msgstr "" +msgstr "èç¹çæ¬ ID ç´¢å¼ %d è¶ åºå®¹å¨å¤§å° %d" -#: ../libsvn_fs_x/noderevs.c:439 +#: ../libsvn_fs_x/noderevs.c:377 #, c-format msgid "Node revision index %%%s exceeds container size %%d" -msgstr "" +msgstr "èç¹çæ¬ç´¢å¼ %%%s è¶ åºå®¹å¨å¤§å° %%d" -#: ../libsvn_fs_x/noderevs.c:679 -#, fuzzy, c-format +#: ../libsvn_fs_x/noderevs.c:618 +#, c-format msgid "Unexpected MD5 digest size %%%s" -msgstr "æå¤åç°èç¹ç§ç±» %d äºâ%sâ" +msgstr "æå¤ç MD5 æè¦å¤§å° %%%s" -#: ../libsvn_fs_x/noderevs.c:691 +#: ../libsvn_fs_x/noderevs.c:630 #, c-format msgid "Unexpected SHA1 digest size %%%s" -msgstr "" +msgstr "æå¤ç SHA1 æè¦å¤§å° %%%s" -#: ../libsvn_fs_x/reps.c:492 +#: ../libsvn_fs_x/reps.c:496 msgid "Text body exceeds star delta container capacity" -msgstr "" +msgstr "ææ¬æ£æè¶ åº star delta 容å¨å®¹é" -#: ../libsvn_fs_x/reps.c:497 +#: ../libsvn_fs_x/reps.c:501 msgid "Instruction count exceeds star delta container capacity" -msgstr "" +msgstr "æ令计æ°è¶ åº star delta 容å¨å®¹é" -#: ../libsvn_fs_x/verify.c:280 +#: ../libsvn_fs_x/verify.c:279 #, c-format msgid "p2l index entry not found for PHYS o%s:s%ld returned by l2p index for LOG r%ld:i%ld" -msgstr "" +msgstr "æ¾ä¸å° PHYS o%s:s%ld ç p2l ç´¢å¼æ¡ç®(ç± l2p ç´¢å¼ä¸º LOG r%ld:i%ld è¿å)" -#: ../libsvn_fs_x/verify.c:385 +#: ../libsvn_fs_x/verify.c:387 #, c-format msgid "l2p index entry PHYS o%s:s%ld does not match p2l index value LOG r%ld:i%ld for PHYS o%s:s%ld" -msgstr "" +msgstr "l2p ç´¢å¼æ¡ç® PHYS o%s:s%ld ä¸ p2l ç´¢å¼å¼ LOG r%ld:i%ld ä¸å¹é (PHYS o%s:s%ld)" #: ../libsvn_ra/compat.c:183 #, c-format msgid "Missing changed-path information for '%s' in revision %ld" -msgstr "æªæä¾ â%sâ äºçæ¬ %ld ä¸ç changed-path ä¿¡æ¯" +msgstr "æªæä¾ '%s' äºçæ¬ %ld ä¸ç changed-path ä¿¡æ¯" #: ../libsvn_ra/compat.c:328 ../libsvn_ra/compat.c:572 #, c-format msgid "Path '%s' doesn't exist in revision %ld" -msgstr "è·¯å¾ â%sâ ä¸å¨çæ¬ %ld ä¸" +msgstr "è·¯å¾ '%s' ä¸å¨çæ¬ %ld ä¸" #: ../libsvn_ra/compat.c:405 #, c-format msgid "'%s' in revision %ld is an unrelated object" -msgstr "â%sâ äºçæ¬ %ld æ¯ä¸ä¸ªæ å ³å¯¹è±¡" +msgstr "'%s' äºçæ¬ %ld æ¯ä¸ä¸ªæ å ³å¯¹è±¡" -#: ../libsvn_ra/compat.c:845 ../libsvn_ra/ra_loader.c:1436 +#: ../libsvn_ra/compat.c:845 ../libsvn_ra/ra_loader.c:1320 #, c-format msgid "Invalid peg revision %ld" -msgstr "æ æçééçæ¬ %ld" +msgstr "æ æçéå®çæ¬ %ld" -#: ../libsvn_ra/compat.c:848 ../libsvn_ra/ra_loader.c:1439 -#: ../libsvn_repos/rev_hunt.c:212 ../libsvn_repos/rev_hunt.c:328 +#: ../libsvn_ra/compat.c:848 ../libsvn_ra/ra_loader.c:1323 +#: ../libsvn_repos/rev_hunt.c:214 ../libsvn_repos/rev_hunt.c:329 #, c-format msgid "Invalid end revision %ld" msgstr "æ æç»æçæ¬ %ld" -#: ../libsvn_ra/compat.c:851 ../libsvn_ra/ra_loader.c:1442 +#: ../libsvn_ra/compat.c:851 ../libsvn_ra/ra_loader.c:1326 msgid "Peg revision must precede end revision" -msgstr "ééçæ¬å¿ é¡»å°äºç»æçæ¬" +msgstr "éå®çæ¬å¿ é¡»å°äºç»æçæ¬" -#: ../libsvn_ra/ra_loader.c:216 +#: ../libsvn_ra/ra_loader.c:220 #, 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:294 ../libsvn_ra_serf/serf.c:819 +#: ../libsvn_ra/ra_loader.c:295 #, c-format msgid "Illegal repository URL '%s'" -msgstr "éæ³çæ¬åº URL â%sâ" +msgstr "éæ³çæ¬åº URL '%s'" -#: ../libsvn_ra/ra_loader.c:401 +#: ../libsvn_ra/ra_loader.c:333 #, c-format msgid "Invalid config: unknown HTTP library '%s'" -msgstr "æ æé ç½®: æªç¥ç HTTP åºâ%sâ" +msgstr "æ æé ç½®: æªç¥ç HTTP åº'%s'" -#: ../libsvn_ra/ra_loader.c:474 +#: ../libsvn_ra/ra_loader.c:377 #, c-format msgid "Unrecognized URL scheme for '%s'" -msgstr "æ æ³è¯å«çURLæ¹æ¡(ä¸è¬éè¦svn://ï¼http://ï¼file://çå¼å¤´)â%sâ" +msgstr "æ æ³è¯å«çURLæ¹æ¡(ä¸è¬éè¦svn://ï¼http://ï¼file://çå¼å¤´)'%s'" -#: ../libsvn_ra/ra_loader.c:491 -#, fuzzy, c-format +#: ../libsvn_ra/ra_loader.c:401 +#, c-format msgid "Unable to connect to a repository at URL '%s'" -msgstr "æ æ³æå¼çæ¬åºâ%sâ" +msgstr "æ æ³è¿æ¥å° URL '%s' å¤ççæ¬åº" -#: ../libsvn_ra/ra_loader.c:529 +#: ../libsvn_ra/ra_loader.c:434 #, c-format msgid "Repository UUID '%s' doesn't match expected UUID '%s'" -msgstr "çæ¬åºç UUIDâ%sâä¸ææç UUIDâ%sâä¸å¹é " - -#: ../libsvn_ra/ra_loader.c:589 -#, c-format -msgid "'%s' isn't in the same repository as '%s'" -msgstr "â%sâä¸â%sâ并ä¸å¨åä¸ä¸ªçæ¬åºä¸" +msgstr "çæ¬åºç UUID'%s'ä¸ææç UUID'%s'ä¸å¹é " -#: ../libsvn_ra/ra_loader.c:613 +#: ../libsvn_ra/ra_loader.c:522 #, c-format msgid "'%s' isn't a child of session URL '%s'" -msgstr "â%sâ ä¸æ¯ä¼è¯ URL â%sâ çåèç¹" +msgstr "'%s' ä¸æ¯ä¼è¯ URL '%s' çåèç¹" -#: ../libsvn_ra/ra_loader.c:629 ../libsvn_ra_svn/client.c:2595 +#: ../libsvn_ra/ra_loader.c:538 ../libsvn_ra_svn/client.c:2884 #, c-format msgid "'%s' isn't a child of repository root URL '%s'" -msgstr "â%sâ ä¸æ¯çæ¬åºæ ¹ URL â%sâ çåèç¹" +msgstr "'%s' ä¸æ¯çæ¬åºæ ¹ URL '%s' çåèç¹" -#: ../libsvn_ra/ra_loader.c:673 +#: ../libsvn_ra/ra_loader.c:582 #, c-format msgid "Specifying 'old_value_p' is not allowed when the '%s' capability is not advertised, and could indicate a bug in your client" -msgstr "å½ç¹æ§ '%s' 没æ广åæ¶ï¼ä¸å 许æå® 'old_value_p'ï¼ä¹è¯´ææ¨ç客æ·ç«¯æé®é¢" +msgstr "å½ç¹æ§ '%s' 没æ广åæ¶ï¼ä¸å 许æå® 'old_value_p'ï¼ä¹è¯´æä½ ç客æ·ç«¯æé®é¢" -#: ../libsvn_ra/ra_loader.c:1587 +#: ../libsvn_ra/ra_loader.c:1478 #, c-format msgid " - handles '%s' scheme\n" -msgstr " - å¤çâ%sâæ¹æ¡\n" +msgstr " - å¤ç'%s'æ¹æ¡\n" -#: ../libsvn_ra/ra_loader.c:1680 +#: ../libsvn_ra/ra_loader.c:1571 #, c-format msgid "Unrecognized URL scheme '%s'" -msgstr "æ æ³è¯å«çURLæ¹æ¡(ä¸è¬éè¦svn://ï¼http://ï¼file://çå¼å¤´)â%sâ" +msgstr "æ æ³è¯å«çURLæ¹æ¡(ä¸è¬éè¦svn://ï¼http://ï¼file://çå¼å¤´)'%s'" #: ../libsvn_ra/util.c:55 -#, fuzzy msgid "<repository>" -msgstr "è·åçæ¬åº UUID" +msgstr "<çæ¬åº>" #: ../libsvn_ra/util.c:73 #, c-format msgid "Retrieval of mergeinfo unsupported by '%s'" -msgstr "â%sâ ä¸æ¯æååå并信æ¯" +msgstr "'%s' ä¸æ¯æååå并信æ¯" #: ../libsvn_ra/util.c:99 -#, fuzzy, c-format +#, c-format msgid "The '%s' feature is not supported by '%s'" -msgstr "â%sâ ä¸æ¯æååå并信æ¯" +msgstr "'%s' åè½ä¸è¢« '%s' æ¯æ" #: ../libsvn_ra/util.c:142 #, c-format @@ -4656,34 +7153,34 @@ msgstr "æ æ³ç¡®å®æ¬å°ä¸»æºå称" msgid "Couldn't get lock on destination repos after %d attempts" msgstr "å°è¯ %d 次åï¼å¯¹ç®æ çæ¬åºå é失败" -#: ../libsvn_ra_local/ra_plugin.c:161 +#: ../libsvn_ra_local/ra_plugin.c:163 msgid "memory-cache-size invalid" msgstr "éæ³ç memory-cache-size" #. ---------------------------------------------------------------- #. ** The RA vtable routines ** -#: ../libsvn_ra_local/ra_plugin.c:503 +#: ../libsvn_ra_local/ra_plugin.c:510 msgid "Module for accessing a repository on local disk." msgstr "访é®æ¬å°ç£çççæ¬åºæ¨¡åã" -#: ../libsvn_ra_local/ra_plugin.c:675 ../libsvn_ra_serf/serf.c:811 +#: ../libsvn_ra_local/ra_plugin.c:689 ../libsvn_ra_serf/serf.c:837 #, c-format msgid "URL '%s' is not a child of the session's repository root URL '%s'" -msgstr "URL â%sâ ä¸æ¯ä¼è¯çæ¬åºæ ¹ URL â%sâ çåèç¹" +msgstr "URL '%s' ä¸æ¯ä¼è¯çæ¬åºæ ¹ URL '%s' çåèç¹" -#: ../libsvn_ra_local/ra_plugin.c:1191 ../libsvn_ra_local/ra_plugin.c:1657 -#: ../libsvn_ra_serf/util.c:1765 +#: ../libsvn_ra_local/ra_plugin.c:1289 ../libsvn_ra_local/ra_plugin.c:1741 +#: ../libsvn_ra_serf/util.c:1869 ../svnserve/serve.c:3648 #, c-format msgid "'%s' path not found" -msgstr "æ¾ä¸å°è·¯å¾ â%sâ" +msgstr "æ¾ä¸å°è·¯å¾ '%s'" -#: ../libsvn_ra_local/ra_plugin.c:1599 ../libsvn_ra_serf/options.c:674 -#: ../libsvn_ra_svn/client.c:2796 +#: ../libsvn_ra_local/ra_plugin.c:1693 ../libsvn_ra_serf/options.c:787 +#: ../libsvn_ra_svn/client.c:3099 #, c-format msgid "Don't know anything about capability '%s'" -msgstr "ä¸ç¥éç¹æ§ â%sâ çä»»ä½ä¿¡æ¯" +msgstr "ä¸ç¥éç¹æ§ '%s' çä»»ä½ä¿¡æ¯" -#: ../libsvn_ra_local/ra_plugin.c:1809 +#: ../libsvn_ra_local/ra_plugin.c:1980 #, c-format msgid "Unsupported RA loader version (%d) for ra_local" msgstr "ä¸æ¯æra_local RAå è½½å¨çæ¬ %d" @@ -4691,173 +7188,189 @@ msgstr "ä¸æ¯æra_local RAå è½½å¨ç #: ../libsvn_ra_local/split_url.c:50 ../libsvn_ra_local/split_url.c:56 #, c-format msgid "Unable to open repository '%s'" -msgstr "æ æ³æå¼çæ¬åºâ%sâ" +msgstr "æ æ³æå¼çæ¬åº'%s'" #: ../libsvn_ra_serf/commit.c:291 msgid "No Location header received" msgstr "没ææ¶å°ä½ç½®å¤´" #: ../libsvn_ra_serf/commit.c:301 -#, fuzzy msgid "Error parsing Location header value" -msgstr "没ææ¶å°ä½ç½®å¤´" +msgstr "解æ Location 头å¼æ¶åºé" -#: ../libsvn_ra_serf/commit.c:489 ../libsvn_repos/commit.c:512 +#: ../libsvn_ra_serf/commit.c:487 ../libsvn_repos/commit.c:553 #, c-format msgid "Path '%s' not present" -msgstr "è·¯å¾ â%sâ ä¸åå¨" +msgstr "è·¯å¾ '%s' ä¸åå¨" -#: ../libsvn_ra_serf/commit.c:1352 +#: ../libsvn_ra_serf/commit.c:1275 #, c-format msgid "POST request did not return transaction information" msgstr "POST 请æ±æ²¡æè¿åäºå¡çä¿¡æ¯" -#: ../libsvn_ra_serf/commit.c:1399 -msgid "The OPTIONS response did not include the requested activity-collection-set value" -msgstr "OPTIONS ååºä¸æ²¡æå å«è¯·æ±ç activity-collection-set å¼ã" - -#: ../libsvn_ra_serf/commit.c:1627 ../libsvn_ra_serf/update.c:2260 +#: ../libsvn_ra_serf/commit.c:1566 ../libsvn_ra_serf/update.c:2126 #, c-format msgid "Unable to parse URL '%s'" -msgstr "ä¸è½è§£æ URL â%sâ" +msgstr "ä¸è½è§£æ URL '%s'" -#: ../libsvn_ra_serf/commit.c:1906 +#: ../libsvn_ra_serf/commit.c:1818 #, c-format msgid "File '%s' already exists" -msgstr "æ件â%sâå·²åå¨" +msgstr "æ件'%s'å·²åå¨" + +#: ../libsvn_ra_serf/commit.c:2252 ../libsvn_ra_svn/editorp.c:901 +msgid "Closing editor with directories or files open" +msgstr "å ³éç¼è¾å¨æ¶è¿æç®å½ææ件æå¼" -#: ../libsvn_ra_serf/get_deleted_rev.c:175 +#: ../libsvn_ra_serf/get_deleted_rev.c:173 #, c-format msgid "'%s' REPORT not implemented" -msgstr "æªå®ç° â%sâ REPORT " +msgstr "æªå®ç° '%s' REPORT" -#: ../libsvn_ra_serf/get_file.c:345 +#: ../libsvn_ra_serf/get_file.c:378 msgid "Can't get text contents of a directory" msgstr "æ æ³è·å¾ç®å½çææ¬å 容" #: ../libsvn_ra_serf/get_lock.c:170 ../libsvn_ra_serf/lock.c:165 -#, fuzzy, c-format +#, c-format msgid "Invalid LOCK timeout value '%s'" -msgstr "æ æä¿®åªè®¡æ° '%s'" +msgstr "æ æç LOCK è¶ æ¶å¼ '%s'" -#: ../libsvn_ra_serf/get_lock.c:320 +#: ../libsvn_ra_serf/get_lock.c:323 msgid "Server does not support locking features" msgstr "æå¡å¨ä¸æ¯æå é" -#: ../libsvn_ra_serf/getdate.c:168 -#, fuzzy +#: ../libsvn_ra_serf/getdate.c:167 msgid "The REPORT response did not include the requested properties" -msgstr "PROPFIND ååºä¸æ²¡æå å«è¯·æ±çå±æ§" +msgstr "REPORT ååºæªå å«è¯·æ±çå±æ§" -#: ../libsvn_ra_serf/inherited_props.c:173 ../libsvn_ra_serf/property.c:244 -#: ../libsvn_ra_serf/update.c:1883 +#: ../libsvn_ra_serf/inherited_props.c:168 ../libsvn_ra_serf/property.c:264 +#: ../libsvn_ra_serf/update.c:1749 #, c-format msgid "Got unrecognized encoding '%s'" -msgstr "å¾å°ä¸è½è¯å«çç¼ç â%sâ" +msgstr "å¾å°ä¸è½è¯å«çç¼ç '%s'" + +#: ../libsvn_ra_serf/list.c:113 ../libsvn_ra_serf/log.c:172 +#, c-format +msgid "Unsupported encoding '%s'" +msgstr "ä¸æ¯æçç¼ç '%s'" -#: ../libsvn_ra_serf/lock.c:260 -#, fuzzy, c-format +#: ../libsvn_ra_serf/lock.c:261 +#, c-format msgid "No lock on path '%s' (%d %s)" -msgstr "è·¯å¾â%sâ没æ被éå®ï¼å ¶æ件系ç»æ¯â%sâ" +msgstr "è·¯å¾ '%s' ä¸æ²¡æé (%d %s)" -#: ../libsvn_ra_serf/lock.c:269 -#, fuzzy, c-format -msgid "Unlock of '%s' failed (%d %s)" -msgstr "解é请æ±å¤±è´¥: %d %s" +#: ../libsvn_ra_serf/lock.c:270 +#, c-format +msgid "Not authorized to perform lock operation on '%s'" +msgstr "æªææå¨ '%s' ä¸æ§è¡éæä½" #: ../libsvn_ra_serf/lock.c:277 -#, fuzzy, c-format +#, c-format msgid "Path '%s' doesn't exist in HEAD revision (%d %s)" -msgstr "HEADä¸æ²¡æè·¯å¾â%sâ" +msgstr "è·¯å¾ '%s' å¨ HEAD çæ¬ä¸ä¸åå¨ (%d %s)" -#: ../libsvn_ra_serf/lock.c:286 -#, fuzzy, c-format +#: ../libsvn_ra_serf/lock.c:293 +#, c-format msgid "Path '%s' already locked (%d %s)" -msgstr "å·²ç»éå®è·¯å¾" +msgstr "è·¯å¾ '%s' 已被éå® (%d %s)" -#: ../libsvn_ra_serf/lock.c:600 +#: ../libsvn_ra_serf/lock.c:609 #, c-format msgid "'%s' is not locked in the repository" -msgstr "çæ¬åºä¸çâ%sâ没æ被éå®" - -#: ../libsvn_ra_serf/log.c:172 -#, c-format -msgid "Unsupported encoding '%s'" -msgstr "ä¸æ¯æçç¼ç â%sâ" +msgstr "çæ¬åºä¸ç'%s'没æ被éå®" -#: ../libsvn_ra_serf/log.c:573 ../libsvn_ra_svn/client.c:1717 +#: ../libsvn_ra_serf/log.c:574 ../libsvn_ra_svn/client.c:1952 msgid "Server does not support custom revprops via log" msgstr "æå¡å¨ä¸æ¯æéè¿æ¥å¿èªå®ä¹ revprops" -#: ../libsvn_ra_serf/merge.c:205 +#: ../libsvn_ra_serf/merge.c:206 #, c-format msgid "A MERGE response for '%s' is not a child of the destination ('%s')" -msgstr "â%sâç MERGE ååºå¹¶ä¸æ¯ç®æ (â%sâ) çå项" +msgstr "'%s'ç MERGE ååºå¹¶ä¸æ¯ç®æ ('%s') çå项" + +#: ../libsvn_ra_serf/merge.c:461 +msgid "The MERGE response did not include a new revision" +msgstr "MERGE ååºæªå å«æ°çæ¬" #: ../libsvn_ra_serf/multistatus.c:226 ../libsvn_ra_serf/multistatus.c:231 -#, fuzzy, c-format +#, c-format msgid "Malformed DAV:status '%s'" -msgstr "éæ³ DAV:status CDATA '%s'" +msgstr "DAV:status '%s' æ ¼å¼é误" -#: ../libsvn_ra_serf/multistatus.c:536 -#, fuzzy, c-format +#: ../libsvn_ra_serf/multistatus.c:534 +#, c-format msgid "Property operation on '%s' failed" -msgstr "è¿æ¥å°â%sâ失败" +msgstr "对 '%s' çå±æ§æä½å¤±è´¥" -#: ../libsvn_ra_serf/multistatus.c:555 -#, fuzzy +#: ../libsvn_ra_serf/multistatus.c:553 msgid "<blank error>" -msgstr "æªç¥é误" +msgstr "<空é误>" -#: ../libsvn_ra_serf/multistatus.c:564 -#, fuzzy, c-format +#: ../libsvn_ra_serf/multistatus.c:562 +#, c-format msgid "While handling the '%s' property on '%s':" -msgstr "å½å¤ç serf çååºæ¶:" +msgstr "å¤ç '%s' ä¸ç '%s' å±æ§æ¶:" -#: ../libsvn_ra_serf/multistatus.c:568 -#, fuzzy, c-format +#: ../libsvn_ra_serf/multistatus.c:566 +#, c-format msgid "While handling the '%s' path:" -msgstr "å½å¤ç serf çååºæ¶:" +msgstr "å¤ç '%s' è·¯å¾æ¶:" + +#: ../libsvn_ra_serf/options.c:413 +#, c-format +msgid "The server at '%s' does not support the HTTP/DAV protocol" +msgstr "'%s' å¤çæå¡å¨ä¸æ¯æ HTTP/DAV åè®®" -#: ../libsvn_ra_serf/options.c:445 +#: ../libsvn_ra_serf/options.c:491 msgid "The OPTIONS response did not include the youngest revision" msgstr "OPTIONS ååºä¸æ²¡æå å«ææ°ççæ¬" -#: ../libsvn_ra_serf/options.c:657 +#: ../libsvn_ra_serf/options.c:532 +msgid "The OPTIONS response did not include the requested activity-collection-set value" +msgstr "OPTIONS ååºä¸æ²¡æå å«è¯·æ±ç activity-collection-set å¼ã" + +#: ../libsvn_ra_serf/options.c:577 +msgid "Location header not set on redirect response" +msgstr "éå®åååºä¸æªè®¾ç½® Location 头" + +#: ../libsvn_ra_serf/options.c:613 ../libsvn_ra_serf/util.c:1860 +#, c-format +msgid "Repository moved permanently to '%s'" +msgstr "çæ¬åºå·²æ°¸ä¹ 移å¨å° '%s'" + +#: ../libsvn_ra_serf/options.c:614 ../libsvn_ra_serf/util.c:1861 +#, c-format +msgid "Repository moved temporarily to '%s'" +msgstr "çæ¬åºå·²ä¸´æ¶ç§»å¨å° '%s'" + +#: ../libsvn_ra_serf/options.c:770 #, c-format msgid "Don't know how to handle '%s' for capability '%s'" -msgstr "ä¸ç¥éå¦ä½å¤çâ%sâï¼å¯¹äºç¹æ§â%sâ" +msgstr "ä¸ç¥éå¦ä½å¤ç'%s'ï¼å¯¹äºç¹æ§'%s'" -#: ../libsvn_ra_serf/options.c:681 +#: ../libsvn_ra_serf/options.c:794 #, c-format msgid "Attempt to fetch capability '%s' resulted in '%s'" -msgstr "è¯å¾åå¾ç¹æ§ â%sâ å¯¼è´ â%sâ" +msgstr "è¯å¾åå¾ç¹æ§ '%s' å¯¼è´ '%s'" -#: ../libsvn_ra_serf/property.c:716 -msgid "The PROPFIND response did not include the requested properties" -msgstr "PROPFIND ååºä¸æ²¡æå å«è¯·æ±çå±æ§" - -#: ../libsvn_ra_serf/property.c:1006 +#: ../libsvn_ra_serf/property.c:668 msgid "The PROPFIND response did not include the requested baseline-collection value" msgstr "PROPFIND ååºä¸æ²¡æå å«è¯·æ±ç baseline-collection å¼ã" -#: ../libsvn_ra_serf/property.c:1026 +#: ../libsvn_ra_serf/property.c:688 msgid "The PROPFIND response did not include the requested version-name value" msgstr "PROPFIND ååºä¸æ²¡æå å«è¯·æ±ç version-name å¼ã" -#: ../libsvn_ra_serf/property.c:1062 +#: ../libsvn_ra_serf/property.c:724 msgid "The OPTIONS response did not include the requested checked-in value" msgstr "OPTIONS ååºä¸æ²¡æå å«è¯·æ±ç checked-in å¼ã" -#: ../libsvn_ra_serf/property.c:1233 -msgid "The PROPFIND response did not include the requested resourcetype value" -msgstr "PROPFIND ååºä¸æ²¡æå å«è¯·æ±ç resourcetype å¼" - -#: ../libsvn_ra_serf/property.c:1268 +#: ../libsvn_ra_serf/property.c:896 msgid "The PROPFIND response did not include the requested 'DAV:' properties" msgstr "PROPFIND ååºä¸æ²¡æå å«è¯·æ±ç 'DAV:' å±æ§" -#: ../libsvn_ra_serf/replay.c:482 +#: ../libsvn_ra_serf/replay.c:468 msgid "Error writing stream: unexpected EOF" msgstr "åå ¥æµåºé: æå¤ç EOF" @@ -4865,483 +7378,477 @@ msgstr "åå ¥æµåºé: æå¤ç EOF" msgid "Failed to read the request" msgstr "读å请æ±å¤±è´¥" -#: ../libsvn_ra_serf/serf.c:63 +#: ../libsvn_ra_serf/serf.c:64 msgid "Module for accessing a repository via WebDAV protocol using serf." msgstr "éè¿ WebDAV åè®®ä½¿ç¨ serf 访é®çæ¬åºç模åã" -#: ../libsvn_ra_serf/serf.c:66 -#, fuzzy, c-format +#: ../libsvn_ra_serf/serf.c:67 +#, c-format msgid "" "Module for accessing a repository via WebDAV protocol using serf.\n" -" - using serf %d.%d.%d" -msgstr "éè¿ WebDAV åè®®ä½¿ç¨ serf 访é®çæ¬åºç模åã" +" - using serf %d.%d.%d (compiled with %d.%d.%d)" +msgstr "" +"éè¿ WebDAV åè®®ä½¿ç¨ serf 访é®çæ¬åºç模åã\n" +" - ä½¿ç¨ serf %d.%d.%d (ç¼è¯æ¶ %d.%d.%d)" -#: ../libsvn_ra_serf/serf.c:130 -#, fuzzy, c-format +#: ../libsvn_ra_serf/serf.c:136 +#, c-format msgid "Invalid config: unknown %s '%s'" -msgstr "æ æé ç½®: æªç¥çå¯ç åå¨ â%sâ" - -#: ../libsvn_ra_serf/serf.c:362 -msgid "Invalid config: illegal character in timeout value" -msgstr "æ æé ç½®: è¶ æ¶æ°å¼ä¸æéæ³å符" - -#: ../libsvn_ra_serf/serf.c:366 -msgid "Invalid config: negative timeout value" -msgstr "æ æé ç½®: è´çè¶ æ¶" +msgstr "æ æçé ç½®: æªç¥ç %s '%s'" #: ../libsvn_ra_serf/serf.c:379 +#, c-format +msgid "invalid config: bad value for '%s' option" +msgstr "æ æçé ç½®: '%s' é项å¼é误" + +#: ../libsvn_ra_serf/serf.c:392 msgid "Invalid URL: illegal character in proxy port number" msgstr "æ æURL: 代ç端å£ä¸æéæ³å符" -#: ../libsvn_ra_serf/serf.c:383 +#: ../libsvn_ra_serf/serf.c:396 msgid "Invalid URL: negative proxy port number" msgstr "æ æURL: è´ç代ç端å£" -#: ../libsvn_ra_serf/serf.c:386 +#: ../libsvn_ra_serf/serf.c:399 msgid "Invalid URL: proxy port number greater than maximum TCP port number 65535" msgstr "æ æURL: 代ç端å£å¤§äºTCPé信端å£æ大å¼65535" -#: ../libsvn_ra_serf/serf.c:406 +#: ../libsvn_ra_serf/serf.c:419 #, c-format msgid "Could not resolve proxy server '%s'" -msgstr "ä¸è½è§£æ代çæå¡å¨â%sâ" - -#: ../libsvn_ra_serf/serf.c:514 -#, c-format -msgid "Illegal URL '%s'" -msgstr "éæ³ URL â%sâ" +msgstr "ä¸è½è§£æ代çæå¡å¨'%s'" -#: ../libsvn_ra_serf/serf.c:597 +#: ../libsvn_ra_serf/serf.c:620 #, c-format msgid "Connection to '%s' failed" -msgstr "è¿æ¥å°â%sâ失败" +msgstr "è¿æ¥å°'%s'失败" -#: ../libsvn_ra_serf/serf.c:1010 +#: ../libsvn_ra_serf/serf.c:1029 msgid "The UUID property was not found on the resource or any of its parents" msgstr "æ æ³å¨æ¬èµæºæå ¶ä»»ä½ç¶é¡¹ç®ä¸æ¾å°UUIDå±æ§" -#: ../libsvn_ra_serf/serf.c:1085 +#: ../libsvn_ra_serf/serf.c:1109 #, c-format msgid "Unsupported RA loader version (%d) for ra_serf" msgstr "ä¸æ¯æç ra_serf RA å è½½å¨çæ¬(%d)" -#: ../libsvn_ra_serf/serf.c:1099 +#: ../libsvn_ra_serf/serf.c:1123 #, c-format msgid "ra_serf was compiled for serf %d.%d.%d but loaded an incompatible %d.%d.%d library" msgstr "ra_serf 为 serf %d.%d.%d ç¼è¯ï¼ä½æ¯å è½½äºä¸å ¼å®¹çå ±äº«åº %d.%d.%d" -#: ../libsvn_ra_serf/stat.c:390 ../libsvn_ra_serf/stat.c:428 -#, fuzzy +#: ../libsvn_ra_serf/stat.c:106 +msgid "The PROPFIND response did not include the requested resourcetype value" +msgstr "PROPFIND ååºä¸æ²¡æå å«è¯·æ±ç resourcetype å¼" + +#: ../libsvn_ra_serf/stat.c:357 ../libsvn_ra_serf/stat.c:395 msgid "Can't get properties of non-directory" -msgstr "ä¸è½è·åéç®å½çæ¡ç®" +msgstr "æ æ³è·åéç®å½çå±æ§" -#: ../libsvn_ra_serf/update.c:1133 +#: ../libsvn_ra_serf/update.c:992 ../libsvn_ra_serf/update.c:998 #, c-format msgid "GET request returned unexpected delta base: %s" -msgstr "" +msgstr "GET 请æ±è¿åäºæå¤ç delta åºç¡: %s" -#: ../libsvn_ra_serf/update.c:1689 ../libsvn_ra_serf/update.c:1739 -#, fuzzy, c-format +#: ../libsvn_ra_serf/update.c:1555 ../libsvn_ra_serf/update.c:1605 +#, c-format msgid "Missing '%s' attribute" -msgstr "ç¼ºå° XML å±æ§: '%s'" +msgstr "ç¼ºå° '%s' å±æ§" -#: ../libsvn_ra_serf/update.c:1953 ../libsvn_ra_serf/update.c:1983 -#, fuzzy +#: ../libsvn_ra_serf/update.c:1819 ../libsvn_ra_serf/update.c:1849 msgid "The REPORT response did not include the requested checked-in value" -msgstr "OPTIONS ååºä¸æ²¡æå å«è¯·æ±ç checked-in å¼ã" +msgstr "REPORT ååºæªå å«è¯·æ±ç checked-in å¼" -#: ../libsvn_ra_serf/update.c:2633 +#: ../libsvn_ra_serf/update.c:2459 msgid "Missing update-report close tag" -msgstr "" +msgstr "ç¼ºå° update-report å ³éæ ç¾" -#: ../libsvn_ra_serf/util.c:195 +#: ../libsvn_ra_serf/util.c:198 msgid ": " -msgstr "" +msgstr ": " -#: ../libsvn_ra_serf/util.c:197 +#: ../libsvn_ra_serf/util.c:200 msgid ", " -msgstr "" +msgstr ", " -#: ../libsvn_ra_serf/util.c:407 -#, fuzzy +#: ../libsvn_ra_serf/util.c:410 msgid "Server SSL certificate verification failed" -msgstr "æå¡å¨ç SSL è¯ä¹¦ä¸è¢«ä¿¡ä»»" +msgstr "æå¡å¨ SSL è¯ä¹¦éªè¯å¤±è´¥" -#: ../libsvn_ra_serf/util.c:412 -#, fuzzy +#: ../libsvn_ra_serf/util.c:415 msgid "certificate is not yet valid" -msgstr " - è¯ä¹¦æªçæã\n" +msgstr "è¯ä¹¦å°æªçæ" -#: ../libsvn_ra_serf/util.c:415 -#, fuzzy +#: ../libsvn_ra_serf/util.c:418 msgid "certificate has expired" -msgstr " - è¯ä¹¦å·²è¿æã\n" +msgstr "è¯ä¹¦å·²è¿æ" -#: ../libsvn_ra_serf/util.c:419 +#: ../libsvn_ra_serf/util.c:422 msgid "certificate issued for a different hostname" -msgstr "" +msgstr "è¯ä¹¦é¢åç»äºä¸åç主æºå" -#: ../libsvn_ra_serf/util.c:423 -#, fuzzy +#: ../libsvn_ra_serf/util.c:426 msgid "issuer is not trusted" -msgstr "ä¸æ¯ææ件系ç»å级" +msgstr "é¢åè ä¸è¢«ä¿¡ä»»" -#: ../libsvn_ra_serf/util.c:426 +#: ../libsvn_ra_serf/util.c:429 msgid "and other reason(s)" -msgstr "" +msgstr "以åå ¶ä»åå " -#: ../libsvn_ra_serf/util.c:473 +#: ../libsvn_ra_serf/util.c:476 #, c-format msgid "Invalid config: unable to load certificate file '%s'" -msgstr "æ æçé ç½®: æ æ³å è½½è¯ä¹¦æ件â%sâ" +msgstr "æ æçé ç½®: æ æ³å è½½è¯ä¹¦æ件'%s'" -#: ../libsvn_ra_serf/util.c:904 ../libsvn_ra_serf/util.c:907 +#: ../libsvn_ra_serf/util.c:963 ../libsvn_ra_serf/util.c:966 msgid "Error running context" msgstr "æ§è¡ä¸ä¸æé误" -#: ../libsvn_ra_serf/util.c:1152 -#, fuzzy +#: ../libsvn_ra_serf/util.c:1238 msgid "" "No more credentials or we tried too many times.\n" "Authentication failed" msgstr "" -"没æåè¯æå·²ç»è¯äºå¤ªå¤æ¬¡ã\n" +"没ææ´å¤åæ®æå°è¯æ¬¡æ°è¿å¤ã\n" "认è¯å¤±è´¥" -#: ../libsvn_ra_serf/util.c:1174 +#: ../libsvn_ra_serf/util.c:1260 msgid "Proxy authentication failed" msgstr "代ç认è¯å¤±è´¥" -#: ../libsvn_ra_serf/util.c:1229 -#, fuzzy, c-format +#: ../libsvn_ra_serf/util.c:1315 +#, c-format msgid "%s request on '%s' failed" -msgstr "%s 请æ±äº '%s' 失败: %d %s" +msgstr "对 '%s' ç %s 请æ±å¤±è´¥" -#: ../libsvn_ra_serf/util.c:1301 +#: ../libsvn_ra_serf/util.c:1391 #, c-format msgid "Premature EOF seen from server (http status=%d)" msgstr "ä»æå¡å¨åç° EOF å¤ªæ© (http status=%d)" -#: ../libsvn_ra_serf/util.c:1651 +#: ../libsvn_ra_serf/util.c:1759 msgid "The PROPFIND response did not include the requested version-controlled-configuration value" msgstr "PROPFIND ååºä¸æ²¡æå å«è¯·æ±ç version-controlled-configuration å¼ã" -#: ../libsvn_ra_serf/util.c:1755 -#, c-format -msgid "Repository moved permanently to '%s'; please relocate" -msgstr "çæ¬åºæ°¸ä¹ ç§»å° â%sâï¼è¯·éæ°å®ä½ã" - -#: ../libsvn_ra_serf/util.c:1757 -#, c-format -msgid "Repository moved temporarily to '%s'; please relocate" -msgstr "çæ¬åºä¸´æ¶ç§»å°â%sâï¼è¯·éæ°å®ä½ã" - -#: ../libsvn_ra_serf/util.c:1761 +#: ../libsvn_ra_serf/util.c:1865 #, c-format msgid "Access to '%s' forbidden" msgstr "ç¦æ¢è®¿é® '%s'" -#: ../libsvn_ra_serf/util.c:1768 ../libsvn_repos/commit.c:170 +#: ../libsvn_ra_serf/util.c:1872 #, c-format -msgid "'%s' is out of date" -msgstr "â%sâ å·²ç»è¿æ¶" +msgid "HTTP method is not allowed on '%s'" +msgstr "'%s' ä¸ä¸å 许 HTTP æ¹æ³" -#: ../libsvn_ra_serf/util.c:1771 -#, fuzzy, c-format +#: ../libsvn_ra_serf/util.c:1876 +#, c-format msgid "'%s' conflicts" -msgstr "â%sâä¸æ¯ä¸ä¸ªæ件" +msgstr "'%s' å²çª" -#: ../libsvn_ra_serf/util.c:1774 -#, fuzzy, c-format +#: ../libsvn_ra_serf/util.c:1879 +#, c-format msgid "Precondition on '%s' failed" -msgstr "è¿æ¥å°â%sâ失败" +msgstr "'%s' ä¸çåææ¡ä»¶å¤±è´¥" -#: ../libsvn_ra_serf/util.c:1777 +#: ../libsvn_ra_serf/util.c:1882 #, c-format msgid "'%s': no lock token available" -msgstr "â%sâï¼æ²¡æå¯ç¨çéå®ä»¤ç" +msgstr "'%s': 没æå¯ç¨çéå®ä»¤ç" -#: ../libsvn_ra_serf/util.c:1781 +#: ../libsvn_ra_serf/util.c:1886 #, c-format msgid "DAV request failed: 411 Content length required. The server or an intermediate proxy does not accept chunked encoding. Try setting 'http-chunked-requests' to 'auto' or 'no' in your client configuration." -msgstr "" +msgstr "DAV 请æ±å¤±è´¥: 411 éè¦å 容é¿åº¦ãæå¡å¨æä¸é´ä»£çä¸æ¥åååç¼ç ã请å¨å®¢æ·ç«¯é ç½®ä¸æ 'http-chunked-requests' 设为 'auto' æ 'no'ã" -#: ../libsvn_ra_serf/util.c:1787 -#, fuzzy, c-format +#: ../libsvn_ra_serf/util.c:1892 +#, c-format msgid "Unexpected server error %d '%s' on '%s'" -msgstr "æå¤åç°èç¹ç§ç±» %d äºâ%sâ" +msgstr "æå¤çæå¡å¨é误 %d '%s'(ä½äº '%s')" -#: ../libsvn_ra_serf/util.c:1791 -#, fuzzy, c-format +#: ../libsvn_ra_serf/util.c:1896 +#, c-format msgid "The requested feature is not supported by '%s'" -msgstr "â%sâ ä¸æ¯æååå并信æ¯" +msgstr "'%s' ä¸æ¯æ请æ±çåè½" -#: ../libsvn_ra_serf/util.c:1797 -#, fuzzy, c-format +#: ../libsvn_ra_serf/util.c:1902 +#, c-format msgid "Unexpected HTTP status %d '%s' on '%s'" -msgstr "æå¤åç°èç¹ç§ç±» %d äºâ%sâ" +msgstr "æå¤ç HTTP ç¶æ %d '%s'(ä½äº '%s')" -#: ../libsvn_ra_serf/util.c:1815 -#, fuzzy, c-format +#: ../libsvn_ra_serf/util.c:1921 +#, c-format msgid "Path '%s' unexpectedly created" -msgstr "èç¹ â%sâ çç±»åæå¤æ¹å" +msgstr "è·¯å¾ '%s' 被æå¤å建" + +#: ../libsvn_ra_serf/util.c:1930 +#, c-format +msgid "The HTTP method '%s' is not allowed on '%s'" +msgstr "'%s' ä¸ä¸å 许 HTTP æ¹æ³ '%s'" -#: ../libsvn_ra_serf/util.c:1824 -#, fuzzy, c-format +#: ../libsvn_ra_serf/util.c:1935 +#, c-format msgid "Unexpected HTTP status %d '%s' on '%s' request to '%s'" -msgstr "æå¤åç°èç¹ç§ç±» %d äºâ%sâ" +msgstr "æå¤ç HTTP ç¶æ %d '%s'(ä½äºå¯¹ '%s' ç '%s' 请æ±)" + +#: ../libsvn_ra_serf/util.c:2038 +#, c-format +msgid "Illegal URL '%s'" +msgstr "éæ³ URL '%s'" -#: ../libsvn_ra_serf/xml.c:502 +#: ../libsvn_ra_serf/xml.c:483 #, c-format msgid "XML stream truncated: closing '%s' missing" msgstr "XML æµè¢«æªæ: ä¸¢å¤±äº '%s' çå ³éæ ç¾" -#: ../libsvn_ra_serf/xml.c:530 -#, fuzzy +#: ../libsvn_ra_serf/xml.c:511 msgid "document element not found" -msgstr "æ¾ä¸å° Header çç»ææ è®°" +msgstr "æªæ¾å°ææ¡£å ç´ " -#: ../libsvn_ra_serf/xml.c:533 +#: ../libsvn_ra_serf/xml.c:514 #, c-format msgid "XML stream truncated: %s" msgstr "XML æµè¢«æªæ: %s" -#: ../libsvn_ra_serf/xml.c:698 -#, fuzzy, c-format +#: ../libsvn_ra_serf/xml.c:679 +#, c-format msgid "XML Parsing failed: Unexpected root element '%s'" -msgstr "XML 解æ失败: (%d %s)" +msgstr "XML 解æ失败: æå¤çæ ¹å ç´ '%s'" -#: ../libsvn_ra_serf/xml.c:758 -#, fuzzy, c-format +#: ../libsvn_ra_serf/xml.c:739 +#, c-format msgid "Missing XML attribute '%s' on '%s' element" -msgstr "ç¼ºå° XML å±æ§: '%s'" +msgstr "'%s' å ç´ ä¸ç¼ºå° XML å±æ§ '%s'" -#: ../libsvn_ra_serf/xml.c:916 -#, fuzzy, c-format -msgid "Malformed XML: %s" -msgstr "éæ³ XML: %s å¨ç¬¬ %ld è¡" - -#: ../libsvn_ra_serf/xml.c:918 -#, fuzzy +#: ../libsvn_ra_serf/xml.c:878 msgid "The XML response contains invalid XML" -msgstr "æ¤ååºå å«éæ³ XML" +msgstr "XML ååºå å«æ æç XML" -#: ../libsvn_ra_svn/client.c:142 +#: ../libsvn_ra_svn/client.c:145 #, c-format msgid "Unknown hostname '%s'" -msgstr "æªç¥ç主æºâ%sâ" +msgstr "æªç¥ç主æº'%s'" -#: ../libsvn_ra_svn/client.c:167 +#: ../libsvn_ra_svn/client.c:170 #, c-format msgid "Can't connect to host '%s'" -msgstr "æ æ³è¿æ¥ä¸»æºâ%sâ" +msgstr "æ æ³è¿æ¥ä¸»æº'%s'" -#: ../libsvn_ra_svn/client.c:205 +#: ../libsvn_ra_svn/client.c:208 msgid "Prop diffs element not a list" msgstr "Prop diffs å ç´ ä¸æ¯ä¸ä¸ªå表" -#: ../libsvn_ra_svn/client.c:404 +#: ../libsvn_ra_svn/client.c:408 #, c-format msgid "Undefined tunnel scheme '%s'" -msgstr "æ æ³è¯å«çé§éæ¹æ¡ â%sâ" +msgstr "æ æ³è¯å«çé§éæ¹æ¡ '%s'" -#: ../libsvn_ra_svn/client.c:421 +#: ../libsvn_ra_svn/client.c:425 #, c-format msgid "Tunnel scheme %s requires environment variable %s to be defined" msgstr "é§éæ¹æ¡ %s éè¦è®¾å®ç¯å¢åé %s" -#: ../libsvn_ra_svn/client.c:432 +#: ../libsvn_ra_svn/client.c:436 #, c-format msgid "Can't tokenize command '%s'" -msgstr "ä¸è½è§£æå½ä»¤â%sâ" +msgstr "ä¸è½è§£æå½ä»¤'%s'" -#: ../libsvn_ra_svn/client.c:475 +#: ../libsvn_ra_svn/client.c:479 #, c-format msgid "Error in child process: %s" msgstr "åè¿ç¨é误: %s" -#: ../libsvn_ra_svn/client.c:554 +#: ../libsvn_ra_svn/client.c:558 msgid "To better debug SSH connection problems, remove the -q option from 'ssh' in the [tunnels] section of your Subversion configuration file." msgstr "为äºæ´å¥½çè¯æ SSH è¿æ¥é®é¢ï¼è¯·ä»ä½ ç Subversion é ç½®æ件ä¸ï¼[tunnels] èï¼å é¤ ssh å½ä»¤è¡åæ° -q ã" -#: ../libsvn_ra_svn/client.c:572 +#: ../libsvn_ra_svn/client.c:576 #, c-format msgid "Illegal svn repository URL '%s'" -msgstr "éæ³çsvnçæ¬åºURLâ%sâ" +msgstr "éæ³çsvnçæ¬åºURL'%s'" -#: ../libsvn_ra_svn/client.c:719 +#: ../libsvn_ra_svn/client.c:733 #, c-format msgid "Server requires minimum version %d" msgstr "æå¡å¨è¦æ±çæä½çæ¬æ¯ %d" -#: ../libsvn_ra_svn/client.c:723 +#: ../libsvn_ra_svn/client.c:737 #, c-format msgid "Server only supports versions up to %d" msgstr "æå¡å¨æ¯æççæ¬ä¸å¤§äº %d" -#: ../libsvn_ra_svn/client.c:731 +#: ../libsvn_ra_svn/client.c:745 msgid "Server does not support edit pipelining" msgstr "æå¡å¨ä¸æ¯ææµæ°´çº¿ç¼è¾" -#: ../libsvn_ra_svn/client.c:768 +#: ../libsvn_ra_svn/client.c:783 msgid "Impossibly long repository root from server" msgstr "æå¡å¨è¿åççæ¬åºæ ¹è·¯å¾å¤ªé¿" -#: ../libsvn_ra_svn/client.c:780 +#: ../libsvn_ra_svn/client.c:795 msgid "" "Module for accessing a repository using the svn network protocol.\n" " - with Cyrus SASL authentication" -msgstr "ä½¿ç¨ svn ç½ç»å议访é®çæ¬åºç模åã - ä½¿ç¨ Cyrus SASL 认è¯" +msgstr "" +"ä½¿ç¨ svn ç½ç»å议访é®çæ¬åºç模åã\n" +" - 带 Cyrus SASL 认è¯" -#: ../libsvn_ra_svn/client.c:784 +#: ../libsvn_ra_svn/client.c:799 msgid "Module for accessing a repository using the svn network protocol." msgstr "ä½¿ç¨ svn ç½ç»å议访é®çæ¬åºç模åã" -#: ../libsvn_ra_svn/client.c:1031 +#: ../libsvn_ra_svn/client.c:884 +#, c-format +msgid "Invalid host '%s'" +msgstr "æ æçä¸»æº '%s'" + +#: ../libsvn_ra_svn/client.c:1213 msgid "Server did not send repository root" msgstr "æå¡å¨æ²¡æè¿åçæ¬åºæ ¹è·¯å¾" -#: ../libsvn_ra_svn/client.c:1104 +#: ../libsvn_ra_svn/client.c:1289 #, c-format msgid "ra_svn does not support not specifying a log message with pre-1.5 servers; consider passing an empty one, or upgrading the server" -msgstr "" +msgstr "ra_svn ä¸æ¯æå¨ 1.5 ä¹åçæå¡å¨ä¸ä¸æå®æ¥å¿æ¶æ¯ï¼è¯·èèä¼ é空æ¶æ¯ï¼æå级" -#: ../libsvn_ra_svn/client.c:1127 +#: ../libsvn_ra_svn/client.c:1312 msgid "Server doesn't support setting arbitrary revision properties during commit" msgstr "å¨æ交æ¶ï¼æå¡å¨ä¸æ¯æ设置任æçæ¬å±æ§" -#: ../libsvn_ra_svn/client.c:1230 -#, fuzzy +#: ../libsvn_ra_svn/client.c:1414 msgid "Inherited proplist element not a list" -msgstr "Proplist å ç´ ä¸æ¯å表" +msgstr "继æ¿çå±æ§å表å ç´ ä¸æ¯å表" -#: ../libsvn_ra_svn/client.c:1305 +#: ../libsvn_ra_svn/client.c:1488 msgid "Non-string as part of file contents" msgstr "é¨åæ件å 容ä¸æ¯å符串" -#: ../libsvn_ra_svn/client.c:1394 +#: ../libsvn_ra_svn/client.c:1598 msgid "Dirlist element not a list" msgstr "ç®å½å表å ç´ ä¸æ¯å表" -#: ../libsvn_ra_svn/client.c:1403 -#, fuzzy, c-format +#: ../libsvn_ra_svn/client.c:1607 +#, c-format msgid "Invalid directory entry name '%s'" -msgstr "æ æ³å¨ â%sâ 读åç®å½å 容" +msgstr "æ æçç®å½æ¡ç®å称 '%s'" -#: ../libsvn_ra_svn/client.c:1486 +#: ../libsvn_ra_svn/client.c:1692 msgid "Mergeinfo element is not a list" msgstr "Mergeinfo å ç´ ä¸æ¯å表" -#: ../libsvn_ra_svn/client.c:1705 +#: ../libsvn_ra_svn/client.c:1940 msgid "Log entry not a list" msgstr "æ¥å¿æ¡ç®ä¸æ¯å表" -#: ../libsvn_ra_svn/client.c:1753 +#: ../libsvn_ra_svn/client.c:1987 msgid "Changed-path entry not a list" msgstr "已修æ¹è·¯å¾æ¡ç®ä¸æ¯å表" -#: ../libsvn_ra_svn/client.c:1908 +#: ../libsvn_ra_svn/client.c:2154 msgid "'stat' not implemented" -msgstr "æªå®ç°âstatâ" +msgstr "æªå®ç°'stat'" -#: ../libsvn_ra_svn/client.c:1967 +#: ../libsvn_ra_svn/client.c:2216 msgid "'get-locations' not implemented" -msgstr "æªå®ç°âget-locationsâ" +msgstr "æªå®ç°'get-locations'" -#: ../libsvn_ra_svn/client.c:1982 +#: ../libsvn_ra_svn/client.c:2233 msgid "Location entry not a list" msgstr "åºåæ¡ç®ä¸æ¯å表" -#: ../libsvn_ra_svn/client.c:2021 +#: ../libsvn_ra_svn/client.c:2277 msgid "'get-location-segments' not implemented" -msgstr "æªå®ç° âget-location-segmentsâ" +msgstr "æªå®ç° 'get-location-segments'" -#: ../libsvn_ra_svn/client.c:2038 +#: ../libsvn_ra_svn/client.c:2294 msgid "Location segment entry not a list" msgstr "ä½ç½®åæ®µå ¥å£ä¸æ¯å表" -#: ../libsvn_ra_svn/client.c:2048 +#: ../libsvn_ra_svn/client.c:2304 msgid "Expected valid revision range" msgstr "ææåæ³ççæ¬èå´" -#: ../libsvn_ra_svn/client.c:2089 +#: ../libsvn_ra_svn/client.c:2377 msgid "'get-file-revs' not implemented" -msgstr "æªå®ç°âget-file-revsâ" +msgstr "æªå®ç°'get-file-revs'" -#: ../libsvn_ra_svn/client.c:2113 +#: ../libsvn_ra_svn/client.c:2401 msgid "Revision entry not a list" msgstr "çæ¬æ¡ç®ä¸æ¯å表" -#: ../libsvn_ra_svn/client.c:2130 ../libsvn_ra_svn/client.c:2160 +#: ../libsvn_ra_svn/client.c:2418 ../libsvn_ra_svn/client.c:2448 msgid "Text delta chunk not a string" msgstr "ææ¬å·®å¼åä¸æ¯å符串" -#: ../libsvn_ra_svn/client.c:2172 +#: ../libsvn_ra_svn/client.c:2460 msgid "The get-file-revs command didn't return any revisions" msgstr "get-file-revs å½ä»¤æ²¡æè¿åä»»ä½çæ¬" -#: ../libsvn_ra_svn/client.c:2219 +#: ../libsvn_ra_svn/client.c:2507 msgid "Server doesn't support the lock command" msgstr "æå¡å¨ä¸æ¯æå é" -#: ../libsvn_ra_svn/client.c:2283 +#: ../libsvn_ra_svn/client.c:2571 msgid "Server doesn't support the unlock command" msgstr "æå¡å¨ä¸æ¯æ解é" -#: ../libsvn_ra_svn/client.c:2381 +#: ../libsvn_ra_svn/client.c:2670 msgid "Lock response not a list" msgstr "å éååºä¸æ¯å表" -#: ../libsvn_ra_svn/client.c:2395 +#: ../libsvn_ra_svn/client.c:2683 msgid "Unknown status for lock command" msgstr "å éå½ä»¤çç¶ææªç¥" -#: ../libsvn_ra_svn/client.c:2419 +#: ../libsvn_ra_svn/client.c:2707 msgid "Didn't receive end marker for lock responses" msgstr "å éååºæ²¡æç»ææ è®°" -#: ../libsvn_ra_svn/client.c:2509 +#: ../libsvn_ra_svn/client.c:2798 msgid "Unlock response not a list" msgstr "解éååºä¸æ¯å表" -#: ../libsvn_ra_svn/client.c:2523 +#: ../libsvn_ra_svn/client.c:2811 msgid "Unknown status for unlock command" msgstr "æªç¥ç解éå½ä»¤ç¶æ" -#: ../libsvn_ra_svn/client.c:2546 +#: ../libsvn_ra_svn/client.c:2834 msgid "Didn't receive end marker for unlock responses" msgstr "解éååºæ²¡æç»ææ è®°" -#: ../libsvn_ra_svn/client.c:2570 ../libsvn_ra_svn/client.c:2622 +#: ../libsvn_ra_svn/client.c:2859 ../libsvn_ra_svn/client.c:2912 msgid "Server doesn't support the get-lock command" msgstr "æå¡å¨ä¸æ¯æå½ä»¤ get-lock" -#: ../libsvn_ra_svn/client.c:2636 +#: ../libsvn_ra_svn/client.c:2926 msgid "Lock element not a list" msgstr "Lockå ç´ ä¸æ¯å表" -#: ../libsvn_ra_svn/client.c:2679 +#: ../libsvn_ra_svn/client.c:2972 msgid "Server doesn't support the replay command" msgstr "æå¡å¨ä¸æ¯æéæ¾å½ä»¤" -#: ../libsvn_ra_svn/client.c:2710 +#: ../libsvn_ra_svn/client.c:3006 msgid "Server doesn't support the replay-range command" msgstr "æå¡å¨ä¸æ¯æéæ¾èå´å½ä»¤" -#: ../libsvn_ra_svn/client.c:2728 +#: ../libsvn_ra_svn/client.c:3029 #, c-format msgid "Expected 'revprops', found '%s'" -msgstr "ææârevpropsâï¼åç°â%sâ" +msgstr "ææ'revprops'ï¼åç°'%s'" -#: ../libsvn_ra_svn/client.c:2745 +#: ../libsvn_ra_svn/client.c:3047 msgid "Error while replaying commit" msgstr "éæ¼æ交æä½é误" -#: ../libsvn_ra_svn/client.c:2818 +#: ../libsvn_ra_svn/client.c:3124 msgid "'get-deleted-rev' not implemented" -msgstr "æªå®ç° âget-deleted-revâ" +msgstr "æªå®ç° 'get-deleted-rev'" -#: ../libsvn_ra_svn/client.c:2929 +#: ../libsvn_ra_svn/client.c:3242 +msgid "List entry not a list" +msgstr "å表æ¡ç®ä¸æ¯å表" + +#: ../libsvn_ra_svn/client.c:3358 #, c-format msgid "Unsupported RA loader version (%d) for ra_svn" msgstr "ä¸æ¯æ ra_svn RA å è½½å¨çæ¬(%d)" @@ -5367,87 +7874,86 @@ msgstr "ä¸è½åå§å SASL åº: %s%s" msgid "Could not create SASL context: %s%s" msgstr "ä¸è½å建 SASL ä¸ä¸æ: %s%s" -#: ../libsvn_ra_svn/cyrus_auth.c:932 ../libsvn_ra_svn/internal_auth.c:63 +#: ../libsvn_ra_svn/cyrus_auth.c:933 ../libsvn_ra_svn/internal_auth.c:63 #: ../libsvn_ra_svn/internal_auth.c:114 #, c-format msgid "Authentication error from server: %s" msgstr "æå¡å¨æ¥å认è¯é误: %s" -#: ../libsvn_ra_svn/cyrus_auth.c:936 +#: ../libsvn_ra_svn/cyrus_auth.c:937 msgid "Can't get username or password" msgstr "æ æ³åå¾ç¨æ·å称æå¯ç " -#: ../libsvn_ra_svn/editorp.c:147 +#: ../libsvn_ra_svn/editorp.c:163 msgid "Successful edit status returned too soon" msgstr "太快è¿åç¼è¾æåç¶æ" -#: ../libsvn_ra_svn/editorp.c:491 +#: ../libsvn_ra_svn/editorp.c:515 msgid "Invalid file or dir token during edit" msgstr "ç¼è¾æ¶éå°æ æçæ件æç®å½ä»¤ç" -#: ../libsvn_ra_svn/editorp.c:719 +#: ../libsvn_ra_svn/editorp.c:779 msgid "Apply-textdelta already active" msgstr "å·²ç»æ¿æ´» Apply-textdelta" -#: ../libsvn_ra_svn/editorp.c:741 ../libsvn_ra_svn/editorp.c:759 +#: ../libsvn_ra_svn/editorp.c:802 ../libsvn_ra_svn/editorp.c:821 msgid "Apply-textdelta not active" msgstr "没ææ¿æ´» Apply-textdelta" -#: ../libsvn_ra_svn/editorp.c:854 +#: ../libsvn_ra_svn/editorp.c:930 #, c-format msgid "Command 'finish-replay' invalid outside of replays" msgstr "finish-replayå½ä»¤åªå¨éæ¾æ¶ææ" -#: ../libsvn_ra_svn/editorp.c:958 ../libsvn_ra_svn/marshal.c:1608 +#: ../libsvn_ra_svn/editorp.c:1130 ../libsvn_ra_svn/marshal.c:1967 #, c-format msgid "Unknown editor command '%s'" -msgstr "æªç¥ç¼è¾å¨å½ä»¤â%sâ" +msgstr "æªç¥ç¼è¾å¨å½ä»¤'%s'" #: ../libsvn_ra_svn/internal_auth.c:101 msgid "Can't get password" msgstr "æ æ³åå¾å¯ç " -#: ../libsvn_ra_svn/marshal.c:147 +#: ../libsvn_ra_svn/marshal.c:261 msgid "Capability entry is not a word" -msgstr "容éç±»åä¸æ¯ word " +msgstr "容éç±»åä¸æ¯ word" -#: ../libsvn_ra_svn/marshal.c:952 +#: ../libsvn_ra_svn/marshal.c:1228 msgid "String length larger than maximum" msgstr "å符串é¿åº¦è¶ åºä¸é" -#: ../libsvn_ra_svn/marshal.c:1019 +#: ../libsvn_ra_svn/marshal.c:1308 msgid "Items are nested too deeply" msgstr "æ¡ç®åµå¥å¤ªæ·±" -#: ../libsvn_ra_svn/marshal.c:1040 ../libsvn_ra_svn/marshal.c:1159 +#: ../libsvn_ra_svn/marshal.c:1329 ../libsvn_ra_svn/marshal.c:1489 msgid "Number is larger than maximum" msgstr "æ°åè¶ è¿ä¸é" -#: ../libsvn_ra_svn/marshal.c:1071 -#, fuzzy +#: ../libsvn_ra_svn/marshal.c:1384 msgid "Word is too long" -msgstr "ååçå称太é¿" +msgstr "åè¯å¤ªé¿" -#: ../libsvn_ra_svn/marshal.c:1187 +#: ../libsvn_ra_svn/marshal.c:1517 msgid "Word too long" msgstr "åè¯å¤ªé¿" -#: ../libsvn_ra_svn/marshal.c:1447 +#: ../libsvn_ra_svn/marshal.c:1781 msgid "Proplist element not a list" msgstr "Proplist å ç´ ä¸æ¯å表" -#: ../libsvn_ra_svn/marshal.c:1486 +#: ../libsvn_ra_svn/marshal.c:1818 msgid "Empty error list" msgstr "é误å表为空" -#: ../libsvn_ra_svn/marshal.c:1495 ../libsvn_ra_svn/marshal.c:1521 +#: ../libsvn_ra_svn/marshal.c:1826 ../libsvn_ra_svn/marshal.c:1850 msgid "Malformed error list" msgstr "é误å表éæ³" -#: ../libsvn_ra_svn/marshal.c:1550 +#: ../libsvn_ra_svn/marshal.c:1879 #, c-format msgid "Unknown status '%s' in command response" -msgstr "å½ä»¤ååºä¸çç¶æ â%sâ æªç¥" +msgstr "å½ä»¤ååºä¸çç¶æ '%s' æªç¥" #: ../libsvn_ra_svn/streams.c:110 #, c-format @@ -5464,17 +7970,159 @@ msgstr "æ æ³è¯»åè¿æ¥" msgid "Can't write to connection" msgstr "æ æ³åå ¥è¿æ¥" -#: ../libsvn_repos/commit.c:291 +#: ../libsvn_repos/authz_parse.c:318 +#, c-format +msgid "Section appears more than once in the global groups file: [%s]" +msgstr "å ¨å±ç»æ件ä¸çèåºç°å¤æ¬¡: [%s]" + +#: ../libsvn_repos/authz_parse.c:324 +#, c-format +msgid "Section appears more than once in the authz file: [%s]" +msgstr "认è¯æ件ä¸çèåºç°å¤æ¬¡: [%s]" + +#: ../libsvn_repos/authz_parse.c:353 +#, c-format +msgid "Section is not valid in the global group file: [%s]" +msgstr "该èå¨å ¨å±ç»æ件ä¸æ æ: [%s]" + +#: ../libsvn_repos/authz_parse.c:354 +#, c-format +msgid "Section is not valid in the authz file: [%s]" +msgstr "该èå¨è®¤è¯æ件ä¸æ æ: [%s]" + +#: ../libsvn_repos/authz_parse.c:375 +#, c-format +msgid "Global group name '%s' may not begin with '%c'" +msgstr "å ¨å±ç»å '%s' ä¸è½ä»¥ '%c' å¼å¤´" + +#: ../libsvn_repos/authz_parse.c:380 +#, c-format +msgid "Group name '%s' may not begin with '%c'" +msgstr "ç»å '%s' ä¸è½ä»¥ '%c' å¼å¤´" + +#: ../libsvn_repos/authz_parse.c:391 +#, c-format +msgid "Can't override definition of global group '%s'" +msgstr "æ æ³è¦çå ¨å±ç» '%s' çå®ä¹" + +#: ../libsvn_repos/authz_parse.c:396 +#, c-format +msgid "Can't override definition of group '%s'" +msgstr "æ æ³è¦çç» '%s' çå®ä¹" + +#: ../libsvn_repos/authz_parse.c:519 +msgid "Found empty name in authz rule path" +msgstr "å¨è®¤è¯è§åè·¯å¾ä¸åç°ç©ºå称" + +#: ../libsvn_repos/authz_parse.c:520 ../libsvn_repos/authz_parse.c:535 +#, c-format +msgid "Non-canonical path '%s' in authz rule [%s]" +msgstr "认è¯è§å [%s] ä¸çéè§èè·¯å¾ '%s'" + +#: ../libsvn_repos/authz_parse.c:532 +msgid "Found '.' in authz rule path" +msgstr "å¨è®¤è¯è§åè·¯å¾ä¸åç° '.'" + +#: ../libsvn_repos/authz_parse.c:534 +msgid "Found '..' in authz rule path" +msgstr "å¨è®¤è¯è§åè·¯å¾ä¸åç° '..'" + +#: ../libsvn_repos/authz_parse.c:694 +#, c-format +msgid "Section [%s] describes the same rule as section [%s]" +msgstr "è [%s] æè¿°äºä¸è [%s] ç¸åçè§å" + +#: ../libsvn_repos/authz_parse.c:733 ../libsvn_repos/authz_parse.c:763 +#, c-format +msgid "Empty repository name in authz rule [%s]" +msgstr "认è¯è§å [%s] ä¸ç空çæ¬åºå称" + +#: ../libsvn_repos/authz_parse.c:742 +#, c-format +msgid "Invalid type token '%s' in authz rule [%s]" +msgstr "认è¯è§å [%s] ä¸æ æçç±»åæ è®° '%s'" + +#: ../libsvn_repos/authz_parse.c:820 +#, c-format +msgid "Alias name '%s' may not begin with '%c'" +msgstr "å«å '%s' ä¸è½ä»¥ '%c' å¼å¤´" + +#: ../libsvn_repos/authz_parse.c:829 +#, c-format +msgid "Can't override definition of alias '%s'" +msgstr "æ æ³è¦çå«å '%s' çå®ä¹" + +#: ../libsvn_repos/authz_parse.c:870 +#, c-format +msgid "Access entry '%s' has more than one inversion; double negatives are not permitted" +msgstr "访é®æ¡ç® '%s' æå¤ä¸ªååï¼ä¸å 许åéå¦å®" + +#: ../libsvn_repos/authz_parse.c:879 +#, c-format +msgid "Access entry '%s' is not valid; it must be a single '*'" +msgstr "访é®æ¡ç® '%s' æ æï¼å®å¿ é¡»æ¯å个 '*'" + +#: ../libsvn_repos/authz_parse.c:886 +#, c-format +msgid "Access entry '~*' will never match" +msgstr "访é®æ¡ç® '~*' æ°¸è¿ä¸ä¼å¹é " + +#: ../libsvn_repos/authz_parse.c:910 +#, c-format +msgid "Access entry token '%s' is not valid; should be '%s' or '%s'" +msgstr "访é®æ¡ç®æ è®° '%s' æ æï¼åºè¯¥æ¯ '%s' æ '%s'" + +#: ../libsvn_repos/authz_parse.c:937 +#, c-format +msgid "The access mode '%c' in access entry '%s' of rule [%s] is not valid" +msgstr "访é®æ¨¡å¼ '%c' æ æ(ä½äºè®¿é®æ¡ç® '%s'ï¼è§å [%s])" + +#: ../libsvn_repos/authz_parse.c:947 +#, c-format +msgid "Write-only access entry '%s' of rule [%s] is not valid" +msgstr "è§å [%s] çåªå访é®æ¡ç® '%s' æ æ" + +#: ../libsvn_repos/authz_parse.c:1085 +#, c-format +msgid "Recursive definition of group '%s'" +msgstr "ç» '%s' çéå½å®ä¹" + +#: ../libsvn_repos/authz_parse.c:1096 ../libsvn_repos/authz_parse.c:1155 +#, c-format +msgid "Alias '%s' was never defined" +msgstr "å«å '%s' ä»æªè¢«å®ä¹" + +#: ../libsvn_repos/authz_parse.c:1118 +#, c-format +msgid "Undefined group '%s'" +msgstr "æªå®ä¹çç» '%s'" + +#: ../libsvn_repos/authz_parse.c:1212 +#, c-format +msgid "Access entry refers to undefined group '%s'" +msgstr "访é®æ¡ç®å¼ç¨äºæªå®ä¹çç» '%s'" + +#: ../libsvn_repos/authz_parse.c:1222 +#, c-format +msgid "Ignoring access entry for empty group '%s'" +msgstr "忽ç¥ç©ºç» '%s' ç访é®æ¡ç®" + +#: ../libsvn_repos/commit.c:172 +#, c-format +msgid "'%s' is out of date" +msgstr "'%s' å·²ç»è¿æ¶" + +#: ../libsvn_repos/commit.c:321 #, c-format msgid "Got source path but no source revision for '%s'" -msgstr "è·å¾æºè·¯å¾ï¼ä½â%sâ没ææºçæ¬" +msgstr "è·å¾æºè·¯å¾ï¼ä½'%s'没ææºçæ¬" -#: ../libsvn_repos/commit.c:324 +#: ../libsvn_repos/commit.c:353 #, c-format msgid "Source url '%s' is from different repository" -msgstr "æº URL â%sâ æ¥èªå ¶å®çæ¬åº" +msgstr "æº URL '%s' æ¥èªå ¶å®çæ¬åº" -#: ../libsvn_repos/commit.c:640 +#: ../libsvn_repos/commit.c:692 #, c-format msgid "" "Checksum mismatch for resulting fulltext\n" @@ -5483,15 +8131,15 @@ msgstr "" "ç»æçæ ¡éªåä¸å¹é : \n" "(%s)" -#: ../libsvn_repos/commit.c:685 +#: ../libsvn_repos/commit.c:742 msgid "(no error)" msgstr "(没æé误)" -#: ../libsvn_repos/commit.c:716 ../libsvn_repos/commit.c:722 +#: ../libsvn_repos/commit.c:773 ../libsvn_repos/commit.c:779 msgid "post-commit hook failed with no error message." msgstr "è°ç¨ post-commit é©å失败 (没æé误信æ¯)ã" -#: ../libsvn_repos/commit.c:725 +#: ../libsvn_repos/commit.c:782 #, c-format msgid "" "post commit FS processing had error:\n" @@ -5502,11 +8150,11 @@ msgstr "" "%s\n" "%s" -#: ../libsvn_repos/commit.c:726 ../libsvn_repos/commit.c:735 +#: ../libsvn_repos/commit.c:783 ../libsvn_repos/commit.c:792 msgid "(no error message)" msgstr "(没æé误信æ¯)" -#: ../libsvn_repos/commit.c:733 +#: ../libsvn_repos/commit.c:790 #, c-format msgid "" "post commit FS processing had error:\n" @@ -5515,8 +8163,8 @@ msgstr "" "æ交åçæ件系ç»è¿ç¨åºé:\n" "%s" -#: ../libsvn_repos/commit.c:1252 ../libsvn_repos/fs-wrap.c:117 -#: ../libsvn_repos/load-fs-vtable.c:1030 +#: ../libsvn_repos/commit.c:1317 ../libsvn_repos/fs-wrap.c:120 +#: ../libsvn_repos/load-fs-vtable.c:1148 msgid "Commit succeeded, but post-commit hook failed" msgstr "æ交æåï¼ä½æ¯åç½®æ交é©å(post-commit)失败" @@ -5524,29 +8172,29 @@ msgstr "æ交æåï¼ä½æ¯åç½®æäº msgid "Unable to open root of edit" msgstr "æ æ³æå¼æ ¹æ¥ç¼è¾" -#: ../libsvn_repos/delta.c:236 +#: ../libsvn_repos/delta.c:244 msgid "Invalid target path" msgstr "æ æç®æ è·¯å¾" -#: ../libsvn_repos/delta.c:240 +#: ../libsvn_repos/delta.c:248 msgid "Delta depth 'exclude' not supported" -msgstr "ä¸æ¯æå·®å¼æ·±åº¦ âexcludeâ" +msgstr "ä¸æ¯æå·®å¼æ·±åº¦ 'exclude'" -#: ../libsvn_repos/delta.c:266 +#: ../libsvn_repos/delta.c:274 msgid "Invalid editor anchoring; at least one of the input paths is not a directory and there was no source entry" msgstr "æ æç¼è¾å¨å®ä½ï¼è³å°ä¸ä¸ªè¾å ¥è·¯å¾ä¸æ¯ç®å½ï¼å¹¶ä¸æ²¡ææºå ¥å£" -#: ../libsvn_repos/deprecated.c:647 ../svnadmin/svnadmin.c:923 +#: ../libsvn_repos/deprecated.c:715 ../svnadmin/svnadmin.c:1083 #, c-format msgid "* Dumped revision %ld.\n" msgstr "* 已转åçæ¬ %ldã\n" -#: ../libsvn_repos/deprecated.c:653 ../svnadmin/svnadmin.c:929 +#: ../libsvn_repos/deprecated.c:721 ../svnadmin/svnadmin.c:1089 #, c-format msgid "* Verified revision %ld.\n" msgstr "* å·²æ ¡éªçæ¬ %ldã\n" -#: ../libsvn_repos/deprecated.c:661 ../svnadmin/svnadmin.c:977 +#: ../libsvn_repos/deprecated.c:729 ../svnadmin/svnadmin.c:1137 #, c-format msgid "" "\n" @@ -5557,7 +8205,7 @@ msgstr "" "------- æ交åçæ¬ %ld >>>\n" "\n" -#: ../libsvn_repos/deprecated.c:667 ../svnadmin/svnadmin.c:983 +#: ../libsvn_repos/deprecated.c:735 ../svnadmin/svnadmin.c:1143 #, c-format msgid "" "\n" @@ -5568,196 +8216,188 @@ msgstr "" "------- æ交æ°çæ¬ %ld (ä»åå§çæ¬ %ld è£ è½½) >>>\n" "\n" -#: ../libsvn_repos/deprecated.c:680 ../svnadmin/svnadmin.c:996 +#: ../libsvn_repos/deprecated.c:748 ../svnadmin/svnadmin.c:1156 #, c-format msgid " * editing path : %s ..." msgstr " * æ£å¨ä¿®æ¹è·¯å¾: %s ..." -#: ../libsvn_repos/deprecated.c:686 ../svnadmin/svnadmin.c:1002 +#: ../libsvn_repos/deprecated.c:754 ../svnadmin/svnadmin.c:1162 #, c-format msgid " * deleting path : %s ..." msgstr " * æ£å¨å é¤è·¯å¾: %s ..." -#: ../libsvn_repos/deprecated.c:692 ../svnadmin/svnadmin.c:1008 +#: ../libsvn_repos/deprecated.c:760 ../svnadmin/svnadmin.c:1168 #, c-format msgid " * adding path : %s ..." msgstr " * æ£å¨å¢å è·¯å¾: %s ..." -#: ../libsvn_repos/deprecated.c:698 ../svnadmin/svnadmin.c:1014 +#: ../libsvn_repos/deprecated.c:766 ../svnadmin/svnadmin.c:1174 #, c-format msgid " * replacing path : %s ..." msgstr " * æ£å¨æ¿æ¢è·¯å¾: %s ..." -#: ../libsvn_repos/deprecated.c:708 ../svnadmin/svnadmin.c:1023 +#: ../libsvn_repos/deprecated.c:776 ../svnadmin/svnadmin.c:1183 msgid " done.\n" msgstr "å®æã\n" -#: ../libsvn_repos/deprecated.c:718 ../svnadmin/svnadmin.c:1032 +#: ../libsvn_repos/deprecated.c:786 ../svnadmin/svnadmin.c:1192 #, c-format msgid "<<< Started new transaction, based on original revision %ld\n" msgstr "<<< å¼å§æ°çäºå¡ï¼åºäºåå§çæ¬ %ld\n" -#: ../libsvn_repos/deprecated.c:725 ../svnadmin/svnadmin.c:1045 +#: ../libsvn_repos/deprecated.c:793 ../svnadmin/svnadmin.c:1205 #, c-format msgid " removing '\\r' from %s ..." -msgstr "æ£å¨ä» '%s' å é¤ '\\r' ..." +msgstr " æ£å¨ä» '%s' å é¤ '\\r' ..." -#: ../libsvn_repos/dump.c:570 -#, fuzzy, c-format +#: ../libsvn_repos/dump.c:825 +#, c-format msgid "Path '%s' not found in r%ld." -msgstr "è·¯å¾ â%sâ ä¸å¨çæ¬ %ld ä¸" +msgstr "è·¯å¾ '%s' å¨ r%ld ä¸æªæ¾å°ã" -#: ../libsvn_repos/dump.c:575 -#, fuzzy, c-format +#: ../libsvn_repos/dump.c:830 +#, c-format msgid "Unexpected node kind %d for '%s' at r%ld. Expected kind was %d." -msgstr "æå¤åç°èç¹ç§ç±» %d äºâ%sâ" +msgstr "æå¤çèç¹ç±»å %d(ä½äº '%s'ï¼r%ld)ãé¢æç±»å为 %dã" -#: ../libsvn_repos/dump.c:613 -#, fuzzy, c-format +#: ../libsvn_repos/dump.c:868 +#, c-format msgid "Path '%s' exists in r%ld." -msgstr "è·¯å¾ â%sâ åå¨ï¼ä½è¢«æé¤" +msgstr "è·¯å¾ '%s' åå¨äº r%ld ä¸ã" -#: ../libsvn_repos/dump.c:643 +#: ../libsvn_repos/dump.c:898 #, c-format msgid "Mergeinfo referencing revision(s) prior to the oldest dumped revision (r%ld). Loading this dump may result in invalid mergeinfo." msgstr "å并信æ¯å¼ç¨ççæ¬æ¯ææ§ç转åçæ¬ (r%ld) è¿æ§ãå è½½è¿ä¸ªè½¬åå¯è½å¯¼è´éæ³çå并信æ¯ã" -#: ../libsvn_repos/dump.c:752 +#: ../libsvn_repos/dump.c:1006 #, c-format msgid "Duplicate representation of path '%s' in %s property of '%s'" -msgstr "" +msgstr "'%s' ç %s å±æ§ä¸è·¯å¾ '%s' çéå¤è¡¨ç¤º" -#: ../libsvn_repos/dump.c:868 +#: ../libsvn_repos/dump.c:1152 #, c-format msgid "E%06d: While validating fspath '%s': %s" -msgstr "E%06d: å½éªè¯æ件系ç»è·¯å¾â%sâæ¶åºéï¼%s" +msgstr "E%06d: å½éªè¯æ件系ç»è·¯å¾'%s'æ¶åºé: %s" -#: ../libsvn_repos/dump.c:907 -#, fuzzy, c-format +#: ../libsvn_repos/dump.c:1196 +#, c-format msgid "Change invalid path '%s' in r%ld" -msgstr "æ æ³ç§»å¨è·¯å¾ â%sâ å°æ¬èº«" - -#: ../libsvn_repos/dump.c:932 -#, fuzzy, c-format -msgid "Replacing non-existent path '%s' in r%ld" -msgstr "è¯å¾å é¤ä¸åå¨çå±æ§â%sâäºâ%sâ\n" +msgstr "ä¿®æ¹æ æè·¯å¾ '%s'(å¨ r%ld)" -#: ../libsvn_repos/dump.c:957 +#: ../libsvn_repos/dump.c:1220 #, c-format -msgid "Replacing path '%s' in r%ld with invalid path" -msgstr "" +msgid "Deleting invalid path '%s' in r%ld" +msgstr "å é¤æ æè·¯å¾ '%s'(å¨ r%ld)" -#: ../libsvn_repos/dump.c:989 +#: ../libsvn_repos/dump.c:1239 #, c-format -msgid "Deleting invalid path '%s' in r%ld" -msgstr "" +msgid "Replacing non-existent path '%s' in r%ld" +msgstr "æ¿æ¢ä¸åå¨çè·¯å¾ '%s'(å¨ r%ld)" -#: ../libsvn_repos/dump.c:1007 +#: ../libsvn_repos/dump.c:1280 #, c-format msgid "Adding already existing path '%s' in r%ld" -msgstr "" +msgstr "æ·»å å·²åå¨çè·¯å¾ '%s'(å¨ r%ld)" -#: ../libsvn_repos/dump.c:1030 -#, fuzzy, c-format +#: ../libsvn_repos/dump.c:1303 +#, c-format msgid "Copying from invalid path to '%s' in r%ld" -msgstr "é ç½®é误: æ æåå¼ â%sâï¼å¯¹äºé项 â%sâ" +msgstr "å¤å¶å° '%s' æ¶æºè·¯å¾æ æ(å¨ r%ld)" -#: ../libsvn_repos/dump.c:1042 +#: ../libsvn_repos/dump.c:1315 #, c-format msgid "Referencing data in revision %ld, which is older than the oldest dumped revision (r%ld). Loading this dump into an empty repository will fail." msgstr "çæ¬ %ld å¼ç¨çæ°æ®æ¯ææ§ç转åçæ¬ (r%ld) è¿æ§ãå è½½è¿ä¸ªè½¬åå°ç©ºççæ¬åºä¼å¤±è´¥ã" -#: ../libsvn_repos/dump.c:1809 ../libsvn_repos/dump.c:2211 +#: ../libsvn_repos/dump.c:2074 ../libsvn_repos/dump.c:2501 #, c-format msgid "Start revision %ld is greater than end revision %ld" msgstr "èµ·å§çæ¬ %ld 大äºç»æçæ¬ %ld" -#: ../libsvn_repos/dump.c:1814 ../libsvn_repos/dump.c:2216 +#: ../libsvn_repos/dump.c:2079 ../libsvn_repos/dump.c:2506 #, c-format msgid "End revision %ld is invalid (youngest revision is %ld)" msgstr "ç»æçæ¬ %ld æ æ (ææ°çæ¬æ¯ %ld)" -#: ../libsvn_repos/dump.c:1927 +#: ../libsvn_repos/dump.c:2204 msgid "The range of revisions dumped contained references to copy sources outside that range." -msgstr "导åºççæ¬èå´å å«çå¼ç¨è¶ åºå¯¼åºèå´ã" +msgstr "转å¨ççæ¬èå´ä¸å å«æå该èå´ä¹å¤çå¤å¶æºçå¼ç¨ã" -#: ../libsvn_repos/dump.c:1939 +#: ../libsvn_repos/dump.c:2216 msgid "The range of revisions dumped contained mergeinfo which reference revisions outside that range." msgstr "导åºççæ¬èå´å å«çå并信æ¯ï¼å ¶å¼ç¨ççæ¬è¶ åºå¯¼åºèå´ã" -#: ../libsvn_repos/dump.c:1993 -#, fuzzy, c-format +#: ../libsvn_repos/dump.c:2270 +#, c-format msgid "Node '%s' is not a directory." -msgstr "â%sâä¸æ¯ç®å½" +msgstr "èç¹ '%s' ä¸æ¯ç®å½ã" -#: ../libsvn_repos/dump.c:2001 -#, fuzzy, c-format +#: ../libsvn_repos/dump.c:2278 +#, c-format msgid "Node '%s' is not a file." -msgstr "èç¹ '%s' ä¸æ¯æ件" +msgstr "èç¹ '%s' ä¸æ¯æ件ã" -#: ../libsvn_repos/dump.c:2006 +#: ../libsvn_repos/dump.c:2283 #, c-format msgid "Unexpected node kind %d for '%s'" -msgstr "æå¤åç°èç¹ç§ç±» %d äºâ%sâ" +msgstr "æå¤åç°èç¹ç§ç±» %d äº'%s'" -#: ../libsvn_repos/dump.c:2053 -#, fuzzy, c-format +#: ../libsvn_repos/dump.c:2330 +#, c-format msgid "Duplicate representation of path '%s'" -msgstr "没æ修订çâ%sâ" +msgstr "è·¯å¾ '%s' çéå¤è¡¨ç¤º" -#: ../libsvn_repos/dump.c:2262 ../libsvn_repos/dump.c:2315 -#, fuzzy, c-format -msgid "Repository '%s' failed to verify" -msgstr "çæ¬åºå·²ç»ç§»å¨" - -#: ../libsvn_repos/fs-wrap.c:213 +#: ../libsvn_repos/fs-wrap.c:216 #, c-format msgid "Storage of non-regular property '%s' is disallowed through the repository interface, and could indicate a bug in your client" -msgstr "ä¸å 许éè¿çæ¬åºæ¥å£åå¨éæ£è§å±æ§â%sâï¼å®è¯´ææ¨ç客æ·ç«¯ææ¼æ´" +msgstr "ä¸å 许éè¿çæ¬åºæ¥å£åå¨éæ£è§å±æ§'%s'ï¼å®è¯´æä½ ç客æ·ç«¯ææ¼æ´" -#: ../libsvn_repos/fs-wrap.c:228 +#: ../libsvn_repos/fs-wrap.c:231 #, c-format msgid "Cannot accept '%s' property because it is not encoded in UTF-8" -msgstr "ä¸è½æ¥åå±æ§ â%sâï¼å 为å®çç¼ç ä¸æ¯ UTF-8" +msgstr "ä¸è½æ¥åå±æ§ '%s'ï¼å 为å®çç¼ç ä¸æ¯ UTF-8" -#: ../libsvn_repos/fs-wrap.c:238 +#: ../libsvn_repos/fs-wrap.c:241 #, c-format msgid "Cannot accept non-LF line endings in '%s' property" -msgstr "ä¸è½æ¥åå±æ§ â%sâ çé LF è¡ç»æ符" +msgstr "ä¸è½æ¥åå±æ§ '%s' çé LF è¡ç»æ符" + +#: ../libsvn_repos/fs-wrap.c:245 +msgid "Invalid property value" +msgstr "æ æçå±æ§å¼" -#: ../libsvn_repos/fs-wrap.c:279 +#: ../libsvn_repos/fs-wrap.c:313 #, c-format msgid "Commit rejected because mergeinfo on '%s' contains unexpected string terminator" msgstr "ç±äº '%s' ä¸çå并信æ¯å å«æå¤çå符串ç»ç»ç¬¦ï¼æ交被æç»" -#: ../libsvn_repos/fs-wrap.c:286 +#: ../libsvn_repos/fs-wrap.c:320 #, c-format msgid "Commit rejected because mergeinfo on '%s' is syntactically invalid" msgstr "ç±äº '%s' ä¸çå并信æ¯éæ³ï¼æ交被æç»" -#: ../libsvn_repos/fs-wrap.c:416 +#: ../libsvn_repos/fs-wrap.c:451 #, c-format msgid "Write denied: not authorized to read all of revision %ld" msgstr "æç»åå ¥: æªææ读åçæ¬ %ld çæææ°æ®ã" -#: ../libsvn_repos/fs-wrap.c:629 -#, fuzzy +#: ../libsvn_repos/fs-wrap.c:667 msgid "Locking succeeded, but post-lock hook failed" -msgstr "解éæåï¼ä½æ¯å置解éé©å(post-unlock)失败" +msgstr "éå®æåï¼ä½ post-lock é©å失败" -#: ../libsvn_repos/fs-wrap.c:735 -#, fuzzy +#: ../libsvn_repos/fs-wrap.c:773 msgid "Cannot unlock, no authenticated username available" -msgstr "ä¸è½è§£é¤è·¯å¾â%sâçéå®ï¼æ²¡æå¯ç¨çå·²ææç¨æ·å" +msgstr "æ æ³è§£éï¼æ²¡æå¯ç¨ç认è¯ç¨æ·å" -#: ../libsvn_repos/fs-wrap.c:783 +#: ../libsvn_repos/fs-wrap.c:821 msgid "Unlock succeeded, but post-unlock hook failed" msgstr "解éæåï¼ä½æ¯å置解éé©å(post-unlock)失败" #: ../libsvn_repos/hooks.c:92 #, c-format msgid "'%s' hook succeeded, but error output could not be read" -msgstr "é©åæ§è¡â%sâæåï¼æ²¡æå¯ç¨çé误è¾åº" +msgstr "é©åæ§è¡'%s'æåï¼æ²¡æå¯ç¨çé误è¾åº" #: ../libsvn_repos/hooks.c:107 msgid "[Error output could not be translated from the native locale to UTF-8.]" @@ -5770,7 +8410,7 @@ msgstr "[没æå¯ç¨çé误è¾åºã] #: ../libsvn_repos/hooks.c:121 #, c-format msgid "'%s' hook failed (did not exit cleanly: apr_exit_why_e was %d, exitcode was %d). " -msgstr "é©åâ%sâ失败(没æå¹²åçéåº: apr_exit_why_e æ¯ %dï¼exitcode æ¯ %d)ã" +msgstr "é©å'%s'失败(没æå¹²åçéåº: apr_exit_why_e æ¯ %dï¼exitcode æ¯ %d)ã " #: ../libsvn_repos/hooks.c:130 msgid "Commit" @@ -5791,7 +8431,7 @@ msgstr "解é" #: ../libsvn_repos/hooks.c:141 #, c-format msgid "%s hook failed (exit code %d)" -msgstr "é©å â%sâ 失败(éåºä»£ç %d)" +msgstr "é©å '%s' 失败(éåºä»£ç %d)" #: ../libsvn_repos/hooks.c:145 #, c-format @@ -5800,7 +8440,7 @@ msgstr "%s 被 %s é©åé»å¡(éåºä»£ #: ../libsvn_repos/hooks.c:152 msgid " with output:\n" -msgstr " è¾åºï¼\n" +msgstr " è¾åº:\n" #: ../libsvn_repos/hooks.c:158 msgid " with no output." @@ -5809,12 +8449,12 @@ msgstr " 没æè¾åºã" #: ../libsvn_repos/hooks.c:233 #, c-format msgid "Can't create null stdout for hook '%s'" -msgstr "æ æ³ä¸ºé©åâ%sâå建空æ åè¾åº" +msgstr "æ æ³ä¸ºé©å'%s'å建空æ åè¾åº" #: ../libsvn_repos/hooks.c:260 #, c-format msgid "Failed to start '%s' hook" -msgstr "å¯å¨é©åâ%sâ失败" +msgstr "å¯å¨é©å'%s'失败" #: ../libsvn_repos/hooks.c:282 #, c-format @@ -5824,34 +8464,49 @@ msgstr "å ³é空æ件åºé" #: ../libsvn_repos/hooks.c:454 #, c-format msgid "Failed to run '%s' hook; broken symlink" -msgstr "è¿è¡é©åâ%sâ失败ï¼ç¬¦å·è¿æ¥æå" +msgstr "è¿è¡é©å'%s'失败ï¼ç¬¦å·è¿æ¥æå" -#: ../libsvn_repos/hooks.c:670 +#: ../libsvn_repos/hooks.c:676 msgid "" "Repository has not been enabled to accept revision propchanges;\n" "ask the administrator to create a pre-revprop-change hook" -msgstr "æ¤çæ¬åºä¸å 许修æ¹çæ¬å±æ§ï¼è¯·ç®¡çåå建 pre-revprop-change é©å" +msgstr "" +"æ¤çæ¬åºæªå¯ç¨çæ¬å±æ§ä¿®æ¹ï¼\n" +"请让管çåå建 pre-revprop-change é©å" + +#: ../libsvn_repos/list.c:314 ../libsvn_subr/io.c:3293 +#, c-format +msgid "Path '%s' not found" +msgstr "è·¯å¾ '%s' æªæ¾å°" -#: ../libsvn_repos/load-fs-vtable.c:576 ../svnrdump/load_editor.c:770 +#: ../libsvn_repos/load-fs-vtable.c:610 ../svnrdump/load_editor.c:492 #, c-format msgid "Relative source revision %ld is not available in current repository" msgstr "å½åçæ¬åºä¸åå¨ç¸å¯¹æºçæ¬ %ld" -#: ../libsvn_repos/load-fs-vtable.c:590 +#: ../libsvn_repos/load-fs-vtable.c:624 #, c-format msgid "" "Copy source checksum mismatch on copy from '%s'@%ld\n" "to '%s' in rev based on r%ld" -msgstr "ä» â%s@%ldâ å¤å¶å° â%sâï¼åºäºçæ¬ r%ld çæºæ ¡éªåä¸å¹é " +msgstr "ä» '%s@%ld' å¤å¶å° '%s'ï¼åºäºçæ¬ r%ld çæºæ ¡éªåä¸å¹é " -#: ../libsvn_repos/load-fs-vtable.c:654 +#: ../libsvn_repos/load-fs-vtable.c:680 msgid "Malformed dumpstream: Revision 0 must not contain node records" msgstr "éæ³ç转åæµ: çæ¬ 0 ä¸è½å å«èç¹è®°å½" -#: ../libsvn_repos/load-fs-vtable.c:670 +#: ../libsvn_repos/load-fs-vtable.c:696 #, c-format msgid "Unrecognized node-action on node '%s'" -msgstr "èç¹â%sâçå¨ä½ä¸è½è¯å«" +msgstr "èç¹'%s'çå¨ä½ä¸è½è¯å«" + +#: ../libsvn_repos/load-fs-vtable.c:865 ../svnrdump/load_editor.c:628 +msgid "Invalid svn:mergeinfo value" +msgstr "æ æç svn:mergeinfo å¼" + +#: ../libsvn_repos/load-fs-vtable.c:874 +msgid "Invalid svn:mergeinfo value; leaving unchanged" +msgstr "æ æç svn:mergeinfo å¼ï¼ä¿æä¸å" #: ../libsvn_repos/load.c:46 msgid "Premature end of content data in dumpstream" @@ -5864,12 +8519,12 @@ msgstr "转åæµä¸åºç°éæ³æ°æ®" #: ../libsvn_repos/load.c:102 #, c-format msgid "Dump stream contains a malformed header (with no ':') at '%.20s'" -msgstr "转åæµå¨â%.20sâå å«é误头é¨(没æâ:â)" +msgstr "转åæµå¨'%.20s'å å«é误头é¨(没æ':')" #: ../libsvn_repos/load.c:115 #, c-format msgid "Dump stream contains a malformed header (with no value) at '%.20s'" -msgstr "转åæµå¨â%.20sâå å«é误头é¨(没æå¼)" +msgstr "转åæµå¨'%.20s'å å«é误头é¨(没æå¼)" #: ../libsvn_repos/load.c:204 msgid "Incomplete or unterminated property block" @@ -5879,92 +8534,91 @@ msgstr "ä¸å®æ´ææªç»æçå±æ§å msgid "Unexpected EOF writing contents" msgstr "åå 容æ¶æå¤ç»æ" -#: ../libsvn_repos/load.c:374 +#: ../libsvn_repos/load.c:398 ../libsvn_repos/load.c:412 #, c-format msgid "Malformed dumpfile header '%s'" msgstr "éæ³ç转åæ件头 '%s'" -#: ../libsvn_repos/load.c:381 +#: ../libsvn_repos/load.c:419 #, c-format msgid "Unsupported dumpfile version: %d" msgstr "ä¸æ¯æç转åæ件çæ¬: %d" -#: ../libsvn_repos/load.c:522 +#: ../libsvn_repos/load.c:688 msgid "Unrecognized record type in stream" msgstr "æµä¸ææ æ³è¯å«çè®°å½ç±»å" -#: ../libsvn_repos/load.c:629 +#: ../libsvn_repos/load.c:795 msgid "Sum of subblock sizes larger than total block content length" msgstr "åå大å°ä¹å大äºåå 容é¿åº¦" #: ../libsvn_repos/node_tree.c:244 #, c-format msgid "'%s' not found in filesystem" -msgstr "å¨æ件系ç»ä¸æ¾ä¸å°â%sâ" +msgstr "å¨æ件系ç»ä¸æ¾ä¸å°'%s'" -#: ../libsvn_repos/replay.c:541 ../libsvn_repos/replay.c:1267 +#: ../libsvn_repos/replay.c:538 ../libsvn_repos/replay.c:1296 #, c-format msgid "Filesystem path '%s' is neither a file nor a directory" -msgstr "æ件系ç»ä¸è·¯å¾â%sâæ¢ä¸æ¯æ件ä¹ä¸æ¯ç®å½" +msgstr "æ件系ç»ä¸è·¯å¾'%s'æ¢ä¸æ¯æ件ä¹ä¸æ¯ç®å½" -#: ../libsvn_repos/replay.c:556 -#, fuzzy +#: ../libsvn_repos/replay.c:553 msgid "Root directory already exists." -msgstr "æ¡ç®å·²åå¨" +msgstr "æ ¹ç®å½å·²åå¨ã" -#: ../libsvn_repos/reporter.c:205 +#: ../libsvn_repos/reporter.c:206 #, c-format msgid "Invalid length (%%%s) when about to read a string" msgstr "é¿åº¦ (%%%s) 对äºå符串éæ³" -#: ../libsvn_repos/reporter.c:270 +#: ../libsvn_repos/reporter.c:271 #, c-format msgid "Invalid depth (%c) for path '%s'" -msgstr "éæ³æ·±åº¦(%c)äºè·¯å¾ â%sâ" +msgstr "éæ³æ·±åº¦(%c)äºè·¯å¾ '%s'" -#: ../libsvn_repos/reporter.c:950 +#: ../libsvn_repos/reporter.c:953 #, c-format msgid "Working copy path '%s' does not exist in repository" -msgstr "å·¥ä½å¯æ¬è·¯å¾â%sâä¸å¨çæ¬åºä¸" +msgstr "å·¥ä½å¯æ¬è·¯å¾'%s'ä¸å¨çæ¬åºä¸" -#: ../libsvn_repos/reporter.c:1357 +#: ../libsvn_repos/reporter.c:1379 msgid "Not authorized to open root of edit operation" msgstr "æ ææå¼æ ¹è¿è¡ç¼è¾æä½" -#: ../libsvn_repos/reporter.c:1374 +#: ../libsvn_repos/reporter.c:1396 #, c-format msgid "Target path '%s' does not exist" -msgstr "ç®æ è·¯å¾ â%sâ ä¸åå¨" +msgstr "ç®æ è·¯å¾ '%s' ä¸åå¨" -#: ../libsvn_repos/reporter.c:1382 +#: ../libsvn_repos/reporter.c:1404 msgid "Cannot replace a directory from within" msgstr "ä¸è½å¨åç®å½ä¸æ¿æ¢ç®å½" -#: ../libsvn_repos/reporter.c:1422 +#: ../libsvn_repos/reporter.c:1444 msgid "Invalid report for top level of working copy" msgstr "æä¸å±å·¥ä½å¯æ¬æ¥åæ æ" -#: ../libsvn_repos/reporter.c:1437 +#: ../libsvn_repos/reporter.c:1459 msgid "Two top-level reports with no target" msgstr "两个æä¸å±æ¥å没æç®æ " -#: ../libsvn_repos/reporter.c:1499 +#: ../libsvn_repos/reporter.c:1521 #, c-format msgid "Unsupported report depth '%s'" -msgstr "ä¸æ¯ææ¥å深度â%sâ" +msgstr "ä¸æ¯ææ¥å深度'%s'" -#: ../libsvn_repos/reporter.c:1529 +#: ../libsvn_repos/reporter.c:1551 msgid "Depth 'exclude' not supported for link" -msgstr "深度 âexcludeâ ä¸æ¯æé¾æ¥" +msgstr "深度 'exclude' ä¸æ¯æé¾æ¥" -#: ../libsvn_repos/reporter.c:1586 +#: ../libsvn_repos/reporter.c:1609 msgid "Request depth 'exclude' not supported" -msgstr "ä¸æ¯æ请æ±ç深度 âexcludeâ" +msgstr "ä¸æ¯æ请æ±ç深度 'exclude'" #: ../libsvn_repos/repos.c:188 #, c-format msgid "'%s' exists and is non-empty" -msgstr "â%sâå·²åå¨å¹¶ä¸é空" +msgstr "'%s'å·²åå¨å¹¶ä¸é空" #: ../libsvn_repos/repos.c:234 msgid "Creating db logs lock file" @@ -5978,140 +8632,158 @@ msgstr "æ£å¨å建æ°æ®åºéæ件" msgid "Creating lock dir" msgstr "æ£å¨å建éæ件ç®å½" -#: ../libsvn_repos/repos.c:301 +#: ../libsvn_repos/repos.c:367 msgid "Creating hook directory" msgstr "æ£å¨å建é©åç®å½" -#: ../libsvn_repos/repos.c:385 +#: ../libsvn_repos/repos.c:420 msgid "Creating start-commit hook" msgstr "æ£å¨å建 start-commit é©å" -#: ../libsvn_repos/repos.c:479 +#: ../libsvn_repos/repos.c:483 msgid "Creating pre-commit hook" msgstr "æ£å¨å建 pre-commit é©å" -#: ../libsvn_repos/repos.c:559 +#: ../libsvn_repos/repos.c:534 msgid "Creating pre-revprop-change hook" msgstr "æ£å¨å建 pre-revprop-change é©å" -#: ../libsvn_repos/repos.c:805 +#: ../libsvn_repos/repos.c:600 +msgid "Creating pre-lock hook" +msgstr "å建 pre-lock é©å" + +#: ../libsvn_repos/repos.c:658 +msgid "Creating pre-unlock hook" +msgstr "å建 pre-unlock é©å" + +#: ../libsvn_repos/repos.c:691 msgid "Creating post-commit hook" msgstr "æ£å¨å建 post-commit é©å" -#: ../libsvn_repos/repos.c:998 +#: ../libsvn_repos/repos.c:726 +msgid "Creating post-lock hook" +msgstr "å建 post-lock é©å" + +#: ../libsvn_repos/repos.c:758 +msgid "Creating post-unlock hook" +msgstr "å建 post-unlock é©å" + +#: ../libsvn_repos/repos.c:799 msgid "Creating post-revprop-change hook" msgstr "æ£å¨å建 post-revprop-change é©å" -#: ../libsvn_repos/repos.c:1010 +#: ../libsvn_repos/repos.c:810 msgid "Creating conf directory" msgstr "æ£å¨å建 conf ç®å½" -#: ../libsvn_repos/repos.c:1094 +#: ../libsvn_repos/repos.c:899 msgid "Creating svnserve.conf file" msgstr "æ£å¨å建 svnserve.conf æ件" -#: ../libsvn_repos/repos.c:1112 +#: ../libsvn_repos/repos.c:917 msgid "Creating passwd file" msgstr "æ£å¨å建 passwd æ件" -#: ../libsvn_repos/repos.c:1154 +#: ../libsvn_repos/repos.c:959 msgid "Creating authz file" msgstr "æ£å¨å建 authz æ件" -#: ../libsvn_repos/repos.c:1184 -#, fuzzy +#: ../libsvn_repos/repos.c:989 msgid "Creating hooks-env file" -msgstr "æ£å¨å建æ°æ®åºéæ件" +msgstr "å建 hooks-env æ件" -#: ../libsvn_repos/repos.c:1240 +#: ../libsvn_repos/repos.c:1045 msgid "Could not create top-level directory" msgstr "æ æ³å建æä¸å±ç®å½" -#: ../libsvn_repos/repos.c:1250 +#: ../libsvn_repos/repos.c:1055 msgid "Creating DAV sandbox dir" msgstr "æ£å¨å建 DAV æ²ç®±ç®å½" -#: ../libsvn_repos/repos.c:1319 +#: ../libsvn_repos/repos.c:1124 msgid "Error opening db lockfile" msgstr "æå¼æ°æ®åºéæ件åºé" -#: ../libsvn_repos/repos.c:1357 +#: ../libsvn_repos/repos.c:1162 #, c-format msgid "'%s' is an existing repository" -msgstr "çæ¬åºçâ%sâå·²ç»åå¨" +msgstr "çæ¬åºç'%s'å·²ç»åå¨" -#: ../libsvn_repos/repos.c:1362 +#: ../libsvn_repos/repos.c:1167 #, c-format msgid "'%s' is a subdirectory of an existing repository rooted at '%s'" -msgstr "â%sâ æ¯å½åæ ¹ä¸º â%sâ ççæ¬åºçåç®å½" +msgstr "'%s' æ¯å½åæ ¹ä¸º '%s' ççæ¬åºçåç®å½" -#: ../libsvn_repos/repos.c:1372 +#: ../libsvn_repos/repos.c:1177 msgid "Repository creation failed" msgstr "å建çæ¬åºå¤±è´¥" -#: ../libsvn_repos/repos.c:1462 +#: ../libsvn_repos/repos.c:1267 #, c-format msgid "Expected repository format '%d' or '%d'; found format '%d'" -msgstr "ææçæ¬åºæ ¼å¼æ¯â%dâæâ%dâï¼åç°æ ¼å¼æ¯â%dâ" +msgstr "ææçæ¬åºæ ¼å¼æ¯'%d'æ'%d'ï¼åç°æ ¼å¼æ¯'%d'" -#: ../libsvn_repos/repos.c:1766 +#: ../libsvn_repos/repos.c:1580 #, c-format msgid "unknown capability '%s'" -msgstr "æªç¥ç¹æ§â%sâ" +msgstr "æªç¥ç¹æ§'%s'" #: ../libsvn_repos/rev_hunt.c:73 #, c-format msgid "Failed to find time on revision %ld" msgstr "æ æ³æ¾å°çæ¬ %ld çæ¶é´" -#: ../libsvn_repos/rev_hunt.c:208 ../libsvn_repos/rev_hunt.c:324 +#: ../libsvn_repos/rev_hunt.c:210 ../libsvn_repos/rev_hunt.c:325 #, c-format msgid "Invalid start revision %ld" msgstr "æ æèµ·å§çæ¬ %ld" -#: ../libsvn_repos/rev_hunt.c:500 +#: ../libsvn_repos/rev_hunt.c:505 msgid "Unreadable path encountered; access denied" msgstr "éå°ä¸å¯è¯»çè·¯å¾ï¼æç»è®¿é®ã" -#: ../libsvn_repos/rev_hunt.c:1120 ../libsvn_repos/rev_hunt.c:1459 +#: ../libsvn_repos/rev_hunt.c:1139 ../libsvn_repos/rev_hunt.c:1523 #, c-format msgid "'%s' is not a file in revision %ld" -msgstr "â%sâ ä¸æ¯æ件ï¼çæ¬ %ld" +msgstr "'%s' ä¸æ¯æ件ï¼çæ¬ %ld" -#: ../libsvn_subr/auth.c:224 -#, fuzzy +#: ../libsvn_subr/auth.c:246 msgid "No authentication providers registered" -msgstr "ææç认è¯æä¾è é½ä¸å¯ç¨" +msgstr "没æ注å认è¯æä¾è " -#: ../libsvn_subr/auth.c:230 +#: ../libsvn_subr/auth.c:252 #, c-format msgid "No provider registered for '%s' credentials" msgstr "没ææä¾ç¨åºä¸º '%s' åæ®æ³¨å" -#: ../libsvn_subr/cache-membuffer.c:640 +#: ../libsvn_subr/cache-membuffer.c:838 #, c-format msgid "Can't lock cache mutex" msgstr "ä¸è½éå®ç¼åäºæ¥ä½" -#: ../libsvn_subr/cache-membuffer.c:678 ../libsvn_subr/cache-membuffer.c:702 +#: ../libsvn_subr/cache-membuffer.c:876 ../libsvn_subr/cache-membuffer.c:897 #, c-format msgid "Can't write-lock cache mutex" msgstr "ä¸è½è·å¾ç¼åäºæ¥ä½çåå ¥é" -#: ../libsvn_subr/cache-membuffer.c:729 +#: ../libsvn_subr/cache-membuffer.c:921 #, c-format msgid "Can't unlock cache mutex" msgstr "ä¸è½è§£éç¼åäºæ¥ä½" -#: ../libsvn_subr/cache-membuffer.c:1830 +#: ../libsvn_subr/cache-membuffer.c:2040 #, c-format msgid "Can't create cache mutex" msgstr "æ æ³å建ç¼åäºæ¥ä½" -#: ../libsvn_subr/cache-membuffer.c:2794 +#: ../libsvn_subr/cache-membuffer.c:3036 msgid "Can't iterate a membuffer-based cache" msgstr "ä¸è½è¿ä»£åºäºå åçç¼å" +#: ../libsvn_subr/cache-membuffer.c:3387 +msgid "Prefix too long" +msgstr "åç¼å¤ªé¿" + #: ../libsvn_subr/cache-memcache.c:170 #, c-format msgid "Unknown memcached error while reading" @@ -6129,17 +8801,17 @@ msgstr "ä¸è½è¿ä»£ memcached ç¼å" #: ../libsvn_subr/cache-memcache.c:460 #, c-format msgid "Error parsing memcache server '%s'" -msgstr "解æ memcache æå¡å¨ â%sâ æ¶åºé" +msgstr "解æ memcache æå¡å¨ '%s' æ¶åºé" #: ../libsvn_subr/cache-memcache.c:468 #, c-format msgid "Scope not allowed in memcache server '%s'" -msgstr "memcache æå¡å¨ â%sâ ä¸ä¸å 许åºç°èå´" +msgstr "memcache æå¡å¨ '%s' ä¸ä¸å 许åºç°èå´" #: ../libsvn_subr/cache-memcache.c:476 #, c-format msgid "Must specify host and port for memcache server '%s'" -msgstr "memcache æå¡å¨ â%sâ ä¸å¿ é¡»æå®ä¸»æºå端å£" +msgstr "memcache æå¡å¨ '%s' ä¸å¿ é¡»æå®ä¸»æºå端å£" #: ../libsvn_subr/cache-memcache.c:496 #, c-format @@ -6156,7 +8828,12 @@ msgstr "å¢å memcache æå¡å¨æ¶åºç msgid "Unknown error creating apr_memcache_t" msgstr "å建 memcache apr_memcache_t æ¶åºç°æªç¥é误" -#: ../libsvn_subr/checksum.c:633 +#: ../libsvn_subr/checksum.c:353 +#, c-format +msgid "Invalid prefix in checksum '%s'" +msgstr "æ ¡éªå '%s' ä¸æ æçåç¼" + +#: ../libsvn_subr/checksum.c:689 #, c-format msgid "" "%s:\n" @@ -6167,105 +8844,134 @@ msgstr "" " ææ: %s\n" " å®é : %s\n" -#: ../libsvn_subr/cmdline.c:760 +#: ../libsvn_subr/cmdline.c:786 #, c-format msgid "Error initializing command line arguments" msgstr "åå§åå½ä»¤è¡åæ°åºé" -#: ../libsvn_subr/cmdline.c:849 +#: ../libsvn_subr/cmdline.c:896 +#, c-format +msgid "Ignoring unknown value '%s'; did you mean '%s'?" +msgstr "忽ç¥æªç¥å¼ '%s'ï¼ä½ æ¯å¦æçæ¯ '%s'ï¼" + +#: ../libsvn_subr/cmdline.c:901 +#, c-format +msgid "Ignoring unknown value '%s'" +msgstr "忽ç¥æªç¥å¼ '%s'" + +#: ../libsvn_subr/cmdline.c:996 msgid "Invalid syntax of argument of --config-option" msgstr "åæ° --config-option çè¯æ³æ æ" -#: ../libsvn_subr/cmdline.c:876 +#: ../libsvn_subr/cmdline.c:1023 #, c-format msgid "Unrecognized file in argument of %s" msgstr "ä¸è½è¯å«åæ° %s æå®çæ件" -#: ../libsvn_subr/cmdline.c:1122 +#: ../libsvn_subr/cmdline.c:1234 ../svnrdump/svnrdump.c:950 +msgid "--non-interactive and --force-interactive are mutually exclusive" +msgstr "--non-interactive å --force-interactive äºæ¥" + +#: ../libsvn_subr/cmdline.c:1287 ../svn/svn.c:2771 +#, c-format +msgid "" +"Unknown value '%s' for %s.\n" +"Supported values: %s" +msgstr "" +"%s çæªç¥å¼ '%s'ã\n" +"æ¯æçå¼: %s" + +#: ../libsvn_subr/cmdline.c:1340 +msgid "Caught signal" +msgstr "ææå°ä¿¡å·" + +#: ../libsvn_subr/cmdline.c:1421 ../libsvn_subr/cmdline.c:1426 +#: ../libsvn_subr/cmdline.c:1435 ../libsvn_subr/cmdline.c:1440 +#: ../libsvn_subr/utf.c:1259 ../libsvn_subr/utf.c:1269 +#, c-format +msgid "Conversion from UTF-16 failed" +msgstr "UTF-16 转æ¢å¤±è´¥" + +#: ../libsvn_subr/cmdline_editor.c:147 msgid "The EDITOR, SVN_EDITOR or VISUAL environment variable or 'editor-cmd' run-time configuration option is empty or consists solely of whitespace. Expected a shell command." -msgstr "ç¯å¢åé EDITORï¼SVN_EDITORï¼æ VISUALï¼æè è¿è¡æ¶é ç½®é项 âeditor-cmdâ 为空æåå¼å å«äºä¸å å¼å·çç©ºæ ¼ãææå¤å£³å½ä»¤ã" +msgstr "ç¯å¢åé EDITORï¼SVN_EDITORï¼æ VISUALï¼æè è¿è¡æ¶é ç½®é项 'editor-cmd' 为空æåå¼å å«äºä¸å å¼å·çç©ºæ ¼ãææå¤å£³å½ä»¤ã" -#: ../libsvn_subr/cmdline.c:1129 +#: ../libsvn_subr/cmdline_editor.c:154 msgid "None of the environment variables SVN_EDITOR, VISUAL or EDITOR are set, and no 'editor-cmd' run-time configuration option was found" -msgstr "没æ设置 SVN_EDITORï¼VISUAL æ EDITOR ç¯å¢åéï¼è¿è¡æ¶çé ç½®åæ°ä¸ä¹æ²¡æ âeditor-cmdâ é项" +msgstr "没æ设置 SVN_EDITORï¼VISUAL æ EDITOR ç¯å¢åéï¼è¿è¡æ¶çé ç½®åæ°ä¸ä¹æ²¡æ 'editor-cmd' é项" -#: ../libsvn_subr/cmdline.c:1154 ../libsvn_subr/cmdline.c:1238 +#: ../libsvn_subr/cmdline_editor.c:275 ../libsvn_subr/cmdline_editor.c:378 #, c-format msgid "Can't get working directory" msgstr "æ æ³åå¾å·¥ä½ç®å½" -#: ../libsvn_subr/cmdline.c:1165 ../libsvn_subr/cmdline.c:1249 -#: ../libsvn_subr/cmdline.c:1274 +#: ../libsvn_subr/cmdline_editor.c:286 ../libsvn_subr/cmdline_editor.c:389 +#: ../libsvn_subr/cmdline_editor.c:414 #, c-format msgid "Can't change working directory to '%s'" -msgstr "æ æ³æ¹åå·¥ä½ç®å½å°â%sâ" +msgstr "æ æ³æ¹åå·¥ä½ç®å½å°'%s'" -#: ../libsvn_subr/cmdline.c:1173 ../libsvn_subr/cmdline.c:1421 +#: ../libsvn_subr/cmdline_editor.c:304 ../libsvn_subr/cmdline_editor.c:558 #, c-format msgid "Can't restore working directory" msgstr "æ æ³è¿åå·¥ä½ç®å½" -#: ../libsvn_subr/cmdline.c:1180 ../libsvn_subr/cmdline.c:1356 +#: ../libsvn_subr/cmdline_editor.c:315 ../libsvn_subr/cmdline_editor.c:499 #, c-format msgid "system('%s') returned %d" msgstr "system('%s') è¿å %d" -#: ../libsvn_subr/cmdline.c:1301 -#, c-format -msgid "Can't write to '%s'" -msgstr "æ æ³åå ¥â%sâ" - -#: ../libsvn_subr/cmdline.c:1316 ../libsvn_subr/cmdline.c:1331 -#: ../libsvn_subr/cmdline.c:1365 ../libsvn_subr/io.c:3978 -#, c-format -msgid "Can't stat '%s'" -msgstr "ä¸è½åå¾â%sâçç¶æ" - -#: ../libsvn_subr/cmdline.c:1390 +#: ../libsvn_subr/cmdline_editor.c:531 msgid "Error normalizing edited contents to internal format" msgstr "å°ç¼è¾å 容è§æ ¼å为å é¨æ ¼å¼åºé" -#: ../libsvn_subr/compress.c:143 +#: ../libsvn_subr/compress_lz4.c:92 +msgid "Decompression of compressed data failed: no size" +msgstr "å缩æ°æ®è§£å缩失败: æ 大å°" + +#: ../libsvn_subr/compress_lz4.c:96 +msgid "Decompression of compressed data failed: size too large" +msgstr "å缩æ°æ®è§£å缩失败: 大å°è¿å¤§" + +#: ../libsvn_subr/compress_lz4.c:120 ../libsvn_subr/compress_zlib.c:173 +msgid "Size of uncompressed data does not match stored original length" +msgstr "解ååçæ°æ®é¿åº¦ä¸åå§é¿åº¦ä¸ç¸ç" + +#: ../libsvn_subr/compress_zlib.c:102 msgid "Compression of svndiff data failed" msgstr "å缩 svndiff æ°æ®å¤±è´¥" -#: ../libsvn_subr/compress.c:179 -#, fuzzy +#: ../libsvn_subr/compress_zlib.c:138 msgid "Decompression of zlib compressed data failed: no size" -msgstr "解å svndiff æ°æ®å¤±è´¥: 没æé¿åº¦" +msgstr "zlib å缩æ°æ®è§£å缩失败: æ 大å°" -#: ../libsvn_subr/compress.c:182 -#, fuzzy +#: ../libsvn_subr/compress_zlib.c:141 msgid "Decompression of zlib compressed data failed: size too large" -msgstr "解å svndiff æ°æ®å¤±è´¥: é¿åº¦å¤ªå¤§" +msgstr "zlib å缩æ°æ®è§£å缩失败: 大å°è¿å¤§" -#: ../libsvn_subr/compress.c:207 +#: ../libsvn_subr/compress_zlib.c:166 msgid "Decompression of svndiff data failed" msgstr "解å svndiff æ°æ®å¤±è´¥" -#: ../libsvn_subr/compress.c:214 -msgid "Size of uncompressed data does not match stored original length" -msgstr "解ååçæ°æ®é¿åº¦ä¸åå§é¿åº¦ä¸ç¸ç" - -#: ../libsvn_subr/compress.c:230 -#, fuzzy, c-format +#: ../libsvn_subr/compress_zlib.c:189 +#, c-format msgid "Unsupported compression method %d" -msgstr "ä¸æ¯ææ¥å深度â%sâ" +msgstr "ä¸æ¯æçå缩æ¹æ³ %d" -#: ../libsvn_subr/config.c:804 +#: ../libsvn_subr/config.c:883 #, c-format msgid "Config error: invalid boolean value '%s' for '[%s] %s'" -msgstr "é ç½®é误: æ æå¸å°å¼ â%sâï¼å¯¹äº â[%s] %sâ" +msgstr "é ç½®é误: æ æå¸å°å¼ '%s'ï¼å¯¹äº '[%s] %s'" -#: ../libsvn_subr/config.c:809 +#: ../libsvn_subr/config.c:888 #, c-format msgid "Config error: invalid boolean value '%s' for '%s'" -msgstr "é ç½®é误: æ æå¸å°å¼ â%sâï¼å¯¹äº â%sâ" +msgstr "é ç½®é误: æ æå¸å°å¼ '%s'ï¼å¯¹äº '%s'" -#: ../libsvn_subr/config.c:1238 +#: ../libsvn_subr/config.c:1306 #, c-format msgid "Config error: invalid integer value '%s'" -msgstr "é ç½®é误: æ ææ´æ°å¼â%sâ" +msgstr "é ç½®é误: æ ææ´æ°å¼'%s'" #: ../libsvn_subr/config_auth.c:96 msgid "Unable to open auth file for reading" @@ -6274,7 +8980,7 @@ msgstr "ä¸è½æå¼è®¤è¯æ件读åæ #: ../libsvn_subr/config_auth.c:101 #, c-format msgid "Error parsing '%s'" -msgstr "解æâ%sâæ¶åºé" +msgstr "解æ'%s'æ¶åºé" #: ../libsvn_subr/config_auth.c:130 msgid "Unable to locate auth file" @@ -6287,97 +8993,86 @@ msgstr "æ æ³æå¼è®¤è¯æ件åå ¥æ #: ../libsvn_subr/config_auth.c:144 #, c-format msgid "Error writing hash to '%s'" -msgstr "ååå¸æ°æ®è³â%sâæ¶åºé" +msgstr "ååå¸æ°æ®è³'%s'æ¶åºé" -#: ../libsvn_subr/config_file.c:344 +#: ../libsvn_subr/config_file.c:524 #, c-format msgid "line %d: Option must end with ':' or '='" -msgstr "" +msgstr "第 %d è¡: éé¡¹å¿ é¡»ä»¥ ':' æ '=' ç»å°¾" -#: ../libsvn_subr/config_file.c:387 +#: ../libsvn_subr/config_file.c:576 #, c-format msgid "line %d: Section header must end with ']'" -msgstr "" +msgstr "第 %d è¡: èæ é¢å¿ 须以 ']' ç»å°¾" -#: ../libsvn_subr/config_file.c:554 -#, fuzzy, c-format +#: ../libsvn_subr/config_file.c:748 +#, c-format msgid "Error while parsing config file: %s:" -msgstr "éæ¼æ交æä½é误" +msgstr "解æé ç½®æ件æ¶åºé: %s:" -#: ../libsvn_subr/config_file.c:596 +#: ../libsvn_subr/config_file.c:795 #, c-format msgid "line %d: Section header must start in the first column" -msgstr "" +msgstr "第 %d è¡: èæ é¢å¿ é¡»ä»ç¬¬ä¸åå¼å§" -#: ../libsvn_subr/config_file.c:609 +#: ../libsvn_subr/config_file.c:821 #, c-format msgid "line %d: Comment must start in the first column" -msgstr "" +msgstr "第 %d è¡: 注éå¿ é¡»ä»ç¬¬ä¸åå¼å§" -#: ../libsvn_subr/config_file.c:624 -#, fuzzy, c-format +#: ../libsvn_subr/config_file.c:836 +#, c-format msgid "line %d: Section header expected" -msgstr "è¡æå¤ç»æ" +msgstr "第 %d è¡: ææèæ é¢" -#: ../libsvn_subr/config_file.c:628 -#, fuzzy, c-format +#: ../libsvn_subr/config_file.c:840 +#, c-format msgid "line %d: Option expected" -msgstr "è¡æå¤ç»æ" +msgstr "第 %d è¡: ææé项" #: ../libsvn_subr/config_win.c:93 -#, fuzzy msgid "Can't determine the system config path" -msgstr "ä¸è½ç¡®å®æ¬å°è·¯å¾ç¼ç " +msgstr "æ æ³ç¡®å®ç³»ç»é 置路å¾" #: ../libsvn_subr/config_win.c:94 -#, fuzzy msgid "Can't determine the user's config path" -msgstr "ä¸è½ç¡®å®æ¬å°è·¯å¾ç¼ç " +msgstr "æ æ³ç¡®å®ç¨æ·é 置路å¾" #: ../libsvn_subr/config_win.c:137 -#, fuzzy msgid "Can't enumerate registry values" -msgstr "æ æ³å建ç®å½ â%sâ" +msgstr "æ æ³æ举注å表å¼" #: ../libsvn_subr/config_win.c:154 -#, fuzzy msgid "Can't read registry value data" -msgstr "æ æ³è¯»åæµ" +msgstr "æ æ³è¯»å注å表å¼æ°æ®" #: ../libsvn_subr/config_win.c:191 -#, fuzzy, c-format +#, c-format msgid "Unrecognised registry path '%s'" -msgstr "â%sâ ç请æ±çæ¬ç±»åæ æ³è¯å«" +msgstr "æ æ³è¯å«ç注åè¡¨è·¯å¾ '%s'" -#: ../libsvn_subr/config_win.c:203 -#, fuzzy, c-format +#: ../libsvn_subr/config_win.c:207 ../libsvn_subr/config_win.c:212 +#, c-format msgid "Can't open registry key '%s'" -msgstr "æ æ³æå¼ç®å½â%sâ" - -#: ../libsvn_subr/config_win.c:207 -#, fuzzy, c-format -msgid "Can't find registry key '%s'" -msgstr "æ æ³éèç®å½ â%sâ" +msgstr "æ æ³æå¼æ³¨åè¡¨é® '%s'" -#: ../libsvn_subr/config_win.c:245 -#, fuzzy +#: ../libsvn_subr/config_win.c:250 msgid "Can't enumerate registry keys" -msgstr "æ æ³å建ç®å½ â%sâ" +msgstr "æ æ³æ举注å表é®" -#: ../libsvn_subr/config_win.c:255 -#, fuzzy +#: ../libsvn_subr/config_win.c:260 msgid "Can't open existing subkey" -msgstr "æ æ³æå¼æ åè¾å ¥" +msgstr "æ æ³æå¼ç°æåé®" #: ../libsvn_subr/crypto.c:93 #, c-format msgid "Failed to initialize cryptography subsystem" -msgstr "" +msgstr "åå§åå å¯åç³»ç»å¤±è´¥" #: ../libsvn_subr/crypto.c:108 #, c-format msgid "code (%d), reason (\"%s\"), msg (\"%s\")" -msgstr "代ç (%d), åå (\"%s\"), æ¶æ¯ (\"%s\")" +msgstr "代ç (%d)ï¼åå (\"%s\")ï¼æ¶æ¯ (\"%s\")" #: ../libsvn_subr/crypto.c:134 #, c-format @@ -6461,7 +9156,8 @@ msgstr "æ æ³è®¡ç®è¢«è¯·æ±çæ¥æ" msgid "Can't expand time" msgstr "æ æ³æç¡®æ¶é´" -#: ../libsvn_subr/deprecated.c:364 ../libsvn_subr/opt.c:302 +#: ../libsvn_subr/deprecated.c:365 ../libsvn_subr/deprecated.c:605 +#: ../libsvn_subr/opt_subcommand.c:265 msgid "" "\n" "Valid options:\n" @@ -6469,341 +9165,421 @@ msgstr "" "\n" "ææé项: \n" -#: ../libsvn_subr/deprecated.c:440 ../libsvn_subr/opt.c:417 +#: ../libsvn_subr/deprecated.c:545 ../libsvn_subr/opt_subcommand.c:165 +msgid " ARG" +msgstr " ARG" + +#: ../libsvn_subr/deprecated.c:627 ../libsvn_subr/opt_subcommand.c:298 +msgid "" +"\n" +"Global options:\n" +msgstr "" +"\n" +"å ¨å±é项: \n" + +#: ../libsvn_subr/deprecated.c:769 ../libsvn_subr/deprecated.c:803 +#: ../libsvn_subr/opt_subcommand.c:435 #, c-format msgid "" "\"%s\": unknown command.\n" "\n" msgstr "" -"â%sâ: æªç¥å½ä»¤ã\n" +"'%s': æªç¥å½ä»¤ã\n" "\n" -#: ../libsvn_subr/deprecated.c:618 ../libsvn_subr/opt.c:1232 -#: ../svnrdump/svnrdump.c:687 +#: ../libsvn_subr/deprecated.c:945 ../libsvn_subr/deprecated.c:1045 +#: ../libsvn_subr/opt_subcommand.c:588 ../svnrdump/svnrdump.c:607 #, c-format msgid "Type '%s help' for usage.\n" -msgstr "使ç¨â%s helpâå¾å°ç¨æ³ã\n" +msgstr "使ç¨'%s help'å¾å°ç¨æ³ã\n" -#: ../libsvn_subr/deprecated.c:1026 +#: ../libsvn_subr/deprecated.c:1473 #, c-format msgid "'%s' is neither a file nor a directory name" -msgstr "â%sâä¸æ¯æ件åä¹ä¸æ¯ç®å½å" +msgstr "'%s'ä¸æ¯æ件åä¹ä¸æ¯ç®å½å" + +#: ../libsvn_subr/dirent_uri.c:315 +msgid "An empty URI can not be canonicalized" +msgstr "空 URI æ æ³è§èå" -#: ../libsvn_subr/dirent_uri.c:1628 +#: ../libsvn_subr/dirent_uri.c:332 +msgid "A URI can not start with '/'" +msgstr "URI ä¸è½ä»¥ '/' å¼å¤´" + +#: ../libsvn_subr/dirent_uri.c:1667 #, c-format msgid "Couldn't determine absolute path of '%s'" -msgstr "ä¸è½ç¡®å®â%sâçç»å¯¹è·¯å¾" +msgstr "ä¸è½ç¡®å®'%s'çç»å¯¹è·¯å¾" + +#: ../libsvn_subr/dirent_uri.c:1705 +#, c-format +msgid "Could not canonicalize URI '%s' (the result '%s' is not canonical)" +msgstr "æ æ³è§èå URI '%s' (ç»æ '%s' ä¸æ¯è§èç)" + +#: ../libsvn_subr/dirent_uri.c:1742 +#, c-format +msgid "Could not canonicalize relpath '%s' (the result '%s' is not canonical)" +msgstr "æ æ³è§èåç¸å¯¹è·¯å¾ '%s' (ç»æ '%s' ä¸æ¯è§èç)" + +#: ../libsvn_subr/dirent_uri.c:1810 +#, c-format +msgid "Could not canonicalize dirent '%s' (the result '%s' is not canonical)" +msgstr "æ æ³è§èåç®å½è·¯å¾ '%s' (ç»æ '%s' ä¸æ¯è§èç)" -#: ../libsvn_subr/dirent_uri.c:2342 +#: ../libsvn_subr/dirent_uri.c:2485 #, c-format msgid "Local URL '%s' does not contain 'file://' prefix" -msgstr "æ¬å°URLâ%sâ没æâfile://âåç¼" +msgstr "æ¬å°URL'%s'没æ'file://'åç¼" -#: ../libsvn_subr/dirent_uri.c:2421 +#: ../libsvn_subr/dirent_uri.c:2569 #, c-format msgid "Local URL '%s' contains only a hostname, no path" -msgstr "æ¬å°URLâ%sâåªæ主æºå称ï¼æ²¡æè·¯å¾" +msgstr "æ¬å°URL'%s'åªæ主æºå称ï¼æ²¡æè·¯å¾" -#: ../libsvn_subr/dirent_uri.c:2435 +#: ../libsvn_subr/dirent_uri.c:2583 #, c-format msgid "Local URL '%s' contains unsupported hostname" -msgstr "æ¬å°URLâ%sâå å«ä¸æ¯æç主æºå称" +msgstr "æ¬å°URL'%s'å å«ä¸æ¯æç主æºå称" -#: ../libsvn_subr/error.c:530 +#: ../libsvn_subr/error.c:636 msgid "Can't recode error string from APR" msgstr "æ æ³éæ°ç¼ç APR çé误信æ¯" -#: ../libsvn_subr/error.c:627 +#: ../libsvn_subr/error.c:729 #, c-format msgid "%swarning: W%06d: %s\n" msgstr "%s è¦å: W%06d: %s\n" -#: ../libsvn_subr/error.c:733 +#: ../libsvn_subr/error.c:835 #, c-format msgid "In file '%s' line %d: assertion failed (%s)" -msgstr "æ件 â%sâï¼è¡ %dï¼æè¨å¤±è´¥(%s)" +msgstr "æ件 '%s'ï¼è¡ %d: æè¨å¤±è´¥(%s)" -#: ../libsvn_subr/error.c:737 +#: ../libsvn_subr/error.c:839 #, c-format msgid "In file '%s' line %d: internal malfunction" -msgstr "æ件 â%sâ è¡ %dï¼å é¨æ é" +msgstr "æ件 '%s' è¡ %d: å é¨æ é" -#: ../libsvn_subr/error.c:799 +#: ../libsvn_subr/error.c:901 msgid "stream error" msgstr "æµåå ¥é误" -#: ../libsvn_subr/error.c:804 +#: ../libsvn_subr/error.c:906 msgid "out of memory" msgstr "å åä¸è¶³" -#: ../libsvn_subr/error.c:809 +#: ../libsvn_subr/error.c:911 msgid "buffer error" msgstr "ç¼å²åºåå ¥é误" -#: ../libsvn_subr/error.c:814 +#: ../libsvn_subr/error.c:916 msgid "version error" msgstr "çæ¬é误" -#: ../libsvn_subr/error.c:819 +#: ../libsvn_subr/error.c:921 msgid "corrupt data" msgstr "æåçæ°æ®" -#: ../libsvn_subr/error.c:824 +#: ../libsvn_subr/error.c:926 msgid "unknown error" msgstr "æªç¥é误" -#: ../libsvn_subr/gpg_agent.c:409 ../libsvn_subr/prompt.c:627 +#: ../libsvn_subr/gpg_agent.c:505 ../libsvn_subr/prompt.c:627 #, c-format msgid "Password for '%s': " -msgstr "â%sâçå¯ç : " +msgstr "'%s'çå¯ç : " -#: ../libsvn_subr/gpg_agent.c:410 +#: ../libsvn_subr/gpg_agent.c:506 #, c-format msgid "Enter your Subversion password for %s" msgstr "为 %s è¾å ¥ä½ ç Subversion å¯ç " -#: ../libsvn_subr/hash.c:126 +#: ../libsvn_subr/hash.c:129 msgid "Serialized hash missing terminator" msgstr "åºåååå¸å¼æ²¡æç»ç»ç¬¦" -#: ../libsvn_subr/hash.c:135 ../libsvn_subr/hash.c:148 -#: ../libsvn_subr/hash.c:160 ../libsvn_subr/hash.c:172 -#: ../libsvn_subr/hash.c:176 ../libsvn_subr/hash.c:186 -#: ../libsvn_subr/hash.c:199 ../libsvn_subr/hash.c:208 +#: ../libsvn_subr/hash.c:138 ../libsvn_subr/hash.c:189 +msgid "Serialized hash malformed key length" +msgstr "åºåååå¸çé®é¿åº¦æ ¼å¼é误" + +#: ../libsvn_subr/hash.c:151 ../libsvn_subr/hash.c:202 +msgid "Serialized hash malformed key data" +msgstr "åºåååå¸çé®æ°æ®æ ¼å¼é误" + +#: ../libsvn_subr/hash.c:163 +msgid "Serialized hash malformed value length" +msgstr "åºåååå¸çå¼é¿åº¦æ ¼å¼é误" + +#: ../libsvn_subr/hash.c:175 +msgid "Serialized hash malformed value data" +msgstr "åºåååå¸çå¼æ°æ®æ ¼å¼é误" + +#: ../libsvn_subr/hash.c:179 ../libsvn_subr/hash.c:211 msgid "Serialized hash malformed" msgstr "ç¸å½¢çåºåååå¸å¼" -#: ../libsvn_subr/hash.c:282 +#: ../libsvn_subr/hash.c:285 msgid "Cannot serialize negative length" -msgstr "" +msgstr "æ æ³åºååè´é¿åº¦" -#: ../libsvn_subr/io.c:331 +#: ../libsvn_subr/io.c:379 #, c-format msgid "Can't check path '%s'" -msgstr "æ æ³æ£æ¥è·¯å¾ â%sâ" +msgstr "æ æ³æ£æ¥è·¯å¾ '%s'" -#: ../libsvn_subr/io.c:559 ../libsvn_subr/io.c:4930 +#: ../libsvn_subr/io.c:655 ../libsvn_subr/io.c:5564 #, c-format msgid "Can't open '%s'" -msgstr "ä¸è½æå¼ â%sâ" +msgstr "ä¸è½æå¼ '%s'" -#: ../libsvn_subr/io.c:585 ../libsvn_subr/io.c:671 +#: ../libsvn_subr/io.c:681 ../libsvn_subr/io.c:767 #, c-format msgid "Unable to make name for '%s'" -msgstr "ä¸è½ä¸º â%sâ 产çåå" +msgstr "ä¸è½ä¸º '%s' 产çåå" -#: ../libsvn_subr/io.c:658 +#: ../libsvn_subr/io.c:754 #, c-format msgid "Can't create symbolic link '%s'" -msgstr "æ æ³å建符å·è¿æ¥ â%sâ" +msgstr "æ æ³å建符å·è¿æ¥ '%s'" -#: ../libsvn_subr/io.c:675 ../libsvn_subr/io.c:710 ../libsvn_subr/io.c:738 -#: ../libsvn_subr/io.c:1915 +#: ../libsvn_subr/io.c:771 ../libsvn_subr/io.c:806 ../libsvn_subr/io.c:834 +#: ../libsvn_subr/io.c:2078 msgid "Symbolic links are not supported on this platform" msgstr "æ¤å¹³å°ä¸æ¯æ符å·é¾æ¥" -#: ../libsvn_subr/io.c:698 ../libsvn_subr/io.c:1874 ../libsvn_subr/io.c:1894 +#: ../libsvn_subr/io.c:794 ../libsvn_subr/io.c:2037 ../libsvn_subr/io.c:2057 #, c-format msgid "Can't read contents of link" msgstr "ä¸è½è¯»åé¾æ¥çå 容" -#: ../libsvn_subr/io.c:758 +#: ../libsvn_subr/io.c:854 #, c-format msgid "Can't find a temporary directory" msgstr "æ æ³æ¾å°ä¸´æ¶ç®å½" -#: ../libsvn_subr/io.c:876 +#: ../libsvn_subr/io.c:972 #, c-format msgid "Can't copy '%s' to '%s'" -msgstr "ä¸è½å¤å¶ â%sâ å° â%sâ" +msgstr "ä¸è½å¤å¶ '%s' å° '%s'" -#: ../libsvn_subr/io.c:919 ../libsvn_subr/io.c:941 ../libsvn_subr/io.c:987 -#: ../libsvn_subr/io.c:5063 +#: ../libsvn_subr/io.c:1015 ../libsvn_subr/io.c:1037 ../libsvn_subr/io.c:1083 +#: ../libsvn_subr/io.c:5697 #, c-format msgid "Can't set permissions on '%s'" -msgstr "ä¸è½å¨ â%sâ 设置æé" +msgstr "ä¸è½å¨ '%s' 设置æé" -#: ../libsvn_subr/io.c:937 ../libsvn_subr/io.c:2138 ../libsvn_subr/io.c:2197 -#: ../libsvn_subr/io.c:4968 +#: ../libsvn_subr/io.c:1033 ../libsvn_subr/io.c:2651 ../libsvn_subr/io.c:2711 +#: ../libsvn_subr/io.c:2799 ../libsvn_subr/io.c:5602 #, c-format msgid "Can't get file name" msgstr "æ æ³è·åæ件å" -#: ../libsvn_subr/io.c:1011 +#: ../libsvn_subr/io.c:1106 #, c-format msgid "Can't append '%s' to '%s'" -msgstr "ä¸è½éå â%sâ å° â%sâ" +msgstr "ä¸è½éå '%s' å° '%s'" -#: ../libsvn_subr/io.c:1057 +#: ../libsvn_subr/io.c:1152 #, c-format msgid "Destination '%s' already exists" -msgstr "ç®ç â%sâ å·²åå¨" +msgstr "ç®ç '%s' å·²åå¨" -#: ../libsvn_subr/io.c:1166 +#: ../libsvn_subr/io.c:1261 #, c-format msgid "Can't make directory '%s'" -msgstr "æ æ³å建ç®å½ â%sâ" +msgstr "æ æ³å建ç®å½ '%s'" -#: ../libsvn_subr/io.c:1269 +#: ../libsvn_subr/io.c:1365 #, c-format msgid "Can't set access time of '%s'" -msgstr "ä¸è½è®¾ç½® â%sâ çååæ¶é´" +msgstr "ä¸è½è®¾ç½® '%s' çååæ¶é´" -#: ../libsvn_subr/io.c:1598 ../libsvn_subr/io.c:1700 +#: ../libsvn_subr/io.c:1706 ../libsvn_subr/io.c:1815 #, c-format msgid "Can't change perms of file '%s'" -msgstr "ä¸è½æ¹åæ件 â%sâ çæé" +msgstr "ä¸è½æ¹åæ件 '%s' çæé" -#: ../libsvn_subr/io.c:1828 -#, fuzzy, c-format +#: ../libsvn_subr/io.c:1710 ../libsvn_subr/io.c:1821 +#, c-format +msgid "Can't change perms of directory '%s'" +msgstr "æ æ³æ´æ¹ç®å½ '%s' çæé" + +#: ../libsvn_subr/io.c:1981 +#, c-format msgid "Can't get attributes of file '%s'" -msgstr "æ æ³ä»æ件â%sâè·åå±æ§ä¿¡æ¯" +msgstr "æ æ³è·åæ件 '%s' çå±æ§" -#: ../libsvn_subr/io.c:1836 -#, fuzzy, c-format +#: ../libsvn_subr/io.c:1989 +#, c-format msgid "Can't set attributes of file '%s'" -msgstr "æ æ³ä»æ件â%sâè·åå±æ§ä¿¡æ¯" +msgstr "æ æ³è®¾ç½®æ件 '%s' çå±æ§" + +#: ../libsvn_subr/io.c:2167 ../libsvn_subr/io.c:2207 ../libsvn_subr/io.c:2217 +#: ../libsvn_subr/io.c:4523 +#, c-format +msgid "Can't stat '%s'" +msgstr "ä¸è½åå¾'%s'çç¶æ" + +#: ../libsvn_subr/io.c:2255 ../libsvn_subr/io.c:2998 +#, c-format +msgid "Can't remove file '%s'" +msgstr "ä¸è½ç§»å¨æ件'%s'" + +#: ../libsvn_subr/io.c:2325 ../libsvn_subr/io.c:4633 +#, c-format +msgid "Can't move '%s' to '%s'" +msgstr "ä¸è½ç§»å¨ '%s' å° '%s'" + +#: ../libsvn_subr/io.c:2359 +#, c-format +msgid "Can't get attributes of '%s'" +msgstr "æ æ³è·å '%s' çå±æ§" + +#: ../libsvn_subr/io.c:2403 +#, c-format +msgid "Can't set attributes of '%s'" +msgstr "æ æ³è®¾ç½® '%s' çå±æ§" -#: ../libsvn_subr/io.c:1957 +#: ../libsvn_subr/io.c:2448 #, c-format msgid "Can't set file '%s' read-only" -msgstr "æ æ³è®¾ç½®æ件 â%sâ åªè¯»" +msgstr "æ æ³è®¾ç½®æ件 '%s' åªè¯»" -#: ../libsvn_subr/io.c:1989 +#: ../libsvn_subr/io.c:2452 #, c-format msgid "Can't set file '%s' read-write" -msgstr "æ æ³è®¾ç½®æ件 â%sâ å¯è¯»å" +msgstr "æ æ³è®¾ç½®æ件 '%s' å¯è¯»å" + +#: ../libsvn_subr/io.c:2459 +#, c-format +msgid "Can't set directory '%s' read-only" +msgstr "æ æ³å°ç®å½ '%s' 设为åªè¯»" + +#: ../libsvn_subr/io.c:2463 +#, c-format +msgid "Can't set directory '%s' read-write" +msgstr "æ æ³å°ç®å½ '%s' 设为å¯è¯»å" -#: ../libsvn_subr/io.c:2028 ../libsvn_subr/io.c:2062 +#: ../libsvn_subr/io.c:2543 ../libsvn_subr/io.c:2577 #, c-format msgid "Error getting UID of process" msgstr "è·åè¿ç¨ç¨æ· ID(UID) æ¶åºé" -#: ../libsvn_subr/io.c:2164 +#: ../libsvn_subr/io.c:2677 #, c-format msgid "Can't get shared lock on file '%s'" -msgstr "ä¸è½è·åæ件 â%sâ çå ±äº«é" +msgstr "ä¸è½è·åæ件 '%s' çå ±äº«é" -#: ../libsvn_subr/io.c:2202 +#: ../libsvn_subr/io.c:2716 #, c-format msgid "Can't unlock file '%s'" -msgstr "æ æ³è§£éæ件â%sâ" +msgstr "æ æ³è§£éæ件'%s'" -#: ../libsvn_subr/io.c:2300 ../libsvn_subr/io.c:2321 +#: ../libsvn_subr/io.c:2813 #, c-format -msgid "Can't flush file to disk" -msgstr "ä¸è½å·æ°æ件å°ç£ç" +msgid "Can't flush file '%s' to disk" +msgstr "æ æ³å°æ件 '%s' å·æ°å°ç£ç" -#: ../libsvn_subr/io.c:2411 ../libsvn_subr/prompt.c:197 +#: ../libsvn_subr/io.c:2912 ../libsvn_subr/prompt.c:197 #, c-format msgid "Can't open stdin" msgstr "æ æ³æå¼æ åè¾å ¥" -#: ../libsvn_subr/io.c:2431 +#: ../libsvn_subr/io.c:2932 msgid "Reading from stdin is disallowed" msgstr "ä¸æ¥åä»æ åè¾å ¥è®¾å¤è¯»å" -#: ../libsvn_subr/io.c:2498 -#, c-format -msgid "Can't remove file '%s'" -msgstr "ä¸è½ç§»å¨æ件â%sâ" - -#: ../libsvn_subr/io.c:2585 +#: ../libsvn_subr/io.c:3091 #, c-format msgid "Can't remove '%s'" -msgstr "æ æ³å é¤â%sâ" +msgstr "æ æ³å é¤'%s'" -#: ../libsvn_subr/io.c:2748 -#, fuzzy, c-format +#: ../libsvn_subr/io.c:3254 +#, c-format msgid "Path '%s' not found, case obstructed by '%s'" -msgstr "è·¯å¾ â%sâ ä¸å¨çæ¬ %ld ä¸" +msgstr "è·¯å¾ '%s' æªæ¾å°ï¼è¢« '%s' 大å°åé»å¡" -#: ../libsvn_subr/io.c:2787 -#, fuzzy, c-format -msgid "Path '%s' not found" -msgstr "æ¾ä¸å° â%sâ" - -#: ../libsvn_subr/io.c:2861 +#: ../libsvn_subr/io.c:3367 #, c-format msgid "Can't create process '%s' attributes" -msgstr "æ æ³å建è¿ç¨â%sâçå±æ§" +msgstr "æ æ³å建è¿ç¨'%s'çå±æ§" -#: ../libsvn_subr/io.c:2868 +#: ../libsvn_subr/io.c:3374 #, c-format msgid "Can't set process '%s' cmdtype" -msgstr "æ æ³è®¾ç½®è¿ç¨â%sâçå½ä»¤ç±»å" +msgstr "æ æ³è®¾ç½®è¿ç¨'%s'çå½ä»¤ç±»å" -#: ../libsvn_subr/io.c:2884 +#: ../libsvn_subr/io.c:3390 #, c-format msgid "Can't set process '%s' directory" -msgstr "æ æ³è®¾å®è¿ç¨â%sâçç®å½" +msgstr "æ æ³è®¾å®è¿ç¨'%s'çç®å½" -#: ../libsvn_subr/io.c:2898 +#: ../libsvn_subr/io.c:3404 #, c-format msgid "Can't set process '%s' child input" -msgstr "æ æ³è®¾ç½®â%sâçåè¿ç¨è¾å ¥æ件" +msgstr "æ æ³è®¾ç½®'%s'çåè¿ç¨è¾å ¥æ件" -#: ../libsvn_subr/io.c:2906 +#: ../libsvn_subr/io.c:3412 #, c-format msgid "Can't set process '%s' child outfile" -msgstr "æ æ³è®¾ç½®â%sâçåè¿ç¨è¾åºæ件" +msgstr "æ æ³è®¾ç½®'%s'çåè¿ç¨è¾åºæ件" -#: ../libsvn_subr/io.c:2914 +#: ../libsvn_subr/io.c:3420 #, c-format msgid "Can't set process '%s' child errfile" -msgstr "æ æ³è®¾ç½®â%sâçåè¿ç¨é误è¾åºæ件" +msgstr "æ æ³è®¾ç½®'%s'çåè¿ç¨é误è¾åºæ件" -#: ../libsvn_subr/io.c:2928 +#: ../libsvn_subr/io.c:3434 #, c-format msgid "Can't set process '%s' stdio pipes" -msgstr "æ æ³è®¾ç½®è¿ç¨â%sâçæ å IO 管é" +msgstr "æ æ³è®¾ç½®è¿ç¨'%s'çæ å IO 管é" -#: ../libsvn_subr/io.c:2936 +#: ../libsvn_subr/io.c:3442 #, c-format msgid "Can't set process '%s' child errfile for error handler" -msgstr "æ æ³ä¸ºé误å¤çå½æ°è®¾ç½®â%sâçåè¿ç¨é误è¾åºæ件" +msgstr "æ æ³ä¸ºé误å¤çå½æ°è®¾ç½®'%s'çåè¿ç¨é误è¾åºæ件" -#: ../libsvn_subr/io.c:2943 +#: ../libsvn_subr/io.c:3449 #, c-format msgid "Can't set process '%s' error handler" -msgstr "æ æ³è®¾ç½®è¿ç¨â%sâçé误å¤çå½æ°" +msgstr "æ æ³è®¾ç½®è¿ç¨'%s'çé误å¤çå½æ°" -#: ../libsvn_subr/io.c:2966 +#: ../libsvn_subr/io.c:3472 #, c-format msgid "Can't start process '%s'" -msgstr "ä¸è½åå¾è¿ç¨â%sâç¶æ" +msgstr "ä¸è½åå¾è¿ç¨'%s'ç¶æ" -#: ../libsvn_subr/io.c:2990 +#: ../libsvn_subr/io.c:3496 #, c-format msgid "Error waiting for process '%s'" -msgstr "çå¾ è¿ç¨â%sâåºé" +msgstr "çå¾ è¿ç¨'%s'åºé" -#: ../libsvn_subr/io.c:2999 -#, fuzzy, c-format +#: ../libsvn_subr/io.c:3505 +#, c-format msgid "Process '%s' failed (signal %d, core dumped)" -msgstr "è¿ç¨â%sâ失败(è¿å %d)" +msgstr "è¿ç¨ '%s' 失败 (ä¿¡å· %dï¼æ ¸å¿å·²è½¬å¨)" -#: ../libsvn_subr/io.c:3004 -#, fuzzy, c-format +#: ../libsvn_subr/io.c:3510 +#, c-format msgid "Process '%s' failed (signal %d)" -msgstr "è¿ç¨â%sâ失败(è¿å %d)" +msgstr "è¿ç¨ '%s' 失败 (ä¿¡å· %d)" -#: ../libsvn_subr/io.c:3010 -#, fuzzy, c-format +#: ../libsvn_subr/io.c:3516 +#, c-format msgid "Process '%s' failed (exitwhy %d, exitcode %d)" -msgstr "è¿ç¨â%sâ失败(è¿å %d)" +msgstr "è¿ç¨ '%s' 失败 (exitwhy %dï¼exitcode %d)" -#: ../libsvn_subr/io.c:3018 +#: ../libsvn_subr/io.c:3524 #, c-format msgid "Process '%s' returned error exitcode %d" -msgstr "è¿ç¨â%sâè¿åé误éåºç %d" +msgstr "è¿ç¨'%s'è¿åé误éåºç %d" -#: ../libsvn_subr/io.c:3125 +#: ../libsvn_subr/io.c:3631 #, c-format msgid "'%s' returned %d" -msgstr "â%sâ è¿å %d" +msgstr "'%s' è¿å %d" -#: ../libsvn_subr/io.c:3246 +#: ../libsvn_subr/io.c:3752 #, c-format msgid "" "Error running '%s': exitcode was %d, args were:\n" @@ -6812,260 +9588,269 @@ msgid "" "%s\n" "%s" msgstr "" -"è¿è¡â%sâåºé: éåºç æ¯ %dï¼åæ°æ¯: \n" -"å¨ç®å½â%sâï¼åºæ¬åå: \n" +"è¿è¡'%s'åºé: éåºç æ¯ %dï¼åæ°æ¯: \n" +"å¨ç®å½'%s'ï¼åºæ¬åå: \n" "%s\n" "%s\n" "%s" -#: ../libsvn_subr/io.c:3387 +#: ../libsvn_subr/io.c:3893 #, c-format msgid "Can't detect MIME type of non-file '%s'" -msgstr "ä¸è½æ£æµéæ件çâ%sâä¹MIMEç±»å" +msgstr "ä¸è½æ£æµéæ件ç'%s'ä¹MIMEç±»å" -#: ../libsvn_subr/io.c:3482 +#: ../libsvn_subr/io.c:3988 #, c-format msgid "Can't open file '%s'" -msgstr "ä¸è½æå¼æ件â%sâ" +msgstr "ä¸è½æå¼æ件'%s'" -#: ../libsvn_subr/io.c:3522 +#: ../libsvn_subr/io.c:4028 #, c-format msgid "Can't close file '%s'" -msgstr "æ æ³å ³éæ件â%sâ" +msgstr "æ æ³å ³éæ件'%s'" -#: ../libsvn_subr/io.c:3523 +#: ../libsvn_subr/io.c:4029 #, c-format msgid "Can't close stream" msgstr "æ æ³å ³éæµ" -#: ../libsvn_subr/io.c:3532 ../libsvn_subr/io.c:3568 ../libsvn_subr/io.c:3593 -#: ../libsvn_subr/io.c:3682 +#: ../libsvn_subr/io.c:4038 ../libsvn_subr/io.c:4100 ../libsvn_subr/io.c:4125 +#: ../libsvn_subr/io.c:4215 #, c-format msgid "Can't read file '%s'" -msgstr "ä¸è½è¯»åæ件â%sâ" +msgstr "ä¸è½è¯»åæ件'%s'" -#: ../libsvn_subr/io.c:3533 ../libsvn_subr/io.c:3569 ../libsvn_subr/io.c:3594 -#: ../libsvn_subr/io.c:3683 +#: ../libsvn_subr/io.c:4039 ../libsvn_subr/io.c:4101 ../libsvn_subr/io.c:4126 +#: ../libsvn_subr/io.c:4216 #, c-format msgid "Can't read stream" msgstr "æ æ³è¯»åæµ" -#: ../libsvn_subr/io.c:3542 +#: ../libsvn_subr/io.c:4048 #, c-format msgid "Can't write file '%s'" -msgstr "æ æ³åå ¥æ件â%sâ" +msgstr "æ æ³åå ¥æ件'%s'" -#: ../libsvn_subr/io.c:3543 +#: ../libsvn_subr/io.c:4049 #, c-format msgid "Can't write stream" msgstr "æ æ³åå ¥æµ" -#: ../libsvn_subr/io.c:3557 +#: ../libsvn_subr/io.c:4063 #, c-format msgid "Can't get attribute information from file '%s'" -msgstr "æ æ³ä»æ件â%sâè·åå±æ§ä¿¡æ¯" +msgstr "æ æ³ä»æ件'%s'è·åå±æ§ä¿¡æ¯" -#: ../libsvn_subr/io.c:3558 +#: ../libsvn_subr/io.c:4064 #, c-format msgid "Can't get attribute information from stream" msgstr "æ æ³ä»æµè·åå±æ§ä¿¡æ¯" -#: ../libsvn_subr/io.c:3605 +#: ../libsvn_subr/io.c:4137 #, c-format msgid "Can't set position pointer in file '%s'" -msgstr "æ æ³å¨æ件â%sâ设置å®ä½æé" +msgstr "æ æ³å¨æ件'%s'设置å®ä½æé" -#: ../libsvn_subr/io.c:3606 +#: ../libsvn_subr/io.c:4138 #, c-format msgid "Can't set position pointer in stream" msgstr "æ æ³å¨æµä¸è®¾ç½®å®ä½æé" -#: ../libsvn_subr/io.c:3692 -#, fuzzy, c-format +#: ../libsvn_subr/io.c:4225 +#, c-format msgid "Can't seek in file '%s'" -msgstr "ä¸è½æå¼æ件â%sâ" +msgstr "æ æ³å¨æ件 '%s' ä¸å®ä½" -#: ../libsvn_subr/io.c:3693 -#, fuzzy, c-format +#: ../libsvn_subr/io.c:4226 +#, c-format msgid "Can't seek in stream" -msgstr "æ æ³å ³éæµ" +msgstr "æ æ³å¨æµä¸å®ä½" -#: ../libsvn_subr/io.c:3710 ../libsvn_subr/io.c:3767 +#: ../libsvn_subr/io.c:4243 ../libsvn_subr/io.c:4299 #, c-format msgid "Can't write to file '%s'" -msgstr "æ æ³åå ¥æ件â%sâ" +msgstr "æ æ³åå ¥æ件'%s'" -#: ../libsvn_subr/io.c:3711 ../libsvn_subr/io.c:3768 +#: ../libsvn_subr/io.c:4244 ../libsvn_subr/io.c:4300 #, c-format msgid "Can't write to stream" msgstr "æ æ³åå ¥æµ" -#: ../libsvn_subr/io.c:3721 ../libsvn_subr/io.c:3873 +#: ../libsvn_subr/io.c:4254 ../libsvn_subr/io.c:4411 #, c-format msgid "Can't flush file '%s'" -msgstr "ä¸è½å·æ°æ件 â%sâ" +msgstr "ä¸è½å·æ°æ件 '%s'" -#: ../libsvn_subr/io.c:3722 ../libsvn_subr/io.c:3874 +#: ../libsvn_subr/io.c:4255 ../libsvn_subr/io.c:4412 #, c-format msgid "Can't flush stream" msgstr "ä¸è½å·æ°æµ" -#: ../libsvn_subr/io.c:3842 -#, fuzzy, c-format +#: ../libsvn_subr/io.c:4376 +#, c-format msgid "Can't write '%s' atomically" -msgstr "æ æ³åå ¥â%sâ" +msgstr "æ æ³åååå ¥ '%s'" -#: ../libsvn_subr/io.c:3878 +#: ../libsvn_subr/io.c:4416 #, c-format msgid "Can't truncate file '%s'" -msgstr "ä¸è½æªææ件 â%sâ" +msgstr "ä¸è½æªææ件 '%s'" -#: ../libsvn_subr/io.c:3879 +#: ../libsvn_subr/io.c:4417 #, c-format msgid "Can't truncate stream" msgstr "æ æ³æªææµ" -#: ../libsvn_subr/io.c:3952 +#: ../libsvn_subr/io.c:4497 #, c-format msgid "Can't read length line in file '%s'" -msgstr "ä¸è½ä»æ件 â%sâ ä¸è¯»åé¿è¡" +msgstr "ä¸è½ä»æ件 '%s' ä¸è¯»åé¿è¡" -#: ../libsvn_subr/io.c:3956 +#: ../libsvn_subr/io.c:4501 msgid "Can't read length line in stream" msgstr "æ æ³ä»æµä¸è¯»åé¿è¡" -#: ../libsvn_subr/io.c:4013 ../libsvn_subr/stream.c:2264 -#, c-format -msgid "Can't move '%s' to '%s'" -msgstr "ä¸è½ç§»å¨ â%sâ å° â%sâ" - -#: ../libsvn_subr/io.c:4100 +#: ../libsvn_subr/io.c:4727 #, c-format msgid "Can't create directory '%s'" -msgstr "æ æ³å建ç®å½ â%sâ" +msgstr "æ æ³å建ç®å½ '%s'" -#: ../libsvn_subr/io.c:4112 ../libsvn_subr/io.c:4126 +#: ../libsvn_subr/io.c:4739 ../libsvn_subr/io.c:4753 #, c-format msgid "Can't hide directory '%s'" -msgstr "æ æ³éèç®å½ â%sâ" +msgstr "æ æ³éèç®å½ '%s'" -#: ../libsvn_subr/io.c:4187 ../libsvn_subr/io.c:4310 +#: ../libsvn_subr/io.c:4814 ../libsvn_subr/io.c:4946 #, c-format msgid "Can't open directory '%s'" -msgstr "æ æ³æå¼ç®å½â%sâ" +msgstr "æ æ³æå¼ç®å½'%s'" -#: ../libsvn_subr/io.c:4222 +#: ../libsvn_subr/io.c:4858 #, c-format msgid "Can't remove directory '%s'" -msgstr "æ æ³å é¤ç®å½ â%sâ" +msgstr "æ æ³å é¤ç®å½ '%s'" -#: ../libsvn_subr/io.c:4240 +#: ../libsvn_subr/io.c:4876 #, c-format msgid "Can't read directory" msgstr "æ æ³è¯»åç®å½" -#: ../libsvn_subr/io.c:4260 +#: ../libsvn_subr/io.c:4896 #, c-format msgid "Error closing directory" msgstr "å ³éç®å½å¤±è´¥" -#: ../libsvn_subr/io.c:4329 +#: ../libsvn_subr/io.c:4965 #, c-format msgid "Can't read directory entry in '%s'" -msgstr "æ æ³å¨ â%sâ 读åç®å½å 容" +msgstr "æ æ³å¨ '%s' 读åç®å½å 容" -#: ../libsvn_subr/io.c:4455 +#: ../libsvn_subr/io.c:5091 #, c-format msgid "Can't check directory '%s'" -msgstr "æ æ³æ£æ¥ç®å½ â%sâ" +msgstr "æ æ³æ£æ¥ç®å½ '%s'" -#: ../libsvn_subr/io.c:4517 +#: ../libsvn_subr/io.c:5153 #, c-format msgid "Reading '%s'" -msgstr "æ£å¨è¯»å â%sâ" +msgstr "æ£å¨è¯»å '%s'" -#: ../libsvn_subr/io.c:4536 +#: ../libsvn_subr/io.c:5172 #, c-format msgid "First line of '%s' contains non-digit" -msgstr "â%sâ ç第ä¸è¡å å«äºéæ°å" +msgstr "'%s' ç第ä¸è¡å å«äºéæ°å" -#: ../libsvn_subr/io.c:4851 +#: ../libsvn_subr/io.c:5487 #, c-format msgid "Can't create temporary file from template '%s'" -msgstr "æ æ³ä»æ¨¡çâ%sâå建临æ¶æ件" +msgstr "æ æ³ä»æ¨¡ç'%s'å建临æ¶æ件" -#: ../libsvn_subr/io.c:4940 +#: ../libsvn_subr/io.c:5574 #, c-format msgid "Can't set aside '%s'" -msgstr "ä¸è½æ¤éâ%sâ" +msgstr "ä¸è½æ¤é'%s'" -#: ../libsvn_subr/io.c:4952 ../libsvn_subr/stream.c:2078 +#: ../libsvn_subr/io.c:5586 ../libsvn_subr/stream.c:2246 #, c-format msgid "Unable to make name in '%s'" -msgstr "ä¸è½æç §â%sâçæåå" +msgstr "ä¸è½æç §'%s'çæåå" + +#: ../libsvn_subr/macos_keychain.c:456 +msgid "repository password" +msgstr "çæ¬åºå¯ç " -#: ../libsvn_subr/mergeinfo.c:101 ../libsvn_subr/mergeinfo.c:698 +#: ../libsvn_subr/macos_keychain.c:457 +msgid "certificate passphrase" +msgstr "è¯ä¹¦å¯ç çè¯" + +#: ../libsvn_subr/mergeinfo.c:110 ../libsvn_subr/mergeinfo.c:738 msgid "Pathname not terminated by ':'" -msgstr "è·¯å¾å称没æ以 â:â ç»æ" +msgstr "è·¯å¾å称没æ以 ':' ç»æ" -#: ../libsvn_subr/mergeinfo.c:104 -msgid "No pathname preceding ':'" -msgstr "没æè·¯å¾å称åç¼ â:â" +#: ../libsvn_subr/mergeinfo.c:480 ../libsvn_subr/mergeinfo.c:499 +#, c-format +msgid "bad range {start=%ld,end=%ld,inheritable=%d}" +msgstr "é误çèå´ {start=%ld,end=%ld,inheritable=%d}" -#: ../libsvn_subr/mergeinfo.c:521 +#: ../libsvn_subr/mergeinfo.c:543 #, c-format msgid "Invalid character '%c' found in revision list" -msgstr "å¨çæ¬å表ä¸åç°æ æå符 â%câ" +msgstr "å¨çæ¬å表ä¸åç°æ æå符 '%c'" -#: ../libsvn_subr/mergeinfo.c:529 +#: ../libsvn_subr/mergeinfo.c:551 #, c-format msgid "Invalid revision number '0' found in range list" -msgstr "å¨èå´å表ä¸åç°æ æççæ¬å·ãâ0â" +msgstr "å¨èå´å表ä¸åç°æ æççæ¬å·ã'0'" -#: ../libsvn_subr/mergeinfo.c:540 +#: ../libsvn_subr/mergeinfo.c:562 #, c-format msgid "Unable to parse reversed revision range '%ld-%ld'" -msgstr "ä¸è½è§£æååççæ¬èå´ â%ld - %ldâ" +msgstr "ä¸è½è§£æååççæ¬èå´ '%ld - %ld'" -#: ../libsvn_subr/mergeinfo.c:545 +#: ../libsvn_subr/mergeinfo.c:567 #, c-format msgid "Unable to parse revision range '%ld-%ld' with same start and end revisions" -msgstr "ä¸è½è§£æå¼å§ä¸ç»æçæ¬ç¸åççæ¬èå´ â%ld-%ldâ" +msgstr "ä¸è½è§£æå¼å§ä¸ç»æçæ¬ç¸åççæ¬èå´ '%ld-%ld'" -#: ../libsvn_subr/mergeinfo.c:582 ../libsvn_subr/mergeinfo.c:589 +#: ../libsvn_subr/mergeinfo.c:604 ../libsvn_subr/mergeinfo.c:611 #, c-format msgid "Invalid character '%c' found in range list" -msgstr "å¨èå´å表ä¸åç°æ æå符 â%câ" +msgstr "å¨èå´å表ä¸åç°æ æå符 '%c'" -#: ../libsvn_subr/mergeinfo.c:596 +#: ../libsvn_subr/mergeinfo.c:618 msgid "Range list parsing ended before hitting newline" msgstr "å¨éå°æ°è¡ä¹åèå´å表åæç»æ" -#: ../libsvn_subr/mergeinfo.c:654 +#: ../libsvn_subr/mergeinfo.c:694 #, c-format msgid "Unable to parse overlapping revision ranges '%s' and '%s' with different inheritance types" -msgstr "ä¸æ¯æ解æéå ä¸ç»§æ¿ç±»åä¸åççæ¬èå´ â%sâ å â%sâ" +msgstr "ä¸æ¯æ解æéå ä¸ç»§æ¿ç±»åä¸åççæ¬èå´ '%s' å '%s'" -#: ../libsvn_subr/mergeinfo.c:706 +#: ../libsvn_subr/mergeinfo.c:746 #, c-format msgid "Mergeinfo for '%s' maps to an empty revision range" -msgstr "â%sâ çå并信æ¯æ å°å°ç©ºççæ¬èå´" +msgstr "'%s' çå并信æ¯æ å°å°ç©ºççæ¬èå´" -#: ../libsvn_subr/mergeinfo.c:710 +#: ../libsvn_subr/mergeinfo.c:750 #, c-format msgid "Could not find end of line in range list line in '%s'" -msgstr "å¨â%sâçèå´å表è¡ä¸æ²¡ææ¾å°è¡ç»æ符" +msgstr "å¨'%s'çèå´å表è¡ä¸æ²¡ææ¾å°è¡ç»æ符" -#: ../libsvn_subr/mergeinfo.c:779 +#: ../libsvn_subr/mergeinfo.c:814 #, c-format msgid "Could not parse mergeinfo string '%s'" -msgstr "ä¸è½è§£æå并信æ¯å符串â%sâ" +msgstr "ä¸è½è§£æå并信æ¯å符串'%s'" -#: ../libsvn_subr/mergeinfo.c:2340 +#: ../libsvn_subr/mergeinfo.c:830 +#, c-format +msgid "<bad rangelist [%d ranges]: %s>" +msgstr "<é误çèå´å表 [%d 个èå´]: %s>" + +#: ../libsvn_subr/mergeinfo.c:2315 msgid "NULL mergeinfo catalog\n" msgstr "空å¼å并信æ¯ç®å½\n" -#: ../libsvn_subr/mergeinfo.c:2345 +#: ../libsvn_subr/mergeinfo.c:2320 msgid "empty mergeinfo catalog\n" msgstr "空å并信æ¯ç®å½\n" @@ -7089,49 +9874,69 @@ msgstr "ä¸è½è§£éäºæ¥ä½" msgid "Can't get module file name" msgstr "æ æ³è·å模åæ件å" -#: ../libsvn_subr/opt.c:189 -msgid " ARG" -msgstr " ARG" - -#: ../libsvn_subr/opt.c:324 -msgid "" -"\n" -"Global options:\n" -msgstr "" -"\n" -"å ¨å±é项: \n" - -#: ../libsvn_subr/opt.c:818 +#: ../libsvn_subr/opt.c:200 #, c-format msgid "Syntax error parsing peg revision '%s'; did you mean '%s@'?" -msgstr "解æééçæ¬ '%s' æ¶åçè¯æ³é误ï¼ä½ æ¯ä¸æ¯æ³æ§è¡ '%s@'?" +msgstr "解æéå®çæ¬ '%s' æ¶åçè¯æ³é误ï¼ä½ æ¯ä¸æ¯æ³æ§è¡ '%s@'?" -#: ../libsvn_subr/opt.c:824 +#: ../libsvn_subr/opt.c:206 #, c-format msgid "Syntax error parsing peg revision '%s'" -msgstr "解æééçæ¬ '%s' æ¶åçè¯æ³é误" +msgstr "解æéå®çæ¬ '%s' æ¶åçè¯æ³é误" -#: ../libsvn_subr/opt.c:961 +#: ../libsvn_subr/opt.c:331 msgid "Revision property pair is empty" msgstr "çæ¬å±æ§å¯¹ä¸ºç©º" -#: ../libsvn_subr/opt.c:981 ../svn/propedit-cmd.c:87 ../svn/propget-cmd.c:338 +#: ../libsvn_subr/opt.c:351 ../svn/propedit-cmd.c:87 ../svn/propget-cmd.c:341 #: ../svn/propset-cmd.c:68 #, c-format msgid "'%s' is not a valid Subversion property name" -msgstr "â%sâä¸æ¯ææç Subversion å±æ§å称" +msgstr "'%s'ä¸æ¯ææç Subversion å±æ§å称" -#: ../libsvn_subr/opt.c:1057 +#: ../libsvn_subr/opt.c:427 #, c-format msgid "URL '%s' contains a '..' element" -msgstr "URLâ%sâå å«â..âå ç´ " +msgstr "URL'%s'å å«'..'å ç´ " -#: ../libsvn_subr/opt.c:1090 +#: ../libsvn_subr/opt.c:460 #, c-format msgid "Error resolving case of '%s'" -msgstr "解æâ%sâåºé" +msgstr "解æ'%s'åºé" + +#: ../libsvn_subr/opt_subcommand.c:282 +msgid "" +"\n" +"Experimental options:\n" +msgstr "" +"\n" +"å®éªæ§é项:\n" + +#: ../libsvn_subr/opt_subcommand.c:321 +msgid "" +"\n" +"(Use '-v' to show global and experimental options.)\n" +msgstr "" +"\n" +"(ä½¿ç¨ '-v' æ¾ç¤ºå ¨å±åå®éªæ§é项ã)\n" + +#: ../libsvn_subr/opt_subcommand.c:351 +msgid "" +"\n" +"Experimental subcommands:\n" +msgstr "" +"\n" +"å®éªæ§åå½ä»¤:\n" + +#: ../libsvn_subr/opt_subcommand.c:365 +msgid "" +"\n" +"(Use '-v' to show experimental subcommands.)\n" +msgstr "" +"\n" +"(ä½¿ç¨ '-v' æ¾ç¤ºå®éªæ§åå½ä»¤ã)\n" -#: ../libsvn_subr/opt.c:1112 +#: ../libsvn_subr/opt_subcommand.c:468 #, c-format msgid "" "%s, version %s\n" @@ -7142,7 +9947,7 @@ msgstr "" " ç¼è¯äº %sï¼%s å¨ %s\n" "\n" -#: ../libsvn_subr/opt.c:1129 +#: ../libsvn_subr/opt_subcommand.c:485 msgid "" "System information:\n" "\n" @@ -7150,64 +9955,66 @@ msgstr "" "ç³»ç»ä¿¡æ¯:\n" "\n" -#: ../libsvn_subr/opt.c:1130 -#, fuzzy, c-format +#: ../libsvn_subr/opt_subcommand.c:486 +#, c-format msgid "* running on %s\n" -msgstr "* è¿è¡äº %s\n" +msgstr "* è¿è¡å¨ %s\n" -#: ../libsvn_subr/opt.c:1134 +#: ../libsvn_subr/opt_subcommand.c:490 #, c-format msgid " - %s\n" msgstr " - %s\n" -#: ../libsvn_subr/opt.c:1144 +#: ../libsvn_subr/opt_subcommand.c:494 +#, c-format +msgid " - character encoding: %s\n" +msgstr " - å符ç¼ç : %s\n" + +#: ../libsvn_subr/opt_subcommand.c:503 msgid "* linked dependencies:\n" msgstr "* é¾æ¥çä¾èµåº:\n" -#: ../libsvn_subr/opt.c:1169 +#: ../libsvn_subr/opt_subcommand.c:528 msgid "* loaded shared libraries:\n" msgstr "* å·²å è½½çå ±äº«åº:\n" -#: ../libsvn_subr/packed_data.c:736 -#, fuzzy +#: ../libsvn_subr/packed_data.c:742 msgid "Unexpected end of stream" -msgstr "å ¥å£æå¤ç»æ" +msgstr "æµæå¤ç»æ" -#: ../libsvn_subr/packed_data.c:742 -#, fuzzy +#: ../libsvn_subr/packed_data.c:748 msgid "Integer representation too long" -msgstr "æ£å¨æå¼ârepresentationsâ表" +msgstr "æ´æ°è¡¨ç¤ºå¤ªé¿" -#: ../libsvn_subr/path.c:1114 +#: ../libsvn_subr/path.c:1125 #, c-format msgid "Can't determine the native path encoding" msgstr "ä¸è½ç¡®å®æ¬å°è·¯å¾ç¼ç " -#: ../libsvn_subr/path.c:1299 +#: ../libsvn_subr/path.c:1310 #, c-format msgid "Improper relative URL '%s'" -msgstr "ä¸æ£ç¡®çç¸å¯¹ URLâ%sâ" +msgstr "ä¸æ£ç¡®çç¸å¯¹ URL'%s'" #: ../libsvn_subr/prompt.c:147 -#, fuzzy msgid "Can't close terminal" -msgstr "æ æ³å ³éæµ" +msgstr "æ æ³å ³éç»ç«¯" #: ../libsvn_subr/prompt.c:200 -#, fuzzy, c-format +#, c-format msgid "Can't open stderr" -msgstr "æ æ³æå¼æ åè¾å ¥" +msgstr "æ æ³æå¼ stderr" #: ../libsvn_subr/prompt.c:381 ../libsvn_subr/prompt.c:468 -#, fuzzy, c-format +#, c-format msgid "Can't read from terminal" -msgstr "æ æ³è¯»åè¿æ¥" +msgstr "æ æ³ä»ç»ç«¯è¯»å" #: ../libsvn_subr/prompt.c:536 msgid "End of file while reading from terminal" msgstr "ä»ç»ç«¯è¯»å°äºæ件ç»ææ è®°" -#: ../libsvn_subr/prompt.c:598 ../svn/auth-cmd.c:184 +#: ../libsvn_subr/prompt.c:598 ../svn/auth-cmd.c:311 #, c-format msgid "Authentication realm: %s\n" msgstr "认è¯é¢å: %s\n" @@ -7219,13 +10026,15 @@ msgstr "ç¨æ·å: " #: ../libsvn_subr/prompt.c:670 #, c-format msgid "Error validating server certificate for '%s':\n" -msgstr "éªè¯â%sâçæå¡å¨è¯ä¹¦æ¶åºé: \n" +msgstr "éªè¯'%s'çæå¡å¨è¯ä¹¦æ¶åºé: \n" #: ../libsvn_subr/prompt.c:676 msgid "" " - The certificate is not issued by a trusted authority. Use the\n" " fingerprint to validate the certificate manually!\n" -msgstr " - æ¤è¯ä¹¦å¹¶ä¸æ¯ç±ä¿¡ä»»çæå¨æºæé¢åã请使ç¨æ¤æ纹æå·¥éªè¯å ¶æææ§ï¼\n" +msgstr "" +" - æ¤è¯ä¹¦ä¸æ¯ç±åä¿¡ä»»çæºæé¢åã请ç¨æ纹æå·¥\n" +" éªè¯æ¤è¯ä¹¦ï¼\n" #: ../libsvn_subr/prompt.c:683 msgid " - The certificate hostname does not match.\n" @@ -7260,11 +10069,11 @@ msgstr "" #: ../libsvn_subr/prompt.c:721 msgid "(R)eject, accept (t)emporarily or accept (p)ermanently? " -msgstr "(R)æç»ï¼(t)ææ¶æ¥åï¼æ(p)æ°¸è¿æ¥åï¼" +msgstr "(R)æç»ï¼(t)ææ¶æ¥åï¼æ(p)æ°¸è¿æ¥åï¼ " #: ../libsvn_subr/prompt.c:725 msgid "(R)eject or accept (t)emporarily? " -msgstr "(R)æç» æ (t)ææ¶æ¥å ï¼" +msgstr "(R)æç» æ (t)ææ¶æ¥å ï¼ " #: ../libsvn_subr/prompt.c:765 msgid "Client certificate filename: " @@ -7273,33 +10082,33 @@ msgstr "客æ·è¯ä¹¦æ件å: " #: ../libsvn_subr/prompt.c:789 #, c-format msgid "Passphrase for '%s': " -msgstr "â%sâçå¯ç : " +msgstr "'%s'çå¯ç : " -#: ../libsvn_subr/prompt.c:841 +#: ../libsvn_subr/prompt.c:832 msgid "yes" msgstr "yes" -#: ../libsvn_subr/prompt.c:842 +#: ../libsvn_subr/prompt.c:833 msgid "y" msgstr "y" -#: ../libsvn_subr/prompt.c:847 +#: ../libsvn_subr/prompt.c:838 msgid "no" msgstr "no" -#: ../libsvn_subr/prompt.c:848 +#: ../libsvn_subr/prompt.c:839 msgid "n" msgstr "n" -#: ../libsvn_subr/prompt.c:854 +#: ../libsvn_subr/prompt.c:845 msgid "Please type 'yes' or 'no': " msgstr "请è¾å ¥ 'yes' æ 'no': " -#: ../libsvn_subr/prompt.c:868 +#: ../libsvn_subr/prompt.c:859 msgid "Store password unencrypted (yes/no)? " -msgstr "ä¿åæªå å¯çå¯ç (yes/no)?" +msgstr "ä¿åæªå å¯çå¯ç (yes/no)? " -#: ../libsvn_subr/prompt.c:870 +#: ../libsvn_subr/prompt.c:861 #, c-format msgid "" "\n" @@ -7326,15 +10135,15 @@ msgstr "" "åªè½ææä¿åå¨ç£çä¸! å¦æå¯è½çè¯ï¼è¯·èèé ç½®ä½ çç³»ç»ï¼è®© Subversion\n" "å¯ä»¥ä¿åå å¯åçå¯ç ã请åé æ档以è·å¾è¯¦ç»ä¿¡æ¯ã\n" "\n" -"ä½ å¯ä»¥éè¿å¨â%sâä¸è®¾ç½®é项âstore-plaintext-passwordsâ为âyesâæânoâï¼\n" +"ä½ å¯ä»¥éè¿å¨'%s'ä¸è®¾ç½®é项'store-plaintext-passwords'为'yes'æ'no'ï¼\n" "æ¥é¿å å次åºç°æ¤è¦åã\n" "-----------------------------------------------------------------------\n" -#: ../libsvn_subr/prompt.c:897 +#: ../libsvn_subr/prompt.c:888 msgid "Store passphrase unencrypted (yes/no)? " -msgstr "ä¿åæªå å¯çå¯ç (yes/no)?" +msgstr "ä¿åæªå å¯çå¯ç (yes/no)? " -#: ../libsvn_subr/prompt.c:899 +#: ../libsvn_subr/prompt.c:890 #, c-format msgid "" "\n" @@ -7361,92 +10170,114 @@ msgstr "" "åªè½ææä¿åå¨ç£çä¸! å¦æå¯è½çè¯ï¼è¯·èèé ç½®ä½ çç³»ç»ï¼è®© Subversion\n" "å¯ä»¥ä¿åå å¯åçå¯ç ã请åé æ档以è·å¾è¯¦ç»ä¿¡æ¯ã\n" "\n" -"ä½ å¯ä»¥éè¿å¨ â%sâ ä¸è®¾ç½®é项 âstore-ssl-client-cert-pp-plaintextâ 为 âyesâ\n" -" æ ânoâ æ¥é¿å å次åºç°æ¤è¦åã\n" +"ä½ å¯ä»¥éè¿å¨ '%s' ä¸è®¾ç½®é项 'store-ssl-client-cert-pp-plaintext' 为 'yes'\n" +" æ 'no' æ¥é¿å å次åºç°æ¤è¦åã\n" "-----------------------------------------------------------------------\n" -#: ../libsvn_subr/prompt.c:945 +#: ../libsvn_subr/prompt.c:936 #, c-format msgid "Password for '%s' GNOME keyring: " msgstr "GNOME keyring [%s] çå¯ç : " #: ../libsvn_subr/simple_providers.c:444 -#: ../libsvn_subr/ssl_client_cert_pw_providers.c:286 +#: ../libsvn_subr/ssl_client_cert_pw_providers.c:294 #, c-format msgid "Config error: invalid value '%s' for option '%s'" -msgstr "é ç½®é误: æ æåå¼ â%sâï¼å¯¹äºé项 â%sâ" +msgstr "é ç½®é误: æ æåå¼ '%s'ï¼å¯¹äºé项 '%s'" -#: ../libsvn_subr/sqlite.c:220 -#, fuzzy, c-format +#: ../libsvn_subr/sorts.c:314 +#, c-format +msgid "svn_sort__array_insert2: Attempted insert at index %d in array length %d" +msgstr "svn_sort__array_insert2: å°è¯å¨é¿åº¦ä¸º %d çæ°ç»çç´¢å¼ %d å¤æå ¥" + +#: ../libsvn_subr/sorts.c:345 +#, c-format +msgid "svn_sort__array_delete2: Attempted delete at index %d, %d elements, in array length %d" +msgstr "svn_sort__array_delete2: å°è¯å¨é¿åº¦ä¸º %d çæ°ç»çç´¢å¼ %d å¤å é¤ %d 个å ç´ " + +#: ../libsvn_subr/sqlite.c:235 +#, c-format msgid "sqlite[S%d]: %s, executing statement '%s'" -msgstr "%s, æ§è¡è¯å¥ '%s'" +msgstr "sqlite[S%d]: %sï¼æ§è¡è¯å¥ '%s'" -#: ../libsvn_subr/sqlite.c:309 -#, fuzzy +#: ../libsvn_subr/sqlite.c:324 msgid "sqlite: Expected database row missing" -msgstr "丢失äºæå¾ çæ°æ®åºè¡" +msgstr "sqlite: ææçæ°æ®åºè¡ç¼ºå¤±" -#: ../libsvn_subr/sqlite.c:310 -#, fuzzy +#: ../libsvn_subr/sqlite.c:325 msgid "sqlite: Extra database row found" -msgstr "åç°äºé¢å¤çæ°æ®åºè¡" +msgstr "sqlite: åç°å¤ä½çæ°æ®åºè¡" -#: ../libsvn_subr/sqlite.c:781 +#: ../libsvn_subr/sqlite.c:796 #, c-format msgid "SQLite compiled for %s, but running with %s" msgstr "SQLite ç¼è¯ä¸º %sï¼ä½æ¯è¿è¡äº %s" -#: ../libsvn_subr/sqlite.c:793 +#: ../libsvn_subr/sqlite.c:808 msgid "SQLite is required to be compiled and run in thread-safe mode" msgstr "SQLite éè¦å¨ç¼è¯åè¿è¡æ¶é½å¤äºçº¿ç¨å®å ¨æ¨¡å¼" -#: ../libsvn_subr/sqlite.c:802 -#, fuzzy, c-format +#: ../libsvn_subr/sqlite.c:817 +#, c-format msgid "Could not configure SQLite [S%d]" -msgstr "ä¸è½é ç½® SQLite" +msgstr "æ æ³é ç½® SQLite [S%d]" -#: ../libsvn_subr/sqlite.c:804 +#: ../libsvn_subr/sqlite.c:819 msgid "Could not initialize SQLite" msgstr "ä¸è½åå§å SQLite" -#: ../libsvn_subr/sqlite.c:1432 +#: ../libsvn_subr/sqlite.c:1482 #, c-format msgid "SQLite hotcopy failed for %s" msgstr "SQLite ç±äº %s 导è´çå¤å¶å¤±è´¥" -#: ../libsvn_subr/stream.c:968 +#: ../libsvn_subr/stream.c:856 #, c-format msgid "Polling for available data on filestream failed" -msgstr "" +msgstr "å¨æ件æµä¸è½®è¯¢å¯ç¨æ°æ®å¤±è´¥" + +#: ../libsvn_subr/stream.c:876 +msgid "Windows doesn't support polling on files" +msgstr "Windows ä¸æ¯æå¨æ件ä¸è½®è¯¢" + +#: ../libsvn_subr/stream.c:918 +#, c-format +msgid "Can't read a line from file '%s'" +msgstr "æ æ³ä»æ件 '%s' 读åä¸è¡" -#: ../libsvn_subr/string.c:990 ../libsvn_subr/string.c:1034 +#: ../libsvn_subr/stream.c:922 +#, c-format +msgid "Can't read a line from stream" +msgstr "æ æ³ä»æµè¯»åä¸è¡" + +#: ../libsvn_subr/string.c:1076 ../libsvn_subr/string.c:1120 #, c-format msgid "Could not convert '%s' into a number" msgstr "æ æ³è½¬æ¢ '%s' å°æ°å" -#: ../libsvn_subr/subst.c:1820 ../libsvn_wc/props.c:1765 +#: ../libsvn_subr/subst.c:1821 ../libsvn_wc/props.c:1767 #, c-format msgid "File '%s' has inconsistent newlines" -msgstr "æ件 â%sâ å çæ¢è¡ç¬¦ä¸ä¸è´" +msgstr "æ件 '%s' å çæ¢è¡ç¬¦ä¸ä¸è´" -#: ../libsvn_subr/subst.c:1858 -#, fuzzy, c-format +#: ../libsvn_subr/subst.c:1859 +#, c-format msgid "Can't read special file: File '%s' not found" -msgstr "ä¸è½è¯»åæ件â%sâ" +msgstr "æ æ³è¯»åç¹æ®æ件: æ件 '%s' æªæ¾å°" -#: ../libsvn_subr/sysinfo.c:1136 +#: ../libsvn_subr/sysinfo.c:1507 msgid "Intel" msgstr "Intel" -#: ../libsvn_subr/sysinfo.c:1137 +#: ../libsvn_subr/sysinfo.c:1508 msgid "Intel 64-bit" msgstr "Intel 64 ä½" -#: ../libsvn_subr/sysinfo.c:1138 +#: ../libsvn_subr/sysinfo.c:1509 msgid "PowerPC" msgstr "PowerPC" -#: ../libsvn_subr/sysinfo.c:1139 +#: ../libsvn_subr/sysinfo.c:1510 msgid "PowerPC 64-bit" msgstr "PowerPC 64 ä½" @@ -7458,69 +10289,69 @@ msgstr " (%a, %Y-%m-%d)" #: ../libsvn_subr/token.c:66 #, c-format msgid "Token '%s' is unrecognized" -msgstr "æ æ³è¯å«ä»¤ç â%sâ" +msgstr "æ æ³è¯å«ä»¤ç '%s'" #: ../libsvn_subr/types.c:52 #, c-format msgid "Negative revision number found parsing '%s'" -msgstr "解æ â%sâ æ¶åç°è´ççæ¬å·" +msgstr "解æ '%s' æ¶åç°è´ççæ¬å·" #: ../libsvn_subr/types.c:53 #, c-format msgid "Invalid revision number found parsing '%s'" -msgstr "解æ â%sâ æ¶åç°æ æççæ¬å·" +msgstr "解æ '%s' æ¶åç°æ æççæ¬å·" #: ../libsvn_subr/types.c:64 -#, fuzzy, c-format +#, c-format msgid "Revision number longer than 10 digits '%s'" -msgstr "解æ â%sâ æ¶åç°æ æççæ¬å·" +msgstr "çæ¬å· '%s' é¿åº¦è¶ è¿ 10 ä½" #: ../libsvn_subr/types.c:70 -#, fuzzy, c-format +#, c-format msgid "Revision number too large '%s'" -msgstr "解æ â%sâ æ¶åç°æ æççæ¬å·" +msgstr "çæ¬å· '%s' 太大" -#: ../libsvn_subr/utf.c:239 +#: ../libsvn_subr/utf.c:257 #, c-format msgid "Can't create a character converter from native encoding to '%s'" -msgstr "ä¸è½å建ä»æ¬å°ç¼ç å°â%sâçå符转æ¢å¨" +msgstr "ä¸è½å建ä»æ¬å°ç¼ç å°'%s'çå符转æ¢å¨" -#: ../libsvn_subr/utf.c:243 +#: ../libsvn_subr/utf.c:261 #, c-format msgid "Can't create a character converter from '%s' to native encoding" -msgstr "ä¸è½å建ä»â%sâå°æ¬å°ç¼ç çå符转æ¢å¨" +msgstr "ä¸è½å建ä»'%s'å°æ¬å°ç¼ç çå符转æ¢å¨" -#: ../libsvn_subr/utf.c:247 +#: ../libsvn_subr/utf.c:265 #, c-format msgid "Can't create a character converter from '%s' to '%s'" -msgstr "ä¸è½å建ä»â%sâå°â%sâçå符转æ¢å¨" +msgstr "ä¸è½å建ä»'%s'å°'%s'çå符转æ¢å¨" -#: ../libsvn_subr/utf.c:543 +#: ../libsvn_subr/utf.c:560 #, c-format msgid "Can't convert string from native encoding to '%s':" -msgstr "ä¸è½æå符串ä»æ¬å°ç¼ç 转æ¢ä¸ºâ%sâç¼ç : " +msgstr "ä¸è½æå符串ä»æ¬å°ç¼ç 转æ¢ä¸º'%s'ç¼ç :" -#: ../libsvn_subr/utf.c:547 +#: ../libsvn_subr/utf.c:564 #, c-format msgid "Can't convert string from '%s' to native encoding:" -msgstr "ä¸è½æå符串ä»â%sâç¼ç 转æ¢ä¸ºæ¬å°ç¼ç ã" +msgstr "ä¸è½æå符串ä»'%s'ç¼ç 转æ¢ä¸ºæ¬å°ç¼ç ã" -#: ../libsvn_subr/utf.c:551 +#: ../libsvn_subr/utf.c:568 #, c-format msgid "Can't convert string from '%s' to '%s':" -msgstr "ä¸è½æå符串ä»â%sâç¼ç 转æ¢ä¸ºâ%sâç¼ç ã" +msgstr "ä¸è½æå符串ä»'%s'ç¼ç 转æ¢ä¸º'%s'ç¼ç ã" -#: ../libsvn_subr/utf.c:596 +#: ../libsvn_subr/utf.c:613 #, 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:604 +#: ../libsvn_subr/utf.c:621 #, c-format msgid "Non-ASCII character (code %d) detected, and unable to convert to/from UTF-8" msgstr "æ£æµå°éASCIIå符 (代ç %d)ï¼å¹¶ä¸ä¸è½è½¬æ¢å°/èª UTF-8" -#: ../libsvn_subr/utf.c:649 +#: ../libsvn_subr/utf.c:666 #, c-format msgid "" "Valid UTF-8 data\n" @@ -7533,581 +10364,598 @@ msgstr "" "åé¢æ¯æ æ UTF-8 åºå\n" "(16è¿å¶: %s)" -#: ../libsvn_subr/utf.c:1042 ../libsvn_subr/utf.c:1051 -#, fuzzy, c-format +#: ../libsvn_subr/utf.c:1221 ../libsvn_subr/utf.c:1230 +#, c-format msgid "Conversion to UTF-16 failed" -msgstr "è¿æ¥å°â%sâ失败" - -#: ../libsvn_subr/utf.c:1080 ../libsvn_subr/utf.c:1090 -#, fuzzy, c-format -msgid "Conversion from UTF-16 failed" -msgstr "è¿æ¥å°â%sâ失败" +msgstr "UTF-16 转æ¢å¤±è´¥" -#: ../libsvn_subr/utf8proc.c:215 -#, fuzzy, c-format +#: ../libsvn_subr/utf8proc.c:298 +#, c-format msgid "Invalid Unicode character U+%04lX" -msgstr "æ æç转ä¹å符" +msgstr "æ æç Unicode å符 U+%04lX" -#: ../libsvn_subr/utf8proc.c:258 +#: ../libsvn_subr/utf8proc.c:335 msgid "Cannot use a custom escape token in glob matching mode" -msgstr "" +msgstr "æ æ³å¨ glob å¹é 模å¼ä¸ä½¿ç¨èªå®ä¹è½¬ä¹æ è®°" -#: ../libsvn_subr/utf8proc.c:289 +#: ../libsvn_subr/utf8proc.c:366 msgid "Escape token must be one character" -msgstr "" +msgstr "转ä¹æ è®°å¿ é¡»æ¯ä¸ä¸ªå符" -#: ../libsvn_subr/utf8proc.c:292 -#, fuzzy, c-format +#: ../libsvn_subr/utf8proc.c:369 +#, c-format msgid "Invalid escape character U+%04lX" -msgstr "æ æç转ä¹å符" - -#: ../libsvn_subr/utf8proc/utf8proc.c:117 -msgid "Memory for processing UTF-8 data could not be allocated." -msgstr "" - -#: ../libsvn_subr/utf8proc/utf8proc.c:119 -msgid "UTF-8 string is too long to be processed." -msgstr "" - -#: ../libsvn_subr/utf8proc/utf8proc.c:121 -#, fuzzy -msgid "Invalid UTF-8 string" -msgstr "æ æURLâ%sâ" - -#: ../libsvn_subr/utf8proc/utf8proc.c:123 -msgid "Unassigned Unicode code point found in UTF-8 string." -msgstr "" - -#: ../libsvn_subr/utf8proc/utf8proc.c:125 -msgid "Invalid options for UTF-8 processing chosen." -msgstr "" - -#: ../libsvn_subr/utf8proc/utf8proc.c:127 -msgid "An unknown error occured while processing UTF-8 data." -msgstr "" +msgstr "æ æç转ä¹å符 U+%04lX" #: ../libsvn_subr/validate.c:56 #, c-format msgid "MIME type '%s' has empty media type" -msgstr "MIME ç±»åâ%sâå«æ空çåªä½ç±»å" +msgstr "MIME ç±»å'%s'å«æ空çåªä½ç±»å" #: ../libsvn_subr/validate.c:61 #, c-format msgid "MIME type '%s' does not contain '/'" -msgstr "MIME ç±»å â%sâ 没æå å« â/â" +msgstr "MIME ç±»å '%s' 没æå å« '/'" #: ../libsvn_subr/validate.c:73 #, c-format msgid "MIME type '%s' contains invalid character '%c' in media type" -msgstr "MIME ç±»åâ%sâçåªä½ç±»åä¸å å«éæ³å符â%câ" +msgstr "MIME ç±»å'%s'çåªä½ç±»åä¸å å«éæ³å符'%c'" #: ../libsvn_subr/validate.c:84 #, c-format msgid "MIME type '%s' contains invalid character '0x%02x' in postfix" -msgstr "MIME ç±»åâ%sâä¸å å«éæ³å符â0x%02xâ" +msgstr "MIME ç±»å'%s'ä¸å å«éæ³å符'0x%02x'" -#: ../libsvn_subr/version.c:91 -#, fuzzy, c-format +#: ../libsvn_subr/version.c:98 +#, c-format msgid "Version mismatch in '%s'%s: found %d.%d.%d%s, expected %d.%d.%d%s" -msgstr "â%sâççæ¬ä¸ä¸è´: æ¾å° %d.%d.%d%sï¼ææ %d.%d.%d%s" +msgstr "'%s' ä¸ççæ¬ä¸å¹é %s: æ¾å° %d.%d.%d%sï¼ææ %d.%d.%d%s" -#: ../libsvn_subr/version.c:96 +#: ../libsvn_subr/version.c:103 msgid " (expecting equality)" msgstr " (ææç¸ç)" -#: ../libsvn_subr/version.c:98 +#: ../libsvn_subr/version.c:105 msgid " (expecting compatibility)" msgstr " (ææå ¼å®¹)" -#: ../libsvn_subr/version.c:139 -#, fuzzy +#: ../libsvn_subr/version.c:147 msgid "" -"Copyright (C) 2014 The Apache Software Foundation.\n" +"Copyright (C) 2026 The Apache Software Foundation.\n" "This software consists of contributions made by many people;\n" "see the NOTICE file for more information.\n" "Subversion is open source software, see https://subversion.apache.org/\n" msgstr "" -"çæææ (C) 2013 Apache 软件åºéä¼ã\n" -"æ¤è½¯ä»¶å å«äºè®¸å¤äººçè´¡ç®ï¼è¯·æ¥çæ件 NOTICE 以è·å¾æ´å¤ä¿¡æ¯ã\n" -"Subversion æ¯å¼æ¾æºä»£ç 软件ï¼è¯·åé https://subversion.apache.org/ ç«ç¹ã\n" -"\n" - -#: ../libsvn_subr/version.c:217 ../libsvn_subr/version.c:228 -#: ../libsvn_subr/version.c:234 ../libsvn_subr/version.c:251 -#: ../libsvn_subr/version.c:258 -#, fuzzy, c-format +"çæææ (C) 2026 Apache 软件åºéä¼ã\n" +"æ¬è½¯ä»¶ç±è®¸å¤äººå ±åè´¡ç®ï¼\n" +"详æ åè§ NOTICE æ件ã\n" +"Subversion æ¯å¼æºè½¯ä»¶ï¼åè§ https://subversion.apache.org/\n" + +#: ../libsvn_subr/version.c:232 ../libsvn_subr/version.c:243 +#: ../libsvn_subr/version.c:249 ../libsvn_subr/version.c:266 +#: ../libsvn_subr/version.c:273 +#, c-format msgid "Failed to parse version number string '%s'" -msgstr "ä¸è½è§£æå并信æ¯å符串â%sâ" +msgstr "æ æ³è§£æçæ¬å·å符串 '%s'" -#: ../libsvn_subr/xml.c:416 +#: ../libsvn_subr/xml.c:271 #, c-format msgid "Malformed XML: %s at line %ld" msgstr "éæ³ XML: %s å¨ç¬¬ %ld è¡" -#: ../libsvn_wc/adm_crawler.c:119 +#: ../libsvn_wc/adm_crawler.c:239 #, c-format msgid "The existing node '%s' can not be restored." msgstr "å·²æèç¹ '%s' ä¸è½æ¢å¤ã" -#: ../libsvn_wc/adm_crawler.c:138 +#: ../libsvn_wc/adm_crawler.c:258 #, c-format msgid "The node '%s' can not be restored." msgstr "èç¹ '%s' ä¸è½æ¢å¤ã" -#: ../libsvn_wc/adm_crawler.c:862 +#: ../libsvn_wc/adm_crawler.c:874 msgid "Error aborting report" msgstr "åæ¶æ¥ååºé" -#: ../libsvn_wc/adm_crawler.c:975 +#: ../libsvn_wc/adm_crawler.c:1013 #, c-format msgid "Pristine checksum for file '%s' is missing" -msgstr "æ件â%sâçåå§å å®¹æ ¡éªå丢失" +msgstr "æ件'%s'çåå§å å®¹æ ¡éªå丢失" -#: ../libsvn_wc/adm_crawler.c:1140 +#: ../libsvn_wc/adm_crawler.c:1215 #, c-format msgid "Checksum mismatch for text base of '%s'" msgstr "'%s' çææ¬æ ¡éªåä¸å¹é " -#: ../libsvn_wc/adm_crawler.c:1151 +#: ../libsvn_wc/adm_crawler.c:1226 #, c-format msgid "While preparing '%s' for commit" -msgstr "å½ä¸ºæ交æä½åå¤â%sâæ¶" +msgstr "å½ä¸ºæ交æä½åå¤'%s'æ¶" -#: ../libsvn_wc/adm_files.c:105 +#: ../libsvn_wc/adm_files.c:106 #, c-format msgid "'%s' is not a valid administrative directory name" -msgstr "â%sâä¸æ¯ä¸ä¸ªææç管çç®å½å" +msgstr "'%s'ä¸æ¯ä¸ä¸ªææç管çç®å½å" -#: ../libsvn_wc/adm_files.c:185 ../libsvn_wc/adm_files.c:241 +#: ../libsvn_wc/adm_files.c:281 #, c-format -msgid "Can only get the pristine contents of files; '%s' is not a file" -msgstr "åªè½åå¾æ件çåå§å 容ï¼â%sâä¸æ¯æ件" +msgid "Working copy format %d is not supported by client version %s." +msgstr "å·¥ä½å¯æ¬æ ¼å¼ %d ä¸è¢«å®¢æ·ç«¯çæ¬ %s æ¯æã" -#: ../libsvn_wc/adm_files.c:194 ../libsvn_wc/adm_files.c:256 +#: ../libsvn_wc/adm_files.c:287 #, c-format -msgid "Cannot get the pristine contents of '%s' because its delete is already committed" -msgstr "ä¸è½åå¾â%sâçåå§å 容ï¼å ä¸ºå ¶å é¤æä½å·²ç»æ交" +msgid "Working copy format %d can't be created by client version %s." +msgstr "å·¥ä½å¯æ¬æ ¼å¼ %d æ æ³è¢«å®¢æ·ç«¯çæ¬ %s å建ã" -#: ../libsvn_wc/adm_files.c:202 ../libsvn_wc/adm_files.c:264 +#: ../libsvn_wc/adm_files.c:293 #, c-format -msgid "Cannot get the pristine contents of '%s' because it has an unexpected status" -msgstr "ä¸è½åå¾â%sâçåå§å 容ï¼å ä¸ºå ¶ç¶ææªç¥" +msgid "Working copy format %d does not support the requested capabilities" +msgstr "å·¥ä½å¯æ¬æ ¼å¼ %d ä¸æ¯æ请æ±çåè½" -#: ../libsvn_wc/adm_files.c:209 +#: ../libsvn_wc/adm_files.c:312 #, c-format -msgid "Node '%s' has no pristine text" -msgstr "èç¹ '%s' 没æåå§å 容" +msgid "Format %d doesn't match existing format %d in '%s'" +msgstr "æ ¼å¼ %d ä¸å·²ææ ¼å¼ %d ä¸å¹é (å¨ '%s' ä¸)" -#: ../libsvn_wc/adm_files.c:420 +#: ../libsvn_wc/adm_files.c:351 #, c-format msgid "Revision %ld doesn't match existing revision %ld in '%s'" -msgstr "çæ¬ %ld ä¸å¹é ç°æçæ¬ %ld äº â%sâ" +msgstr "çæ¬ %ld ä¸å¹é ç°æçæ¬ %ld äº '%s'" -#: ../libsvn_wc/adm_files.c:460 +#: ../libsvn_wc/adm_files.c:393 #, c-format msgid "URL '%s' (uuid: '%s') doesn't match existing URL '%s' (uuid: '%s') in '%s'" -msgstr "URL â%sâ(uuid: '%s') ä¸å¹é ç°æ URL â%sâ(uuid: '%s') äº â%sâ" +msgstr "URL '%s'(uuid: '%s') ä¸å¹é ç°æ URL '%s'(uuid: '%s') äº '%s'" -#: ../libsvn_wc/adm_ops.c:313 ../libsvn_wc/update_editor.c:5396 +#: ../libsvn_wc/adm_ops.c:314 ../libsvn_wc/update_editor.c:5578 #, c-format msgid "Can't find parent directory's node while trying to add '%s'" -msgstr "å¢å â%sâ æ¶æ æ³æ¾å°ç¶ç®å½èç¹" +msgstr "å¢å '%s' æ¶æ æ³æ¾å°ç¶ç®å½èç¹" -#: ../libsvn_wc/adm_ops.c:322 ../libsvn_wc/update_editor.c:5390 +#: ../libsvn_wc/adm_ops.c:323 ../libsvn_wc/update_editor.c:5572 #, c-format msgid "Can't add '%s' to a parent directory scheduled for deletion" -msgstr "å¢å â%sâ å°è°åº¦å é¤çç®å½ä¸" +msgstr "å¢å '%s' å°è°åº¦å é¤çç®å½ä¸" -#: ../libsvn_wc/adm_ops.c:329 ../libsvn_wc/update_editor.c:5403 +#: ../libsvn_wc/adm_ops.c:330 ../libsvn_wc/update_editor.c:5585 #, c-format msgid "Can't schedule an addition of '%s' below a not-directory node" msgstr "ä¸è½å¨éç®å½èç¹ '%s' ä¸è°åº¦å¢å " -#: ../libsvn_wc/adm_ops.c:390 +#: ../libsvn_wc/adm_ops.c:391 #, c-format msgid "Can't create an entry with a reserved name while trying to add '%s'" -msgstr "å¢å â%sâ æ¶æ æ³å建使ç¨ä¿çå称çæ¡ç®" +msgstr "å¢å '%s' æ¶æ æ³å建使ç¨ä¿çå称çæ¡ç®" -#: ../libsvn_wc/adm_ops.c:594 +#: ../libsvn_wc/adm_ops.c:595 #, 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:614 +#: ../libsvn_wc/adm_ops.c:615 #, c-format msgid "Can't schedule the working copy at '%s' from repository '%s' with uuid '%s' for addition under a working copy from repository '%s' with uuid '%s'." msgstr "ä¸è½è°åº¦å·¥ä½å¯æ¬ '%s' (çæ¬åº '%s'ï¼uuid '%s') å¨çæ¬åº '%s' (uuid '%s') çå·¥ä½å¯æ¬ä¸å¢å ã" -#: ../libsvn_wc/adm_ops.c:628 +#: ../libsvn_wc/adm_ops.c:629 #, c-format msgid "Can't add '%s' with URL '%s', but with the data from '%s'" msgstr "ä¸è½å¢å '%s' 为 URL '%s' (æ°æ®æ¥èª '%s')" +#: ../libsvn_wc/adm_ops.c:785 ../libsvn_wc/textbase.c:227 +#, c-format +msgid "Can only get the pristine contents of files; '%s' is not a file" +msgstr "åªè½åå¾æ件çåå§å 容ï¼'%s'ä¸æ¯æ件" + +#: ../libsvn_wc/adm_ops.c:794 ../libsvn_wc/textbase.c:237 +#, c-format +msgid "Cannot get the pristine contents of '%s' because its delete is already committed" +msgstr "ä¸è½åå¾'%s'çåå§å 容ï¼å ä¸ºå ¶å é¤æä½å·²ç»æ交" + +#: ../libsvn_wc/adm_ops.c:802 ../libsvn_wc/textbase.c:247 +#, c-format +msgid "Cannot get the pristine contents of '%s' because it has an unexpected status" +msgstr "ä¸è½åå¾'%s'çåå§å 容ï¼å ä¸ºå ¶ç¶ææªç¥" + +#: ../libsvn_wc/adm_ops.c:826 ../libsvn_wc/wc_db_pristine.c:544 +#, c-format +msgid "The pristine text with checksum '%s' was not found" +msgstr "æ¾ä¸å°æ ¡éªå为'%s'çåå§å 容" + #: ../libsvn_wc/cleanup.c:58 #, c-format msgid "'%s' is not a working copy directory" -msgstr "â%sâ ä¸æ¯å·¥ä½å¯æ¬ç®å½" +msgstr "'%s' ä¸æ¯å·¥ä½å¯æ¬ç®å½" #: ../libsvn_wc/cleanup.c:64 msgid "Log format too old, please use Subversion 1.6 or earlier" msgstr "æ¥å¿æ ¼å¼å¤ªæ§ï¼è¯·ä½¿ç¨ Subversion 1.6 ææ´æ°ççæ¬" -#: ../libsvn_wc/conflicts.c:83 -#, fuzzy +#: ../libsvn_wc/conflicts.c:84 msgid "Not a conflict skel" -msgstr "解ææ å²çªéª¨æ¶åºé" +msgstr "ä¸æ¯å²çª skel" -#: ../libsvn_wc/conflicts.c:607 ../libsvn_wc/conflicts.c:704 -#, fuzzy +#: ../libsvn_wc/conflicts.c:624 ../libsvn_wc/conflicts.c:721 msgid "Not a completed conflict skel" -msgstr "解ææ å²çªéª¨æ¶åºé" +msgstr "ä¸æ¯å·²å®æçå²çª skel" -#: ../libsvn_wc/conflicts.c:785 ../libsvn_wc/conflicts.c:858 -#: ../libsvn_wc/conflicts.c:948 +#: ../libsvn_wc/conflicts.c:802 ../libsvn_wc/conflicts.c:875 +#: ../libsvn_wc/conflicts.c:966 msgid "Conflict not set" msgstr "没æ设置å²çª" -#: ../libsvn_wc/conflicts.c:1327 ../libsvn_wc/conflicts.c:1700 +#: ../libsvn_wc/conflicts.c:1350 ../libsvn_wc/conflicts.c:2025 +#: ../libsvn_wc/conflicts.c:2070 msgid "Conflict callback violated API: returned no results" -msgstr "å²çªçåè°å½æ°è¿å APIï¼æ²¡æè¿åç»æã" +msgstr "å²çªçåè°å½æ°è¿å API: 没æè¿åç»æã" -#: ../libsvn_wc/conflicts.c:1371 -#, fuzzy +#: ../libsvn_wc/conflicts.c:1393 msgid "Conflict callback violated API: returned no merged file" -msgstr "å²çªçåè°å½æ°è¿å APIï¼æ²¡æè¿åå并æ件ã" +msgstr "å²çªåè°è¿åäº API: æªè¿åå并åçæ件" + +#: ../libsvn_wc/conflicts.c:1680 +#, c-format +msgid "Conflict on '%s' cannot be resolved to 'theirs-conflict' or 'mine-conflict' because a merged version of the file cannot be created." +msgstr "æ æ³å° '%s' ä¸çå²çªè§£å³ä¸º 'theirs-conflict' æ 'mine-conflict'ï¼å 为æ æ³çææ件çå并çæ¬ã" + +#: ../libsvn_wc/conflicts.c:1725 +#, c-format +msgid "Conflict on '%s' could not be resolved because the chosen version of the file is not available." +msgstr "æ æ³è§£å³ '%s' ä¸çå²çªï¼å 为æéçæ¬çæ件ä¸å¯ç¨ã" -#: ../libsvn_wc/conflicts.c:2441 ../libsvn_wc/conflicts.c:2617 +#: ../libsvn_wc/conflicts.c:2540 msgid "Invalid 'conflict_result' argument" -msgstr "æ æç âconflict_resultâ åæ°" +msgstr "æ æç 'conflict_result' åæ°" -#: ../libsvn_wc/conflicts.c:2762 ../libsvn_wc/conflicts.c:2818 -#, fuzzy, c-format +#: ../libsvn_wc/conflicts.c:2803 ../libsvn_wc/conflicts.c:2848 +#, c-format msgid "Tree conflict can only be resolved to 'working' or 'mine-conflict' state; '%s' not resolved" -msgstr "æ å²çªåªè½è§£å³ä¸º âworkingâ ç¶æï¼â%sâ è¿æ²¡æ解å³" +msgstr "æ å²çªåªè½è§£å³ä¸º 'working' æ 'mine-conflict' ç¶æï¼'%s' æªè¢«è§£å³" + +#: ../libsvn_wc/conflicts.c:2875 +#, c-format +msgid "Tree conflict can only be resolved to 'working' state; '%s' is no longer moved" +msgstr "æ å²çªåªè½è§£å³ä¸º 'working' ç¶æï¼'%s' ä¸åæ¯ç§»å¨ç" -#: ../libsvn_wc/conflicts.c:2835 -#, fuzzy, c-format +#: ../libsvn_wc/conflicts.c:2893 +#, c-format msgid "Tree conflict can only be resolved to 'working' state; '%s' not resolved" -msgstr "æ å²çªåªè½è§£å³ä¸º âworkingâ ç¶æï¼â%sâ è¿æ²¡æ解å³" +msgstr "æ å²çªåªè½è§£å³ä¸º 'working' ç¶æï¼'%s' æªè¢«è§£å³" -#: ../libsvn_wc/conflicts.c:2945 +#: ../libsvn_wc/conflicts.c:3070 msgid "No conflict-callback and no pre-defined conflict-choice provided" msgstr "没æå²çªåè°ï¼ä¹æ²¡ææä¾é¢å®ä¹çå²çªéæ©" -#: ../libsvn_wc/conflicts.c:3154 -#, fuzzy, c-format -msgid "Unable to resolve pending conflict on '%s'" -msgstr "æ æ³å é¤ç®å½ â%sâ" - -#: ../libsvn_wc/conflicts.c:3165 -#, fuzzy, c-format +#: ../libsvn_wc/conflicts.c:3339 +#, c-format msgid "Unable to resolve conflicts on '%s'" -msgstr "æ æ³å é¤ç®å½ â%sâ" +msgstr "æ æ³è§£å³ '%s' ä¸çå²çª" -#: ../libsvn_wc/copy.c:102 +#: ../libsvn_wc/conflicts.c:3537 ../libsvn_wc/conflicts.c:3623 +#: ../libsvn_wc/conflicts.c:3702 ../libsvn_wc/conflicts.c:3788 +#: ../libsvn_wc/conflicts.c:3855 +#, c-format +msgid "Unexpected conflict operation '%s' on '%s'" +msgstr "'%s' ä¸åºç°æå¤çå²çªæä½ '%s'" + +#: ../libsvn_wc/conflicts.c:3545 ../libsvn_wc/conflicts.c:3630 +#: ../libsvn_wc/conflicts.c:3708 ../libsvn_wc/conflicts.c:3794 +#: ../libsvn_wc/conflicts.c:3861 +#, c-format +msgid "Unexpected conflict reason '%s' on '%s'" +msgstr "'%s' ä¸åºç°æå¤çå²çªåå '%s'" + +#: ../libsvn_wc/conflicts.c:3636 ../libsvn_wc/conflicts.c:3714 +#: ../libsvn_wc/conflicts.c:3800 ../libsvn_wc/conflicts.c:3867 +#, c-format +msgid "Unexpected conflict action '%s' on '%s'" +msgstr "'%s' ä¸åºç°æå¤çå²çªå¨ä½ '%s'" + +#: ../libsvn_wc/copy.c:104 #, c-format msgid "Source '%s' is unexpected kind" -msgstr "æº â%sâ å ·ææå¤çç±»å" +msgstr "æº '%s' å ·ææå¤çç±»å" -#: ../libsvn_wc/copy.c:469 +#: ../libsvn_wc/copy.c:522 #, c-format msgid "cannot handle node kind for '%s'" -msgstr "ä¸è½ä¸º '%s'âå¤çèç¹ç±»å" +msgstr "ä¸è½ä¸º '%s''å¤çèç¹ç±»å" -#: ../libsvn_wc/copy.c:491 ../libsvn_wc/wc_db.c:4540 ../libsvn_wc/wc_db.c:5113 +#: ../libsvn_wc/copy.c:544 ../libsvn_wc/wc_db.c:4743 ../libsvn_wc/wc_db.c:5546 #, c-format msgid "Cannot handle status of '%s'" -msgstr "ä¸è½å¤çâ%sâçç¶æ" +msgstr "ä¸è½å¤ç'%s'çç¶æ" -#: ../libsvn_wc/copy.c:500 ../libsvn_wc/wc_db.c:4531 ../libsvn_wc/wc_db.c:5107 -#: ../libsvn_wc/wc_db.c:5350 +#: ../libsvn_wc/copy.c:553 ../libsvn_wc/wc_db.c:4734 ../libsvn_wc/wc_db.c:5540 +#: ../libsvn_wc/wc_db.c:5784 #, c-format msgid "Cannot copy '%s' excluded by server" msgstr "ä¸è½å¤å¶è¢«æå¡å¨æé¤ç '%s'" -#: ../libsvn_wc/copy.c:641 +#: ../libsvn_wc/copy.c:694 #, c-format msgid "Deleted node '%s' can't be copied." -msgstr "å·²ç»å é¤çèç¹â%sâä¸è½è¢«å¤å¶ã" +msgstr "å·²ç»å é¤çèç¹'%s'ä¸è½è¢«å¤å¶ã" -#: ../libsvn_wc/copy.c:659 -#, fuzzy, c-format +#: ../libsvn_wc/copy.c:712 +#, c-format msgid "'%s' is the root of a working copy and cannot be moved" -msgstr "ä¸è½å é¤å·¥ä½å¯æ¬æ ¹ç®å½ '%s'" +msgstr "'%s' æ¯å·¥ä½å¯æ¬çæ ¹ï¼æ æ³ç§»å¨" -#: ../libsvn_wc/copy.c:667 -#, fuzzy, c-format +#: ../libsvn_wc/copy.c:720 +#, c-format msgid "'%s' represents the repository root and cannot be moved" -msgstr "â%sâ æ¯ä¿çå称ï¼æ æ³è¢«å¯¼å ¥" +msgstr "'%s' 代表çæ¬åºæ ¹ï¼æ æ³ç§»å¨" -#: ../libsvn_wc/copy.c:742 +#: ../libsvn_wc/copy.c:795 #, c-format msgid "Cannot copy to '%s', as it is not from repository '%s'; it is from '%s'" -msgstr "æ æ³å¤å¶å°â%sâï¼å 为å®ä¸å¨çæ¬åºâ%sâä¸ï¼å®æ¥èªâ%sâ" +msgstr "æ æ³å¤å¶å°'%s'ï¼å 为å®ä¸å¨çæ¬åº'%s'ä¸ï¼å®æ¥èª'%s'" -#: ../libsvn_wc/copy.c:750 +#: ../libsvn_wc/copy.c:803 #, c-format msgid "Cannot copy to '%s' as it is scheduled for deletion" -msgstr "æ æ³å¤å¶å°â%sâï¼å 为å®å·²è°åº¦å é¤" +msgstr "æ æ³å¤å¶å°'%s'ï¼å 为å®å·²è°åº¦å é¤" -#: ../libsvn_wc/copy.c:778 +#: ../libsvn_wc/copy.c:831 #, c-format msgid "'%s' is already under version control but is excluded." msgstr "'%s' å·²çº³å ¥çæ¬æ§å¶ï¼å´è¢«æé¤ã" -#: ../libsvn_wc/copy.c:793 +#: ../libsvn_wc/copy.c:847 #, c-format msgid "There is already a versioned item '%s'" -msgstr "å·²æçº³å ¥çæ¬æ§å¶é¡¹â%sâ" +msgstr "å·²æçº³å ¥çæ¬æ§å¶é¡¹'%s'" -#: ../libsvn_wc/copy.c:809 +#: ../libsvn_wc/copy.c:863 #, c-format msgid "'%s' already exists and is in the way" -msgstr "â%sâå·²åå¨ï¼åææ¦è·¯è" +msgstr "'%s'å·²åå¨ï¼åææ¦è·¯è" -#: ../libsvn_wc/copy.c:861 -#, fuzzy, c-format +#: ../libsvn_wc/copy.c:910 +#, c-format msgid "Cannot move mixed-revision subtree '%s' [%ld:%ld]; try updating it first" -msgstr "ä¸è½å并å°ææ··åçæ¬çå·¥ä½å¯æ¬ [%lu:%lu] ä¸ï¼è¯·å æ´æ°" +msgstr "æ æ³ç§»å¨æ··åçæ¬åæ '%s' [%ld:%ld]ï¼è¯·å å°è¯æ´æ°å®" -#: ../libsvn_wc/crop.c:208 +#: ../libsvn_wc/crop.c:211 #, c-format msgid "Cannot exclude '%s': it is a working copy root" msgstr "ä¸è½æé¤ '%s': å®æ¯å·¥ä½å¯æ¬æ ¹ç®å½" -#: ../libsvn_wc/crop.c:216 +#: ../libsvn_wc/crop.c:219 #, c-format msgid "Cannot exclude '%s': it is a switched path" msgstr "ä¸è½æé¤ '%s':å®æ¯å·²åæ¢çè·¯å¾" -#: ../libsvn_wc/crop.c:243 +#: ../libsvn_wc/crop.c:246 #, c-format msgid "Cannot exclude '%s': it is to be added to the repository. Try commit instead" msgstr "ä¸è½æé¤ '%s': å®å°è¦å¢å å°çæ¬åºä¸ã请å æ交" -#: ../libsvn_wc/crop.c:250 +#: ../libsvn_wc/crop.c:253 #, c-format msgid "Cannot exclude '%s': it is to be deleted from the repository. Try commit instead" msgstr "ä¸è½æé¤ '%s': å®å°è¦ä»çæ¬åºä¸å é¤ã请å æ交" -#: ../libsvn_wc/crop.c:309 +#: ../libsvn_wc/crop.c:324 msgid "Can only crop a working copy with a restrictive depth" msgstr "åªè½ä¿®åªå·¥ä½å¯æ¬å°æé深度" -#: ../libsvn_wc/crop.c:320 +#: ../libsvn_wc/crop.c:335 msgid "Can only crop directories" msgstr "åªè½ä¿®åªç®å½" -#: ../libsvn_wc/crop.c:333 +#: ../libsvn_wc/crop.c:348 #, c-format msgid "Cannot crop '%s': it is going to be removed from repository. Try commit instead" -msgstr "æ æ³ä¿®åª â%sâ: å®å°è¦ä»çæ¬åºä¸å é¤ï¼è¯·å æ交" +msgstr "æ æ³ä¿®åª '%s': å®å°è¦ä»çæ¬åºä¸å é¤ï¼è¯·å æ交" -#: ../libsvn_wc/crop.c:340 +#: ../libsvn_wc/crop.c:355 #, c-format msgid "Cannot crop '%s': it is to be added to the repository. Try commit instead" msgstr "æ æ³ä¿®åª '%s': å®å°è¦å¢å å°çæ¬åºä¸ã请å æ交" -#: ../libsvn_wc/delete.c:237 ../libsvn_wc/delete.c:357 +#: ../libsvn_wc/delete.c:238 ../libsvn_wc/delete.c:358 #, c-format msgid "'%s' cannot be deleted" msgstr "'%s' ä¸è½è¢«å é¤" -#: ../libsvn_wc/delete.c:255 ../libsvn_wc/delete.c:373 +#: ../libsvn_wc/delete.c:256 ../libsvn_wc/delete.c:374 #, c-format msgid "'%s' is the root of a working copy and cannot be deleted" msgstr "ä¸è½å é¤å·¥ä½å¯æ¬æ ¹ç®å½ '%s'" -#: ../libsvn_wc/delete.c:262 ../libsvn_wc/delete.c:379 -#, fuzzy, c-format +#: ../libsvn_wc/delete.c:263 ../libsvn_wc/delete.c:380 +#, c-format msgid "'%s' represents the repository root and cannot be deleted" -msgstr "ä¸è½å é¤å·¥ä½å¯æ¬æ ¹ç®å½ '%s'" +msgstr "'%s' 代表çæ¬åºæ ¹ï¼æ æ³å é¤" -#: ../libsvn_wc/delete.c:476 +#: ../libsvn_wc/delete.c:474 #, c-format msgid "File '%s' has local modifications" -msgstr "æ件â%sâææ¬å°ä¿®æ¹" +msgstr "æ件'%s'ææ¬å°ä¿®æ¹" -#: ../libsvn_wc/deprecated.c:2362 +#: ../libsvn_wc/deprecated.c:2637 #, c-format msgid "Unexpectedly found '%s': path is marked 'missing'" -msgstr "æå¤åç°â%sâ: è·¯å¾è¢«æ 记为â丢失â" +msgstr "æå¤åç°'%s': è·¯å¾è¢«æ 记为'丢失'" -#: ../libsvn_wc/entries.c:1044 +#: ../libsvn_wc/entries.c:1100 #, c-format msgid "'%s' is not a versioned working copy" -msgstr "â%sâä¸æ¯å·²çæ¬æ§å¶çå·¥ä½å¯æ¬" +msgstr "'%s'ä¸æ¯å·²çæ¬æ§å¶çå·¥ä½å¯æ¬" -#: ../libsvn_wc/entries.c:1290 +#: ../libsvn_wc/entries.c:1396 #, c-format msgid "Admin area of '%s' is missing" -msgstr "â%sâç管çç®å½ä¸¢å¤±" +msgstr "'%s'ç管çç®å½ä¸¢å¤±" -#: ../libsvn_wc/entries.c:1310 +#: ../libsvn_wc/entries.c:1416 #, c-format msgid "'%s' is not of the right kind" -msgstr "â%sâ çç±»åé误" +msgstr "'%s' çç±»åé误" -#: ../libsvn_wc/entries.c:1507 +#: ../libsvn_wc/entries.c:1578 #, c-format msgid "The file '%s' has no checksum" msgstr "æ件 '%s' 没ææ ¡éªåã" -#: ../libsvn_wc/entries.c:1619 -#, fuzzy, c-format +#: ../libsvn_wc/entries.c:1696 +#, c-format msgid "Unable to upgrade '%s' at line %d" -msgstr "ä¸è½æç §â%sâçæåå" +msgstr "æ æ³å级 '%s'ï¼å¨ç¬¬ %d è¡" -#: ../libsvn_wc/entries.c:1837 +#: ../libsvn_wc/entries.c:1935 #, c-format msgid "No copyfrom URL for '%s'" msgstr "'%s' 没æ copyfrom URL" -#: ../libsvn_wc/entries.c:2051 +#: ../libsvn_wc/entries.c:2167 #, c-format msgid "Bad base MD5 checksum for '%s'; expected: '%s'; found '%s'; " msgstr "'%s' çåºç¡ç MD5 æ ¡éªåé误; ææ '%s'; åç° '%s'; " -#: ../libsvn_wc/entries.c:2398 +#: ../libsvn_wc/entries.c:2520 #, c-format msgid "No default entry in directory '%s'" -msgstr "å¨ç®å½â%sâä¸æ²¡æé»è®¤å ¥å£" +msgstr "å¨ç®å½'%s'ä¸æ²¡æé»è®¤å ¥å£" -#: ../libsvn_wc/entries.c:2554 +#: ../libsvn_wc/entries.c:2676 #, c-format msgid "Directory '%s' has no THIS_DIR entry" -msgstr "ç®å½â%sâ没æ THIS_DIR å ¥å£" +msgstr "ç®å½'%s'没æ THIS_DIR å ¥å£" -#: ../libsvn_wc/entries.c:2735 ../libsvn_wc/node.c:514 +#: ../libsvn_wc/entries.c:2856 ../libsvn_wc/node.c:403 #, c-format msgid "'%s' has an unrecognized node kind" -msgstr "â%sâææ æ³è¯å«çèç¹ç§ç±»" +msgstr "'%s'ææ æ³è¯å«çèç¹ç§ç±»" -#: ../libsvn_wc/externals.c:154 ../libsvn_wc/externals.c:232 +#: ../libsvn_wc/externals.c:159 ../libsvn_wc/externals.c:248 #, c-format msgid "Error parsing %s property on '%s': '%s'" -msgstr "解æ %s å±æ§äºâ%sâåºé: â%sâ" +msgstr "解æ %s å±æ§äº'%s'åºé: '%s'" -#: ../libsvn_wc/externals.c:202 +#: ../libsvn_wc/externals.c:215 #, c-format msgid "Can't split line into components: '%s'" -msgstr "ä¸è½åå²è¡å°ç»ä»¶ï¼â%sâ" +msgstr "ä¸è½åå²è¡å°ç»ä»¶: '%s'" -#: ../libsvn_wc/externals.c:257 +#: ../libsvn_wc/externals.c:274 #, c-format msgid "Invalid %s property on '%s': cannot use two absolute URLs ('%s' and '%s') in an external; one must be a path where an absolute or relative URL is checked out to" -msgstr "éæ³å±æ§ â%sâ äº â%sâ: ä¸è½å¨å¤é¨å®ä¹ä¸ä½¿ç¨ 2 个ç»å¯¹ URL(â%sâ å â%sâ)ï¼ç»å¯¹æç¸å¯¹ URL å¿ é¡»æ£åºå°æ¬å°è·¯å¾" +msgstr "éæ³å±æ§ '%s' äº '%s': ä¸è½å¨å¤é¨å¼ç¨å®ä¹ä¸ä½¿ç¨ 2 个ç»å¯¹ URL('%s' å '%s')ï¼ç»å¯¹æç¸å¯¹ URL å¿ é¡»æ£åºå°æ¬å°è·¯å¾" -#: ../libsvn_wc/externals.c:266 ../libsvn_wc/externals.c:274 +#: ../libsvn_wc/externals.c:283 ../libsvn_wc/externals.c:291 #, c-format msgid "Invalid %s property on '%s': cannot use a URL '%s' as the target directory for an external definition" -msgstr "éæ³å±æ§ â%sâ äº â%sâ: 对äºå¤é¨å®ä¹ï¼ä¸è½ä½¿ç¨ URL \"%s\" ä½ä¸ºç®æ ç®å½" +msgstr "éæ³å±æ§ '%s' äº '%s': 对äºå¤é¨å¼ç¨å®ä¹ï¼ä¸è½ä½¿ç¨ URL '%s' ä½ä¸ºç®æ ç®å½" -#: ../libsvn_wc/externals.c:316 +#: ../libsvn_wc/externals.c:355 #, c-format msgid "Invalid %s property on '%s': target '%s' is an absolute path or involves '..'" -msgstr "æ æå±æ§ %s ä½äº â%sâ: ç®æ â%sâ å å« â..â ææ¯ç»å¯¹è·¯å¾" +msgstr "æ æå±æ§ %s ä½äº '%s': ç®æ '%s' å å« '..' ææ¯ç»å¯¹è·¯å¾" -#: ../libsvn_wc/externals.c:489 ../libsvn_wc/externals.c:512 +#: ../libsvn_wc/externals.c:550 ../libsvn_wc/externals.c:573 #, c-format msgid "This editor can only update '%s'" -msgstr "æ¤ç¼è¾å¨åªè½æ´æ°â%sâ" +msgstr "æ¤ç¼è¾å¨åªè½æ´æ°'%s'" -#: ../libsvn_wc/externals.c:527 ../libsvn_wc/externals.c:974 +#: ../libsvn_wc/externals.c:589 #, c-format msgid "Node '%s' is no existing file external" -msgstr "èç¹ '%s' çå¤é¨é¾æ¥ä¸æ¯ç°åæ件" +msgstr "èç¹ '%s' çå¤é¨å¼ç¨é¾æ¥ä¸æ¯ç°åæ件" -#: ../libsvn_wc/externals.c:1545 +#: ../libsvn_wc/externals.c:1628 #, c-format msgid "URL '%s' does not begin with a scheme" -msgstr "URL â%sâ 没æ以æ¹æ¡å¼å§" +msgstr "URL '%s' 没æ以æ¹æ¡å¼å§" -#: ../libsvn_wc/externals.c:1600 +#: ../libsvn_wc/externals.c:1683 #, c-format msgid "Illegal parent directory URL '%s'" -msgstr "éæ³ç¶ç®å½ URL â%sâ" +msgstr "éæ³ç¶ç®å½ URL '%s'" -#: ../libsvn_wc/externals.c:1639 +#: ../libsvn_wc/externals.c:1722 #, c-format msgid "Illegal repository root URL '%s'" -msgstr "éæ³çæ¬åºæ ¹ URL â%sâ" +msgstr "éæ³çæ¬åºæ ¹ URL '%s'" -#: ../libsvn_wc/externals.c:1684 +#: ../libsvn_wc/externals.c:1767 #, c-format msgid "The external relative URL '%s' cannot have backpaths, i.e. '..'" -msgstr "å¤é¨ç¸å¯¹ URL â%sâ ä¸è½å å«åéè·¯å¾ï¼ä¾å¦ â..â" +msgstr "å¤é¨å¼ç¨ç¸å¯¹ URL '%s' ä¸è½å å«åéè·¯å¾ï¼ä¾å¦ '..'" -#: ../libsvn_wc/externals.c:1712 +#: ../libsvn_wc/externals.c:1795 #, c-format msgid "Unrecognized format for the relative external URL '%s'" -msgstr "å¤é¨ç¸å¯¹ URL â%sâ çæ ¼å¼æ æ³è¯å«" +msgstr "å¤é¨å¼ç¨ç¸å¯¹ URL '%s' çæ ¼å¼æ æ³è¯å«" #: ../libsvn_wc/lock.c:529 #, c-format msgid "Path '%s' ends in '%s', which is unsupported for this operation" -msgstr "è·¯å¾â%sâ以â%sâç»æï¼æ¤æä½ä¸æ¯æ" +msgstr "è·¯å¾'%s'以'%s'ç»æï¼æ¤æä½ä¸æ¯æ" -#: ../libsvn_wc/lock.c:773 +#: ../libsvn_wc/lock.c:775 #, c-format msgid "Working copy '%s' locked" -msgstr "å·¥ä½å¯æ¬â%sâå·²ç»éå®" +msgstr "å·¥ä½å¯æ¬'%s'å·²ç»éå®" -#: ../libsvn_wc/lock.c:918 +#: ../libsvn_wc/lock.c:920 #, c-format msgid "Unable to check path existence for '%s'" -msgstr "æ æ³æ£æ¥è·¯å¾â%sâæ¯å¦åå¨" +msgstr "æ æ³æ£æ¥è·¯å¾'%s'æ¯å¦åå¨" -#: ../libsvn_wc/lock.c:941 +#: ../libsvn_wc/lock.c:943 #, c-format msgid "Expected '%s' to be a directory but found a file" -msgstr "ææâ%sâæ¯ç®å½ï¼ä½å®æ¯æ件" +msgstr "ææ'%s'æ¯ç®å½ï¼ä½å®æ¯æ件" -#: ../libsvn_wc/lock.c:951 +#: ../libsvn_wc/lock.c:953 #, c-format msgid "Can't retrieve an access baton for non-directory '%s'" msgstr "ä¸è½è·åéç®å½å¯¹è±¡ '%s' ç访é®æ" -#: ../libsvn_wc/lock.c:960 +#: ../libsvn_wc/lock.c:962 #, c-format msgid "Directory '%s' is missing" -msgstr "ç®å½â%sâ丢失" +msgstr "ç®å½'%s'丢失" -#: ../libsvn_wc/lock.c:968 +#: ../libsvn_wc/lock.c:970 #, c-format msgid "Working copy '%s' is not locked" -msgstr "å·¥ä½å¯æ¬â%sâæªè¢«éå®" +msgstr "å·¥ä½å¯æ¬'%s'æªè¢«éå®" -#: ../libsvn_wc/lock.c:1382 ../libsvn_wc/wc_db.c:15664 -#: ../libsvn_wc/wc_db_update_move.c:116 +#: ../libsvn_wc/lock.c:1384 ../libsvn_wc/wc_db.c:5067 +#: ../libsvn_wc/wc_db.c:16358 ../libsvn_wc/wc_db_update_move.c:186 #, c-format msgid "No write-lock in '%s'" -msgstr "â%sâ没æåå ¥éå®" +msgstr "'%s'没æåå ¥éå®" -#: ../libsvn_wc/lock.c:1496 +#: ../libsvn_wc/lock.c:1498 #, c-format msgid "Can't obtain lock on non-directory '%s'." msgstr "ä¸è½è·åéç®å½å¯¹è±¡ '%s' çé" #: ../libsvn_wc/merge.c:1285 ../libsvn_wc/props.c:232 -#, fuzzy, c-format +#, c-format msgid "Can't merge into conflicted node '%s'" -msgstr "æ æ³åå ¥æ件â%sâ" +msgstr "æ æ³å并å°æå²çªçèç¹ '%s'" #: ../libsvn_wc/merge.c:1328 ../libsvn_wc/props.c:248 #, c-format msgid "The property '%s' may not be merged into '%s'." -msgstr "å±æ§ â%sâ ä¸è½åå¹¶å° â%sâã" +msgstr "å±æ§ '%s' ä¸è½åå¹¶å° '%s'ã" -#: ../libsvn_wc/node.c:887 -#, fuzzy, c-format +#: ../libsvn_wc/node.c:749 +#, c-format msgid "Incomplete copy information on path '%s'." -msgstr "å¤å¶æºè·¯å¾â%sâæ æ" +msgstr "è·¯å¾ '%s' ä¸çå¤å¶ä¿¡æ¯ä¸å®æ´ã" -#: ../libsvn_wc/node.c:1052 +#: ../libsvn_wc/node.c:915 #, c-format msgid "'%s' is not the root of the working copy '%s'" -msgstr "â%sâä¸æ¯å·¥ä½å¯æ¬â%sâçæ ¹" +msgstr "'%s'ä¸æ¯å·¥ä½å¯æ¬'%s'çæ ¹" #: ../libsvn_wc/old-and-busted.c:123 msgid "Invalid escape sequence" @@ -8125,32 +10973,32 @@ msgstr "å ¥å£æå¤ç»æ" #: ../libsvn_wc/old-and-busted.c:203 #, c-format msgid "Entry contains non-canonical path '%s'" -msgstr "å ¥å£å å«ä¸è§èçè·¯å¾ â%sâ" +msgstr "å ¥å£å å«ä¸è§èçè·¯å¾ '%s'" #: ../libsvn_wc/old-and-busted.c:275 #, c-format msgid "Invalid value for field '%s'" -msgstr "â%sâåçå¼æ æ" +msgstr "'%s'åçå¼æ æ" #: ../libsvn_wc/old-and-busted.c:347 #, c-format msgid "Found an unexpected \\0 in the file external '%s'" -msgstr "å¨å¤é¨å¼ç¨çæ件 â%sâ ä¸ï¼åç°ä¸ææç \\0" +msgstr "å¨å¤é¨å¼ç¨çæ件 '%s' ä¸ï¼åç°ä¸ææç \\0" #: ../libsvn_wc/old-and-busted.c:391 #, c-format msgid "Illegal file external revision kind %d for path '%s'" -msgstr "éæ³çå¤é¨å¼ç¨æ件ççæ¬ç±»å %dï¼å¨è·¯å¾ â%sâ ä¸" +msgstr "éæ³çå¤é¨å¼ç¨æ件ççæ¬ç±»å %dï¼å¨è·¯å¾ '%s' ä¸" #: ../libsvn_wc/old-and-busted.c:489 ../libsvn_wc/old-and-busted.c:847 #, c-format msgid "Entry '%s' has invalid node kind" -msgstr "å ¥å£â%sâææ æçèç¹ç§ç±»" +msgstr "å ¥å£'%s'ææ æçèç¹ç§ç±»" #: ../libsvn_wc/old-and-busted.c:510 ../libsvn_wc/old-and-busted.c:827 #, c-format msgid "Entry for '%s' has invalid repository root" -msgstr "â%sâæ¡ç®ççæ¬åºæ ¹ç®å½æ æ" +msgstr "'%s'æ¡ç®ççæ¬åºæ ¹ç®å½æ æ" #: ../libsvn_wc/old-and-busted.c:531 ../libsvn_wc/old-and-busted.c:872 #, c-format @@ -8165,12 +11013,12 @@ msgstr "å ¥å£ '%s' ææ æ 'depth' å #: ../libsvn_wc/old-and-busted.c:732 #, c-format msgid "Entry '%s' has invalid '%s' value" -msgstr "å ¥å£â%sâææ æå¼â%sâ" +msgstr "å ¥å£'%s'ææ æå¼'%s'" #: ../libsvn_wc/old-and-busted.c:1085 #, c-format msgid "XML parser failed in '%s'" -msgstr "XML 解æå¨å¤±è´¥äºâ%sâ" +msgstr "XML 解æå¨å¤±è´¥äº'%s'" #: ../libsvn_wc/old-and-busted.c:1141 msgid "Missing default entry" @@ -8184,190 +11032,196 @@ msgstr "é»è®¤æ¡ç®æ²¡æçæ¬å·" msgid "Default entry is missing URL" msgstr "é»è®¤æ¡ç®æ²¡æURL" -#: ../libsvn_wc/old-and-busted.c:1230 +#: ../libsvn_wc/old-and-busted.c:1231 #, c-format msgid "Invalid version line in entries file of '%s'" -msgstr "â%sâæ件ä¸ççæ¬è¡æ æ" +msgstr "'%s'æ件ä¸ççæ¬è¡æ æ" -#: ../libsvn_wc/old-and-busted.c:1247 +#: ../libsvn_wc/old-and-busted.c:1248 msgid "Missing entry terminator" msgstr "æ¡ç®ç»ç»ç¬¦ä¸¢å¤±" -#: ../libsvn_wc/old-and-busted.c:1250 +#: ../libsvn_wc/old-and-busted.c:1251 msgid "Invalid entry terminator" msgstr "æ æçæ¡ç®ç»æ¢ç¬¦" -#: ../libsvn_wc/old-and-busted.c:1254 +#: ../libsvn_wc/old-and-busted.c:1255 #, c-format msgid "Error at entry %d in entries file for '%s':" -msgstr "æ¡ç®æ件ä¸çæ¡ç® %d åºéäº â%sâ" +msgstr "æ¡ç®æ件ä¸çæ¡ç® %d åºéäº '%s'" #: ../libsvn_wc/props.c:211 #, c-format msgid "The node '%s' does not have properties in this state." msgstr "èç¹ '%s' 没æå±æ§ã" -#: ../libsvn_wc/props.c:376 +#: ../libsvn_wc/props.c:377 #, c-format msgid "" "Trying to add new property '%s'\n" "but the property already exists.\n" -msgstr "è¯å¾å¢å æ°å±æ§ â%sâï¼ä½æ¯å®å·²ç»åå¨ã\n" +msgstr "è¯å¾å¢å æ°å±æ§ '%s'ï¼ä½æ¯å®å·²ç»åå¨ã\n" -#: ../libsvn_wc/props.c:385 +#: ../libsvn_wc/props.c:386 #, c-format msgid "" "Trying to add new property '%s'\n" "but the property has been locally deleted.\n" -msgstr "è¯å¾å¢å æ°å±æ§ â%sâï¼ä½æ¯å®å·²ç»å¨æ¬å°è¢«å é¤ã\n" +msgstr "è¯å¾å¢å æ°å±æ§ '%s'ï¼ä½æ¯å®å·²ç»å¨æ¬å°è¢«å é¤ã\n" -#: ../libsvn_wc/props.c:399 +#: ../libsvn_wc/props.c:400 #, c-format msgid "" "Trying to delete property '%s'\n" "but the property has been locally added.\n" -msgstr "è¯å¾å é¤å±æ§ â%sâï¼ä½æ¯å®å·²ç»å¨æ¬å°è¢«å¢å ã\n" +msgstr "è¯å¾å é¤å±æ§ '%s'ï¼ä½æ¯å®å·²ç»å¨æ¬å°è¢«å¢å ã\n" -#: ../libsvn_wc/props.c:415 +#: ../libsvn_wc/props.c:416 #, c-format msgid "" "Trying to delete property '%s'\n" "but the property has been locally modified.\n" -msgstr "è¯å¾å é¤å±æ§ â%sâï¼ä½æ¯å®å·²ç»å¨æ¬å°è¢«ä¿®æ¹ã\n" +msgstr "è¯å¾å é¤å±æ§ '%s'ï¼ä½æ¯å®å·²ç»å¨æ¬å°è¢«ä¿®æ¹ã\n" -#: ../libsvn_wc/props.c:425 +#: ../libsvn_wc/props.c:426 #, c-format msgid "" "Trying to delete property '%s'\n" "but the property has been locally deleted and had a different value.\n" -msgstr "è¯å¾å é¤å±æ§ â%sâï¼ä½æ¯å®å·²ç»å¨æ¬å°è¢«ä¿®æ¹ï¼å¹¶ä¸å ·æä¸åçåå¼ã\n" +msgstr "è¯å¾å é¤å±æ§ '%s'ï¼ä½æ¯å®å·²ç»å¨æ¬å°è¢«å é¤ï¼å¹¶ä¸åå¼ä¸åã\n" -#: ../libsvn_wc/props.c:437 +#: ../libsvn_wc/props.c:438 #, c-format msgid "" "Trying to delete property '%s'\n" "but the local property value is different.\n" -msgstr "è¯å¾å é¤å±æ§ â%sâï¼ä½æ¯å®çæ¬å°åå¼ä¸åã\n" +msgstr "è¯å¾å é¤å±æ§ '%s'ï¼ä½æ¯å®çæ¬å°åå¼ä¸åã\n" -#: ../libsvn_wc/props.c:456 +#: ../libsvn_wc/props.c:457 #, c-format msgid "" "Trying to change property '%s'\n" "but the local property value conflicts with the incoming change.\n" -msgstr "è¯å¾ä¿®æ¹å±æ§ â%sâï¼ä½æ¯å®çæ¬å°åå¼ä¸åã\n" +msgstr "" +"è¯å¾ä¿®æ¹å±æ§ '%s'ï¼\n" +"ä½æ¬å°å±æ§å¼ä¸ä¼ å ¥çä¿®æ¹å²çªã\n" -#: ../libsvn_wc/props.c:464 +#: ../libsvn_wc/props.c:465 #, c-format msgid "" "Trying to change property '%s'\n" "but the property has already been locally changed to a different value.\n" -msgstr "è¯å¾ä¿®æ¹å±æ§ â%sâï¼ä½æ¯å®çæ¬å°åå¼å·²ç»æ¹åã\n" +msgstr "" +"è¯å¾ä¿®æ¹å±æ§ '%s'ï¼\n" +"ä½è¯¥å±æ§å·²å¨æ¬å°æ¹æäºä¸åçå¼ã\n" -#: ../libsvn_wc/props.c:471 +#: ../libsvn_wc/props.c:472 #, c-format msgid "" "Trying to change property '%s'\n" "but the property has been locally deleted.\n" -msgstr "è¯å¾ä¿®æ¹å±æ§ â%sâï¼ä½æ¯å®å·²ç»å¨æ¬å°è¢«å é¤ã\n" +msgstr "è¯å¾ä¿®æ¹å±æ§ '%s'ï¼ä½æ¯å®å·²ç»å¨æ¬å°è¢«å é¤ã\n" -#: ../libsvn_wc/props.c:477 +#: ../libsvn_wc/props.c:478 #, c-format msgid "" "Trying to change property '%s'\n" "but the property has been locally added with a different value.\n" -msgstr "è¯å¾ä¿®æ¹å±æ§ â%sâï¼ä½æ¯å®å·²ç»å¨æ¬å°è¢«å¢å ï¼å¹¶ä¸åå¼ä¸åã\n" +msgstr "è¯å¾ä¿®æ¹å±æ§ '%s'ï¼ä½æ¯å®å·²ç»å¨æ¬å°è¢«å¢å ï¼å¹¶ä¸åå¼ä¸åã\n" -#: ../libsvn_wc/props.c:483 +#: ../libsvn_wc/props.c:484 #, c-format msgid "" "Trying to change property '%s'\n" "but the property does not exist locally.\n" -msgstr "è¯å¾ä¿®æ¹å±æ§ â%sâï¼ä½æ¯å®å¹¶ä¸åå¨ã\n" +msgstr "" +"è¯å¾ä¿®æ¹å±æ§ '%s'ï¼\n" +"ä½è¯¥å±æ§å¨æ¬å°ä¸åå¨ã\n" -#: ../libsvn_wc/props.c:593 +#: ../libsvn_wc/props.c:594 msgid "<<<<<<< (local property value)" msgstr "<<<<<<< (æ¬å°å±æ§å¼)" -#: ../libsvn_wc/props.c:594 -#, fuzzy +#: ../libsvn_wc/props.c:595 msgid ">>>>>>> (incoming 'changed to' value)" -msgstr ">>>>>>> (æå¡å¨ç«¯å±æ§å¼)" +msgstr ">>>>>>> (ä¼ å ¥ç 'æ´æ¹ä¸º' å¼)" -#: ../libsvn_wc/props.c:595 +#: ../libsvn_wc/props.c:596 msgid "||||||| (incoming 'changed from' value)" -msgstr "" +msgstr "||||||| (ä¼ å ¥ç 'æ´æ¹èª' å¼)" -#: ../libsvn_wc/props.c:632 +#: ../libsvn_wc/props.c:633 msgid "Local property value:\n" msgstr "æ¬å°å±æ§åå¼:\n" -#: ../libsvn_wc/props.c:634 ../libsvn_wc/props.c:645 +#: ../libsvn_wc/props.c:635 ../libsvn_wc/props.c:646 msgid "Cannot display: property value is binary data\n" msgstr "æ æ³æ¾ç¤º: å±æ§åå¼ä¸ºäºè¿å¶æ°æ®\n" -#: ../libsvn_wc/props.c:643 +#: ../libsvn_wc/props.c:644 msgid "Incoming property value:\n" msgstr "å¤é¨å±æ§åå¼:\n" -#: ../libsvn_wc/props.c:1580 ../libsvn_wc/props.c:1989 -#: ../libsvn_wc/props.c:2090 +#: ../libsvn_wc/props.c:1582 ../libsvn_wc/props.c:1991 +#: ../libsvn_wc/props.c:2092 #, c-format msgid "Property '%s' is an entry property" -msgstr "å±æ§ â%sâ æ¯æ¡ç®å±æ§" +msgstr "å±æ§ '%s' æ¯æ¡ç®å±æ§" -#: ../libsvn_wc/props.c:1617 ../libsvn_wc/props.c:1624 +#: ../libsvn_wc/props.c:1619 ../libsvn_wc/props.c:1626 msgid "Failed to load properties" msgstr "å è½½å±æ§å¤±è´¥" -#: ../libsvn_wc/props.c:1660 +#: ../libsvn_wc/props.c:1662 #, c-format msgid "Cannot set '%s' on a directory ('%s')" -msgstr "æ æ³è®¾å®â%sâäºç®å½ (â%sâ)" +msgstr "æ æ³è®¾å®'%s'äºç®å½ ('%s')" -#: ../libsvn_wc/props.c:1667 +#: ../libsvn_wc/props.c:1669 #, c-format msgid "Cannot set '%s' on a file ('%s')" -msgstr "æ æ³è®¾å®â%sâäºæ件 (â%sâ)" +msgstr "æ æ³è®¾å®'%s'äºæ件 ('%s')" -#: ../libsvn_wc/props.c:1746 -#, fuzzy, c-format +#: ../libsvn_wc/props.c:1748 +#, c-format msgid "Can't set '%s': file '%s' has binary mime type property" -msgstr "æ件â%sâæäºè¿å¶ç mime ç±»åå±æ§" +msgstr "æ æ³è®¾ç½® '%s': æ件 '%s' å ·æäºè¿å¶ MIME ç±»åå±æ§" -#: ../libsvn_wc/props.c:1791 +#: ../libsvn_wc/props.c:1793 msgid "Failed to load current properties" msgstr "å è½½å½åå±æ§å¤±è´¥" -#: ../libsvn_wc/props.c:2011 +#: ../libsvn_wc/props.c:2013 #, c-format msgid "Can't set properties on '%s': invalid status for updating properties." msgstr "ä¸è½å¯¹ '%s' 设置å±æ§: 对äºæ´æ°å±æ§ï¼ç¶æéæ³ã" -#: ../libsvn_wc/props.c:2095 -#, fuzzy, c-format +#: ../libsvn_wc/props.c:2097 +#, c-format msgid "Property '%s' is a WC property, not a regular property" -msgstr "å±æ§ â%sâ ä¸æ¯å¸¸è§å±æ§" +msgstr "å±æ§ '%s' æ¯å·¥ä½å¯æ¬å±æ§ï¼ä¸æ¯å¸¸è§å±æ§" -#: ../libsvn_wc/props.c:2189 +#: ../libsvn_wc/props.c:2188 #, c-format msgid "Unrecognized line ending style '%s' for '%s'" -msgstr "æ æ³è¯å«çè¡ç»ææ ·å¼â%sâï¼å¯¹äºâ%sâ" +msgstr "æ æ³è¯å«çè¡ç»ææ ·å¼'%s'ï¼å¯¹äº'%s'" #. scratch_ -#: ../libsvn_wc/props.c:2240 +#: ../libsvn_wc/props.c:2239 #, c-format -msgid " (%d more duplicate targets found)" -msgstr " (åç°äº %d 个éå¤ç®æ )" +msgid " (%d more duplicate target found)" +msgid_plural " (%d more duplicate targets found)" +msgstr[0] " (è¿åç° %d 个éå¤ç®æ )" -#: ../libsvn_wc/props.c:2245 -#, fuzzy, c-format +#: ../libsvn_wc/props.c:2246 +#, c-format msgid "Invalid %s property on '%s': target '%s' appears more than once%s" -msgstr "æ æå±æ§ %s ä½äº â%sâ: ç®æ â%sâ å å« â..â ææ¯ç»å¯¹è·¯å¾" +msgstr "'%s' ç %s å±æ§æ æ: ç®æ '%s' åºç°å¤æ¬¡%s" -#: ../libsvn_wc/props.c:2276 +#: ../libsvn_wc/props.c:2277 #, c-format msgid "Cannot set non-inheritable mergeinfo on a non-directory ('%s')" -msgstr "æ æ³å¨éç®å½å¯¹è±¡(â%sâ)设å®ä¸å¯ç»§æ¿çå并信æ¯" +msgstr "æ æ³å¨éç®å½å¯¹è±¡('%s')设å®ä¸å¯ç»§æ¿çå并信æ¯" #: ../libsvn_wc/relocate.c:111 #, c-format @@ -8398,6 +11252,17 @@ msgstr "éæ³è¿ç§»ç®æ : '%s' (ä¸æ¯ msgid "Invalid relocation destination: '%s' (does not point to target)" msgstr "éæ³è¿ç§»ç®æ : '%s' (没ææåç®æ )" +#: ../libsvn_wc/textbase.c:310 +#, c-format +msgid "No local pristine contents for file '%s'" +msgstr "æ件 '%s' 没ææ¬å°åå§å 容" + +#: ../libsvn_wc/textbase.c:339 ../libsvn_wc/textbase.c:369 +#: ../libsvn_wc/textbase.c:416 +#, c-format +msgid "Node '%s' has no pristine text" +msgstr "èç¹ '%s' 没æåå§å 容" + #: ../libsvn_wc/tree_conflicts.c:137 msgid "Unknown enumeration value in tree conflict description" msgstr "æ å²çªæè¿°ä¸ææªç¥çæ举å¼" @@ -8413,18 +11278,18 @@ msgstr "æ å²çªæè¿°ä¸æéæ³çå #: ../libsvn_wc/tree_conflicts.c:230 msgid "Empty 'victim' field in tree conflict description" -msgstr "æ å²çªæè¿°ä¸ç âvictimâ å为空" +msgstr "æ å²çªæè¿°ä¸ç 'victim' å为空" #: ../libsvn_wc/tree_conflicts.c:238 msgid "Invalid 'node_kind' field in tree conflict description" -msgstr "æ å²çªæè¿°ä¸æéæ³ç ânode_kindâ å" +msgstr "æ å²çªæè¿°ä¸æéæ³ç 'node_kind' å" #: ../libsvn_wc/tree_conflicts.c:432 #, c-format msgid "Attempt to add tree conflict that already exists at '%s'" -msgstr "è¯å¾å¢å å·²ç»ä½äºâ%sâçæ å²çª" +msgstr "è¯å¾å¢å å·²ç»ä½äº'%s'çæ å²çª" -#: ../libsvn_wc/update_editor.c:978 +#: ../libsvn_wc/update_editor.c:1018 #, c-format msgid "" "Checksum mismatch while updating '%s':\n" @@ -8435,36 +11300,36 @@ msgstr "" " ææ: %s\n" " å®é : %s\n" -#: ../libsvn_wc/update_editor.c:1113 -#, fuzzy, c-format +#: ../libsvn_wc/update_editor.c:1159 +#, c-format msgid "'%s' is not valid as filename in directory '%s'" -msgstr "â%sâä¸æ¯æ件æç®å½" +msgstr "'%s' ä¸æ¯ç®å½ '%s' ä¸çæææ件å" -#: ../libsvn_wc/update_editor.c:1585 -#, fuzzy, c-format +#: ../libsvn_wc/update_editor.c:1541 +#, c-format msgid "Unexpected attempt to add a node at path '%s'" -msgstr "â%sâææå¤çä¸åèç¹" +msgstr "æå¤å°è¯å¨è·¯å¾ '%s' å¤æ·»å èç¹" -#: ../libsvn_wc/update_editor.c:1596 +#: ../libsvn_wc/update_editor.c:1552 #, c-format msgid "Unexpected attempt to edit, delete, or replace a node at path '%s'" -msgstr "" +msgstr "æå¤å°è¯å¨è·¯å¾ '%s' å¤ç¼è¾ãå é¤ææ¿æ¢èç¹" -#: ../libsvn_wc/update_editor.c:2018 +#: ../libsvn_wc/update_editor.c:1934 #, c-format msgid "Failed to add directory '%s': object of the same name as the administrative directory" -msgstr "æ æ³å¢å ç®å½â%sâ: 对象ä¸ç®¡çç®å½åå" +msgstr "æ æ³å¢å ç®å½'%s': 对象ä¸ç®¡çç®å½åå" -#: ../libsvn_wc/update_editor.c:2684 +#: ../libsvn_wc/update_editor.c:2610 msgid "Couldn't do property merge" msgstr "æ æ³è¿è¡å±æ§å并" -#: ../libsvn_wc/update_editor.c:3194 +#: ../libsvn_wc/update_editor.c:3149 #, c-format msgid "Failed to add file '%s': object of the same name as the administrative directory" -msgstr "æ æ³å¢å æ件â%sâ: 对象ä¸ç®¡çç®å½åå" +msgstr "æ æ³å¢å æ件'%s': 对象ä¸ç®¡çç®å½åå" -#: ../libsvn_wc/update_editor.c:3716 +#: ../libsvn_wc/update_editor.c:3884 #, c-format msgid "" "Checksum mismatch for '%s':\n" @@ -8475,339 +11340,363 @@ msgstr "" " ææ: %s\n" " è®°å½: %s\n" -#: ../libsvn_wc/update_editor.c:5371 +#: ../libsvn_wc/update_editor.c:5553 #, c-format msgid "Node '%s' exists." -msgstr "èç¹â%sâå·²åå¨" +msgstr "èç¹'%s'å·²åå¨" -#: ../libsvn_wc/update_editor.c:5431 +#: ../libsvn_wc/update_editor.c:5613 #, c-format msgid "Copyfrom-url '%s' has different repository root than '%s'" -msgstr "Copyfrom-urlâ%sâä¸â%sâççæ¬åºæ ¹ç®å½ä¸ç¸å" +msgstr "Copyfrom-url'%s'ä¸'%s'ççæ¬åºæ ¹ç®å½ä¸ç¸å" -#: ../libsvn_wc/update_editor.c:5643 -#, fuzzy, c-format +#: ../libsvn_wc/update_editor.c:5813 +#, c-format msgid "'%s' is not an unmodified copied directory" -msgstr "â%sâä¸æ¯æ件æç®å½" +msgstr "'%s' ä¸æ¯æªä¿®æ¹çå¤å¶ç®å½" -#: ../libsvn_wc/update_editor.c:5654 +#: ../libsvn_wc/update_editor.c:5824 #, c-format msgid "Copyfrom '%s' doesn't match original location of '%s'" -msgstr "" +msgstr "å¤å¶æº '%s' ä¸ '%s' çåå§ä½ç½®ä¸å¹é " -#: ../libsvn_wc/upgrade.c:255 +#: ../libsvn_wc/upgrade.c:257 #, c-format msgid "Missing end of line in wcprops file for '%s'" -msgstr "wcpropsæ件â%sâ丢失äºè¡ç»æ符" +msgstr "wcpropsæ件'%s'丢失äºè¡ç»æ符" -#: ../libsvn_wc/upgrade.c:631 +#: ../libsvn_wc/upgrade.c:633 #, c-format msgid "Working copy '%s' can't be upgraded because the repository root is not available and can't be retrieved" -msgstr "ç±äºçæ¬åºçæ ¹ä¸å¯ç¨ï¼å¹¶ä¸ä¸è½æ¾åï¼æ以工ä½å¯æ¬â%sâä¸è½è¢«å级" +msgstr "ç±äºçæ¬åºçæ ¹ä¸å¯ç¨ï¼å¹¶ä¸ä¸è½æ¾åï¼æ以工ä½å¯æ¬'%s'ä¸è½è¢«å级" -#: ../libsvn_wc/upgrade.c:638 +#: ../libsvn_wc/upgrade.c:640 #, c-format msgid "Working copy '%s' can't be upgraded because the repository uuid is not available and can't be retrieved" -msgstr "ç±äºçæ¬åºç UUID ä¸å¯ç¨ï¼å¹¶ä¸ä¸è½æ¾åï¼æ以工ä½å¯æ¬â%sâä¸è½è¢«å级" +msgstr "ç±äºçæ¬åºç UUID ä¸å¯ç¨ï¼å¹¶ä¸ä¸è½æ¾åï¼æ以工ä½å¯æ¬'%s'ä¸è½è¢«å级" -#: ../libsvn_wc/upgrade.c:645 +#: ../libsvn_wc/upgrade.c:647 #, c-format msgid "Working copy '%s' can't be upgraded because it doesn't have a url" -msgstr "ç±äºæ²¡æ URLï¼æ以工ä½å¯æ¬â%sâä¸è½è¢«å级" +msgstr "ç±äºæ²¡æ URLï¼æ以工ä½å¯æ¬'%s'ä¸è½è¢«å级" -#: ../libsvn_wc/upgrade.c:690 -msgid "Error parsing tree conflict skel" -msgstr "解ææ å²çªéª¨æ¶åºé" - -#: ../libsvn_wc/upgrade.c:1172 +#: ../libsvn_wc/upgrade.c:751 #, c-format -msgid "The working copy at '%s' is format 22 with WORKING nodes; use a format 22 client to diff/revert before using this client" -msgstr "ä½äº '%s' çå·¥ä½å¯æ¬æ¯æ WORKING èç¹çæ ¼å¼ 22ï¼è¯·å 使ç¨æ¯ææ ¼å¼ 22 ç客æ·ç«¯æ¯è¾/è¿ååï¼å使ç¨æ¤å®¢æ·ç«¯" +msgid "The properties of '%s' are in an indeterminate state and cannot be upgraded. See issue #2530." +msgstr "'%s' çå±æ§å¤äºä¸ç¡®å®çç¶æï¼ä¸è½æ´æ°ã详æ åè§é®é¢ #2530ã" -#: ../libsvn_wc/upgrade.c:1216 +#: ../libsvn_wc/upgrade.c:763 #, c-format -msgid "The working copy at '%s' is format 26 with conflicts; use a format 26 client to resolve before using this client" -msgstr "ä½äº '%s' çå·¥ä½å¯æ¬æ¯æå²çªçæ ¼å¼ 26ï¼è¯·å 使ç¨æ¯ææ ¼å¼ 26 ç客æ·ç«¯è§£å³å²çªåï¼å使ç¨æ¤å®¢æ·ç«¯" +msgid "Insufficient NODES rows for '%s'" +msgstr "'%s' çèç¹è¡æ°ä¸è¶³" -#: ../libsvn_wc/upgrade.c:1723 +#: ../libsvn_wc/upgrade.c:1524 msgid "Cannot upgrade with existing logs; run a cleanup operation on this working copy using a client version which is compatible with this working copy's format (such as the version you are upgrading from), then retry the upgrade with the current version" -msgstr "ä¸è½å¨ææ¥å¿æ件æ¶å级ï¼è¯·å 使ç¨ä¸æ¤å·¥ä½å¯æ¬æ ¼å¼å ¼å®¹ç客æ·ç«¯(ä¾å¦çææ¤å·¥ä½å¯æ¬ç客æ·ç«¯)æ§è¡æ¸ çæä½ï¼åå级" +msgstr "ä¸è½å¨åå¨éçæ¥å¿æ¶å级ï¼è¯·å ç¨ä¸æ¤å·¥ä½å¯æ¬æ ¼å¼å ¼å®¹ç客æ·ç«¯çæ¬(ä¾å¦ä½ å级å使ç¨ççæ¬)对该工ä½å¯æ¬æ§è¡æ¸ çï¼ç¶ååç¨å½åçæ¬éè¯å级" -#: ../libsvn_wc/upgrade.c:1792 +#: ../libsvn_wc/upgrade.c:1593 msgid "This working copy is corrupt and cannot be upgraded. Please check out a new working copy." -msgstr "æ¤å·¥ä½å¯æ¬æåï¼ä¸è½å级ã请éæ°æ£åºã" +msgstr "æ¤å·¥ä½å¯æ¬å·²æåï¼æ æ³å级ã请æ£åºæ°çå·¥ä½å¯æ¬ã" -#: ../libsvn_wc/upgrade.c:1837 +#: ../libsvn_wc/upgrade.c:1641 msgid "(unreleased development version)" msgstr "(æªåå¸çå¼åçæ¬)" -#: ../libsvn_wc/upgrade.c:1853 +#: ../libsvn_wc/upgrade.c:1657 +#, c-format +msgid "Can't determine working copy format for Subversion %d.%d.%d" +msgstr "æ æ³ç¡®å® Subversion %d.%d.%d çå·¥ä½å¯æ¬æ ¼å¼" + +#: ../libsvn_wc/upgrade.c:1740 #, c-format msgid "Working copy '%s' is too old (format %d, created by Subversion %s)" msgstr "å·¥ä½å¯æ¬ '%s' æ ¼å¼å¤ªæ§ (æ ¼å¼ %d, Subversion %s å建)" -#: ../libsvn_wc/upgrade.c:1863 +#: ../libsvn_wc/upgrade.c:1750 #, c-format msgid "Working copy '%s' is an old development version (format %d); to upgrade it, use a format 18 client, then use 'tools/dev/wc-ng/bump-to-19.py', then use the current client" msgstr "å·¥ä½å¯æ¬ '%s' æ¯æ§å¼åçæ¬çæ ¼å¼(%d); 请使ç¨æ ¼å¼ 18 客æ·ç«¯æ¸ çåï¼ åä½¿ç¨ 'tools/dev/wc-ng/bump-to-19.py' å级ï¼æå使ç¨å½å客æ·ç«¯" -#: ../libsvn_wc/upgrade.c:2092 -#, fuzzy, c-format +#: ../libsvn_wc/upgrade.c:1760 +#, c-format +msgid "Working copy '%s' is an old development version (format %d); to upgrade it, use a Subversion 1.7-1.9 client, then use the current client" +msgstr "å·¥ä½å¯æ¬ '%s' æ¯æ§çå¼åçæ¬ (æ ¼å¼ %d)ï¼è¦å级å®ï¼è¯·ä½¿ç¨ Subversion 1.7-1.9 客æ·ç«¯ï¼ç¶å使ç¨æ¤å®¢æ·ç«¯" + +#: ../libsvn_wc/upgrade.c:1770 +#, c-format +msgid "Working copy version %s (format %d) is not supported by client version %s." +msgstr "å·¥ä½å¯æ¬çæ¬ %s (æ ¼å¼ %d) ä¸è¢«å®¢æ·ç«¯çæ¬ %s æ¯æã" + +#: ../libsvn_wc/upgrade.c:1777 +#, c-format +msgid "Working copy with format %d can't be created by client version %s." +msgstr "æ ¼å¼ä¸º %d çå·¥ä½å¯æ¬æ æ³è¢«å®¢æ·ç«¯çæ¬ %s å建ã" + +#: ../libsvn_wc/upgrade.c:1946 +#, c-format msgid "Can't upgrade '%s' as it is not a working copy" -msgstr "ä¸è½å级 '%s'ï¼å 为å®ä¸æ¯ 1.7 ä¹åçå·¥ä½å¯æ¬ç®å½" +msgstr "æ æ³å级 '%s'ï¼å 为å®ä¸æ¯å·¥ä½å¯æ¬" -#: ../libsvn_wc/upgrade.c:2141 -#, fuzzy, c-format +#: ../libsvn_wc/upgrade.c:1995 +#, c-format msgid "Can't upgrade '%s' as it is not a working copy root, the root is '%s'" -msgstr "ä¸è½å级 '%s'ï¼å 为å®ä¸æ¯ 1.7 ä¹åçå·¥ä½å¯æ¬æ ¹ç®å½ï¼æ ¹ç®å½æ¯ '%s'" +msgstr "æ æ³å级 '%s'ï¼å 为å®ä¸æ¯å·¥ä½å¯æ¬æ ¹ï¼æ ¹æ¯ '%s'" -#: ../libsvn_wc/wc_db.c:446 +#: ../libsvn_wc/wc_db.c:445 #, c-format msgid "No REPOSITORY table entry for id '%ld'" msgstr "对äºæ è¯ '%ld' 没æ REPOSITORY è¡¨å ¥å£" -#: ../libsvn_wc/wc_db.c:762 +#: ../libsvn_wc/wc_db.c:778 #, c-format msgid "The file '%s' has no checksum." msgstr "æ件 '%s' 没ææ ¡éªåã" -#: ../libsvn_wc/wc_db.c:2533 ../libsvn_wc/wc_db.c:2949 -#: ../libsvn_wc/wc_db.c:9478 +#: ../libsvn_wc/wc_db.c:2209 +#, c-format +msgid "Path '%s' is not moved" +msgstr "è·¯å¾ '%s' æªè¢«ç§»å¨" + +#: ../libsvn_wc/wc_db.c:2683 ../libsvn_wc/wc_db.c:3118 +#: ../libsvn_wc/wc_db.c:10021 #, c-format msgid "The node '%s' has a corrupt checksum value." msgstr "èç¹ '%s' çæ ¡éªåæåã" -#: ../libsvn_wc/wc_db.c:2753 +#: ../libsvn_wc/wc_db.c:2903 #, c-format msgid "The node '%s' has a BASE status that has no properties." -msgstr "" +msgstr "èç¹ '%s' ç BASE ç¶æ没æå±æ§ã" -#: ../libsvn_wc/wc_db.c:3579 +#: ../libsvn_wc/wc_db.c:3645 ../libsvn_wc/wc_db.c:3765 #, c-format msgid "The node '%s' is not an external." -msgstr "èç¹ â%sâ ä¸æ¯å¤é¨å¯¹è±¡" +msgstr "èç¹ '%s' ä¸æ¯å¤é¨å¼ç¨å¯¹è±¡" -#: ../libsvn_wc/wc_db.c:3993 +#: ../libsvn_wc/wc_db.c:4177 #, c-format msgid "Expected node '%s' to be deleted." -msgstr "ææèç¹â%sâ被å é¤ã" +msgstr "ææèç¹'%s'被å é¤ã" -#: ../libsvn_wc/wc_db.c:6522 ../libsvn_wc/wc_db.c:6601 +#: ../libsvn_wc/wc_db.c:7023 ../libsvn_wc/wc_db.c:7070 #, c-format msgid "Can't revert '%s' without reverting children" msgstr "ä¸è½æ¢å¤ '%s'ï¼èä¸æ¢å¤å©åã" -#: ../libsvn_wc/wc_db.c:6709 +#: ../libsvn_wc/wc_db.c:7184 #, c-format msgid "Can't revert '%s' without reverting parent" msgstr "ä¸è½æ¢å¤ '%s'ï¼èä¸æ¢å¤ç¶äº²ã" -#: ../libsvn_wc/wc_db.c:6844 +#: ../libsvn_wc/wc_db.c:7319 #, c-format msgid "Unsupported depth for revert of '%s'" msgstr "对äºæ¢å¤ '%s'ï¼å ¶æ·±åº¦ä¸åæ¯æ" -#: ../libsvn_wc/wc_db.c:7430 -#, fuzzy, c-format +#: ../libsvn_wc/wc_db.c:7889 +#, c-format msgid "The node '%s' is not a committed directory" -msgstr "èç¹ '%s' ä¸æ¯æ件" +msgstr "èç¹ '%s' ä¸æ¯å·²æ交çç®å½" -#: ../libsvn_wc/wc_db.c:7816 +#: ../libsvn_wc/wc_db.c:8279 #, c-format msgid "Cannot delete '%s' as '%s' is excluded by server" msgstr "ä¸è½å é¤ '%s'ï¼å 为 '%s' 被æå¡å¨æé¤" -#: ../libsvn_wc/wc_db.c:7827 -#, fuzzy, c-format +#: ../libsvn_wc/wc_db.c:8290 +#, c-format msgid "Cannot delete '%s' as it is excluded by server" -msgstr "ä¸è½å é¤ '%s'ï¼å 为 '%s' 被æå¡å¨æé¤" +msgstr "æ æ³å é¤ '%s'ï¼å 为å®è¢«æå¡å¨æé¤" -#: ../libsvn_wc/wc_db.c:7834 -#, fuzzy, c-format +#: ../libsvn_wc/wc_db.c:8297 +#, c-format msgid "Cannot delete '%s' as it is excluded" -msgstr "ä¸è½å é¤ '%s'ï¼å 为 '%s' 被æå¡å¨æé¤" +msgstr "æ æ³å é¤ '%s'ï¼å 为å®å·²è¢«æé¤" -#: ../libsvn_wc/wc_db.c:8286 -#, fuzzy, c-format +#: ../libsvn_wc/wc_db.c:8754 +#, c-format msgid "Cannot move '%s' to '%s' because they are not in the same working copy" -msgstr "ä¸è½éæ°å®ä½ '%s'ï¼å 为å®ä¸æ¯å·¥ä½å¯æ¬æ ¹ç®å½" +msgstr "æ æ³å° '%s' 移å¨å° '%s'ï¼å 为å®ä»¬ä¸å¨åä¸ä¸ªå·¥ä½å¯æ¬ä¸" -#: ../libsvn_wc/wc_db.c:8644 +#: ../libsvn_wc/wc_db.c:8893 +#, c-format +msgid "Encountered invalid node state in column %d of info query to working copy database" +msgstr "å¨å·¥ä½å¯æ¬æ°æ®åºç info æ¥è¯¢ç第 %d åéå°æ æçèç¹ç¶æ" + +#: ../libsvn_wc/wc_db.c:9148 #, c-format msgid "Corrupt data for '%s'" msgstr "'%s' çæ°æ®æå" -#: ../libsvn_wc/wc_db.c:8718 -#, fuzzy, c-format +#: ../libsvn_wc/wc_db.c:9220 +#, c-format msgid "Error reading node '%s'" -msgstr "读åé® â%sâ çä¿®æ¹æ¶åºé" +msgstr "读åèç¹ '%s' æ¶åºé" -#: ../libsvn_wc/wc_db.c:8954 +#: ../libsvn_wc/wc_db.c:9478 #, c-format msgid "The node '%s' comes from unexpected repository '%s', expected '%s'; if this node is a file external using the correct URL in the external definition can fix the problem, see issue #4087" -msgstr "èç¹â%sâæ¥èªä¸ææççæ¬åºâ%sâï¼ææççæ¬åºæ¯â%sâï¼å¦ææ¤èç¹æ¯æ件å¤é¨å¼ç¨ï¼é£ä¹å¨å¤é¨å®ä¹ä¸ä½¿ç¨æ£ç¡®ç URL å¯ä»¥ä¿®æ£è¿ä¸ªé®é¢ï¼è¯·åè§é®é¢ #4087 以è·å¾è¯¦ç»ä¿¡æ¯" +msgstr "èç¹'%s'æ¥èªä¸ææççæ¬åº'%s'ï¼ææççæ¬åºæ¯'%s'ï¼å¦ææ¤èç¹æ¯æ件å¤é¨å¼ç¨ï¼é£ä¹å¨å¤é¨å®ä¹ä¸ä½¿ç¨æ£ç¡®ç URL å¯ä»¥ä¿®æ£è¿ä¸ªé®é¢ï¼è¯·åè§é®é¢ #4087 以è·å¾è¯¦ç»ä¿¡æ¯" -#: ../libsvn_wc/wc_db.c:9603 +#: ../libsvn_wc/wc_db.c:10152 #, c-format msgid "The node '%s' is not in working copy '%s'" -msgstr "èç¹â%sâä¸å¨å·¥ä½å¯æ¬â%sâä¸" +msgstr "èç¹'%s'ä¸å¨å·¥ä½å¯æ¬'%s'ä¸" -#: ../libsvn_wc/wc_db.c:9640 +#: ../libsvn_wc/wc_db.c:10189 #, c-format msgid "The node '%s' is not installable" msgstr "èç¹ '%s' ä¸å¯å®è£ " -#: ../libsvn_wc/wc_db.c:10071 ../libsvn_wc/wc_db.c:10330 -#, fuzzy, c-format +#: ../libsvn_wc/wc_db.c:10630 ../libsvn_wc/wc_db.c:10827 +#, c-format msgid "The node '%s' has a status that has no properties." -msgstr "èç¹ '%s' 没æå±æ§ã" +msgstr "èç¹ '%s' çç¶æ没æå±æ§ã" -#: ../libsvn_wc/wc_db.c:12151 +#: ../libsvn_wc/wc_db.c:12823 #, c-format msgid "Expected node '%s' to be added." -msgstr "ææèç¹â%sâ被å¢å ã" - -#: ../libsvn_wc/wc_db.c:12458 -#, fuzzy, c-format -msgid "Path '%s' was not moved here" -msgstr "è·¯å¾â%sâä¸æ¯æ件" - -#: ../libsvn_wc/wc_db.c:12875 -#, c-format -msgid "The properties of '%s' are in an indeterminate state and cannot be upgraded. See issue #2530." -msgstr "'%s' çå±æ§å¤äºä¸ç¡®å®çç¶æï¼ä¸è½æ´æ°ã详æ åè§é®é¢ #2530ã" +msgstr "ææèç¹'%s'被å¢å ã" -#: ../libsvn_wc/wc_db.c:12887 +#: ../libsvn_wc/wc_db.c:13152 #, c-format -msgid "Insufficient NODES rows for '%s'" -msgstr "'%s' çèç¹è¡æ°ä¸è¶³" +msgid "Path '%s' was not moved here" +msgstr "è·¯å¾ '%s' æªè¢«ç§»å°æ¤å¤" -#: ../libsvn_wc/wc_db.c:13034 +#: ../libsvn_wc/wc_db.c:13340 #, c-format -msgid "Repository '%s' not found in the database" -msgstr "å¨æ°æ®åºä¸æ¾ä¸å°çæ¬åºâ%sâ" +msgid "Node '%s' is not shadowed" +msgstr "èç¹ '%s' ä¸æ¯è¢«é®è½ç" -#: ../libsvn_wc/wc_db.c:14026 ../libsvn_wc/wc_db.c:14074 +#: ../libsvn_wc/wc_db.c:14585 ../libsvn_wc/wc_db.c:14633 #, c-format msgid "'%s' is already locked." msgstr "'%s' å·²ç»éå®ã" -#: ../libsvn_wc/wc_db.c:14031 ../libsvn_wc/wc_db.c:14082 +#: ../libsvn_wc/wc_db.c:14590 ../libsvn_wc/wc_db.c:14641 #, c-format msgid "Working copy '%s' locked." msgstr "å·¥ä½å¯æ¬ '%s' å·²ç»éå®ã" -#: ../libsvn_wc/wc_db.c:14105 -#, fuzzy, c-format +#: ../libsvn_wc/wc_db.c:14664 +#, c-format msgid "Failed to lock working copy '%s'." -msgstr "å¨å·¥ä½å¯æ¬ä¸å®ä½ âcopyfromâ çè·¯å¾å¤±è´¥ã" +msgstr "éå®å·¥ä½å¯æ¬ '%s' 失败ã" -#: ../libsvn_wc/wc_db.c:14154 +#: ../libsvn_wc/wc_db.c:14713 #, c-format msgid "'%s' is already locked via '%s'." msgstr "'%s' å·²ç»éè¿ '%s' éå®ã" -#: ../libsvn_wc/wc_db.c:14328 +#: ../libsvn_wc/wc_db.c:14887 #, c-format msgid "Working copy not locked at '%s'." msgstr "å·¥ä½å¯æ¬ '%s' æªè¢«éå®ã" -#: ../libsvn_wc/wc_db.c:14711 +#: ../libsvn_wc/wc_db.c:15386 #, c-format msgid "Modification of '%s' already exists" -msgstr "â%sâ çä¿®æ¹å·²åå¨" +msgstr "'%s' çä¿®æ¹å·²åå¨" #. If EXPRESSION is false, cause the caller to return an SVN_ERR_WC_CORRUPT #. * error, showing EXPRESSION and the caller's LOCAL_RELPATH in the message. -#: ../libsvn_wc/wc_db.c:15353 +#: ../libsvn_wc/wc_db.c:15983 #, c-format msgid "database inconsistency at local_relpath='%s' verifying expression '%s'" -msgstr "æ°æ®åºä¸ä¸è´ï¼è·¯å¾æ¯â%sâï¼æ ¡éªè¡¨è¾¾å¼æ¯â%sâ" +msgstr "æ°æ®åºä¸ä¸è´ï¼è·¯å¾æ¯'%s'ï¼æ ¡éªè¡¨è¾¾å¼æ¯'%s'" -#: ../libsvn_wc/wc_db.c:15478 -#, fuzzy, c-format +#: ../libsvn_wc/wc_db.c:16172 +#, c-format msgid "Can't upgrade '%s' as it is not a working copy root" -msgstr "ä¸è½å级 '%s'ï¼å 为å®ä¸æ¯ 1.7 ä¹åçå·¥ä½å¯æ¬ç®å½" +msgstr "æ æ³å级 '%s'ï¼å 为å®ä¸æ¯å·¥ä½å¯æ¬æ ¹" -#: ../libsvn_wc/wc_db.c:15484 -#, fuzzy, c-format +#: ../libsvn_wc/wc_db.c:16178 +#, c-format msgid "Working copy '%s' is too old and must be upgraded to at least format %d, as created by Subversion %s" -msgstr "å·¥ä½å¯æ¬ '%s' æ ¼å¼å¤ªæ§ (æ ¼å¼ %d, Subversion %s å建)" +msgstr "å·¥ä½å¯æ¬ '%s' 太æ§ï¼å¿ é¡»è³å°å级å°æ ¼å¼ %dï¼ç± Subversion %s å建" -#: ../libsvn_wc/wc_db.c:15502 -#, fuzzy +#: ../libsvn_wc/wc_db.c:16196 msgid "Working copy upgrade failed" -msgstr "å·¥ä½å¯æ¬â%sâå·²ç»éå®" - -#: ../libsvn_wc/wc_db.c:15603 -#, fuzzy, c-format -msgid "The path '%s' is not in the working copy '%s'" -msgstr "è·¯å¾ â%sâ ä¸å¨å·¥ä½å¯æ¬ä¸" +msgstr "å·¥ä½å¯æ¬å级失败" -#: ../libsvn_wc/wc_db_pristine.c:128 ../libsvn_wc/wc_db_pristine.c:467 +#: ../libsvn_wc/wc_db.c:16297 #, c-format -msgid "The pristine text with checksum '%s' was not found" -msgstr "æ¾ä¸å°æ ¡éªå为â%sâçåå§å 容" +msgid "The path '%s' is not in the working copy '%s'" +msgstr "è·¯å¾ '%s' ä¸å¨å·¥ä½å¯æ¬ '%s' ä¸" -#: ../libsvn_wc/wc_db_pristine.c:194 +#: ../libsvn_wc/wc_db_pristine.c:191 #, c-format msgid "Pristine text '%s' not present" -msgstr "åå§å 容 â%sâ ä¸åå¨" +msgstr "åå§å 容 '%s' ä¸åå¨" -#: ../libsvn_wc/wc_db_pristine.c:237 +#: ../libsvn_wc/wc_db_pristine.c:241 #, c-format msgid "Can't read '%s' from pristine store because no checksum supplied" msgstr "没ææä¾æ ¡éªåï¼å æ¤ä¸è½ä»åå§å 容ä»åºä¸è¯»å '%s'" -#: ../libsvn_wc/wc_db_pristine.c:320 -#, c-format -msgid "New pristine text '%s' has different size: %ld versus %ld" -msgstr "æ°åå§å 容 '%s' æä¸åç大å°: %ld ä¸ %ld" +#: ../libsvn_wc/wc_db_pristine.c:449 +msgid "Unable to create pristine install stream" +msgstr "æ æ³å建åå§å 容å®è£ æµ" -#: ../libsvn_wc/wc_db_pristine.c:506 +#: ../libsvn_wc/wc_db_pristine.c:582 #, c-format msgid "The pristine text with MD5 checksum '%s' was not found" -msgstr "æ¾ä¸å° MD5 æ ¡éªå为â%sâçåå§å 容" +msgstr "æ¾ä¸å° MD5 æ ¡éªå为'%s'çåå§å 容" -#: ../libsvn_wc/wc_db_update_move.c:310 ../libsvn_wc/wc_db_update_move.c:334 -#, fuzzy, c-format -msgid "'%s' already in conflict" -msgstr "â%sâ å·²åå¨" +#: ../libsvn_wc/wc_db_textbase.c:198 +msgid "Checksum mismatch while fetching text base" +msgstr "è·åææ¬åºç¡æ¶æ ¡éªåä¸å¹é " -#: ../libsvn_wc/wc_db_update_move.c:1322 -#, fuzzy, c-format -msgid "'%s' is not in conflict" -msgstr "â%sâä¸æ¯ä¸ä¸ªæ件" +#: ../libsvn_wc/wc_db_textbase.c:284 ../libsvn_wc/wc_db_textbase.c:296 +#: ../libsvn_wc/wc_db_textbase.c:310 ../libsvn_wc/wc_db_textbase.c:319 +#, c-format +msgid "Unexpected entry for '%s'" +msgstr "'%s' çæå¤æ¡ç®" -#: ../libsvn_wc/wc_db_update_move.c:1335 -#, fuzzy, c-format -msgid "'%s' is not a tree-conflict victim" -msgstr "'%s' ä¸æ¯ç¸å¯¹è·¯å¾" +#: ../libsvn_wc/wc_db_update_move.c:226 +#, c-format +msgid "'%s' is not deleted" +msgstr "'%s' æªè¢«å é¤" -#: ../libsvn_wc/wc_db_update_move.c:1721 -#, fuzzy, c-format -msgid "Cannot auto-resolve tree-conflict on '%s'" -msgstr "æ æ³å é¤ç®å½ â%sâ" +#: ../libsvn_wc/wc_db_update_move.c:465 ../libsvn_wc/wc_db_update_move.c:489 +#, c-format +msgid "'%s' already in conflict" +msgstr "'%s' å·²å¤äºå²çªç¶æ" -#: ../libsvn_wc/wc_db_update_move.c:1781 +#: ../libsvn_wc/wc_db_update_move.c:2235 #, c-format -msgid "Cannot apply update because move source %s' is a mixed-revision working copy" -msgstr "" +msgid "Cannot apply update because '%s' is a switched path (please switch it back to its original URL and try again)" +msgstr "æ æ³åºç¨æ´æ°ï¼å 为 '%s' æ¯åæ¢çè·¯å¾(请å°å ¶åæ¢ååå§ URL åéè¯)" -#: ../libsvn_wc/wc_db_update_move.c:1792 +#: ../libsvn_wc/wc_db_update_move.c:2244 #, c-format -msgid "Cannot apply update because move source '%s' is a switched subtree" -msgstr "" +msgid "Cannot apply update because '%s' is a mixed-revision working copy (please update and try again)" +msgstr "æ æ³åºç¨æ´æ°ï¼å 为 '%s' æ¯æ··åçæ¬å·¥ä½å¯æ¬(请æ´æ°åéè¯)" -#: ../libsvn_wc/wc_db_update_move.c:1842 -#, fuzzy, c-format +#: ../libsvn_wc/wc_db_update_move.c:2297 +#, c-format msgid "The node '%s' has not been moved away" -msgstr "èç¹ '%s' ä¸è½æ¢å¤ã" +msgstr "èç¹ '%s' æªè¢«ç§»èµ°" -#: ../libsvn_wc/wc_db_update_move.c:1871 -#, fuzzy, c-format -msgid "'%s' is not deleted" -msgstr "â%sâ 没æ被éå®" +#: ../libsvn_wc/wc_db_update_move.c:2761 +#, c-format +msgid "Cannot merge local changes from '%s' because '%s' already contains other local changes (please commit or revert these other changes and try again)" +msgstr "æ æ³ä» '%s' å并æ¬å°æ´æ¹ï¼å 为 '%s' å·²å å«å ¶ä»æ¬å°æ´æ¹(请å æ交ææ¢å¤è¿äºæ´æ¹)" + +#: ../libsvn_wc/wc_db_update_move.c:4160 +#, c-format +msgid "'%s' is not in conflict" +msgstr "'%s' ä¸å¤äºå²çªç¶æ" + +#: ../libsvn_wc/wc_db_update_move.c:4173 +#, c-format +msgid "'%s' is not a valid tree-conflict victim" +msgstr "'%s' ä¸æ¯ææçæ å²çªå害è " + +#: ../libsvn_wc/wc_db_update_move.c:4186 +#, c-format +msgid "'%s' is already a moved away tree-conflict" +msgstr "'%s' å·²ç»æ¯ç§»èµ°çæ å²çª" #: ../libsvn_wc/wc_db_util.c:69 #, c-format @@ -8815,16 +11704,16 @@ msgid "Missing a row in WCROOT." msgstr "WCROOT ä¸ä¸¢å¤±äºä¸è¡ã" #: ../libsvn_wc/wc_db_util.c:136 -#, fuzzy, c-format +#, c-format msgid "Working copy database '%s' not found" -msgstr "å·¥ä½å¯æ¬â%sâæªè¢«éå®" +msgstr "å·¥ä½å¯æ¬æ°æ®åº '%s' æªæ¾å°" -#: ../libsvn_wc/wc_db_wcroot.c:284 +#: ../libsvn_wc/wc_db_wcroot.c:319 #, c-format msgid "Working copy format of '%s' is too old (%d); please check out your working copy again" -msgstr "â%sâçå·¥ä½å¯æ¬æ ¼å¼å¤ªæ§(%d)ï¼è¯·éæ°ååºå·¥ä½å¯æ¬" +msgstr "'%s' çå·¥ä½å¯æ¬æ ¼å¼å¤ªæ§(%d)ï¼è¯·éæ°æ£åºå·¥ä½å¯æ¬" -#: ../libsvn_wc/wc_db_wcroot.c:294 +#: ../libsvn_wc/wc_db_wcroot.c:329 #, c-format msgid "" "This client is too old to work with the working copy at\n" @@ -8832,1115 +11721,232 @@ msgid "" "You need to get a newer Subversion client. For more details, see\n" " https://subversion.apache.org/faq.html#working-copy-format-change\n" msgstr "" -"æ¤å®¢æ·ç«¯å¯¹äºå·¥ä½å¯æ¬â%sâ太æ§(æ ¼å¼ %d)ã\n" +"æ¤å®¢æ·ç«¯å¯¹äºå·¥ä½å¯æ¬'%s'太æ§(æ ¼å¼ %d)ã\n" "ä½ éè¦åå¾æ´æ°ç Subversion 客æ·ç«¯ãåè§\n" " https://subversion.apache.org/faq.html#working-copy-format-change\n" "以è·å¾æ´è¯¦ç»çä¿¡æ¯ã\n" -#: ../libsvn_wc/wc_db_wcroot.c:315 +#: ../libsvn_wc/wc_db_wcroot.c:350 msgid "Cleanup with an older 1.7 client before upgrading with this client" msgstr "请å¨ç¨æ¤å®¢æ·ç«¯å级ä¹åï¼ç¨æ§ç 1.7 客æ·ç«¯æ¸ ç" -#: ../libsvn_wc/wc_db_wcroot.c:326 +#: ../libsvn_wc/wc_db_wcroot.c:362 #, c-format msgid "" "The working copy at '%s'\n" "is too old (format %d) to work with client version '%s' (expects format %d). You need to upgrade the working copy first.\n" msgstr "" +"ä½äº '%s' çå·¥ä½å¯æ¬\n" +"å¤ªæ§ (æ ¼å¼ %d)ï¼æ æ³ä¸å®¢æ·ç«¯çæ¬ '%s' (æææ ¼å¼ %d) ä¸èµ·å·¥ä½ãä½ éè¦å级\n" -#: ../libsvn_wc/wc_db_wcroot.c:404 +#: ../libsvn_wc/wc_db_wcroot.c:371 +#, c-format +msgid "" +"The working copy at '%s'\n" +"is too old (format %d) to work with client version '%s' (expects format %d to %d). You need to upgrade the working copy first.\n" +msgstr "" +"ä½äº '%s' çå·¥ä½å¯æ¬\n" +"å¤ªæ§ (æ ¼å¼ %d)ï¼æ æ³ä¸å®¢æ·ç«¯çæ¬ '%s' (æææ ¼å¼ %d å° %d) ä¸èµ·å·¥ä½ãä½ éè¦å级\n" + +#: ../libsvn_wc/wc_db_wcroot.c:451 #, c-format msgid "The symlink at '%s' points nowhere" msgstr "符å·è¿æ¥ '%s' 没ææåä»»ä½å°æ¹" -#: ../libsvn_wc/wc_db_wcroot.c:673 +#: ../libsvn_wc/wc_db_wcroot.c:805 #, c-format msgid "Missing a row in WCROOT for '%s'." msgstr "WCROOT ä¸ç '%s' 丢失äºä¸è¡ã" -#: ../libsvn_wc/wc_db_wcroot.c:728 -#, fuzzy, c-format +#: ../libsvn_wc/wc_db_wcroot.c:860 +#, c-format msgid "The working copy at '%s' is corrupt." -msgstr "å·¥ä½å¯æ¬çåèæ件æå" +msgstr "ä½äº '%s' çå·¥ä½å¯æ¬å·²æåã" -#: ../libsvn_wc/wc_db_wcroot.c:744 -#, fuzzy, c-format +#: ../libsvn_wc/wc_db_wcroot.c:876 +#, c-format msgid "The working copy database at '%s' is missing." -msgstr "å·¥ä½å¯æ¬ä¸¢å¤±" +msgstr "ä½äº '%s' çå·¥ä½å¯æ¬æ°æ®åºç¼ºå¤±ã" -#: ../libsvn_wc/wc_db_wcroot.c:753 -#, fuzzy, c-format +#: ../libsvn_wc/wc_db_wcroot.c:885 +#, c-format msgid "The working copy database at '%s' is corrupt." -msgstr "å·¥ä½å¯æ¬çåèæ件æå" +msgstr "ä½äº '%s' çå·¥ä½å¯æ¬æ°æ®åºå·²æåã" -#: ../libsvn_wc/wc_db_wcroot.c:911 +#: ../libsvn_wc/wc_db_wcroot.c:1045 #, c-format msgid "'%s' is not a working copy root" msgstr "'%s' ä¸æ¯å·¥ä½å¯æ¬æ ¹ç®å½" -#: ../libsvn_wc/workqueue.c:513 +#: ../libsvn_wc/working_file_writer.c:77 +msgid "Unable to create file install stream" +msgstr "æ æ³å建æ件å®è£ æµ" + +#: ../libsvn_wc/workqueue.c:550 #, c-format msgid "Can't install '%s' from pristine store, because no checksum is recorded for this file" msgstr "æ件 '%s' 没ææ ¡éªåè®°å½ï¼å æ¤ä¸è½ä»åå§å 容ä»åºä¸å®è£ " -#: ../libsvn_wc/workqueue.c:1469 -#, fuzzy, c-format +#: ../libsvn_wc/workqueue.c:1502 +#, c-format msgid "Unrecognized work item in the queue" -msgstr "â%sâ å ³èçéåä¸ç项ç®æ æ³è¯å«" +msgstr "éåä¸ææ æ³è¯å«çå·¥ä½é¡¹" -#: ../libsvn_wc/workqueue.c:1552 +#: ../libsvn_wc/workqueue.c:1585 #, c-format msgid "Failed to run the WC DB work queue associated with '%s', work item %d %s" -msgstr "" - -#: ../svn-bench/help-cmd.c:49 -#, fuzzy -msgid "" -"usage: svn-bench <subcommand> [options] [args]\n" -"Subversion benchmarking tool.\n" -"Type 'svn-bench help <subcommand>' for help on a specific subcommand.\n" -"Type 'svn-bench --version' to see the program version and RA modules\n" -" or 'svn-bench --version --quiet' to see just the version number.\n" -"\n" -"Most subcommands take file and/or directory arguments, recursing\n" -"on the directories. If no arguments are supplied to such a\n" -"command, it recurses on the current directory (inclusive) by default.\n" -"\n" -"Available subcommands:\n" -msgstr "" -"ç¨æ³: svn <subcommand> [options] [args]\n" -"Subversion å½ä»¤è¡å®¢æ·ç«¯ï¼çæ¬ %sã\n" -"使ç¨âsvn help <subcommand>â æ¾ç¤ºåå½ä»¤ç帮å©ä¿¡æ¯ã\n" -"使ç¨âsvn --versionâæ¥çç¨åºççæ¬å·åçæ¬åºè®¿é®æ¨¡åï¼æè \n" -"使ç¨âsvn --version --quietâåªæ¥çç¨åºççæ¬å·ã\n" -"\n" -"大å¤æ°çåå½ä»¤å¯æ¥åæ件æç®å½åæ°ï¼å¯¹ç®å½è¿è¡éå½å¤çã\n" -"å¦æ没ææå®åæ°ï¼é»è®¤å¯¹å½åç®å½(å å«å½åç®å½)éå½å¤çã\n" -"\n" -"å¯ç¨çåå½ä»¤: \n" - -#: ../svn-bench/help-cmd.c:62 ../svn/help-cmd.c:66 -msgid "" -"Subversion is a tool for version control.\n" -"For additional information, see https://subversion.apache.org/\n" -msgstr "" -"Subversion æ¯çæ¬æ§å¶å·¥å ·ã\n" -"欲åå¾è¯¦ç»èµæï¼è¯·åé https://subversion.apache.org/\n" - -#: ../svn-bench/help-cmd.c:66 ../svn/help-cmd.c:70 ../svnrdump/svnrdump.c:700 -#: ../svnsync/svnsync.c:1910 -msgid "" -"The following repository access (RA) modules are available:\n" -"\n" -msgstr "" -"å¯ä½¿ç¨ä»¥ä¸ççæ¬åºè®¿é®æ¨¡å: \n" -"\n" - -#: ../svn-bench/notify.c:107 ../svn/notify.c:246 -#, c-format -msgid "Skipped missing target: '%s'\n" -msgstr "è·³è¿ç¼ºå°çç®æ : â%sâ\n" - -#: ../svn-bench/notify.c:114 ../svn/notify.c:253 -#, c-format -msgid "Skipped target: '%s' -- copy-source is missing\n" -msgstr "è·³è¿ç®æ : '%s' -- copy-source 丢失\n" - -#: ../svn-bench/notify.c:121 ../svn/notify.c:258 -#, c-format -msgid "Skipped '%s'\n" -msgstr "è·³è¿â%sâ\n" - -#: ../svn-bench/notify.c:128 ../svn/notify.c:265 -#, c-format -msgid "Skipped '%s' -- An obstructing working copy was found\n" -msgstr "忽ç¥â%sâ -- åç°éç¢å·¥ä½å¯æ¬\n" - -#: ../svn-bench/notify.c:135 ../svn/notify.c:271 -#, c-format -msgid "Skipped '%s' -- Has no versioned parent\n" -msgstr "å·²è·³è¿ '%s' -- 没æå·²çæ¬æ§å¶çç¶äº²\n" - -#: ../svn-bench/notify.c:142 ../svn/notify.c:277 -#, c-format -msgid "Skipped '%s' -- Access denied\n" -msgstr "å·²è·³è¿ '%s' -- æç»è®¿é®\n" - -#: ../svn-bench/notify.c:149 ../svn/notify.c:283 -#, c-format -msgid "Skipped '%s' -- Node remains in conflict\n" -msgstr "å·²è·³è¿ '%s' -- èç¹å¤äºå²çªç¶æ\n" - -#: ../svn-bench/notify.c:233 ../svn/notify.c:354 -#, c-format -msgid "Restored '%s'\n" -msgstr "å·²è¿åâ%sâ\n" - -#: ../svn-bench/notify.c:239 ../svn/notify.c:359 -#, c-format -msgid "Reverted '%s'\n" -msgstr "å·²æ¢å¤â%sâ\n" - -#: ../svn-bench/notify.c:245 ../svn/notify.c:364 -#, c-format -msgid "Failed to revert '%s' -- try updating instead.\n" -msgstr "æ æ³æ¢å¤â%sâ-- 请æ¹ç¨æ´æ°è¯è¯ã\n" - -#: ../svn-bench/notify.c:253 ../svn/notify.c:371 -#, c-format -msgid "Resolved conflicted state of '%s'\n" -msgstr "â%sâçå²çªç¶æ已解å³\n" - -#: ../svn-bench/notify.c:344 ../svn-bench/notify.c:384 ../svn/notify.c:461 -#: ../svn/notify.c:498 -#, c-format -msgid "> applied hunk ## -%lu,%lu +%lu,%lu ## with offset %s" -msgstr "> å·²åºç¨å ## -%lu,%lu +%lu,%lu ##ï¼å移 %s" - -#: ../svn-bench/notify.c:361 ../svn-bench/notify.c:398 ../svn/notify.c:478 -#: ../svn/notify.c:512 -#, c-format -msgid "> applied hunk @@ -%lu,%lu +%lu,%lu @@ with offset %s" -msgstr "> å·²åºç¨å @@ -%lu,%lu +%lu,%lu @@ å移 %s" - -#: ../svn-bench/notify.c:419 ../svn/notify.c:530 -#, c-format -msgid "> applied hunk ## -%lu,%lu +%lu,%lu ## with fuzz %lu (%s)\n" -msgstr "> å·²åºç¨å ## -%lu,%lu +%lu,%lu ## æ¨¡ç³ %lu (%s)\n" - -#: ../svn-bench/notify.c:429 ../svn/notify.c:540 -#, c-format -msgid "> applied hunk @@ -%lu,%lu +%lu,%lu @@ with fuzz %lu\n" -msgstr "> å·²åºç¨å @@ -%lu,%lu +%lu,%lu @@ æ¨¡ç³ %lu\n" - -#: ../svn-bench/notify.c:447 ../svn/notify.c:556 -#, c-format -msgid "> rejected hunk ## -%lu,%lu +%lu,%lu ## (%s)\n" -msgstr "> å·²æç»å ## -%lu,%lu +%lu,%lu ## (%s)\n" - -#: ../svn-bench/notify.c:456 ../svn/notify.c:565 -#, c-format -msgid "> rejected hunk @@ -%lu,%lu +%lu,%lu @@\n" -msgstr "> å·²æç»çå @@ -%lu,%lu +%lu,%lu @@\n" - -#: ../svn-bench/notify.c:470 ../svn/notify.c:577 -#, c-format -msgid "> hunk ## -%lu,%lu +%lu,%lu ## already applied (%s)\n" -msgstr "> å ## -%lu,%lu +%lu,%lu ## å·²ç»åºç¨ (%s)\n" - -#: ../svn-bench/notify.c:480 ../svn/notify.c:587 -#, c-format -msgid "> hunk @@ -%lu,%lu +%lu,%lu @@ already applied\n" -msgstr "> å @@ -%lu,%lu +%lu,%lu @@ å·²ç»åºç¨\n" - -#: ../svn-bench/notify.c:542 ../svn/notify.c:644 -#, c-format -msgid "" -"\n" -"Fetching external item into '%s':\n" -msgstr "" -"\n" -"æ£å¨åå¾å¤é¨é¡¹ç®è³ '%s':\n" - -#: ../svn-bench/notify.c:568 ../svn/notify.c:668 -#, c-format -msgid "Error handling externals definition for '%s':" -msgstr "å¤çå¤é¨å¼ç¨â%sâæ¶åºéï¼" - -#: ../svn-bench/notify.c:581 ../svn/notify.c:681 -#, c-format -msgid "Updating '%s':\n" -msgstr "æ£å¨å级 '%s':\n" - -#: ../svn-bench/notify.c:595 ../svn/notify.c:694 -#, c-format -msgid "Exported external at revision %ld.\n" -msgstr "已导åºçæ¬ %ld çå¤é¨é¡¹ç®ã\n" - -#: ../svn-bench/notify.c:596 ../svn/notify.c:695 -#, c-format -msgid "Exported revision %ld.\n" -msgstr "已导åºçæ¬ %ldã\n" - -#: ../svn-bench/notify.c:604 ../svn/notify.c:702 -#, c-format -msgid "Checked out external at revision %ld.\n" -msgstr "ååºçæ¬ %ld çå¤é¨é¡¹ç®ã\n" - -#: ../svn-bench/notify.c:605 ../svn/notify.c:703 -#, c-format -msgid "Checked out revision %ld.\n" -msgstr "ååºçæ¬ %ldã\n" - -#: ../svn-bench/notify.c:616 ../svn/notify.c:713 -#, c-format -msgid "Updated external to revision %ld.\n" -msgstr "æ´æ°å¤é¨é¡¹ç®è³çæ¬ %ldã\n" - -#: ../svn-bench/notify.c:617 ../svn/notify.c:714 -#, c-format -msgid "Updated to revision %ld.\n" -msgstr "æ´æ°å°çæ¬ %ldã\n" - -#: ../svn-bench/notify.c:625 ../svn/notify.c:721 -#, c-format -msgid "External at revision %ld.\n" -msgstr "å¤é¨é¡¹ç®çæ¬ %ldã\n" - -#: ../svn-bench/notify.c:626 ../svn/notify.c:722 -#, c-format -msgid "At revision %ld.\n" -msgstr "çæ¬ %ldã\n" - -#: ../svn-bench/notify.c:638 ../svn/notify.c:733 -#, c-format -msgid "External export complete.\n" -msgstr "å®æå¤é¨é¡¹ç®å¯¼åºã\n" - -#: ../svn-bench/notify.c:639 ../svn/notify.c:734 -#, c-format -msgid "Export complete.\n" -msgstr "å®æ导åºã\n" - -#: ../svn-bench/notify.c:646 ../svn/notify.c:740 -#, c-format -msgid "External checkout complete.\n" -msgstr "å®æååºå¤é¨é¡¹ç®ã\n" - -#: ../svn-bench/notify.c:647 ../svn/notify.c:741 -#, c-format -msgid "Checkout complete.\n" -msgstr "å®æååºã\n" - -#: ../svn-bench/notify.c:654 ../svn/notify.c:747 -#, c-format -msgid "External update complete.\n" -msgstr "å®æå¤é¨é¡¹ç®æ´æ°ã\n" - -#: ../svn-bench/notify.c:655 ../svn/notify.c:748 -#, c-format -msgid "Update complete.\n" -msgstr "å®ææ´æ°ã\n" - -#: ../svn-bench/notify.c:671 ../svn/notify.c:762 -#, c-format -msgid "" -"\n" -"Performing status on external item at '%s':\n" -msgstr "" -"\n" -"对å¤é¨é¡¹ç®â%sâè¿è¡ç¶ææ£æ¥:\n" - -#: ../svn-bench/notify.c:679 ../svn/notify.c:775 -#, c-format -msgid "Status against revision: %6ld\n" -msgstr "çæ¬ %6ld çç¶æ\n" - -#: ../svn-bench/notify.c:688 ../svn/notify.c:783 -#, c-format -msgid "Sending copy of %s\n" -msgstr "æ£å¨åéå¯æ¬ %s\n" - -#: ../svn-bench/notify.c:689 ../svn/notify.c:784 -#, c-format -msgid "Sending %s\n" -msgstr "æ£å¨åé %s\n" - -#: ../svn-bench/notify.c:700 ../svn/notify.c:794 -#, c-format -msgid "Adding copy of (bin) %s\n" -msgstr "æ£å¨å¢å (äºè¿å¶) %s\n" - -#: ../svn-bench/notify.c:701 ../svn/notify.c:795 -#, c-format -msgid "Adding (bin) %s\n" -msgstr "æ£å¨å¢å (äºè¿å¶) %s\n" - -#: ../svn-bench/notify.c:709 ../svn/notify.c:802 -#, c-format -msgid "Adding copy of %s\n" -msgstr "æ£å¨å¢å å¯æ¬ %s\n" - -#: ../svn-bench/notify.c:710 ../svn/notify.c:803 -#, c-format -msgid "Adding %s\n" -msgstr "æ£å¨å¢å %s\n" - -#: ../svn-bench/notify.c:719 ../svn/notify.c:811 -#, c-format -msgid "Deleting copy of %s\n" -msgstr "æ£å¨å é¤å¯æ¬ %s\n" - -#: ../svn-bench/notify.c:720 ../svn/notify.c:812 -#, c-format -msgid "Deleting %s\n" -msgstr "æ£å¨å é¤ %s\n" - -#: ../svn-bench/notify.c:729 ../svn/notify.c:820 -#, c-format -msgid "Replacing copy of %s\n" -msgstr "æ£å¨æ¿æ¢å¯æ¬ %s\n" - -#: ../svn-bench/notify.c:730 ../svn/notify.c:821 -#, c-format -msgid "Replacing %s\n" -msgstr "æ£å¨æ¿æ¢ %s\n" - -#: ../svn-bench/notify.c:740 ../svn/notify.c:830 ../svnsync/sync.c:327 -#, c-format -msgid "Transmitting file data " -msgstr "ä¼ è¾æ件æ°æ®" - -#: ../svn-bench/notify.c:749 ../svn/notify.c:837 ../svnadmin/svnadmin.c:2116 -#, c-format -msgid "'%s' locked by user '%s'.\n" -msgstr "â%sâ被ç¨æ·â%sâéå®ã\n" - -#: ../svn-bench/notify.c:755 ../svn/notify.c:842 -#, c-format -msgid "'%s' unlocked.\n" -msgstr "â%sâ解é¤éå®ã\n" - -#: ../svn-bench/notify.c:782 ../svn/notify.c:866 -#, c-format -msgid "--- Merging differences between repository URLs into '%s':\n" -msgstr "--- æ£å¨å并çæ¬åº URL ä¹é´çå·®å¼å° â%sâï¼\n" - -#: ../svn-bench/notify.c:787 ../svn/notify.c:871 -#, c-format -msgid "--- Merging r%ld into '%s':\n" -msgstr "--- æ£å¨å并 r%ld å° â%sâ:\n" - -#: ../svn-bench/notify.c:791 ../svn/notify.c:875 -#, c-format -msgid "--- Reverse-merging r%ld into '%s':\n" -msgstr "--- æ£å¨ååå并 r%ld å° â%sâ:\n" - -#: ../svn-bench/notify.c:795 ../svn/notify.c:879 -#, c-format -msgid "--- Merging r%ld through r%ld into '%s':\n" -msgstr "--- æ£å¨å并 r%ldï¼ç»ç± r%ldï¼å° â%sâ:\n" - -#: ../svn-bench/notify.c:801 ../svn/notify.c:885 -#, c-format -msgid "--- Reverse-merging r%ld through r%ld into '%s':\n" -msgstr "--- æ£å¨ååå并 r%ldï¼ç»ç± r%ldï¼å° â%sâ:\n" - -#: ../svn-bench/notify.c:813 ../svn/notify.c:895 -#, c-format -msgid "--- Recording mergeinfo for merge between repository URLs into '%s':\n" -msgstr "--- è®°å½çæ¬åº URL ä¹é´çå并信æ¯å°â%sâï¼\n" - -#: ../svn-bench/notify.c:823 ../svn/notify.c:905 -#, c-format -msgid "--- Recording mergeinfo for merge of r%ld into '%s':\n" -msgstr "--- è®°å½å并 r%ld å°â%sâçä¿¡æ¯:\n" - -#: ../svn-bench/notify.c:828 ../svn/notify.c:910 -#, c-format -msgid "--- Recording mergeinfo for reverse merge of r%ld into '%s':\n" -msgstr "--- è®°å½ååå并 r%ld å°â%sâçä¿¡æ¯:\n" - -#: ../svn-bench/notify.c:833 ../svn/notify.c:915 -#, c-format -msgid "--- Recording mergeinfo for merge of r%ld through r%ld into '%s':\n" -msgstr "--- è®°å½å并 r%ldï¼ç»ç± r%ldï¼å°â%sâçä¿¡æ¯:\n" - -#: ../svn-bench/notify.c:838 ../svn/notify.c:920 -#, c-format -msgid "--- Recording mergeinfo for reverse merge of r%ld through r%ld into '%s':\n" -msgstr "--- è®°å½ååå并 r%ldï¼ç»ç± r%ldï¼å°â%sâçä¿¡æ¯:\n" - -#: ../svn-bench/notify.c:848 ../svn/notify.c:927 -#, c-format -msgid "--- Eliding mergeinfo from '%s':\n" -msgstr "--- æ£å¨ä» '%s' å é¤å并信æ¯:\n" +msgstr "è¿è¡ä¸ '%s' å ³èçå·¥ä½å¯æ¬æ°æ®åºå·¥ä½éå失败ï¼å·¥ä½é¡¹ %d %s" -#: ../svn-bench/notify.c:856 ../svn/notify.c:934 -#, c-format -msgid "--- Merging differences between foreign repository URLs into '%s':\n" -msgstr "--- æ£å¨å并å¤é¨çæ¬åº URL ä¹é´çå·®å¼å° â%sâï¼\n" - -#: ../svn-bench/notify.c:862 ../svn/notify.c:940 -#, c-format -msgid "--- Merging (from foreign repository) r%ld into '%s':\n" -msgstr "--- æ£å¨å并(ä»å¤é¨çæ¬åº) r%ld å° â%sâï¼\n" - -#: ../svn-bench/notify.c:867 ../svn/notify.c:945 -#, c-format -msgid "--- Reverse-merging (from foreign repository) r%ld into '%s':\n" -msgstr "--- æ£å¨ååå并(ä»å¤é¨çæ¬åº) r%ld å° â%sâ:\n" - -#: ../svn-bench/notify.c:872 ../svn/notify.c:950 -#, c-format -msgid "--- Merging (from foreign repository) r%ld through r%ld into '%s':\n" -msgstr "--- æ£å¨å并(ä»å¤é¨çæ¬åº) r%ldï¼ç»ç± r%ldï¼å° â%sâ:\n" - -#: ../svn-bench/notify.c:878 ../svn/notify.c:956 -#, c-format -msgid "--- Reverse-merging (from foreign repository) r%ld through r%ld into '%s':\n" -msgstr "--- æ£å¨ååå并(ä»å¤é¨çæ¬åº) r%ldï¼ç»ç± r%ldï¼å° â%sâ:\n" - -#: ../svn-bench/notify.c:915 ../svn/notify.c:986 -#, c-format -msgid "property '%s' set on '%s'\n" -msgstr "设置å±æ§ â%sâ äº â%sâ\n" - -#: ../svn-bench/notify.c:923 ../svn/notify.c:992 -#, c-format -msgid "property '%s' deleted from '%s'.\n" -msgstr "å é¤å±æ§ â%sâ äº â%sâã\n" - -#: ../svn-bench/notify.c:931 ../svn/notify.c:998 -#, c-format -msgid "Attempting to delete nonexistent property '%s' on '%s'\n" -msgstr "è¯å¾å é¤ä¸åå¨çå±æ§â%sâäºâ%sâ\n" - -#: ../svn-bench/notify.c:940 ../svn/notify.c:1005 -#, c-format -msgid "property '%s' set on repository revision %ld\n" -msgstr "设å®å±æ§ â%sâ äºçæ¬åºçæ¬ %ld\n" - -#: ../svn-bench/notify.c:948 ../svn/notify.c:1011 -#, c-format -msgid "property '%s' deleted from repository revision %ld\n" -msgstr "å é¤å±æ§ â%sâ äºçæ¬åºçæ¬ %ld\n" - -#: ../svn-bench/notify.c:955 ../svn/notify.c:1016 -#, c-format -msgid "Upgraded '%s'\n" -msgstr "å·²å级çâ%sâ\n" +#: ../svn/add-cmd.c:101 +msgid "Could not add all targets because some targets don't exist" +msgstr "å 为ä¸äºç®æ ä¸åå¨ï¼æ以ä¸è½å¢å å ¨é¨ç®æ " -#: ../svn-bench/notify.c:961 ../svn/notify.c:1020 -#, c-format -msgid "Redirecting to URL '%s':\n" -msgstr "æ£å¨éå®åå° URL '%s':\n" +#: ../svn/add-cmd.c:105 +msgid "Could not add all targets because some targets are already versioned" +msgstr "å 为ä¸äºç®æ å·²ç»çæ¬åï¼æ以ä¸è½å¢å å ¨é¨ç®æ " -#: ../svn-bench/null-export-cmd.c:334 +#: ../svn/auth-cmd.c:71 #, c-format -msgid "" -"%15s directories\n" -"%15s files\n" -"%15s bytes in files\n" -"%15s properties\n" -"%15s bytes in properties\n" -msgstr "" +msgid "Automatic certificate validity check failed because:\n" +msgstr "èªå¨è¯ä¹¦æææ§æ£æ¥å¤±è´¥ï¼å 为:\n" -#: ../svn-bench/null-info-cmd.c:273 +#: ../svn/auth-cmd.c:76 #, c-format -msgid "Number of status notifications received: %d\n" -msgstr "" - -#: ../svn-bench/null-info-cmd.c:283 ../svn/info-cmd.c:684 -msgid "Could not display info for all targets because some targets don't exist" -msgstr "å 为ä¸äºç®æ ä¸åå¨ï¼æ以ä¸è½æ¾ç¤ºå ¨é¨ç®æ " +msgid " The certificate is not yet valid.\n" +msgstr " è¯ä¹¦å°æªçæã\n" -#: ../svn-bench/null-list-cmd.c:153 +#: ../svn/auth-cmd.c:80 #, c-format -msgid "" -"%15s directories\n" -"%15s files\n" -"%15s locks\n" -msgstr "" - -#: ../svn-bench/null-list-cmd.c:166 ../svn/list-cmd.c:422 -msgid "Could not list all targets because some targets don't exist" -msgstr "å 为ä¸äºç®æ ä¸åå¨ï¼æ以ä¸è½ååºå ¨é¨ç®æ " - -#: ../svn-bench/null-log-cmd.c:158 ../svn/log-cmd.c:751 -msgid "-c and -r are mutually exclusive" -msgstr "-c ä¸ -r æ¯äºæ¥ç" - -#: ../svn-bench/null-log-cmd.c:190 -#, fuzzy, c-format -msgid "Only relative paths can be specified after a URL for 'svn-bench log', but '%s' is not a relative path" -msgstr "å¯¹äº 'svn log'ï¼å¨ URL ååªè½æå®ç¸å¯¹è·¯å¾ï¼ä½ '%s' ä¸æ¯ç¸å¯¹è·¯å¾" +msgid " The certificate has expired.\n" +msgstr " è¯ä¹¦å·²è¿æã\n" -#: ../svn-bench/null-log-cmd.c:222 +#: ../svn/auth-cmd.c:84 #, c-format -msgid "" -"%15s revisions, %15s merged in %s merges\n" -"%15s msg lines, %15s in merged revisions\n" -"%15s changes, %15s in merged revisions\n" -msgstr "" +msgid " The certificate's Common Name (hostname) does not match the remote hostname.\n" +msgstr " è¯ä¹¦çéç¨å称(主æºå)ä¸è¿ç¨ä¸»æºåä¸å¹é ã\n" -#: ../svn-bench/null-log-cmd.c:234 +#: ../svn/auth-cmd.c:89 #, c-format -msgid "" -"%15s revisions\n" -"%15s msg lines\n" -"%15s changes\n" -msgstr "" - -#: ../svn-bench/svn-bench.c:85 ../svn-bench/svn-bench.c:86 ../svn/svn.c:160 -#: ../svn/svn.c:161 ../svnadmin/svnadmin.c:227 ../svnadmin/svnadmin.c:230 -#: ../svndumpfilter/svndumpfilter.c:1048 ../svndumpfilter/svndumpfilter.c:1051 -#: ../svnfsfs/svnfsfs.c:129 ../svnfsfs/svnfsfs.c:132 ../svnlook/svnlook.c:115 -#: ../svnlook/svnlook.c:127 ../svnsync/svnsync.c:275 ../svnsync/svnsync.c:277 -msgid "show help on a subcommand" -msgstr "æ¾ç¤ºåå½ä»¤å¸®å©ä¿¡æ¯" - -#: ../svn-bench/svn-bench.c:87 ../svn/svn.c:163 -msgid "print nothing, or only summary information" -msgstr "ä¸æå°ä¿¡æ¯ï¼æåªæå°æ¦è¦ä¿¡æ¯" - -#: ../svn-bench/svn-bench.c:88 ../svn/svn.c:164 -msgid "descend recursively, same as --depth=infinity" -msgstr "åä¸éå½ï¼ä¸ --depth=infinity ç¸å" - -#: ../svn-bench/svn-bench.c:89 ../svn/svn.c:165 -msgid "obsolete; try --depth=files or --depth=immediates" -msgstr "è¿æ¶ï¼å°è¯ --depth=files æ --depth=immediates" - -#: ../svn-bench/svn-bench.c:91 ../svn/svn.c:167 -msgid "" -"the change made by revision ARG (like -r ARG-1:ARG)\n" -" If ARG is negative this is like -r ARG:ARG-1\n" -" If ARG is of the form ARG1-ARG2 then this is like\n" -" ARG1:ARG2, where ARG1 is inclusive" -msgstr "" -"çæ¬ ARG (å¦å -r ARG-1:ARG) åçä¿®æ¹\n" -" å¦æ ARG 为è´æ°åçä»·äº -r ARG:ARG-1 å¦æ ARG çæ ¼å¼æ¯ ARG1-ARG2ï¼é£ä¹å®çä»·äº\n" -" ARG1:ARG2ï¼å å« ARG1" - -#: ../svn-bench/svn-bench.c:99 ../svn/svn.c:175 -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" -" NUMBER çæ¬å·\n" -" '{' DATE '}' å¨æå®æ¶é´ä»¥åççæ¬\n" -" 'HEAD' çæ¬åºä¸çææ°çæ¬\n" -" 'BASE' å·¥ä½å¯æ¬çåºçº¿çæ¬\n" -" 'COMMITTED' æåæ交æåºçº¿ä¹å\n" -" 'PREV' COMMITTEDçåä¸çæ¬" - -#: ../svn-bench/svn-bench.c:114 ../svn/svn.c:195 ../svnadmin/svnadmin.c:233 -#: ../svndumpfilter/svndumpfilter.c:1054 ../svnfsfs/svnfsfs.c:135 -#: ../svnlook/svnlook.c:172 ../svnrdump/svnrdump.c:157 -#: ../svnserve/svnserve.c:376 ../svnsync/svnsync.c:273 -#: ../svnversion/svnversion.c:144 -msgid "show program version information" -msgstr "æ¾ç¤ºç¨åºçæ¬ä¿¡æ¯" - -#: ../svn-bench/svn-bench.c:115 ../svn/svn.c:196 -msgid "print extra information" -msgstr "æå°éå ä¿¡æ¯" - -#: ../svn-bench/svn-bench.c:116 ../svn/svn.c:198 ../svnrdump/svnrdump.c:141 -msgid "specify a username ARG" -msgstr "æå®ç¨æ·å称 ARG" - -#: ../svn-bench/svn-bench.c:117 ../svnrdump/svnrdump.c:143 -msgid "specify a password ARG" -msgstr "æå®å¯ç ARG" - -#: ../svn-bench/svn-bench.c:119 ../svn/svn.c:224 -msgid "pass contents of file ARG as additional args" -msgstr "ä¼ éæ件 ARG å 容为é件åæ°" - -#: ../svn-bench/svn-bench.c:121 ../svn/svn.c:226 -msgid "" -"limit operation by depth ARG ('empty', 'files',\n" -" 'immediates', or 'infinity')" -msgstr "" -"éå¶æä½æ·±åº¦æ¯ ARG ('empty', 'files',\n" -" 'immediates', æ 'infinity')" - -#: ../svn-bench/svn-bench.c:124 ../svn/svn.c:234 -msgid "use strict semantics" -msgstr "使ç¨ä¸¥æ ¼çè¯æ³" - -#: ../svn-bench/svn-bench.c:126 ../svn/svn.c:236 -msgid "do not cross copies while traversing history" -msgstr "æ¥çåå²ä¸è¦è·¨è¶ä¸åçå¯æ¬" - -#: ../svn-bench/svn-bench.c:128 ../svn/svn.c:242 ../svnrdump/svnrdump.c:153 -#: ../svnsync/svnsync.c:197 -msgid "do not cache authentication tokens" -msgstr "ä¸è¦ç¼åç¨æ·è®¤è¯ä»¤ç" - -#: ../svn-bench/svn-bench.c:130 ../svn/svn.c:244 ../svnrdump/svnrdump.c:167 -#: ../svnsync/svnsync.c:207 -msgid "deprecated; same as --trust-unknown-ca" -msgstr "" - -#: ../svn-bench/svn-bench.c:132 ../svn/svn.c:246 ../svnrdump/svnrdump.c:169 -#: ../svnsync/svnsync.c:209 -msgid "" -"with --non-interactive, accept SSL server\n" -" certificates from unknown certificate authorities" -msgstr "" - -#: ../svn-bench/svn-bench.c:136 ../svn/svn.c:250 ../svnrdump/svnrdump.c:173 -#: ../svnsync/svnsync.c:213 -#, fuzzy -msgid "" -"with --non-interactive, accept SSL server\n" -" certificates even if the server hostname does not\n" -" match the certificate's common name attribute" -msgstr "ä¸æ示çæ¥åæªç¥çè¯ä¹¦é¢åæºæåè¡ç SSL æå¡å¨è¯ä¹¦(åªç¨äºé项 â--non-interactiveâ)" - -#: ../svn-bench/svn-bench.c:142 ../svn/svn.c:256 ../svnrdump/svnrdump.c:179 -#: ../svnsync/svnsync.c:219 -#, fuzzy -msgid "" -"with --non-interactive, accept expired SSL server\n" -" certificates" -msgstr "å¦æçæ¬åºè¢«å ¶ä»è¿ç¨å ç¨ï¼çå¾ èä¸ç´æ¥éåº" - -#: ../svn-bench/svn-bench.c:146 ../svn/svn.c:260 ../svnrdump/svnrdump.c:183 -#: ../svnsync/svnsync.c:223 -msgid "" -"with --non-interactive, accept SSL server\n" -" certificates from the future" -msgstr "" - -#: ../svn-bench/svn-bench.c:150 ../svn/svn.c:264 ../svnrdump/svnrdump.c:187 -#: ../svnsync/svnsync.c:227 -msgid "" -"with --non-interactive, accept SSL server\n" -" certificates with failures other than the above" -msgstr "" - -#: ../svn-bench/svn-bench.c:154 -msgid "do no interactive prompting" -msgstr "" - -#: ../svn-bench/svn-bench.c:156 ../svn/svn.c:291 ../svnadmin/svnadmin.c:280 -#: ../svnrdump/svnrdump.c:139 ../svnsync/svnsync.c:239 -msgid "read user configuration files from directory ARG" -msgstr "ä»ç®å½ ARG 读åç¨æ·é ç½®æ件" - -#: ../svn-bench/svn-bench.c:158 ../svn/svn.c:293 ../svnrdump/svnrdump.c:159 -#: ../svnsync/svnsync.c:241 -msgid "" -"set user configuration option in the format:\n" -" FILE:SECTION:OPTION=[VALUE]\n" -" For example:\n" -" servers:global:http-library=serf" -msgstr "" -"以ä¸å±æ ¼å¼è®¾ç½®ç¨æ·é ç½®é项ï¼\n" -" FILE:SECTION:OPTION=[VALUE]\n" -" ä¾å¦ï¼\n" -" servers:global:http-library=serf" - -#: ../svn-bench/svn-bench.c:165 ../svn/svn.c:310 -msgid "maximum number of log entries" -msgstr "æ¥å¼é¡¹æ大å¼" - -#: ../svn-bench/svn-bench.c:167 ../svn/svn.c:319 -msgid "retrieve all revision properties" -msgstr "è·åææçæ¬å±æ§" - -#: ../svn-bench/svn-bench.c:169 ../svn/svn.c:321 -msgid "retrieve no revision properties" -msgstr "没ææ¾åçæ¬å±æ§" - -#: ../svn-bench/svn-bench.c:171 ../svn/svn.c:323 -msgid "" -"set revision property ARG in new revision\n" -" using the name[=value] format" -msgstr "" -"å¨æ°çæ¬è®¾ç½®çæ¬å±æ§ ARG\n" -" 使ç¨æ ¼å¼ name[=value]" - -#: ../svn-bench/svn-bench.c:175 ../svn/svn.c:328 -msgid "" -"use/display additional information from merge\n" -" history" -msgstr "ä»å并åå²ä½¿ç¨/æ¾ç¤ºé¢å¤ä¿¡æ¯" - -#: ../svn-bench/svn-bench.c:217 ../svn/svn.c:693 -msgid "" -"Describe the usage of this program or its subcommands.\n" -"usage: help [SUBCOMMAND...]\n" -msgstr "" -"æè¿°æ¬ç¨åºæå ¶åå½ä»¤çç¨æ³ã\n" -"ç¨æ³: help [åå½ä»¤...]\n" - -#: ../svn-bench/svn-bench.c:223 -msgid "" -"Create an unversioned copy of a tree.\n" -"usage: null-export [-r REV] URL[@PEGREV]\n" -"\n" -" Exports a clean directory tree from the repository specified by\n" -" URL, at revision REV if it is given, otherwise at HEAD.\n" -"\n" -" If specified, PEGREV determines in which revision the target is first\n" -" looked up.\n" -msgstr "" - -#: ../svn-bench/svn-bench.c:234 -#, fuzzy -msgid "" -"List directory entries in the repository.\n" -"usage: null-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 fetched 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 æ¯å·¥ä½å¯æ¬è·¯å¾ï¼é£ä¹æä½å¯¹åºç\n" -" çæ¬åºURLæå®çTARGETãREVæå®ä»å¨åªä¸ªçæ¬æ¥æ¾TARGETã\n" -"\n" -" TARGETé»è®¤æ¯â.âï¼è¡¨ç¤ºå½åå·¥ä½ç®å½å¯¹åºççæ¬åºURLã\n" -"\n" -" ä½¿ç¨ --verbose æ¶ï¼æ¯ä¸ªæ¡ç®ä¼æ¾ç¤ºä»¥ä¸é¢å¤ä¿¡æ¯: \n" -"\n" -" æåä¸æ¬¡æ交ççæ¬å·ç \n" -" æåä¸æ¬¡æ交çä½è \n" -" å¦æ被éå®ï¼æ¾ç¤ºåæ¯âOâã(使ç¨âsvn info URLâæ¥ç详ç»ä¿¡æ¯)\n" -" å¤§å° (以åè为åä½)\n" -" æåä¸æ¬¡æ交çæ¥æä¸æ¶é´\n" - -#: ../svn-bench/svn-bench.c:255 -msgid "" -"Fetch the log messages for a set of revision(s) and/or path(s).\n" -"usage: 1. null-log [PATH][@REV]\n" -" 2. null-log URL[@REV] [PATH...]\n" -"\n" -" 1. Fetch the log messages for the URL corresponding to PATH\n" -" (default: '.'). If specified, REV is the revision in which the\n" -" URL is first looked up, and the default revision range is REV:1.\n" -" If REV is not specified, the default revision range is BASE:1,\n" -" since the URL might not exist in the HEAD revision.\n" -"\n" -" 2. Fetch the log messages for the PATHs (default: '.') under URL.\n" -" If specified, REV is the revision in which the URL is first\n" -" looked up, and the default revision range is REV:1; otherwise,\n" -" the URL is looked up in HEAD, and the default revision range is\n" -" HEAD:1.\n" -"\n" -" Multiple '-c' or '-r' options may be specified (but not a\n" -" combination of '-c' and '-r' options), and mixing of forward and\n" -" reverse ranges is allowed.\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" -msgstr "" - -#: ../svn-bench/svn-bench.c:286 ../svn/svn.c:835 -msgid "retrieve revision property ARG" -msgstr "è·åçæ¬å±æ§ ARG" - -#: ../svn-bench/svn-bench.c:287 ../svn/svn.c:836 -msgid "the change made in revision ARG" -msgstr "çæ¬ ARG å¼èµ·çæ¹å" - -#: ../svn-bench/svn-bench.c:290 -#, fuzzy -msgid "" -"Display information about a local or remote item.\n" -"usage: null-info [TARGET[@REV]...]\n" -"\n" -" Print information about each TARGET (default: '.').\n" -" TARGET may be either a working-copy path or URL. If specified, REV\n" -" determines in which revision the target is first looked up.\n" -msgstr "" -"æ¾ç¤ºæ¬å°æè¿ç¨æ¡ç®çä¿¡æ¯ã\n" -"ç¨æ³: info [TARGET[@REV]...]\n" -"\n" -" æ¾ç¤ºæ¯ä¸ª TARGET çä¿¡æ¯ (é»è®¤: â.â)ã\n" -" TARGET å¯ä»¥æ¯å·¥ä½å¯æ¬ä¸çè·¯å¾æçæ¬åºä¸ç URLãREV æå®ä»åªä¸ª\n" -" çæ¬å¼å§æ¥æ¾ç®æ ã\n" - -#: ../svn-bench/svn-bench.c:338 ../svn/svn.c:1764 ../svnadmin/svnadmin.c:97 -#: ../svnfsfs/svnfsfs.c:79 ../svnlook/svnlook.c:387 ../svnrdump/svnrdump.c:65 -#: ../svnsync/svnsync.c:332 -msgid "Caught signal" -msgstr "ææå°ä¿¡å·" - -#: ../svn-bench/svn-bench.c:430 ../svn/svn.c:1910 ../svnlook/svnlook.c:2571 -msgid "Non-numeric limit argument given" -msgstr "--limit åå¼ä¸æ¯æ°å" - -#: ../svn-bench/svn-bench.c:435 ../svn/svn.c:1915 ../svnlook/svnlook.c:2576 -msgid "Argument to --limit must be positive" -msgstr "--limit åå¼å¿ 须为æ£" +msgid " The certificate issuer is unknown.\n" +msgstr " è¯ä¹¦é¢åè æªç¥ã\n" -#: ../svn-bench/svn-bench.c:471 ../svn/svn.c:1965 +#: ../svn/auth-cmd.c:93 #, c-format -msgid "Negative number in range (%s) not supported with -c" -msgstr "-c é项ä¸æ¯æè´æ°å¨èå´ (%s) ä¸" +msgid " Unknown verification failure.\n" +msgstr " æªç¥çéªè¯å¤±è´¥ã\n" -#: ../svn-bench/svn-bench.c:483 ../svn/svn.c:1977 +#: ../svn/auth-cmd.c:260 #, c-format -msgid "Non-numeric change argument (%s) given to -c" -msgstr "-c é项çåå¼(%s)ä¸æ¯æ°å" +msgid "Subject: %s\n" +msgstr "主é¢: %s\n" -#: ../svn-bench/svn-bench.c:490 ../svn/svn.c:1984 -msgid "There is no change 0" -msgstr "没æçæ¬ 0" - -#: ../svn-bench/svn-bench.c:532 ../svn/svn.c:2025 ../svnadmin/svnadmin.c:2488 -#: ../svnfsfs/svnfsfs.c:331 ../svnrdump/svnrdump.c:962 -#: ../svnsync/svnsync.c:2107 +#: ../svn/auth-cmd.c:262 #, c-format -msgid "Syntax error in revision argument '%s'" -msgstr "çæ¬åæ°â%sâä¸æè¯æ³é误" +msgid "Valid from: %s\n" +msgstr "çææ¥æ: %s\n" -#: ../svn-bench/svn-bench.c:571 ../svn/svn.c:2088 ../svn/svn.c:2105 +#: ../svn/auth-cmd.c:266 #, c-format -msgid "Error converting depth from locale to UTF-8" -msgstr "å°æ·±åº¦ä»æ¬å°ç¼ç 转æ¢å° UTF8 失败" +msgid "Valid until: %s\n" +msgstr "è¿ææ¥æ: %s\n" -#: ../svn-bench/svn-bench.c:578 ../svn/svn.c:2095 +#: ../svn/auth-cmd.c:270 #, c-format -msgid "'%s' is not a valid depth; try 'empty', 'files', 'immediates', or 'infinity'" -msgstr "â%sâ ä¸æ¯ææç深度ï¼å°è¯ âemptyâï¼âfilesâï¼âimmediatesâï¼æ âinfinityâ" +msgid "Issuer: %s\n" +msgstr "é¢åè : %s\n" -#: ../svn-bench/svn-bench.c:708 ../svn/svn.c:2452 -#: ../svndumpfilter/svndumpfilter.c:1527 ../svnlook/svnlook.c:2675 +#: ../svn/auth-cmd.c:272 #, c-format -msgid "Subcommand argument required\n" -msgstr "å¿ é¡»æä¾åå½ä»¤åæ°\n" - -#: ../svn-bench/svn-bench.c:726 ../svn/svn.c:2470 ../svnadmin/svnadmin.c:2688 -#: ../svndumpfilter/svndumpfilter.c:1545 ../svnfsfs/svnfsfs.c:403 -#: ../svnlook/svnlook.c:2692 ../svnrdump/svnrdump.c:1078 -#, fuzzy, c-format -msgid "Unknown subcommand: '%s'\n" -msgstr "æªç¥å½ä»¤: â%sâ\n" - -#: ../svn-bench/svn-bench.c:760 -#, fuzzy, c-format -msgid "" -"Subcommand '%s' doesn't accept option '%s'\n" -"Type 'svn-bench help %s' for usage.\n" -msgstr "" -"åå½ä»¤â%sâä¸æ¥åé项â%sâ\n" -"使ç¨âsvnsync help %sâå¾å°ç¨æ³ã\n" - -#: ../svn-bench/svn-bench.c:774 ../svn/svn.c:2530 -msgid "Multiple revision arguments encountered; can't specify -c twice, or both -c and -r" -msgstr "éå°äºå¤ä¸ªçæ¬åæ°ï¼ä¸è½æå® -c 两次æè åæ¶ä½¿ç¨ -c å -r" - -#: ../svn-bench/svn-bench.c:785 ../svn/svn.c:2550 -msgid "--with-all-revprops and --with-no-revprops are mutually exclusive" -msgstr "--with-all-revprops ä¸ --with-no-revprops æ¯äºæ¥ç" - -#: ../svn-bench/svn-bench.c:794 ../svn/svn.c:2559 -msgid "--with-revprop and --with-no-revprops are mutually exclusive" -msgstr "--with-revprop ä¸ --with-no-revprops æ¯äºæ¥ç" - -#: ../svn-bench/svn-bench.c:803 ../svn/svn.c:2598 ../svnmucc/svnmucc.c:669 -#: ../svnrdump/svnrdump.c:1136 ../svnsync/svnsync.c:2213 -#, fuzzy -msgid "--trust-unknown-ca requires --non-interactive" -msgstr "--trust-server-cert éè¦ --non-interactive" - -#: ../svn-bench/svn-bench.c:807 ../svn/svn.c:2602 ../svnmucc/svnmucc.c:673 -#: ../svnrdump/svnrdump.c:1140 ../svnsync/svnsync.c:2217 -#, fuzzy -msgid "--trust-cn-mismatch requires --non-interactive" -msgstr "--trust-server-cert éè¦ --non-interactive" - -#: ../svn-bench/svn-bench.c:811 ../svn/svn.c:2606 ../svnmucc/svnmucc.c:677 -#: ../svnrdump/svnrdump.c:1144 ../svnsync/svnsync.c:2221 -#, fuzzy -msgid "--trust-expired requires --non-interactive" -msgstr "--trust-server-cert éè¦ --non-interactive" - -#: ../svn-bench/svn-bench.c:815 ../svn/svn.c:2610 ../svnmucc/svnmucc.c:681 -#: ../svnrdump/svnrdump.c:1148 ../svnsync/svnsync.c:2225 -#, fuzzy -msgid "--trust-not-yet-valid requires --non-interactive" -msgstr "--trust-server-cert éè¦ --non-interactive" - -#: ../svn-bench/svn-bench.c:819 ../svn/svn.c:2614 ../svnmucc/svnmucc.c:685 -#: ../svnrdump/svnrdump.c:1152 ../svnsync/svnsync.c:2229 -#, fuzzy -msgid "--trust-other-failure requires --non-interactive" -msgstr "--trust-server-cert éè¦ --non-interactive" - -#: ../svn-bench/svn-bench.c:963 -#, fuzzy, c-format -msgid "Try 'svn-bench help %s' for more information" -msgstr "è¯·ä½¿ç¨ âsvn helpâ 以å¾å°æ´å¤ä¿¡æ¯" - -#: ../svn-bench/svn-bench.c:969 ../svn/svn.c:3027 -msgid "Please see the 'svn upgrade' command" -msgstr "请åé å½ä»¤ 'svn upgrade'" - -#: ../svn-bench/svn-bench.c:977 ../svn/svn.c:3049 -msgid "Run 'svn cleanup' to remove locks (type 'svn help cleanup' for details)" -msgstr "è¿è¡âsvn cleanupâå é¤é (è¿è¡âsvn help cleanupâ以å¾å°è¯¦ç»ä¿¡æ¯)" - -#: ../svn/add-cmd.c:101 -msgid "Could not add all targets because some targets don't exist" -msgstr "å 为ä¸äºç®æ ä¸åå¨ï¼æ以ä¸è½å¢å å ¨é¨ç®æ " - -#: ../svn/add-cmd.c:105 -msgid "Could not add all targets because some targets are already versioned" -msgstr "å 为ä¸äºç®æ å·²ç»çæ¬åï¼æ以ä¸è½å¢å å ¨é¨ç®æ " +msgid "Fingerprint: %s\n" +msgstr "æ纹: %s\n" -#: ../svn/auth-cmd.c:69 +#: ../svn/auth-cmd.c:289 #, c-format -msgid "Automatic certificate validity check failed because:\n" -msgstr "" - -#: ../svn/auth-cmd.c:74 -#, fuzzy, c-format -msgid " The certificate is not yet valid.\n" -msgstr " - è¯ä¹¦æªçæã\n" +msgid "Hostnames: %s\n" +msgstr "主æºå: %s\n" -#: ../svn/auth-cmd.c:78 -#, fuzzy, c-format -msgid " The certificate has expired.\n" -msgstr " - è¯ä¹¦å·²è¿æã\n" - -#: ../svn/auth-cmd.c:82 -#, fuzzy, c-format -msgid " The certificate's Common Name (hostname) does not match the remote hostname.\n" -msgstr " - è¯ä¹¦ç主æºå称ä¸å¹é ã\n" - -#: ../svn/auth-cmd.c:87 -#, fuzzy, c-format -msgid " The certificate issuer is unknown.\n" -msgstr " - è¯ä¹¦åçæªç¥é误ã\n" - -#: ../svn/auth-cmd.c:91 +#: ../svn/auth-cmd.c:309 #, c-format -msgid " Unknown verification failure.\n" -msgstr " æªç¥çéªè¯å¤±è´¥ã\n" - -#: ../svn/auth-cmd.c:182 -#, fuzzy, c-format msgid "Credential kind: %s\n" -msgstr "没æä¿ååè¯æ°æ®" +msgstr "åæ®ç±»å: %s\n" -#: ../svn/auth-cmd.c:202 -#, fuzzy, c-format +#: ../svn/auth-cmd.c:329 +#, c-format msgid "Password: %s\n" -msgstr "â%sâçå¯ç : " +msgstr "å¯ç : %s\n" -#: ../svn/auth-cmd.c:204 +#: ../svn/auth-cmd.c:331 #, c-format msgid "Password: [not shown]\n" msgstr "å¯ç : [æªæ¾ç¤º]\n" -#: ../svn/auth-cmd.c:210 -#, fuzzy, c-format +#: ../svn/auth-cmd.c:337 +#, c-format msgid "Passphrase: %s\n" -msgstr "â%sâçå¯ç : " +msgstr "å¯ç çè¯: %s\n" -#: ../svn/auth-cmd.c:213 -#, fuzzy, c-format +#: ../svn/auth-cmd.c:340 +#, c-format msgid "Passphrase: [not shown]\n" -msgstr "â%sâçå¯ç : " +msgstr "å¯ç çè¯: [æªæ¾ç¤º]\n" -#: ../svn/auth-cmd.c:216 -#, fuzzy, c-format +#: ../svn/auth-cmd.c:343 +#, c-format msgid "Password cache: %s\n" -msgstr "â%sâçå¯ç : " +msgstr "å¯ç ç¼å: %s\n" -#: ../svn/auth-cmd.c:219 -#, fuzzy, c-format +#: ../svn/auth-cmd.c:346 +#, c-format msgid "Username: %s\n" -msgstr "ç¨æ·å: " - -#: ../svn/auth-cmd.c:223 -#, fuzzy, c-format -msgid "Hostname: %s\n" -msgstr "å称: %s\n" - -#: ../svn/auth-cmd.c:225 -#, fuzzy, c-format -msgid "Valid from: %s\n" -msgstr "移èª: %s\n" - -#: ../svn/auth-cmd.c:228 -#, fuzzy, c-format -msgid "Valid until: %s\n" -msgstr "" -"\n" -"ææé项: \n" - -#: ../svn/auth-cmd.c:231 -#, fuzzy, c-format -msgid "Issuer: %s\n" -msgstr "ææè : %s\n" - -#: ../svn/auth-cmd.c:233 -#, fuzzy, c-format -msgid "Fingerprint: %s\n" -msgstr "ä¿®æ¹å表: %s\n" +msgstr "ç¨æ·å: %s\n" -#: ../svn/auth-cmd.c:283 +#: ../svn/auth-cmd.c:398 #, c-format msgid "Deleting %s credential for realm '%s'\n" -msgstr "" +msgstr "æ£å¨å é¤é¢å '%s' ç %s åæ®\n" -#: ../svn/auth-cmd.c:330 +#: ../svn/auth-cmd.c:445 #, c-format msgid "Credentials cache in '%s' is empty\n" -msgstr "" +msgstr "'%s' ä¸çåæ®ç¼å为空\n" -#: ../svn/auth-cmd.c:334 ../svn/auth-cmd.c:357 +#: ../svn/auth-cmd.c:449 ../svn/auth-cmd.c:475 #, c-format msgid "Credentials cache in '%s' contains no matching credentials" -msgstr "" +msgstr "'%s' ä¸çåæ®ç¼åä¸å å«å¹é çåæ®" -#: ../svn/auth-cmd.c:342 +#: ../svn/auth-cmd.c:457 #, c-format -msgid "Credentials cache in '%s' contains %d credentials\n" -msgstr "" +msgid "Credentials cache in '%s' contains %d credential\n" +msgid_plural "Credentials cache in '%s' contains %d credentials\n" +msgstr[0] "'%s' ä¸çåæ®ç¼åå å« %d 个åæ®\n" -#: ../svn/auth-cmd.c:346 +#: ../svn/auth-cmd.c:463 #, c-format -msgid "Credentials cache in '%s' contains %d matching credentials\n" -msgstr "" +msgid "Credentials cache in '%s' contains %d matching credential\n" +msgid_plural "Credentials cache in '%s' contains %d matching credentials\n" +msgstr[0] "'%s' ä¸çåæ®ç¼åå å« %d 个å¹é çåæ®\n" -#: ../svn/auth-cmd.c:361 +#: ../svn/auth-cmd.c:480 #, c-format -msgid "Deleted %d matching credentials from '%s'\n" -msgstr "" +msgid "Deleted %d matching credential from '%s'\n" +msgid_plural "Deleted %d matching credentials from '%s'\n" +msgstr[0] "å·²å é¤ %d 个å¹é çåæ®(æ¥èª '%s')\n" -#: ../svn/blame-cmd.c:303 ../svn/list-cmd.c:301 +#: ../svn/blame-cmd.c:311 msgid "'verbose' option invalid in XML mode" -msgstr "å¨XML模å¼ä¸âverboseâé项æ æ" +msgstr "å¨XML模å¼ä¸'verbose'é项æ æ" -#: ../svn/blame-cmd.c:315 ../svn/info-cmd.c:615 ../svn/list-cmd.c:313 -#: ../svn/status-cmd.c:308 +#: ../svn/blame-cmd.c:323 ../svn/status-cmd.c:315 msgid "'incremental' option only valid in XML mode" -msgstr "åªæå¨XML模å¼âincrementalâé项æææ" +msgstr "åªæå¨XML模å¼'incremental'é项æææ" -#: ../svn/blame-cmd.c:378 -#, fuzzy, c-format +#: ../svn/blame-cmd.c:387 +#, c-format msgid "Skipping binary file (use --force to treat as text): '%s'\n" -msgstr "ç¥è¿äºè¿å¶æ件: â%sâ\n" +msgstr "è·³è¿äºè¿å¶æ件(ä½¿ç¨ --force å°å ¶è§ä¸ºææ¬): '%s'\n" -#: ../svn/blame-cmd.c:415 +#: ../svn/blame-cmd.c:424 ../svnbench/null-blame-cmd.c:272 msgid "Could not perform blame on all targets because some targets don't exist" msgstr "å 为ä¸äºç®æ ä¸åå¨ï¼æ以ä¸è½è¿½æº¯å ¨é¨ç®æ " @@ -9956,318 +11962,236 @@ msgstr "å 为ä¸äºç®æ 没æçæ¬å msgid "Could not cat all targets because some targets are directories" msgstr "å 为ä¸äºç®æ æ¯ç®å½ï¼æ以ä¸è½æ¾ç¤ºå ¨é¨ç®æ " -#: ../svn/changelist-cmd.c:135 +#: ../svn/changelist-cmd.c:117 msgid "Could not set changelists on all targets because some targets don't exist" msgstr "å 为ä¸äºç®æ ä¸åå¨ï¼æ以ä¸è½å¯¹å ¨é¨ç®æ 设置修æ¹å表" -#: ../svn/changelist-cmd.c:140 +#: ../svn/changelist-cmd.c:122 msgid "Could not set changelists on all targets because some targets are not versioned" msgstr "å 为ä¸äºç®æ 没æçæ¬åï¼æ以ä¸è½å¯¹å ¨é¨ç®æ 设置修æ¹å表" -#: ../svn/checkout-cmd.c:140 ../svn/switch-cmd.c:138 +#: ../svn/checkout-cmd.c:140 ../svn/switch-cmd.c:141 #, c-format msgid "'%s' does not appear to be a URL" -msgstr "â%sâä¸åæ¯URL" +msgstr "'%s'ä¸åæ¯URL" -#: ../svn/checkout-cmd.c:181 ../svn/export-cmd.c:130 ../svn/list-cmd.c:413 -#: ../svn/switch-cmd.c:188 ../svn/update-cmd.c:177 +#: ../svn/checkout-cmd.c:183 ../svn/export-cmd.c:130 ../svn/list-cmd.c:508 +#: ../svn/switch-cmd.c:191 ../svn/update-cmd.c:181 msgid "Failure occurred processing one or more externals definitions" -msgstr "å¤çä¸ä¸ªææ´å¤çå¤é¨å®ä¹å¤±è´¥" +msgstr "å¤çä¸ä¸ªææ´å¤çå¤é¨å¼ç¨å®ä¹å¤±è´¥" -#: ../svn/cl-conflicts.c:82 +#: ../svn/cl-conflicts.c:74 msgid "local file edit" msgstr "æ¬å°æ件ç¼è¾" -#: ../svn/cl-conflicts.c:84 -#, fuzzy +#: ../svn/cl-conflicts.c:76 msgid "local file obstruction" -msgstr "é»å¡" +msgstr "æ¬å°æ件é»å¡" -#: ../svn/cl-conflicts.c:86 +#: ../svn/cl-conflicts.c:78 msgid "local file delete" msgstr "æ¬å°æ件å é¤" -#: ../svn/cl-conflicts.c:89 -#, fuzzy +#: ../svn/cl-conflicts.c:81 msgid "local file missing or deleted or moved away" -msgstr "æ¬å°æ件移走" +msgstr "æ¬å°æ件缺失ãå·²å é¤æ已移走" -#: ../svn/cl-conflicts.c:91 +#: ../svn/cl-conflicts.c:83 msgid "local file missing" msgstr "æ¬å°æ件缺失" -#: ../svn/cl-conflicts.c:93 -#, fuzzy +#: ../svn/cl-conflicts.c:85 msgid "local file unversioned" -msgstr "æªçæ¬æ§å¶" +msgstr "æ¬å°æ件æªçæ¬æ§å¶" -#: ../svn/cl-conflicts.c:95 +#: ../svn/cl-conflicts.c:87 msgid "local file add" msgstr "æ¬å°æ件å¢å " -#: ../svn/cl-conflicts.c:97 -#, fuzzy +#: ../svn/cl-conflicts.c:89 msgid "local file replace" -msgstr "è°åº¦: æ¿æ¢\n" +msgstr "æ¬å°æ件æ¿æ¢" -#: ../svn/cl-conflicts.c:99 +#: ../svn/cl-conflicts.c:91 msgid "local file moved away" msgstr "æ¬å°æ件移走" -#: ../svn/cl-conflicts.c:101 +#: ../svn/cl-conflicts.c:93 msgid "local file moved here" msgstr "æ¬å°æä»¶ç§»å ¥" -#: ../svn/cl-conflicts.c:108 +#: ../svn/cl-conflicts.c:100 msgid "local dir edit" msgstr "æ¬å°ç®å½ç¼è¾" -#: ../svn/cl-conflicts.c:110 -#, fuzzy +#: ../svn/cl-conflicts.c:102 msgid "local dir obstruction" -msgstr "é»å¡" +msgstr "æ¬å°ç®å½é»å¡" -#: ../svn/cl-conflicts.c:112 +#: ../svn/cl-conflicts.c:104 msgid "local dir delete" msgstr "æ¬å°ç®å½å é¤" -#: ../svn/cl-conflicts.c:115 -#, fuzzy +#: ../svn/cl-conflicts.c:107 msgid "local dir missing or deleted or moved away" -msgstr "æ¬å°ç®å½ç§»èµ°" +msgstr "æ¬å°ç®å½ç¼ºå¤±ãå·²å é¤æ已移走" -#: ../svn/cl-conflicts.c:117 +#: ../svn/cl-conflicts.c:109 msgid "local dir missing" msgstr "æ¬å°ç®å½ç¼ºå¤±" -#: ../svn/cl-conflicts.c:119 -#, fuzzy +#: ../svn/cl-conflicts.c:111 msgid "local dir unversioned" -msgstr "æªçæ¬æ§å¶" +msgstr "æ¬å°ç®å½æªçæ¬æ§å¶" -#: ../svn/cl-conflicts.c:121 +#: ../svn/cl-conflicts.c:113 msgid "local dir add" msgstr "æ¬å°ç®å½å¢å " -#: ../svn/cl-conflicts.c:123 +#: ../svn/cl-conflicts.c:115 msgid "local dir replace" msgstr "æ¬å°ç®å½æ¿æ¢" -#: ../svn/cl-conflicts.c:125 +#: ../svn/cl-conflicts.c:117 msgid "local dir moved away" msgstr "æ¬å°ç®å½ç§»èµ°" -#: ../svn/cl-conflicts.c:127 +#: ../svn/cl-conflicts.c:119 msgid "local dir moved here" msgstr "æ¬å°ç®å½ç§»å ¥" -#: ../svn/cl-conflicts.c:135 ../svn/cl-conflicts.c:242 -msgid "local edit" -msgstr "æ¬å°ç¼è¾" - -#: ../svn/cl-conflicts.c:137 ../svn/cl-conflicts.c:251 -#, fuzzy -msgid "local obstruction" -msgstr "é»å¡" - -#: ../svn/cl-conflicts.c:139 ../svn/cl-conflicts.c:248 -#, fuzzy -msgid "local delete" -msgstr "å é¤" - -#: ../svn/cl-conflicts.c:142 -#, fuzzy +#: ../svn/cl-conflicts.c:134 msgid "local missing or deleted or moved away" -msgstr "æ¬å°ç®å½ç§»èµ°" +msgstr "æ¬å°ç¼ºå¤±ãå·²å é¤æ已移走" -#: ../svn/cl-conflicts.c:144 -#, fuzzy +#: ../svn/cl-conflicts.c:136 msgid "local missing" -msgstr "æ¬å°ç®å½ç¼ºå¤±" +msgstr "æ¬å°ç¼ºå¤±" -#: ../svn/cl-conflicts.c:146 -#, fuzzy +#: ../svn/cl-conflicts.c:138 msgid "local unversioned" -msgstr "æªçæ¬æ§å¶" - -#: ../svn/cl-conflicts.c:148 ../svn/cl-conflicts.c:245 -#, fuzzy -msgid "local add" -msgstr "(æ¬å°)" +msgstr "æ¬å°æªçæ¬æ§å¶" -#: ../svn/cl-conflicts.c:150 -#, fuzzy +#: ../svn/cl-conflicts.c:142 msgid "local replace" -msgstr "æ¬å°ç®å½æ¿æ¢" +msgstr "æ¬å°æ¿æ¢" -#: ../svn/cl-conflicts.c:152 -#, fuzzy +#: ../svn/cl-conflicts.c:144 msgid "local moved away" -msgstr "æ¬å°ç®å½ç§»èµ°" +msgstr "æ¬å°ç§»èµ°" -#: ../svn/cl-conflicts.c:154 -#, fuzzy +#: ../svn/cl-conflicts.c:146 msgid "local moved here" -msgstr "æ¬å°ç®å½ç§»å ¥" +msgstr "æ¬å°ç§»å ¥" -#: ../svn/cl-conflicts.c:173 -#, fuzzy +#: ../svn/cl-conflicts.c:165 msgid "incoming file edit" -msgstr "ä¼ è¾æ件æ°æ®" +msgstr "ä¼ å ¥æ件ç¼è¾" -#: ../svn/cl-conflicts.c:175 -#, fuzzy +#: ../svn/cl-conflicts.c:167 msgid "incoming file add" -msgstr "ä¼ è¾æ件æ°æ®" +msgstr "ä¼ å ¥æ件添å " -#: ../svn/cl-conflicts.c:177 -#, fuzzy +#: ../svn/cl-conflicts.c:169 msgid "incoming file delete or move" -msgstr "ä¼ è¾æ件æ°æ®" +msgstr "ä¼ å ¥æ件å é¤æ移å¨" -#: ../svn/cl-conflicts.c:179 -#, fuzzy +#: ../svn/cl-conflicts.c:171 msgid "incoming replace with file" -msgstr "è¿å ¥çç®å½æ¿æ¢" +msgstr "ä¼ å ¥æ¿æ¢ä¸ºæ件" -#: ../svn/cl-conflicts.c:186 +#: ../svn/cl-conflicts.c:178 msgid "incoming dir edit" -msgstr "è¿å ¥çç®å½ç¼è¾" +msgstr "ä¼ å ¥çç®å½ç¼è¾" -#: ../svn/cl-conflicts.c:188 +#: ../svn/cl-conflicts.c:180 msgid "incoming dir add" -msgstr "è¿å ¥çç®å½å¢å " +msgstr "ä¼ å ¥çç®å½å¢å " -#: ../svn/cl-conflicts.c:190 -#, fuzzy +#: ../svn/cl-conflicts.c:182 msgid "incoming dir delete or move" -msgstr "è¿å ¥çç®å½å é¤" +msgstr "ä¼ å ¥ç®å½å é¤æ移å¨" -#: ../svn/cl-conflicts.c:192 -#, fuzzy +#: ../svn/cl-conflicts.c:184 msgid "incoming replace with dir" -msgstr "è¿å ¥çç®å½æ¿æ¢" - -#: ../svn/cl-conflicts.c:200 ../svn/cl-conflicts.c:262 -msgid "incoming edit" -msgstr "è¿å ¥çç¼è¾" - -#: ../svn/cl-conflicts.c:202 ../svn/cl-conflicts.c:265 -msgid "incoming add" -msgstr "è¿å ¥çå¢å " +msgstr "ä¼ å ¥æ¿æ¢ä¸ºç®å½" -#: ../svn/cl-conflicts.c:204 -#, fuzzy +#: ../svn/cl-conflicts.c:196 msgid "incoming delete or move" -msgstr "è¿å ¥çç®å½å é¤" +msgstr "ä¼ å ¥å é¤æ移å¨" -#: ../svn/cl-conflicts.c:206 -#, fuzzy +#: ../svn/cl-conflicts.c:198 msgid "incoming replace" -msgstr "è¿å ¥çç®å½æ¿æ¢" - -#: ../svn/cl-conflicts.c:220 -#, fuzzy -msgid "upon update" -msgstr "æ´æ°" - -#: ../svn/cl-conflicts.c:221 -#, fuzzy -msgid "upon switch" -msgstr "åæ¢" - -#: ../svn/cl-conflicts.c:222 -#, fuzzy -msgid "upon merge" -msgstr "å并" - -#: ../svn/cl-conflicts.c:223 -#, fuzzy -msgid "upon none" -msgstr "æ " - -#: ../svn/cl-conflicts.c:254 -#, fuzzy, c-format -msgid "local %s" -msgstr "(æ¬å°)" - -#: ../svn/cl-conflicts.c:268 -msgid "incoming delete" -msgstr "è¿å ¥çå é¤" - -#: ../svn/cl-conflicts.c:271 -#, c-format -msgid "incoming %s" -msgstr "è¿å ¥ç %s" - -#: ../svn/cl-conflicts.c:277 ../svn/cl-conflicts.c:320 -#, c-format -msgid "%s, %s %s" -msgstr "%s, %s %s" +msgstr "ä¼ å ¥æ¿æ¢" #. A catch-all message for very rare or nominally impossible cases. #. It will not be pretty, but is closer to an internal error than #. an ordinary user-facing string. -#: ../svn/cl-conflicts.c:328 -#, fuzzy, c-format +#: ../svn/cl-conflicts.c:334 +#, c-format msgid "local: %s %s incoming: %s %s %s" -msgstr "æ¬å° %sï¼å¨ä½ %sï¼æä½ %s" +msgstr "æ¬å°: %s %s ä¼ å ¥: %s %s %s" + +#: ../svn/cl-conflicts.c:361 +#, c-format +msgid "%s %s" +msgstr "%s %s" -#: ../svn/cleanup-cmd.c:87 +#: ../svn/cleanup-cmd.c:88 msgid "Working copy locked; if no other Subversion client is currently using the working copy, try running 'svn cleanup' without the --remove-unversioned and --remove-ignored options first." msgstr "å·¥ä½å¯æ¬éå®ï¼å¦æ没æå ¶å® Subversion 客æ·ç«¯æ£å¨ä½¿ç¨æ¤å·¥ä½å¯æ¬ï¼è¯·å å°è¯æ§è¡å½ä»¤ 'svn cleanup'ï¼ä¸ä½¿ç¨åæ° --remove-unversioned å --remove-ignoredã" -#: ../svn/cleanup-cmd.c:95 +#: ../svn/cleanup-cmd.c:96 msgid "Cannot remove unversioned or ignored items from something that is not a working copy" -msgstr "" +msgstr "æ æ³ä»éå·¥ä½å¯æ¬ä¸ç§»é¤æªçæ¬æ§å¶æ忽ç¥ç项" -#: ../svn/cleanup-cmd.c:122 +#: ../svn/cleanup-cmd.c:123 #, c-format msgid "Working copy locked; try running 'svn cleanup' on the root of the working copy ('%s') instead." -msgstr "å·¥ä½å¯æ¬è¢«éå®ï¼è¯·å 对工ä½å¯æ¬(â%sâ)æ ¹ç®å½æ§è¡âsvn cleanupâã" +msgstr "å·¥ä½å¯æ¬è¢«éå®ï¼è¯·å 对工ä½å¯æ¬('%s')æ ¹ç®å½æ§è¡'svn cleanup'ã" #: ../svn/commit-cmd.c:80 #, c-format msgid "svn: The depth of this commit is '%s', but copies are always performed recursively in the repository.\n" -msgstr "svn: æ¤æ交ç深度æ¯â%sâï¼ä½æ¯å¨çæ¬åºä¸æ§è¡çå¤å¶æ»æ¯éå½çã\n" +msgstr "svn: æ¤æ交ç深度æ¯'%s'ï¼ä½æ¯å¨çæ¬åºä¸æ§è¡çå¤å¶æ»æ¯éå½çã\n" #: ../svn/commit-cmd.c:116 msgid "Commit targets must be local paths" msgstr "æ交ç®æ å¿ é¡»æ¯æ¬å°è·¯å¾" -#: ../svn/conflict-callbacks.c:159 ../svn/conflict-callbacks.c:176 +#: ../svn/conflict-callbacks.c:127 ../svn/conflict-callbacks.c:144 msgid "MINE" msgstr "æç" -#: ../svn/conflict-callbacks.c:164 ../svn/conflict-callbacks.c:174 +#: ../svn/conflict-callbacks.c:132 ../svn/conflict-callbacks.c:142 msgid "THEIRS" msgstr "å«äººç" -#: ../svn/conflict-callbacks.c:167 +#: ../svn/conflict-callbacks.c:135 msgid "MERGED" msgstr "å·²å并" -#: ../svn/conflict-callbacks.c:229 ../svn/conflict-callbacks.c:289 +#: ../svn/conflict-callbacks.c:198 ../svn/conflict-callbacks.c:246 msgid "||||||| ORIGINAL" msgstr "||||||| åå§çæ¬" -#: ../svn/conflict-callbacks.c:230 +#: ../svn/conflict-callbacks.c:199 msgid "<<<<<<< MINE (select with 'mc')" -msgstr "<<<<<<< æççæ¬ (ä½¿ç¨ âmcâ éæ©)" +msgstr "<<<<<<< æççæ¬ (ä½¿ç¨ 'mc' éæ©)" -#: ../svn/conflict-callbacks.c:231 +#: ../svn/conflict-callbacks.c:200 msgid ">>>>>>> THEIRS (select with 'tc')" -msgstr ">>>>>>> ä»äººçæ¬ (ä½¿ç¨ âtcâ éæ©)" +msgstr ">>>>>>> ä»äººçæ¬ (ä½¿ç¨ 'tc' éæ©)" -#: ../svn/conflict-callbacks.c:290 +#: ../svn/conflict-callbacks.c:247 msgid "<<<<<<< MINE" msgstr "<<<<<<< æç" -#: ../svn/conflict-callbacks.c:291 +#: ../svn/conflict-callbacks.c:248 msgid ">>>>>>> THEIRS" msgstr ">>>>>>> å«äººç" -#: ../svn/conflict-callbacks.c:362 +#: ../svn/conflict-callbacks.c:322 #, c-format msgid "" "Invalid option; there's no merged version to edit.\n" @@ -10276,232 +12200,142 @@ msgstr "" "éæ³é项ï¼æ²¡æå·²å并ççæ¬æ¥ç¼è¾ã\n" "\n" -#: ../svn/conflict-callbacks.c:420 -msgid "change merged file in an editor [edit]" -msgstr "å¨ç¼è¾å¨ä¸ä¿®æ¹å并åçæ件 [edit]" - #. Translators: keep long_desc below 70 characters (wrap with a left -#. margin of 9 spaces if needed); don't translate the words within square -#. brackets. -#: ../svn/conflict-callbacks.c:420 -#, fuzzy -msgid "edit file" -msgstr "深度: æ件\n" +#. margin of 9 spaces if needed) +#: ../svn/conflict-callbacks.c:463 +msgid "Quit resolution" +msgstr "éåºè§£å³" -#: ../svn/conflict-callbacks.c:423 -#, fuzzy -msgid "show all changes made to merged file" -msgstr "æ æ³å° svndiff åå ¥ä¸´æ¶æ件" +#: ../svn/conflict-callbacks.c:463 +msgid "postpone all remaining conflicts" +msgstr "æ¨è¿ææå©ä½å²çª" + +#. Translators: keep long_desc below 70 characters (wrap with a left +#. margin of 9 spaces if needed) +#: ../svn/conflict-callbacks.c:474 +msgid "Edit file" +msgstr "ç¼è¾æ件" + +#: ../svn/conflict-callbacks.c:474 +msgid "change merged file in an editor" +msgstr "å¨ç¼è¾å¨ä¸æ´æ¹å并åçæ件" -#: ../svn/conflict-callbacks.c:423 -msgid "show diff" +#: ../svn/conflict-callbacks.c:477 +msgid "Show diff" msgstr "æ¾ç¤ºå·®å¼" -#: ../svn/conflict-callbacks.c:425 -msgid "accept merged version of file" -msgstr "æ¥åæ件çå并çæ¬" - -#: ../svn/conflict-callbacks.c:425 ../svn/conflict-callbacks.c:478 -#: ../svn/conflict-callbacks.c:493 -#, fuzzy -msgid "mark resolved" -msgstr "ï¼(r) 已解å³" - -#: ../svn/conflict-callbacks.c:428 ../svn/conflict-callbacks.c:473 -#, fuzzy -msgid "display conflict" -msgstr "æ å²çª" +#: ../svn/conflict-callbacks.c:477 +msgid "show all changes made to merged file" +msgstr "æ¾ç¤ºå¯¹å并æ件çæææ´æ¹" -#: ../svn/conflict-callbacks.c:428 +#. Translators: keep long_desc below 70 characters (wrap with a left +#. margin of 9 spaces if needed) +#: ../svn/conflict-callbacks.c:479 ../svn/conflict-callbacks.c:501 +msgid "Display conflict" +msgstr "æ¾ç¤ºå²çª" + +#: ../svn/conflict-callbacks.c:479 msgid "show all conflicts (ignoring merged version)" msgstr "æ¾ç¤ºææå²çª (忽ç¥å·²å并çæ¬)" -#: ../svn/conflict-callbacks.c:431 -msgid "accept my version for all conflicts (same) [mine-conflict]" -msgstr "" - -#: ../svn/conflict-callbacks.c:431 -#, fuzzy -msgid "my side of conflict" -msgstr "å²çªæ¦è¦ï¼\n" - -#: ../svn/conflict-callbacks.c:434 -msgid "accept their version for all conflicts (same) [theirs-conflict]" -msgstr "" - -#: ../svn/conflict-callbacks.c:434 -#, fuzzy -msgid "their side of conflict" -msgstr "æ å²çª" - -#: ../svn/conflict-callbacks.c:439 -msgid "accept my version of entire file (even non-conflicts) [mine-full]" -msgstr "" - -#: ../svn/conflict-callbacks.c:439 ../svn/conflict-callbacks.c:467 -#, fuzzy -msgid "my version" -msgstr "æªçæ¬æ§å¶" - -#: ../svn/conflict-callbacks.c:442 -msgid "accept their version of entire file (same) [theirs-full]" -msgstr "" - -#: ../svn/conflict-callbacks.c:442 ../svn/conflict-callbacks.c:470 -msgid "their version" -msgstr "å«äººççæ¬" - -#: ../svn/conflict-callbacks.c:446 ../svn/util.c:769 -msgid "merge" +#: ../svn/conflict-callbacks.c:482 +msgid "Merge" msgstr "å并" -#: ../svn/conflict-callbacks.c:446 -#, fuzzy +#: ../svn/conflict-callbacks.c:482 msgid "use merge tool to resolve conflict" -msgstr "没æåç°åå¹¶å·¥å ·ï¼ä¸å¤çå²çªã" +msgstr "使ç¨åå¹¶å·¥å ·è§£å³å²çª" -#: ../svn/conflict-callbacks.c:448 -msgid "launch external merge tool to resolve conflict [launch]" -msgstr "" +#: ../svn/conflict-callbacks.c:484 +msgid "Launch tool" +msgstr "å¯å¨å·¥å ·" -#: ../svn/conflict-callbacks.c:448 -msgid "launch tool" -msgstr "" +#: ../svn/conflict-callbacks.c:484 +msgid "launch external merge tool to resolve conflict" +msgstr "å¯å¨å¤é¨åå¹¶å·¥å ·è§£å³å²çª" -#: ../svn/conflict-callbacks.c:451 -#, fuzzy -msgid "internal merge tool" -msgstr "没æå¤é¨åå¹¶å·¥å ·å¯ç¨" +#: ../svn/conflict-callbacks.c:488 +msgid "Internal merge tool" +msgstr "å é¨åå¹¶å·¥å ·" -#: ../svn/conflict-callbacks.c:451 +#: ../svn/conflict-callbacks.c:488 msgid "use built-in merge tool to resolve conflict" -msgstr "" +msgstr "使ç¨å ç½®åå¹¶å·¥å ·è§£å³å²çª" -#: ../svn/conflict-callbacks.c:454 ../svn/conflict-callbacks.c:480 -msgid "mark the conflict to be resolved later [postpone]" -msgstr "" +#: ../svn/conflict-callbacks.c:491 +msgid "Show all options" +msgstr "æ¾ç¤ºææé项" -#: ../svn/conflict-callbacks.c:454 ../svn/conflict-callbacks.c:480 -#: ../svn/conflict-callbacks.c:495 ../svn/conflict-callbacks.c:510 -#: ../svn/conflict-callbacks.c:525 -msgid "postpone" -msgstr "" - -#: ../svn/conflict-callbacks.c:457 ../svn/conflict-callbacks.c:483 -#: ../svn/conflict-callbacks.c:497 ../svn/conflict-callbacks.c:512 -#: ../svn/conflict-callbacks.c:527 -#, fuzzy -msgid "postpone all remaining conflicts" -msgstr "æ交ç»æ¢: â%sâ å¤äºå²çªç¶æ" - -#: ../svn/conflict-callbacks.c:457 ../svn/conflict-callbacks.c:483 -#: ../svn/conflict-callbacks.c:497 ../svn/conflict-callbacks.c:512 -#: ../svn/conflict-callbacks.c:527 -#, fuzzy -msgid "quit resolution" -msgstr "解å³å²çªå¤±è´¥" - -#: ../svn/conflict-callbacks.c:459 -#, fuzzy -msgid "show all options" -msgstr "(s) æ¾ç¤ºå ¨é¨é项: " - -#: ../svn/conflict-callbacks.c:459 +#: ../svn/conflict-callbacks.c:491 msgid "show this list (also 'h', '?')" -msgstr "" +msgstr "æ¾ç¤ºæ¤å表(ä¹å¯ç¨ 'h'ã'?')" -#: ../svn/conflict-callbacks.c:467 -msgid "accept my version of entire property (even non-conflicts) [mine-full]" -msgstr "" - -#: ../svn/conflict-callbacks.c:470 -msgid "accept their version of entire property (same) [theirs-full]" -msgstr "" - -#: ../svn/conflict-callbacks.c:473 -#, fuzzy +#: ../svn/conflict-callbacks.c:501 msgid "show conflicts in this property" -msgstr "æä½æ¶å¿½ç¥å±æ§" +msgstr "æ¾ç¤ºæ¤å±æ§ä¸çå²çª" -#: ../svn/conflict-callbacks.c:475 -msgid "change merged property value in an editor [edit]" -msgstr "" +#: ../svn/conflict-callbacks.c:503 +msgid "Edit property" +msgstr "ç¼è¾å±æ§" -#: ../svn/conflict-callbacks.c:475 -#, fuzzy -msgid "edit property" -msgstr "å±æ§å称é误" +#: ../svn/conflict-callbacks.c:503 +msgid "change merged property value in an editor" +msgstr "å¨ç¼è¾å¨ä¸æ´æ¹å并åçå±æ§å¼" -#: ../svn/conflict-callbacks.c:478 -#, fuzzy -msgid "accept edited version of property" -msgstr "è·åçæ¬å±æ§ ARG" - -#: ../svn/conflict-callbacks.c:485 ../svn/conflict-callbacks.c:499 -#: ../svn/conflict-callbacks.c:514 ../svn/conflict-callbacks.c:529 -msgid "help" -msgstr "" +#: ../svn/conflict-callbacks.c:507 ../svn/conflict-callbacks.c:525 +msgid "Help" +msgstr "帮å©" -#: ../svn/conflict-callbacks.c:485 ../svn/conflict-callbacks.c:499 -#: ../svn/conflict-callbacks.c:514 ../svn/conflict-callbacks.c:529 +#: ../svn/conflict-callbacks.c:507 ../svn/conflict-callbacks.c:525 msgid "show this help (also '?')" -msgstr "" - -#: ../svn/conflict-callbacks.c:493 -#, fuzzy -msgid "accept current working copy state" -msgstr "ç®æ å¿ é¡»æ¯å·¥ä½å¯æ¬è·¯å¾" - -#: ../svn/conflict-callbacks.c:495 ../svn/conflict-callbacks.c:510 -#: ../svn/conflict-callbacks.c:525 -#, fuzzy -msgid "resolve the conflict later [postpone]" -msgstr "â%sâçå²çªç¶æ已解å³\n" +msgstr "æ¾ç¤ºæ¤å¸®å©(ä¹å¯ç¨ '?')" -#: ../svn/conflict-callbacks.c:506 -msgid "apply update to move destination (recommended)" -msgstr "" - -#: ../svn/conflict-callbacks.c:507 -msgid "apply incoming update to move destination [mine-conflict]" -msgstr "" +#. Translators: keep long_desc below 70 characters (wrap with a left +#. margin of 9 spaces if needed) +#: ../svn/conflict-callbacks.c:517 +msgid "Set repository move destination path" +msgstr "设置çæ¬åºç§»å¨ç®æ è·¯å¾" + +#: ../svn/conflict-callbacks.c:518 +msgid "pick repository move target from list of possible targets" +msgstr "ä»å¯è½çç®æ å表ä¸éæ©çæ¬åºç§»å¨ç®æ " #: ../svn/conflict-callbacks.c:521 -msgid "prepare for updating moved-away children, if any (recommended)" -msgstr "" +msgid "Set working copy move destination path" +msgstr "设置工ä½å¯æ¬ç§»å¨ç®æ è·¯å¾" #: ../svn/conflict-callbacks.c:522 -msgid "allow updating moved-away children with 'svn resolve' [mine-conflict]" -msgstr "" +msgid "pick working copy move target from list of possible targets" +msgstr "ä»å¯è½çç®æ å表ä¸éæ©å·¥ä½å¯æ¬ç§»å¨ç®æ " -#: ../svn/conflict-callbacks.c:558 +#: ../svn/conflict-callbacks.c:624 msgid "Select:" -msgstr "" - -#: ../svn/conflict-callbacks.c:585 -#, c-format -msgid " (%s) %s" -msgstr "" +msgstr "éæ©:" -#: ../svn/conflict-callbacks.c:625 +#: ../svn/conflict-callbacks.c:710 msgid "Words in square brackets are the corresponding --accept option arguments.\n" -msgstr "" +msgstr "æ¹æ¬å·ä¸çåè¯æ¯å¯¹åºç --accept é项åæ°ã\n" -#: ../svn/conflict-callbacks.c:664 -#, fuzzy, c-format +#: ../svn/conflict-callbacks.c:755 +#, c-format msgid "" "Unrecognized option.\n" "\n" msgstr "" -"æ æé项ã\n" +"æ æ³è¯å«çé项ã\n" "\n" -#: ../svn/conflict-callbacks.c:693 -#, fuzzy, c-format -msgid "Conflict discovered in file '%s'.\n" -msgstr "å¨ â%sâ ä¸åç°å²çªã\n" +#: ../svn/conflict-callbacks.c:920 +#, c-format +msgid "Merge conflict discovered in binary file '%s'.\n" +msgstr "å¨äºè¿å¶æ件 '%s' ä¸åç°å并å²çªã\n" -#: ../svn/conflict-callbacks.c:763 +#: ../svn/conflict-callbacks.c:925 +#, c-format +msgid "Merge conflict discovered in file '%s'.\n" +msgstr "å¨æ件 '%s' ä¸åç°å并å²çªã\n" + +#: ../svn/conflict-callbacks.c:1008 #, c-format msgid "" "Invalid option; cannot display conflicts for a binary file.\n" @@ -10510,7 +12344,7 @@ msgstr "" "éæ³é项ï¼ä¸è½æ¾ç¤ºäºè¿å¶æ件çå²çªã\n" "\n" -#: ../svn/conflict-callbacks.c:772 +#: ../svn/conflict-callbacks.c:1016 #, c-format msgid "" "Invalid option; original files not available.\n" @@ -10519,7 +12353,7 @@ msgstr "" "éæ³é项ï¼åå§æ件ä¸å¯ç¨ã\n" "\n" -#: ../svn/conflict-callbacks.c:787 +#: ../svn/conflict-callbacks.c:1032 #, c-format msgid "" "Invalid option; there's no merged version to diff.\n" @@ -10528,7 +12362,16 @@ msgstr "" "éæ³é项ï¼æ²¡æå·²å并ççæ¬æ¥æ¯è¾å·®å¼ã\n" "\n" -#: ../svn/conflict-callbacks.c:897 +#: ../svn/conflict-callbacks.c:1058 +#, c-format +msgid "" +"Invalid option; there's no base path to merge.\n" +"\n" +msgstr "" +"æ æé项ï¼æ²¡æå¯å并çåºç¡è·¯å¾ã\n" +"\n" + +#: ../svn/conflict-callbacks.c:1151 #, c-format msgid "" "Invalid option.\n" @@ -10537,7 +12380,7 @@ msgstr "" "æ æé项ã\n" "\n" -#: ../svn/conflict-callbacks.c:926 +#: ../svn/conflict-callbacks.c:1180 #, c-format msgid "" "Invalid option; cannot choose based on conflicts in a binary file.\n" @@ -10546,74 +12389,132 @@ msgstr "" "éæ³é项ï¼ä¸è½ä¸ºäºè¿å¶æ件å²çªéæ©åºåã\n" "\n" -#: ../svn/conflict-callbacks.c:940 +#: ../svn/conflict-callbacks.c:1194 #, c-format msgid "" "Invalid option; use diff/edit/merge/launch before choosing 'mark resolved'.\n" "\n" msgstr "" +"æ æé项ï¼è¯·å ä½¿ç¨ diff/edit/merge/launch åéæ©'æ 记为已解å³'ã\n" +"\n" -#: ../svn/conflict-callbacks.c:981 +#: ../svn/conflict-callbacks.c:1307 #, c-format msgid "Conflict for property '%s' discovered on '%s'.\n" -msgstr "å±æ§ â%sâ å²çªï¼ä½äº â%sâã\n" +msgstr "å±æ§ '%s' å²çªï¼ä½äº '%s'ã\n" -#: ../svn/conflict-callbacks.c:1041 -#, fuzzy, c-format +#: ../svn/conflict-callbacks.c:1376 +#, c-format msgid "" "Invalid option; please edit the property first.\n" "\n" msgstr "" -"éæ³é项ï¼ä¸è½æ¾ç¤ºå±æ§çå²çªã\n" +"æ æé项ï¼è¯·å ç¼è¾å±æ§ã\n" "\n" -#: ../svn/conflict-callbacks.c:1078 -#, fuzzy, c-format +#: ../svn/conflict-callbacks.c:1635 +#, c-format +msgid "" +"Possible working copy destinations for moved-away '%s' are:\n" +"%sOnly one destination can be a move; the others are copies.\n" +"Specify the correct move target path by number: " +msgstr "" +"移走ç '%s' çå¯è½å·¥ä½å¯æ¬ç®æ 为:\n" +"%såªæä¸ä¸ªç®æ å¯ä»¥æ¯ç§»å¨ï¼å ¶ä½ä¸ºå¤å¶ã\n" +"请æç¼å·æå®æ£ç¡®ç移å¨ç®æ è·¯å¾: " + +#: ../svn/conflict-callbacks.c:1644 +#, c-format +msgid "" +"Possible repository destinations for moved-away '%s' are:\n" +"%sOnly one destination can be a move; the others are copies.\n" +"Specify the correct move target path by number: " +msgstr "" +"移走ç '%s' çå¯è½çæ¬åºç®æ 为:\n" +"%såªæä¸ä¸ªç®æ å¯ä»¥æ¯ç§»å¨ï¼å ¶ä½ä¸ºå¯æ¬ã\n" +"请è¾å ¥æ£ç¡®ç移å¨ç®æ è·¯å¾ç¼å·: " + +#: ../svn/conflict-callbacks.c:1789 +#, c-format +msgid "" +"Tree conflict on '%s':\n" +"%s\n" +msgstr "" +"'%s' ä¸çæ å²çª:\n" +"%s\n" + +#: ../svn/conflict-callbacks.c:1809 +#, c-format +msgid "Applying recommended resolution '%s':\n" +msgstr "æ£å¨åºç¨æ¨èç解å³æ¹æ¡ '%s':\n" + +#: ../svn/conflict-callbacks.c:1834 +#, c-format msgid "" -"Tree conflict on '%s'\n" -" > %s\n" -msgstr " æ å²çªï¼%u\n" +"\n" +"Subversion is not smart enough to resolve this tree conflict automatically!\n" +"See 'svn help resolve' for more information.\n" +"\n" +msgstr "" +"\n" +"Subversion ä¸å¤æºè½æ¥èªå¨è§£å³æ¤æ å²çªï¼\n" +"åè§ 'svn help resolve' è·åæ´å¤ä¿¡æ¯ã\n" + +#: ../svn/conflict-callbacks.c:1849 +#, c-format +msgid "Ambiguous move destinations exist in the repository; try the 'd' option\n" +msgstr "çæ¬åºä¸åå¨æ¨¡ç³ç移å¨ç®æ ï¼å°è¯ 'd' é项\n" + +#: ../svn/conflict-callbacks.c:1854 +#, c-format +msgid "Ambiguous move destinations exist in the working copy; try the 'w' option\n" +msgstr "å·¥ä½å¯æ¬ä¸åå¨æ¨¡ç³ç移å¨ç®æ ï¼å°è¯ 'w' é项\n" -#: ../svn/copy-cmd.c:123 ../svn/export-cmd.c:94 ../svn/util.c:952 +#: ../svn/copy-cmd.c:123 ../svn/export-cmd.c:94 ../svn/util.c:965 #, c-format msgid "'%s': a peg revision is not allowed here" -msgstr "'%s': æ¤å¤ä¸å 许ééçæ¬èå´" +msgstr "'%s': æ¤å¤ä¸å 许éå®çæ¬èå´" #: ../svn/copy-cmd.c:162 ../svn/delete-cmd.c:69 ../svn/mkdir-cmd.c:68 -#: ../svn/move-cmd.c:77 ../svn/propedit-cmd.c:260 +#: ../svn/move-cmd.c:77 ../svn/propedit-cmd.c:262 msgid "Local, non-commit operations do not take a log message or revision properties" msgstr "æ¬å°æä½ï¼éæ交æä½æ é¡»æ¥å¿ä¿¡æ¯æçæ¬å±æ§" -#: ../svn/diff-cmd.c:210 +#: ../svn/diff-cmd.c:242 msgid "'--xml' option only valid with '--summarize' option" -msgstr "â--xmlâ é项åªè½ä¸ â--summarizeâ åæ¶ä½¿ç¨" +msgstr "'--xml' é项åªè½ä¸ '--summarize' åæ¶ä½¿ç¨" -#: ../svn/diff-cmd.c:301 +#: ../svn/diff-cmd.c:255 ../svn/diff-cmd.c:259 ../svn/diff-cmd.c:263 +#: ../svn/diff-cmd.c:267 ../svn/diff-cmd.c:271 ../svn/diff-cmd.c:275 +#: ../svn/diff-cmd.c:279 ../svn/diff-cmd.c:283 +#, c-format +msgid "'%s' not valid with '--summarize' option" +msgstr "'%s' ä¸è½ä¸ '--summarize' é项ä¸èµ·ä½¿ç¨" + +#: ../svn/diff-cmd.c:370 msgid "'--new' option only valid with '--old' option" -msgstr "â--newâ é项åªè½ä¸ â--oldâ åæ¶ä½¿ç¨" +msgstr "'--new' é项åªè½ä¸ '--old' åæ¶ä½¿ç¨" -#: ../svn/diff-cmd.c:319 +#: ../svn/diff-cmd.c:388 msgid "'svn diff [-r N[:M]] [TARGET[@REV]...]' does not support mixed target types. Try using the --old and --new options or one of the shorthand invocations listed in 'svn help diff'." -msgstr "" +msgstr "'svn diff [-r N[:M]] [TARGET[@REV]...]' ä¸æ¯ææ··åç®æ ç±»åã请å°è¯ä½¿ç¨ --old å --new é项æåªä½¿ç¨ä¸ç§ç®æ ç±»å" -#: ../svn/diff-cmd.c:372 +#: ../svn/diff-cmd.c:445 #, c-format msgid "Path '%s' not relative to base URLs" -msgstr "è·¯å¾â%sâä¸æ¯ç¸å¯¹äºåºç¡ URL" +msgstr "è·¯å¾'%s'ä¸æ¯ç¸å¯¹äºåºç¡ URL" #: ../svn/export-cmd.c:121 msgid "Destination directory exists; please remove the directory or use --force to overwrite" msgstr "ç®çç®å½å·²åå¨ï¼è¯·å é¤ç®å½æç¨ --force æ¥è¦çç®å½" #: ../svn/file-merge.c:139 ../svn/file-merge.c:809 -#, fuzzy msgid "Could not write data to merged file" -msgstr "æ æ³å° svndiff åå ¥ä¸´æ¶æ件" +msgstr "æ æ³å°æ°æ®åå ¥å并åçæ件" #: ../svn/file-merge.c:495 -#, fuzzy msgid "Could not write data to temporary file" -msgstr "æ æ³å° svndiff åå ¥ä¸´æ¶æ件" +msgstr "æ æ³å°æ°æ®åå ¥ä¸´æ¶æ件" #: ../svn/file-merge.c:507 msgid "No editor found." @@ -10625,17 +12526,17 @@ msgstr "æ§è¡ç¼è¾å¨é误ã" #: ../svn/file-merge.c:604 msgid "Conflicting section found during merge:" -msgstr "" +msgstr "å并è¿ç¨ä¸åç°å²çªçé¨å:" #: ../svn/file-merge.c:607 #, c-format msgid "(1) their version (at line %lu)" -msgstr "" +msgstr "(1) 对æ¹ççæ¬ (å¨ç¬¬ %lu è¡)" #: ../svn/file-merge.c:612 #, c-format msgid "(2) your version (at line %lu)" -msgstr "" +msgstr "(2) ä½ ççæ¬ (å¨ç¬¬ %lu è¡)" #: ../svn/file-merge.c:661 msgid "" @@ -10648,16 +12549,24 @@ msgid "" " (p) postpone this conflicting section leaving conflict markers,\n" " (a) abort file merge and return to main menu: " msgstr "" +"éæ©: (1) 使ç¨å¯¹æ¹çæ¬ï¼(2) 使ç¨ä½ ççæ¬ï¼\n" +" (12) å 对æ¹åä½ çï¼\n" +" (21) å ä½ çå对æ¹ï¼\n" +" (e1) ç¼è¾å¯¹æ¹çæ¬å¹¶ä½¿ç¨ç»æï¼\n" +" (e2) ç¼è¾ä½ ççæ¬å¹¶ä½¿ç¨ç»æï¼\n" +" (eb) ç¼è¾ä¸¤ä¸ªçæ¬å¹¶ä½¿ç¨ç»æï¼\n" +" (p) æ¨è¿æ¤å²çªæ®µï¼ä¿çå²çªæ è®°ï¼\n" +" (a) ä¸æ¢æ件å并ï¼è¿å主èå: " #: ../svn/file-merge.c:894 -#, fuzzy, c-format +#, c-format msgid "Merging '%s'.\n" -msgstr "æ£å¨è¯»å â%sâ" +msgstr "æ£å¨å并 '%s'ã\n" #: ../svn/file-merge.c:942 #, c-format msgid "Merge of '%s' aborted.\n" -msgstr "" +msgstr "'%s' çå并已ä¸æ¢ã\n" #: ../svn/file-merge.c:960 #, c-format @@ -10665,27 +12574,32 @@ msgid "" "Could not write merged result to '%s', saved instead at '%s'.\n" "'%s' remains in conflict.\n" msgstr "" +"æ æ³å°å并ç»æåå ¥ '%s'ï¼å·²ä¿åå° '%s'ã\n" +"'%s' ä»å¤äºå²çªç¶æã\n" #: ../svn/file-merge.c:978 -#, fuzzy, c-format +#, c-format msgid "Merge of '%s' completed (remains in conflict).\n" -msgstr "å·²è·³è¿ '%s' -- èç¹å¤äºå²çªç¶æ\n" +msgstr "'%s' çå并已å®æ(ä»å¤äºå²çªç¶æ)ã\n" #: ../svn/file-merge.c:982 -#, fuzzy, c-format +#, c-format msgid "Merge of '%s' completed.\n" -msgstr "" -"\n" -"å®æå级ã\n" +msgstr "'%s' çå并已å®æã\n" + +#: ../svn/help-cmd.c:60 +#, c-format +msgid "%sWC format %d, compatible with Subversion v%d.%d and newer\n" +msgstr "%så·¥ä½å¯æ¬æ ¼å¼ %dï¼å ¼å®¹ Subversion v%d.%d åæ´æ°çæ¬\n" -#: ../svn/help-cmd.c:53 -#, fuzzy +#: ../svn/help-cmd.c:79 msgid "" "usage: svn <subcommand> [options] [args]\n" "Subversion command-line client.\n" "Type 'svn help <subcommand>' for help on a specific subcommand.\n" -"Type 'svn --version' to see the program version and RA modules\n" -" or 'svn --version --quiet' to see just the version number.\n" +"Type 'svn --version' to see the program version and RA modules,\n" +" 'svn --version --verbose' to see dependency versions as well,\n" +" 'svn --version --quiet' to see just the version number.\n" "\n" "Most subcommands take file and/or directory arguments, recursing\n" "on the directories. If no arguments are supplied to such a\n" @@ -10694,41 +12608,69 @@ msgid "" "Available subcommands:\n" msgstr "" "ç¨æ³: svn <subcommand> [options] [args]\n" -"Subversion å½ä»¤è¡å®¢æ·ç«¯ï¼çæ¬ %sã\n" -"使ç¨âsvn help <subcommand>â æ¾ç¤ºåå½ä»¤ç帮å©ä¿¡æ¯ã\n" -"使ç¨âsvn --versionâæ¥çç¨åºççæ¬å·åçæ¬åºè®¿é®æ¨¡åï¼æè \n" -"使ç¨âsvn --version --quietâåªæ¥çç¨åºççæ¬å·ã\n" +"Subversion å½ä»¤è¡å®¢æ·ç«¯ã\n" +"ä½¿ç¨ 'svn help <subcommand>' æ¥çåå½ä»¤ç帮å©ä¿¡æ¯ã\n" +"ä½¿ç¨ 'svn --version' æ¥çç¨åºçæ¬åçæ¬åºè®¿é®(RA)模åï¼\n" +" 'svn --version --verbose' åæ¶æ¥çä¾èµçæ¬ï¼\n" +" 'svn --version --quiet' åªæ¥ççæ¬å·ã\n" "\n" -"大å¤æ°çåå½ä»¤å¯æ¥åæ件æç®å½åæ°ï¼å¯¹ç®å½è¿è¡éå½å¤çã\n" -"å¦æ没ææå®åæ°ï¼é»è®¤å¯¹å½åç®å½(å å«å½åç®å½)éå½å¤çã\n" +"大å¤æ°åå½ä»¤æ¥åæ件æç®å½åæ°ï¼å¹¶éå½å¤çç®å½ã\n" +"å¦æ没æç»å½ä»¤æä¾åæ°ï¼é»è®¤éå½å¤çå½åç®å½(å å«èªèº«)ã\n" "\n" -"å¯ç¨çåå½ä»¤: \n" +"å¯ç¨çåå½ä»¤:\n" + +#: ../svn/help-cmd.c:93 ../svnbench/help-cmd.c:62 +msgid "" +"Subversion is a tool for version control.\n" +"For additional information, see https://subversion.apache.org/\n" +msgstr "" +"Subversion æ¯çæ¬æ§å¶å·¥å ·ã\n" +"欲åå¾è¯¦ç»èµæï¼è¯·åé https://subversion.apache.org/\n" -#: ../svn/help-cmd.c:124 +#: ../svn/help-cmd.c:149 msgid "" "WARNING: Plaintext password storage is enabled!\n" "\n" msgstr "" +"è¦å: 纯ææ¬å¯ç åå¨å·²å¯ç¨ï¼\n" +"\n" + +#: ../svn/help-cmd.c:161 +msgid "" +"Supported working copy (WC) formats:\n" +"\n" +msgstr "" +"æ¯æçå·¥ä½å¯æ¬ (WC) æ ¼å¼:\n" +"\n" -#: ../svn/help-cmd.c:147 -#, fuzzy +#: ../svn/help-cmd.c:170 ../svnbench/help-cmd.c:66 ../svnrdump/svnrdump.c:620 +#: ../svnsync/svnsync.c:1938 +msgid "" +"The following repository access (RA) modules are available:\n" +"\n" +msgstr "" +"以ä¸çæ¬åºè®¿é® (RA) 模åå¯ç¨:\n" +"\n" + +#: ../svn/help-cmd.c:183 msgid "" "\n" "The following authentication credential caches are available:\n" "\n" msgstr "" -"å¯ä½¿ç¨ä»¥ä¸ççæ¬åºè®¿é®æ¨¡å: \n" +"\n" +"以ä¸è®¤è¯åæ®ç¼åå¯ç¨:\n" "\n" -#: ../svn/help-cmd.c:152 +#: ../svn/help-cmd.c:190 #, c-format msgid "%s* Wincrypt cache in %s\n" -msgstr "" +msgstr "%s* Wincrypt ç¼åå¨ %s\n" -#: ../svn/help-cmd.c:159 +#: ../svn/help-cmd.c:197 #, c-format msgid "%s* Plaintext cache in %s\n" -msgstr "" +msgstr "%s* 纯ææ¬ç¼åå¨ %s\n" #: ../svn/import-cmd.c:87 msgid "Repository URL required when importing" @@ -10741,213 +12683,270 @@ msgstr "å¯¼å ¥å½ä»¤åæ°å¤ªå¤" #: ../svn/import-cmd.c:107 #, c-format msgid "Invalid URL '%s'" -msgstr "æ æURLâ%sâ" +msgstr "æ æURL'%s'" + +#: ../svn/info-cmd.c:222 +#, c-format +msgid "svn-viewspec.py format 1 does not support the 'not-present' state found at '%s'" +msgstr "svn-viewspec.py æ ¼å¼ 1 ä¸æ¯æå¨ '%s' å¤åç°ç 'not-present' ç¶æ" + +#: ../svn/info-cmd.c:231 +#, c-format +msgid "svn-viewspec.py format 1 does not support the 'switched' state found at '%s'" +msgstr "svn-viewspec.py æ ¼å¼ 1 ä¸æ¯æå¨ '%s' å¤åç°ç 'switched' ç¶æ" + +#: ../svn/info-cmd.c:481 +#, c-format +msgid "'%s' is not a valid value for --show-item" +msgstr "'%s' ä¸æ¯ --show-item çææå¼" + +#: ../svn/info-cmd.c:489 +#, c-format +msgid "'%s' is not a valid value for --show-item; did you mean '%s'?" +msgstr "'%s' ä¸æ¯ --show-item çææå¼ï¼ä½ æ¯å¦æçæ¯ '%s'ï¼" + +#: ../svn/info-cmd.c:499 +#, c-format +msgid "'%s' is not a valid value for --show-item; did you mean '%s' or '%s'?" +msgstr "'%s' ä¸æ¯ --show-item çææå¼ï¼ä½ æ¯å¦æçæ¯ '%s' æ '%s'ï¼" -#: ../svn/info-cmd.c:95 +#: ../svn/info-cmd.c:510 +#, c-format +msgid "'%s' is not a valid value for --show-item; did you mean '%s', '%s' or '%s'?" +msgstr "'%s' ä¸æ¯ --show-item çææå¼ï¼ä½ æ¯å¦æçæ¯ '%s'ã'%s' æ '%s'ï¼" + +#: ../svn/info-cmd.c:534 msgid "Resource is not under version control." msgstr "èµæºå°æªçº³å ¥çæ¬æ§å¶" -#: ../svn/info-cmd.c:268 ../svnadmin/svnadmin.c:1949 -#: ../svnadmin/svnadmin.c:2167 +#: ../svn/info-cmd.c:745 ../svnadmin/svnadmin.c:2400 +#: ../svnadmin/svnadmin.c:2636 #, c-format msgid "Path: %s\n" msgstr "è·¯å¾: %s\n" -#: ../svn/info-cmd.c:275 +#: ../svn/info-cmd.c:752 #, c-format msgid "Name: %s\n" msgstr "å称: %s\n" -#: ../svn/info-cmd.c:279 +#: ../svn/info-cmd.c:756 #, c-format msgid "Working Copy Root Path: %s\n" msgstr "å·¥ä½å¯æ¬æ ¹ç®å½: %s\n" -#: ../svn/info-cmd.c:285 +#: ../svn/info-cmd.c:766 +#, c-format +msgid "Working Copy Compatible With Version: %d.%d\n" +msgstr "å·¥ä½å¯æ¬å ¼å®¹çæ¬: %d.%d\n" + +#: ../svn/info-cmd.c:768 +#, c-format +msgid "Working Copy Format: %d\n" +msgstr "å·¥ä½å¯æ¬æ ¼å¼: %d\n" + +#: ../svn/info-cmd.c:775 +msgid "Working Copy Store Pristine: yes\n" +msgstr "å·¥ä½å¯æ¬åå¨åå§å 容: æ¯\n" + +#: ../svn/info-cmd.c:778 +msgid "Working Copy Store Pristine: no\n" +msgstr "å·¥ä½å¯æ¬åå¨åå§å 容: å¦\n" + +#: ../svn/info-cmd.c:783 #, c-format msgid "URL: %s\n" msgstr "URL: %s\n" -#: ../svn/info-cmd.c:288 -#, fuzzy, c-format -msgid "Relative URL: ^/%s\n" -msgstr "ä¸æ£ç¡®çç¸å¯¹ URLâ%sâ" +#: ../svn/info-cmd.c:786 +#, c-format +msgid "Relative URL: %s\n" +msgstr "ç¸å¯¹ URL: %s\n" -#: ../svn/info-cmd.c:295 +#: ../svn/info-cmd.c:790 #, c-format msgid "Repository Root: %s\n" msgstr "çæ¬åºæ ¹: %s\n" -#: ../svn/info-cmd.c:299 +#: ../svn/info-cmd.c:794 #, c-format msgid "Repository UUID: %s\n" msgstr "çæ¬åº UUID: %s\n" -#: ../svn/info-cmd.c:303 +#: ../svn/info-cmd.c:798 #, c-format msgid "Revision: %ld\n" msgstr "çæ¬: %ld\n" -#: ../svn/info-cmd.c:308 +#: ../svn/info-cmd.c:803 #, c-format msgid "Node Kind: file\n" msgstr "èç¹ç§ç±»: æ件\n" -#: ../svn/info-cmd.c:312 +#: ../svn/info-cmd.c:807 #, c-format msgid "Node Kind: directory\n" msgstr "èç¹ç§ç±»: ç®å½\n" -#: ../svn/info-cmd.c:316 +#: ../svn/info-cmd.c:811 #, c-format msgid "Node Kind: none\n" msgstr "èç¹ç§ç±»: æ \n" -#: ../svn/info-cmd.c:321 +#: ../svn/info-cmd.c:816 #, c-format msgid "Node Kind: unknown\n" msgstr "èç¹ç§ç±»: æªç¥\n" -#: ../svn/info-cmd.c:330 +#: ../svn/info-cmd.c:826 +#, c-format +msgid "Size in Repository: %s\n" +msgstr "çæ¬åºä¸ç大å°: %s\n" + +#: ../svn/info-cmd.c:835 #, c-format msgid "Schedule: normal\n" msgstr "è°åº¦: æ£å¸¸\n" -#: ../svn/info-cmd.c:334 +#: ../svn/info-cmd.c:839 #, c-format msgid "Schedule: add\n" msgstr "è°åº¦: å¢å \n" -#: ../svn/info-cmd.c:338 +#: ../svn/info-cmd.c:843 #, c-format msgid "Schedule: delete\n" msgstr "è°åº¦: å é¤\n" -#: ../svn/info-cmd.c:342 +#: ../svn/info-cmd.c:847 #, c-format msgid "Schedule: replace\n" msgstr "è°åº¦: æ¿æ¢\n" -#: ../svn/info-cmd.c:358 +#: ../svn/info-cmd.c:863 #, c-format msgid "Depth: empty\n" msgstr "深度: 空\n" -#: ../svn/info-cmd.c:362 +#: ../svn/info-cmd.c:867 #, c-format msgid "Depth: files\n" msgstr "深度: æ件\n" -#: ../svn/info-cmd.c:366 +#: ../svn/info-cmd.c:871 #, c-format msgid "Depth: immediates\n" msgstr "深度: ç´æ¥\n" -#: ../svn/info-cmd.c:370 +#: ../svn/info-cmd.c:875 #, c-format msgid "Depth: exclude\n" msgstr "深度: æé¤\n" #. Other depths should never happen here. -#: ../svn/info-cmd.c:381 +#: ../svn/info-cmd.c:886 #, c-format msgid "Depth: INVALID\n" msgstr "深度: éæ³\n" -#: ../svn/info-cmd.c:385 +#: ../svn/info-cmd.c:890 #, c-format msgid "Copied From URL: %s\n" msgstr "ä»URL %s å¤å¶: \n" -#: ../svn/info-cmd.c:389 +#: ../svn/info-cmd.c:894 #, c-format msgid "Copied From Rev: %ld\n" msgstr "ä»çæ¬ %ld å¤å¶: \n" -#: ../svn/info-cmd.c:398 ../svn/info-cmd.c:400 +#: ../svn/info-cmd.c:897 #, c-format msgid "Moved From: %s\n" msgstr "移èª: %s\n" -#: ../svn/info-cmd.c:411 ../svn/info-cmd.c:413 +#: ../svn/info-cmd.c:904 #, c-format msgid "Moved To: %s\n" msgstr "移å°: %s\n" -#: ../svn/info-cmd.c:419 +#: ../svn/info-cmd.c:912 #, c-format msgid "Last Changed Author: %s\n" msgstr "æåä¿®æ¹çä½è : %s\n" -#: ../svn/info-cmd.c:423 +#: ../svn/info-cmd.c:916 #, c-format msgid "Last Changed Rev: %ld\n" msgstr "æåä¿®æ¹ççæ¬: %ld\n" -#: ../svn/info-cmd.c:428 +#: ../svn/info-cmd.c:921 msgid "Last Changed Date" msgstr "æåä¿®æ¹çæ¶é´" -#: ../svn/info-cmd.c:434 +#: ../svn/info-cmd.c:927 msgid "Text Last Updated" msgstr "ææ¬æåæ´æ°" -#: ../svn/info-cmd.c:437 +#: ../svn/info-cmd.c:930 #, c-format msgid "Checksum: %s\n" msgstr "æ ¡éªå: %s\n" -#: ../svn/info-cmd.c:458 +#: ../svn/info-cmd.c:964 #, c-format msgid "Conflict Previous Base File: %s\n" msgstr "ä¸ä¹åçåèæ件å²çª: %s\n" -#: ../svn/info-cmd.c:465 +#: ../svn/info-cmd.c:972 #, c-format msgid "Conflict Previous Working File: %s\n" msgstr "ä¸ä¹åçå·¥ä½æ件å²çª: %s\n" -#: ../svn/info-cmd.c:472 +#: ../svn/info-cmd.c:980 #, c-format msgid "Conflict Current Base File: %s\n" msgstr "ä¸å½åçåèæ件å²çª: %s\n" -#: ../svn/info-cmd.c:481 -#, c-format -msgid "Conflict Properties File: %s\n" -msgstr "å±æ§å²çªçæ件: %s\n" - -#: ../svn/info-cmd.c:493 +#: ../svn/info-cmd.c:1016 msgid "Tree conflict" msgstr "æ å²çª" -#: ../svn/info-cmd.c:519 +#: ../svn/info-cmd.c:1020 +#, c-format +msgid "Conflicted Properties: %s\n" +msgstr "æå²çªçå±æ§: %s\n" + +#: ../svn/info-cmd.c:1046 +msgid "Conflict Details" +msgstr "å²çªè¯¦æ " + +#: ../svn/info-cmd.c:1067 msgid "Source left" msgstr "æº å·¦è¾¹" -#: ../svn/info-cmd.c:528 +#: ../svn/info-cmd.c:1076 msgid "Source right" msgstr "æº å³è¾¹" -#: ../svn/info-cmd.c:537 +#: ../svn/info-cmd.c:1085 #, c-format msgid "Lock Token: %s\n" msgstr "éå®ä»¤ç: %s\n" -#: ../svn/info-cmd.c:541 +#: ../svn/info-cmd.c:1089 #, c-format msgid "Lock Owner: %s\n" msgstr "éå®ææè : %s\n" -#: ../svn/info-cmd.c:546 +#: ../svn/info-cmd.c:1094 msgid "Lock Created" msgstr "å·²å建éå®" -#: ../svn/info-cmd.c:550 +#: ../svn/info-cmd.c:1098 msgid "Lock Expires" msgstr "éå®è¿æ" -#: ../svn/info-cmd.c:558 +#: ../svn/info-cmd.c:1106 #, c-format msgid "" "Lock Comment (%i line):\n" @@ -10959,437 +12958,896 @@ msgstr[0] "" "éå®æ³¨é(%i è¡): \n" "%s\n" -#: ../svn/info-cmd.c:567 +#: ../svn/info-cmd.c:1115 #, c-format msgid "Changelist: %s\n" msgstr "ä¿®æ¹å表: %s\n" -#: ../svn/list-cmd.c:73 +#: ../svn/info-cmd.c:1235 +#, c-format +msgid "can't show in-repository size of working copy file '%s'" +msgstr "æ æ³æ¾ç¤ºå·¥ä½å¯æ¬æ件 '%s' ççæ¬åºå 大å°" + +#: ../svn/info-cmd.c:1382 +msgid "--show-item is not valid in --xml mode" +msgstr "--show-item å¨ --xml 模å¼ä¸æ æ" + +#: ../svn/info-cmd.c:1386 +msgid "--no-newline is not valid in --xml mode" +msgstr "--no-newline å¨ --xml 模å¼ä¸æ æ" + +#: ../svn/info-cmd.c:1390 ../svn/list-cmd.c:356 +msgid "--human-readable is not valid in --xml mode" +msgstr "--human-readable å¨ --xml 模å¼ä¸æ æ" + +#: ../svn/info-cmd.c:1405 ../svn/info-cmd.c:1425 ../svn/list-cmd.c:369 +msgid "--incremental is only valid in --xml mode" +msgstr "--incremental ä» å¨ --xml 模å¼ä¸ææ" + +#: ../svn/info-cmd.c:1412 +msgid "--no-newline is only available for single-target, non-recursive info operations" +msgstr "--no-newline ä» å¯¹åç®æ ãééå½ç info æä½ææ" + +#: ../svn/info-cmd.c:1429 +msgid "--no-newline' is only valid with --show-item" +msgstr "--no-newline ä» ä¸ --show-item ä¸èµ·ææ" + +#: ../svn/info-cmd.c:1502 ../svnbench/null-info-cmd.c:283 +msgid "Could not display info for all targets because some targets don't exist" +msgstr "å 为ä¸äºç®æ ä¸åå¨ï¼æ以ä¸è½æ¾ç¤ºå ¨é¨ç®æ " + +#: ../svn/list-cmd.c:95 msgid "%b %d %H:%M" msgstr "%b %d %H:%M" -#: ../svn/list-cmd.c:75 +#: ../svn/list-cmd.c:97 msgid "%b %d %Y" msgstr "%Y-%m-%d" -#: ../svn/list-cmd.c:101 -#, fuzzy, c-format +#: ../svn/list-cmd.c:123 +#, c-format msgid "Listing external '%s' defined on '%s':\n" -msgstr "" -"\n" -"æ£å¨åå¾å¤é¨é¡¹ç®è³ '%s':\n" +msgstr "æ£å¨ååºå®ä¹å¨ '%s' ä¸çå¤é¨å¼ç¨ '%s':\n" + +#: ../svn/list-cmd.c:352 +msgid "--verbose is not valid in --xml mode" +msgstr "--verbose å¨ --xml 模å¼ä¸æ æ" + +#: ../svn/list-cmd.c:450 ../svnbench/null-list-cmd.c:148 +msgid "'search-and' option is not supported" +msgstr "ä¸æ¯æ 'search-and' é项" + +#: ../svn/list-cmd.c:517 ../svnbench/null-list-cmd.c:193 +msgid "Could not list all targets because some targets don't exist" +msgstr "å 为ä¸äºç®æ ä¸åå¨ï¼æ以ä¸è½ååºå ¨é¨ç®æ " #: ../svn/lock-cmd.c:58 msgid "Lock comment contains a zero byte" msgstr "å é注éä¸æä¸ä¸ªé¶åè" -#: ../svn/log-cmd.c:109 +#: ../svn/lock-cmd.c:144 +msgid "One or more locks could not be obtained" +msgstr "æ æ³è·åä¸ä¸ªæå¤ä¸ªé" + +#: ../svn/log-cmd.c:111 ../svn/svn.c:1141 ../svn/svn.c:1213 ../svn/svn.c:1279 msgid "\n" msgstr "\n" -#: ../svn/log-cmd.c:321 +#: ../svn/log-cmd.c:341 msgid "(no author)" msgstr "(没æä½è ä¿¡æ¯)" -#: ../svn/log-cmd.c:327 +#: ../svn/log-cmd.c:347 msgid "(no date)" msgstr "(没ææ¶é´ä¿¡æ¯)" -#: ../svn/log-cmd.c:357 +#: ../svn/log-cmd.c:377 #, c-format msgid " | %d line" msgid_plural " | %d lines" msgstr[0] " | %d è¡" -#: ../svn/log-cmd.c:374 +#: ../svn/log-cmd.c:394 #, c-format msgid "Changed paths:\n" msgstr "æ¹åçè·¯å¾: \n" -#: ../svn/log-cmd.c:394 +#: ../svn/log-cmd.c:414 #, c-format msgid " (from %s:%ld)" msgstr " (ä» %s:%ld)" -#: ../svn/log-cmd.c:412 +#: ../svn/log-cmd.c:432 #, c-format msgid "Reverse merged via:" msgstr "å·²ç»æ¤éå并ï¼éè¿:" -#: ../svn/log-cmd.c:414 +#: ../svn/log-cmd.c:434 #, c-format msgid "Merged via:" -msgstr "å并éè¿: " +msgstr "å并éè¿:" -#: ../svn/log-cmd.c:697 +#: ../svn/log-cmd.c:717 msgid "'with-all-revprops' option only valid in XML mode" -msgstr "åªæå¨ XML æ¨¡å¼ âwith-all-revpropsâ é项æææ" +msgstr "åªæå¨ XML æ¨¡å¼ 'with-all-revprops' é项æææ" -#: ../svn/log-cmd.c:701 +#: ../svn/log-cmd.c:721 msgid "'with-no-revprops' option only valid in XML mode" -msgstr "åªæå¨ XML æ¨¡å¼ âwith-no-revpropsâ é项æææ" +msgstr "åªæå¨ XML æ¨¡å¼ 'with-no-revprops' é项æææ" -#: ../svn/log-cmd.c:705 +#: ../svn/log-cmd.c:725 msgid "'with-revprop' option only valid in XML mode" -msgstr "åªæå¨ XML æ¨¡å¼ âwith-revpropâ é项æææ" +msgstr "åªæå¨ XML æ¨¡å¼ 'with-revprop' é项æææ" -#: ../svn/log-cmd.c:712 +#: ../svn/log-cmd.c:732 msgid "'diff' option is not supported in XML mode" msgstr "å¨ XML 模å¼ä¸æ¯æ 'diff' é项" -#: ../svn/log-cmd.c:718 -msgid "'quiet' and 'diff' options are mutually exclusive" -msgstr "'quiet' ä¸ 'diff' é项æ¯äºæ¥ç" - -#: ../svn/log-cmd.c:722 +#: ../svn/log-cmd.c:738 msgid "'diff-cmd' option requires 'diff' option" msgstr "'diff-cmd' é项éè¦ 'diff' é项" -#: ../svn/log-cmd.c:726 +#: ../svn/log-cmd.c:742 msgid "'internal-diff' option requires 'diff' option" msgstr "'internal-diff' é项éè¦ 'diff' é项" -#: ../svn/log-cmd.c:730 +#: ../svn/log-cmd.c:746 msgid "'extensions' option requires 'diff' option" msgstr "'extensions' é项å¾åå 'diff' é项" -#: ../svn/log-cmd.c:735 +#: ../svn/log-cmd.c:751 msgid "'depth' option requires 'diff' option" msgstr "'depth' é项éè¦ 'diff' é项" -#: ../svn/log-cmd.c:783 +#: ../svn/log-cmd.c:767 ../svnbench/null-log-cmd.c:158 +msgid "-c and -r are mutually exclusive" +msgstr "-c ä¸ -r æ¯äºæ¥ç" + +#: ../svn/log-cmd.c:799 #, c-format msgid "Only relative paths can be specified after a URL for 'svn log', but '%s' is not a relative path" msgstr "å¯¹äº 'svn log'ï¼å¨ URL ååªè½æå®ç¸å¯¹è·¯å¾ï¼ä½ '%s' ä¸æ¯ç¸å¯¹è·¯å¾" -#: ../svn/log-cmd.c:829 +#: ../svn/log-cmd.c:846 #, c-format msgid "cannot assign with 'with-revprop' option (drop the '=')" msgstr "é项 'with-revprop' ä¸æ¥åèµå¼(请å é¤ '=')" -#: ../svn/merge-cmd.c:103 ../svn/merge-cmd.c:127 -#, fuzzy, c-format +#: ../svn/merge-cmd.c:103 ../svn/merge-cmd.c:132 +#, c-format msgid "--- Merging\n" -msgstr "æ£å¨è¯»å â%sâ" +msgstr "--- æ£å¨å并\n" + +#: ../svn/merge-cmd.c:128 +#, c-format +msgid "Merge target '%s' must be a local path but looks like a URL" +msgstr "å并ç®æ '%s' å¿ é¡»æ¯æ¬å°è·¯å¾ï¼ä½çèµ·æ¥åæ¯ URL" -#: ../svn/merge-cmd.c:171 +#: ../svn/merge-cmd.c:258 msgid "-r and -c can't be used with --reintegrate" msgstr "-r å -c ä¸è½ä¸ --reintegrate å ±å" -#: ../svn/merge-cmd.c:226 +#: ../svn/merge-cmd.c:313 msgid "Merge source required" msgstr "éè¦å并æº" -#: ../svn/merge-cmd.c:272 +#: ../svn/merge-cmd.c:359 msgid "Second revision required" msgstr "éè¦ç¬¬äºä¸ªçæ¬" -#: ../svn/merge-cmd.c:281 ../svn/merge-cmd.c:308 ../svn/mergeinfo-cmd.c:361 -#: ../svnadmin/svnadmin.c:2138 ../svnlook/svnlook.c:2077 -#: ../svnlook/svnlook.c:2271 ../svnlook/svnlook.c:2375 -#: ../svnlook/svnlook.c:2410 +#: ../svn/merge-cmd.c:368 ../svn/merge-cmd.c:395 ../svn/mergeinfo-cmd.c:361 +#: ../svnadmin/svnadmin.c:2604 ../svnlook/svnlook.c:2086 +#: ../svnlook/svnlook.c:2280 ../svnlook/svnlook.c:2384 +#: ../svnlook/svnlook.c:2419 msgid "Too many arguments given" msgstr "åæ°è¿å¤" -#: ../svn/merge-cmd.c:298 +#: ../svn/merge-cmd.c:385 msgid "Cannot specify a revision range with two URLs" msgstr "ä¸è½å¯¹ä¸¤ä¸ª URL æå®çæ¬èå´" -#: ../svn/merge-cmd.c:402 +#: ../svn/merge-cmd.c:489 msgid "--reintegrate cannot be used with --ignore-ancestry" msgstr "--reintegrate ä¸è½ä¸ --ignore-ancestry å ±å" -#: ../svn/merge-cmd.c:407 +#: ../svn/merge-cmd.c:494 msgid "--reintegrate cannot be used with --record-only" msgstr "--reintegrate ä¸è½ä¸ --record-only å ±å" -#: ../svn/merge-cmd.c:412 +#: ../svn/merge-cmd.c:499 msgid "--depth cannot be used with --reintegrate" msgstr "--depth ä¸è½ä¸ --reintegrate å ±å" -#: ../svn/merge-cmd.c:417 +#: ../svn/merge-cmd.c:504 msgid "--force cannot be used with --reintegrate" msgstr "--force ä¸è½ä¸ --reintegrate å ±å" -#: ../svn/merge-cmd.c:422 +#: ../svn/merge-cmd.c:509 msgid "--reintegrate can only be used with a single merge source" msgstr "--reintegrate åªè½ç¨äºåä¸å并æº" -#: ../svn/merge-cmd.c:426 +#: ../svn/merge-cmd.c:513 msgid "--allow-mixed-revisions cannot be used with --reintegrate" msgstr "--allow-mixed-revisions ä¸è½ä¸ --reintegrate å ±å" -#: ../svn/merge-cmd.c:441 +#: ../svn/merge-cmd.c:544 msgid "" "Merge tracking not possible, use --ignore-ancestry or\n" "fix invalid mergeinfo in target with 'svn propset'" msgstr "" -"ä¸è½æ§è¡å并è·è¸ªï¼å¯¹ç®æ 使ç¨âsvn propsetâä¿®æ£éæ³å并信æ¯ï¼æè 使ç¨é项\n" +"ä¸è½æ§è¡å并è·è¸ªï¼å¯¹ç®æ 使ç¨'svn propset'ä¿®æ£éæ³å并信æ¯ï¼æè 使ç¨é项\n" "--ignore-ancestry" #: ../svn/mergeinfo-cmd.c:193 msgid "last full merge" -msgstr "" +msgstr "æåä¸æ¬¡å®æ´å并" #: ../svn/mergeinfo-cmd.c:193 msgid "youngest common ancestor" -msgstr "" +msgstr "æè¿å ¬å ±ç¥å " #: ../svn/mergeinfo-cmd.c:194 -#, fuzzy msgid "repository path" -msgstr "è·åçæ¬åº UUID" +msgstr "çæ¬åºè·¯å¾" #: ../svn/mergeinfo-cmd.c:194 msgid "tip of branch" -msgstr "" +msgstr "åæ¯å°ç«¯" #: ../svn/mergeinfo-cmd.c:358 msgid "Not enough arguments given" msgstr "没ææä¾è¶³å¤çåæ°" #: ../svn/mergeinfo-cmd.c:404 -#, fuzzy msgid "--quiet (-q) option valid only with --log option" -msgstr "â--newâ é项åªè½ä¸ â--oldâ åæ¶ä½¿ç¨" +msgstr "--quiet (-q) éé¡¹ä» å¯¹ --log é项ææ" #: ../svn/mergeinfo-cmd.c:409 -#, fuzzy msgid "--verbose (-v) option valid only with --log option" -msgstr "â--newâ é项åªè½ä¸ â--oldâ åæ¶ä½¿ç¨" +msgstr "--verbose (-v) éé¡¹ä» å¯¹ --log é项ææ" #: ../svn/mergeinfo-cmd.c:414 -#, fuzzy msgid "--incremental option valid only with --log option" -msgstr "â--xmlâ é项åªè½ä¸ â--summarizeâ åæ¶ä½¿ç¨" +msgstr "--incremental éé¡¹ä» å¯¹ --log é项ææ" #: ../svn/mergeinfo-cmd.c:444 -#, fuzzy msgid "--revision (-r) option valid only with --show-revs option" -msgstr "â--newâ é项åªè½ä¸ â--oldâ åæ¶ä½¿ç¨" +msgstr "--revision (-r) éé¡¹ä» å¯¹ --show-revs é项ææ" #: ../svn/mergeinfo-cmd.c:448 msgid "Depth specification options valid only with --show-revs option" -msgstr "" +msgstr "深度æå®éé¡¹ä» å¯¹ --show-revs é项ææ" #: ../svn/mergeinfo-cmd.c:452 -#, fuzzy msgid "--log option valid only with --show-revs option" -msgstr "â--xmlâ é项åªè½ä¸ â--summarizeâ åæ¶ä½¿ç¨" +msgstr "--log éé¡¹ä» å¯¹ --show-revs é项ææ" #: ../svn/mkdir-cmd.c:92 msgid "Try 'svn add' or 'svn add --non-recursive' instead?" -msgstr "å°è¯ç¨ âsvn addâæ âsvn add --non-recursiveâ代æ¿ï¼" +msgstr "å°è¯ç¨ 'svn add'æ 'svn add --non-recursive'代æ¿ï¼" #: ../svn/mkdir-cmd.c:98 msgid "Try 'svn mkdir --parents' instead?" -msgstr "å°è¯ âsvn mkdir --parentsâï¼" +msgstr "å°è¯ 'svn mkdir --parents'ï¼" -#: ../svn/notify.c:132 +#: ../svn/notify.c:137 #, c-format msgid "%d remaining" msgid_plural "%d remaining" -msgstr[0] "" +msgstr[0] "å©ä½ %d 个" -#: ../svn/notify.c:141 -#, fuzzy, c-format +#: ../svn/notify.c:146 +#, c-format msgid "and %d already resolved" msgid_plural "and %d already resolved" -msgstr[0] "å·²ç»éå®è·¯å¾" +msgstr[0] "ä¸ %d 个已解å³" -#: ../svn/notify.c:163 ../svn/status-cmd.c:93 +#: ../svn/notify.c:238 ../svn/status-cmd.c:93 #, c-format msgid "Summary of conflicts:\n" -msgstr "å²çªæ¦è¦ï¼\n" +msgstr "å²çªæ¦è¦:\n" -#: ../svn/notify.c:169 -#, fuzzy, c-format +#: ../svn/notify.c:244 +#, c-format msgid " Text conflicts: %d\n" -msgstr " æ£æå²çªï¼%u\n" +msgstr " ææ¬å²çª: %d\n" -#: ../svn/notify.c:173 -#, fuzzy, c-format +#: ../svn/notify.c:248 +#, c-format msgid " Property conflicts: %d\n" -msgstr " å±æ§å²çªï¼%u\n" +msgstr " å±æ§å²çª: %d\n" -#: ../svn/notify.c:177 -#, fuzzy, c-format +#: ../svn/notify.c:252 +#, c-format msgid " Tree conflicts: %d\n" -msgstr " æ å²çªï¼%u\n" +msgstr " æ å²çª: %d\n" -#: ../svn/notify.c:184 -#, fuzzy, c-format +#: ../svn/notify.c:259 +#, c-format msgid " Text conflicts: %s (%s)\n" -msgstr " æ£æå²çªï¼%u\n" +msgstr " ææ¬å²çª: %s (%s)\n" -#: ../svn/notify.c:189 -#, fuzzy, c-format +#: ../svn/notify.c:264 +#, c-format msgid " Property conflicts: %s (%s)\n" -msgstr " å±æ§å²çªï¼%u\n" +msgstr " å±æ§å²çª: %s (%s)\n" -#: ../svn/notify.c:194 -#, fuzzy, c-format +#: ../svn/notify.c:269 +#, c-format msgid " Tree conflicts: %s (%s)\n" -msgstr " æ å²çªï¼%u\n" +msgstr " æ å²çª: %s (%s)\n" -#: ../svn/notify.c:200 -#, fuzzy, c-format +#: ../svn/notify.c:275 +#, c-format msgid " Skipped paths: %d\n" -msgstr " è·³è¿çè·¯å¾ï¼%u\n" +msgstr " è·³è¿çè·¯å¾: %d\n" + +#: ../svn/notify.c:329 ../svnbench/notify.c:107 +#, c-format +msgid "Skipped missing target: '%s'\n" +msgstr "è·³è¿ç¼ºå°çç®æ : '%s'\n" + +#: ../svn/notify.c:336 ../svnbench/notify.c:114 +#, c-format +msgid "Skipped target: '%s' -- copy-source is missing\n" +msgstr "è·³è¿ç®æ : '%s' -- copy-source 丢失\n" + +#: ../svn/notify.c:343 +#, c-format +msgid "Skipped '%s' -- obstructed by unversioned node\n" +msgstr "è·³è¿ '%s' -- 被æªçæ¬æ§å¶èç¹é»å¡\n" + +#: ../svn/notify.c:348 ../svnbench/notify.c:121 +#, c-format +msgid "Skipped '%s'\n" +msgstr "è·³è¿'%s'\n" + +#: ../svn/notify.c:355 ../svnbench/notify.c:128 +#, c-format +msgid "Skipped '%s' -- An obstructing working copy was found\n" +msgstr "忽ç¥'%s' -- åç°éç¢å·¥ä½å¯æ¬\n" + +#: ../svn/notify.c:361 ../svnbench/notify.c:135 +#, c-format +msgid "Skipped '%s' -- Has no versioned parent\n" +msgstr "å·²è·³è¿ '%s' -- 没æå·²çæ¬æ§å¶çç¶äº²\n" + +#: ../svn/notify.c:367 ../svnbench/notify.c:142 +#, c-format +msgid "Skipped '%s' -- Access denied\n" +msgstr "å·²è·³è¿ '%s' -- æç»è®¿é®\n" + +#: ../svn/notify.c:373 ../svnbench/notify.c:149 +#, c-format +msgid "Skipped '%s' -- Node remains in conflict\n" +msgstr "å·²è·³è¿ '%s' -- èç¹å¤äºå²çªç¶æ\n" -#: ../svn/notify.c:299 -#, fuzzy, c-format +#: ../svn/notify.c:389 +#, c-format msgid "Removed external '%s': %s\n" -msgstr "å é¤ â%sâ ä¸çéã\n" +msgstr "已移é¤å¤é¨å¼ç¨ '%s': %s\n" -#: ../svn/notify.c:304 -#, fuzzy, c-format +#: ../svn/notify.c:394 +#, c-format msgid "Removed external '%s'\n" -msgstr "å é¤ â%sâ ä¸çéã\n" +msgstr "已移é¤å¤é¨å¼ç¨ '%s'\n" -#: ../svn/notify.c:310 -#, fuzzy, c-format +#: ../svn/notify.c:400 +#, c-format msgid "Left local modifications as '%s'\n" -msgstr "æ件â%sâææ¬å°ä¿®æ¹" +msgstr "æ¬å°ä¿®æ¹ä¿ç为 '%s'\n" + +#: ../svn/notify.c:444 ../svnbench/notify.c:233 +#, c-format +msgid "Restored '%s'\n" +msgstr "å·²è¿å'%s'\n" + +#: ../svn/notify.c:449 ../svnbench/notify.c:239 +#, c-format +msgid "Reverted '%s'\n" +msgstr "å·²æ¢å¤'%s'\n" + +#: ../svn/notify.c:454 ../svnbench/notify.c:245 +#, c-format +msgid "Failed to revert '%s' -- try updating instead.\n" +msgstr "æ æ³æ¢å¤'%s'-- 请æ¹ç¨æ´æ°è¯è¯ã\n" + +#: ../svn/notify.c:461 ../svnbench/notify.c:253 +#, c-format +msgid "Resolved conflicted state of '%s'\n" +msgstr "'%s'çå²çªç¶æ已解å³\n" + +#: ../svn/notify.c:467 +#, c-format +msgid "Merge conflicts in '%s' marked as resolved.\n" +msgstr "'%s' ä¸çå并å²çªå·²æ 记为已解å³ã\n" + +#: ../svn/notify.c:475 +#, c-format +msgid "Conflict in property '%s' at '%s' marked as resolved.\n" +msgstr "'%s' å¤å±æ§ '%s' ä¸çå²çªå·²æ 记为已解å³ã\n" + +#: ../svn/notify.c:482 +#, c-format +msgid "Tree conflict at '%s' marked as resolved.\n" +msgstr "'%s' å¤çæ å²çªå·²æ 记为已解å³ã\n" + +#: ../svn/notify.c:489 +#, c-format +msgid "Searching tree conflict details for '%s' in repository:\n" +msgstr "æ£å¨çæ¬åºä¸æç´¢ '%s' çæ å²çªè¯¦æ :\n" + +#: ../svn/notify.c:511 +#, c-format +msgid " done\n" +msgstr " å®æ\n" + +#: ../svn/notify.c:603 ../svn/notify.c:640 ../svnbench/notify.c:344 +#: ../svnbench/notify.c:384 +#, c-format +msgid "> applied hunk ## -%lu,%lu +%lu,%lu ## with offset %s" +msgstr "> å·²åºç¨å ## -%lu,%lu +%lu,%lu ##ï¼å移 %s" + +#: ../svn/notify.c:620 ../svn/notify.c:654 ../svnbench/notify.c:361 +#: ../svnbench/notify.c:398 +#, c-format +msgid "> applied hunk @@ -%lu,%lu +%lu,%lu @@ with offset %s" +msgstr "> å·²åºç¨å @@ -%lu,%lu +%lu,%lu @@ å移 %s" + +#: ../svn/notify.c:672 ../svnbench/notify.c:419 +#, c-format +msgid "> applied hunk ## -%lu,%lu +%lu,%lu ## with fuzz %lu (%s)\n" +msgstr "> å·²åºç¨å ## -%lu,%lu +%lu,%lu ## æ¨¡ç³ %lu (%s)\n" + +#: ../svn/notify.c:682 ../svnbench/notify.c:429 +#, c-format +msgid "> applied hunk @@ -%lu,%lu +%lu,%lu @@ with fuzz %lu\n" +msgstr "> å·²åºç¨å @@ -%lu,%lu +%lu,%lu @@ æ¨¡ç³ %lu\n" + +#: ../svn/notify.c:698 ../svnbench/notify.c:447 +#, c-format +msgid "> rejected hunk ## -%lu,%lu +%lu,%lu ## (%s)\n" +msgstr "> å·²æç»å ## -%lu,%lu +%lu,%lu ## (%s)\n" + +#: ../svn/notify.c:707 ../svnbench/notify.c:456 +#, c-format +msgid "> rejected hunk @@ -%lu,%lu +%lu,%lu @@\n" +msgstr "> å·²æç»çå @@ -%lu,%lu +%lu,%lu @@\n" + +#: ../svn/notify.c:719 ../svnbench/notify.c:470 +#, c-format +msgid "> hunk ## -%lu,%lu +%lu,%lu ## already applied (%s)\n" +msgstr "> å ## -%lu,%lu +%lu,%lu ## å·²ç»åºç¨ (%s)\n" + +#: ../svn/notify.c:729 ../svnbench/notify.c:480 +#, c-format +msgid "> hunk @@ -%lu,%lu +%lu,%lu @@ already applied\n" +msgstr "> å @@ -%lu,%lu +%lu,%lu @@ å·²ç»åºç¨\n" -#: ../svn/notify.c:768 -#, fuzzy, c-format +#: ../svn/notify.c:786 ../svnbench/notify.c:542 +#, c-format +msgid "" +"\n" +"Fetching external item into '%s':\n" +msgstr "" +"\n" +"æ£å¨åå¾å¤é¨å¼ç¨é¡¹ç®è³ '%s':\n" + +#: ../svn/notify.c:810 ../svnbench/notify.c:568 +#, c-format +msgid "Error handling externals definition for '%s':" +msgstr "å¤çå¤é¨å¼ç¨'%s'æ¶åºé:" + +#: ../svn/notify.c:823 ../svnbench/notify.c:581 +#, c-format +msgid "Updating '%s':\n" +msgstr "æ£å¨å级 '%s':\n" + +#: ../svn/notify.c:836 ../svnbench/notify.c:595 +#, c-format +msgid "Exported external at revision %ld.\n" +msgstr "已导åºçæ¬ %ld çå¤é¨å¼ç¨é¡¹ç®ã\n" + +#: ../svn/notify.c:837 ../svnbench/notify.c:596 +#, c-format +msgid "Exported revision %ld.\n" +msgstr "已导åºçæ¬ %ldã\n" + +#: ../svn/notify.c:844 ../svnbench/notify.c:604 +#, c-format +msgid "Checked out external at revision %ld.\n" +msgstr "å·²æ£åºçæ¬ %ld çå¤é¨å¼ç¨é¡¹ç®ã\n" + +#: ../svn/notify.c:845 ../svnbench/notify.c:605 +#, c-format +msgid "Checked out revision %ld.\n" +msgstr "å·²æ£åºçæ¬ %ldã\n" + +#: ../svn/notify.c:855 ../svnbench/notify.c:616 +#, c-format +msgid "Updated external to revision %ld.\n" +msgstr "æ´æ°å¤é¨å¼ç¨é¡¹ç®è³çæ¬ %ldã\n" + +#: ../svn/notify.c:856 ../svnbench/notify.c:617 +#, c-format +msgid "Updated to revision %ld.\n" +msgstr "æ´æ°å°çæ¬ %ldã\n" + +#: ../svn/notify.c:863 ../svnbench/notify.c:625 +#, c-format +msgid "External at revision %ld.\n" +msgstr "å¤é¨å¼ç¨é¡¹ç®çæ¬ %ldã\n" + +#: ../svn/notify.c:864 ../svnbench/notify.c:626 +#, c-format +msgid "At revision %ld.\n" +msgstr "çæ¬ %ldã\n" + +#: ../svn/notify.c:875 ../svnbench/notify.c:638 +#, c-format +msgid "External export complete.\n" +msgstr "å®æå¤é¨å¼ç¨é¡¹ç®å¯¼åºã\n" + +#: ../svn/notify.c:876 ../svnbench/notify.c:639 +#, c-format +msgid "Export complete.\n" +msgstr "å®æ导åºã\n" + +#: ../svn/notify.c:882 ../svnbench/notify.c:646 +#, c-format +msgid "External checkout complete.\n" +msgstr "å¤é¨å¼ç¨é¡¹ç®æ£åºå®æã\n" + +#: ../svn/notify.c:883 ../svnbench/notify.c:647 +#, c-format +msgid "Checkout complete.\n" +msgstr "æ£åºå®æã\n" + +#: ../svn/notify.c:889 ../svnbench/notify.c:654 +#, c-format +msgid "External update complete.\n" +msgstr "å®æå¤é¨å¼ç¨é¡¹ç®æ´æ°ã\n" + +#: ../svn/notify.c:890 ../svnbench/notify.c:655 +#, c-format +msgid "Update complete.\n" +msgstr "å®ææ´æ°ã\n" + +#: ../svn/notify.c:904 ../svnbench/notify.c:671 +#, c-format +msgid "" +"\n" +"Performing status on external item at '%s':\n" +msgstr "" +"\n" +"对å¤é¨å¼ç¨é¡¹ç®'%s'è¿è¡ç¶ææ£æ¥:\n" + +#: ../svn/notify.c:910 +#, c-format msgid "" "\n" "Performing info on external item at '%s':\n" msgstr "" "\n" -"对å¤é¨é¡¹ç®â%sâè¿è¡ç¶ææ£æ¥:\n" +"æ£å¨å¯¹ '%s' çå¤é¨å¼ç¨é¡¹æ§è¡ info æä½:\n" + +#: ../svn/notify.c:917 ../svnbench/notify.c:679 +#, c-format +msgid "Status against revision: %6ld\n" +msgstr "çæ¬ %6ld çç¶æ\n" -#: ../svn/notify.c:1044 -#, fuzzy, c-format +#: ../svn/notify.c:925 ../svnbench/notify.c:688 +#, c-format +msgid "Sending copy of %s\n" +msgstr "æ£å¨åéå¯æ¬ %s\n" + +#: ../svn/notify.c:926 ../svnbench/notify.c:689 +#, c-format +msgid "Sending %s\n" +msgstr "æ£å¨åé %s\n" + +#: ../svn/notify.c:936 ../svnbench/notify.c:700 +#, c-format +msgid "Adding copy of (bin) %s\n" +msgstr "æ£å¨å¢å (äºè¿å¶) %s\n" + +#: ../svn/notify.c:937 ../svnbench/notify.c:701 +#, c-format +msgid "Adding (bin) %s\n" +msgstr "æ£å¨å¢å (äºè¿å¶) %s\n" + +#: ../svn/notify.c:944 ../svnbench/notify.c:709 +#, c-format +msgid "Adding copy of %s\n" +msgstr "æ£å¨å¢å å¯æ¬ %s\n" + +#: ../svn/notify.c:945 ../svnbench/notify.c:710 +#, c-format +msgid "Adding %s\n" +msgstr "æ£å¨å¢å %s\n" + +#: ../svn/notify.c:953 ../svnbench/notify.c:719 +#, c-format +msgid "Deleting copy of %s\n" +msgstr "æ£å¨å é¤å¯æ¬ %s\n" + +#: ../svn/notify.c:954 ../svnbench/notify.c:720 +#, c-format +msgid "Deleting %s\n" +msgstr "æ£å¨å é¤ %s\n" + +#: ../svn/notify.c:962 ../svnbench/notify.c:729 +#, c-format +msgid "Replacing copy of %s\n" +msgstr "æ£å¨æ¿æ¢å¯æ¬ %s\n" + +#: ../svn/notify.c:963 ../svnbench/notify.c:730 +#, c-format +msgid "Replacing %s\n" +msgstr "æ£å¨æ¿æ¢ %s\n" + +#: ../svn/notify.c:972 ../svnbench/notify.c:740 ../svnsync/sync.c:416 +#, c-format +msgid "Transmitting file data " +msgstr "ä¼ è¾æ件æ°æ® " + +#: ../svn/notify.c:979 ../svnadmin/svnadmin.c:2581 ../svnbench/notify.c:749 +#, c-format +msgid "'%s' locked by user '%s'.\n" +msgstr "'%s'被ç¨æ·'%s'éå®ã\n" + +#: ../svn/notify.c:984 ../svnbench/notify.c:755 +#, c-format +msgid "'%s' unlocked.\n" +msgstr "'%s'解é¤éå®ã\n" + +#: ../svn/notify.c:1008 ../svnbench/notify.c:782 +#, c-format +msgid "--- Merging differences between repository URLs into '%s':\n" +msgstr "--- æ£å¨å并çæ¬åº URL ä¹é´çå·®å¼å° '%s':\n" + +#: ../svn/notify.c:1013 ../svnbench/notify.c:787 +#, c-format +msgid "--- Merging r%ld into '%s':\n" +msgstr "--- æ£å¨å并 r%ld å° '%s':\n" + +#: ../svn/notify.c:1017 ../svnbench/notify.c:791 +#, c-format +msgid "--- Reverse-merging r%ld into '%s':\n" +msgstr "--- æ£å¨ååå并 r%ld å° '%s':\n" + +#: ../svn/notify.c:1021 ../svnbench/notify.c:795 +#, c-format +msgid "--- Merging r%ld through r%ld into '%s':\n" +msgstr "--- æ£å¨å并 r%ldï¼ç»ç± r%ldï¼å° '%s':\n" + +#: ../svn/notify.c:1027 ../svnbench/notify.c:801 +#, c-format +msgid "--- Reverse-merging r%ld through r%ld into '%s':\n" +msgstr "--- æ£å¨ååå并 r%ldï¼ç»ç± r%ldï¼å° '%s':\n" + +#: ../svn/notify.c:1037 ../svnbench/notify.c:813 +#, c-format +msgid "--- Recording mergeinfo for merge between repository URLs into '%s':\n" +msgstr "--- è®°å½çæ¬åº URL ä¹é´çå并信æ¯å°'%s':\n" + +#: ../svn/notify.c:1047 ../svnbench/notify.c:823 +#, c-format +msgid "--- Recording mergeinfo for merge of r%ld into '%s':\n" +msgstr "--- è®°å½å并 r%ld å°'%s'çä¿¡æ¯:\n" + +#: ../svn/notify.c:1052 ../svnbench/notify.c:828 +#, c-format +msgid "--- Recording mergeinfo for reverse merge of r%ld into '%s':\n" +msgstr "--- è®°å½ååå并 r%ld å°'%s'çä¿¡æ¯:\n" + +#: ../svn/notify.c:1057 ../svnbench/notify.c:833 +#, c-format +msgid "--- Recording mergeinfo for merge of r%ld through r%ld into '%s':\n" +msgstr "--- è®°å½å并 r%ldï¼ç»ç± r%ldï¼å°'%s'çä¿¡æ¯:\n" + +#: ../svn/notify.c:1062 ../svnbench/notify.c:838 +#, c-format +msgid "--- Recording mergeinfo for reverse merge of r%ld through r%ld into '%s':\n" +msgstr "--- è®°å½ååå并 r%ldï¼ç»ç± r%ldï¼å°'%s'çä¿¡æ¯:\n" + +#: ../svn/notify.c:1069 ../svnbench/notify.c:848 +#, c-format +msgid "--- Eliding mergeinfo from '%s':\n" +msgstr "--- æ£å¨ä» '%s' å é¤å并信æ¯:\n" + +#: ../svn/notify.c:1076 ../svnbench/notify.c:856 +#, c-format +msgid "--- Merging differences between foreign repository URLs into '%s':\n" +msgstr "--- æ£å¨å并å¤é¨çæ¬åº URL ä¹é´çå·®å¼å° '%s':\n" + +#: ../svn/notify.c:1082 ../svnbench/notify.c:862 +#, c-format +msgid "--- Merging (from foreign repository) r%ld into '%s':\n" +msgstr "--- æ£å¨å并(ä»å¤é¨çæ¬åº) r%ld å° '%s':\n" + +#: ../svn/notify.c:1087 ../svnbench/notify.c:867 +#, c-format +msgid "--- Reverse-merging (from foreign repository) r%ld into '%s':\n" +msgstr "--- æ£å¨ååå并(ä»å¤é¨çæ¬åº) r%ld å° '%s':\n" + +#: ../svn/notify.c:1092 ../svnbench/notify.c:872 +#, c-format +msgid "--- Merging (from foreign repository) r%ld through r%ld into '%s':\n" +msgstr "--- æ£å¨å并(ä»å¤é¨çæ¬åº) r%ldï¼ç»ç± r%ldï¼å° '%s':\n" + +#: ../svn/notify.c:1098 ../svnbench/notify.c:878 +#, c-format +msgid "--- Reverse-merging (from foreign repository) r%ld through r%ld into '%s':\n" +msgstr "--- æ£å¨ååå并(ä»å¤é¨çæ¬åº) r%ldï¼ç»ç± r%ldï¼å° '%s':\n" + +#: ../svn/notify.c:1128 ../svnbench/notify.c:915 +#, c-format +msgid "property '%s' set on '%s'\n" +msgstr "设置å±æ§ '%s' äº '%s'\n" + +#: ../svn/notify.c:1134 ../svnbench/notify.c:923 +#, c-format +msgid "property '%s' deleted from '%s'.\n" +msgstr "å é¤å±æ§ '%s' äº '%s'ã\n" + +#: ../svn/notify.c:1140 ../svnbench/notify.c:931 +#, c-format +msgid "Attempting to delete nonexistent property '%s' on '%s'\n" +msgstr "è¯å¾å é¤ä¸åå¨çå±æ§'%s'äº'%s'\n" + +#: ../svn/notify.c:1147 ../svnbench/notify.c:940 +#, c-format +msgid "property '%s' set on repository revision %ld\n" +msgstr "设å®å±æ§ '%s' äºçæ¬åºçæ¬ %ld\n" + +#: ../svn/notify.c:1153 ../svnbench/notify.c:948 +#, c-format +msgid "property '%s' deleted from repository revision %ld\n" +msgstr "å é¤å±æ§ '%s' äºçæ¬åºçæ¬ %ld\n" + +#: ../svn/notify.c:1158 ../svnbench/notify.c:955 +#, c-format +msgid "Upgraded '%s'\n" +msgstr "å·²å级ç'%s'\n" + +#: ../svn/notify.c:1163 ../svnbench/notify.c:961 +#, c-format +msgid "Redirecting to URL '%s':\n" +msgstr "æ£å¨éå®åå° URL '%s':\n" + +#: ../svn/notify.c:1187 +#, c-format msgid "--- Copying from foreign repository URL '%s':\n" -msgstr "--- æ£å¨å并(ä»å¤é¨çæ¬åº) r%ld å° â%sâï¼\n" +msgstr "--- æ£å¨ä»å¤é¨çæ¬åº URL '%s' å¤å¶:\n" -#: ../svn/notify.c:1051 -#, fuzzy, c-format +#: ../svn/notify.c:1194 +#, c-format msgid "Breaking move with source path '%s'\n" -msgstr "å¤å¶æºè·¯å¾â%sâæ æ" +msgstr "æ£å¨æå¼æºè·¯å¾ '%s' ç移å¨\n" -#: ../svn/notify.c:1057 -#, fuzzy, c-format +#: ../svn/notify.c:1200 +#, c-format msgid "Performing cleanup on external item at '%s'.\n" -msgstr "" -"\n" -"对å¤é¨é¡¹ç®â%sâè¿è¡ç¶ææ£æ¥:\n" +msgstr "æ£å¨å¯¹ '%s' çå¤é¨å¼ç¨é¡¹æ§è¡æ¸ çã\n" -#: ../svn/notify.c:1064 -#, fuzzy, c-format +#: ../svn/notify.c:1207 ../svn/notify.c:1231 +#, c-format msgid "done\n" -msgstr "å®æã\n" +msgstr "å®æ\n" -#: ../svn/notify.c:1066 +#: ../svn/notify.c:1209 #, c-format msgid "Committing transaction...\n" -msgstr "æ£å¨è¯»åäºå¡\n" +msgstr "æ£å¨è¯»åäºå¡...\n" + +#: ../svn/notify.c:1220 +#, c-format +msgid "Fetching text bases " +msgstr "æ£å¨è·åææ¬åºç¡ " #: ../svn/propdel-cmd.c:88 #, c-format msgid "Cannot specify revision for deleting versioned property '%s'" -msgstr "å é¤çº³å ¥çæ¬æ§å¶çå±æ§ â%sâ æ¶ä¸å¯æå®çæ¬" +msgstr "å é¤çº³å ¥çæ¬æ§å¶çå±æ§ '%s' æ¶ä¸å¯æå®çæ¬" -#: ../svn/propedit-cmd.c:62 ../svn/propedit-cmd.c:341 +#: ../svn/propedit-cmd.c:62 ../svn/propedit-cmd.c:343 #, c-format msgid "Set new value for property '%s' on '%s'\n" -msgstr "å±æ§ â%sâ äº â%sâ 被设为æ°å¼\n" +msgstr "å±æ§ '%s' äº '%s' 被设为æ°å¼\n" #: ../svn/propedit-cmd.c:96 ../svn/propset-cmd.c:97 msgid "--encoding option applies only to textual Subversion-controlled properties" msgstr "--encoding é项åªè½ç¨äº Subversion çææ¬å±æ§" -#: ../svn/propedit-cmd.c:162 +#: ../svn/propedit-cmd.c:164 #, c-format msgid "Set new value for property '%s' on revision %ld\n" -msgstr "å±æ§ â%sâ äºçæ¬ %ld 被设为æ°å¼\n" +msgstr "å±æ§ '%s' äºçæ¬ %ld 被设为æ°å¼\n" -#: ../svn/propedit-cmd.c:168 +#: ../svn/propedit-cmd.c:170 #, c-format msgid "No changes to property '%s' on revision %ld\n" -msgstr "å±æ§ â%sâ äºçæ¬ %ld 没ææ¹å\n" +msgstr "å±æ§ '%s' äºçæ¬ %ld 没ææ¹å\n" -#: ../svn/propedit-cmd.c:176 +#: ../svn/propedit-cmd.c:178 #, c-format msgid "Cannot specify revision for editing versioned property '%s'" -msgstr "ç¼è¾çº³å ¥çæ¬æ§å¶çå±æ§ â%sâ æ¶ä¸å¯æå®çæ¬" +msgstr "ç¼è¾çº³å ¥çæ¬æ§å¶çå±æ§ '%s' æ¶ä¸å¯æå®çæ¬" -#: ../svn/propedit-cmd.c:204 ../svn/propset-cmd.c:172 +#: ../svn/propedit-cmd.c:206 ../svn/propset-cmd.c:172 msgid "Explicit target argument required" msgstr "å¿ é¡»æç¡®å°æä¾ç®æ åæ°" -#: ../svn/propedit-cmd.c:271 +#: ../svn/propedit-cmd.c:273 #, c-format msgid "'%s' does not appear to be a working copy path" -msgstr "â%sâä¸åæ¯å·¥ä½å¯æ¬è·¯å¾" +msgstr "'%s'ä¸åæ¯å·¥ä½å¯æ¬è·¯å¾" -#: ../svn/propedit-cmd.c:348 +#: ../svn/propedit-cmd.c:350 #, c-format msgid "No changes to property '%s' on '%s'\n" -msgstr "å±æ§ â%sâ äº â%sâ 没ææ¹å\n" +msgstr "å±æ§ '%s' äº '%s' 没ææ¹å\n" #: ../svn/propget-cmd.c:67 msgid "Error writing to stream" msgstr "åå ¥æµåºé" -#: ../svn/propget-cmd.c:187 ../svn/proplist-cmd.c:156 -#: ../svn/proplist-cmd.c:160 ../svnlook/svnlook.c:1769 -#: ../svnlook/svnlook.c:1923 -#, fuzzy, c-format +#: ../svn/propget-cmd.c:187 ../svn/proplist-cmd.c:158 ../svn/proplist-cmd.c:162 +#: ../svnlook/svnlook.c:1777 ../svnlook/svnlook.c:1932 +#, c-format msgid "" "Inherited properties on '%s',\n" "from '%s':\n" -msgstr "çæ¬ %ld ä¸çæªçº³å ¥çæ¬æ§å¶çå±æ§: \n" +msgstr "" +"'%s' ä¸ç继æ¿å±æ§ï¼\n" +"æ¥èª '%s':\n" #. Not a --revprop -#: ../svn/propget-cmd.c:197 ../svn/proplist-cmd.c:175 -#: ../svnlook/svnlook.c:1804 ../svnlook/svnlook.c:1958 +#: ../svn/propget-cmd.c:197 ../svn/proplist-cmd.c:177 ../svnlook/svnlook.c:1812 +#: ../svnlook/svnlook.c:1967 #, c-format msgid "Properties on '%s':\n" -msgstr "â%sâ ä¸çå±æ§: \n" +msgstr "'%s' ä¸çå±æ§: \n" -#: ../svn/propget-cmd.c:328 -msgid "--verbose cannot be used with --revprop or --strict or --xml" -msgstr "--verbose ä¸è½ä¸ --revpropï¼ --strict æ --xml å ±å" +#: ../svn/propget-cmd.c:332 +msgid "--verbose cannot be used with --revprop or --no-newline or --xml" +msgstr "--verbose ä¸è½ä¸ --revprop æ --no-newline æ --xml ä¸èµ·ä½¿ç¨" -#: ../svn/propget-cmd.c:360 ../svn/proplist-cmd.c:214 -#, fuzzy +#: ../svn/propget-cmd.c:363 ../svn/proplist-cmd.c:216 msgid "--show-inherited-props can't be used with --revprop" -msgstr "--reintegrate ä¸è½ä¸ --record-only å ±å" +msgstr "--show-inherited-props ä¸è½ä¸ --revprop ä¸èµ·ä½¿ç¨" -#: ../svn/propget-cmd.c:373 -#, fuzzy, c-format +#: ../svn/propget-cmd.c:376 +#, c-format msgid "Property '%s' not found on revision %s" -msgstr "å±æ§â%sâå¨çæ¬ %ld ä¸æ¾ä¸å°" +msgstr "çæ¬ %s ä¸æªæ¾å°å±æ§ '%s'" -#: ../svn/propget-cmd.c:438 -msgid "Strict output of property values only available for single-target, non-recursive propget operations" -msgstr "精确çè¾åºå±æ§å¼åªéç¨äºåä¸ç®æ çééå½æä½ propget" +#: ../svn/propget-cmd.c:441 +msgid "--no-newline is only available for single-target, non-recursive propget operations" +msgstr "--no-newline ä» å¯¹åç®æ ãééå½ç propget æä½ææ" -#: ../svn/propget-cmd.c:493 -#, fuzzy, c-format +#: ../svn/propget-cmd.c:496 +#, c-format msgid "Property '%s' not found on '%s'" -msgstr "å±æ§â%sâå¨çæ¬ %ld ä¸æ¾ä¸å°" +msgstr "'%s' ä¸æªæ¾å°å±æ§ '%s'" -#: ../svn/proplist-cmd.c:246 +#: ../svn/proplist-cmd.c:248 #, c-format msgid "Unversioned properties on revision %ld:\n" msgstr "çæ¬ %ld ä¸çæªçº³å ¥çæ¬æ§å¶çå±æ§: \n" -#: ../svn/proplist-cmd.c:321 +#: ../svn/proplist-cmd.c:323 msgid "Could not display properties of all targets because some targets don't exist" msgstr "å 为ä¸äºç®æ ä¸åå¨ï¼æ以ä¸è½æ¾ç¤ºå ¨é¨ç®æ çå±æ§" -#: ../svn/proplist-cmd.c:326 +#: ../svn/proplist-cmd.c:328 msgid "Could not display properties of all targets because some targets are not versioned" msgstr "å 为ä¸äºç®æ 没æçæ¬åï¼æ以ä¸è½æ¾ç¤ºå ¨é¨ç®æ çå±æ§" #: ../svn/props.c:66 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:73 msgid "Wrong number of targets specified" @@ -11405,104 +13863,553 @@ msgid "" "To turn off the %s property, use 'svn propdel';\n" "setting the property to '%s' will not turn it off." msgstr "" -"ä½¿ç¨ âsvn propdelâ å ³éå±æ§ %sï¼\n" -"设置å±æ§ä¸º â%sâ ä¸ä¼å ³éå®ã" +"ä½¿ç¨ 'svn propdel' å ³éå±æ§ %sï¼\n" +"设置å±æ§ä¸º '%s' ä¸ä¼å ³éå®ã" -#: ../svn/props.c:177 +#: ../svn/props.c:124 #, c-format -msgid "(To set the '%s' property, re-run with '--force'.)" -msgstr "" +msgid "Use '--force' to set the '%s' property." +msgstr "ä½¿ç¨ '--force' æ¥è®¾ç½® '%s' å±æ§ã" -#: ../svn/props.c:182 +#: ../svn/props.c:129 #, c-format -msgid "(To edit the '%s' property, re-run with '--force'.)" -msgstr "" +msgid "Use '--force' to edit the '%s' property." +msgstr "ä½¿ç¨ '--force' æ¥ç¼è¾ '%s' å±æ§ã" -#: ../svn/props.c:188 +#: ../svn/props.c:135 #, c-format -msgid "(To use the '%s' property, re-run with '--force'.)" -msgstr "" +msgid "Use '--force' to use the '%s' property'." +msgstr "ä½¿ç¨ '--force' æ¥ä½¿ç¨ '%s' å±æ§ã" -#: ../svn/props.c:202 -#, fuzzy, c-format -msgid "'%s' is not a valid %s property name; re-run with '--force' to set it" -msgstr "â%sâä¸æ¯ææç Subversion å±æ§å称" +#: ../svn/props.c:149 +#, c-format +msgid "'%s' is not a valid %s property name; use '--force' to set it" +msgstr "'%s' ä¸æ¯ææç %s å±æ§åï¼ä½¿ç¨ '--force' æ¥è®¾ç½®å®" -#: ../svn/props.c:208 -#, fuzzy, c-format -msgid "'%s' is not a valid %s property name; re-run with '--force' to edit it" -msgstr "â%sâä¸æ¯ææç Subversion å±æ§å称" +#: ../svn/props.c:154 +#, c-format +msgid "'%s' is not a valid %s property name; use '--force' to edit it" +msgstr "'%s' ä¸æ¯ææç %s å±æ§åï¼ä½¿ç¨ '--force' æ¥ç¼è¾å®" -#: ../svn/props.c:215 -#, fuzzy, c-format -msgid "'%s' is not a valid %s property name; re-run with '--force' to use it" -msgstr "â%sâä¸æ¯ææç Subversion å±æ§å称" +#: ../svn/props.c:160 +#, c-format +msgid "'%s' is not a valid %s property name; use '--force' to use it" +msgstr "'%s' ä¸æ¯ææç %s å±æ§åï¼ä½¿ç¨ '--force' æ¥ä½¿ç¨å®" -#: ../svn/props.c:281 ../svn/props.c:332 -#, fuzzy, c-format -msgid "" -"'%s' is not a valid %s property name; did you mean '%s'?\n" -"%s" -msgstr "â%sâä¸æ¯ææç Subversion å±æ§å称" +#: ../svn/props.c:226 ../svn/props.c:269 +#, c-format +msgid "'%s' is not a valid %s property name; did you mean '%s'?" +msgstr "'%s' ä¸æ¯ææç %s å±æ§åï¼ä½ æ¯å¦æçæ¯ '%s'ï¼" -#: ../svn/props.c:340 -#, fuzzy, c-format -msgid "" -"'%s' is not a valid %s property name\n" -"Did you mean '%s' or '%s'?\n" -"%s" -msgstr "â%sâä¸æ¯ææç Subversion å±æ§å称" +#: ../svn/props.c:278 +#, c-format +msgid "'%s' is not a valid %s property name; did you mean '%s' or '%s'?" +msgstr "'%s' ä¸æ¯ææç %s å±æ§åï¼ä½ æ¯å¦æçæ¯ '%s' æ '%s'ï¼" -#: ../svn/props.c:350 -#, fuzzy, c-format -msgid "" -"'%s' is not a valid %s property name\n" -"Did you mean '%s', '%s' or '%s'?\n" -"%s" -msgstr "â%sâä¸æ¯ææç Subversion å±æ§å称" +#: ../svn/props.c:288 +#, c-format +msgid "'%s' is not a valid %s property name; did you mean '%s', '%s' or '%s'?" +msgstr "'%s' ä¸æ¯ææç %s å±æ§åï¼ä½ æ¯å¦æçæ¯ '%s'ã'%s' æ '%s'ï¼" #: ../svn/propset-cmd.c:132 #, c-format msgid "Cannot specify revision for setting versioned property '%s'" -msgstr "设置åçæ¬æ§å¶çå±æ§ â%sâ æ¶ä¸è½æå®çæ¬" +msgstr "设置åçæ¬æ§å¶çå±æ§ '%s' æ¶ä¸è½æå®çæ¬" #: ../svn/propset-cmd.c:165 #, c-format msgid "Explicit target required ('%s' interpreted as prop value)" -msgstr "å¿ é¡»æç¡®å°æä¾ç®ç (â%sâ解é为å±æ§å 容)" +msgstr "å¿ é¡»æç¡®å°æä¾ç®ç ('%s'解é为å±æ§å 容)" + +#: ../svn/resolve-cmd.c:158 +msgid "Failure occurred resolving one or more conflicts" +msgstr "å¤çä¸ä¸ªææ´å¤çå²çªå¤±è´¥" -#: ../svn/resolve-cmd.c:79 +#: ../svn/resolve-cmd.c:198 msgid "missing --accept option" msgstr "缺å°é项 --accept" -#: ../svn/resolve-cmd.c:84 +#: ../svn/resolve-cmd.c:205 msgid "invalid 'accept' ARG" -msgstr "æ æç âacceptâ åæ°" +msgstr "æ æç 'accept' åæ°" -#: ../svn/resolve-cmd.c:127 -msgid "Failure occurred resolving one or more conflicts" -msgstr "å¤çä¸ä¸ªææ´å¤çå²çªå¤±è´¥" - -#: ../svn/revert-cmd.c:79 +#: ../svn/revert-cmd.c:81 msgid "Try 'svn revert --depth infinity' instead?" -msgstr "å°è¯ âsvn revert --depth infinityâï¼" +msgstr "å°è¯ 'svn revert --depth infinity'ï¼" + +#: ../svn/shelf-cmd.c:58 ../svn/shelf2-cmd.c:58 +#, c-format +msgid "Shelf '%s': no versions found" +msgstr "æç½® '%s': æªæ¾å°çæ¬" + +#: ../svn/shelf-cmd.c:146 ../svn/shelf2-cmd.c:146 +msgid "All targets must be in the same WC" +msgstr "ææç®æ å¿ é¡»å¨åä¸ä¸ªå·¥ä½å¯æ¬ä¸" + +#: ../svn/shelf-cmd.c:166 ../svn/shelf2-cmd.c:166 +#, c-format +msgid "%d day ago" +msgid_plural "%d days ago" +msgstr[0] "%d 天å" + +#: ../svn/shelf-cmd.c:171 ../svn/shelf2-cmd.c:171 +#, c-format +msgid "%d hour ago" +msgid_plural "%d hours ago" +msgstr[0] "%d å°æ¶å" + +#: ../svn/shelf-cmd.c:176 ../svn/shelf2-cmd.c:176 +#, c-format +msgid "%d minute ago" +msgid_plural "%d minutes ago" +msgstr[0] "%d åéå" + +#: ../svn/shelf-cmd.c:235 ../svn/shelf2-cmd.c:235 +#, c-format +msgid "version %d" +msgstr "çæ¬ %d" + +#: ../svn/shelf-cmd.c:238 ../svn/shelf2-cmd.c:238 +#, c-format +msgid "version %d of %d" +msgid_plural "version %d of %d" +msgstr[0] "第 %d çï¼å ± %d ç" + +#: ../svn/shelf-cmd.c:244 ../svn/shelf2-cmd.c:244 +#, c-format +msgid "%d path changed" +msgid_plural "%d paths changed" +msgstr[0] "%d 个路å¾å·²æ´æ¹" + +#: ../svn/shelf-cmd.c:260 ../svn/shelf2-cmd.c:260 +#, c-format +msgid " %.50s\n" +msgstr " %.50s\n" + +#: ../svn/shelf-cmd.c:353 ../svn/shelf2-cmd.c:353 +msgid "No shelves found" +msgstr "æªæ¾å°æç½®" + +#: ../svn/shelf-cmd.c:469 ../svn/shelf2-cmd.c:469 +#, c-format +msgid "--- Save a new version of '%s' in WC root '%s'\n" +msgstr "--- å¨å·¥ä½å¯æ¬æ ¹ '%s' ä¸ä¿å '%s' çæ°çæ¬\n" + +#: ../svn/shelf-cmd.c:470 ../svn/shelf2-cmd.c:470 +#, c-format +msgid "--- Shelve '%s' in WC root '%s'\n" +msgstr "--- å¨å·¥ä½å¯æ¬æ ¹ '%s' ä¸æç½® '%s'\n" + +#: ../svn/shelf-cmd.c:485 ../svn/shelf2-cmd.c:485 +#, c-format +msgid "--- Saving...\n" +msgstr "--- æ£å¨ä¿å...\n" + +#: ../svn/shelf-cmd.c:486 ../svn/shelf2-cmd.c:486 +#, c-format +msgid "--- Shelving...\n" +msgstr "--- æ£å¨æç½®...\n" + +#: ../svn/shelf-cmd.c:498 ../svn/shelf2-cmd.c:498 +#, c-format +msgid "%d path could not be shelved" +msgid_plural "%d paths could not be shelved" +msgstr[0] "%d 个路å¾æ æ³æç½®" + +#: ../svn/shelf-cmd.c:508 ../svn/shelf2-cmd.c:508 +#, c-format +msgid "No local modifications could be saved" +msgstr "没æå¯ä¿åçæ¬å°ä¿®æ¹" + +#: ../svn/shelf-cmd.c:509 ../svn/shelf2-cmd.c:509 +#, c-format +msgid "No local modifications could be shelved" +msgstr "没æå¯æç½®çæ¬å°ä¿®æ¹" + +#: ../svn/shelf-cmd.c:613 ../svn/shelf2-cmd.c:613 +#, c-format +msgid "Shelved path '%s' already has status '%c' in the working copy" +msgstr "æç½®çè·¯å¾ '%s' å¨å·¥ä½å¯æ¬ä¸å·²æç¶æ '%c'" + +#: ../svn/shelf-cmd.c:666 ../svn/shelf2-cmd.c:666 +#, c-format +msgid "--- Unshelve '%s' in WC root '%s'\n" +msgstr "--- å¨å·¥ä½å¯æ¬æ ¹ '%s' ä¸åæ¶æç½® '%s'\n" + +#: ../svn/shelf-cmd.c:674 ../svn/shelf2-cmd.c:674 +msgid "Cannot unshelve/restore, as at least one shelved path would conflict with a local modification or other status in the working copy" +msgstr "æ æ³åæ¶æç½®/æ¢å¤ï¼å 为è³å°ä¸ä¸ªæç½®çè·¯å¾ä¼ä¸å·¥ä½å¯æ¬ä¸çæ¬å°ä¿®æ¹æå ¶ä»ç¶æå²çª" + +#: ../svn/shelf-cmd.c:692 ../svn/shelf2-cmd.c:692 +#, c-format +msgid "restored '%s' version %d and deleted %d newer version\n" +msgid_plural "restored '%s' version %d and deleted %d newer versions\n" +msgstr[0] "å·²æ¢å¤ '%s' çæ¬ %d 并å é¤äº %d 个è¾æ°ççæ¬\n" + +#: ../svn/shelf-cmd.c:698 ../svn/shelf2-cmd.c:698 +#, c-format +msgid "restored '%s' version %d (the newest version)\n" +msgstr "å·²æ¢å¤ '%s' çæ¬ %d (ææ°çæ¬)\n" + +#: ../svn/shelf-cmd.c:801 ../svn/shelf2-cmd.c:801 +#, c-format +msgid "deleted '%s'\n" +msgstr "å·²å é¤ '%s'\n" + +#: ../svn/shelf-cmd.c:906 ../svn/shelf2-cmd.c:906 +#, c-format +msgid "saved '%s' version %d\n" +msgstr "å·²ä¿å '%s' çæ¬ %d\n" + +#: ../svn/shelf-cmd.c:910 ../svn/shelf2-cmd.c:910 +#, c-format +msgid "shelved '%s' version %d\n" +msgstr "å·²æç½® '%s' çæ¬ %d\n" + +#: ../svn/shelf-cmd.c:941 ../svn/shelf2-cmd.c:941 +#, c-format +msgid "unshelving the youngest shelf, '%s'\n" +msgstr "æ£å¨åæ¶æç½®ææ°çæç½® '%s'\n" + +#: ../svn/shelf-cmd.c:951 ../svn/shelf-cmd.c:1136 ../svn/shelf2-cmd.c:951 +#: ../svn/shelf2-cmd.c:1136 ../svnadmin/svnadmin.c:798 +msgid "Too many arguments" +msgstr "åæ°å¤ªå¤" + +#: ../svn/shelf-cmd.c:1248 ../svn/shelf2-cmd.c:1224 +msgid "" +"Show shelved changes as a diff.\n" +"usage: x-shelf-diff SHELF [VERSION]\n" +"\n" +msgstr "" +"æ¾ç¤ºæç½®çæ´æ¹ä¸ºå·®å¼ã\n" +"ç¨æ³: x-shelf-diff SHELF [VERSION]\n" +"\n" + +#: ../svn/shelf-cmd.c:1251 ../svn/shelf2-cmd.c:1227 +msgid "" +" Show the changes in SHELF:VERSION (default: latest) as a diff.\n" +"\n" +msgstr "" +" æ¾ç¤º SHELF:VERSION (é»è®¤: ææ°) ä¸çæ´æ¹ä¸ºå·®å¼ã\n" +"\n" + +#: ../svn/shelf-cmd.c:1253 ../svn/shelf2-cmd.c:1229 +msgid "" +" See also: 'svn diff --cl=svn:shelf:SHELF' which supports most options of\n" +" 'svn diff'.\n" +"\n" +msgstr "" +" å¦è§: 'svn diff --cl=svn:shelf:SHELF'ï¼å®æ¯æ\n" +" 'svn diff' ç大å¤æ°é项ã\n" +"\n" + +#: ../svn/shelf-cmd.c:1256 ../svn/shelf-cmd.c:1269 ../svn/shelf-cmd.c:1282 +#: ../svn/shelf-cmd.c:1294 ../svn/shelf-cmd.c:1306 ../svn/shelf-cmd.c:1321 +#: ../svn/shelf-cmd.c:1355 ../svn/shelf-cmd.c:1388 ../svn/shelf2-cmd.c:1232 +#: ../svn/shelf2-cmd.c:1245 ../svn/shelf2-cmd.c:1258 ../svn/shelf2-cmd.c:1270 +#: ../svn/shelf2-cmd.c:1282 ../svn/shelf2-cmd.c:1297 ../svn/shelf2-cmd.c:1331 +#: ../svn/shelf2-cmd.c:1364 +msgid "" +" The shelving feature is EXPERIMENTAL. This command is likely to change\n" +" in the next release, and there is no promise of backward compatibility.\n" +msgstr "" +" æç½®åè½æ¯å®éªæ§çãæ¤å½ä»¤å¯è½å¨\n" +" ä¸ä¸ä¸ªçæ¬ä¸æ´æ¹ï¼ä¸ä¸æ¿è¯ºååå ¼å®¹ã\n" + +#: ../svn/shelf-cmd.c:1263 ../svn/shelf2-cmd.c:1239 +msgid "" +"Delete a shelf.\n" +"usage: x-shelf-drop SHELF [PATH ...]\n" +"\n" +msgstr "" +"å é¤æç½®ã\n" +"ç¨æ³: x-shelf-drop SHELF [PATH ...]\n" +"\n" + +#: ../svn/shelf-cmd.c:1266 ../svn/shelf2-cmd.c:1242 +msgid "" +" Delete the shelves named SHELF from the working copies containing PATH\n" +" (default PATH is '.')\n" +"\n" +msgstr "" +" ä»å å« PATH çå·¥ä½å¯æ¬ä¸å é¤å为 SHELF çæç½®\n" +" (é»è®¤ PATH 为 '.')\n" +"\n" + +#: ../svn/shelf-cmd.c:1275 ../svn/shelf2-cmd.c:1251 +msgid "" +"List shelves.\n" +"usage: x-shelf-list [PATH ...]\n" +"\n" +msgstr "" +"ååºæç½®ã\n" +"ç¨æ³: x-shelf-list [PATH ...]\n" +"\n" + +#: ../svn/shelf-cmd.c:1278 ../svn/shelf2-cmd.c:1254 +msgid "" +" List shelves for each working copy containing PATH (default is '.')\n" +" Include the first line of any log message and some details about the\n" +" contents of the shelf, unless '-q' is given.\n" +"\n" +msgstr "" +" ååºæ¯ä¸ªå å« PATH çå·¥ä½å¯æ¬ä¸çæç½®(é»è®¤ä¸º '.')\n" +" é¤éæå® '-q'ï¼å¦åå å«æ¥å¿æ¶æ¯ç第ä¸è¡ä»¥åæç½®å 容ç\n" +" ä¸äºç»èã\n" +"\n" + +#: ../svn/shelf-cmd.c:1289 ../svn/shelf2-cmd.c:1265 +msgid "" +"List which shelf affects each path.\n" +"usage: x-shelf-list-by-paths [PATH...]\n" +"\n" +msgstr "" +"ååºæ¯ä¸ªè·¯å¾ååªä¸ªæ置影åã\n" +"ç¨æ³: x-shelf-list-by-paths [PATH...]\n" +"\n" + +#: ../svn/shelf-cmd.c:1292 ../svn/shelf2-cmd.c:1268 +msgid "" +" List which shelf most recently affects each path below the given PATHs.\n" +"\n" +msgstr "" +" ååºæè¿å½±åç»å® PATH ä¸æ¯ä¸ªè·¯å¾çæç½®ã\n" +"\n" + +#: ../svn/shelf-cmd.c:1300 ../svn/shelf2-cmd.c:1276 +msgid "" +"Show the versions of a shelf.\n" +"usage: x-shelf-log SHELF [PATH...]\n" +"\n" +msgstr "" +"æ¾ç¤ºæç½®ççæ¬ã\n" +"ç¨æ³: x-shelf-log SHELF [PATH...]\n" +"\n" + +#: ../svn/shelf-cmd.c:1303 ../svn/shelf2-cmd.c:1279 +msgid "" +" Show all versions of SHELF for each working copy containing PATH (the\n" +" default PATH is '.').\n" +"\n" +msgstr "" +" æ¾ç¤ºæ¯ä¸ªå å« PATH çå·¥ä½å¯æ¬ç SHELF çææçæ¬\n" +" (é»è®¤ PATH 为 '.')ã\n" +"\n" + +#: ../svn/shelf-cmd.c:1313 ../svn/shelf2-cmd.c:1289 +msgid "" +"Copy local changes onto a new version of a shelf.\n" +"usage: x-shelf-save SHELF [PATH...]\n" +"\n" +msgstr "" +"å°æ¬å°æ´æ¹å¤å¶å°æç½®çæ°çæ¬ã\n" +"ç¨æ³: x-shelf-save SHELF [PATH...]\n" +"\n" + +#: ../svn/shelf-cmd.c:1316 ../svn/shelf2-cmd.c:1292 +msgid "" +" Save local changes in the given PATHs as a new version of SHELF.\n" +" The shelf's log message can be set with -m, -F, etc.\n" +"\n" +msgstr "" +" å°ç»å® PATH ä¸çæ¬å°æ´æ¹ä¿å为 SHELF çæ°çæ¬ã\n" +" å¯ç¨ -mã-F ç设置æç½®çæ¥å¿æ¶æ¯ã\n" + +#: ../svn/shelf-cmd.c:1319 ../svn/shelf2-cmd.c:1295 +msgid "" +" The same as 'svn shelve --keep-local'.\n" +"\n" +msgstr "" +" å 'svn shelve --keep-local'ã\n" +"\n" + +#: ../svn/shelf-cmd.c:1331 ../svn/shelf2-cmd.c:1307 +msgid "" +"Move local changes onto a shelf.\n" +"usage: x-shelve [--keep-local] SHELF [PATH...]\n" +"\n" +msgstr "" +"å°æ¬å°æ´æ¹ç§»å°æç½®ã\n" +"ç¨æ³: x-shelve [--keep-local] SHELF [PATH...]\n" +"\n" + +#: ../svn/shelf-cmd.c:1334 ../svn/shelf2-cmd.c:1310 +msgid "" +" Save the local changes in the given PATHs to a new or existing SHELF.\n" +" Revert those changes from the WC unless '--keep-local' is given.\n" +" The shelf's log message can be set with -m, -F, etc.\n" +"\n" +msgstr "" +" å°ç»å® PATH ä¸çæ¬å°æ´æ¹ä¿åå°æ°çæå·²æç SHELFã\n" +" é¤éæå® '--keep-local'ï¼å¦åä»å·¥ä½å¯æ¬ä¸æ¢å¤è¿äºæ´æ¹ã\n" +" æç½®çæ¥å¿æ¶æ¯å¯ç¨ -mã-F ç设置ã\n" +"\n" + +#: ../svn/shelf-cmd.c:1338 ../svn/shelf2-cmd.c:1314 +msgid "" +" 'svn shelve --keep-local' is the same as 'svn shelf-save'.\n" +"\n" +msgstr "" +" 'svn shelve --keep-local' å 'svn shelf-save'ã\n" +"\n" + +#: ../svn/shelf-cmd.c:1340 ../svn/shelf2-cmd.c:1316 +msgid "" +" The kinds of change you can shelve are committable changes to files and\n" +" properties, except the following kinds which are not yet supported:\n" +" * copies and moves\n" +" * mkdir and rmdir\n" +" Uncommittable states such as conflicts, unversioned and missing cannot\n" +" be shelved.\n" +"\n" +msgstr "" +" å¯ä»¥æç½®çæ´æ¹æ¯å¯¹æ件åå±æ§çå¯æ交æ´æ¹ï¼ä½ä»¥ä¸ç±»å\n" +" æä¸æ¯æ:\n" +" * å¤å¶å移å¨\n" +" * mkdir å rmdir\n" +" å²çªãæªçæ¬æ§å¶ã缺失çä¸å¯æ交ç¶ææ æ³æç½®ã\n" +"\n" + +#: ../svn/shelf-cmd.c:1347 ../svn/shelf2-cmd.c:1323 +msgid "" +" To bring back shelved changes, use 'svn unshelve SHELF'.\n" +"\n" +msgstr "" +" è¦æ¢å¤æç½®çæ´æ¹ï¼ä½¿ç¨ 'svn unshelve SHELF'ã\n" +"\n" + +#: ../svn/shelf-cmd.c:1349 ../svn/shelf2-cmd.c:1325 +msgid "" +" Shelves are currently stored under <WC>/.svn/experimental/shelves/ .\n" +" (In Subversion 1.10, shelves were stored under <WC>/.svn/shelves/ as\n" +" patch files. To recover a shelf created by 1.10, either use a 1.10\n" +" client to find and unshelve it, or find the patch file and use any\n" +" 1.10 or later 'svn patch' to apply it.)\n" +"\n" +msgstr "" +" æç½®å½ååå¨å¨ <WC>/.svn/experimental/shelves/ ä¸ã\n" +" (å¨ Subversion 1.10 ä¸ï¼æ置以补ä¸æ件形å¼åå¨å¨\n" +" <WC>/.svn/shelves/ ä¸ãè¦æ¢å¤ 1.10 å建çæç½®ï¼å¯ä»¥ç¨ 1.10\n" +" 客æ·ç«¯æ¾å°å¹¶åæ¶æç½®ï¼ä¹å¯ä»¥æ¾å°è¯¥è¡¥ä¸æ件ï¼ç¨ 1.10 ææ´é«\n" +" çæ¬ç 'svn patch' åºç¨å®ã)\n" +"\n" + +#: ../svn/shelf-cmd.c:1364 ../svn/shelf2-cmd.c:1340 +msgid "" +"Copy shelved changes back into the WC.\n" +"usage: x-unshelve [--drop] [SHELF [VERSION]]\n" +"\n" +msgstr "" +"å°æç½®çæ´æ¹å¤å¶åå·¥ä½å¯æ¬ã\n" +"ç¨æ³: x-unshelve [--drop] [SHELF [VERSION]]\n" +"\n" + +#: ../svn/shelf-cmd.c:1367 ../svn/shelf2-cmd.c:1343 +msgid "" +" Apply the changes stored in SHELF to the working copy.\n" +" SHELF defaults to the newest shelf.\n" +"\n" +msgstr "" +" å°åå¨å¨ SHELF ä¸çæ´æ¹åºç¨å°å·¥ä½å¯æ¬ã\n" +" SHELF é»è®¤ä¸ºææ°çæç½®ã\n" +"\n" + +#: ../svn/shelf-cmd.c:1370 ../svn/shelf2-cmd.c:1346 +msgid "" +" Apply the newest version of the shelf, by default. If VERSION is\n" +" specified, apply that version and discard all versions newer than that.\n" +" In any case, retain the unshelved version and versions older than that\n" +" (unless --drop is specified).\n" +"\n" +msgstr "" +" é»è®¤åºç¨æç½®çææ°çæ¬ãå¦ææå®äº VERSIONï¼ååºç¨è¯¥çæ¬\n" +" 并丢å¼æ¯å®æ´æ°çææçæ¬ãæ 论åªç§æ åµï¼é½ä¿çåæ¶æç½®ç\n" +" çæ¬åæ´æ§ççæ¬(é¤éæå® --drop)ã\n" +"\n" + +#: ../svn/shelf-cmd.c:1375 ../svn/shelf2-cmd.c:1351 +msgid "" +" With --drop, delete the entire shelf (like 'svn shelf-drop') after\n" +" successfully unshelving with no conflicts.\n" +"\n" +msgstr "" +" ä½¿ç¨ --drop æ¶ï¼æååæ¶æç½®åå é¤æ´ä¸ªæç½®\n" +" (类似 'svn shelf-drop')ï¼ä¸æ å²çªã\n" +"\n" + +#: ../svn/shelf-cmd.c:1378 ../svn/shelf2-cmd.c:1354 +msgid "" +" The working files involved should be in a clean, unmodified state\n" +" before using this command. To roll back to an older version of the\n" +" shelf, first ensure any current working changes are removed, such as\n" +" by shelving or reverting them, and then unshelve the desired version.\n" +"\n" +msgstr "" +" 使ç¨æ¤å½ä»¤åï¼æ¶åçå·¥ä½æ件åºå¤äºå¹²åãæªä¿®æ¹çç¶æã\n" +" è¦åéå°æç½®çæ§çæ¬ï¼å ç¡®ä¿å½åçå·¥ä½ä¿®æ¹å·²è¢«æ¸ é¤ï¼ä¾å¦\n" +" æå®ä»¬æç½®ææ¢å¤ï¼ç¶åååæ¶æç½®æéççæ¬ã\n" +"\n" + +#: ../svn/shelf-cmd.c:1383 ../svn/shelf2-cmd.c:1359 +msgid "" +" Unshelve normally refuses to apply any changes if any path involved is\n" +" already modified (or has any other abnormal status) in the WC. With\n" +" --force, it does not check and may error out and/or produce partial or\n" +" unexpected results.\n" +"\n" +msgstr "" +" å¦æå·¥ä½å¯æ¬ä¸æ¶åçä»»ä½è·¯å¾å·²è¢«ä¿®æ¹(ææå ¶ä»å¼å¸¸ç¶æ)ï¼\n" +" åæ¶æç½®é常ä¼æç»åºç¨ä»»ä½æ´æ¹ãä½¿ç¨ --force åä¸ä½æ£æ¥ï¼\n" +" å¯è½æ¥éå/æ产çé¨åææå¤çç»æã\n" +"\n" + +#: ../svn/shelf-cmd.c:1394 +msgid "" +"Copy local modifications from one WC to another.\n" +"usage: x-wc-copy-mods SRC_WC_PATH DST_WC_PATH\n" +"\n" +msgstr "" +"å°æ¬å°ä¿®æ¹ä»ä¸ä¸ªå·¥ä½å¯æ¬å¤å¶å°å¦ä¸ä¸ªã\n" +"ç¨æ³: x-wc-copy-mods SRC_WC_PATH DST_WC_PATH\n" +"\n" + +#: ../svn/shelf-cmd.c:1397 +msgid "" +" The source and destination WC paths may be in the same WC or in different WCs.\n" +"\n" +msgstr "" +" æºåç®æ å·¥ä½å¯æ¬è·¯å¾å¯ä»¥å¨åä¸ä¸ªå·¥ä½å¯æ¬ä¸æä¸åçå·¥ä½å¯æ¬ä¸ã\n" +"\n" + +#: ../svn/shelf-cmd.c:1400 +msgid "" +" This feature is EXPERIMENTAL. This command is likely to change\n" +" in the next release, and there is no promise of backward compatibility.\n" +msgstr "" +" æ¤åè½æ¯å®éªæ§çãæ¤å½ä»¤å¯è½å¨\n" +" ä¸ä¸ä¸ªçæ¬ä¸æ´æ¹ï¼ä¸ä¸æ¿è¯ºååå ¼å®¹ã\n" #: ../svn/status-cmd.c:97 #, c-format msgid " Text conflicts: %u\n" -msgstr " æ£æå²çªï¼%u\n" +msgstr " æ£æå²çª: %u\n" #: ../svn/status-cmd.c:101 #, c-format msgid " Property conflicts: %u\n" -msgstr " å±æ§å²çªï¼%u\n" +msgstr " å±æ§å²çª: %u\n" #: ../svn/status-cmd.c:105 #, c-format msgid " Tree conflicts: %u\n" -msgstr " æ å²çªï¼%u\n" +msgstr " æ å²çª: %u\n" + +#: ../svn/status-cmd.c:296 +msgid "--revision (-r) option valid only with --show-updates (-u) option" +msgstr "--revision (-r) éé¡¹ä» å¯¹ --show-updates (-u) é项ææ" -#: ../svn/status-cmd.c:399 +#: ../svn/status-cmd.c:406 #, c-format msgid "" "\n" @@ -11511,60 +14418,135 @@ msgstr "" "\n" "--- ä¿®æ¹å表 '%s':\n" -#: ../svn/status.c:318 +#: ../svn/status.c:315 #, c-format msgid "swapped places with %s" -msgstr "" +msgstr "ä¸ %s 交æ¢äºä½ç½®" -#: ../svn/status.c:333 +#: ../svn/status.c:330 #, c-format msgid "moved from %s" msgstr "ç§»èª %s" -#: ../svn/status.c:345 +#: ../svn/status.c:342 #, c-format msgid "moved to %s" msgstr "ç§»å° %s" -#: ../svn/svn.c:157 +#: ../svn/svn.c:73 msgid "force operation to run" msgstr "强å¶æä½è¿è¡" -#: ../svn/svn.c:159 +#: ../svn/svn.c:75 msgid "force validity of log message source" msgstr "强å¶æ ¡éªæ¥å¿ä¿¡æ¯èµæº" -#: ../svn/svn.c:162 +#: ../svn/svn.c:76 ../svn/svn.c:77 ../svnadmin/svnadmin.c:172 +#: ../svnadmin/svnadmin.c:175 ../svnbench/svnbench.c:83 +#: ../svnbench/svnbench.c:84 ../svndumpfilter/svndumpfilter.c:945 +#: ../svndumpfilter/svndumpfilter.c:948 ../svnfsfs/svnfsfs.c:89 +#: ../svnfsfs/svnfsfs.c:92 ../svnlook/svnlook.c:115 ../svnlook/svnlook.c:127 +#: ../svnsync/svnsync.c:289 ../svnsync/svnsync.c:291 +msgid "show help on a subcommand" +msgstr "æ¾ç¤ºåå½ä»¤å¸®å©ä¿¡æ¯" + +#: ../svn/svn.c:78 msgid "specify log message ARG" msgstr "æå®æ¥å¿ä¿¡æ¯ARG" -#: ../svn/svn.c:190 +#: ../svn/svn.c:79 ../svnbench/svnbench.c:85 +msgid "print nothing, or only summary information" +msgstr "ä¸æå°ä¿¡æ¯ï¼æåªæå°æ¦è¦ä¿¡æ¯" + +#: ../svn/svn.c:80 ../svnbench/svnbench.c:86 +msgid "descend recursively, same as --depth=infinity" +msgstr "åä¸éå½ï¼ä¸ --depth=infinity ç¸å" + +#: ../svn/svn.c:81 +msgid "obsolete" +msgstr "å·²åºå¼" + +#: ../svn/svn.c:82 +msgid "show human-readable output" +msgstr "æ¾ç¤ºäººç±»å¯è¯»çè¾åº" + +#: ../svn/svn.c:84 ../svnbench/svnbench.c:89 +msgid "" +"the change made by revision ARG (like -r ARG-1:ARG)\n" +" If ARG is negative this is like -r ARG:ARG-1\n" +" If ARG is of the form ARG1-ARG2 then this is like\n" +" ARG1:ARG2, where ARG1 is inclusive" +msgstr "" +"çæ¬ ARG æåçä¿®æ¹(å¦å -r ARG-1:ARG)\n" +" å¦æ ARG 为è´æ°ï¼åçä»·äº -r ARG:ARG-1\n" +" å¦æ ARG çå½¢å¼æ¯ ARG1-ARG2ï¼åçä»·äº\n" +" ARG1:ARG2ï¼å ¶ä¸ ARG1 å å«å¨å " + +#: ../svn/svn.c:92 ../svnbench/svnbench.c:97 +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" +" NUMBER çæ¬å·\n" +" '{' DATE '}' å¨æå®æ¶é´ä»¥åççæ¬\n" +" 'HEAD' çæ¬åºä¸çææ°çæ¬\n" +" 'BASE' å·¥ä½å¯æ¬çåºçº¿çæ¬\n" +" 'COMMITTED' æåæ交æåºçº¿ä¹å\n" +" 'PREV' COMMITTEDçåä¸çæ¬" + +#: ../svn/svn.c:107 msgid "read log message from file ARG" msgstr "ä»æ件ARG读åæ¥å¿ä¿¡æ¯" -#: ../svn/svn.c:192 +#: ../svn/svn.c:109 msgid "give output suitable for concatenation" msgstr "ç»äºéå串èçè¾åº" -#: ../svn/svn.c:194 +#: ../svn/svn.c:111 msgid "treat value as being in charset encoding ARG" msgstr "å°ARGçå¼è§ä¸ºå符ç¼ç " -#: ../svn/svn.c:197 +#: ../svn/svn.c:112 ../svnadmin/svnadmin.c:178 ../svnbench/svnbench.c:112 +#: ../svndumpfilter/svndumpfilter.c:951 ../svnfsfs/svnfsfs.c:95 +#: ../svnlook/svnlook.c:179 ../svnrdump/svnrdump.c:142 +#: ../svnserve/svnserve.c:421 ../svnsync/svnsync.c:287 +#: ../svnversion/svnversion.c:147 +msgid "show program version information" +msgstr "æ¾ç¤ºç¨åºçæ¬ä¿¡æ¯" + +#: ../svn/svn.c:113 ../svnbench/svnbench.c:113 +msgid "print extra information" +msgstr "æå°éå ä¿¡æ¯" + +#: ../svn/svn.c:114 msgid "display update information" msgstr "æ¾ç¤ºæ´æ°ä¿¡æ¯" -#: ../svn/svn.c:200 -#, fuzzy +#: ../svn/svn.c:115 ../svnbench/svnbench.c:114 ../svnrdump/svnrdump.c:124 +msgid "specify a username ARG" +msgstr "æå®ç¨æ·å称 ARG" + +#: ../svn/svn.c:117 msgid "" "specify a password ARG (caution: on many operating\n" " systems, other users will be able to see this)" msgstr "" -"æå®å¯ç ARG (å·²ç»è¿æ¶;\n" -" åç --source-password å --sync-password)" +"æå®å¯ç ARG (注æ: å¨è®¸å¤æä½ç³»ç»ä¸ï¼\n" +" å ¶ä»ç¨æ·å¯ä»¥çå°" -#: ../svn/svn.c:204 -#, fuzzy +#: ../svn/svn.c:122 ../svnbench/svnbench.c:117 ../svnrdump/svnrdump.c:128 +msgid "read password from stdin" +msgstr "ä»æ åè¾å ¥è¯»åå¯ç " + +#: ../svn/svn.c:124 msgid "" "Specify differencing options for external diff or\n" " internal diff or blame. Default: '-u'. Options are\n" @@ -11577,21 +14559,29 @@ msgid "" " -U ARG, --context ARG: Show ARG lines of context\n" " -p, --show-c-function: Show C function name" msgstr "" -"缺ç: â-uâãå½ Subversion è°ç¨å¤é¨æ¯è¾ç¨åºæ¶ï¼ARG ç´æ¥ä¼ ç»å®ãä½æ¯å½\n" -" Subversion 使ç¨ç¼ºççå ç½®æ¯è¾å®ç°ï¼æè æ£\n" -" æ¾ç¤ºè¿½æº¯æ¶, ARG å¯ä»¥æ¯: \n" -" -u (--unified):\n" -" è¾åºä¸è¡ç»ä¸ä¸ä¸æã\n" -" -b (--ignore-space-change):\n" -" 忽ç¥ç©ºç½æ°éçä¿®æ¹ã\n" -" -w (--ignore-all-space):\n" -" 忽ç¥ææç空ç½ã\n" -" --ignore-eol-style:\n" -" 忽ç¥è¡å°¾æ ·å¼çæ¹åã\n" -" -p (--show-c-function):\n" -" å¨æ¯è¾è¾åºä¸æ¾ç¤º C å½æ°å称ã" +"为å¤é¨å¼ç¨å·®å¼æ¯è¾æå é¨å·®å¼æ¯è¾æ追溯\n" +" æå®é项ãé»è®¤: '-u'ãé项ç¨ç©ºæ ¼åéã\n" +" å é¨å·®å¼æ¯è¾å追溯æ¥å:\n" +" -u, --unified: æ¾ç¤º3è¡ç»ä¸ä¸ä¸æ\n" +" -b, --ignore-space-change: 忽ç¥ç©ºç½éåå\n" +" -w, --ignore-all-space: 忽ç¥ææ空ç½\n" +" --ignore-eol-style: 忽ç¥è¡å°¾é£æ ¼åå\n" +" -U ARG, --context ARG: æ¾ç¤º ARG è¡ä¸ä¸æ\n" +" -p, --show-c-function: æ¾ç¤º C å½æ°å" -#: ../svn/svn.c:230 +#: ../svn/svn.c:144 ../svnbench/svnbench.c:119 +msgid "pass contents of file ARG as additional args" +msgstr "ä¼ éæ件 ARG å 容为é件åæ°" + +#: ../svn/svn.c:146 ../svnbench/svnbench.c:121 +msgid "" +"limit operation by depth ARG ('empty', 'files',\n" +" 'immediates', or 'infinity')" +msgstr "" +"éå¶æä½æ·±åº¦æ¯ ARG ('empty', 'files',\n" +" 'immediates', æ 'infinity')" + +#: ../svn/svn.c:150 msgid "" "set new working copy depth to ARG ('exclude',\n" " 'empty', 'files', 'immediates', or 'infinity')" @@ -11599,128 +14589,215 @@ msgstr "" "设置工ä½å¯æ¬çæ°æ·±åº¦ä¸º ARG('exclude',\n" " 'empty', 'files', 'immediates', æ 'infinity')" -#: ../svn/svn.c:233 ../svnlook/svnlook.c:175 +#: ../svn/svn.c:153 ../svnlook/svnlook.c:182 msgid "output in XML" msgstr "è¾åºä¸º XML" -#: ../svn/svn.c:238 -#, fuzzy +#: ../svn/svn.c:154 +msgid "DEPRECATED" +msgstr "å·²åºå¼" + +#: ../svn/svn.c:156 ../svnbench/svnbench.c:126 +msgid "do not cross copies while traversing history" +msgstr "æ¥çåå²ä¸è¦è·¨è¶ä¸åçå¯æ¬" + +#: ../svn/svn.c:158 msgid "" "disregard default and svn:ignore and\n" " svn:global-ignores property ignores" -msgstr "忽ç¥é»è®¤å¼å svn:ignore å±æ§" +msgstr "" +"忽ç¥é»è®¤çå svn:ignore 以å\n" +" svn:global-ignores å±æ§ç忽ç¥è§å" + +#: ../svn/svn.c:162 ../svnbench/svnbench.c:128 ../svnrdump/svnrdump.c:138 +#: ../svnsync/svnsync.c:203 +msgid "do not cache authentication tokens" +msgstr "ä¸è¦ç¼åç¨æ·è®¤è¯ä»¤ç" + +#: ../svn/svn.c:164 ../svnbench/svnbench.c:130 ../svnrdump/svnrdump.c:152 +msgid "" +"deprecated; same as\n" +" --trust-server-cert-failures=unknown-ca" +msgstr "" +"å·²åºå¼ï¼å\n" +" --trust-server-cert-failures=unknown-ca" -#: ../svn/svn.c:268 ../svnrdump/svnrdump.c:145 ../svnsync/svnsync.c:189 +#: ../svn/svn.c:168 ../svnbench/svnbench.c:134 ../svnrdump/svnrdump.c:156 +msgid "" +"with --non-interactive, accept SSL server\n" +" certificates with failures; ARG is comma-separated\n" +" list of 'unknown-ca' (Unknown Authority),\n" +" 'cn-mismatch' (Hostname mismatch), 'expired'\n" +" (Expired certificate), 'not-yet-valid' (Not yet\n" +" valid certificate) and 'other' (all other not\n" +" separately classified certificate errors)." +msgstr "" +"å¨ --non-interactive 模å¼ä¸ï¼æ¥åæ失败ç\n" +" SSL æå¡å¨è¯ä¹¦ï¼ARG æ¯éå·åéçå表ï¼\n" +" åå¼ä¸º 'unknown-ca' (æªç¥çé¢åæºæ)ã\n" +" 'cn-mismatch' (主æºåä¸å¹é )ã'expired'\n" +" (è¯ä¹¦å·²è¿æ)ã'not-yet-valid' (è¯ä¹¦å°æª\n" +" çæ) å 'other' (å ¶ä»æªåç¬åç±»çè¯ä¹¦\n" +" é误)ã" + +#: ../svn/svn.c:182 ../svnrdump/svnrdump.c:130 ../svnsync/svnsync.c:195 msgid "" "do no interactive prompting (default is to prompt\n" " only if standard input is a terminal device)" msgstr "" +"ä¸è¿è¡äº¤äºå¼æ示(é»è®¤ä» å¨æ åè¾å ¥\n" +" æ¯ç»ç«¯è®¾å¤æ¶ææ示)" -#: ../svn/svn.c:272 ../svnrdump/svnrdump.c:149 ../svnsync/svnsync.c:193 -#, fuzzy +#: ../svn/svn.c:186 ../svnrdump/svnrdump.c:134 ../svnsync/svnsync.c:199 msgid "" "do interactive prompting even if standard input\n" " is not a terminal device" -msgstr "å¦æçæ¬åºè¢«å ¶ä»è¿ç¨å ç¨ï¼çå¾ èä¸ç´æ¥éåº" +msgstr "" +"å³ä½¿æ åè¾å ¥ä¸æ¯ç»ç«¯è®¾å¤\n" +" ä¹è¿è¡äº¤äºå¼æ示" -#: ../svn/svn.c:276 +#: ../svn/svn.c:190 msgid "try operation but make no changes" msgstr "å°è¯æä½ä½æ²¡æä¿®æ¹" -#: ../svn/svn.c:278 +#: ../svn/svn.c:192 msgid "disable merge tracking; diff nodes as if related" -msgstr "" +msgstr "ç¦ç¨å并è·è¸ªï¼å°èç¹ä½ä¸ºç¸å ³èç¹è¿è¡å·®å¼æ¯è¾" -#: ../svn/svn.c:280 +#: ../svn/svn.c:194 msgid "ignore externals definitions" -msgstr "忽ç¥å¤é¨é¡¹ç®" +msgstr "忽ç¥å¤é¨å¼ç¨é¡¹ç®" -#: ../svn/svn.c:281 +#: ../svn/svn.c:195 msgid "use ARG as merge command" msgstr "ä½¿ç¨ ARG ä½ä¸ºå并å½ä»¤" -#: ../svn/svn.c:282 +#: ../svn/svn.c:196 msgid "use ARG as external editor" msgstr "ä½¿ç¨ ARG ä½ä¸ºå¤é¨ç¼è¾å¨" -#: ../svn/svn.c:284 +#: ../svn/svn.c:198 msgid "merge only mergeinfo differences" msgstr "åªå并å并信æ¯çå·®å¼" -#: ../svn/svn.c:285 +#: ../svn/svn.c:199 msgid "use ARG as the older target" msgstr "ä½¿ç¨ ARG ä½ä¸ºæ§ç®æ " -#: ../svn/svn.c:286 +#: ../svn/svn.c:200 msgid "use ARG as the newer target" msgstr "ä½¿ç¨ ARG ä½ä¸ºæ°ç®æ " -#: ../svn/svn.c:288 +#: ../svn/svn.c:202 msgid "operate on a revision property (use with -r)" msgstr "å¨çæ¬å±æ§ä¸æä½(使ç¨-råæ°)" -#: ../svn/svn.c:289 +#: ../svn/svn.c:203 msgid "relocate via URL-rewriting" msgstr "éè¿URLæ¹åéæ°å®ä½" -#: ../svn/svn.c:300 +#: ../svn/svn.c:205 ../svnadmin/svnadmin.c:225 ../svnbench/svnbench.c:150 +#: ../svnrdump/svnrdump.c:122 ../svnsync/svnsync.c:253 +msgid "read user configuration files from directory ARG" +msgstr "ä»ç®å½ ARG 读åç¨æ·é ç½®æ件" + +#: ../svn/svn.c:207 ../svnbench/svnbench.c:152 ../svnrdump/svnrdump.c:144 +#: ../svnsync/svnsync.c:255 +msgid "" +"set user configuration option in the format:\n" +" FILE:SECTION:OPTION=[VALUE]\n" +" For example:\n" +" servers:global:http-library=serf" +msgstr "" +"以ä¸å±æ ¼å¼è®¾ç½®ç¨æ·é ç½®é项:\n" +" FILE:SECTION:OPTION=[VALUE]\n" +" ä¾å¦:\n" +" servers:global:http-library=serf" + +#: ../svn/svn.c:214 msgid "enable automatic properties" msgstr "å¯ç¨èªå¨å±æ§" -#: ../svn/svn.c:301 +#: ../svn/svn.c:215 msgid "disable automatic properties" msgstr "å ³éèªå¨å±æ§" -#: ../svn/svn.c:303 +#: ../svn/svn.c:217 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" +" ä¸ç³»ç»æ åæ è®°ä¸åç EOL æ è®°ã\n" +" ARG å¯ä»¥æ¯ 'LF'ã'CR'ã'CRLF' ä¹ä¸" -#: ../svn/svn.c:311 +#: ../svn/svn.c:224 ../svnbench/svnbench.c:159 +msgid "maximum number of log entries" +msgstr "æ¥å¼é¡¹æ大å¼" + +#: ../svn/svn.c:225 msgid "don't unlock the targets" msgstr "ä¸è¦è§£éç®æ " -#: ../svn/svn.c:312 +#: ../svn/svn.c:226 msgid "remove changelist association" msgstr "å é¤ä¿®æ¹å表è¦å" -#: ../svn/svn.c:314 +#: ../svn/svn.c:228 msgid "operate only on members of changelist ARG" msgstr "åªè½å¯¹ä¿®æ¹å表 ARG çæåæä½" -#: ../svn/svn.c:316 +#: ../svn/svn.c:230 msgid "don't delete changelists after commit" msgstr "ä¸è¦å¨æ交åå é¤ä¿®æ¹å表" -#: ../svn/svn.c:317 +#: ../svn/svn.c:231 msgid "keep path in working copy" msgstr "å¨å·¥ä½å¯æ¬ä¸ä¿çè·¯å¾" -#: ../svn/svn.c:326 +#: ../svn/svn.c:233 ../svnbench/svnbench.c:161 +msgid "retrieve all revision properties" +msgstr "è·åææçæ¬å±æ§" + +#: ../svn/svn.c:235 ../svnbench/svnbench.c:163 +msgid "retrieve no revision properties" +msgstr "没ææ¾åçæ¬å±æ§" + +#: ../svn/svn.c:237 ../svnbench/svnbench.c:165 +msgid "" +"set revision property ARG in new revision\n" +" using the name[=value] format" +msgstr "" +"å¨æ°çæ¬ä¸è®¾ç½®çæ¬å±æ§ ARG\n" +" ä½¿ç¨ name[=value] æ ¼å¼" + +#: ../svn/svn.c:240 msgid "make intermediate directories" msgstr "å建ä¸é´ç®å½" -#: ../svn/svn.c:332 +#: ../svn/svn.c:242 ../svnbench/svnbench.c:169 +msgid "" +"use/display additional information from merge\n" +" history" +msgstr "ä»å并åå²ä½¿ç¨/æ¾ç¤ºé¢å¤ä¿¡æ¯" + +#: ../svn/svn.c:246 msgid "" "specify automatic conflict resolution action\n" " ('postpone', 'working', 'base', 'mine-conflict',\n" " 'theirs-conflict', 'mine-full', 'theirs-full',\n" -" 'edit', 'launch')\n" -" (shorthand: 'p', 'mc', 'tc', 'mf', 'tf', 'e', 'l')" +" 'edit', 'launch', 'recommended') (shorthand:\n" +" 'p', 'mc', 'tc', 'mf', 'tf', 'e', 'l', 'r')" msgstr "" -"æå®èªå¨è§£å³å²çªå¨ä½\n" -" ('postpone', 'working', 'base', 'mine-conflict',\n" -" 'theirs-conflict', 'mine-full', 'theirs-full',\n" -" 'edit', 'launch')\n" -" (shorthand: 'p', 'mc', 'tc', 'mf', 'tf', 'e', 'l')" +"æå®èªå¨å²çªè§£å³å¨ä½\n" +" ('postpone'ã'working'ã'base'ã'mine-conflict'ã\n" +" 'theirs-conflict'ã'mine-full'ã'theirs-full'ã\n" +" 'edit'ã'launch'ã'recommended') (ç®å:\n" +" 'p'ã'mc'ã'tc'ã'mf'ã'tf'ã'e'ã'l'ã'r')" -#: ../svn/svn.c:343 +#: ../svn/svn.c:257 msgid "" "specify which collection of revisions to display\n" " ('merged', 'eligible')" @@ -11728,11 +14805,11 @@ msgstr "" "æå®æ¾ç¤ºåªä¸ªçæ¬éå\n" " ('merged', 'eligible')" -#: ../svn/svn.c:347 +#: ../svn/svn.c:261 msgid "deprecated" -msgstr "" +msgstr "å·²åºå¼" -#: ../svn/svn.c:349 +#: ../svn/svn.c:263 msgid "" "number of leading path components to strip from\n" " paths parsed from the patch file. --strip 0\n" @@ -11750,146 +14827,291 @@ msgstr "" " 'crunchy.html' ãå¨ææå¹³å°ä¸ææçç»ä»¶åé符\n" " é½æ¯ '/'ãå导 '/' 被计ç®ä¸ºä¸ä¸ªç»ä»¶ã" -#: ../svn/svn.c:365 +#: ../svn/svn.c:279 msgid "don't expand keywords" msgstr "ä¸è¦å±å¼å ³é®å" -#: ../svn/svn.c:367 +#: ../svn/svn.c:281 msgid "apply the unidiff in reverse" msgstr "åååºç¨è¡¥ä¸" -#: ../svn/svn.c:369 +#: ../svn/svn.c:283 msgid "ignore whitespace during pattern matching" msgstr "å¨æ¨¡å¼å¹é æ¶ï¼å¿½ç¥ç©ºç½" -#: ../svn/svn.c:370 +#: ../svn/svn.c:284 msgid "produce diff output" msgstr "产çå·®å¼è¾åº" #. maps to show_diff #. diff options -#: ../svn/svn.c:372 ../svnlook/svnlook.c:139 +#: ../svn/svn.c:286 ../svnlook/svnlook.c:139 msgid "use ARG as diff command" msgstr "ä½¿ç¨ ARG ä½ä¸ºæ¯è¾å½ä»¤" -#: ../svn/svn.c:374 +#: ../svn/svn.c:288 msgid "override diff-cmd specified in config file" msgstr "è¦çé ç½®æ件ä¸æå®ç diff-cmd" -#: ../svn/svn.c:376 ../svnlook/svnlook.c:133 +#: ../svn/svn.c:290 ../svnlook/svnlook.c:133 msgid "do not print differences for added files" msgstr "ä¸è¦è¾åºå¢å æ件é æçå·®å¼" -#: ../svn/svn.c:378 ../svnlook/svnlook.c:136 +#: ../svn/svn.c:292 ../svnlook/svnlook.c:136 msgid "do not print differences for deleted files" msgstr "ä¸è¦è¾åºå é¤æ件é æçå·®å¼" -#: ../svn/svn.c:380 +#: ../svn/svn.c:294 msgid "don't diff copied or moved files with their source" msgstr "请ä¸è¦å°å¤å¶æ移å¨çæ件ä¸å ¶æºæ件æ¯è¾" -#: ../svn/svn.c:382 +#: ../svn/svn.c:296 msgid "diff unrelated nodes as delete and add" -msgstr "" +msgstr "å°ä¸ç¸å ³çèç¹ä½ä¸ºå é¤åæ·»å è¿è¡å·®å¼æ¯è¾" -#: ../svn/svn.c:383 +#: ../svn/svn.c:297 msgid "show a summary of the results" msgstr "æ¾ç¤ºç»æçæ¦è¦" -#: ../svn/svn.c:385 +#: ../svn/svn.c:299 msgid "use git's extended diff format" msgstr "ä½¿ç¨ git çæ©å±å·®å¼æ ¼å¼" -#: ../svn/svn.c:387 ../svnlook/svnlook.c:142 +#: ../svn/svn.c:301 ../svnlook/svnlook.c:142 msgid "ignore properties during the operation" msgstr "æä½æ¶å¿½ç¥å±æ§" -#: ../svn/svn.c:389 ../svnlook/svnlook.c:145 -#, fuzzy +#: ../svn/svn.c:303 ../svnlook/svnlook.c:145 msgid "show only properties during the operation" -msgstr "æä½æ¶å¿½ç¥å±æ§" +msgstr "æä½æé´ä» æ¾ç¤ºå±æ§" -#: ../svn/svn.c:391 -#, fuzzy +#: ../svn/svn.c:305 msgid "" "generate diff suitable for generic third-party\n" " patch tools; currently the same as\n" " --show-copies-as-adds --ignore-properties" msgstr "" -"çæéç¨äºç¬¬ä¸æ¹å·¥å ·çå·®å¼æ ¼å¼ï¼å½åçä»·äº\n" -" --show-copies-as-adds --ignore-properties\n" +"çæéåéç¨ç¬¬ä¸æ¹è¡¥ä¸å·¥å ·çå·®å¼ï¼\n" +" ç®åçåäº\n" +" --show-copies-as-adds --ignore-properties" -#: ../svn/svn.c:399 -#, fuzzy +#: ../svn/svn.c:313 msgid "" "Allow operation on mixed-revision working copy.\n" " Use of this option is not recommended!\n" " Please run 'svn update' instead." msgstr "" -"å 许å并å°å«ææ··åçæ¬çå·¥ä½å¯æ¬.\n" -" ä¸å»ºè®®ä½¿ç¨æ¤é项!\n" -" 请å æ§è¡ 'svn update' ã" +"å 许对混åçæ¬å·¥ä½å¯æ¬è¿è¡æä½ã\n" +" ä¸æ¨è使ç¨æ¤é项ï¼\n" +" 请æ¹ç¨ 'svn update'ã" -#: ../svn/svn.c:405 -#, fuzzy +#: ../svn/svn.c:319 msgid "" "also operate on externals defined by\n" " svn:externals properties" -msgstr "å¦æçæ¬åºè¢«å ¶ä»è¿ç¨å ç¨ï¼çå¾ èä¸ç´æ¥éåº" +msgstr "" +"åæ¶å¯¹ç± svn:externals å±æ§\n" +" å®ä¹çå¤é¨å¼ç¨è¿è¡æä½" -#: ../svn/svn.c:409 -#, fuzzy -msgid "retrieve target's inherited properties" -msgstr "è·åææçæ¬å±æ§" +#: ../svn/svn.c:323 +msgid "retrieve properties set on parents of the target" +msgstr "è·å设置å¨ç®æ ç¶çº§ä¸çå±æ§" -#: ../svn/svn.c:411 -msgid "use ARG as search pattern (glob syntax)" +#: ../svn/svn.c:325 +msgid "" +"use ARG as search pattern (glob syntax, case-\n" +" and accent-insensitive, may require quotation marks\n" +" to prevent shell expansion)" msgstr "" +"ä½¿ç¨ ARG ä½ä¸ºæ索模å¼(glob è¯æ³ï¼ä¸åºå大å°å\n" +" åéé³ï¼å¯è½éè¦å å¼å·ä»¥é² shell å±å¼)" -#: ../svn/svn.c:413 +#: ../svn/svn.c:331 msgid "combine ARG with the previous search pattern" -msgstr "" +msgstr "å° ARG ä¸åä¸ä¸ªæ索模å¼ç»å" -#: ../svn/svn.c:415 +#: ../svn/svn.c:333 msgid "show revision log message, author and date" -msgstr "" +msgstr "æ¾ç¤ºçæ¬æ¥å¿æ¶æ¯ãä½è åæ¥æ" -#: ../svn/svn.c:417 -#, fuzzy +#: ../svn/svn.c:335 msgid "remove unversioned items" -msgstr "ä¸æå°æªçæ¬æ§å¶çæ¡ç®" +msgstr "移é¤æªçæ¬æ§å¶ç项" -#: ../svn/svn.c:418 +#: ../svn/svn.c:336 msgid "remove ignored items" -msgstr "" +msgstr "移é¤å¿½ç¥ç项" + +#: ../svn/svn.c:338 +msgid "reverting an added item will remove it from disk" +msgstr "æ¢å¤å·²æ·»å ç项å°ä»ç£çä¸å é¤å®" -#: ../svn/svn.c:419 ../svnlook/svnlook.c:148 ../svnversion/svnversion.c:140 +#: ../svn/svn.c:339 ../svnlook/svnlook.c:155 ../svnversion/svnversion.c:143 msgid "do not output the trailing newline" msgstr "ä¸è¾åºå ¶åçæ¢è¡ç¬¦" -#: ../svn/svn.c:420 +#: ../svn/svn.c:340 msgid "show cached passwords" +msgstr "æ¾ç¤ºç¼åçå¯ç " + +#: ../svn/svn.c:342 +msgid "" +"pin externals with no explicit revision to their\n" +" current revision (recommended when tagging)" +msgstr "" +"å°æ²¡ææç¡®çæ¬çå¤é¨å¼ç¨åºå®å°\n" +" å ¶å½åçæ¬(å¨æ è®°æ¶æ¨è)" + +#: ../svn/svn.c:346 +msgid "print only the item identified by ARG" +msgstr "ä» æå°ç± ARG æ è¯ç项" + +#: ../svn/svn.c:349 +msgid "" +"Local additions are merged with incoming additions\n" +" instead of causing a tree conflict. Use of this\n" +" option is not recommended! Use 'svn resolve' to\n" +" resolve tree conflicts instead." +msgstr "" +"æ¬å°æ·»å ä¸ä¼ å ¥çæ·»å å并ï¼èä¸æ¯å¼åæ å²çªã\n" +" ä¸æ¨è使ç¨æ¤é项ï¼è¯·æ¹ç¨ 'svn resolve'\n" +" 解å³æ å²çªã" + +#: ../svn/svn.c:358 +msgid "remove unreferenced pristines from .svn directory" +msgstr "ä» .svn ç®å½ä¸ç§»é¤æªå¼ç¨çåå§å 容" + +#: ../svn/svn.c:361 +msgid "drop shelf after successful unshelve" +msgstr "æååæ¶æç½®åå é¤æç½®" + +#: ../svn/svn.c:364 +msgid "" +"print the working copy layout, formatted according\n" +" to ARG: 'classic' or 'svn11'" +msgstr "" +"æå°å·¥ä½å¯æ¬å¸å±ï¼æç § ARG æ ¼å¼å:\n" +" 'classic' æ 'svn11'" + +#: ../svn/svn.c:369 +msgid "" +"use working copy format compatible with Subversion\n" +" version ARG (\"1.8\", \"1.9.5\", etc.)" +msgstr "" +"使ç¨ä¸ Subversion çæ¬ ARG å ¼å®¹ç\n" +" å·¥ä½å¯æ¬æ ¼å¼(\"1.8\"ã\"1.9.5\" ç)" + +#: ../svn/svn.c:374 +msgid "" +"Configure the working copy to either store local\n" +" copies of pristine contents ('yes') or to fetch\n" +" them on demand ('no'). Fetching on demand saves\n" +" disk space, but may require network access for\n" +" commands such as diff or revert. Default: 'yes'." +msgstr "" +"é 置工ä½å¯æ¬åå¨åå§å 容çæ¬å°å¯æ¬('yes')ï¼\n" +" è¿æ¯æéè·å('no')ãæéè·åèçç£ç\n" +" 空é´ï¼ä½ diffãrevert çå½ä»¤å¯è½éè¦\n" +" 访é®ç½ç»ãé»è®¤: 'yes'ã" + +#: ../svn/svn.c:425 +msgid "" +"Put new files and directories under version control.\n" +"usage: add PATH[@]...\n" +"\n" +msgstr "" +"å°æ°æ件åç®å½å å ¥çæ¬æ§å¶ã\n" +"ç¨æ³: add PATH[@]...\n" +"\n" + +#: ../svn/svn.c:428 +msgid "" +" Schedule unversioned PATHs for addition, so they will become versioned and\n" +" be added to the repository in the next commit. Recurse into directories by\n" +" default (see the --depth option).\n" +"\n" +msgstr "" +" å°æªçæ¬æ§å¶ç PATH è°åº¦ä¸ºæ·»å ï¼è¿æ ·å®ä»¬ä¼åæå·²çæ¬æ§å¶ï¼\n" +" 并å¨ä¸æ¬¡æ交æ¶æ·»å å°çæ¬åºãé»è®¤éå½è¿å ¥ç®å½\n" +" (åè§ --depth é项)ã\n" +"\n" + +#: ../svn/svn.c:432 +msgid "" +" The 'svn add' command is only necessary for files and directories that are\n" +" not yet under version control. Unversioned files and directories can be\n" +" identified with 'svn status' (see 'svn help status').\n" +"\n" +msgstr "" +" åªæå°æªçº³å ¥çæ¬æ§å¶çæ件åç®å½æéè¦ç¨ 'svn add' å½ä»¤ã\n" +" æªçæ¬æ§å¶çæ件åç®å½å¯ä»¥ç¨ 'svn status' æ¾åº\n" +" (åè§ 'svn help status')ã\n" +"\n" + +#: ../svn/svn.c:436 +msgid "" +" The effects of 'svn add' can be undone with 'svn revert' before the addition\n" +" has been committed. Once committed, a path can be removed from version\n" +" control with 'svn delete', and in some circumstances by running a reverse-\n" +" merge (see 'svn help merge' for details).\n" +"\n" msgstr "" +" å¨æ·»å æ交ä¹åï¼'svn add' çææå¯ä»¥ç¨ 'svn revert' æ¤éã\n" +" ä¸æ¦æ交ï¼å¯ä»¥ç¨ 'svn delete' æè·¯å¾ä»çæ¬æ§å¶ä¸ç§»é¤ï¼æäº\n" +" æ åµä¸ä¹å¯ä»¥åååå并(è¯¦è§ 'svn help merge')ã\n" +"\n" -#: ../svn/svn.c:471 +#: ../svn/svn.c:441 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" +" With --force, add all the unversioned paths found in PATHs and ignore the\n" +" rest; otherwise, error out if any specified paths are already versioned.\n" +"\n" msgstr "" -"ææ件åç®å½çº³å ¥çæ¬æ§å¶ï¼éè¿è°åº¦å å°çæ¬åºãå®ä»¬ä¼å¨ä¸ä¸æ¬¡æ交æ¶å å ¥ã\n" -"ç¨æ³: add è·¯å¾...\n" +" ä½¿ç¨ --force æ¶ï¼æ·»å PATH ä¸æææªçæ¬æ§å¶çè·¯å¾å¹¶å¿½ç¥\n" +" å ¶ä½ï¼å¦åï¼å¦ææå®çè·¯å¾ä¸ææªçæ¬æ§å¶çåæ¥éã\n" -#: ../svn/svn.c:476 +#: ../svn/svn.c:444 +msgid "" +" The selection of items to add may be influenced by the 'ignores' feature.\n" +" Properties may be attached to the items as configured by the 'auto-props'\n" +" feature.\n" +msgstr "" +" è¦æ·»å åªäºé¡¹å¯è½å 'ignores' åè½å½±åã\n" +" å±æ§ä¼æ 'auto-props' åè½çé ç½®éå å°è¿äºé¡¹ä¸ã\n" + +#: ../svn/svn.c:447 ../svn/svn.c:523 ../svn/svn.c:546 ../svn/svn.c:613 +msgid "" +" If PATH contains an @ character, an additional @ must be specified at the\n" +" end of PATH to avoid interpreting the first @ as a peg revision indicator.\n" +msgstr "" +" å¦æ PATH å å« @ å符ï¼å¿ é¡»å¨ PATH æ«å°¾é¢å¤æå® @\n" +" 以é¿å å°ç¬¬ä¸ä¸ª @ åçé¨å解é为éå®çæ¬ã\n" + +#: ../svn/svn.c:452 msgid "add intermediate parents" msgstr "å¢å ä¸é´ç¶ç®å½" -#: ../svn/svn.c:479 +#: ../svn/svn.c:453 ../svn/svn.c:618 +msgid "obsolete; same as --depth=empty" +msgstr "å·²åºå¼ï¼å --depth=empty" + +#: ../svn/svn.c:454 +msgid "ignore already versioned paths" +msgstr "忽ç¥å·²çæ¬æ§å¶çè·¯å¾" + +#: ../svn/svn.c:457 msgid "" "Manage cached authentication credentials.\n" "usage: 1. svn auth [PATTERN ...]\n" -"usage: 2. svn auth --remove PATTERN [PATTERN ...]\n" +" 2. svn auth --remove PATTERN [PATTERN ...]\n" "\n" +msgstr "" +"管çç¼åç认è¯åæ®ã\n" +"ç¨æ³: 1. svn auth [PATTERN ...]\n" +" 2. svn auth --remove PATTERN [PATTERN\n" + +#: ../svn/svn.c:461 +msgid "" " With no arguments, list all cached authentication credentials.\n" " Authentication credentials include usernames, passwords,\n" " SSL certificates, and SSL client-certificate passphrases.\n" @@ -11897,7 +15119,16 @@ msgid "" " or more patterns. With the --remove option, remove cached authentication\n" " credentials matching one or more patterns.\n" "\n" -" If more than one pattern is specified credentials are considered only they\n" +msgstr "" +" ä¸å¸¦åæ°æ¶ï¼ååºææç¼åç认è¯åæ®ã\n" +" 认è¯åæ®å æ¬ç¨æ·åãå¯ç ãSSL è¯ä¹¦å SSL 客æ·ç«¯è¯ä¹¦å¯ç ã\n" +" å¦ææå®äº PATTERNï¼åªååºå±æ§å¹é ä¸ä¸ªæå¤ä¸ªæ¨¡å¼çåæ®ã\n" +" å --remove é项æ¶ï¼å é¤å¹é ä¸ä¸ªæå¤ä¸ªæ¨¡å¼çç¼å认è¯åæ®ã\n" +"\n" + +#: ../svn/svn.c:468 +msgid "" +" If more than one pattern is specified credentials are considered only if they\n" " match all specified patterns. Patterns are matched case-sensitively and may\n" " contain glob wildcards:\n" " ? matches any single character\n" @@ -11907,65 +15138,158 @@ msgid "" " command line because many command shells will interfere by trying to\n" " expand them.\n" msgstr "" +" å¦ææå®äºå¤ä¸ªæ¨¡å¼ï¼ä» å½åæ®å¹é æææå®æ¨¡å¼æ¶æä¼è¢«èèã\n" +" 模å¼åºå大å°åï¼å¯å å« glob éé 符:\n" +" ? å¹é ä»»æå个å符\n" +" * å¹é ä»»æå符åºå\n" +" [abc] å¹é æ¹æ¬å·å ååºçä»»æå符\n" +" 注æéé 符é常éè¦å¨å½ä»¤è¡ä¸å å¼å·æ转ä¹ï¼å 为许å¤å½ä»¤ shell\n" +" ä¼å°è¯å±å¼å®ä»¬èé æå¹²æ°ã\n" -#: ../svn/svn.c:500 -#, fuzzy +#: ../svn/svn.c:479 msgid "remove matching authentication credentials" -msgstr "ä¸è¦ç¼åç¨æ·è®¤è¯ä»¤ç" +msgstr "移é¤å¹é ç认è¯åæ®" -#: ../svn/svn.c:505 +#: ../svn/svn.c:484 msgid "" -"Output the content of specified files or\n" -"URLs with revision and author information in-line.\n" -"usage: blame TARGET[@REV]...\n" +"Show when each line of a file was last (or\n" +"next) changed.\n" +"usage: blame [-rM:N] TARGET[@REV]...\n" "\n" +msgstr "" +"æ¾ç¤ºæ件æ¯è¡æå(æä¸ä¸æ¬¡)ä¿®æ¹çæ¶é´ã\n" +"ç¨æ³: blame [-rM:N] TARGET[@REV]...\n" +"\n" + +#: ../svn/svn.c:488 +msgid "" +" Annotate each line of a file with the revision number and author of the\n" +" last change (or optionally the next change) to that line.\n" +"\n" +msgstr "" +" ç¨æåä¿®æ¹(æå¯éçä¸æ¬¡ä¿®æ¹)ççæ¬å·åä½è \n" +" 注éæ件çæ¯ä¸è¡ã\n" + +#: ../svn/svn.c:491 ../svnbench/svnbench.c:222 +msgid "" +" With no revision range (same as -r0:REV), or with '-r M:N' where M < N,\n" +" annotate each line that is present in revision N of the file, with\n" +" the last revision at or before rN that changed or added the line,\n" +" looking back no further than rM.\n" +"\n" +msgstr "" +" ä¸å¸¦çæ¬èå´(å -r0:REV)ï¼æä½¿ç¨ '-r M:N' ä¸ M < N æ¶ï¼\n" +" 为æ件çæ¬ N ä¸åå¨çæ¯ä¸è¡æ 注 rN åä¹åæåä¸æ¬¡ä¿®æ¹æ\n" +" æ·»å 该è¡ççæ¬ï¼å溯ä¸è¶ è¿ rMã\n" +"\n" + +#: ../svn/svn.c:496 ../svnbench/svnbench.c:227 +msgid "" +" With a reverse revision range '-r M:N' where M > N,\n" +" annotate each line that is present in revision N of the file, with\n" +" the next revision after rN that changed or deleted the line,\n" +" looking forward no further than rM.\n" +"\n" +msgstr "" +" 使ç¨ååçæ¬èå´ '-r M:N' ä¸ M > N æ¶ï¼ä¸ºæ件çæ¬ N ä¸åå¨\n" +" çæ¯ä¸è¡æ 注 rN ä¹åä¸ä¸æ¬¡ä¿®æ¹æå é¤è¯¥è¡ççæ¬ï¼ååæ¥æ¾\n" +" ä¸è¶ è¿ rMã\n" +"\n" + +#: ../svn/svn.c:501 ../svnbench/svnbench.c:232 +msgid "" " If specified, REV determines in which revision the target is first\n" " looked up.\n" -msgstr "" -"è¾åºæå®æ件æURLç追溯å 容ï¼å å«çæ¬åä½è ä¿¡æ¯ã\n" "\n" -"ç¨æ³: blame ç®æ [@çæ¬]...\n" +msgstr "" +" å¦ææå®äº REVï¼ç¡®å®é¦å å¨åªä¸ªçæ¬ä¸\n" +" æ¥æ¾ç®æ ã\n" "\n" -" å¦ææå®äºçæ¬ï¼å°ä»æå®ççæ¬å¼å§æ¥æ¾ã\n" -" \n" -#: ../svn/svn.c:514 +#: ../svn/svn.c:504 ../svnbench/svnbench.c:235 +msgid " Write the annotated result to standard output.\n" +msgstr " å°æ³¨éç»æåå ¥æ åè¾åºã\n" + +#: ../svn/svn.c:509 msgid "" "Output the content of specified files or URLs.\n" "usage: cat TARGET[@REV]...\n" "\n" +msgstr "" +"è¾åºæå®æ件æ URL çå 容ã\n" +"ç¨æ³: cat TARGET[@REV]...\n" +"\n" + +#: ../svn/svn.c:512 +msgid "" " If specified, REV determines in which revision the target is first\n" " looked up.\n" msgstr "" -"è¾åºæå®æ件æURLçå 容ã\n" -"ç¨æ³: cat ç®æ [@çæ¬]...\n" -"\n" -" å¦ææå®äºçæ¬ï¼å°ä»æå®ççæ¬å¼å§æ¥æ¾ã\n" -" \n" +" å¦ææå®äº REVï¼ç¡®å®é¦å å¨åªä¸ªçæ¬ä¸\n" +" æ¥æ¾ç®æ ã\n" -#: ../svn/svn.c:522 +#: ../svn/svn.c:518 msgid "" -"Associate (or dissociate) changelist CLNAME with the named files.\n" -"usage: 1. changelist CLNAME PATH...\n" -" 2. changelist --remove PATH...\n" +"Associate (or dissociate) changelist CLNAME with the named\n" +"files.\n" +"usage: 1. changelist CLNAME PATH[@]...\n" +" 2. changelist --remove PATH[@]...\n" msgstr "" -"è¦å(æ解è¦)å½åæ件ä¸ä¿®æ¹å表 CLNAMEã\n" -"使ç¨: 1. changelist CLNAME PATH...\n" -" 2. changelist --remove PATH...\n" +"å°åæ´å表 CLNAME ä¸æå®æä»¶å ³è(æåæ¶å ³è)ã\n" +"ç¨æ³: 1. changelist CLNAME PATH[@]...\n" +" 2. ch\n" -#: ../svn/svn.c:528 +#: ../svn/svn.c:529 msgid "" "Check out a working copy from a repository.\n" "usage: checkout URL[@REV]... [PATH]\n" "\n" +msgstr "" +"ä»çæ¬åºæ£åºå·¥ä½å¯æ¬ã\n" +"ç¨æ³: checkout URL[@REV]... [PATH]\n" +"\n" + +#: ../svn/svn.c:532 +msgid "" +" The new working copy (WC) will be compatible with Subversion 1.8 and\n" +" newer (this default may change in the future). To create a different\n" +" WC format, use an option such as '--compatible-version=1.15'.\n" +" The versions available are the same as in the 'upgrade' command.\n" +" Use 'svn --version' to see the compatible versions supported.\n" +"\n" +msgstr "" +" æ°å·¥ä½å¯æ¬ (WC) å°å ¼å®¹ Subversion 1.8 åæ´æ°çæ¬(æ¤é»è®¤å¼\n" +" å°æ¥å¯è½æ´æ¹)ãè¦åå»ºå ¶ä»æ ¼å¼çå·¥ä½å¯æ¬ï¼å¯ç¨\n" +" '--compatible-version=1.15' ä¹ç±»çé项ã\n" +" å¯ç¨ççæ¬ä¸ 'upgrade' å½ä»¤ç¸åã\n" +" ç¨ 'svn --version' æ¥çæ¯æçå ¼å®¹çæ¬ã\n" +"\n" + +#: ../svn/svn.c:538 +msgid "" " If specified, REV determines in which revision the URL is first\n" " looked up.\n" "\n" +msgstr "" +" å¦ææå®äº REVï¼ç¡®å®é¦å å¨åªä¸ªçæ¬ä¸\n" +" æ¥æ¾ URLã\n" +"\n" + +#: ../svn/svn.c:541 +msgid "" " If PATH is omitted, the basename of the URL will be used as\n" " the destination. If multiple URLs are given each will be checked\n" " out into a sub-directory of PATH, with the name of the sub-directory\n" " being the basename of the URL.\n" "\n" +msgstr "" +" å¦æçç¥ PATHï¼åç¨ URL çåºæ¬åä½ä¸ºç®æ ãå¦æç»åºå¤ä¸ª\n" +" URLï¼æ¯ä¸ªé½ä¼æ£åºå° PATH çä¸ä¸ªåç®å½ä¸ï¼åç®å½å为该\n" +" URL çåºæ¬åã\n" +"\n" + +#: ../svn/svn.c:548 +msgid "" " If --force is used, unversioned obstructing paths in the working\n" " copy destination do not automatically cause the check out to fail.\n" " If the obstructing path is the same type (file or directory) as the\n" @@ -11977,114 +15301,212 @@ msgid "" " to the working copy. All properties from the repository are applied\n" " to the obstructing path.\n" "\n" +msgstr "" +" å¦æ使ç¨äº --forceï¼å·¥ä½å¯æ¬ç®æ ä¸æªçæ¬æ§å¶çéç¢è·¯å¾\n" +" ä¸ä¼èªå¨å¯¼è´æ£åºå¤±è´¥ãå¦æéç¢è·¯å¾ä¸çæ¬åºä¸å¯¹åºè·¯å¾ç\n" +" ç±»å(æ件æç®å½)ç¸åï¼å®ä¼å为已çæ¬æ§å¶ä½å ¶å 容å¨å·¥ä½\n" +" å¯æ¬ä¸ä¿æåæ ·ãè¿æå³çéç¢ç®å½ä¸æªçæ¬æ§å¶çå项ä¹å¯è½\n" +" æ为éç¢å¹¶å为已çæ¬æ§å¶ã对äºæ件ï¼éç¢ä¸çæ¬åºä¹é´ç\n" +" ä»»ä½å 容差å¼é½è¢«è§ä¸ºå·¥ä½å¯æ¬çæ¬å°ä¿®æ¹ãçæ¬åºä¸çææ\n" +" å±æ§é½ä¼åºç¨å°éç¢è·¯å¾ã\n" +"\n" + +#: ../svn/svn.c:559 +msgid "" " See also 'svn help update' for a list of possible characters\n" " reporting the action taken.\n" msgstr "" -"ä»çæ¬åºç¾åºå·¥ä½å¯æ¬ã\n" -"使ç¨: checkout URL[@REV]... [PATH]\n" +" å¦è§ 'svn help update' äºè§£æ¥åææ§è¡æä½ç\n" +" å¯è½å符å表ã\n" + +#: ../svn/svn.c:564 ../svn/svn.c:706 ../svn/svn.c:733 ../svn/svn.c:757 +#: ../svn/svn.c:1339 ../svn/svn.c:1929 ../svn/svn.c:2001 +msgid "obsolete; same as --depth=files" +msgstr "å·²åºå¼ï¼å --depth=files" + +#: ../svn/svn.c:567 +msgid "" +"Either recover from an interrupted operation that left the working\n" +"copy locked, or remove unwanted files.\n" +"usage: 1. cleanup [WCPATH[@]...]\n" +" 2. cleanup --remove-unversioned [WCPATH[@]...]\n" +" cleanup --remove-ignored [WCPATH[@]...]\n" +" 3. cleanup --vacuum-pristines [WCPATH[@]...]\n" "\n" -" å¦ææå® REVï¼é£ä¹å®ç¡®å®äºä» URL é¦å æ¥æ¾ççæ¬ã\n" +msgstr "" +"ä»ä¸æçæä½(该æä½å¯¼è´å·¥ä½å¯æ¬è¢«éå®)ä¸æ¢å¤ï¼\n" +"æ移é¤ä¸éè¦çæ件ã\n" +"ç¨æ³: 1. cleanup [WCPATH[@]...]\n" +" 2. cleanup --remove-unversioned [WCPATH[@]...]\n" +" cleanup --remove-ignored [WCPATH[@]...]\n" +" 3. cleanup --vacuum-pristines [WCPATH[@]...]\n" "\n" -" å¦æçç¥è·¯å¾åæ°ï¼å URL ææ«å°¾çç®å½åä½ä¸ºç®æ ç®å½åãå¦ææå®å¤ä¸ª URLï¼\n" -" åä¾æ¬¡å°å ¶ç¾åºå° PATH çåç®å½ä¸ï¼åç®å½åå°±æ¯ URL ææ«å°¾çç®å½åã\n" + +#: ../svn/svn.c:574 +msgid "" +" 1. When none of the options --remove-unversioned, --remove-ignored, and\n" +" --vacuum-pristines is specified, remove all write locks (shown as 'L' by\n" +" the 'svn status' command) from the working copy. Usually, this is only\n" +" necessary if a Subversion client has crashed while using the working copy,\n" +" leaving it in an unusable state.\n" "\n" -" å¦æ使ç¨äº â--forceâ é项ï¼å¨å·¥ä½å¯æ¬ä¸æªçæ¬æ§å¶çéç¢è·¯å¾ï¼ä¸ä¼èªå¨å¯¼\n" -" è´ç¾åºå¤±è´¥ã å¦æéç¢è·¯å¾ä¸çæ¬åºä¸ç对åºè·¯å¾ç±»åç¸å(æ件æç®å½),å®å°æ\n" -" 为åçæ¬æ§å¶çè·¯å¾ï¼ä½æ¯å 容ä¸æ¹åãå®æå³çéç¢è·¯å¾çå©åï¼å¦æä¹æ¯éç¢è·¯\n" -" å¾ï¼é£ä¹ä¹ä¼åçæ¬æ§å¶ã对äºéç¢è·¯å¾ä¸çæ件ï¼å¦æä¸çæ¬åºå çä¸åï¼å°è§ä¸ºå·¥\n" -" ä½å¯æ¬åçæ¬å°ä¿®æ¹ãçæ¬åºä¸çææå±æ§é½åºç¨äºéç¢è·¯å¾ã\n" -"\n" -" åè§ âsvn help updateâ 以è·åæ¥åæ§è¡å¨ä½çå符å表ã\n" - -#: ../svn/svn.c:555 -msgid "" -"Recursively clean up the working copy, removing write locks, resuming\n" -"unfinished operations, etc.\n" -"usage: cleanup [WCPATH...]\n" -"\n" -" By default, finish any unfinished business in the working copy at WCPATH,\n" -" and remove write locks (shown as 'L' by the 'svn status' command) from\n" -" the working copy. Usually, this is only necessary if a Subversion client\n" -" has crashed while using the working copy, leaving it in an unusable state.\n" -"\n" -" WARNING: There is no mechanism that will protect write locks still\n" -" being used by other Subversion clients. Running this command\n" -" while another client is using the working copy can corrupt\n" -" the working copy beyond repair!\n" -"\n" -" If the --remove-unversioned option or the --remove-ignored option\n" -" is given, remove any unversioned or ignored items within WCPATH.\n" -" To prevent accidental working copy corruption, unversioned or ignored\n" -" items can only be removed if the working copy is not already locked\n" -" for writing by another Subversion client.\n" -" Note that the 'svn status' command shows unversioned items as '?',\n" -" and ignored items as 'I' if the --no-ignore option is given to it.\n" msgstr "" +" 1. å½æªæå® --remove-unversionedã--remove-ignored å\n" +" --vacuum-pristines é项æ¶ï¼ç§»é¤å·¥ä½å¯æ¬ä¸ææçåé\n" +" ('svn status' å½ä»¤æ¾ç¤ºä¸º 'L')ãé常åªæå¨ Subversion 客æ·ç«¯\n" +" 使ç¨å·¥ä½å¯æ¬æ¶å´©æºãä½¿å ¶å¤äºä¸å¯ç¨ç¶ææ¶æéè¦è¿æ ·åã\n" +"\n" #: ../svn/svn.c:580 -#, fuzzy +msgid "" +" WARNING: There is no mechanism that will protect write locks still\n" +" being used by other Subversion clients. Running this command\n" +" without any options while another client is using the working\n" +" copy can corrupt the working copy beyond repair!\n" +"\n" +msgstr "" +" è¦å: 没ææºå¶è½ä¿æ¤å ¶ä» Subversion 客æ·ç«¯ä»å¨ä½¿ç¨ç\n" +" åéãå½å¦ä¸ä¸ªå®¢æ·ç«¯æ£å¨ä½¿ç¨è¯¥å·¥ä½å¯æ¬æ¶ï¼ä¸å¸¦\n" +" ä»»ä½é项è¿è¡æ¤å½ä»¤ä¼ä½¿å·¥ä½å¯æ¬æåå°æ æ³ä¿®å¤ï¼\n" +"\n" + +#: ../svn/svn.c:585 +msgid "" +" 2. If the --remove-unversioned option or the --remove-ignored option\n" +" is given, remove any unversioned or ignored items within WCPATH.\n" +" Note that the 'svn status' command shows unversioned items as '?',\n" +" and ignored items as 'I' if the --no-ignore option is given to it.\n" +"\n" +msgstr "" +" 2. å¦æç»å® --remove-unversioned æ --remove-ignored é项ï¼\n" +" ç§»é¤ WCPATH ä¸ä»»ä½æªçæ¬æ§å¶æ被忽ç¥ç项ã注æ 'svn status'\n" +" å½ä»¤ææªçæ¬æ§å¶ç项æ¾ç¤ºä¸º '?'ï¼å¦æç»å®å ä¸ --no-ignore\n" +" é项ï¼åæ被忽ç¥ç项æ¾ç¤ºä¸º 'I'ã\n" +"\n" + +#: ../svn/svn.c:590 +msgid "" +" 3. If the --vacuum-pristines option is given, remove pristine copies of\n" +" files which are stored inside the .svn directory and which are no longer\n" +" referenced by any file in the working copy.\n" +msgstr "" +" 3. å¦æç»å® --vacuum-pristines é项ï¼ç§»é¤åæ¾å¨ .svn ç®å½å ã\n" +" ä¸å·¥ä½å¯æ¬ä¸å·²æ ä»»ä½æ件å¼ç¨çåå§æ件å¯æ¬ã\n" + +#: ../svn/svn.c:593 +msgid "" +" If WCPATH contains an @ character, an additional @ must be specified at the\n" +" end of WCPATH to avoid interpreting the first @ as a peg revision indicator.\n" +msgstr "" +" å¦æ WCPATH å å« @ å符ï¼å¿ é¡»å¨ WCPATH æ«å°¾é¢å¤æå® @\n" +" 以é¿å å°ç¬¬ä¸ä¸ª @ åçé¨å解é为éå®çæ¬ã\n" + +#: ../svn/svn.c:598 +msgid "deprecated and ignored" +msgstr "å·²åºå¼å¹¶å¿½ç¥" + +#: ../svn/svn.c:601 msgid "" "Send changes from your working copy to the repository.\n" -"usage: commit [PATH...]\n" +"usage: commit [PATH[@]...]\n" +"\n" +msgstr "" +"å°å·¥ä½å¯æ¬ä¸çæ´æ¹åéå°çæ¬åºã\n" +"ç¨æ³: commit [PATH[@]...]\n" "\n" + +#: ../svn/svn.c:604 +msgid "" " 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" +"\n" +msgstr "" +" å¿ é¡»æä¾æ¥å¿æ¶æ¯ï¼ä½å¯ä»¥ä¸ºç©ºãå¦ææªéè¿\n" +" --message æ --file é项ç»åºï¼å°æå¼ç¼è¾å¨ã\n" + +#: ../svn/svn.c:607 +msgid "" " If any targets are (or contain) locked items, those will be\n" -" unlocked after a successful commit.\n" +" unlocked after a successful commit, unless --no-unlock is given.\n" "\n" +msgstr "" +" å¦æä»»ä½ç®æ æ¯(æå å«)éå®ç项ï¼è¿äºå°å¨\n" +" æåæ交å解éï¼é¤éä½¿ç¨ --no-unlockã\n" + +#: ../svn/svn.c:610 +msgid "" " If --include-externals is given, also commit file and directory\n" " externals reached by recursion. Do not commit externals with a\n" " fixed revision.\n" msgstr "" -"æå·¥ä½å¯æ¬çä¿®æ¹æ交å°çæ¬åºã\n" -"ç¨æ³: commit [è·¯å¾...]\n" -"\n" -" å¿ é¡»æä¾æ¥å¿æ¶æ¯ï¼ä½å®å¯ä»¥æ¯ç©ºçãå¦æ没ææå® --message æ --file\n" -" é项ï¼ç¼è¾å¨ä¼è¢«å¯å¨ãå¦ææç®æ æ¯éå®çæè å å«éå®æ¡ç®ï¼åå¨æå\n" -" æ交åä¼è¢«è§£éã\n" +" å¦æç»å® --include-externalsï¼ä¹æ交éå½å°è¾¾çæ件åç®å½\n" +" å¤é¨å¼ç¨ãä¸è¦æ交åºå®çæ¬çå¤é¨å¼ç¨ã\n" -#: ../svn/svn.c:595 -#, fuzzy +#: ../svn/svn.c:621 msgid "" "Copy files and directories in a working copy or repository.\n" -"usage: copy SRC[@REV]... DST\n" +"usage: copy SRC[@REV]... DST[@]\n" +"\n" +msgstr "" +"å¨å·¥ä½å¯æ¬æçæ¬åºä¸å¤å¶æ件åç®å½ã\n" +"ç¨æ³: copy SRC[@REV]... DST[@]\n" "\n" + +#: ../svn/svn.c:624 +msgid "" " 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 and tag\n" -" All the SRCs must be of the same type. When copying multiple sources,\n" -" they will be added as children of DST, which must be a directory.\n" +" All the SRCs must be of the same type. If DST is an existing directory,\n" +" the sources will be added as children of DST. When copying multiple\n" +" sources, DST must be an existing directory.\n" "\n" +msgstr "" +" SRC å DST é½å¯ä»¥æ¯å·¥ä½å¯æ¬(WC)è·¯å¾æ URL:\n" +" WC -> WC: å¤å¶å¹¶è®¡åæ·»å (å å«åå²)\n" +" WC -> URL: ç«å³æ交 WC çå¯æ¬å° URL\n" +" URL -> WC: æ£åº URL å° WCï¼è®¡åæ·»å \n" +" URL -> URL: å®å ¨å¨æå¡å¨ç«¯å¤å¶ï¼ç¨äºå建åæ¯åæ ç¾\n" +" ææ SRC å¿ é¡»æ¯ç¸åç±»åãå¦æ DST æ¯å·²åå¨çç®å½ï¼\n" +" æºå°ä½ä¸º DST çå项添å ãå¤å¶å¤ä¸ªæºæ¶ï¼DST å¿ é¡»æ¯å·²åå¨çç®å½ã\n" +"\n" + +#: ../svn/svn.c:633 +msgid "" +" If DST contains an @ character, an additional @ must be specified at the\n" +" end of DST to avoid interpreting the first @ as a peg revision indicator.\n" +msgstr "" +" å¦æ DST å å« @ å符ï¼å¿ é¡»å¨ DST æ«å°¾é¢å¤æå® @\n" +" 以é¿å å°ç¬¬ä¸ä¸ª @ åçé¨å解é为éå®çæ¬ã\n" + +#: ../svn/svn.c:635 +msgid "" " WARNING: For compatibility with previous versions of Subversion,\n" " copies performed using two working copy paths (WC -> WC) will not\n" " contact the repository. As such, they may not, by default, be able\n" " to propagate merge tracking information from the source of the copy\n" " to the destination.\n" msgstr "" -"å¨å·¥ä½å¯æ¬æçæ¬åºä¸å¤å¶æ°æ®ï¼ä¿çåå²ã\n" -"ç¨æ³: copy SRC[@REV]... DST\n" -"\n" -"å½å¤å¶å¤ä¸ªæºæ¶ï¼å®ä»¬ä½ä¸º DST çåèç¹å¢å , DST å¿ é¡»æ¯ç®å½ã\n" -"\n" -" SRC å DST å¯ä»¥æ¯å·¥ä½å¯æ¬è·¯å¾(WC)æçæ¬åºå°å(URL): \n" -" WC -> WC: å¤å¶åè°åº¦å¢å (å å«åå²)\n" -" WC -> URL: ç«å³æ交工ä½å¯æ¬å°çæ¬åº\n" -" URL -> WC: æ£åº URL å°å·¥ä½å¯æ¬ï¼è°åº¦å¢å \n" -" URL -> URL: å®å ¨æå¡å¨ç«¯å¤å¶ï¼ä¸è¬ç¨äºåæ¯åæ ç¾\n" -" ææ SRC å¿ é¡»æ¯åä¸ç±»åã\n" -"\n" -"è¦åï¼ä¸ºäºä¸æ§çæ¬ç Subversion å ¼å®¹ï¼ä½¿ç¨ä¸¤ä¸ªå·¥ä½å¯æ¬å¤å¶(WC -> WC)ç\n" -"æä½ä¸ä¼ä¸çæ¬åºéä¿¡ãåæ ·å°ï¼å¨ç¼ºçæ åµä¸ï¼ä¸è½ä»å¤å¶æºå°ç®çå°ä¼ æå\n" -"并è·è¸ªä¿¡æ¯ã\n" +" è¦å: ä¸ºå ¼å®¹ä»¥åçæ¬ç Subversionï¼ä½¿ç¨ä¸¤ä¸ªå·¥ä½å¯æ¬è·¯å¾\n" +" (WC -> WC) æ§è¡çå¤å¶ä¸ä¼èç³»çæ¬åºãå æ¤é»è®¤æ åµä¸ï¼å®ä»¬\n" +" å¯è½æ æ³æå并è·è¸ªä¿¡æ¯ä»å¤å¶æºä¼ æå°ç®æ ã\n" -#: ../svn/svn.c:614 +#: ../svn/svn.c:645 msgid "" "Remove files and directories from version control.\n" -"usage: 1. delete PATH...\n" -" 2. delete URL...\n" +"usage: 1. delete PATH[@]...\n" +" 2. delete URL[@]...\n" "\n" +msgstr "" +"ä»çæ¬æ§å¶ä¸ç§»é¤æ件åç®å½ã\n" +"ç¨æ³: 1. delete PATH[@]...\n" +" 2. delete URL[@]...\n" +"\n" + +#: ../svn/svn.c:649 +msgid "" " 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" @@ -12092,23 +15514,32 @@ msgid "" " PATHs that are, or contain, unversioned or modified items will\n" " not be removed unless the --force or --keep-local option is given.\n" "\n" +msgstr "" +" 1. PATH æå®çæ¯ä¸ªé¡¹å°å¨ä¸æ¬¡æ交æ¶è°åº¦ä¸ºå é¤ãé¤éç»å®\n" +" --keep-local é项ï¼å°æªæ交çæ件åç®å½ä¼ç«å³ä»å·¥ä½å¯æ¬\n" +" ä¸ç§»é¤ã\n" +" å¦æ PATH æ¬èº«æ¯æå å«æªçæ¬æ§å¶æ已修æ¹ç项ï¼é¤éç»å®\n" +" --force æ --keep-local é项ï¼å¦åä¸ä¼è¢«ç§»é¤ã\n" +"\n" + +#: ../svn/svn.c:656 +msgid "" " 2. Each item specified by a URL is deleted from the repository\n" " via an immediate commit.\n" msgstr "" -"ä»çæ¬åºä¸å é¤æ件åç®å½ã\n" -"ç¨æ³: 1ãdelete PATH...\n" -" 2ãdelete URL...\n" -"\n" -" 1ãæ¯ä¸ª PATH æå®ç项ç®ä¼è¢«è°åº¦å°ä¸æ¬¡æ交æ¶ä»çæ¬åºå é¤ãé¤éç»åº\n" -" --keep-local åæ°ï¼å·¥ä½å¯æ¬ä¸æ²¡ææ交çæ件åç®å½ä¼è¢«ç«å³å é¤ã\n" -" å¦æ PATH æªçæ¬æ§å¶æè å å«æªçæ¬æ§å¶ç项ç®ï¼æè å å«å·²ä¿®æ¹ç\n" -" 项ç®ï¼é£ä¹ä» å½ç»åº --force æ --keep-local åæ°æ¶è¿äºé¡¹ç®æä¼è¢«\n" -" å é¤ã\n" -"\n" -" 2ãæ¯ä¸ª URL æå®ç项ç®ä¼éè¿ç«å³æ交ä»çæ¬åºä¸å é¤ã\n" +" 2. URL æå®çæ¯ä¸ªé¡¹å°éè¿ç«å³æ交\n" +" ä»çæ¬åºä¸å é¤ã\n" + +#: ../svn/svn.c:658 +msgid "" +" If PATH or URL contains an @ character, an additional @ must be specified\n" +" at the end of PATH to avoid interpreting the first @ as a peg revision\n" +" indicator.\n" +msgstr "" +" å¦æ PATH æ URL å å« @ å符ï¼å¿ é¡»å¨ PATH æ«å°¾é¢å¤æå® @ï¼\n" +" 以å æ第ä¸ä¸ª @ å½ä½éå®çæ¬æ è®°ã\n" -#: ../svn/svn.c:630 -#, fuzzy +#: ../svn/svn.c:665 msgid "" "Display local changes or differences between two revisions or paths.\n" "usage: 1. diff\n" @@ -12119,8 +15550,27 @@ msgid "" " 5. diff OLD-URL[@OLDREV] NEW-PATH[@NEWREV]\n" " 6. diff OLD-PATH[@OLDREV] NEW-URL[@NEWREV]\n" "\n" +msgstr "" +"æ¾ç¤ºæ¬å°æ´æ¹ï¼æ两个çæ¬æè·¯å¾ä¹é´çå·®å¼ã\n" +"ç¨æ³: 1. diff\n" +" 2. diff [-c M | -r N[:M]] [TARGET[@REV]...]\n" +" 3. diff [-r N[:M]] --old=OLD-TGT[@OLDREV] [--new=NEW-TGT[@NEWREV]] \\\n" +" [PATH...]\n" +" 4. diff OLD-URL[@OLDREV] NEW-URL[@NEWREV]\n" +" 5. diff OLD-URL[@OLDREV] NEW-PATH[@NEWREV]\n" +" 6. diff OLD-PATH[@OLDREV] NEW-URL[@NEWREV]\n" +"\n" + +#: ../svn/svn.c:674 +msgid "" " 1. Use just 'svn diff' to display local modifications in a working copy.\n" "\n" +msgstr "" +" 1. ä» ä½¿ç¨ 'svn diff' æ¾ç¤ºå·¥ä½å¯æ¬ä¸çæ¬å°ä¿®æ¹ã\n" +"\n" + +#: ../svn/svn.c:676 +msgid "" " 2. Display the changes made to TARGETs as they are seen in REV between\n" " two revisions. TARGETs may be all working copy paths or all URLs.\n" " If TARGETs are working copy paths, N defaults to BASE and M to the\n" @@ -12128,6 +15578,17 @@ msgid "" " The '-c M' option is equivalent to '-r N:M' where N = M-1.\n" " Using '-c -M' does the reverse: '-r M:N' where N = M-1.\n" "\n" +msgstr "" +" 2. æ¾ç¤º TARGET å¨ä¸¤ä¸ªçæ¬ä¹é´çæ´æ¹ï¼ä»¥ REV ä¸æè§ä¸ºåã\n" +" TARGET å¯ä»¥å ¨æ¯å·¥ä½å¯æ¬è·¯å¾ï¼æå ¨æ¯ URLã\n" +" å¦æ TARGET æ¯å·¥ä½å¯æ¬è·¯å¾ï¼N é»è®¤ä¸º BASEï¼M é»è®¤ä¸ºå·¥ä½\n" +" å¯æ¬ï¼å¦ææ¯ URLï¼N å¿ é¡»æå®ï¼M é»è®¤ä¸º HEADã\n" +" '-c M' é项çä»·äº '-r N:M'ï¼å ¶ä¸ N = M-1ã\n" +" '-c -M' åç¸å: '-r M:N'ï¼å ¶ä¸ N = M-1ã\n" +"\n" + +#: ../svn/svn.c:683 +msgid "" " 3. 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" @@ -12137,77 +15598,122 @@ msgid "" " If OLDREV or NEWREV are not specified, they default to WORKING for\n" " working copy targets and to HEAD for URL targets.\n" "\n" +msgstr "" +" 3. æ¾ç¤º OLD-TGT å¨ OLDREV ä¸ä¸ NEW-TGT å¨ NEWREV ä¸çå·®å¼ã\n" +" å¦æç»åº PATHï¼åç¸å¯¹äº OLD-TGT å NEW-TGTï¼å¹¶å°è¾åºéå¶ä¸º\n" +" è¿äºè·¯å¾çå·®å¼ãOLD-TGT å NEW-TGT å¯ä»¥æ¯å·¥ä½å¯æ¬è·¯å¾æ URL[@REV]ã\n" +" å¦ææªæå® NEW-TGTï¼åé»è®¤ä¸º OLD-TGTã-r N 使 OLDREV é»è®¤ä¸º Nï¼\n" +" -r N:M 使 OLDREV é»è®¤ä¸º NãNEWREV é»è®¤ä¸º Mã\n" +" å¦ææªæå® OLDREV æ NEWREVï¼å·¥ä½å¯æ¬ç®æ é»è®¤ä¸º WORKINGï¼\n" +" URL ç®æ é»è®¤ä¸º HEADã\n" +"\n" + +#: ../svn/svn.c:692 +msgid "" " Either or both OLD-TGT and NEW-TGT may also be paths to unversioned\n" " targets. Revisions cannot be specified for unversioned targets.\n" " Both targets must be of the same node kind (file or directory).\n" " Diffing unversioned targets against URL targets is not supported.\n" "\n" +msgstr "" +" OLD-TGT å NEW-TGT ä¹ä¸æ两è ä¹å¯ä»¥æ¯æªçæ¬æ§å¶ç®æ ç\n" +" è·¯å¾ãä¸è½ä¸ºæªçæ¬æ§å¶çç®æ æå®çæ¬ã\n" +" 两个ç®æ å¿ é¡»æ¯åä¸èç¹ç±»å(æ件æç®å½)ã\n" +" ä¸æ¯æææªçæ¬æ§å¶çç®æ ä¸ URL ç®æ åæ¯è¾ã\n" +"\n" + +#: ../svn/svn.c:697 +msgid "" " 4. Shorthand for 'svn diff --old=OLD-URL[@OLDREV] --new=NEW-URL[@NEWREV]'\n" " 5. Shorthand for 'svn diff --old=OLD-URL[@OLDREV] --new=NEW-PATH[@NEWREV]'\n" " 6. Shorthand for 'svn diff --old=OLD-PATH[@OLDREV] --new=NEW-URL[@NEWREV]'\n" msgstr "" -"æ¾ç¤ºä¸¤ä¸ªçæ¬æè·¯å¾çå·®å¼ã\n" -"ç¨æ³: 1. diff [-c M | -r N[:M]] [TARGET[@REV]...]\n" -" 2. diff [-r N[:M]] --old=OLD-TGT[@OLDREV] [--new=NEW-TGT[@NEWREV]] \\\n" -" [PATH...]\n" -" 3. diff OLD-URL[@OLDREV] NEW-URL[@NEWREV]\n" -"\n" -" 1ãæ¾ç¤ºçæ¬ REV ä¸ TARGET å¨ä¸¤ä¸ªä¸åççæ¬ä¹é´çå·®å¼ãTARGET è¦ä¹å ¨æ¯\n" -" å·¥ä½å¯æ¬è·¯å¾ï¼è¦ä¹å ¨æ¯ URLãå¦æ TARGET æ¯å·¥ä½å¯æ¬è·¯å¾ï¼N é»è®¤ä¸º\n" -" BASEï¼M é»è®¤ä¸ºå·¥ä½å¯æ¬ï¼å¦æ TARGET æ¯ URLï¼N å¿ é¡»æå®ï¼ M é»è®¤ä¸º HEADã\n" -" â-c Mâ çä»·äº â-r M-1:Mâï¼â-c -Mâ çä»·äº â-r M:M-1âã\n" -"\n" -" 2ãæ¾ç¤ºæ°æ§çæ¬ä¸å¯¹åºç®æ çå·®å¼ãPATH æ¯ç¸å¯¹äºæ°æ§ç®æ çç¸å¯¹è·¯å¾ï¼\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" +" 4. 'svn diff --old=OLD-URL[@OLDREV] --new=NEW-URL[@NEWREV]' çç®å\n" +" 5. 'svn diff --old=OLD-URL[@OLDREV] --new=NEW-PATH[@NEWREV]' çç®å\n" +" 6. 'svn diff --old=OLD-PATH[@OLDREV] --new=NEW-URL[@NEWREV]' çç®å\n" -#: ../svn/svn.c:671 +#: ../svn/svn.c:709 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" +"usage: 1. export [-r REV] URL[@PEGREV] [UNVERSIONED_PATH[@]]\n" +" 2. export [-r REV] WCPATH[@PEGREV] [UNVERSIONED_PATH[@]]\n" "\n" +msgstr "" +"å建æªçæ¬æ§å¶çç®å½æ å¯æ¬ã\n" +"ç¨æ³: 1. export [-r REV] URL[@PEGREV] [UNVERSIONED_PATH[@]]\n" +" 2. export [-\n" + +#: ../svn/svn.c:713 +msgid "" " 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" +" UNVERSIONED_PATH. If UNVERSIONED_PATH is omitted, the last\n" +" component of the URL is used for the local directory name.\n" "\n" +msgstr "" +" 1. ä» URL æå®ççæ¬åºå¯¼åºå¹²åçç®å½æ å° UNVERSIONED_PATHï¼\n" +" å¦æç»å®äº REV åç¨è¯¥çæ¬ï¼å¦åç¨ HEADãå¦æçç¥\n" +" UNVERSIONED_PATHï¼åç¨ URL çæåä¸æ®µä½ä¸ºæ¬å°ç®å½åã\n" +"\n" + +#: ../svn/svn.c:718 +msgid "" " 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" +" WCPATH, at revision REV if it is given, otherwise at WORKING, into\n" +" UNVERSIONED_PATH. If UNVERSIONED_PATH is omitted, the last\n" +" component of the WCPATH is used for the local directory name. If\n" +" REV is not specified, all local changes will be preserved. Files\n" +" not under version control will not be copied.\n" +"\n" +msgstr "" +" 2. ä» WCPATH æå®çå·¥ä½å¯æ¬å¯¼åºå¹²åçç®å½æ å°\n" +" UNVERSIONED_PATHï¼å¦æç»å®äº REV åç¨è¯¥çæ¬ï¼å¦åç¨\n" +" WORKINGãå¦æçç¥ UNVERSIONED_PATHï¼åç¨ WCPATH çæå\n" +" ä¸æ®µä½ä¸ºæ¬å°ç®å½åãå¦ææªæå® REVï¼å°ä¿çæææ¬å°æ´æ¹ã\n" +" æªçº³å ¥çæ¬æ§å¶çæ件ä¸ä¼è¢«å¤å¶ã\n" "\n" + +#: ../svn/svn.c:725 ../svnbench/svnbench.c:246 +msgid "" " 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 çè¯ï¼ä¼ä»æå®ççæ¬å¯¼åºï¼å¦åä»å·¥ä½å¯æ¬å¯¼åºãå¦æ\n" -" PATH2 被çç¥çè¯ï¼PATH1 çæåé¨åä¼è¢«ç¨æ¥å½ææ¬å°çç®å½å称ã\n" -" å¦æ没ææå® REV çè¯ï¼ææçæ¬å°ä¿®æ¹é½ä¿çï¼ä½æ¯æªçº³å ¥çæ¬æ§å¶\n" -" çæ件ä¸ä¼è¢«å¤å¶ã\n" -"\n" -" å¦ææå®äº PEGREV ï¼å°ä»æå®ççæ¬æ¬å¼å§æ¥æ¾ã\n" -"\n" +" å¦ææå®äº PEGREVï¼ç¡®å®é¦å å¨åªä¸ªçæ¬ä¸\n" +" æ¥æ¾ç®æ ã\n" + +#: ../svn/svn.c:727 +msgid "" +" If UNVERSIONED_PATH contains an @ character, an additional @ must be\n" +" specified at the end of UNVERSIONED_PATH to avoid interpreting the\n" +" first @ as a peg revision indicator.\n" +msgstr "" +" å¦æ UNVERSIONED_PATH å å« @ å符ï¼å¿ é¡»å¨ UNVERSIONED_PATH\n" +" æ«å°¾é¢å¤æå® @ï¼ä»¥å æ第ä¸ä¸ª @ å½ä½éå®çæ¬æ è®°ã\n" -#: ../svn/svn.c:699 +#: ../svn/svn.c:736 ../svnbench/svnbench.c:212 +msgid "" +"Describe the usage of this program or its subcommands.\n" +"usage: help [SUBCOMMAND...]\n" +msgstr "" +"æè¿°æ¬ç¨åºæå ¶åå½ä»¤çç¨æ³ã\n" +"ç¨æ³: help [åå½ä»¤...]\n" + +#: ../svn/svn.c:740 +msgid "also show experimental subcommands and options" +msgstr "åæ¶æ¾ç¤ºå®éªæ§åå½ä»¤åé项" + +#: ../svn/svn.c:744 msgid "" "Commit an unversioned file or tree into the repository.\n" "usage: import [PATH] URL\n" "\n" +msgstr "" +"å°æªçæ¬æ§å¶çæ件æç®å½æ æ交å°çæ¬åºã\n" +"ç¨æ³: import [PATH] URL\n" +"\n" + +#: ../svn/svn.c:747 +msgid "" " 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" @@ -12216,128 +15722,355 @@ msgid "" " Unversionable items such as device files and pipes are ignored\n" " if --force is specified.\n" msgstr "" -"å°æªçº³å ¥çæ¬æ§å¶çæ件æç®å½æ æ交å°çæ¬åºã\n" -"ç¨æ³: import [PATH] URL\n" -"\n" -" éå½å°æ交 PATH çå¯æ¬è³ URLã\n" -" å¦æçç¥ PATHï¼åé»è®¤ä¸º â.âã\n" -" ç¶ç®å½ä¼æ ¹æ®éè¦å¨çæ¬åºå å建ã\n" -" å¦æ PATH æ¯ç®å½ï¼åå ¶ä¸çå 容ç´æ¥å å ¥å° URL æå®çä½ç½®å ã\n" -" å¦æ使ç¨äº â--forceâï¼é£ä¹ä¸è½çº³å ¥çæ¬æ§å¶ç项ç®ï¼ä¾å¦è®¾å¤æ件ï¼ç®¡éçï¼ä¼è¢«å¿½ç¥ã\n" +" éå½æ PATH çå¯æ¬æäº¤å° URLã\n" +" å¦æçç¥ PATHï¼ååå®ä¸º '.'ã\n" +" å¿ è¦æ¶ä¼å¨çæ¬åºä¸å建ç¶ç®å½ã\n" +" å¦æ PATH æ¯ç®å½ï¼è¯¥ç®å½çå 容ä¼ç´æ¥æ·»å å° URL ä¸ã\n" +" å¦ææå® --forceï¼è®¾å¤æ件ã管éçæ æ³çº³å ¥çæ¬æ§å¶ç项\n" +" ä¼è¢«å¿½ç¥ã\n" -#: ../svn/svn.c:713 +#: ../svn/svn.c:760 msgid "" "Display information about a local or remote item.\n" "usage: info [TARGET[@REV]...]\n" "\n" -" Print information about each TARGET (default: '.').\n" -" TARGET may be either a working-copy path or URL. If specified, REV\n" -" determines in which revision the target is first looked up.\n" msgstr "" -"æ¾ç¤ºæ¬å°æè¿ç¨æ¡ç®çä¿¡æ¯ã\n" +"æ¾ç¤ºæ¬å°æè¿ç¨é¡¹çä¿¡æ¯ã\n" "ç¨æ³: info [TARGET[@REV]...]\n" "\n" -" æ¾ç¤ºæ¯ä¸ª TARGET çä¿¡æ¯ (é»è®¤: â.â)ã\n" -" TARGET å¯ä»¥æ¯å·¥ä½å¯æ¬ä¸çè·¯å¾æçæ¬åºä¸ç URLãREV æå®ä»åªä¸ª\n" -" çæ¬å¼å§æ¥æ¾ç®æ ã\n" -#: ../svn/svn.c:724 +#: ../svn/svn.c:763 +msgid "" +" Print information about each TARGET (default: '.').\n" +" TARGET may be either a working-copy path or a URL. If specified, REV\n" +" determines in which revision the target is first looked up; the default\n" +" is HEAD for a URL or BASE for a WC path.\n" +"\n" +msgstr "" +" æå°æ¯ä¸ª TARGET çä¿¡æ¯(é»è®¤: '.')ã\n" +" TARGET å¯ä»¥æ¯å·¥ä½å¯æ¬è·¯å¾æ URLãå¦ææå®äº REVï¼å®å³å®å å¨\n" +" åªä¸ªçæ¬ä¸æ¥æ¾ç®æ ï¼URL é»è®¤ä¸º HEADï¼å·¥ä½å¯æ¬è·¯å¾é»è®¤ä¸º BASEã\n" +"\n" + +#: ../svn/svn.c:768 +msgid "" +" With --show-item, print only the value of one item of information\n" +" about TARGET.\n" +"\n" +msgstr "" +" ä½¿ç¨ --show-item æ¶ï¼ä» æå° TARGET çä¸é¡¹ä¿¡æ¯ã\n" +"\n" + +#: ../svn/svn.c:771 +msgid "" +" EXPERIMENTAL:\n" +" With --x-viewspec, print the working copy layout.\n" +msgstr "" +" å®éªæ§:\n" +" ä½¿ç¨ --x-viewspec æå°å·¥ä½å¯æ¬å¸å±ã\n" + +#: ../svn/svn.c:777 +msgid "" +"show file sizes with base-2 unit suffixes\n" +" (Byte, Kilobyte, Megabyte, Gigabyte, Terabyte\n" +" and Petabyte), limiting the number of digits\n" +" to three or less" +msgstr "" +"æ¾ç¤ºæ件大å°ï¼ä½¿ç¨äºè¿å¶åä½åç¼\n" +" (ByteãKilobyteãMegabyteãGigabyteã\n" +" Terabyte å Petabyte)ï¼ä½æ°ä¸è¶ è¿ä¸ä½" + +#: ../svn/svn.c:784 +msgid "" +"print only the item identified by ARG:\n" +" 'kind' node kind of TARGET\n" +" 'url' URL of TARGET in the repository\n" +" 'relative-url'\n" +" repository-relative URL of TARGET\n" +" 'repos-root-url'\n" +" root URL of repository\n" +" 'repos-uuid' UUID of repository\n" +" 'repos-size' for files, the size of TARGET\n" +" in the repository\n" +" 'revision' specified or implied revision\n" +" 'last-changed-revision'\n" +" last change of TARGET at or before\n" +" 'revision'\n" +" 'last-changed-date'\n" +" date of 'last-changed-revision'\n" +" 'last-changed-author'\n" +" author of 'last-changed-revision'\n" +" 'wc-root' root of TARGET's working copy\n" +" 'schedule' 'normal','add','delete','replace'\n" +" 'depth' checkout depth of TARGET in WC\n" +" 'wc-format' TARGET's working copy format\n" +" 'wc-compatible-version'\n" +" first version supporting TARGET WC\n" +" 'changelist' changelist of TARGET in WC\n" +" 'store-pristine'\n" +" TARGET's working copy pristine mode" +msgstr "" +"åªæå° ARG æ è¯ç项ç®:\n" +" 'kind' TARGET çèç¹ç±»å\n" +" 'url' TARGET å¨çæ¬åºä¸ç URL\n" +" 'relative-url'\n" +" TARGET ç¸å¯¹çæ¬åºç URL\n" +" 'repos-root-url'\n" +" çæ¬åºçæ ¹ URL\n" +" 'repos-uuid' çæ¬åºç UUID\n" +" 'repos-size' 对äºæ件ï¼TARGET å¨çæ¬åºä¸\n" +" ç大å°\n" +" 'revision' æå®æéå«ççæ¬\n" +" 'last-changed-revision'\n" +" TARGET å¨ 'revision' æä¹åç\n" +" æååæ´\n" +" 'last-changed-date'\n" +" 'last-changed-revision' çæ¥æ\n" +" 'last-changed-author'\n" +" 'last-changed-revision' çä½è \n" +" 'wc-root' TARGET å·¥ä½å¯æ¬çæ ¹\n" +" 'schedule' 'normal','add','delete','replace'\n" +" 'depth' TARGET å¨å·¥ä½å¯æ¬ä¸çæ£åºæ·±åº¦\n" +" 'wc-format' TARGET çå·¥ä½å¯æ¬æ ¼å¼\n" +" 'wc-compatible-version'\n" +" æ¯æ TARGET å·¥ä½å¯æ¬çææ©çæ¬\n" +" 'changelist' TARGET å¨å·¥ä½å¯æ¬ä¸çä¿®æ¹å表\n" +" 'store-pristine'\n" +" TARGET å·¥ä½å¯æ¬çåå§å¯æ¬æ¨¡å¼" + +#: ../svn/svn.c:841 msgid "" "List directory entries in the repository.\n" "usage: list [TARGET[@REV]...]\n" "\n" +msgstr "" +"ååºçæ¬åºä¸çç®å½æ¡ç®ã\n" +"ç¨æ³: list [TARGET[@REV]...]\n" +"\n" + +#: ../svn/svn.c:844 ../svnbench/svnbench.c:255 +msgid "" " 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" +msgstr "" +" ååºçæ¬åºä¸æ¯ä¸ª TARGET æ件ï¼ä»¥åæ¯ä¸ª TARGET ç®å½çå 容ã\n" +" å¦æ TARGET æ¯å·¥ä½å¯æ¬è·¯å¾ï¼å°ä½¿ç¨å¯¹åºççæ¬åº URLãå¦æ\n" +" æå®äº REVï¼å®å³å®å å¨åªä¸ªçæ¬ä¸æ¥æ¾ç®æ ã\n" +"\n" + +#: ../svn/svn.c:849 ../svnbench/svnbench.c:260 +msgid "" " The default TARGET is '.', meaning the repository URL of the current\n" " working directory.\n" "\n" +msgstr "" +" é»è®¤ TARGET 为 '.'ï¼å³å½åå·¥ä½ç®å½ç\n" +" çæ¬åº URLã\n" +"\n" + +#: ../svn/svn.c:854 +msgid "" +" Multiple --search patterns may be specified and the output will be\n" +" reduced to those paths whose last segment - i.e. the file or directory\n" +" name - contains a sub-string matching at least one of these patterns\n" +" (Windows only).\n" +"\n" +msgstr "" +" å¯ä»¥æå®å¤ä¸ª --search 模å¼ï¼è¾åºåªä¿çæåä¸æ®µ(å³æ件åæ\n" +" ç®å½å)ä¸å«æå串å¹é å ¶ä¸è³å°ä¸ä¸ªæ¨¡å¼çè·¯å¾(ä» Windows)ã\n" +"\n" + +#: ../svn/svn.c:861 +msgid "" +" Multiple --search patterns may be specified and the output will be\n" +" reduced to those paths whose last segment - i.e. the file or directory\n" +" name - matches at least one of these patterns.\n" +"\n" +msgstr "" +" å¯ä»¥æå®å¤ä¸ª --search 模å¼ï¼è¾åºåªä¿çæåä¸æ®µ(å³æ件åæ\n" +" ç®å½å)å¹é å ¶ä¸è³å°ä¸ä¸ªæ¨¡å¼çè·¯å¾ã\n" +"\n" + +#: ../svn/svn.c:867 +msgid "" " With --verbose, the following fields will be shown for each item:\n" "\n" +msgstr "" +" ä½¿ç¨ --verbose æ¶ï¼æ¯ä¸ªé¡¹å°æ¾ç¤ºä»¥ä¸å段:\n" +"\n" + +#: ../svn/svn.c:869 ../svnbench/svnbench.c:265 +msgid "" " 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 æ¯å·¥ä½å¯æ¬è·¯å¾ï¼é£ä¹æä½å¯¹åºç\n" -" çæ¬åºURLæå®çTARGETãREVæå®ä»å¨åªä¸ªçæ¬æ¥æ¾TARGETã\n" -"\n" -" TARGETé»è®¤æ¯â.âï¼è¡¨ç¤ºå½åå·¥ä½ç®å½å¯¹åºççæ¬åºURLã\n" -"\n" -" ä½¿ç¨ --verbose æ¶ï¼æ¯ä¸ªæ¡ç®ä¼æ¾ç¤ºä»¥ä¸é¢å¤ä¿¡æ¯: \n" -"\n" -" æåä¸æ¬¡æ交ççæ¬å·ç \n" -" æåä¸æ¬¡æ交çä½è \n" -" å¦æ被éå®ï¼æ¾ç¤ºåæ¯âOâã(使ç¨âsvn info URLâæ¥ç详ç»ä¿¡æ¯)\n" -" å¤§å° (以åè为åä½)\n" -" æåä¸æ¬¡æ交çæ¥æä¸æ¶é´\n" +" æåæ交ççæ¬å·\n" +" æåæ交çä½è \n" +" å¦æå·²éå®ï¼æ¾ç¤ºåæ¯ 'O'ã(ç¨ 'svn info URL' æ¥ç详æ )\n" +" 大å°(åè)\n" +" æåæ交çæ¥æåæ¶é´\n" + +#: ../svn/svn.c:877 +msgid "" +"with --verbose, show file sizes with base-2\n" +" unit suffixes (Byte, Kilobyte, Megabyte,\n" +" Gigabyte, Terabyte and Petabyte), limiting\n" +" the number of digits to three or less" +msgstr "" +"ä¸ --verbose ä¸èµ·ä½¿ç¨æ¶ï¼æ¾ç¤ºæ件大å°ï¼ä½¿ç¨äºè¿å¶\n" +" åä½åç¼(ByteãKilobyteãMegabyteã\n" +" GigabyteãTerabyte å Petabyte)ï¼ä½æ°\n" +" ä¸è¶ è¿ä¸ä½" -#: ../svn/svn.c:746 +#: ../svn/svn.c:886 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 "" -"éå®çæ¬åºä¸çè·¯å¾ï¼ä½¿å¾å ¶ä»ç¨æ·ä¸è½åå ¶æ交修æ¹ã\n" -"ç¨æ³: lock TARGET...\n" -"\n" -" ä½¿ç¨ --force é项å¯ä»¥ä»å ¶ä»ç¨æ·æå·¥ä½å¯æ¬çªåå°éã\n" +"éå®çæ¬åºä¸çå·¥ä½å¯æ¬è·¯å¾æ URLï¼\n" +"ä½¿å ¶ä»ç¨æ·æ æ³æ交æ´æ¹ã\n" +"ç¨æ³: lock TARGET\n" + +#: ../svn/svn.c:890 +msgid " Use --force to steal a lock from another user or working copy.\n" +msgstr " ä½¿ç¨ --force ä»å ¶ä»ç¨æ·æå·¥ä½å¯æ¬çªåéã\n" -#: ../svn/svn.c:752 +#: ../svn/svn.c:893 msgid "read lock comment from file ARG" msgstr "ä»æ件 ARG 读åå é注é" -#: ../svn/svn.c:753 +#: ../svn/svn.c:894 msgid "specify lock comment ARG" msgstr "æå®å é注éARG" -#: ../svn/svn.c:754 +#: ../svn/svn.c:895 msgid "force validity of lock comment source" msgstr "强å¶æ ¡éªéå®æ³¨éæº" -#: ../svn/svn.c:757 -#, fuzzy +#: ../svn/svn.c:896 +msgid "steal locks" +msgstr "çªåé" + +#: ../svn/svn.c:899 msgid "" "Show the log messages for a set of revision(s) and/or path(s).\n" "usage: 1. log [PATH][@REV]\n" " 2. log URL[@REV] [PATH...]\n" "\n" +msgstr "" +"æ¾ç¤ºä¸ç»çæ¬å/æè·¯å¾çæ¥å¿æ¶æ¯ã\n" +"ç¨æ³: 1. log [PATH][@REV]\n" +" 2. log URL[@REV] [PAT\n" + +#: ../svn/svn.c:903 +msgid "" " 1. Print the log messages for the URL corresponding to PATH\n" " (default: '.'). If specified, REV is the revision in which the\n" " URL is first looked up, and the default revision range is REV:1.\n" " If REV is not specified, the default revision range is BASE:1,\n" " since the URL might not exist in the HEAD revision.\n" "\n" +msgstr "" +" 1. æå° PATH (é»è®¤: '.') å¯¹åº URL çæ¥å¿æ¶æ¯ãå¦ææå®äº\n" +" REVï¼å®æ¯å æ¥æ¾è¯¥ URL ççæ¬ï¼é»è®¤çæ¬èå´ä¸º REV:1ã\n" +" å¦ææªæå® REVï¼é»è®¤çæ¬èå´ä¸º BASE:1ï¼å 为该 URL å¯è½\n" +" å¨ HEAD çæ¬ä¸å¹¶ä¸åå¨ã\n" +"\n" + +#: ../svn/svn.c:909 +msgid "" " 2. Print the log messages for the PATHs (default: '.') under URL.\n" " If specified, REV is the revision in which the URL is first\n" " looked up, and the default revision range is REV:1; otherwise,\n" " the URL is looked up in HEAD, and the default revision range is\n" " HEAD:1.\n" "\n" +msgstr "" +" 2. æå° URL ä¸ç PATH (é»è®¤: '.') çæ¥å¿æ¶æ¯ã\n" +" å¦ææå®äº REVï¼å®æ¯å æ¥æ¾è¯¥ URL ççæ¬ï¼é»è®¤çæ¬èå´ä¸º\n" +" REV:1ï¼å¦åå¨ HEAD ä¸æ¥æ¾è¯¥ URLï¼é»è®¤çæ¬èå´ä¸º HEAD:1ã\n" +"\n" + +#: ../svn/svn.c:915 ../svnbench/svnbench.c:290 +msgid "" " Multiple '-c' or '-r' options may be specified (but not a\n" " combination of '-c' and '-r' options), and mixing of forward and\n" " reverse ranges is allowed.\n" "\n" +msgstr "" +" å¯ä»¥æå®å¤ä¸ª '-c' æ '-r' é项(ä½ä¸è½ç»å\n" +" '-c' å '-r' é项)ï¼å 许混åæ£ååååèå´ã\n" + +#: ../svn/svn.c:919 +msgid "" " With -v, also print all affected paths with each log message.\n" +" Each changed path is preceded with a symbol describing the change:\n" +" A: The path was added or copied.\n" +" D: The path was deleted.\n" +" R: The path was replaced (deleted and re-added in the same revision).\n" +" M: The path's file and/or property content was modified.\n" +" If an added or replaced path was copied from somewhere else, the copy\n" +" source path and revision are shown in parentheses.\n" +" If a file or directory was moved from one path to another with 'svn move'\n" +" the old path will be listed as deleted and the new path will be listed\n" +" as copied from the old path at a prior revision.\n" +"\n" +msgstr "" +" ä½¿ç¨ -v æ¶ï¼éæ¯æ¡æ¥å¿æ¶æ¯è¿ä¼æå°ææåå½±åçè·¯å¾ã\n" +" æ¯ä¸ªåæ´è·¯å¾åæä¸ä¸ªæè¿°åæ´ç符å·:\n" +" A: è·¯å¾è¢«æ·»å æå¤å¶ã\n" +" D: è·¯å¾è¢«å é¤ã\n" +" R: è·¯å¾è¢«æ¿æ¢(å¨åä¸çæ¬ä¸å é¤å¹¶éæ°æ·»å )ã\n" +" M: è·¯å¾çæ件å/æå±æ§å 容被修æ¹ã\n" +" å¦æ被添å ææ¿æ¢çè·¯å¾æ¯ä»å«å¤å¤å¶çï¼å¤å¶æ¥æºè·¯å¾åçæ¬ä¼\n" +" æ¾ç¤ºå¨æ¬å·ä¸ã\n" +" å¦ææ件æç®å½ç¨ 'svn move' ä»ä¸ä¸ªè·¯å¾ç§»å°å¦ä¸ä¸ªè·¯å¾ï¼æ§è·¯å¾\n" +" ä¼è¢«å为已å é¤ï¼æ°è·¯å¾ä¼è¢«å为å¨ä¹åçæ¬ä»æ§è·¯å¾å¤å¶èæ¥ã\n" +"\n" + +#: ../svn/svn.c:931 +msgid "" " With -q, don't print the log message body itself (note that this is\n" " compatible with -v).\n" "\n" +msgstr "" +" ä½¿ç¨ -q æ¶ï¼ä¸æå°æ¥å¿æ¶æ¯æ£ææ¬èº«(注æè¿ä¸\n" +" -v å ¼å®¹)ã\n" +"\n" + +#: ../svn/svn.c:934 +msgid "" " 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" +msgstr "" +" æ¯æ¡æ¥å¿æ¶æ¯åªæå°ä¸æ¬¡ï¼å³ä½¿è¯¥çæ¬çå¤ä¸ªåå½±åè·¯å¾é½è¢«æ¾å¼\n" +" 请æ±ãæ¥å¿é»è®¤è·éå¤å¶åå²ãç¨ --stop-on-copy å¯ç¦ç¨æ¤è¡ä¸ºï¼\n" +" è¿å¨ç¡®å®åæ¯ç¹æ¶å¾æç¨ã\n" +"\n" + +#: ../svn/svn.c:939 +msgid "" " The --depth option is only valid in combination with the --diff option\n" " and limits the scope of the displayed diff to the specified depth.\n" "\n" +msgstr "" +" --depth éé¡¹ä» å¨ä¸ --diff é项ä¸èµ·ä½¿ç¨æ¶ææï¼\n" +" å®ææ¾ç¤ºçå·®å¼èå´éå¶å°æå®æ·±åº¦ã\n" +"\n" + +#: ../svn/svn.c:942 +msgid "" " If the --search option is used, log messages are displayed only if the\n" " provided search pattern matches any of the author, date, log message\n" " text (unless --quiet is used), or, if the --verbose option is also\n" @@ -12355,73 +16088,143 @@ msgid "" " number of log messages searched, rather than restricting the output\n" " to a particular number of matching log messages.\n" "\n" +msgstr "" +" å¦æä½¿ç¨ --search é项ï¼ä» å½æä¾çæ索模å¼å¹é ä½è ãæ¥æãæ¥å¿\n" +" æ¶æ¯ææ¬(é¤éä½¿ç¨ --quiet)ï¼æè (å¦æè¿æä¾äº --verbose é项)æ个\n" +" åæ´è·¯å¾æ¶ï¼ææ¾ç¤ºæ¥å¿æ¶æ¯ã\n" +" æ索模å¼å¯ä»¥å å« \"glob è¯æ³\" éé 符:\n" +" ? å¹é ä»»æå个å符\n" +" * å¹é ä»»æå符åºå\n" +" [abc] å¹é æ¹æ¬å·å ååºçä»»æå符\n" +" å¦ææä¾å¤ä¸ª --search é项ï¼åªè¦æ¥å¿æ¶æ¯å¹é ä»»ä¸æä¾çæ索模å¼\n" +" å³ä¼æ¾ç¤ºãå¦æä½¿ç¨ --search-and é项ï¼è¯¥é项çåæ°ä¼ä¸ä¸ä¸ä¸ª\n" +" --search æ --search-and é项ç模å¼ç»åï¼ä» å½æ¥å¿æ¶æ¯å¹é ç»å\n" +" åçæ索模å¼æ¶ææ¾ç¤ºã\n" +" å¦æ --limit ä¸ --search ç»å使ç¨ï¼--limit éå¶è¢«æç´¢çæ¥å¿æ¶æ¯\n" +" æ°éï¼èä¸æ¯å°è¾åºéå¶ä¸ºç¹å®æ°éçå¹é æ¥å¿æ¶æ¯ã\n" +"\n" + +#: ../svn/svn.c:959 +msgid "" " Examples:\n" "\n" +msgstr "" +" 示ä¾:\n" +"\n" + +#: ../svn/svn.c:961 +msgid "" " Show the latest 5 log messages for the current working copy\n" " directory and display paths changed in each commit:\n" " svn log -l 5 -v\n" "\n" +msgstr "" +" æ¾ç¤ºå½åå·¥ä½å¯æ¬ç®å½çææ° 5 æ¡æ¥å¿æ¶æ¯ï¼\n" +" 并æ¾ç¤ºæ¯æ¬¡æ交ä¸æ´æ¹çè·¯å¾:\n" +" svn log -l 5 -v\n" +"\n" + +#: ../svn/svn.c:965 +msgid "" " Show the log for bar.c as of revision 42:\n" " svn log bar.c@42\n" "\n" +msgstr "" +" æ¾ç¤ºçæ¬ 42 æ¶ bar.c çæ¥å¿:\n" +" svn log bar.c@42\n" +"\n" + +#: ../svn/svn.c:968 +msgid "" " Show log messages and diffs for each commit to foo.c:\n" " svn log --diff http://www.example.com/repo/project/foo.c\n" " (Because the above command uses a full URL it does not require\n" " a working copy.)\n" "\n" +msgstr "" +" æ¾ç¤º foo.c æ¯æ¬¡æ交çæ¥å¿æ¶æ¯åå·®å¼:\n" +" svn log --diff http://www.example.com/repo/project/foo.c\n" +" (å 为ä¸é¢çå½ä»¤ä½¿ç¨å®æ´ URLï¼æ以ä¸éè¦å·¥ä½å¯æ¬ã)\n" +"\n" + +#: ../svn/svn.c:973 +msgid "" " Show log messages for the children foo.c and bar.c of the directory\n" " '/trunk' as it appeared in revision 50, using the ^/ URL shortcut:\n" " svn log ^/trunk@50 foo.c bar.c\n" "\n" +msgstr "" +" ç¨ ^/ URL ç®åï¼æ¾ç¤ºç®å½ '/trunk' å¨çæ¬ 50 ä¸çå项 foo.c\n" +" å bar.c çæ¥å¿æ¶æ¯:\n" +" svn log ^/trunk@50 foo.c bar.c\n" +"\n" + +#: ../svn/svn.c:977 +msgid "" " Show the log messages for any incoming changes to foo.c during the\n" " next 'svn update':\n" " svn log -r BASE:HEAD foo.c\n" "\n" +msgstr "" +" æ¾ç¤ºä¸æ¬¡ 'svn update' æé´ foo.c çä»»ä½ä¼ å ¥æ´æ¹çæ¥å¿æ¶æ¯:\n" +" svn log -r BASE:HEAD foo.c\n" +"\n" + +#: ../svn/svn.c:981 +msgid "" " Show the log message for the revision in which /branches/foo\n" " was created:\n" " svn log --stop-on-copy --limit 1 -r0:HEAD ^/branches/foo\n" +"\n" +msgstr "" +" æ¾ç¤º /branches/foo 被å建æ¶ççæ¬çæ¥å¿æ¶æ¯:\n" +" svn log --stop-on-copy --limit 1 -r0:HEAD ^/branches/foo\n" +"\n" + +#: ../svn/svn.c:985 +msgid "" +" Show all log messages for commits between the tags ^/tags/2.0 and\n" +" ^/tags/3.0; assuming that tag 2.0 was created in revision 100:\n" +" svn log -rHEAD:100 ^/tags/3.0\n" +"\n" +msgstr "" +" æ¾ç¤ºæ ç¾ ^/tags/2.0 å ^/tags/3.0 ä¹é´æææ交çæ¥å¿æ¶æ¯ï¼\n" +" å设æ ç¾ 2.0 å建äºçæ¬ 100:\n" +" svn log -rHEAD:100 ^/tags/3.0\n" +"\n" + +#: ../svn/svn.c:989 +msgid "" +" If ^/trunk/foo.c was moved to ^/trunk/bar.c' in revision 22, 'svn log -v'\n" +" shows a deletion and a copy in its changed paths list, such as:\n" +" D /trunk/foo.c\n" +" A /trunk/bar.c (from /trunk/foo.c:21)\n" msgstr "" -"æ¾ç¤ºä¸ç»çæ¬ä¸/æè·¯å¾çæ¥å¿ä¿¡æ¯ã\n" -"ç¨æ³: 1ãlog [PATH][@REV]\n" -" 2ãlog URL[@REV] [PATH...]\n" -"\n" -" 1ãæ¾ç¤ºä¸æ¬å° PATH (é»è®¤: â.â) 对åºç URL çæ¥å¿ä¿¡æ¯ãå¦ææå®äº REVï¼çæ¬\n" -" èå´æ¯ REV:1ãé»è®¤ççæ¬èå´æ¯ BASE:1ï¼å 为 URL æªå¿ å¨ HEAD ä¸åå¨ã\n" -"\n" -" 2ãæ¾ç¤º URL ä¸ PATH (é»è®¤: â.â) çæ¥å¿ä¿¡æ¯ãå¦ææå®äº REVï¼çæ¬èå´æ¯\n" -" REV:1ãå¦åçæ¬èå´æ¯ HEAD:1ã\n" -"\n" -" å¯ä»¥æå®å¤ä¸ª â-câ æ â-râ é项 (ä½æ¯ä¸å 许åæ¶ä½¿ç¨ â-câ å â-râ é项)ï¼ä»¥å\n" -" æ··å使ç¨åååååèå´ã\n" -"\n" -" ä½¿ç¨ -v æ¶ï¼å¨æ¥å¿ä¿¡æ¯ä¸æ¾ç¤ºåå½±åçè·¯å¾åã\n" -" ä½¿ç¨ -q æ¶ï¼ä¸æ¾ç¤ºæ¥å¿ä¿¡æ¯ä¸»ä½ (请注æï¼å®å¯ä¸ -v 并å)ã\n" -"\n" -" æ¯æ¡æ¥å¿ä¿¡æ¯åªä¼æ¾ç¤ºä¸æ¬¡ï¼å³ä½¿æå®äºæ¤çæ¬æ¶åå°çå¤ä¸ªè·¯å¾ãé»è®¤æ¥å¿ä¿¡æ¯\n" -" ä¼è¿½æº¯å¤å¶åå²ï¼ä½¿ç¨ --stop-on-copy å¯ä»¥å ³éè¿ç§è¡ä¸ºï¼è¿å¯ä»¥ç¨æ¥æ¾åºåæ¯ç¹ã\n" -"\n" -" èä¾: \n" -" svn log\n" -" svn log foo.c\n" -" svn log bar.c@42\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" -" svn log http://www.example.com/repo/project@50 foo.c bar.c\n" +" å¦æ ^/trunk/foo.c å¨çæ¬ 22 ä¸è¢«ç§»å¨å° ^/trunk/bar.cï¼'svn log -v'\n" +" ä¼å¨å ¶åæ´è·¯å¾å表ä¸æ¾ç¤ºä¸æ¬¡å é¤åä¸æ¬¡å¤å¶ï¼ä¾å¦:\n" +" D /trunk/foo.c\n" +" A /trunk/bar.c (from /trunk/foo.c:21)\n" + +#: ../svn/svn.c:998 ../svnbench/svnbench.c:305 +msgid "retrieve revision property ARG" +msgstr "è·åçæ¬å±æ§ ARG" -#: ../svn/svn.c:837 -#, fuzzy +#: ../svn/svn.c:999 ../svnbench/svnbench.c:306 +msgid "the change made in revision ARG" +msgstr "çæ¬ ARG å¼èµ·çæ¹å" + +#: ../svn/svn.c:1000 msgid "also print all affected paths" -msgstr "ä¸è¦è§£éç®æ " +msgstr "åæ¶æå°ææåå½±åçè·¯å¾" -#: ../svn/svn.c:838 -#, fuzzy +#: ../svn/svn.c:1001 msgid "do not print the log message" -msgstr "ä¸è¦è§£éç®æ " +msgstr "ä¸æå°æ¥å¿æ¶æ¯" #. For this large section, let's keep it unindented for easier #. * viewing/editing. It has been vim-treated with a textwidth=75 and 'gw' #. * (with quotes and newlines removed). -#: ../svn/svn.c:844 +#: ../svn/svn.c:1007 msgid "" "Merge changes into a working copy.\n" "usage: 1. merge SOURCE[@REV] [TARGET_WCPATH]\n" @@ -12431,17 +16234,51 @@ msgid "" " 3. merge SOURCE1[@REV1] SOURCE2[@REV2] [TARGET_WCPATH]\n" " (the '2-URL' merge)\n" "\n" +msgstr "" +"å°æ´æ¹å并å°å·¥ä½å¯æ¬ä¸ã\n" +"ç¨æ³: 1. merge SOURCE[@REV] [TARGET_WCPATH]\n" +" ('å®æ´'å并)\n" +" 2. merge [-c M[,N...] | -r N:M ...] SOURCE[@REV] [TARGET_WCPATH]\n" +" ('æé'å并)\n" +" 3. merge SOURCE1[@REV1] SOURCE2[@REV2] [TARGET_WCPATH]\n" +" ('2-URL'å并)\n" +"\n" + +#: ../svn/svn.c:1015 +msgid "" " 1. This form, with one source path and no revision range, is called\n" " a 'complete' merge:\n" "\n" +msgstr "" +" 1. æ¤å½¢å¼ï¼å ·æä¸ä¸ªæºè·¯å¾ä¸æ²¡æçæ¬èå´ï¼ç§°ä¸º\n" +" 'å®æ´'å并:\n" +"\n" + +#: ../svn/svn.c:1018 +msgid "" +" svn merge SOURCE[@REV] [TARGET_WCPATH]\n" +"\n" +msgstr "" " svn merge SOURCE[@REV] [TARGET_WCPATH]\n" "\n" + +#: ../svn/svn.c:1020 +msgid "" " The complete merge is used for the 'sync' and 'reintegrate' merges\n" " in the 'feature branch' pattern described below. It finds all the\n" " changes on the source branch that have not already been merged to the\n" " target branch, and merges them into the working copy. Merge tracking\n" " is used to know which changes have already been merged.\n" "\n" +msgstr "" +" å®æ´å并ç¨äºä¸é¢æè¿°ç'åè½åæ¯'模å¼ä¸ç'åæ¥'å\n" +" 'reintegrate'å并ãå®æ¾åºæºåæ¯ä¸å°æªå并å°ç®æ åæ¯çææ\n" +" æ´æ¹ï¼å¹¶æå®ä»¬å并å°å·¥ä½å¯æ¬ãéè¿å并è·è¸ªæ¥å¾ç¥åªäºæ´æ¹\n" +" å·²ç»å并è¿ã\n" +"\n" + +#: ../svn/svn.c:1026 +msgid "" " SOURCE specifies the branch from where the changes will be pulled, and\n" " TARGET_WCPATH specifies a working copy of the target branch to which\n" " the changes will be applied. Normally SOURCE and TARGET_WCPATH should\n" @@ -12449,6 +16286,16 @@ msgid "" " subtree, then the subtree path must be included in both SOURCE and\n" " TARGET_WCPATH; this is discouraged, to avoid subtree mergeinfo.)\n" "\n" +msgstr "" +" SOURCE æå®ä»åªä¸ªåæ¯æåæ´æ¹ï¼TARGET_WCPATH æå®ç®æ åæ¯\n" +" çå·¥ä½å¯æ¬ï¼æ´æ¹å°åºç¨å°å®ä¸é¢ãé常 SOURCE å\n" +" TARGET_WCPATH åºåèªå¯¹åºä¸ä¸ªåæ¯çæ ¹ã(å¦æåªæ³å并åæ ï¼\n" +" å SOURCE å TARGET_WCPATH é½å¿ é¡»å å«è¯¥åæ è·¯å¾ï¼ä¸æ¨èè¿\n" +" æ ·åï¼ä»¥å 产çåæ å并信æ¯ã)\n" +"\n" + +#: ../svn/svn.c:1033 +msgid "" " SOURCE is usually a URL. The optional '@REV' specifies both the peg\n" " revision of the URL and the latest revision that will be considered\n" " for merging; if REV is not specified, the HEAD revision is assumed. If\n" @@ -12456,28 +16303,84 @@ msgid "" " used, and the default value of 'REV' is the base revision (usually the\n" " revision last updated to).\n" "\n" +msgstr "" +" SOURCE éå¸¸æ¯ URLãå¯éç '@REV' åæ¶æå®è¯¥ URL çéå®çæ¬\n" +" ååä¸å并çææ°çæ¬ï¼å¦ææªæå® REVï¼ååå®ä¸º HEAD çæ¬ã\n" +" å¦æ SOURCE æ¯å·¥ä½å¯æ¬è·¯å¾ï¼å使ç¨è¯¥è·¯å¾å¯¹åºç URLï¼'REV'\n" +" é»è®¤ä¸ºåºç¡çæ¬(é常æ¯æåæ´æ°å°ççæ¬)ã\n" +"\n" + +#: ../svn/svn.c:1040 +msgid "" " TARGET_WCPATH is a working copy path; if omitted, '.' is generally\n" " assumed. There are some special cases:\n" "\n" +msgstr "" +" TARGET_WCPATH æ¯å·¥ä½å¯æ¬è·¯å¾ï¼å¦æçç¥ï¼é常åå®ä¸º '.'ã\n" +" æä¸äºç¹æ®æ åµ:\n" +"\n" + +#: ../svn/svn.c:1043 +msgid "" " - If SOURCE is a URL:\n" "\n" +msgstr "" +" - å¦æ SOURCE æ¯ URL:\n" +"\n" + +#: ../svn/svn.c:1045 +msgid "" " - If the basename of the URL and the basename of '.' are the\n" " same, then the differences are applied to '.'. Otherwise,\n" " if a file with the same basename as that of the URL is found\n" " within '.', then the differences are applied to that file.\n" " In all other cases, the target defaults to '.'.\n" "\n" +msgstr "" +" - å¦æ URL çåºæ¬åä¸ '.' çåºæ¬åç¸åï¼åå·®å¼åºç¨\n" +" å° '.'ãå¦åï¼å¦æå¨ '.' ä¸æ¾å°ä¸è¯¥ URL åºæ¬åç¸å\n" +" çæ件ï¼åå·®å¼åºç¨å°è¯¥æ件ã\n" +" å ¶ä»æææ åµä¸ï¼ç®æ é»è®¤ä¸º '.'ã\n" +"\n" + +#: ../svn/svn.c:1051 +msgid "" " - If SOURCE is a working copy path:\n" "\n" +msgstr "" +" - å¦æ SOURCE æ¯å·¥ä½å¯æ¬è·¯å¾:\n" +"\n" + +#: ../svn/svn.c:1053 +msgid "" " - If the source is a file, then differences are applied to that\n" " file (useful for reverse-merging earlier changes). Otherwise,\n" " if the source is a directory, then the target defaults to '.'.\n" "\n" +msgstr "" +" - å¦ææºæ¯æ件ï¼åå·®å¼åºç¨å°è¯¥æ件(éç¨äºååå并\n" +" æ©å çæ´æ¹)ãå¦åï¼å¦ææºæ¯ç®å½ï¼åç®æ é»è®¤ä¸º '.'ã\n" +"\n" + +#: ../svn/svn.c:1057 +msgid "" " In normal usage the working copy should be up to date, at a single\n" " revision, with no local modifications and no switched subtrees.\n" "\n" +msgstr "" +" å¨æ£å¸¸ä½¿ç¨ä¸ï¼å·¥ä½å¯æ¬åºè¯¥æ¯ææ°çï¼åä¸çæ¬ï¼\n" +" 没ææ¬å°ä¿®æ¹ä¸æ²¡æåæ¢çåè·¯å¾ã\n" + +#: ../svn/svn.c:1060 +msgid "" " - The 'Feature Branch' Merging Pattern -\n" "\n" +msgstr "" +" - 'åè½åæ¯'åå¹¶æ¨¡å¼ -\n" +"\n" + +#: ../svn/svn.c:1062 +msgid "" " In this commonly used work flow, known also as the 'development\n" " branch' pattern, a developer creates a branch and commits a series of\n" " changes that implement a new feature. The developer periodically\n" @@ -12486,16 +16389,43 @@ msgid "" " complete, the developer performs a merge from the feature branch to\n" " the parent branch to re-integrate the changes.\n" "\n" +msgstr "" +" å¨è¿ç§å¸¸ç¨çå·¥ä½æµç¨ä¸(ä¹ç§°ä¸º'å¼ååæ¯'模å¼)ï¼å¼å人åå建\n" +" ä¸ä¸ªåæ¯ï¼å¹¶æ交ä¸ç³»åå®ç°æ°åè½çæ´æ¹ãå¼å人åå®æä»ç¶\n" +" åæ¯å并ææææ°æ´æ¹ï¼ä½¿å¼ååæ¯ä¸è¿äºæ´æ¹ä¿æåæ¥ãåè½\n" +" å®æåï¼å¼å人ååä»åè½åæ¯åç¶åæ¯åä¸æ¬¡å并ï¼ææ´æ¹å¹¶\n" +" åå»ã\n" +"\n" + +#: ../svn/svn.c:1070 +msgid "" +" parent --+----------o------o-o-------------o--\n" +" \\ \\ \\ /\n" +" \\ merge merge merge\n" +" \\ \\ \\ /\n" +" feature +--o-o-------o----o-o----o-------\n" +"\n" +msgstr "" " parent --+----------o------o-o-------------o--\n" " \\ \\ \\ /\n" " \\ merge merge merge\n" " \\ \\ \\ /\n" " feature +--o-o-------o----o-o----o-------\n" "\n" + +#: ../svn/svn.c:1076 +msgid "" " A merge from the parent branch to the feature branch is called a\n" " 'sync' or 'catch-up' merge, and a merge from the feature branch to the\n" " parent branch is called a 'reintegrate' merge.\n" "\n" +msgstr "" +" ä»ç¶åæ¯å°åè½åæ¯çå并称为'åæ¥'æ'追赶'å并ï¼ä»åè½åæ¯\n" +" å°ç¶åæ¯çå并称为 'reintegrate' å并ã\n" +"\n" + +#: ../svn/svn.c:1080 +msgid "" " - Sync Merge Example -\n" " ............\n" " . .\n" @@ -12506,6 +16436,20 @@ msgid "" " feature +------------------------o-----\n" " r100 r200\n" "\n" +msgstr "" +" - åæ¥åå¹¶ç¤ºä¾ -\n" +" ............\n" +" . .\n" +" trunk --+------------L--------------R------\n" +" \\ \\\n" +" \\ |\n" +" \\ v\n" +" feature +------------------------o-----\n" +" r100 r200\n" +"\n" + +#: ../svn/svn.c:1090 +msgid "" " Subversion will locate all the changes on 'trunk' that have not yet\n" " been merged into the 'feature' branch. In this case that is a single\n" " range, r100:200. In the diagram above, L marks the left side (trunk@100)\n" @@ -12514,23 +16458,67 @@ msgid "" " path. In this case, the working copy is a clean checkout of the entire\n" " 'feature' branch.\n" "\n" +msgstr "" +" Subversion ä¼æ¾åº 'trunk' ä¸å°æªåå¹¶å° 'feature' åæ¯çææ\n" +" æ´æ¹ãæ¬ä¾ä¸å°±æ¯ä¸ä¸ªåºé´ r100:200ãå¨ä¸å¾ä¸ï¼L æ è®°å并æºç\n" +" 左侧 (trunk@100)ï¼R æ è®°å³ä¾§ (trunk@200)ãL ä¸ R ä¹é´çå·®å¼å°\n" +" åºç¨å°ç®æ å·¥ä½å¯æ¬è·¯å¾ãæ¬ä¾ä¸ï¼å·¥ä½å¯æ¬æ¯æ´ä¸ª 'feature'\n" +" åæ¯çå¹²åæ£åºã\n" +"\n" + +#: ../svn/svn.c:1098 +msgid "" " To perform this sync merge, have a clean working copy of the feature\n" " branch and run the following command in its top-level directory:\n" "\n" +msgstr "" +" è¦æ§è¡æ¤åæ¥å并ï¼åå¤ä¸ä¸ªåè½åæ¯çå¹²åå·¥ä½å¯æ¬\n" +" 并å¨å ¶é¡¶çº§ç®å½ä¸è¿è¡ä»¥ä¸å½ä»¤:\n" + +#: ../svn/svn.c:1101 +msgid "" +" svn merge ^/trunk\n" +"\n" +msgstr "" " svn merge ^/trunk\n" "\n" + +#: ../svn/svn.c:1103 +msgid "" " Note that the merge is now only in your local working copy and still\n" " needs to be committed to the repository so that it can be seen by\n" " others. You can review the changes and you may have to resolve\n" " conflicts before you commit the merge.\n" "\n" +msgstr "" +" 注æè¿æ¬¡å并ç°å¨åªå¨ä½ çæ¬å°å·¥ä½å¯æ¬ä¸ï¼è¿éè¦æ交å°çæ¬åº\n" +" å ¶ä»äººæè½çå°ãä½ å¯ä»¥å 审æ¥è¿äºæ´æ¹ï¼æ交å并ä¹åå¯è½è¿å¾\n" +" 解å³å²çªã\n" +"\n" + +#: ../svn/svn.c:1108 +msgid "" " - Reintegrate Merge Example -\n" "\n" +msgstr "" +" - reintegrate åå¹¶ç¤ºä¾ -\n" +"\n" + +#: ../svn/svn.c:1110 +msgid "" " The feature branch was last synced with trunk up to revision X. So the\n" " difference between trunk@X and feature@HEAD contains the complete set\n" " of changes that implement the feature, and no other changes. These\n" " changes are applied to trunk.\n" "\n" +msgstr "" +" åè½åæ¯æåä¸æ¬¡ä¸ trunk åæ¥å°çæ¬ Xãæ以 trunk@X ä¸\n" +" feature@HEAD ä¹é´çå·®å¼æ£å¥½æ¯å®ç°è¯¥åè½çå ¨é¨æ´æ¹ï¼ä¸å«å ¶ä»\n" +" æ´æ¹ãè¿äºæ´æ¹å°åºç¨å° trunkã\n" +"\n" + +#: ../svn/svn.c:1115 +msgid "" " rW rX\n" " trunk ------+--------------------L------------------o\n" " \\ . ^\n" @@ -12538,57 +16526,153 @@ msgid "" " \\ . /\n" " feature +--------------------------------R\n" "\n" +msgstr "" +" rW rX\n" +" trunk ------+--------------------L------------------o\n" +" \\ . ^\n" +" \\ ............. /\n" +" \\ . /\n" +" feature +--------------------------------R\n" +"\n" + +#: ../svn/svn.c:1122 +msgid "" " In the diagram above, L marks the left side (trunk@X) and R marks the\n" " right side (feature@HEAD) of the merge. The difference between the\n" " left and right side is merged into trunk, the target.\n" "\n" +msgstr "" +" å¨ä¸å¾ä¸ï¼L æ è®°å并ç左侧 (trunk@X)ï¼R æ è®°å³ä¾§\n" +" (feature@HEAD)ãå·¦å³ä¸¤ä¾§çå·®å¼è¢«å并å°ç®æ trunkã\n" +"\n" + +#: ../svn/svn.c:1126 +msgid "" " To perform the merge, have a clean working copy of trunk and run the\n" " following command in its top-level directory:\n" "\n" +msgstr "" +" è¦æ§è¡å并ï¼åå¤ä¸ä¸ª trunk çå¹²åå·¥ä½å¯æ¬\n" +" 并å¨å ¶é¡¶çº§ç®å½ä¸è¿è¡ä»¥ä¸å½ä»¤:\n" + +#: ../svn/svn.c:1129 +msgid "" +" svn merge ^/feature\n" +"\n" +msgstr "" " svn merge ^/feature\n" "\n" + +#: ../svn/svn.c:1131 +msgid "" " To prevent unnecessary merge conflicts, a reintegrate merge requires\n" " that TARGET_WCPATH is not a mixed-revision working copy, has no local\n" " modifications, and has no switched subtrees.\n" "\n" +msgstr "" +" 为é²æ¢ä¸å¿ è¦çå并å²çªï¼reintegrate å并è¦æ± TARGET_WCPATH\n" +" ä¸æ¯æ··åçæ¬å·¥ä½å¯æ¬ï¼æ²¡ææ¬å°ä¿®æ¹ï¼ä¹æ²¡æ被åæ¢çåæ ã\n" +"\n" + +#: ../svn/svn.c:1135 +msgid "" " A reintegrate merge also requires that the source branch is coherently\n" " synced with the target -- in the above example, this means that all\n" " revisions between the branch point W and the last merged revision X\n" " are merged to the feature branch, so that there are no unmerged\n" " revisions in-between.\n" "\n" +msgstr "" +" reintegrate å并è¿è¦æ±æºåæ¯ä¸ç®æ ä¿æè¿è´¯åæ¥ -- å¨ä¸é¢ç\n" +" ä¾åä¸ï¼è¿æå³çåæ¯ç¹ W ä¸æåå并ççæ¬ X ä¹é´çææçæ¬\n" +" é½å·²å并å°åè½åæ¯ï¼ä¸é´æ²¡ææªå并ççæ¬ã\n" "\n" + +#: ../svn/svn.c:1142 +msgid "" " 2. This form is called a 'cherry-pick' merge:\n" "\n" +msgstr "" +" 2. æ¤å½¢å¼ç§°ä¸º'æé'å并:\n" +"\n" + +#: ../svn/svn.c:1144 +msgid "" +" svn merge [-c M[,N...] | -r N:M ...] SOURCE[@REV] [TARGET_WCPATH]\n" +"\n" +msgstr "" " svn merge [-c M[,N...] | -r N:M ...] SOURCE[@REV] [TARGET_WCPATH]\n" "\n" + +#: ../svn/svn.c:1146 +msgid "" " A cherry-pick merge is used to merge specific revisions (or revision\n" " ranges) from one branch to another. By default, this uses merge\n" " tracking to automatically skip any revisions that have already been\n" " merged to the target; you can use the --ignore-ancestry option to\n" " disable such skipping.\n" "\n" +msgstr "" +" æéå并ç¨äºæç¹å®çæ¬(æçæ¬èå´)ä»ä¸ä¸ªåæ¯å并å°å¦ä¸ä¸ª\n" +" åæ¯ãé»è®¤æ åµä¸ï¼å®ä½¿ç¨å并è·è¸ªæ¥èªå¨è·³è¿å·²ç»å并å°ç®æ ç\n" +" çæ¬ï¼å¯ä»¥ç¨ --ignore-ancestry é项ç¦ç¨è¿ç§è·³è¿ã\n" +"\n" + +#: ../svn/svn.c:1152 +msgid "" " SOURCE is usually a URL. The optional '@REV' specifies only the peg\n" " revision of the URL and does not affect the merge range; if REV is not\n" " specified, the HEAD revision is assumed. If SOURCE is a working copy\n" " path, the corresponding URL of the path is used, and the default value\n" " of 'REV' is the base revision (usually the revision last updated to).\n" "\n" +msgstr "" +" SOURCE éå¸¸æ¯ URLãå¯éç '@REV' åªæå®è¯¥ URL çéå®çæ¬ï¼\n" +" ä¸å½±åå并èå´ï¼å¦ææªæå® REVï¼ååå®ä¸º HEAD çæ¬ãå¦æ\n" +" SOURCE æ¯å·¥ä½å¯æ¬è·¯å¾ï¼å使ç¨è¯¥è·¯å¾å¯¹åºç URLï¼'REV' é»è®¤\n" +" 为åºç¡çæ¬(é常æ¯æåæ´æ°å°ççæ¬)ã\n" +"\n" + +#: ../svn/svn.c:1158 ../svn/svn.c:1229 +msgid "" " TARGET_WCPATH is a working copy path; if omitted, '.' is generally\n" " assumed. The special cases noted above in the 'complete' merge form\n" " also apply here.\n" "\n" +msgstr "" +" TARGET_WCPATH æ¯å·¥ä½å¯æ¬è·¯å¾ï¼å¦æçç¥ï¼é常åå®ä¸º '.'ã\n" +" ä¸é¢è¡¨å 1 ä¸æå°çç¹æ®æ åµä¹éç¨äºæ¤ã\n" + +#: ../svn/svn.c:1162 +msgid "" " The revision ranges to be merged are specified by the '-r' and/or '-c'\n" " options. '-r N:M' refers to the difference in the history of the\n" " source branch between revisions N and M. You can use '-c M' to merge\n" " single revisions: '-c M' is equivalent to '-r <M-1>:M'. Each such\n" " difference is applied to TARGET_WCPATH.\n" "\n" +msgstr "" +" è¦å并ççæ¬èå´ç± '-r' å/æ '-c' é项æå®ã'-r N:M' ææº\n" +" åæ¯åå²ä¸çæ¬ N ä¸ M ä¹é´çå·®å¼ãå¯ä»¥ç¨ '-c M' å并å个\n" +" çæ¬: '-c M' çä»·äº '-r <M-1>:M'ãæ¯ä¸ªè¿æ ·çå·®å¼é½ä¼åºç¨å°\n" +" TARGET_WCPATHã\n" +"\n" + +#: ../svn/svn.c:1168 +msgid "" " If the mergeinfo in TARGET_WCPATH indicates that revisions within the\n" " range were already merged, changes made in those revisions are not\n" " merged again. If needed, the range is broken into multiple sub-ranges,\n" " and each sub-range is merged separately.\n" "\n" +msgstr "" +" å¦æ TARGET_WCPATH ä¸çå并信æ¯è¡¨æ该èå´å ççæ¬å·²ç»å并\n" +" è¿ï¼è¿äºçæ¬ä¸çæ´æ¹ä¸ä¼å次å并ãå¿ è¦æ¶è¯¥èå´ä¼è¢«ææå¤ä¸ª\n" +" åèå´ï¼æ¯ä¸ªåèå´åå«å并ã\n" +"\n" + +#: ../svn/svn.c:1173 +msgid "" " A 'reverse range' can be used to undo changes. For example, when\n" " source and target refer to the same branch, a previously committed\n" " revision can be 'undone'. In a reverse range, N is greater than M in\n" @@ -12596,14 +16680,42 @@ msgid "" " is equivalent to '-r M:<M-1>'. Undoing changes like this is also known\n" " as performing a 'reverse merge'.\n" "\n" +msgstr "" +" 'ååèå´'å¯ç¨äºæ¤éæ´æ¹ãä¾å¦ï¼å½æºåç®æ æååä¸åæ¯æ¶ï¼\n" +" å¯ä»¥'æ¤é'å åæ交çæ个çæ¬ãå¨ååèå´ä¸ï¼'-r N:M' ç N\n" +" å¤§äº Mï¼æè ç» '-c' é项ä¸ä¸ªè´æ°: '-c -M' çä»·äº\n" +" '-r M:<M-1>'ãè¿æ ·æ¤éæ´æ¹ä¹å«ååä¸æ¬¡'ååå并'ã\n" +"\n" + +#: ../svn/svn.c:1180 +msgid "" " Multiple '-c' and/or '-r' options may be specified and mixing of\n" " forward and reverse ranges is allowed.\n" "\n" +msgstr "" +" å¯æå®å¤ä¸ª '-c' å/æ '-r' é项ï¼å 许混å\n" +" æ£ååååèå´ã\n" +"\n" + +#: ../svn/svn.c:1183 +msgid "" " - Cherry-pick Merge Example -\n" "\n" +msgstr "" +" - æéåå¹¶ç¤ºä¾ -\n" +"\n" + +#: ../svn/svn.c:1185 +msgid "" " A bug has been fixed on trunk in revision 50. This fix needs to\n" " be merged from trunk onto the release branch.\n" "\n" +msgstr "" +" trunk ä¸å¨çæ¬ 50 ä¸ä¿®å¤äºä¸ä¸ª bugãæ¤ä¿®å¤éè¦\n" +" ä» trunk å并å°åå¸åæ¯ã\n" + +#: ../svn/svn.c:1188 +msgid "" " 1.x-release +-----------------------o-----\n" " / ^\n" " / |\n" @@ -12611,33 +16723,101 @@ msgid "" " trunk ------+--------------------------LR-----\n" " r50\n" "\n" +msgstr "" +" 1.x-release +-----------------------o-----\n" +" / ^\n" +" / |\n" +" / |\n" +" trunk ------+--------------------------LR-----\n" +" r50\n" +"\n" + +#: ../svn/svn.c:1195 +msgid "" " In the above diagram, L marks the left side (trunk@49) and R marks the\n" " right side (trunk@50) of the merge. The difference between the left\n" " and right side is applied to the target working copy path.\n" "\n" +msgstr "" +" å¨ä¸å¾ä¸ï¼L æ è®°å并ç左侧 (trunk@49)ï¼R æ è®°å³ä¾§\n" +" (trunk@50)ãå·¦å³ä¸¤ä¾§çå·®å¼è¢«åºç¨å°ç®æ å·¥ä½å¯æ¬è·¯å¾ã\n" +"\n" + +#: ../svn/svn.c:1199 +msgid "" " Note that the difference between revision 49 and 50 is exactly those\n" " changes that were committed in revision 50, not including changes\n" " committed in revision 49.\n" "\n" +msgstr "" +" 注æçæ¬ 49 ä¸ 50 ä¹é´çå·®å¼æ£å¥½æ¯çæ¬ 50 ä¸æ交çé£äºæ´æ¹ï¼\n" +" ä¸å æ¬çæ¬ 49 ä¸æ交çæ´æ¹ã\n" +"\n" + +#: ../svn/svn.c:1203 +msgid "" " To perform the merge, have a clean working copy of the release branch\n" " and run the following command in its top-level directory; remember\n" " that the default target is '.':\n" "\n" +msgstr "" +" è¦æ§è¡å并ï¼åå¤ä¸ä¸ªåå¸åæ¯çå¹²åå·¥ä½å¯æ¬ï¼å¹¶å¨å ¶é¡¶çº§ç®å½\n" +" ä¸è¿è¡ä»¥ä¸å½ä»¤ï¼è®°ä½é»è®¤ç®æ æ¯ '.':\n" +"\n" + +#: ../svn/svn.c:1207 +msgid "" +" svn merge -c50 ^/trunk\n" +"\n" +msgstr "" " svn merge -c50 ^/trunk\n" "\n" + +#: ../svn/svn.c:1209 +msgid "" " You can also cherry-pick several revisions and/or revision ranges:\n" "\n" +msgstr "" +" ä½ ä¹å¯ä»¥æéå¤ä¸ªçæ¬å/æçæ¬èå´:\n" +"\n" + +#: ../svn/svn.c:1211 +msgid "" " svn merge -c50,54,60 -r65:68 ^/trunk\n" "\n" +msgstr "" +" svn merge -c50,54,60 -r65:68 ^/trunk\n" "\n" + +#: ../svn/svn.c:1214 +msgid "" " 3. This form is called a '2-URL merge':\n" "\n" +msgstr "" +" 3. æ¤å½¢å¼ç§°ä¸º '2-URL å并':\n" +"\n" + +#: ../svn/svn.c:1216 +msgid "" +" svn merge SOURCE1[@REV1] SOURCE2[@REV2] [TARGET_WCPATH]\n" +"\n" +msgstr "" " svn merge SOURCE1[@REV1] SOURCE2[@REV2] [TARGET_WCPATH]\n" "\n" + +#: ../svn/svn.c:1218 +msgid "" " You should use this merge variant only if the other variants do not\n" " apply to your situation, as this variant can be quite complex to\n" " master.\n" "\n" +msgstr "" +" åªæå¨å ¶ä»åä½ä¸éç¨äºä½ çæ åµæ¶æåºä½¿ç¨æ¤å并åä½ï¼å 为å®\n" +" ç¸å½å¤æï¼ä¸å®¹æææ¡ã\n" +"\n" + +#: ../svn/svn.c:1222 +msgid "" " Two source URLs are specified, identifying two trees on the same\n" " branch or on different branches. The trees are compared and the\n" " difference from SOURCE1@REV1 to SOURCE2@REV2 is applied to the\n" @@ -12645,23 +16825,55 @@ msgid "" " branch may be the same as one or both sources, or different again.\n" " The three branches involved can be completely unrelated.\n" "\n" -" TARGET_WCPATH is a working copy path; if omitted, '.' is generally\n" -" assumed. The special cases noted above in the 'complete' merge form\n" -" also apply here.\n" +msgstr "" +" æå®ä¸¤ä¸ªæº URLï¼æ è¯åä¸åæ¯æä¸ååæ¯ä¸ç两棵æ ãæ¯è¾è¿ä¸¤\n" +" 棵æ ï¼æ SOURCE1@REV1 å° SOURCE2@REV2 çå·®å¼åºç¨å°\n" +" TARGET_WCPATH å¤ç®æ åæ¯çå·¥ä½å¯æ¬ãç®æ åæ¯å¯ä»¥ä¸å ¶ä¸ä¸ä¸ª\n" +" æ两个æºç¸åï¼ä¹å¯ä»¥æ¯å¦ä¸ä¸ªåæ¯ãæ¶åçä¸ä¸ªåæ¯å¯ä»¥å®å ¨\n" +" æ å ³ã\n" "\n" + +#: ../svn/svn.c:1233 +msgid "" " SOURCE1 and/or SOURCE2 can also be specified as a working copy path,\n" " in which case the merge source URL is derived from the working copy.\n" "\n" +msgstr "" +" SOURCE1 å/æ SOURCE2 ä¹å¯æå®ä¸ºå·¥ä½å¯æ¬è·¯å¾ï¼\n" +" å¨è¿ç§æ åµä¸ï¼åå¹¶æº URL ä»ä¸æ¨å¯¼ã\n" + +#: ../svn/svn.c:1236 +msgid "" " - 2-URL Merge Example -\n" "\n" +msgstr "" +" - 2-URL åå¹¶ç¤ºä¾ -\n" +"\n" + +#: ../svn/svn.c:1238 +msgid "" " Two features have been developed on separate branches called 'foo' and\n" " 'bar'. It has since become clear that 'bar' should be combined with\n" " the 'foo' branch for further development before reintegration.\n" "\n" +msgstr "" +" 两个åè½å¨å为 'foo' å 'bar' çç¬ç«åæ¯ä¸å¼åãç°å¨æç¡®äº:\n" +" å¨å并åå»ä¹åï¼åºè¯¥æ 'bar' å¹¶å ¥ 'foo' åæ¯ç»§ç»å¼åã\n" +"\n" + +#: ../svn/svn.c:1242 +msgid "" " Although both feature branches originate from trunk, they are not\n" " directly related -- one is not a direct copy of the other. A 2-URL\n" " merge is necessary.\n" "\n" +msgstr "" +" è½ç¶ä¸¤ä¸ªåè½åæ¯é½æºèª trunkï¼ä½å®ä»¬æ²¡æç´æ¥å ³ç³» -- ä¸ä¸ªä¸æ¯\n" +" å¦ä¸ä¸ªçç´æ¥å¯æ¬ãå¿ é¡»å 2-URL å并ã\n" +"\n" + +#: ../svn/svn.c:1246 +msgid "" " The 'bar' branch has been synced with trunk up to revision 500.\n" " (If this revision number is not known, it can be located using the\n" " 'svn log' and/or 'svn mergeinfo' commands.)\n" @@ -12669,6 +16881,16 @@ msgid "" " set of changes related to feature 'bar', and no other changes. These\n" " changes are applied to the 'foo' branch.\n" "\n" +msgstr "" +" 'bar' åæ¯å·²ä¸ trunk åæ¥å°çæ¬ 500ã\n" +" (å¦æä¸ç¥éè¿ä¸ªçæ¬å·ï¼å¯ä»¥ç¨ 'svn log' å/æ 'svn mergeinfo'\n" +" å½ä»¤æ¾å°ã)\n" +" trunk@500 ä¸ bar@HEAD ä¹é´çå·®å¼æ£å¥½æ¯ä¸åè½ 'bar' ç¸å ³çå ¨é¨\n" +" æ´æ¹ï¼ä¸å«å ¶ä»æ´æ¹ãè¿äºæ´æ¹å°åºç¨å° 'foo' åæ¯ã\n" +"\n" + +#: ../svn/svn.c:1253 +msgid "" " foo +-----------------------------------o\n" " / ^\n" " / /\n" @@ -12679,40 +16901,119 @@ msgid "" " \\ . /\n" " bar +-----------------------------------R\n" "\n" +msgstr "" +" foo +-----------------------------------o\n" +" / ^\n" +" / /\n" +" / r500 /\n" +" trunk ------+------+-----------------L---------> /\n" +" \\ . /\n" +" \\ ............ /\n" +" \\ . /\n" +" bar +-----------------------------------R\n" +"\n" + +#: ../svn/svn.c:1263 +msgid "" " In the diagram above, L marks the left side (trunk@500) and R marks\n" " the right side (bar@HEAD) of the merge. The difference between the\n" " left and right side is applied to the target working copy path, in\n" " this case a working copy of the 'foo' branch.\n" "\n" +msgstr "" +" å¨ä¸å¾ä¸ï¼L æ è®°å并ç左侧 (trunk@500)ï¼R æ è®°å³ä¾§\n" +" (bar@HEAD)ãå·¦å³ä¸¤ä¾§çå·®å¼è¢«åºç¨å°ç®æ å·¥ä½å¯æ¬è·¯å¾ï¼æ¬ä¾ä¸\n" +" å°±æ¯ 'foo' åæ¯çå·¥ä½å¯æ¬ã\n" +"\n" + +#: ../svn/svn.c:1268 +msgid "" " To perform the merge, have a clean working copy of the 'foo' branch\n" " and run the following command in its top-level directory:\n" "\n" +msgstr "" +" è¦æ§è¡å并ï¼åå¤ä¸ä¸ª 'foo' åæ¯çå¹²åå·¥ä½å¯æ¬\n" +" 并å¨å ¶é¡¶çº§ç®å½ä¸è¿è¡ä»¥ä¸å½ä»¤:\n" + +#: ../svn/svn.c:1271 +msgid "" " svn merge ^/trunk@500 ^/bar\n" "\n" +msgstr "" +" svn merge ^/trunk@500 ^/bar\n" +"\n" + +#: ../svn/svn.c:1273 +msgid "" " The exact changes applied by a 2-URL merge can be previewed with svn's\n" " diff command, which is a good idea to verify if you do not have the\n" " luxury of a clean working copy to merge to. In this case:\n" "\n" +msgstr "" +" 2-URL å并å®é åºç¨çæ´æ¹å¯ä»¥ç¨ svn ç diff å½ä»¤é¢è§ï¼å¦æ没æ\n" +" å¹²åçå·¥ä½å¯æ¬å¯ä¾å并ï¼æ好å è¿æ ·æ ¸å¯¹ä¸ä¸ãæ¬ä¾ä¸:\n" +"\n" + +#: ../svn/svn.c:1277 +msgid "" " svn diff ^/trunk@500 ^/bar@HEAD\n" "\n" +msgstr "" +" svn diff ^/trunk@500 ^/bar@HEAD\n" "\n" + +#: ../svn/svn.c:1280 +msgid "" " The following applies to all types of merges:\n" "\n" +msgstr "" +" 以ä¸éç¨äºææç±»åçå并:\n" +"\n" + +#: ../svn/svn.c:1282 +msgid "" " To prevent unnecessary merge conflicts, svn merge requires that\n" " TARGET_WCPATH is not a mixed-revision working copy. Running 'svn update'\n" " before starting a merge ensures that all items in the working copy are\n" " based on the same revision.\n" "\n" +msgstr "" +" 为é²æ¢ä¸å¿ è¦çå并å²çªï¼svn merge è¦æ± TARGET_WCPATH ä¸æ¯æ··å\n" +" çæ¬å·¥ä½å¯æ¬ãå¼å§å并åè¿è¡ 'svn update' å¯ç¡®ä¿å·¥ä½å¯æ¬ä¸ææ\n" +" 项é½åºäºåä¸çæ¬ã\n" +"\n" + +#: ../svn/svn.c:1287 +msgid "" " If possible, you should have no local modifications in the merge's target\n" " working copy prior to the merge, to keep things simpler. It will be\n" " easier to revert the merge and to understand the branch's history.\n" "\n" +msgstr "" +" å¦æå¯è½ï¼å并åç®æ å·¥ä½å¯æ¬ä¸ä¸åºææ¬å°ä¿®æ¹ï¼è¿æ ·äºæ æ´ç®åã\n" +" æ¤éå并ä¼æ´å®¹æï¼ä¹æ´å®¹æç解åæ¯çåå²ã\n" +"\n" + +#: ../svn/svn.c:1291 +msgid "" " Switched sub-paths should also be avoided during merging, as they may\n" " cause incomplete merges and create subtree mergeinfo.\n" "\n" +msgstr "" +" å并æé´ä¹åºé¿å åæ¢çåè·¯å¾ï¼å 为å®ä»¬å¯è½\n" +" 导è´ä¸å®æ´çå并并å建åæ å并信æ¯ã\n" + +#: ../svn/svn.c:1294 +msgid "" " For each merged item a line will be printed with characters reporting the\n" " action taken. These characters have the following meaning:\n" "\n" +msgstr "" +" 对æ¯ä¸ªå并ç项æå°ä¸è¡ï¼å å«æ¥åææ§è¡æä½çå符ã\n" +" è¿äºå符çå«ä¹å¦ä¸:\n" + +#: ../svn/svn.c:1297 ../svn/svn.c:1955 +msgid "" " A Added\n" " D Deleted\n" " U Updated\n" @@ -12721,14 +17022,41 @@ msgid "" " E Existed\n" " R Replaced\n" "\n" +msgstr "" +" A 已添å \n" +" D å·²å é¤\n" +" U å·²æ´æ°\n" +" C å²çª\n" +" G å·²å并\n" +" E å·²åå¨\n" +" R å·²æ¿æ¢\n" +"\n" + +#: ../svn/svn.c:1305 +msgid "" " Characters in the first column report about the item itself.\n" " Characters in the second column report about properties of the item.\n" " A 'C' in the third column indicates a tree conflict, while a 'C' in\n" " the first and second columns indicate textual conflicts in files\n" " and in property values, respectively.\n" "\n" +msgstr "" +" 第ä¸åçå符æ¥å项æ¬èº«çæ åµã\n" +" 第äºåçå符æ¥å项å±æ§çæ åµã\n" +" 第ä¸åç 'C' 表示æ å²çªï¼è第ä¸åå第äºåç 'C' åå«è¡¨ç¤ºæ件\n" +" ä¸åå±æ§å¼ä¸çææ¬å²çªã\n" +"\n" + +#: ../svn/svn.c:1311 +msgid "" " - Merge Tracking -\n" "\n" +msgstr "" +" - å并è·è¸ª -\n" +"\n" + +#: ../svn/svn.c:1313 +msgid "" " Subversion uses the svn:mergeinfo property to track merge history. This\n" " property is considered at the start of a merge to determine what to merge\n" " and it is updated at the conclusion of the merge to describe the merge\n" @@ -12738,11 +17066,33 @@ msgid "" " other). This is verified and enforced when using sync merges and\n" " reintegrate merges.\n" "\n" +msgstr "" +" Subversion ä½¿ç¨ svn:mergeinfo å±æ§æ¥è·è¸ªå并åå²ãå并å¼å§æ¶ä¼\n" +" åèæ¤å±æ§ä»¥ç¡®å®è¦å并çå 容ï¼å并ç»ææ¶ä¼æ´æ°å®ä»¥æè¿°åçç\n" +" å并ãä» å½ä¸¤ä¸ªæºä½äºåä¸åå²çº¿ä¸æ¶æ使ç¨åå¹¶ä¿¡æ¯ -- å³ç¬¬ä¸ä¸ª\n" +" æºæ¯ç¬¬äºä¸ªæºçç¥å ï¼æåä¹(å³å ¶ä¸ä¸ä¸ªæåæ¯å¤å¶å¦ä¸ä¸ªèæ¥)ã\n" +" 使ç¨åæ¥å并å reintegrate å并æ¶ä¼éªè¯å¹¶å¼ºå¶è¿ä¸ç¹ã\n" +"\n" + +#: ../svn/svn.c:1322 +msgid "" " The --ignore-ancestry option prevents merge tracking and thus ignores\n" " mergeinfo, neither considering it nor recording it.\n" "\n" +msgstr "" +" --ignore-ancestry é项é»æ¢å并è·è¸ªï¼ä»è忽ç¥\n" +" å并信æ¯ï¼æ¢ä¸èèä¹ä¸è®°å½ã\n" + +#: ../svn/svn.c:1325 +msgid "" " - Merging from foreign repositories -\n" "\n" +msgstr "" +" - ä»å¤é¨çæ¬åºå并 -\n" +"\n" + +#: ../svn/svn.c:1327 +msgid "" " Subversion does support merging from foreign repositories.\n" " While all merge source URLs must point to the same repository, the merge\n" " target working copy may come from a different repository than the source.\n" @@ -12751,17 +17101,29 @@ msgid "" " target. Also, merge-tracking is not supported for merges from foreign\n" " repositories.\n" msgstr "" +" Subversion ç¡®å®æ¯æä»å¤é¨çæ¬åºå并ã\n" +" è½ç¶ææåå¹¶æº URL å¿ é¡»æååä¸çæ¬åºï¼ä½å并ç®æ å·¥ä½å¯æ¬å¯ä»¥\n" +" æ¥èªä¸æºä¸åççæ¬åºãä¸è¿æä¸äºæ³¨æäºé¡¹ãæææ¾çæ¯ï¼å并æº\n" +" ä¸çå¤å¶å¨å并ç®æ ä¸ä¼åææ®éçæ·»å ãå¦å¤ï¼ä»å¤é¨çæ¬åºå并\n" +" ä¸æ¯æå并è·è¸ªã\n" -#: ../svn/svn.c:1174 +#: ../svn/svn.c:1338 msgid "force deletions even if deleted contents don't match" -msgstr "" +msgstr "å³ä½¿å é¤çå 容ä¸å¹é ä¹å¼ºå¶å é¤" -#: ../svn/svn.c:1178 +#: ../svn/svn.c:1343 msgid "" "Display merge-related information.\n" "usage: 1. mergeinfo SOURCE[@REV] [TARGET[@REV]]\n" " 2. mergeinfo --show-revs=WHICH SOURCE[@REV] [TARGET[@REV]]\n" "\n" +msgstr "" +"æ¾ç¤ºå并ç¸å ³ä¿¡æ¯ã\n" +"ç¨æ³: 1. åå¹¶ä¿¡æ¯ SOURCE[@REV] [TARGET[@REV]]\n" +" 2. åå¹¶ä¿¡æ¯ --show-revs=WHI\n" + +#: ../svn/svn.c:1347 +msgid "" " 1. Summarize the history of merging between SOURCE and TARGET. The graph\n" " shows, from left to right:\n" " the youngest common ancestor of the branches;\n" @@ -12769,91 +17131,203 @@ msgid "" " that will be used for the next complete merge;\n" " the repository path and revision number of the tip of each branch.\n" "\n" +msgstr "" +" 1. æ»ç» SOURCE ä¸ TARGET ä¹é´çå并åå²ãå¾ä»å·¦å°å³æ¾ç¤º:\n" +" 两个åæ¯æè¿çå ±åç¥å ï¼\n" +" ä»»ä¸æ¹åä¸æè¿çä¸æ¬¡å®æ´å并ï¼ä¹å°±æ¯ä¸æ¬¡å®æ´å并å°ä½¿ç¨ç\n" +" å ±ååºç¡ï¼\n" +" æ¯ä¸ªåæ¯é¡¶ç«¯ççæ¬åºè·¯å¾åçæ¬å·ã\n" +"\n" + +#: ../svn/svn.c:1354 +msgid "" " 2. Print the revision numbers on SOURCE that have been merged to TARGET\n" " (with --show-revs=merged), or that have not been merged to TARGET\n" " (with --show-revs=eligible). Print only revisions in which there was\n" " at least one change in SOURCE.\n" "\n" +msgstr "" +" 2. æå° SOURCE ä¸å·²åå¹¶å° TARGET ççæ¬å·(ç¨ --show-revs=merged)ï¼\n" +" æå°æªåå¹¶å° TARGET ççæ¬å·(ç¨ --show-revs=eligible)ãåªæå°\n" +" SOURCE ä¸è³å°æä¸å¤æ´æ¹ççæ¬ã\n" +"\n" + +#: ../svn/svn.c:1359 +msgid "" " If --revision (-r) is provided, filter the displayed information to\n" " show only that which is associated with the revisions within the\n" " specified range. Revision numbers, dates, and the 'HEAD' keyword are\n" " valid range values.\n" "\n" +msgstr "" +" å¦ææä¾äº --revision (-r)ï¼åè¿æ»¤æ¾ç¤ºçä¿¡æ¯ï¼åªæ¾ç¤ºä¸æå®\n" +" èå´å çæ¬ç¸å ³çå 容ãçæ¬å·ãæ¥æå 'HEAD' å ³é®åé½æ¯ææ\n" +" çèå´å¼ã\n" +"\n" + +#: ../svn/svn.c:1364 +msgid "" " SOURCE and TARGET are the source and target branch URLs, respectively.\n" " (If a WC path is given, the corresponding base URL is used.) The default\n" " TARGET is the current working directory ('.'). REV specifies the revision\n" " to be considered the tip of the branch; the default for SOURCE is HEAD,\n" " and the default for TARGET is HEAD for a URL or BASE for a WC path.\n" "\n" -" The depth can be 'empty' or 'infinity'; the default is 'empty'.\n" msgstr "" +" SOURCE å TARGET åå«æ¯æºåæ¯åç®æ åæ¯ç URLã(å¦æç»åºå·¥ä½\n" +" å¯æ¬è·¯å¾ï¼å使ç¨å¯¹åºçåºç¡ URLã)TARGET é»è®¤ä¸ºå½åå·¥ä½ç®å½\n" +" ('.')ãREV æå®è§ä¸ºåæ¯é¡¶ç«¯ççæ¬ï¼SOURCE é»è®¤ä¸º HEADï¼TARGET\n" +" 对 URL é»è®¤ä¸º HEADï¼å¯¹å·¥ä½å¯æ¬è·¯å¾é»è®¤ä¸º BASEã\n" +"\n" + +#: ../svn/svn.c:1370 +msgid " The depth can be 'empty' or 'infinity'; the default is 'empty'.\n" +msgstr " 深度å¯ä»¥æ¯ 'empty' æ 'infinity'ï¼é»è®¤ä¸º 'empty'ã\n" -#: ../svn/svn.c:1210 +#: ../svn/svn.c:1376 msgid "" "Create a new directory under version control.\n" -"usage: 1. mkdir PATH...\n" -" 2. mkdir URL...\n" +"usage: 1. mkdir PATH[@]...\n" +" 2. mkdir URL[@]...\n" "\n" +msgstr "" +"å¨çæ¬æ§å¶ä¸å建æ°ç®å½ã\n" +"ç¨æ³: 1. mkdir PATH[@]...\n" +" 2. mkdir URL[@]...\n" +"\n" + +#: ../svn/svn.c:1380 +msgid "" " Create version controlled directories.\n" "\n" +msgstr "" +"å建çæ¬æ§å¶çç®å½ã\n" +"\n" + +#: ../svn/svn.c:1382 +msgid "" " 1. Each directory specified by a working copy PATH is created locally\n" " and scheduled for addition upon the next commit.\n" "\n" +msgstr "" +" 1. å·¥ä½å¯æ¬ PATH æå®çæ¯ä¸ªç®å½å¨æ¬å°å建\n" +" 并å¨ä¸æ¬¡æ交æ¶è°åº¦ä¸ºæ·»å ã\n" + +#: ../svn/svn.c:1385 +msgid "" " 2. Each directory specified by a URL is created in the repository via\n" " an immediate commit.\n" "\n" +msgstr "" +" 2. URL æå®çæ¯ä¸ªç®å½éè¿ç«å³æ交\n" +" å¨çæ¬åºä¸å建ã\n" +"\n" + +#: ../svn/svn.c:1388 +msgid "" " In both cases, all the intermediate directories must already exist,\n" " unless the --parents option is given.\n" msgstr "" -"åå»ºçº³å ¥çæ¬æ§å¶çæ°ç®å½ã\n" -"ç¨æ³: 1ãmkdir PATH...\n" -" 2ãmkdir URL...\n" -"\n" -" å建çæ¬æ§å¶çç®å½ã\n" -"\n" -" 1ãæ¯ä¸ªä»¥å·¥ä½å¯æ¬ PATH æå®çç®å½ï¼é½ä¼å¨æ¬å°å建ï¼å¹¶ä¸å å ¥å¢å \n" -" è°åº¦ï¼ç´å°ä¸æ¬¡æ交ã\n" -"\n" -" 2ãæ¯ä¸ªä»¥ URL æå®çç®å½ï¼é½ä¼éè¿ç«å³æ交å¨çæ¬åºä¸å建ã\n" -"\n" -" å¨è¿ä¸¤ä¸ªæ åµä¸ï¼ææçä¸é´ç®å½é½å¿ é¡»äºå åå¨ï¼\n" -" é¤é使ç¨é项 --parentsã\n" +" å¨ä¸¤ç§æ åµä¸ï¼ææä¸é´ç®å½å¿ 须已åå¨ï¼\n" +" é¤éç»å® --parents é项ã\n" -#: ../svn/svn.c:1227 +#: ../svn/svn.c:1391 +msgid "" +" If PATH or URL contains an @ character, an additional @ must be\n" +" specified at the end of PATH/URL to avoid interpreting the\n" +" first @ as a peg revision indicator.\n" +msgstr "" +" å¦æ PATH æ URL å å« @ å符ï¼å¿ é¡»å¨ PATH/URL æ«å°¾é¢å¤æå® @ï¼\n" +" 以å æ第ä¸ä¸ª @ å½ä½éå®çæ¬æ è®°ã\n" + +#: ../svn/svn.c:1398 msgid "" "Move (rename) an item in a working copy or repository.\n" -"usage: move SRC... DST\n" +"usage: move SRC[@]... DST\n" +"\n" +msgstr "" +"å¨å·¥ä½å¯æ¬æçæ¬åºä¸ç§»å¨(éå½å)项ã\n" +"ç¨æ³: move SRC[@]... DST\n" "\n" + +#: ../svn/svn.c:1401 +msgid "" " SRC and DST can both be working copy (WC) paths or URLs:\n" " WC -> WC: move an item in a working copy, as a local change to\n" " be committed later (with or without further changes)\n" " URL -> URL: move an item in the repository directly, immediately\n" " creating a new revision in the repository\n" -" All the SRCs must be of the same type. When moving multiple sources,\n" -" they will be added as children of DST, which must be a directory.\n" +" All the SRCs must be of the same type. If DST is an existing directory,\n" +" the sources will be added as children of DST. When moving multiple\n" +" sources, DST must be an existing directory.\n" "\n" +msgstr "" +" SRC å DST é½å¯ä»¥æ¯å·¥ä½å¯æ¬(WC)è·¯å¾æ URL:\n" +" WC -> WC: 移å¨å·¥ä½å¯æ¬ä¸ç项ç®ï¼ä½ä¸ºæ¬å°ä¿®æ¹ç¨åæ交\n" +" (å¯å¸¦æä¸å¸¦è¿ä¸æ¥çä¿®æ¹)\n" +" URL -> URL: ç´æ¥ç§»å¨çæ¬åºä¸ç项ç®ï¼ç«å³å¨çæ¬åºä¸å建æ°çæ¬\n" +" ææ SRC å¿ é¡»æ¯ç¸åç±»åãå¦æ DST æ¯å·²åå¨çç®å½ï¼æºå°ä½ä¸º DST\n" +" çå项添å ã移å¨å¤ä¸ªæºæ¶ï¼DST å¿ é¡»æ¯å·²åå¨çç®å½ã\n" +"\n" + +#: ../svn/svn.c:1410 +msgid "" " SRC and DST of WC -> WC moves must be committed in the same revision.\n" " Furthermore, WC -> WC moves will refuse to move a mixed-revision subtree.\n" " To avoid unnecessary conflicts, it is recommended to run 'svn update'\n" " to update the subtree to a single revision before moving it.\n" " The --allow-mixed-revisions option is provided for backward compatibility.\n" -"\n" -" The --revision option has no use and is deprecated.\n" msgstr "" +" å·¥ä½å¯æ¬ -> å·¥ä½å¯æ¬ç§»å¨ç SRC å DST å¿ é¡»å¨åä¸çæ¬ä¸æ交ã\n" +" æ¤å¤ï¼å·¥ä½å¯æ¬ -> å·¥ä½å¯æ¬ç§»å¨ä¼æç»ç§»å¨æ··åçæ¬çåæ ã\n" +" 为é¿å ä¸å¿ è¦çå²çªï¼å»ºè®®ç§»å¨åå è¿è¡ 'svn update' æåæ æ´æ°å°\n" +" åä¸çæ¬ã\n" +" æä¾ --allow-mixed-revisions é项æ¯ä¸ºäºååå ¼å®¹ã\n" + +#: ../svn/svn.c:1416 +msgid "" +" If any SRC contains an @ character, an additional @ must be\n" +" specified at the end of that SRC to avoid interpreting the\n" +" first @ as a peg revision indicator. This does not apply to DST.\n" +msgstr "" +" å¦æä»»ä½ SRC å å« @ å符ï¼å¿ é¡»å¨è¯¥ SRC æ«å°¾é¢å¤æå® @ï¼ä»¥å æ\n" +" 第ä¸ä¸ª @ å½ä½éå®çæ¬æ è®°ãè¿ä¸éç¨äº DSTã\n" -#: ../svn/svn.c:1249 +#: ../svn/svn.c:1425 msgid "" "Apply a patch to a working copy.\n" -"usage: patch PATCHFILE [WCPATH]\n" +"usage: patch PATCHFILE [WCPATH[@]]\n" +"\n" +msgstr "" +"å°è¡¥ä¸åºç¨å°å·¥ä½å¯æ¬ã\n" +"ç¨æ³: patch PATCHFILE [WCPATH[@]]\n" "\n" + +#: ../svn/svn.c:1428 +msgid "" " Apply a unidiff patch in PATCHFILE to the working copy WCPATH.\n" " If WCPATH is omitted, '.' is assumed.\n" "\n" +msgstr "" +" å° PATCHFILE ä¸ç unidiff è¡¥ä¸åºç¨å°å·¥ä½å¯æ¬ WCPATHã\n" +" å¦æçç¥ WCPATHï¼åå®ä¸º '.'ã\n" +"\n" + +#: ../svn/svn.c:1431 +msgid "" " A unidiff patch suitable for application to a working copy can be\n" " produced with the 'svn diff' command or third-party diffing tools.\n" " Any non-unidiff content of PATCHFILE is ignored, except for Subversion\n" " property diffs as produced by 'svn diff'.\n" "\n" +msgstr "" +" éååºç¨å°å·¥ä½å¯æ¬ç unidiff è¡¥ä¸å¯ä»¥ç¨ 'svn diff' å½ä»¤æ第ä¸æ¹\n" +" æ¯è¾å·¥å ·çæãPATCHFILE ä¸ä»»ä½é unidiff å 容é½ä¼è¢«å¿½ç¥ï¼ä½\n" +" 'svn diff' 产çç Subversion å±æ§å·®å¼é¤å¤ã\n" +"\n" + +#: ../svn/svn.c:1436 +msgid "" " Changes listed in the patch will either be applied or rejected.\n" " If a change does not match at its exact line offset, it may be applied\n" " earlier or later in the file if a match is found elsewhere for the\n" @@ -12863,23 +17337,65 @@ msgid "" " If no matching context can be found for a change, the change conflicts\n" " and will be written to a reject file with the extension .svnpatch.rej.\n" "\n" +msgstr "" +" è¡¥ä¸ä¸ååºçä¿®æ¹å°è¢«åºç¨ææç»ã\n" +" å¦ææ个修æ¹å¨å ¶ç¡®åçè¡å移å¤ä¸å¹é ï¼ä½å¨æ件çå ¶ä»ä½ç½®æ¾å°äº\n" +" è¡¥ä¸æä¾çä¸ä¸æè¡çå¹é ï¼å该修æ¹å¯è½è¢«åºç¨å¨æ´æ©ææ´æçä½ç½®ã\n" +" ä¿®æ¹ä¹å¯è½ä»¥æ¨¡ç³(fuzz)æ¹å¼åºç¨ï¼å³å¹é ä¿®æ¹æ¶å¿½ç¥ä¸è¡æå¤è¡ä¸ä¸æã\n" +" å¦ææ¾ä¸å°æ个修æ¹çå¹é ä¸ä¸æï¼è¯¥ä¿®æ¹ä¼å²çªï¼å¹¶è¢«åå ¥æ©å±å为\n" +" .svnpatch.rej çæç»æ件ä¸ã\n" +"\n" + +#: ../svn/svn.c:1445 +msgid "" " For each patched file a line will be printed with characters reporting\n" " the action taken. These characters have the following meaning:\n" "\n" +msgstr "" +" 对æ¯ä¸ªæè¡¥ä¸çæ件æå°ä¸è¡ï¼å å«æ¥åææ§è¡æä½çå符ã\n" +" è¿äºå符çå«ä¹å¦ä¸:\n" + +#: ../svn/svn.c:1448 +msgid "" " A Added\n" " D Deleted\n" " U Updated\n" " C Conflict\n" " G Merged (with local uncommitted changes)\n" "\n" +msgstr "" +" A 已添å \n" +" D å·²å é¤\n" +" U å·²æ´æ°\n" +" C å²çª\n" +" G å·²å并(ææ¬å°æªæ交çæ´æ¹)\n" +"\n" + +#: ../svn/svn.c:1454 +msgid "" " Changes applied with an offset or fuzz are reported on lines starting\n" " with the '>' symbol. You should review such changes carefully.\n" "\n" +msgstr "" +" 使ç¨å移æ模ç³å¹é åºç¨çæ´æ¹ä¼å¨ä»¥ '>' å¼å¤´çè¡ä¸æ¥åãä½ åºè¯¥\n" +" ä»ç»å®¡æ¥è¿ç±»æ´æ¹ã\n" +"\n" + +#: ../svn/svn.c:1457 +msgid "" " If the patch removes all content from a file, that file is scheduled\n" " for deletion. If the patch creates a new file, that file is scheduled\n" " for addition. Use 'svn revert' to undo deletions and additions you\n" " do not agree with.\n" "\n" +msgstr "" +" å¦æè¡¥ä¸ç§»é¤äºæ件çå ¨é¨å 容ï¼è¯¥æ件ä¼è¢«è°åº¦ä¸ºå é¤ãå¦æè¡¥ä¸\n" +" å建äºæ°æ件ï¼è¯¥æ件ä¼è¢«è°åº¦ä¸ºæ·»å ãç¨ 'svn revert' æ¤éä½ ä¸\n" +" 认å¯çå é¤åæ·»å ã\n" +"\n" + +#: ../svn/svn.c:1462 +msgid "" " Hint: If the patch file was created with Subversion, it will contain\n" " the number of a revision N the patch will cleanly apply to\n" " (look for lines like '--- foo/bar.txt (revision N)').\n" @@ -12887,130 +17403,222 @@ msgid "" " 'svn update -r N', apply the patch, and then update back to the\n" " HEAD revision. This way, conflicts can be resolved interactively.\n" msgstr "" +" æ示: å¦æè¡¥ä¸æä»¶ç± Subversion å建ï¼å®ä¼å å«è¡¥ä¸å¯ä»¥å¹²ååºç¨\n" +" ççæ¬å· N (æ¥æ¾ç±»ä¼¼ '--- foo/bar.txt (revision N)'\n" +" çè¡)ã为é¿å 产çæç»åï¼å ç¨ 'svn update -r N' æ´æ°å°çæ¬\n" +" Nï¼åºç¨è¡¥ä¸ï¼ç¶ååæ´æ°å HEAD çæ¬ãè¿æ ·å¯ä»¥äº¤äºå¼å°è§£å³\n" +" å²çªã\n" + +#: ../svn/svn.c:1469 ../svn/svn.c:2017 +msgid "" +" If WCPATH contains an @ character, an additional @ must be\n" +" specified at the end of WCPATH to avoid interpreting the\n" +" first @ as a peg revision indicator.\n" +msgstr "" +" å¦æ WCPATH å å« @ å符ï¼å¿ é¡»å¨ WCPATH æ«å°¾é¢å¤æå® @ï¼ä»¥å æ\n" +" 第ä¸ä¸ª @ å½ä½éå®çæ¬æ è®°ã\n" -#: ../svn/svn.c:1297 +#: ../svn/svn.c:1477 msgid "" "Remove a property from files, dirs, or revisions.\n" -"usage: 1. propdel PROPNAME [PATH...]\n" -" 2. propdel PROPNAME --revprop -r REV [TARGET]\n" +"usage: 1. propdel PROPNAME [PATH[@]...]\n" +" 2. propdel PROPNAME --revprop -r REV [TARGET[@]]\n" "\n" +msgstr "" +"ä»æ件ãç®å½æçæ¬ä¸ç§»é¤å±æ§ã\n" +"ç¨æ³: 1. propdel PROPNAME [PATH[@]...]\n" +" 2. propdel PROPNAME -\n" + +#: ../svn/svn.c:1481 +msgid "" " 1. Removes versioned props in working copy.\n" " 2. Removes unversioned remote prop on repos revision.\n" " TARGET only determines which repository to access.\n" +"\n" msgstr "" -"å é¤ç®å½ãæ件æçæ¬çå±æ§ã\n" -"ç¨æ³: 1ãpropdel PROPNAME [PATH...]\n" -" 2ãpropdel PROPNAME --revprop -r REV [URL]\n" +" 1. 移é¤å·¥ä½å¯æ¬ä¸çå·²çæ¬æ§å¶å±æ§ã\n" +" 2. 移é¤çæ¬åºçæ¬ä¸çæªçæ¬æ§å¶è¿ç¨å±æ§ã\n" +" TARGET åªå³å®è®¿é®åªä¸ªçæ¬åºã\n" "\n" -" 1ãå é¤å·¥ä½å¯æ¬ä¸çº³å ¥çæ¬ç®¡ççæ件æç®å½çå±æ§ã\n" -" 2ãå é¤çæ¬åºä¸çæ¬çå±æ§ãTARGETåªç¨æ¥å¤æ访é®åªä¸ªçæ¬åºã\n" -#: ../svn/svn.c:1307 -#, fuzzy +#: ../svn/svn.c:1485 ../svn/svn.c:1502 ../svn/svn.c:1530 ../svn/svn.c:1554 +msgid " See 'svn help propset' for descriptions of the svn:* special properties.\n" +msgstr " åè§ 'svn help propset' äºè§£ svn:* ç¹æ®å±æ§çæè¿°ã\n" + +#: ../svn/svn.c:1487 ../svn/svn.c:1652 +msgid "" +" If PATH or TARGET contains an @ character, an additional @ must be\n" +" specified at the end of PATH or TARGET to avoid interpreting the\n" +" first @ as a peg revision indicator.\n" +msgstr "" +" å¦æ PATH æ TARGET å å« @ å符ï¼å¿ é¡»å¨ PATH æ TARGET æ«å°¾é¢å¤\n" +" æå® @ï¼ä»¥å æ第ä¸ä¸ª @ å½ä½éå®çæ¬æ è®°ã\n" + +#: ../svn/svn.c:1494 msgid "" "Edit a property with an external editor.\n" -"usage: 1. propedit PROPNAME TARGET...\n" -" 2. propedit PROPNAME --revprop -r REV [TARGET]\n" +"usage: 1. propedit PROPNAME TARGET[@]...\n" +" 2. propedit PROPNAME --revprop -r REV [TARGET[@]]\n" "\n" +msgstr "" +"使ç¨å¤é¨ç¼è¾å¨ç¼è¾å±æ§ã\n" +"ç¨æ³: 1. propedit PROPNAME TARGET[@]...\n" +" 2. propedit PROPNAME --revpro\n" + +#: ../svn/svn.c:1498 +msgid "" " 1. Edits versioned prop in working copy or repository.\n" " 2. Edits unversioned remote prop on repos revision.\n" " TARGET only determines which repository to access.\n" "\n" -" See 'svn help propset' for more on setting properties.\n" msgstr "" -"使ç¨å¤é¨ç¼è¾å¨ç¼è¾å±æ§ã\n" -"ç¨æ³: 1ãpropedit PROPNAME TARGET...\n" -" 2ãpropedit PROPNAME --revprop -r REV [TARGET]\n" -"\n" -" 1ãç¼è¾å·¥ä½å¯æ¬æè çæ¬åºä¸åçæ¬æ§å¶çå±æ§ã\n" -" 2ãç¼è¾çæ¬åºä¸æå®çæ¬çæªçæ¬æ§å¶çè¿ç¨å±æ§ã\n" -" TARGET åªç¨æ¥å¤æ访é®åªä¸ä¸ªçæ¬åºã\n" +" 1. ç¼è¾å·¥ä½å¯æ¬æçæ¬åºä¸çå·²çæ¬æ§å¶å±æ§ã\n" +" 2. ç¼è¾çæ¬åºçæ¬ä¸çæªçæ¬æ§å¶è¿ç¨å±æ§ã\n" +" TARGET åªå³å®è®¿é®åªä¸ªçæ¬åºã\n" "\n" -"åè§ âsvn help propsetâ 以è·å¾æ´å¤è®¾ç½®å±æ§çä¿¡æ¯ã\n" -#: ../svn/svn.c:1319 -#, fuzzy +#: ../svn/svn.c:1504 ../svn/svn.c:1532 ../svn/svn.c:1556 ../svn/svn.c:1938 +msgid "" +" If TARGET contains an @ character, an additional @ must be\n" +" specified at the end of TARGET to avoid interpreting the\n" +" first @ as a peg revision indicator.\n" +msgstr "" +" å¦æ TARGET å å« @ å符ï¼å¿ é¡»å¨ TARGET æ«å°¾é¢å¤æå® @\n" +" 以é¿å å°ç¬¬ä¸ä¸ª @ åçé¨å解é为éå®çæ¬ã\n" + +#: ../svn/svn.c:1511 msgid "" "Print the value of a property on files, dirs, or revisions.\n" "usage: 1. propget PROPNAME [TARGET[@REV]...]\n" -" 2. propget PROPNAME --revprop -r REV [TARGET]\n" +" 2. propget PROPNAME --revprop -r REV [TARGET[@]]\n" "\n" +msgstr "" +"æå°æ件ãç®å½æçæ¬ä¸çå±æ§å¼ã\n" +"ç¨æ³: 1. propget PROPNAME [TARGET[@REV]...]\n" +" 2. propget PROPNAME --revprop -r REV [TARGET[@]]\n" +"\n" + +#: ../svn/svn.c:1515 +msgid "" " 1. Prints versioned props. If specified, REV determines in which\n" " revision the target is first looked up.\n" " 2. Prints unversioned remote prop on repos revision.\n" " TARGET only determines which repository to access.\n" "\n" +msgstr "" +" 1. æå°å·²çæ¬æ§å¶å±æ§ãå¦ææå®äº REVï¼å®å³å®å å¨åªä¸ªçæ¬ä¸\n" +" æ¥æ¾ç®æ ã\n" +" 2. æå°çæ¬åºçæ¬ä¸çæªçæ¬æ§å¶è¿ç¨å±æ§ã\n" +" TARGET åªå³å®è®¿é®åªä¸ªçæ¬åºã\n" +"\n" + +#: ../svn/svn.c:1520 +msgid "" " With --verbose, the target path and the property name are printed on\n" " separate lines before each value, like 'svn proplist --verbose'.\n" " Otherwise, if there is more than one TARGET or a depth other than\n" " 'empty', the target path is printed on the same line before each value.\n" "\n" +msgstr "" +" ä½¿ç¨ --verbose æ¶ï¼ç®æ è·¯å¾åå±æ§åä¼å¨æ¯ä¸ªå¼ä¹ååè¡æå°ï¼\n" +" å°±å 'svn proplist --verbose'ãå¦åï¼å¦æ TARGET å¤äºä¸ä¸ªï¼æè \n" +" 深度ä¸æ¯ 'empty'ï¼åç®æ è·¯å¾æå°å¨æ¯ä¸ªå¼ä¹åçåä¸è¡ä¸ã\n" +"\n" + +#: ../svn/svn.c:1525 +msgid "" " By default, an extra newline is printed after the property value so that\n" " the output looks pretty. With a single TARGET, depth 'empty' and without\n" -" --show-inherited-props, you can use the --strict option to disable this\n" +" --show-inherited-props, you can use the --no-newline option to disable this\n" " (useful when redirecting a binary property value to a file, for example).\n" +"\n" msgstr "" -"æ¾ç¤ºç®å½ãæ件æçæ¬çå±æ§åå¼ã\n" -"ç¨æ³: 1ãpropget PROPNAME [TARGET[@REV]...]\n" -" 2ãpropget PROPNAME --revprop -r REV [URL]\n" -"\n" -" 1ãæ¾ç¤ºçæ¬æ§å¶çå±æ§ãREV æå®ä»åªä¸ªçæ¬å¼å§æ¥æ¾ç®æ ã\n" -" 2ãæ¾ç¤ºçæ¬åºä¸çæ¬çæªçæ¬æ§å¶çè¿ç¨å±æ§ã\n" -" åªç¨æ¥å¤æ访é®åªä¸ªçæ¬åºã\n" -"\n" -" æ¬åå½ä»¤é»è®¤ä¼å¨å±æ§å 容å ä¸é¢å¤çæ¢è¡ç¬¦ï¼å¾å°ç¾è§çè¾åºãå¦å¤ï¼\n" -" å½åæ¶å¤çå¤ä¸ªè·¯å¾æ¶ï¼æ¯ä¸ä¸ªå±æ§å 容ä¼å¨å¼å¤´å¢å ä¸å®æ对åºçè·¯å¾ã\n" -" ä½¿ç¨ --strict é项å¯ä»¥å ³éè¿äºç¾åè¡ä¸º (å®å¾æç¨ï¼ä¾å¦å°äºè¿å¶å±\n" -" æ§å 容éå®åå°ä¸ä¸ªæ件ï¼ä½æ¯ä» ç¨äºåä¸ç®æ çééå½æä½)ã\n" +" é»è®¤æ åµä¸ï¼å±æ§å¼ä¹åä¼å¤æå°ä¸ä¸ªæ¢è¡ç¬¦ï¼ä½¿è¾åºå¥½çãå½åªæ\n" +" ä¸ä¸ª TARGETã深度为 'empty' ä¸æªæå® --show-inherited-props æ¶ï¼\n" +" å¯ä»¥ç¨ --no-newline é项ç¦ç¨å®(ä¾å¦æäºè¿å¶å±æ§å¼éå®åå°æ件\n" +" æ¶å¾æç¨)ã\n" +"\n" -#: ../svn/svn.c:1339 ../svn/svn.c:1356 +#: ../svn/svn.c:1538 ../svn/svn.c:1562 msgid "print path, name and value on separate lines" -msgstr "" +msgstr "å¨åç¬çè¡ä¸æå°è·¯å¾ãå称åå¼" -#: ../svn/svn.c:1340 -#, fuzzy -msgid "don't print an extra newline" -msgstr "ä¸æå°æªçæ¬æ§å¶çæ¡ç®" +#: ../svn/svn.c:1539 +msgid "(deprecated; use --no-newline)" +msgstr "(å·²åºå¼ï¼ä½¿ç¨ --no-newline)" -#: ../svn/svn.c:1343 -#, fuzzy +#: ../svn/svn.c:1542 msgid "" "List all properties on files, dirs, or revisions.\n" "usage: 1. proplist [TARGET[@REV]...]\n" -" 2. proplist --revprop -r REV [TARGET]\n" +" 2. proplist --revprop -r REV [TARGET[@]]\n" "\n" +msgstr "" +"ååºæ件ãç®å½æçæ¬ä¸çææå±æ§ã\n" +"ç¨æ³: 1. proplist [TARGET[@REV]...]\n" +" 2. proplist --revprop -r\n" + +#: ../svn/svn.c:1546 +msgid "" " 1. Lists versioned props. If specified, REV determines in which\n" " revision the target is first looked up.\n" " 2. Lists unversioned remote props on repos revision.\n" " TARGET only determines which repository to access.\n" "\n" +msgstr "" +" 1. ååºå·²çæ¬æ§å¶å±æ§ãå¦ææå®äº REVï¼å®å³å®å å¨åªä¸ªçæ¬ä¸\n" +" æ¥æ¾ç®æ ã\n" +" 2. ååºçæ¬åºçæ¬ä¸çæªçæ¬æ§å¶è¿ç¨å±æ§ã\n" +" TARGET åªå³å®è®¿é®åªä¸ªçæ¬åºã\n" +"\n" + +#: ../svn/svn.c:1551 +msgid "" " With --verbose, the property values are printed as well, like 'svn propget\n" " --verbose'. With --quiet, the paths are not printed.\n" -msgstr "" -"ååºç®å½ãæ件æçæ¬çææå±æ§ã\n" -"ç¨æ³: 1ãproplist [TARGET[@REV]...]\n" -" 2ãproplist --revprop -r REV [TARGET]\n" "\n" -" 1ãæ¾ç¤ºç®æ çå±æ§ãREV æå®ä»åªä¸ªçæ¬å¼å§æ¥æ¾ç®æ ã\n" -" 2ãååºçæ¬åºä¸çæ¬çå±æ§ãTARGET åªç¨æ¥å¤æ访é®åªä¸ªçæ¬åºã\n" +msgstr "" +" ä½¿ç¨ --verbose æ¶ï¼ä¹æå°å±æ§å¼ï¼ç±»ä¼¼ 'svn propget\n" +" --verbose'ãä½¿ç¨ --quiet æ¶ï¼ä¸æå°è·¯å¾ã\n" -#: ../svn/svn.c:1357 -#, fuzzy +#: ../svn/svn.c:1563 msgid "don't print the path" -msgstr "ä¸è¦è§£éç®æ " +msgstr "ä¸æå°è·¯å¾" -#: ../svn/svn.c:1360 +#: ../svn/svn.c:1566 msgid "" "Set the value of a property on files, dirs, or revisions.\n" -"usage: 1. propset PROPNAME PROPVAL PATH...\n" -" 2. propset PROPNAME --revprop -r REV PROPVAL [TARGET]\n" +"usage: 1. propset PROPNAME PROPVAL PATH[@]...\n" +" 2. propset PROPNAME --revprop -r REV PROPVAL [TARGET[@]]\n" +"\n" +msgstr "" +"设置æ件ãç®å½æçæ¬ä¸çå±æ§å¼ã\n" +"ç¨æ³: 1. propset PROPNAME PROPVAL PATH[@]...\n" +" 2. propset PROPNAME --revprop -r REV PROPVAL [TARGET[@]]\n" "\n" + +#: ../svn/svn.c:1570 +msgid "" " 1. Changes a versioned file or directory property in a working copy.\n" " 2. Changes an unversioned property on a repository revision.\n" " (TARGET only determines which repository to access.)\n" "\n" +msgstr "" +" 1. æ´æ¹å·¥ä½å¯æ¬ä¸å·²çæ¬æ§å¶çæ件æç®å½å±æ§ã\n" +" 2. æ´æ¹çæ¬åºçæ¬ä¸çæªçæ¬æ§å¶å±æ§ã\n" +" (TARGET åªå³å®è®¿é®åªä¸ªçæ¬åºã)\n" +"\n" + +#: ../svn/svn.c:1574 +msgid "" " The value may be provided with the --file option instead of PROPVAL.\n" "\n" +msgstr "" +" å¼ä¹å¯éè¿ --file é项æä¾èé PROPVALã\n" +"\n" + +#: ../svn/svn.c:1576 +msgid "" " Property names starting with 'svn:' are reserved. Subversion recognizes\n" " the following special versioned properties on a file:\n" " svn:keywords - Keywords to be expanded. Valid keywords are:\n" @@ -13022,6 +17630,21 @@ msgid "" " Id - A compressed summary of the previous four.\n" " Header - Similar to Id but includes the full URL.\n" "\n" +msgstr "" +" 以 'svn:' å¼å¤´çå±æ§åæ¯ä¿ççãSubversion è¯å«æ件ä¸ç以ä¸ç¹æ®\n" +" åçæ¬æ§å¶å±æ§:\n" +" svn:keywords - è¦å±å¼çå ³é®åãææå ³é®å为:\n" +" URL, HeadURL - æ件ææ°çæ¬ç URLã\n" +" Author, LastChangedBy - æåä¿®æ¹æ件ç人ã\n" +" Date, LastChangedDate - æ件æåä¿®æ¹çæ¥æ/æ¶é´ã\n" +" Rev, Revision, - æ件æååæ´ççæ¬ã\n" +" LastChangedRevision\n" +" Id - åé¢å项çå缩æè¦ã\n" +" Header - 类似 Id ä½å å«å®æ´ URLã\n" +"\n" + +#: ../svn/svn.c:1587 +msgid "" " Custom keywords can be defined with a format string separated from\n" " the keyword name with '='. Valid format substitutions are:\n" " %a - The author of the revision given by %r.\n" @@ -13040,6 +17663,28 @@ msgid "" " Once a custom keyword has been defined for a file, it can be used\n" " within the file like any other keyword: $MyKeyword$\n" "\n" +msgstr "" +" èªå®ä¹å ³é®åå¯ç¨æ ¼å¼ä¸²å®ä¹ï¼æ ¼å¼ä¸²ä¸å ³é®ååä¹é´ç¨ '=' åéã\n" +" ææçæ ¼å¼æ¿æ¢ä¸º:\n" +" %a - %r ææçæ¬çä½è ã\n" +" %b - æ件 URL çåºæ¬åã\n" +" %d - %r ææçæ¬æ¥æççæ ¼å¼ã\n" +" %D - %r ææçæ¬æ¥æçé¿æ ¼å¼ã\n" +" %P - æ件ç¸å¯¹äºçæ¬åºæ ¹çè·¯å¾ã\n" +" %r - æååæ´è¯¥æ件ççæ¬å·ã\n" +" %R - çæ¬åºæ ¹ç URLã\n" +" %u - æ件ç URLã\n" +" %_ - ä¸ä¸ªç©ºæ ¼(å ³é®åå®ä¹ä¸è½å å«åé¢ç©ºæ ¼)ã\n" +" %% - åé¢ç '%'ã\n" +" %H - çåäº %P%_%r%_%d%_%aã\n" +" %I - çåäº %b%_%r%_%d%_%aã\n" +" èªå®ä¹å ³é®åå®ä¹ç¤ºä¾: MyKeyword=%r%_%a%_%P\n" +" 为æ件å®ä¹èªå®ä¹å ³é®ååï¼å³å¯åå ¶ä»å ³é®åä¸æ ·å¨æ件ä¸ä½¿ç¨:\n" +" $MyKeyword$\n" +"\n" + +#: ../svn/svn.c:1605 +msgid "" " svn:executable - If present, make the file executable. Use\n" " 'svn propdel svn:executable PATH...' to clear.\n" " svn:eol-style - One of 'native', 'LF', 'CR', 'CRLF'.\n" @@ -13052,10 +17697,31 @@ msgid "" " when it is not locked. Use 'svn propdel svn:needs-lock PATH...'\n" " to clear.\n" "\n" +msgstr "" +" svn:executable - å¦æåå¨ï¼ä½¿æ件å¯æ§è¡ãç¨\n" +" 'svn propdel svn:executable PATH...' æ¸ é¤ã\n" +" svn:eol-style - 'native'ã'LF'ã'CR'ã'CRLF' ä¹ä¸ã\n" +" svn:mime-type - æ件ç MIME ç±»åãç¨äºç¡®å®æ¯å¦å并该æ件ï¼\n" +" 以å Apache å¦ä½æä¾å®ã以 'text/' å¼å¤´ç MIME ç±»å(ææ MIME\n" +" ç±»å)è§ä¸ºææ¬ãå ¶ä»ä¸åè§ä¸ºäºè¿å¶ã\n" +" svn:needs-lock - å¦æåå¨ï¼è¡¨ç¤ºæ件å¨ä¿®æ¹ååºå å éãæªå éæ¶\n" +" 使工ä½å¯æ¬æ件åªè¯»ãç¨ 'svn propdel svn:needs-lock PATH...'\n" +" æ¸ é¤ã\n" +"\n" + +#: ../svn/svn.c:1617 +msgid "" " Subversion recognizes the following special versioned properties on a\n" " directory:\n" " svn:ignore - A list of file glob patterns to ignore, one per line.\n" " svn:global-ignores - Like svn:ignore, but inheritable.\n" +" svn:auto-props - Automatically set properties on files when they are\n" +" added or imported. Contains key-value pairs, one per line, in the format:\n" +" PATTERN = PROPNAME=VALUE[;PROPNAME=VALUE ...]\n" +" Example (where a literal ';' is escaped by adding another ';'):\n" +" *.html = svn:eol-style=native;svn:mime-type=text/html;; charset=UTF8\n" +" Applies recursively to all files added or imported under the directory\n" +" it is set on. See also [auto-props] in the client configuration file.\n" " svn:externals - A list of module specifiers, one per line, in the\n" " following format similar to the syntax of 'svn checkout':\n" " [-r REV] URL[@PEG] LOCALPATH\n" @@ -13080,116 +17746,324 @@ msgid "" " 'relative_url relative_path' with peg revision support.\n" " Lines starting with a '#' character are ignored.\n" msgstr "" +" Subversion è¯å«ç®å½ä¸ç以ä¸ç¹æ®åçæ¬æ§å¶å±æ§:\n" +" svn:ignore - è¦å¿½ç¥çæ件 glob 模å¼å表ï¼æ¯è¡ä¸ä¸ªã\n" +" svn:global-ignores - 类似 svn:ignoreï¼ä½å¯ç»§æ¿ã\n" +" svn:auto-props - æ件被添å æå¯¼å ¥æ¶èªå¨è®¾ç½®å±æ§ãå å«é®å¼å¯¹ï¼\n" +" æ¯è¡ä¸ä¸ªï¼æ ¼å¼ä¸º:\n" +" PATTERN = PROPNAME=VALUE[;PROPNAME=VALUE ...]\n" +" 示ä¾(å ¶ä¸åé¢ç ';' éè¿åå ä¸ä¸ª ';' æ¥è½¬ä¹):\n" +" *.html = svn:eol-style=native;svn:mime-type=text/html;; charset=UTF8\n" +" éå½åºç¨äºè®¾ç½®è¯¥å±æ§çç®å½ä¸ææ被添å æå¯¼å ¥çæ件ãå¦è§å®¢æ·ç«¯\n" +" é ç½®æ件ä¸ç [auto-props]ã\n" +" svn:externals - 模å说æ符å表ï¼æ¯è¡ä¸ä¸ªï¼æ ¼å¼ç±»ä¼¼ 'svn checkout'\n" +" çè¯æ³:\n" +" [-r REV] URL[@PEG] LOCALPATH\n" +" 示ä¾:\n" +" http://example.com/repos/zig foo/bar\n" +" LOCALPATH ç¸å¯¹äºæ¥ææ¤å±æ§çç®å½ã\n" +" è¦å°å¤é¨å¼ç¨åºå®å°å·²ç¥çæ¬ï¼æå®å¯éç REV:\n" +" -r25 http://example.com/repos/zig foo/bar\n" +" è¦æç¡®æ è¯æ个å¯è½éå被å é¤ææ¹åçè·¯å¾ä¸çå ç´ ï¼æå®å¯éç\n" +" PEG çæ¬:\n" +" -r25 http://example.com/repos/zig@42 foo/bar\n" +" URL å¯ä»¥æ¯å®æ´ URLï¼æ以ä¸åä¹ä¸å¼å¤´çç¸å¯¹ URL:\n" +" ../ ç¸å¯¹äºææåå¤é¨å¼ç¨çç¶ç®å½\n" +" ^/ ç¸å¯¹äºçæ¬åºæ ¹\n" +" / ç¸å¯¹äºæå¡å¨æ ¹\n" +" // ç¸å¯¹äº URL æ¹æ¡\n" +" ^/../ ç¸å¯¹äºåä¸ SVNParentPath ä½ç½®ä¸çå级çæ¬åº\n" +" ä¸å»ºè®®ä½¿ç¨ä»¥ä¸æ ¼å¼ï¼ä½ä¸ºä¸ Subversion 1.4 åæ´æ©å®¢æ·ç«¯äºæä½è\n" +" æ¯æ:\n" +" LOCALPATH [-r PEG] URL\n" +" ææ§ä¹çæ ¼å¼ 'relative_path relative_path' ä¼è¢«å½ä½\n" +" 'relative_url relative_path' å¤çï¼å¹¶æ¯æ peg çæ¬ã\n" +" 以 '#' å符å¼å¤´çè¡å°è¢«å¿½ç¥ã\n" -#: ../svn/svn.c:1440 +#: ../svn/svn.c:1658 msgid "read property value from file ARG" msgstr "ä»æ件 ARG 读åå±æ§å¼" -#: ../svn/svn.c:1443 +#: ../svn/svn.c:1661 msgid "" "Relocate the working copy to point to a different repository root URL.\n" "usage: 1. relocate FROM-PREFIX TO-PREFIX [PATH...]\n" " 2. relocate TO-URL [PATH]\n" "\n" +msgstr "" +"å°å·¥ä½å¯æ¬éå®ä½å°æåä¸åççæ¬åºæ ¹ URLã\n" +"ç¨æ³: 1. relocate FROM-PREFIX TO-PREFIX [PATH...]\n" +" 2. relocate TO-URL [PATH]\n" +"\n" + +#: ../svn/svn.c:1665 +msgid "" " Rewrite working copy URL metadata to reflect a syntactic change only.\n" " This is used when a repository's root URL changes (such as a scheme\n" " or hostname change) but your working copy still reflects the same\n" " directory within the same repository.\n" "\n" +msgstr "" +" éåå·¥ä½å¯æ¬ç URL å æ°æ®ï¼åªåæ è¯æ³ä¸çæ´æ¹ãå½çæ¬åºçæ ¹\n" +" URL æ¹å(ä¾å¦åè®®æ主æºåæ¹å)ãèä½ çå·¥ä½å¯æ¬ä»ç¶å¯¹åºåä¸\n" +" çæ¬åºä¸çåä¸ç®å½æ¶ï¼ä½¿ç¨å®ã\n" +"\n" + +#: ../svn/svn.c:1670 +msgid "" " 1. FROM-PREFIX and TO-PREFIX are initial substrings of the working\n" " copy's current and new URLs, respectively. (You may specify the\n" " complete old and new URLs if you wish.) Use 'svn info' to determine\n" " the current working copy URL.\n" "\n" +msgstr "" +" 1. FROM-PREFIX å TO-PREFIX åå«æ¯å·¥ä½å¯æ¬å½å URL åæ° URL ç\n" +" èµ·å§å串ã(å¦ææ¿æï¼ä¹å¯ä»¥æå®å®æ´çæ§ URL åæ° URLã)ç¨\n" +" 'svn info' å¯ä»¥æ¥åºå½åå·¥ä½å¯æ¬ç URLã\n" +"\n" + +#: ../svn/svn.c:1675 +msgid "" " 2. TO-URL is the (complete) new repository URL to use for PATH.\n" "\n" +msgstr "" +" 2. TO-URL æ¯ç¨äº PATH ç(å®æ´)æ°çæ¬åº URLã\n" +"\n" + +#: ../svn/svn.c:1677 +msgid "" " Examples:\n" " svn relocate http:// svn:// project1 project2\n" " svn relocate http://www.example.com/repo/project \\\n" " svn://svn.example.com/repo/project\n" msgstr "" -"éæ°å®ä½å·¥ä½å¯æ¬ï¼æåä¸åççæ¬åºæ ¹ URLã\n" -"ç¨æ³: 1. relocate FROM-PREFIX TO-PREFIX [PATH...]\n" -" 2. relocate TO-URL [PATH]\n" -"\n" -" æ¹åå·¥ä½å¯æ¬ URL å æ°æ®ï¼ä»¥åæ ä» çæ¬åºæ ¹ URL çæ¹åãè¿ç¨äºä» çæ¬åºæ ¹\n" -" URL æ¹å(ä¾å¦æ¹æ¡æ主æºå称)ï¼ä½æ¯å·¥ä½å¯æ¬å 容ä»æ§ä¸çæ¬åºå¯¹åºçæ åµã\n" -"\n" -" 1. FROM-PREFIX å TO-PREFIX åå«å¯¹åºå·¥ä½å¯æ¬çæ§ URL ä¸æ° URL å¼å§å串\n" -" (å¦æä½ å欢ï¼å¯ä»¥æå®å®æ´ç URL)ãè¯·ä½¿ç¨ 'svn info' æ¥ç¡®å®å½åå·¥ä½\n" -" å¯æ¬ç URLã\n" -"\n" -" 2. TO-URL æ¯ç¨äº PATH ç(å®æ´ç)æ°çæ¬åº URLã\n" -"\n" -" ä¾å¦:\n" +" 示ä¾:\n" " svn relocate http:// svn:// project1 project2\n" " svn relocate http://www.example.com/repo/project \\\n" " svn://svn.example.com/repo/project\n" -#: ../svn/svn.c:1466 +#: ../svn/svn.c:1685 msgid "" "Resolve conflicts on working copy files or directories.\n" -"usage: resolve [PATH...]\n" +"usage: resolve [PATH[@]...]\n" "\n" +msgstr "" +"解å³å·¥ä½å¯æ¬æ件æç®å½ä¸çå²çªã\n" +"ç¨æ³: resolve [PATH[@]...]\n" +"\n" + +#: ../svn/svn.c:1688 +msgid "" " By default, perform interactive conflict resolution on PATH.\n" " In this mode, the command is recursive by default (depth 'infinity').\n" "\n" +msgstr "" +" é»è®¤å¯¹ PATH æ§è¡äº¤äºå¼å²çªè§£å³ã\n" +" å¨æ¤æ¨¡å¼ä¸ï¼å½ä»¤é»è®¤æ¯éå½ç(深度 'infinity')ã\n" +"\n" + +#: ../svn/svn.c:1691 +msgid "" " The --accept=ARG option prevents interactive prompting and forces\n" " conflicts on PATH to be resolved in the manner specified by ARG.\n" " In this mode, the command is not recursive by default (depth 'empty').\n" +"\n" +msgstr "" +" --accept=ARG é项ç¦æ¢äº¤äºå¼æ示ï¼å¼ºå¶æ ARG æå®çæ¹å¼è§£å³\n" +" PATH ä¸çå²çªãå¨æ¤æ¨¡å¼ä¸ï¼å½ä»¤é»è®¤ä¸éå½(深度 'empty')ã\n" +"\n" + +#: ../svn/svn.c:1695 +msgid "" +" A conflicted path cannot be committed with 'svn commit' until it\n" +" has been marked as resolved with 'svn resolve'.\n" +"\n" +msgstr "" +" æå²çªçè·¯å¾å¨ç¨ 'svn resolve' æ 记为已解å³ä¹å\n" +" æ æ³ç¨ 'svn commit' æ交ã\n" +"\n" + +#: ../svn/svn.c:1698 +msgid "" +" Subversion knows three types of conflicts:\n" +" Text conflicts, Property conflicts, and Tree conflicts.\n" +"\n" +msgstr "" +" Subversion ç¥éä¸ç§å²çªç±»å:\n" +" ææ¬å²çªãå±æ§å²çªåæ å²çªã\n" +"\n" + +#: ../svn/svn.c:1701 +msgid "" +" Text conflicts occur when overlapping changes to file contents were\n" +" made. Text conflicts are usually resolved by editing the conflicted\n" +" file or by using a merge tool (which may be an external program).\n" +" 'svn resolve' provides options which can be used to automatically\n" +" edit files (such as 'mine-full' or 'theirs-conflict'), but these are\n" +" only useful in situations where it is acceptable to discard local or\n" +" incoming changes altogether.\n" +"\n" msgstr "" +" å½å¯¹æ件å 容çæ´æ¹äºç¸éå æ¶ä¼åºç°ææ¬å²çªãææ¬å²çªé常éè¿\n" +" ç¼è¾å²çªæ件æ使ç¨åå¹¶å·¥å ·(å¯ä»¥æ¯å¤é¨ç¨åº)æ¥è§£å³ã'svn resolve'\n" +" æä¾äºå¯ä»¥èªå¨ç¼è¾æ件çé项(å¦ 'mine-full' æ\n" +" 'theirs-conflict')ï¼ä½åªæå¨å¯ä»¥å®å ¨ä¸¢å¼æ¬å°æ´æ¹æä¼ å ¥æ´æ¹ç\n" +" æ åµä¸ææç¨ã\n" +"\n" + +#: ../svn/svn.c:1709 +msgid "" +" Property conflicts are usually resolved by editing the value of the\n" +" conflicted property (either from the interactive prompt, or with\n" +" 'svn propedit'). As with text conflicts, options exist to edit a\n" +" property automatically, discarding some changes in favour of others.\n" +"\n" +msgstr "" +" å±æ§å²çªé常éè¿ç¼è¾å²çªå±æ§çå¼æ¥è§£å³(å¨äº¤äºå¼æ示ä¸ï¼æè ç¨\n" +" 'svn propedit')ãåææ¬å²çªä¸æ ·ï¼ä¹æé项å¯ä»¥èªå¨ç¼è¾å±æ§ï¼\n" +" 丢å¼ä¸é¨åæ´æ¹èä¿çå¦ä¸é¨åã\n" +"\n" + +#: ../svn/svn.c:1714 +msgid "" +" Tree conflicts occur when a change to the directory structure was\n" +" made, and when this change cannot be applied to the working copy\n" +" without affecting other changes (text changes, property changes,\n" +" or other changes to the directory structure). Brief information about\n" +" tree conflicts is shown by the 'svn status' and 'svn info' commands.\n" +" In interactive mode, 'svn resolve' will attempt to describe tree conflicts\n" +" in detail, and may offer options to resolve the conflict automatically.\n" +" It is recommended to use these automatic options whenever possible,\n" +" rather than attempting manual tree conflict resolution.\n" +"\n" +msgstr "" +" å½å¯¹ç®å½ç»æåäºä¿®æ¹ï¼è该修æ¹æ æ³å¨ä¸å½±åå ¶ä»ä¿®æ¹(ææ¬ä¿®æ¹ã\n" +" å±æ§ä¿®æ¹æ对ç®å½ç»æçå ¶ä»ä¿®æ¹)çæ åµä¸åºç¨å°å·¥ä½å¯æ¬æ¶ï¼å°±ä¼\n" +" åçæ å²çªã'svn status' å 'svn info' å½ä»¤ä¼æ¾ç¤ºæ å²çªçç®è¦ä¿¡æ¯ã\n" +" å¨äº¤äºæ¨¡å¼ä¸ï¼'svn resolve' ä¼å°è¯è¯¦ç»æè¿°æ å²çªï¼å¹¶å¯è½æä¾èªå¨\n" +" 解å³å²çªçé项ã建议尽å¯è½ä½¿ç¨è¿äºèªå¨é项ï¼èä¸æ¯å°è¯æå¨è§£å³\n" +" æ å²çªã\n" +"\n" + +#: ../svn/svn.c:1724 +msgid "" +" If a tree conflict cannot be resolved automatically, it is recommended\n" +" to figure out why the conflict occurred before attempting to resolve it.\n" +" The 'svn log -v' command can be used to inspect structural changes\n" +" made in past revisions, and perhaps even on other branches.\n" +" 'svn help log' describes how these structural changes are presented.\n" +" Once the conflicting \"incoming\" change has been identified with 'svn log'\n" +" the current \"local\" working copy state should be examined and adjusted\n" +" in a way such that the conflict is resolved. This may involve editing\n" +" files manually or with 'svn merge'. It may be necessary to discard some\n" +" local changes with 'svn revert'. Files or directories might have to be\n" +" copied, deleted, or moved.\n" +msgstr "" +" å¦ææ å²çªæ æ³èªå¨è§£å³ï¼å»ºè®®å å¼æ¸ å²çªåççåå ï¼åå°è¯è§£å³ã\n" +" 'svn log -v' å½ä»¤å¯ç¨äºæ¥çè¿å»çæ¬ä¸æåçç»ææ§ä¿®æ¹ï¼çè³å¯è½\n" +" æ¯å ¶ä»åæ¯ä¸çä¿®æ¹ã'svn help log' æè¿°äºè¿äºç»ææ§ä¿®æ¹çåç°æ¹å¼ã\n" +" ç¨ 'svn log' è¯å«åºå²çªç \"ä¼ å ¥\"(incoming)ä¿®æ¹åï¼åºæ£æ¥å¹¶è°æ´å½å\n" +" \"æ¬å°\"(local)å·¥ä½å¯æ¬ç¶æï¼ä»¥è§£å³å²çªãè¿å¯è½æ¶åæå¨ç¼è¾æ件æç¨\n" +" 'svn merge' ç¼è¾ãå¯è½éè¦ç¨ 'svn revert' 丢å¼ä¸äºæ¬å°ä¿®æ¹ãæ件æ\n" +" ç®å½å¯è½å¿ 须被å¤å¶ãå é¤æ移å¨ã\n" + +#: ../svn/svn.c:1736 ../svn/svn.c:1756 ../svn/svn.c:1773 ../svn/svn.c:1873 +#: ../svn/svn.c:1992 +msgid "" +" If PATH contains an @ character, an additional @ must be\n" +" specified at the end of PATH to avoid interpreting the\n" +" first @ as a peg revision indicator.\n" +msgstr "" +" å¦æ PATH å å« @ å符ï¼å¿ é¡»å¨ PATH æ«å°¾é¢å¤æå® @ï¼\n" +" 以å æ第ä¸ä¸ª @ å½ä½éå®çæ¬æ è®°ã\n" -#: ../svn/svn.c:1476 +#: ../svn/svn.c:1741 msgid "" "specify automatic conflict resolution source\n" " ('base', 'working', 'mine-conflict',\n" " 'theirs-conflict', 'mine-full', 'theirs-full')" msgstr "" -"æå®èªå¨è§£å³å²çªå¨ä½çæº\n" -" ('base', 'working', 'mine-conflict',\n" -" 'theirs-conflict', 'mine-full', 'theirs-full')" +"æå®èªå¨è§£å³å²çªçæ¥æº\n" +" ('base'ã'working'ã'mine-conflict'ã\n" +" 'theirs-conflict'ã'mine-full'ã'theirs-full')" -#: ../svn/svn.c:1483 +#: ../svn/svn.c:1748 msgid "" "Remove 'conflicted' state on working copy files or directories.\n" -"usage: resolved PATH...\n" +"usage: resolved PATH[@]...\n" +"\n" +msgstr "" +"移é¤å·¥ä½å¯æ¬æ件æç®å½ä¸ç'å²çª'ç¶æã\n" +"ç¨æ³: resolved PATH[@]...\n" "\n" + +#: ../svn/svn.c:1751 +msgid "" " 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. It has been\n" " deprecated in favor of running 'svn resolve --accept working'.\n" msgstr "" -"å é¤å·¥ä½å¯æ¬ä¸ç®å½ææ件çâå²çªâç¶æã\n" -"ç¨æ³: resolved PATH...\n" -"\n" -" 注æ: æ¬åå½ä»¤ä¸ä¼ä¾è¯æ³æ¥è§£å³å²çªææ¯å é¤å²çªæ è®°ï¼å®åªæ¯å é¤å²çªç¸å ³ç\n" -" éå æ件ï¼è®© PATH å¯ä»¥è¢«å次æ交ãå®å·²ç»è¿æ¶ï¼è¢«\n" -" âsvn resolve --accept workingâå代ã\n" +" 注æ: æ¤åå½ä»¤å¹¶ä¸å¨è¯ä¹ä¸è§£å³å²çªï¼ä¹ä¸ç§»é¤å²çªæ è®°ï¼å®åªæ¯\n" +" å é¤ä¸å²çªç¸å ³ç临æ¶æ件ï¼è®© PATH å¯ä»¥å次æ交ãå®å·²è¢«åºå¼ï¼\n" +" 请æ¹ç¨ 'svn resolve --accept working'ã\n" -#: ../svn/svn.c:1493 +#: ../svn/svn.c:1763 msgid "" "Restore pristine working copy state (undo local changes).\n" -"usage: revert PATH...\n" +"usage: revert PATH[@]...\n" +"\n" +msgstr "" +"æ¢å¤åå§å·¥ä½å¯æ¬ç¶æ(æ¤éæ¬å°æ´æ¹)ã\n" +"ç¨æ³: revert PATH[@]...\n" "\n" + +#: ../svn/svn.c:1766 +msgid "" " Revert changes in the working copy at or within PATH, and remove\n" " conflict markers as well, if any.\n" "\n" +msgstr "" +" æ¢å¤ PATH å¤æå ¶ä¸çå·¥ä½å¯æ¬æ´æ¹ï¼\n" +" 并移é¤å²çªæ è®°(å¦ææ)ã\n" +"\n" + +#: ../svn/svn.c:1769 +msgid "" " This subcommand does not revert already committed changes.\n" " For information about undoing already committed changes, search\n" " the output of 'svn help merge' for 'undo'.\n" msgstr "" +" æ¤åå½ä»¤ä¸æ¢å¤å·²ç»æ交çæ´æ¹ã\n" +" å ³äºæ¤éå·²æ交æ´æ¹çä¿¡æ¯ï¼è¯·å¨ 'svn help merge' çè¾åºä¸æç´¢\n" +" 'undo'ã\n" -#: ../svn/svn.c:1505 -#, fuzzy +#: ../svn/svn.c:1781 msgid "" "Print the status of working copy files and directories.\n" -"usage: status [PATH...]\n" +"usage: status [PATH[@]...]\n" +"\n" +msgstr "" +"æå°å·¥ä½å¯æ¬æ件åç®å½çç¶æã\n" +"ç¨æ³: status [PATH[@]...]\n" "\n" + +#: ../svn/svn.c:1784 +msgid "" " With no args, print only locally modified items (no network access).\n" " With -q, print only summary information about locally modified items.\n" " With -u, add working revision and server out-of-date information.\n" " With -v, print full revision information on every item.\n" "\n" +msgstr "" +" ä¸å¸¦åæ°æ¶ï¼åªæå°æ¬å°ä¿®æ¹ç项(ä¸è®¿é®ç½ç»)ã\n" +" ç¨ -q æ¶ï¼åªæå°æ¬å°ä¿®æ¹é¡¹çæ±æ»ä¿¡æ¯ã\n" +" ç¨ -u æ¶ï¼å¢å å·¥ä½çæ¬åæå¡å¨ç«¯è¿æä¿¡æ¯ã\n" +" ç¨ -v æ¶ï¼æå°æ¯ä¸é¡¹çå®æ´çæ¬ä¿¡æ¯ã\n" +"\n" + +#: ../svn/svn.c:1789 +msgid "" " The first seven 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" @@ -13234,33 +18108,122 @@ msgid "" " If the item is a tree conflict victim, an additional line is printed\n" " after the item's status line, explaining the nature of the conflict.\n" "\n" +msgstr "" +" è¾åºçåä¸æ åå ä¸ä¸ªå符宽度:\n" +" 第ä¸æ : 表示项ç®æ¯å¦è¢«æ·»å ãå é¤ææå ¶ä»ä¿®æ¹\n" +" ' ' æ ä¿®æ¹\n" +" 'A' 已添å \n" +" 'C' æå²çª\n" +" 'D' å·²å é¤\n" +" 'I' 已忽ç¥\n" +" 'M' 已修æ¹\n" +" 'R' å·²æ¿æ¢\n" +" 'X' ç±å¤é¨å¼ç¨å®ä¹å建çæªçæ¬æ§å¶ç®å½\n" +" '?' 项ç®æªçº³å ¥çæ¬æ§å¶\n" +" '!' 项ç®ç¼ºå¤±(被é svn å½ä»¤å é¤)æä¸å®æ´\n" +" '~' å·²çæ¬æ§å¶é¡¹ç®è¢«ä¸åç±»åç项ç®é»å¡\n" +" 第äºæ : æ件æç®å½å±æ§çä¿®æ¹\n" +" ' ' æ ä¿®æ¹\n" +" 'C' æå²çª\n" +" 'M' 已修æ¹\n" +" 第ä¸æ : å·¥ä½å¯æ¬æ¯å¦è¢«å¦ä¸ä¸ª Subversion 客æ·ç«¯éå®ä»¥è¿è¡åå ¥\n" +" ' ' æªéå®\n" +" 'L' å·²éå®\n" +" 第åæ : 计åçæ交æ¯å¦ä¼å建å¯æ¬(带åå²çæ·»å )\n" +" ' ' æ åå²(项ç®ä¸ºæ°æ·»å )\n" +" '+' æåå²(项ç®ä¸ºå¤å¶)\n" +" 第äºæ : 项ç®æ¯å¦å·²åæ¢ææ¯æ件å¤é¨å¼ç¨\n" +" ' ' æ£å¸¸\n" +" 'S' 项ç®ç¸å¯¹äºç¶ç®å½æå·²åæ¢ç URL\n" +" 'X' ç±å¤é¨å¼ç¨å®ä¹å建çå·²çæ¬æ§å¶æ件\n" +" 第å æ : 项ç®æ¯å¦å¨çæ¬åºä¸ä¸ºç¬å æ交èéå®\n" +" (æ -u æ¶)\n" +" ' ' æªè¢«æ¤å·¥ä½å¯æ¬éå®\n" +" 'K' 被æ¤å·¥ä½å¯æ¬éå®ï¼ä½éå¯è½è¢«çªåæç ´å\n" +" (æ -u æ¶)\n" +" ' ' çæ¬åºä¸æªéå®ï¼æ¤å·¥ä½å¯æ¬æªéå®\n" +" 'K' çæ¬åºä¸å·²éå®ï¼éå±äºæ¤å·¥ä½å¯æ¬\n" +" 'O' çæ¬åºä¸å·²éå®ï¼éå±äºå¦ä¸ä¸ªå·¥ä½å¯æ¬\n" +" 'T' çæ¬åºä¸å·²éå®ï¼æ¤å·¥ä½å¯æ¬çé被çªå\n" +" 'B' çæ¬åºä¸æªéå®ï¼æ¤å·¥ä½å¯æ¬çéå·²ç ´å\n" +" 第ä¸æ : 项ç®æ¯å¦ä¸ºæ å²çªçå害è \n" +" ' ' æ£å¸¸\n" +" 'C' æ å²çª\n" +" å¦æ项ç®æ¯æ å²çªå害è ï¼ç¶æè¡ä¹åä¼æå°é¢å¤ä¸è¡ï¼\n" +" 说æå²çªçæ§è´¨ã\n" +"\n" + +#: ../svn/svn.c:1833 +msgid "" " The out-of-date information appears in the ninth column (with -u):\n" " '*' a newer revision exists on the server\n" " ' ' the working copy is up to date\n" "\n" +msgstr "" +" è¿æä¿¡æ¯åºç°å¨ç¬¬ä¹å(ä½¿ç¨ -u æ¶):\n" +" '*' æå¡å¨ä¸åå¨æ´æ°ççæ¬\n" +" ' ' å·¥ä½å¯æ¬æ¯ææ°ç\n" +"\n" + +#: ../svn/svn.c:1837 +msgid "" " Remaining fields are variable width and delimited by spaces:\n" " The working revision (with -u or -v; '-' if the item is copied)\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" +msgstr "" +" å ¶ä½å段宽度å¯åï¼ä»¥ç©ºæ ¼åé:\n" +" å·¥ä½çæ¬(ä½¿ç¨ -u æ -vï¼å¦æ该项æ¯å¤å¶æ¥çå为 '-')\n" +" æåæ交ççæ¬åæåæ交çä½è (ä½¿ç¨ -v)\n" +" å·¥ä½å¯æ¬è·¯å¾å§ç»æ¯æåä¸ä¸ªå段ï¼æ以å®å¯ä»¥å å«ç©ºæ ¼ã\n" +"\n" + +#: ../svn/svn.c:1843 +msgid "" " The presence of a question mark ('?') where a working revision, last\n" " committed revision, or last committed author was expected indicates\n" " that the information is unknown or irrelevant given the state of the\n" " item (for example, when the item is the result of a copy operation).\n" " The question mark serves as a visual placeholder to facilitate parsing.\n" "\n" +msgstr "" +" å¨åºåºç°å·¥ä½çæ¬ãæåæ交çæ¬ææåæ交ä½è çä½ç½®åºç°é®å·\n" +" ('?')ï¼è¡¨ç¤ºæ ¹æ®è¯¥é¡¹çç¶æï¼è¿äºä¿¡æ¯æªç¥ææ æä¹(ä¾å¦è¯¥é¡¹æ¯\n" +" å¤å¶æä½çç»æ)ãé®å·åªæ¯ä¾¿äºè§£æçè§è§å ä½ç¬¦ã\n" +"\n" + +#: ../svn/svn.c:1849 +msgid "" " Example output:\n" " svn status wc\n" " M wc/bar.c\n" " A + wc/qax.c\n" "\n" +msgstr "" +" 示ä¾è¾åº:\n" +" svn status wc\n" +" M wc/bar.c\n" +" A + wc/qax.c\n" +"\n" + +#: ../svn/svn.c:1854 +msgid "" " svn status -u wc\n" " M 965 wc/bar.c\n" " * 965 wc/foo.c\n" " A + - wc/qax.c\n" " Status against revision: 981\n" "\n" +msgstr "" +" svn status -u wc\n" +" M 965 wc/bar.c\n" +" * 965 wc/foo.c\n" +" A + - wc/\n" + +#: ../svn/svn.c:1860 +msgid "" " svn status --show-updates --verbose wc\n" " M 965 938 kfogel wc/bar.c\n" " * 965 922 sussman wc/foo.c\n" @@ -13268,115 +18231,67 @@ msgid "" " 965 687 joe wc/zig.c\n" " Status against revision: 981\n" "\n" -" svn status\n" -" M wc/bar.c\n" -" ! C wc/qaz.c\n" -" > local missing, incoming edit upon update\n" -" D wc/qax.c\n" msgstr "" -"æ¾ç¤ºå·¥ä½å¯æ¬ä¸ç®å½ä¸æ件çç¶æã\n" -"ç¨æ³: status [PATH...]\n" -"\n" -" æªæå®åæ°æ¶ï¼åªæ¾ç¤ºæ¬å°ä¿®æ¹çæ¡ç®(没æç½ç»è®¿é®)ã\n" -" ä½¿ç¨ -q æ¶ï¼åªæ¾ç¤ºæ¬å°ä¿®æ¹æ¡ç®çæè¦ä¿¡æ¯ã\n" -" ä½¿ç¨ -u æ¶ï¼å¢å å·¥ä½çæ¬åæå¡å¨ä¸çæ¬è¿æä¿¡æ¯ã\n" -" ä½¿ç¨ -v æ¶ï¼æ¾ç¤ºæ¯ä¸ªæ¡ç®çå®æ´çæ¬ä¿¡æ¯ã\n" -"\n" -" è¾åºçåä¸æ åå ä¸ä¸ªå符宽度: \n" -" 第ä¸æ : 表示ä¸ä¸ªé¡¹ç®æ¯å¢å ãå é¤ï¼è¿æ¯ä¿®æ¹\n" -" â â æ ä¿®æ¹\n" -" âAâ å¢å \n" -" âCâ å²çª\n" -" âDâ å é¤\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" -" âXâ 被å¤é¨å¼ç¨å建çæ件\n" -" 第å æ : çæ¬åºéå®æ è®°\n" -" (没æ -u)\n" -" â â 没æéå®æ è®°\n" -" âKâ åå¨éå®æ è®°\n" -" (ä½¿ç¨ -u)\n" -" â â 没æå¨çæ¬åºä¸éå®ï¼æ²¡æéå®æ è®°\n" -" âKâ å¨çæ¬åºä¸è¢«éå®ï¼åå¨éå®æ è®°\n" -" âOâ å¨çæ¬åºä¸è¢«éå®ï¼éå®æ è®°å¨ä¸äºå ¶ä»å·¥ä½å¯æ¬ä¸\n" -" âTâ å¨çæ¬åºä¸è¢«éå®ï¼åå¨éå®æ è®°ä½å·²è¢«çªå\n" -" âBâ 没æå¨çæ¬åºä¸è¢«éå®ï¼åå¨éå®æ è®°ä½å·²è¢«ç ´å\n" -" 第ä¸æ : 项ç®å²çªæ è®°\n" -" â â æ£å¸¸\n" -" âCâ æ å²çª\n" -" å¦æ项ç®å å«äºæ å²çªä¹ä¸ï¼å¨é¡¹ç®ç¶æè¡åä¼éå è¡ï¼è¯´æå²çªçç§ç±»ã\n" -"\n" -" æ¯å¦è¿æçä¿¡æ¯åºç°çä½ç½®æ¯ç¬¬ä¹æ (ä¸ -u 并ç¨æ¶): \n" -" â*â æå¡å¨ä¸ææ´æ°çæ¬\n" -" â â å·¥ä½å¯æ¬æ¯ææ°çç\n" -"\n" -" å©ä½çæ ä½ç为åå¨å®½åº¦ï¼å¹¶ä»¥ç©ºç½éå¼: \n" -" å·¥ä½çæ¬å·(ä½¿ç¨ -u æ -v æ¶ï¼è¢«å¤å¶æ¶æ¾ç¤ºâ-â)\n" -" æåæ交ççæ¬ä¸æåæ交çä½è (ä½¿ç¨ -v æ¶)\n" -" å·¥ä½å¯æ¬è·¯å¾æ»æ¯æåä¸æ ï¼æ以å®å¯ä»¥å å«ç©ºç½å符ã\n" -"\n" -" é®å·æ è®° (â?â) åºç°å¨å·¥ä½çæ¬ï¼æåæ交ççæ¬ï¼ææåæ交çä½è ä½ç½®æ¶ï¼\n" -" å®æ示信æ¯æªç¥ï¼æè ç»åºæ¤é¡¹ç®çç¶ææ¯ä¸æ°å½ç (ä¾å¦é¡¹ç®æ¯å¤å¶æä½çç»æ)ã\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 + - wc/qax.c\n" -" çæ¬ 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 + - 687 joe wc/qax.c\n" " 965 687 joe wc/zig.c\n" -" çæ¬ 981 çç¶æ\n" +" Status against revision: 981\n" "\n" + +#: ../svn/svn.c:1867 +msgid "" " svn status\n" " M wc/bar.c\n" " ! C wc/qaz.c\n" " > local missing, incoming edit upon update\n" " D wc/qax.c\n" +msgstr "" +" svn status\n" +" M wc/bar.c\n" +" ! C wc/qaz.c\n" +" > local missing, incoming edit upon update\n" +" \n" -#: ../svn/svn.c:1598 +#: ../svn/svn.c:1879 msgid "don't print unversioned items" msgstr "ä¸æå°æªçæ¬æ§å¶çæ¡ç®" -#: ../svn/svn.c:1601 +#: ../svn/svn.c:1880 +msgid "obsolete; same as --depth=immediates" +msgstr "å·²åºå¼ï¼å --depth=immediates" + +#: ../svn/svn.c:1883 msgid "" -"Update the working copy to a different URL within the same repository.\n" +"Update the working copy to a different URL within the same\n" +"repository.\n" "usage: 1. switch URL[@PEGREV] [PATH]\n" " 2. switch --relocate FROM-PREFIX TO-PREFIX [PATH...]\n" "\n" +msgstr "" +"å°å·¥ä½å¯æ¬æ´æ°å°åä¸çæ¬åºä¸çä¸å URLã\n" +"ç¨æ³: 1. switch URL[@PEGREV] [PATH]\n" +" 2. switch --relocate FROM-PREFIX TO-PREFIX [PATH...]\n" +"\n" + +#: ../svn/svn.c:1888 +msgid "" " 1. Update the working copy to mirror a new URL within the repository.\n" " This behavior 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" " If specified, PEGREV determines in which revision the target is first\n" " looked up.\n" "\n" +msgstr "" +" 1. æ´æ°å·¥ä½å¯æ¬ï¼ä½¿å ¶éåçæ¬åºä¸çæ° URLã\n" +" æ¤è¡ä¸ºç±»ä¼¼ 'svn update'ï¼ä¹æ¯æå·¥ä½å¯æ¬åæ¢å°åä¸çæ¬åºä¸ç\n" +" åæ¯ææ ç¾çæ¹å¼ã\n" +" å¦ææå®äº PEGREVï¼å®å³å®å å¨åªä¸ªçæ¬ä¸æ¥æ¾ç®æ ã\n" +"\n" + +#: ../svn/svn.c:1894 +msgid "" " If --force is used, unversioned obstructing paths in the working\n" " copy do not automatically cause a failure if the switch attempts to\n" " add the same path. If the obstructing path is the same type (file\n" @@ -13388,94 +18303,125 @@ msgid "" " modification to the working copy. All properties from the repository\n" " are applied to the obstructing path.\n" "\n" +msgstr "" +" å¦æ使ç¨äº --forceï¼å¨åæ¢è¯å¾æ·»å ç¸åè·¯å¾æ¶ï¼å·¥ä½å¯æ¬ä¸\n" +" æªçæ¬æ§å¶çéç¢è·¯å¾ä¸ä¼èªå¨å¯¼è´å¤±è´¥ãå¦æéç¢è·¯å¾ä¸çæ¬åº\n" +" ä¸å¯¹åºè·¯å¾çç±»å(æ件æç®å½)ç¸åï¼å®ä¼å为已çæ¬æ§å¶ä½å ¶\n" +" å 容å¨å·¥ä½å¯æ¬ä¸ä¿æåæ ·ãè¿æå³çéç¢ç®å½ä¸æªçæ¬æ§å¶ç\n" +" å项ä¹å¯è½æ为éç¢å¹¶å为已çæ¬æ§å¶ã对äºæ件ï¼éç¢ä¸çæ¬åº\n" +" ä¹é´çä»»ä½å 容差å¼é½è¢«è§ä¸ºå·¥ä½å¯æ¬çæ¬å°ä¿®æ¹ãçæ¬åºä¸ç\n" +" ææå±æ§é½ä¼åºç¨å°éç¢è·¯å¾ã\n" +"\n" + +#: ../svn/svn.c:1905 +msgid "" " Use the --set-depth option to set a new working copy depth on the\n" " targets of this operation.\n" "\n" +msgstr "" +" ä½¿ç¨ --set-depth é项对æ¤æä½çç®æ \n" +" 设置æ°çå·¥ä½å¯æ¬æ·±åº¦ã\n" +"\n" + +#: ../svn/svn.c:1908 +msgid "" " By default, Subversion will refuse to switch a working copy path to\n" " a new URL with which it shares no common version control ancestry.\n" " Use the '--ignore-ancestry' option to override this sanity check.\n" "\n" +msgstr "" +" é»è®¤æ åµä¸ï¼Subversion ä¼æç»æå·¥ä½å¯æ¬è·¯å¾åæ¢å°ä¸å®æ²¡æ\n" +" å ±åçæ¬æ§å¶è¡ç¼çæ° URLãç¨ '--ignore-ancestry' é项å¯ä»¥\n" +" è·³è¿è¿é¡¹åçæ§æ£æ¥ã\n" +"\n" + +#: ../svn/svn.c:1912 +msgid "" " 2. The '--relocate' option is deprecated. This syntax is equivalent to\n" " 'svn relocate FROM-PREFIX TO-PREFIX [PATH]'.\n" "\n" +msgstr "" +" 2. '--relocate' é项已åºå¼ãæ¤è¯æ³çåäº\n" +" 'svn relocate FROM-PREFIX TO-PREFIX [PATH\n" + +#: ../svn/svn.c:1915 +msgid "" " See also 'svn help update' for a list of possible characters\n" " reporting the action taken.\n" "\n" +msgstr "" +" å¦è§ 'svn help update' äºè§£æ¥åææ§è¡æä½ç\n" +" å¯è½å符å表ã\n" +"\n" + +#: ../svn/svn.c:1918 +msgid "" " Examples:\n" " svn switch ^/branches/1.x-release\n" -" svn switch --relocate http:// svn://\n" -" svn switch --relocate http://www.example.com/repo/project \\\n" -" svn://svn.example.com/repo/project\n" msgstr "" -"æ´æ°å·¥ä½å¯æ¬è³åä¸çæ¬åºä¸çä¸å URLã\n" -"ç¨æ³: 1ãswitch URL[@PEGREV] [PATH]\n" -" 2ãswitch --relocate FROM-PREFIX TO-PREFIX [PATH...]\n" -"\n" -" 1ãæ´æ°å·¥ä½å¯æ¬ï¼ä¸åä¸çæ¬åºä¸çæ° URL 对åºãå ¶è¡ä¸ºè· âsvn updateâ å¾åï¼\n" -" ä¹æ¯å°å·¥ä½å¯æ¬åæ¢å°åä¸çæ¬åºä¸æ个åæ¯æè æ ç¾çæ¹æ³ãPEGREV å³å®ä»\n" -" åªä¸ªçæ¬æ¥æ¾ç®æ ã\n" -"\n" -" å¦æ使ç¨äº â--forceâ é项ï¼å¨å·¥ä½å¯æ¬ä¸æªçæ¬æ§å¶çéç¢è·¯å¾ï¼ä¸ä¼èªå¨\n" -" 导è´å¤±è´¥ãå¦æéç¢è·¯å¾ä¸çæ¬åºä¸ç对åºè·¯å¾ç±»åç¸å(æ件æç®å½)ï¼å®å°æ\n" -" 为åçæ¬æ§å¶çè·¯å¾ï¼ä½æ¯å 容ä¸æ¹åãå®æå³çéç¢è·¯å¾çååï¼ä¹å¯è½æ¯é\n" -" ç¢è·¯å¾ï¼åæ ·ä¼åçæ¬æ§å¶ã对äºéç¢è·¯å¾ä¸çæ件ï¼å¦æä¸çæ¬åºå çä¸åï¼\n" -" å°è§ä¸ºå·¥ä½å¯æ¬åçæ¬å°ä¿®æ¹ãçæ¬åºä¸çææå±æ§é½åºç¨äºéç¢è·¯å¾ã\n" -"\n" -" ä½¿ç¨ â--set-depthâ é项设置æ¤æä½ç®æ çå·¥ä½å¯æ¬ä¹æ°æ·±åº¦ã\n" -"\n" -" å¦ææ° URL ä¸å·¥ä½å¯æ¬è·¯å¾æ²¡æçæ¬ç»§æ¿å ³ç³»ï¼Subversion å°ä¼æç»æä½ãé项\n" -" '--ignore-ancestry' å¯ä»¥ç¦æ¢æ¤æ£æ¥ã\n" -"\n" -" 2ãé项 â--relocateâ å·²ç»æ·æ±°ãå®çå¥æ³çä»·äº\n" -" âsvn relocate FROM-PREFIX TO-PREFIX [PATH]âã\n" -"\n" -" åè§ âsvn help updateâ 以è·åæ¥åæ§è¡å¨ä½çå符å表ã\n" -"\n" -" æ ·ä¾:\n" +" 示ä¾:\n" " svn switch ^/branches/1.x-release\n" -" svn switch --relocate http:// svn://\n" -" svn switch --relocate http://www.example.com/repo/project \\\n" -" svn://svn.example.com/repo/project\n" -#: ../svn/svn.c:1643 +#: ../svn/svn.c:1925 msgid "allow switching to a node with no common ancestor" -msgstr "" +msgstr "å 许åæ¢å°æ²¡æå ±åç¥å çèç¹" -#: ../svn/svn.c:1645 ../svn/svn.c:1705 +#: ../svn/svn.c:1927 ../svn/svn.c:2000 msgid "handle unversioned obstructions as changes" -msgstr "" +msgstr "å°æªçæ¬æ§å¶çé»å¡è§ä¸ºæ´æ¹" + +#: ../svn/svn.c:1928 +msgid "deprecated; use 'svn relocate'" +msgstr "å·²åºå¼ï¼ä½¿ç¨ 'svn relocate'" -#: ../svn/svn.c:1649 +#: ../svn/svn.c:1933 msgid "" "Unlock working copy paths or URLs.\n" -"usage: unlock TARGET...\n" +"usage: unlock TARGET[@]...\n" "\n" -" Use --force to break the lock.\n" msgstr "" -"解é¤å·¥ä½å¯æ¬æURLçéå®ã\n" -"ç¨æ³: unlock TARGET...\n" +"解éå·¥ä½å¯æ¬è·¯å¾æ URLã\n" +"ç¨æ³: unlock TARGET[@]...\n" "\n" -" ä½¿ç¨ --force ç»æ¢éå®ã\n" -#: ../svn/svn.c:1656 +#: ../svn/svn.c:1936 +msgid " Use --force to break a lock held by another user or working copy.\n" +msgstr " ä½¿ç¨ --force ä¸æå ¶ä»ç¨æ·ææçéã\n" + +#: ../svn/svn.c:1943 +msgid "break locks" +msgstr "ä¸æé" + +#: ../svn/svn.c:1946 msgid "" "Bring changes from the repository into the working copy.\n" -"usage: update [PATH...]\n" +"usage: update [PATH[@]...]\n" "\n" +msgstr "" +"å°çæ¬åºä¸çæ´æ¹å¸¦å ¥å·¥ä½å¯æ¬ã\n" +"ç¨æ³: update [PATH[@]...]\n" +"\n" + +#: ../svn/svn.c:1949 +msgid "" " If no revision is given, bring working copy up-to-date with HEAD rev.\n" " Else synchronize working copy to revision given by -r.\n" "\n" +msgstr "" +" å¦ææªç»å®çæ¬ï¼å°å·¥ä½å¯æ¬æ´æ°å° HEAD çæ¬ã\n" +" å¦åå°å·¥ä½å¯æ¬åæ¥å°ç»å®çæ¬ã\n" + +#: ../svn/svn.c:1952 +msgid "" " For each updated item a line will be printed with characters reporting\n" " the action taken. These characters have the following meaning:\n" "\n" -" A Added\n" -" D Deleted\n" -" U Updated\n" -" C Conflict\n" -" G Merged\n" -" E Existed\n" -" R Replaced\n" -"\n" +msgstr "" +" 对æ¯ä¸ªæ´æ°ç项æå°ä¸è¡ï¼å å«æ¥åææ§è¡æä½çå符ã\n" +" è¿äºå符çå«ä¹å¦ä¸:\n" + +#: ../svn/svn.c:1963 +msgid "" " Characters in the first column report about the item itself.\n" " Characters in the second column report about properties of the item.\n" " A 'B' in the third column signifies that the lock for the file has\n" @@ -13484,6 +18430,16 @@ msgid "" " the first and second columns indicate textual conflicts in files\n" " and in property values, respectively.\n" "\n" +msgstr "" +" 第ä¸åçå符æ¥å项æ¬èº«çæ åµã\n" +" 第äºåçå符æ¥å项å±æ§çæ åµã\n" +" 第ä¸åç 'B' 表示该æ件çé已被强å¶è§£é¤æ被çªåã\n" +" 第ååç 'C' 表示æ å²çªï¼è第ä¸åå第äºåç 'C' åå«è¡¨ç¤ºæ件ä¸\n" +" åå±æ§å¼ä¸çææ¬å²çªã\n" +"\n" + +#: ../svn/svn.c:1971 +msgid "" " If --force is used, unversioned obstructing paths in the working\n" " copy do not automatically cause a failure if the update attempts to\n" " add the same path. If the obstructing path is the same type (file\n" @@ -13496,230 +18452,320 @@ msgid "" " are applied to the obstructing path. Obstructing paths are reported\n" " in the first column with code 'E'.\n" "\n" +msgstr "" +" å¦æ使ç¨äº --forceï¼å¨æ´æ°è¯å¾æ·»å ç¸åè·¯å¾æ¶ï¼å·¥ä½å¯æ¬ä¸\n" +" æªçæ¬æ§å¶çéç¢è·¯å¾ä¸ä¼èªå¨å¯¼è´å¤±è´¥ãå¦æéç¢è·¯å¾ä¸çæ¬åº\n" +" ä¸å¯¹åºè·¯å¾çç±»å(æ件æç®å½)ç¸åï¼å®ä¼å为已çæ¬æ§å¶ä½å ¶\n" +" å 容å¨å·¥ä½å¯æ¬ä¸ä¿æåæ ·ãè¿æå³çéç¢ç®å½ä¸æªçæ¬æ§å¶ç\n" +" å项ä¹å¯è½æ为éç¢å¹¶å为已çæ¬æ§å¶ã对äºæ件ï¼éç¢ä¸çæ¬åº\n" +" ä¹é´çä»»ä½å 容差å¼é½è¢«è§ä¸ºå·¥ä½å¯æ¬çæ¬å°ä¿®æ¹ãçæ¬åºä¸ç\n" +" ææå±æ§é½ä¼åºç¨å°éç¢è·¯å¾ãéç¢è·¯å¾å¨ç¬¬ä¸å以代ç 'E'\n" +" æ¥åã\n" +"\n" + +#: ../svn/svn.c:1983 +msgid "" " If the specified update target is missing from the working copy but its\n" " immediate parent directory is present, checkout the target into its\n" " parent directory at the specified depth. If --parents is specified,\n" " create any missing parent directories of the target by checking them\n" " out, too, at depth=empty.\n" "\n" +msgstr "" +" å¦ææå®çæ´æ°ç®æ å¨å·¥ä½å¯æ¬ä¸ç¼ºå¤±ï¼ä½å ¶ç´æ¥ç¶ç®å½åå¨ï¼åæ\n" +" æå®æ·±åº¦æ该ç®æ æ£åºå°å ¶ç¶ç®å½ä¸ãå¦ææå®äº --parentsï¼ä¹ä¼ä»¥\n" +" depth=empty æ£åºç®æ 缺失çå级ç¶ç®å½ã\n" +"\n" + +#: ../svn/svn.c:1989 +msgid "" " Use the --set-depth option to set a new working copy depth on the\n" " targets of this operation.\n" msgstr "" -"å°çæ¬åºçä¿®æ¹å并å°å·¥ä½å¯æ¬ä¸ã\n" -"ç¨æ³: update [PATH...]\n" -"\n" -" å¦æ没ææå®çæ¬ï¼åå°å·¥ä½å¯æ¬æ´æ°å° HEAD çæ¬ãå¦ååæ¥å° -r é项æ\n" -" æå®ççæ¬ã\n" -"\n" -" æ¯æ´æ°ä¸é¡¹å°±è¾åºä¸è¡ä¿¡æ¯ï¼ä½¿ç¨é¦å符æ¥æ¥åæ§è¡çå¨ä½ãè¿äºå符çå«ä¹æ¯: \n" -"\n" -" A 已添å \n" -" D å·²å é¤\n" -" U å·²æ´æ°\n" -" C å并å²çª\n" -" G å并æå\n" -" E å·²åå¨\n" -" R å·²æ¿æ¢\n" -"\n" -" 第ä¸åå符æ¥å项ç®æ¬èº«ã\n" -" 第äºå表示æ¥å项ç®å±æ§ã\n" -" 第ä¸åä¸çå符âBâ表示æ¤æ件ä¸çé被ç»æ¢æçªåã\n" -" 第ååä¸çå符âCâ表示æ å²çªï¼åæ¶âCâåºç°å¨ç¬¬ä¸åæ第äºåï¼åå«è¡¨ç¤º\n" -" å 容å²çªæå±æ§å²çªã\n" -"\n" -" å¦æ使ç¨äº â--forceâ é项ï¼å¨å·¥ä½å¯æ¬ä¸æªçæ¬æ§å¶çéç¢è·¯å¾ï¼ä¸ä¼èªå¨\n" -" 导è´ç¾åºå¤±è´¥ã å¦æéç¢è·¯å¾ä¸çæ¬åºä¸ç对åºè·¯å¾ç±»åç¸å(æ件æç®å½),å®\n" -" å°æ为åçæ¬æ§å¶çè·¯å¾ï¼ä½æ¯å 容ä¸æ¹åãå®æå³çéç¢è·¯å¾çååï¼ä¹å¯è½\n" -" æ¯éç¢è·¯å¾ï¼åæ ·ä¼åçæ¬æ§å¶ã对äºéç¢è·¯å¾ä¸çæ件ï¼å¦æä¸çæ¬åºå ç\n" -" ä¸åï¼å°è§ä¸ºå·¥ä½å¯æ¬åçæ¬å°ä¿®æ¹ãçæ¬åºä¸çææå±æ§é½åºç¨äºéç¢è·¯å¾ã\n" -" ç¨ç¬¬ä¸åå符 âEâ æ¥æ¥åéç¢è·¯å¾ã\n" -"\n" -" å¦æå·¥ä½å¯æ¬ä¸å¹¶æ²¡ææå®çæ´æ°ç®æ ï¼ä½æ¯æå ¶ç¶ç®å½ï¼é£ä¹å°±å¨æå®è·¯å¾ä¸\n" -" å°ç®æ æ£åºå°å ¶ç¶ç®å½ä¸ãå¦æ使ç¨äºé项 --parentsï¼å°±ä¼å建ç®æ çææä¸\n" -" åå¨çç¶ç®å½ (使ç¨é项 --depth=empty)ã\n" -"\n" -" 使ç¨â--set-depthâé项设置æ¤æä½ç®æ çå·¥ä½å¯æ¬ä¹æ°æ·±åº¦ã\n" +" ä½¿ç¨ --set-depth é项对æ¤æä½çç®æ \n" +" 设置æ°çå·¥ä½å¯æ¬æ·±åº¦ã\n" -#: ../svn/svn.c:1708 +#: ../svn/svn.c:2004 msgid "" "Upgrade the metadata storage format for a working copy.\n" -"usage: upgrade [WCPATH...]\n" +"usage: upgrade [WCPATH[@]...]\n" "\n" -" Local modifications are preserved.\n" msgstr "" "å级工ä½å¯æ¬çå æ°æ®åå¨æ ¼å¼ã\n" -"ç¨æ³: upgrade [WCPATH...]\n" +"ç¨æ³: upgrade [WCPATH[@]...]\n" "\n" -" ä¿çæ¬å°ä¿®æ¹ã\n" -#: ../svn/svn.c:1715 +#: ../svn/svn.c:2007 msgid "" -"Print the youngest revision number of a target's repository.\n" -"usage: youngest [TARGET]\n" +" The upgraded working copy will be compatible with Subversion 1.8 and\n" +" newer (this default may change in the future). To upgrade to a different\n" +" version, use an option such as '--compatible-version=1.15'.\n" +" The versions available are the same as in the 'checkout' command.\n" +" Use 'svn --version' to see the compatible versions supported.\n" "\n" -" Print the revision number of the youngest revision in the repository\n" -" with which TARGET is associated.\n" msgstr "" +" å级åçå·¥ä½å¯æ¬å°å ¼å®¹ Subversion 1.8 åæ´æ°çæ¬(æ¤é»è®¤å¼å°æ¥\n" +" å¯è½æ´æ¹)ãè¦å级å°å ¶ä»çæ¬ï¼å¯ç¨ '--compatible-version=1.15'\n" +" ä¹ç±»çé项ã\n" +" å¯ç¨ççæ¬ä¸ 'checkout' å½ä»¤ç¸åã\n" +" ç¨ 'svn --version' æ¥çæ¯æçå ¼å®¹çæ¬ã\n" +"\n" -#: ../svn/svn.c:1935 ../svn/svn.c:2213 +#: ../svn/svn.c:2013 +msgid "" +" Only upgrades are supported, not downgrades.\n" +"\n" +msgstr "" +" ä» æ¯æå级ï¼ä¸æ¯æé级ã\n" +"\n" + +#: ../svn/svn.c:2015 +msgid " Local modifications are preserved.\n" +msgstr " æ¬å°ä¿®æ¹å°è¢«ä¿çã\n" + +#: ../svn/svn.c:2101 +#, c-format +msgid "'%s' is not a valid --x-viewspec value" +msgstr "'%s' ä¸æ¯ææç --x-viewspec å¼" + +#: ../svn/svn.c:2171 +#, c-format +msgid "Cannot make working copies compatible with the requested version %d.%d; the oldest supported version is %d.%d" +msgstr "æ æ³ä½¿å·¥ä½å¯æ¬å ¼å®¹è¯·æ±ççæ¬ %d.%dï¼æ¯æçææ§çæ¬æ¯ %d.%d" + +#: ../svn/svn.c:2183 +#, c-format +msgid "Cannot guarantee working copy compatibility with the requested version %d.%d; the latest supported version is %d.%d" +msgstr "æ æ³ä¿è¯å·¥ä½å¯æ¬ä¸è¯·æ±ççæ¬ %d.%d å ¼å®¹ï¼æ¯æçææ°çæ¬æ¯ %d.%d" + +#: ../svn/svn.c:2322 ../svnbench/svnbench.c:480 ../svnlook/svnlook.c:2589 +msgid "Non-numeric limit argument given" +msgstr "--limit åå¼ä¸æ¯æ°å" + +#: ../svn/svn.c:2327 ../svnbench/svnbench.c:485 ../svnlook/svnlook.c:2594 +msgid "Argument to --limit must be positive" +msgstr "--limit åå¼å¿ 须为æ£" + +#: ../svn/svn.c:2347 ../svn/svn.c:2554 msgid "Can't specify -c with --old" msgstr "ä¸è½åæ¶æå® -c å --old" -#: ../svn/svn.c:2112 +#: ../svn/svn.c:2359 ../svnbench/svnbench.c:506 +#, c-format +msgid "Syntax error in change argument '%s'" +msgstr "æ´æ¹åæ° '%s' ä¸çè¯æ³é误" + +#: ../svn/svn.c:2374 ../svnadmin/svnadmin.c:3135 ../svnbench/svnbench.c:522 +#: ../svnfsfs/svnfsfs.c:309 ../svnrdump/svnrdump.c:871 +#: ../svnsync/svnsync.c:2152 +#, c-format +msgid "Syntax error in revision argument '%s'" +msgstr "çæ¬åæ°'%s'ä¸æè¯æ³é误" + +#: ../svn/svn.c:2443 ../svnbench/svnbench.c:564 +#, c-format +msgid "'%s' is not a valid depth; try 'empty', 'files', 'immediates', or 'infinity'" +msgstr "'%s' ä¸æ¯ææç深度ï¼å°è¯ 'empty'ï¼'files'ï¼'immediates'ï¼æ 'infinity'" + +#: ../svn/svn.c:2456 #, c-format msgid "'%s' is not a valid depth; try 'exclude', 'empty', 'files', 'immediates', or 'infinity'" -msgstr "â%sâ ä¸æ¯ææç深度ï¼å°è¯ âexcludeâï¼âemptyâï¼âfilesâï¼âimmediatesâï¼æ âinfinityâ" +msgstr "'%s' ä¸æ¯ææç深度ï¼å°è¯ 'exclude'ï¼'empty'ï¼'files'ï¼'immediates'ï¼æ 'infinity'" -#: ../svn/svn.c:2250 +#: ../svn/svn.c:2592 #, c-format msgid "Syntax error in native-eol argument '%s'" -msgstr "åçæ¢è¡ç¬¦å·åæ° â%sâ ä¸æè¯æ³é误" +msgstr "åçæ¢è¡ç¬¦å·åæ° '%s' ä¸æè¯æ³é误" -#: ../svn/svn.c:2268 -#, fuzzy +#: ../svn/svn.c:2613 msgid "Changelist names must not be empty" -msgstr "ç®æ ä¿®æ¹å表çå称ä¸è½ä¸ºç©º" +msgstr "åæ´å表å称ä¸è½ä¸ºç©º" -#: ../svn/svn.c:2301 +#: ../svn/svn.c:2646 #, c-format msgid "'%s' is not a valid --accept value" -msgstr "â%sâ æ¯éæ³ --accept åå¼" +msgstr "'%s' æ¯éæ³ --accept åå¼" -#: ../svn/svn.c:2309 +#: ../svn/svn.c:2654 #, c-format msgid "'%s' is not a valid --show-revs value" -msgstr "â%sâ æ¯éæ³ --show-revs åå¼" +msgstr "'%s' æ¯éæ³ --show-revs åå¼" -#: ../svn/svn.c:2325 +#: ../svn/svn.c:2670 #, c-format msgid "Invalid strip count '%s'" msgstr "æ æä¿®åªè®¡æ° '%s'" -#: ../svn/svn.c:2331 +#: ../svn/svn.c:2676 msgid "Argument to --strip must be positive" msgstr "--strip åæ°çåå¼å¿ 须为æ£" -#: ../svn/svn.c:2399 ../svnmucc/svnmucc.c:658 ../svnrdump/svnrdump.c:1034 -#: ../svnsync/svnsync.c:2164 -#, fuzzy -msgid "--non-interactive and --force-interactive are mutually exclusive" -msgstr "--relocate ä¸ --non-recursive (-N) æ¯äºæ¥ç" +#: ../svn/svn.c:2830 ../svnbench/svnbench.c:698 +#: ../svndumpfilter/svndumpfilter.c:1435 ../svnlook/svnlook.c:2693 +#, c-format +msgid "Subcommand argument required\n" +msgstr "å¿ é¡»æä¾åå½ä»¤åæ°\n" -#: ../svn/svn.c:2479 +#: ../svn/svn.c:2848 ../svnadmin/svnadmin.c:3361 ../svnbench/svnbench.c:716 +#: ../svndumpfilter/svndumpfilter.c:1452 ../svnfsfs/svnfsfs.c:385 +#: ../svnlook/svnlook.c:2710 ../svnrdump/svnrdump.c:994 +#, c-format +msgid "Unknown subcommand: '%s'\n" +msgstr "æªç¥åå½ä»¤: '%s'\n" + +#: ../svn/svn.c:2857 #, c-format msgid "Undo is done using either the 'svn revert' or the 'svn merge' command.\n" -msgstr "" +msgstr "æ¤éæä½ä½¿ç¨ 'svn revert' æ 'svn merge' å½ä»¤ã\n" -#: ../svn/svn.c:2515 +#: ../svn/svn.c:2893 #, 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" +"åå½ä»¤'%s'ä¸æ¥åé项'%s'\n" +"è¾å ¥'svn help %s'å¾å°ç¨æ³ã\n" + +#: ../svn/svn.c:2908 ../svnbench/svnbench.c:764 +msgid "Multiple revision arguments encountered; can't specify -c twice, or both -c and -r" +msgstr "éå°äºå¤ä¸ªçæ¬åæ°ï¼ä¸è½æå® -c 两次æè åæ¶ä½¿ç¨ -c å -r" -#: ../svn/svn.c:2541 +#: ../svn/svn.c:2919 msgid "--depth and --set-depth are mutually exclusive" msgstr "--depth ä¸ --set-depth æ¯äºæ¥ç" -#: ../svn/svn.c:2589 +#: ../svn/svn.c:2928 ../svnbench/svnbench.c:775 +msgid "--with-all-revprops and --with-no-revprops are mutually exclusive" +msgstr "--with-all-revprops ä¸ --with-no-revprops æ¯äºæ¥ç" + +#: ../svn/svn.c:2937 ../svnbench/svnbench.c:784 +msgid "--with-revprop and --with-no-revprops are mutually exclusive" +msgstr "--with-revprop ä¸ --with-no-revprops æ¯äºæ¥ç" + +#: ../svn/svn.c:2967 msgid "--message (-m) and --file (-F) are mutually exclusive" msgstr "--message (-m) ä¸ --file (-F) æ¯äºæ¥ç" -#: ../svn/svn.c:2623 +#: ../svn/svn.c:2980 ../svnbench/svnbench.c:797 ../svnmucc/svnmucc.c:701 +#: ../svnrdump/svnrdump.c:1053 +msgid "--trust-server-cert-failures requires --non-interactive" +msgstr "--trust-server-cert-failures éè¦ --non-interactive" + +#: ../svn/svn.c:2988 ../svnbench/svnbench.c:805 ../svnmucc/svnmucc.c:709 +#: ../svnrdump/svnrdump.c:1060 +msgid "--password-from-stdin requires --non-interactive" +msgstr "--password-from-stdin éè¦ --non-interactive" + +#: ../svn/svn.c:2997 msgid "--diff-cmd and --internal-diff are mutually exclusive" msgstr "--diff-cmd ä¸ --internal-diff æ¯äºæ¥ç" -#: ../svn/svn.c:2665 +#: ../svn/svn.c:3039 msgid "--relocate and --depth are mutually exclusive" msgstr "--relocate ä¸ --depth æ¯äºæ¥ç" -#: ../svn/svn.c:2672 +#: ../svn/svn.c:3046 msgid "--relocate and --non-recursive (-N) are mutually exclusive" msgstr "--relocate ä¸ --non-recursive (-N) æ¯äºæ¥ç" -#: ../svn/svn.c:2791 +#: ../svn/svn.c:3162 msgid "Log message file is a versioned file; use '--force-log' to override" -msgstr "æ¥å¿ä¿¡æ¯æ件åçæ¬æ§å¶ï¼è¯·ä½¿ç¨ â--force-logâ 强å¶æ§è¡" +msgstr "æ¥å¿ä¿¡æ¯æ件åçæ¬æ§å¶ï¼è¯·ä½¿ç¨ '--force-log' 强å¶æ§è¡" -#: ../svn/svn.c:2798 +#: ../svn/svn.c:3169 msgid "Lock comment file is a versioned file; use '--force-log' to override" -msgstr "é注éæ件åçæ¬æ§å¶ï¼è¯·ä½¿ç¨ â--force-logâ 强å¶æ§è¡" +msgstr "é注éæ件åçæ¬æ§å¶ï¼è¯·ä½¿ç¨ '--force-log' 强å¶æ§è¡" -#: ../svn/svn.c:2818 +#: ../svn/svn.c:3189 msgid "The log message is a pathname (was -F intended?); use '--force-log' to override" -msgstr "æ¥å¿ä¿¡æ¯æ¯è·¯å¾å称 (æ¬æ¥æ³ç¨ -F é项çåï¼)ï¼è¯·ä½¿ç¨â--force-logâ强å¶æ§è¡" +msgstr "æ¥å¿ä¿¡æ¯æ¯è·¯å¾å称 (æ¬æ¥æ³ç¨ -F é项çåï¼)ï¼è¯·ä½¿ç¨'--force-log'强å¶æ§è¡" -#: ../svn/svn.c:2825 +#: ../svn/svn.c:3196 msgid "The lock comment is a pathname (was -F intended?); use '--force-log' to override" -msgstr "é注éæ¯è·¯å¾å称 (æ¬æ¥æ³ç¨-F é项çåï¼)ï¼è¯·ä½¿ç¨â--force-logâ强å¶æ§è¡" +msgstr "é注éæ¯è·¯å¾å称 (æ¬æ¥æ³ç¨-F é项çåï¼)ï¼è¯·ä½¿ç¨'--force-log'强å¶æ§è¡" -#: ../svn/svn.c:2848 +#: ../svn/svn.c:3219 msgid "--auto-props and --no-auto-props are mutually exclusive" msgstr "--auto-props ä¸ --no-auto-props æ¯äºæ¥ç" -#: ../svn/svn.c:2957 ../svn/svn.c:2964 +#: ../svn/svn.c:3318 ../svn/svn.c:3325 #, c-format msgid "--accept=%s incompatible with --non-interactive" msgstr "--accept=%s ä¸ --non-interactive ä¸å ¼å®¹" -#: ../svn/svn.c:3021 -#, fuzzy, c-format +#: ../svn/svn.c:3374 +#, c-format msgid "Try 'svn help %s' for more information" -msgstr "è¯·ä½¿ç¨ âsvn helpâ 以å¾å°æ´å¤ä¿¡æ¯" +msgstr "å°è¯ 'svn help %s' è·åæ´å¤ä¿¡æ¯" + +#: ../svn/svn.c:3380 ../svnbench/svnbench.c:948 +msgid "Please see the 'svn upgrade' command" +msgstr "请åé å½ä»¤ 'svn upgrade'" -#: ../svn/svn.c:3033 ../svnmucc/svnmucc.c:966 ../svnrdump/svnrdump.c:1228 +#: ../svn/svn.c:3386 ../svnmucc/svnmucc.c:964 ../svnrdump/svnrdump.c:1152 msgid "Authentication failed and interactive prompting is disabled; see the --force-interactive option" -msgstr "" +msgstr "认è¯å¤±è´¥ä¸äº¤äºå¼æ示已ç¦ç¨ï¼åè§ --force-interactive é项" -#: ../svn/svn.c:3038 +#: ../svn/svn.c:3391 msgid "Reading file from standard input because of -F option; this can interfere with interactive prompting" -msgstr "" +msgstr "ç±äº -F é项ï¼æ£å¨ä»æ åè¾å ¥è¯»åæ件ï¼è¿å¯è½å¹²æ°äº¤äºå¼æ示" + +#: ../svn/svn.c:3402 ../svnbench/svnbench.c:956 +msgid "Run 'svn cleanup' to remove locks (type 'svn help cleanup' for details)" +msgstr "è¿è¡'svn cleanup'å é¤é (è¿è¡'svn help cleanup'以å¾å°è¯¦ç»ä¿¡æ¯)" -#: ../svn/svn.c:3056 +#: ../svn/svn.c:3409 msgid "Another process is blocking the working copy database, or the underlying filesystem does not support file locking; if the working copy is on a network filesystem, make sure file locking has been enabled on the file server" -msgstr "" +msgstr "å¦ä¸ä¸ªè¿ç¨æ£å¨é»å¡å·¥ä½å¯æ¬æ°æ®åºï¼æè åºå±æ件系ç»ä¸æ¯ææ件éå®ï¼å¦æå·¥ä½å¯æ¬ä½äºç½ç»æ件系ç»ä¸ï¼è¯·ç¡®è®¤æ件æå¡å¨ä¸å·²å¯ç¨æ件éå®" -#: ../svn/svn.c:3069 +#: ../svn/svn.c:3422 msgid "When using svn+ssh:// URLs, keep in mind that the --username and --password options are ignored because authentication is performed by SSH, not Subversion" -msgstr "" +msgstr "ä½¿ç¨ svn+ssh:// URL æ¶ï¼è¯·æ³¨æ --username å --password é项ä¼è¢«å¿½ç¥ï¼å 为认è¯ç±" #: ../svn/switch-cmd.c:63 #, c-format msgid "'%s' to '%s' is not a valid relocation" -msgstr "â%sâå°â%sâä¸æ¯ææçéå®ä½" +msgstr "'%s'å°'%s'ä¸æ¯ææçéå®ä½" -#: ../svn/switch-cmd.c:170 +#: ../svn/switch-cmd.c:173 #, c-format msgid "Path '%s' does not share common version control ancestry with the requested switch location. Use --ignore-ancestry to disable this check." -msgstr "è·¯å¾â%sâä¸è¯·æ±çåæ¢ä½ç½®æ²¡æå ±åçç¥å ãä½¿ç¨ --ignore-ancestry å¯ä»¥ç¦ç¨æ¤æ£æ¥ã" +msgstr "è·¯å¾'%s'ä¸è¯·æ±çåæ¢ä½ç½®æ²¡æå ±åçç¥å ãä½¿ç¨ --ignore-ancestry å¯ä»¥ç¦ç¨æ¤æ£æ¥ã" -#: ../svn/switch-cmd.c:180 +#: ../svn/switch-cmd.c:183 msgid "'svn switch' does not support switching a working copy to a different repository" -msgstr "" +msgstr "'svn switch' ä¸æ¯æå°å·¥ä½å¯æ¬åæ¢å°ä¸åççæ¬åº" + +#: ../svn/unlock-cmd.c:101 +msgid "One or more locks could not be released" +msgstr "æ æ³éæ¾ä¸ä¸ªæå¤ä¸ªé" #: ../svn/update-cmd.c:93 #, c-format msgid "Summary of updates:\n" -msgstr "æ´æ°æ¦è¦ï¼\n" +msgstr "æ´æ°æ¦è¦:\n" #: ../svn/update-cmd.c:97 #, c-format msgid " Updated '%s' to r%ld.\n" msgstr "æ´æ° '%s' å°çæ¬ %ldã\n" -#: ../svn/util.c:79 +#: ../svn/upgrade-cmd.c:94 +#, c-format +msgid "svn: The target working copy '%s' is at version %d.%d; the highest version supported by this client can be specified with '--compatible-version=%d.%d'.\n" +msgstr "svn: ç®æ å·¥ä½å¯æ¬ '%s' ççæ¬ä¸º %d.%dï¼æ¤å®¢æ·ç«¯æ¯æçæé«çæ¬å¯éè¿ '--compatible-version=%d.%d' æå®ã\n" + +#: ../svn/util.c:86 #, c-format msgid "Committed revision %ld%s.\n" -msgstr "" -"æ交åççæ¬ä¸º %ld%sã\n" +msgstr "æ交åççæ¬ä¸º %ld%sã\n" -#: ../svn/util.c:83 +#: ../svn/util.c:90 msgid " (the answer to life, the universe, and everything)" msgstr " (çå½ï¼å®å®ï¼åä¸åççæ¡)" -#: ../svn/util.c:92 +#: ../svn/util.c:99 ../svnmucc/svnmucc.c:94 #, c-format msgid "" "\n" @@ -13728,49 +18774,49 @@ msgstr "" "\n" "è¦å: %s\n" -#: ../svn/util.c:133 +#: ../svn/util.c:140 msgid "The SVN_MERGE environment variable is empty or consists solely of whitespace. Expected a shell command.\n" msgstr "ç¯å¢åé SVN_MERGE 没æ设置æè ç±ç©ºç½ç»æãææå¤å£³å½ä»¤ã\n" -#: ../svn/util.c:139 +#: ../svn/util.c:146 msgid "The environment variable SVN_MERGE and the merge-tool-cmd run-time configuration option were not set.\n" -msgstr "ç¯å¢åé SVN_MERGE 没æ设置ï¼è¿è¡æ¶çé ç½®ä¸ä¹æ²¡æ设置 âmerge-tool-cmdâã\n" +msgstr "ç¯å¢åé SVN_MERGE 没æ设置ï¼è¿è¡æ¶çé ç½®ä¸ä¹æ²¡æ设置 'merge-tool-cmd'ã\n" -#: ../svn/util.c:168 -#, fuzzy, c-format +#: ../svn/util.c:177 +#, c-format msgid "The external merge tool '%s' exited with exit code %d." -msgstr "å¤é¨åå¹¶å·¥å ·å·²ç»éåºï¼ä»£ç æ¯ %d" +msgstr "å¤é¨åå¹¶å·¥å · '%s' 以éåºç %d éåºã" -#: ../svn/util.c:211 +#: ../svn/util.c:220 msgid "Log message contains a zero byte" msgstr "æ¥å¿ä¿¡æ¯ä¸æä¸ä¸ªé¶åè" -#: ../svn/util.c:269 +#: ../svn/util.c:280 #, c-format msgid " '%s'" msgstr " '%s'" -#: ../svn/util.c:273 +#: ../svn/util.c:284 msgid "Your commit message was left in a temporary file:" -msgstr "æ¨çæ交信æ¯ä¿çå¨ä¸´æ¶æ件ä¸: " +msgstr "ä½ çæ交信æ¯ä¿çå¨ä¸´æ¶æ件ä¸:" -#: ../svn/util.c:325 +#: ../svn/util.c:336 msgid "--This line, and those below, will be ignored--" msgstr "--æ¤è¡å以ä¸å 容å°ä¼è¢«å¿½ç¥--" -#: ../svn/util.c:351 ../svnmucc/svnmucc.c:423 +#: ../svn/util.c:362 ../svnmucc/svnmucc.c:468 msgid "Error normalizing log message to internal format" msgstr "å°æ¥å¿å 容è§æ ¼å为å é¨æ ¼å¼åºé" -#: ../svn/util.c:442 ../svnmucc/svnmucc.c:433 +#: ../svn/util.c:451 ../svnmucc/svnmucc.c:478 msgid "Cannot invoke editor to get log message when non-interactive" msgstr "å¨é交äºå¼ç¯å¢ä¸ä¸è½è°ç¨ç¼è¾å¨è·å¾æ¥å¿ä¿¡æ¯" -#: ../svn/util.c:455 +#: ../svn/util.c:464 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) é项" -#: ../svn/util.c:491 +#: ../svn/util.c:500 msgid "" "\n" "Log message unchanged or not specified\n" @@ -13778,145 +18824,150 @@ msgid "" msgstr "" "\n" "æ¥å¿ä¿¡æ¯æªä¿®æ¹ï¼ææªæå®\n" -"a)ç»æ¢ï¼c)继ç»ï¼e)ç¼è¾ï¼\n" +"a)ç»æ¢ï¼c)继ç»ï¼e)ç¼è¾:\n" -#: ../svn/util.c:544 +#: ../svn/util.c:553 msgid "Use --force to override this restriction (local modifications may be lost)" msgstr "è¯·ä½¿ç¨ --force é项强å¶æ§è¡(å¯è½ä¼ä¸¢å¤±æ¬å°ä¿®æ¹)" -#: ../svn/util.c:733 ../svn/util.c:766 +#: ../svn/util.c:743 ../svn/util.c:776 msgid "none" msgstr "æ " -#: ../svn/util.c:734 +#: ../svn/util.c:744 msgid "file" msgstr "æ件" -#: ../svn/util.c:735 +#: ../svn/util.c:745 msgid "dir" msgstr "ç®å½" -#: ../svn/util.c:767 +#: ../svn/util.c:777 msgid "update" msgstr "æ´æ°" -#: ../svn/util.c:768 +#: ../svn/util.c:778 msgid "switch" msgstr "åæ¢" -#: ../svn/util.c:891 +#: ../svn/util.c:779 +msgid "merge" +msgstr "å并" + +#: ../svn/util.c:901 msgid "(invalid date)" msgstr "(éæ³æ¥æ)" -#: ../svn/util.c:1051 +#: ../svn/util.c:1064 #, c-format msgid "svn: warning: '%s' is a binary mime-type but file '%s' looks like text; diff, merge, blame, and other operations will stop working on this file\n" -msgstr "" +msgstr "svn: è¦å: '%s' æ¯äºè¿å¶ MIME ç±»åï¼ä½æ件 '%s' çèµ·æ¥åææ¬ï¼diffãmergeãblame åå ¶ä»æä½å°ä»\n" -#: ../svnadmin/svnadmin.c:236 ../svnfsfs/svnfsfs.c:141 -#: ../svnrdump/svnrdump.c:131 +#: ../svnadmin/svnadmin.c:181 ../svnfsfs/svnfsfs.c:101 +#: ../svnrdump/svnrdump.c:114 msgid "specify revision number ARG (or X:Y range)" msgstr "æå®çæ¬ ARG (æ X:Y èå´)" -#: ../svnadmin/svnadmin.c:239 ../svnlook/svnlook.c:166 +#: ../svnadmin/svnadmin.c:184 ../svnlook/svnlook.c:173 msgid "specify transaction name ARG" msgstr "æå®äºå¡å称 ARG" -#: ../svnadmin/svnadmin.c:242 +#: ../svnadmin/svnadmin.c:187 msgid "dump or hotcopy incrementally" msgstr "以å¢éæ¹å¼è¿è¡è½¬åæçå¤å¶" -#: ../svnadmin/svnadmin.c:245 +#: ../svnadmin/svnadmin.c:190 msgid "use deltas in dump output" msgstr "å¨è½¬åè¾åºä¸ä½¿ç¨å·®å¼" -#: ../svnadmin/svnadmin.c:248 +#: ../svnadmin/svnadmin.c:193 msgid "bypass the repository hook system" msgstr "è·³è¿çæ¬åºé©åç³»ç»" -#: ../svnadmin/svnadmin.c:251 +#: ../svnadmin/svnadmin.c:196 msgid "bypass property validation logic" msgstr "è·³è¿å±æ§æ ¡éªé»è¾" -#: ../svnadmin/svnadmin.c:254 -#, fuzzy +#: ../svnadmin/svnadmin.c:199 msgid "ignore revision datestamps found in the stream" -msgstr "忽ç¥æææµä¸ççæ¬åº UUID" +msgstr "忽ç¥æµä¸ççæ¬æ¥ææ³" -#: ../svnadmin/svnadmin.c:257 ../svnfsfs/svnfsfs.c:138 -#, fuzzy +#: ../svnadmin/svnadmin.c:202 ../svnfsfs/svnfsfs.c:98 msgid "no progress (only errors to stderr)" -msgstr "å¨æ åé误è¾åºä¸æ¾ç¤ºè¿åº¦ (ä» é误)" +msgstr "ä¸æ¾ç¤ºè¿åº¦(ä» é误è¾åºå° stderr)" -#: ../svnadmin/svnadmin.c:260 +#: ../svnadmin/svnadmin.c:205 msgid "ignore any repos UUID found in the stream" msgstr "忽ç¥æææµä¸ççæ¬åº UUID" -#: ../svnadmin/svnadmin.c:263 +#: ../svnadmin/svnadmin.c:208 msgid "set repos UUID to that found in stream, if any" msgstr "å¦ææµä¸åå¨UUID,å设å®ä¸ºçæ¬åºç UUID" -#: ../svnadmin/svnadmin.c:266 -#, fuzzy +#: ../svnadmin/svnadmin.c:211 msgid "" "type of repository:\n" " 'fsfs' (default), 'bdb' or 'fsx'\n" " CAUTION: FSX is for EXPERIMENTAL use only!" msgstr "" -"æ¯å¦å¯¹æ件å 容å¯ç¨ç¼å\n" -" é»è®¤å¼: æ¯ã\n" -" [ä» ç¨äº FSFS ä»åº]" +"çæ¬åºç±»å:\n" +" 'fsfs' (é»è®¤)ã'bdb' æ 'fsx'\n" +" 注æ" -#: ../svnadmin/svnadmin.c:271 +#: ../svnadmin/svnadmin.c:216 msgid "load at specified directory in repository" msgstr "å è½½å°çæ¬åºæå®çç®å½ä¸" -#: ../svnadmin/svnadmin.c:274 +#: ../svnadmin/svnadmin.c:219 msgid "disable fsync at transaction commit [Berkeley DB]" msgstr "å¨æ交äºå¡æ¶ç¦ç¨fsync [BDB]" -#: ../svnadmin/svnadmin.c:277 +#: ../svnadmin/svnadmin.c:222 msgid "disable automatic log file removal [Berkeley DB]" msgstr "ç¦ç¨èªå¨å é¤æ¥å¿æ件 [BDB]" -#: ../svnadmin/svnadmin.c:283 +#: ../svnadmin/svnadmin.c:228 msgid "" "remove redundant Berkeley DB log files\n" " from source repository [Berkeley DB]" -msgstr "å é¤æºçæ¬åºä¸å¤ä½çBDBæ¥å¿æ件 [BDB]" +msgstr "" +"ä»æºçæ¬åºä¸å é¤å¤ä½ç Berkeley DB\n" +" æ¥å¿æ件 [Berkeley DB]" -#: ../svnadmin/svnadmin.c:287 +#: ../svnadmin/svnadmin.c:232 msgid "call pre-commit hook before committing revisions" msgstr "æ交çæ¬åè°ç¨ pre-commit é©å" -#: ../svnadmin/svnadmin.c:290 +#: ../svnadmin/svnadmin.c:235 msgid "call post-commit hook after committing revisions" msgstr "æ交çæ¬åè°ç¨ post-commit é©å" -#: ../svnadmin/svnadmin.c:293 +#: ../svnadmin/svnadmin.c:238 msgid "call hook before changing revision property" msgstr "ä¿®æ¹å±æ§åè°ç¨é©å" -#: ../svnadmin/svnadmin.c:296 +#: ../svnadmin/svnadmin.c:241 msgid "call hook after changing revision property" msgstr "ä¿®æ¹å±æ§åè°ç¨é©å" -#: ../svnadmin/svnadmin.c:299 +#: ../svnadmin/svnadmin.c:244 msgid "" "wait instead of exit if the repository is in\n" " use by another process" -msgstr "å¦æçæ¬åºè¢«å ¶ä»è¿ç¨å ç¨ï¼çå¾ èä¸ç´æ¥éåº" +msgstr "" +"å¦æçæ¬åºæ£è¢«å ¶ä»è¿ç¨ä½¿ç¨ï¼åçå¾ \n" +" èä¸æ¯éåº" -#: ../svnadmin/svnadmin.c:303 ../svnadmin/svnadmin.c:306 -#: ../svnadmin/svnadmin.c:309 +#: ../svnadmin/svnadmin.c:248 ../svnadmin/svnadmin.c:251 +#: ../svnadmin/svnadmin.c:254 msgid "deprecated; see --compatible-version" -msgstr "" +msgstr "å·²åºå¼ï¼åè§ --compatible-version" -#: ../svnadmin/svnadmin.c:312 +#: ../svnadmin/svnadmin.c:257 msgid "continue verification after detecting a corruption" -msgstr "" +msgstr "æ£æµå°æåå继ç»éªè¯" -#: ../svnadmin/svnadmin.c:315 +#: ../svnadmin/svnadmin.c:260 ../svnlook/svnlook.c:148 msgid "" "size of the extra in-memory cache in MB used to\n" " minimize redundant operations. Default: 16.\n" @@ -13926,107 +18977,195 @@ msgstr "" " é»è®¤å¼: 16ã\n" " [ä» ç¨äº FSFS ä»åº]" -#: ../svnadmin/svnadmin.c:320 -#, fuzzy +#: ../svnadmin/svnadmin.c:265 msgid "" "use repository format compatible with Subversion\n" " version ARG (\"1.5.5\", \"1.7\", etc.)" -msgstr "ä½¿ç¨ Subversion 1.5 ä¹åçæ¬çæ ¼å¼" +msgstr "" +"使ç¨ä¸ Subversion çæ¬ ARG å ¼å®¹ç\n" +" çæ¬åºæ ¼å¼(\"1.5.5\"ã\"1.7\" ç)" -#: ../svnadmin/svnadmin.c:323 -#, fuzzy +#: ../svnadmin/svnadmin.c:268 ../svnadmin/svnadmin.c:417 msgid "read repository paths from file ARG" -msgstr "ä»æ件 ARG 读åå±æ§å¼" +msgstr "ä»æ件 ARG 读åçæ¬åºè·¯å¾" -#: ../svnadmin/svnadmin.c:326 -#, fuzzy +#: ../svnadmin/svnadmin.c:271 msgid "" "report any names within the same directory or\n" " svn:mergeinfo property value that differ only\n" " in character representation, but are otherwise\n" " identical" msgstr "" -"å¨éè¦æ¶çªåéã请å°å¿ä½¿ç¨\n" -" å¦æä½ çéåå å«è¿æ¶çéï¼å¹¶ä¸æ²¡æå ¶å® svnsync\n" -" å®ä¾åæ¶è¿è¡ã" +"æ¥ååä¸ç®å½ä¸æ svn:mergeinfo å±æ§å¼å \n" +" ä» å符表示形å¼ä¸åãå ¶ä½å®å ¨ç¸åç\n" +" å称" -#: ../svnadmin/svnadmin.c:332 -#, fuzzy +#: ../svnadmin/svnadmin.c:277 msgid "" "verify metadata only (ignored for BDB),\n" " checking against external corruption in\n" " Subversion 1.9+ format repositories.\n" msgstr "" -"ç¨æ¥åå°åä½æä½çå åä¸çé¢å¤ç¼åç大å°(MB)\n" -" é»è®¤å¼: 16ã\n" -" [ä» ç¨äº FSFS ä»åº]" +"ä» éªè¯å æ°æ®(BDB 忽ç¥æ¤é项)ï¼\n" +" å¨ Subversion 1.9+ æ ¼å¼ççæ¬åºä¸\n" +" æ£æ¥å¤é¨åå é æçæåã\n" + +#: ../svnadmin/svnadmin.c:282 +msgid "" +"disable flushing to disk during the operation\n" +" (faster, but unsafe on power off)" +msgstr "" +"æä½æé´ç¦ç¨ç£çå·æ°\n" +" (æ´å¿«ï¼ä½æçµä¸å®å ¨)" + +#: ../svnadmin/svnadmin.c:286 +msgid "" +"normalize property values found in the dumpstream\n" +" (currently, only translates non-LF line endings)" +msgstr "" +"è§èå转å¨æµä¸çå±æ§å¼\n" +" (ç®åä» å°é LF è¡ç»æ符转æ¢ä¸º LF)" + +#: ../svnadmin/svnadmin.c:290 +msgid "filter out nodes with given prefix(es) from dump" +msgstr "ä»è½¬å¨ä¸è¿æ»¤æå ·æç»å®åç¼çèç¹" + +#: ../svnadmin/svnadmin.c:293 +msgid "filter out nodes without given prefix(es) from dump" +msgstr "ä»è½¬å¨ä¸è¿æ»¤æä¸å ·æç»å®åç¼çèç¹" + +#: ../svnadmin/svnadmin.c:296 +msgid "" +"treat the path prefixes as file glob patterns.\n" +" Glob special characters are '*' '?' '[]' and '\\'.\n" +" Character '/' is not treated specially, so\n" +" pattern /*/foo matches paths /a/foo and /a/b/foo." +msgstr "" +"å°è·¯å¾åç¼ä½ä¸ºæ件 glob 模å¼å¤çã\n" +" Glob ç¹æ®å符为 '*' '?' '[]' å '\\'ã\n" +" å符 '/' ä¸ä½ç¹æ®å¤çï¼æ以模å¼\n" +" /*/foo å¹é è·¯å¾ /a/foo å /a/b/fooã" -#: ../svnadmin/svnadmin.c:346 +#: ../svnadmin/svnadmin.c:311 +msgid "" +"usage: svnadmin build-repcache REPOS_PATH [-r LOWER[:UPPER]]\n" +"\n" +msgstr "" +"ç¨æ³: svnadmin build-repcache REPOS_PATH [-r LOWER[:UPPER]]\n" +"\n" + +#: ../svnadmin/svnadmin.c:313 +msgid "" +"Add missing entries to the representation cache for the repository\n" +"at REPOS_PATH. Process data in revisions LOWER through UPPER.\n" +"If no revision arguments are given, process all revisions. If only\n" +"LOWER revision argument is given, process only that single revision.\n" +msgstr "" +"为 REPOS_PATH å¤ççæ¬åºæ·»å 缺失ç表示ç¼åæ¡ç®ã\n" +"å¤ç LOWER å° UPPER çæ¬ä¸çæ°æ®ã\n" +"å¦ææªç»åºçæ¬åæ°ï¼åå¤çææçæ¬ãå¦æåªç»åº LOWER\n" +"çæ¬åæ°ï¼ååªå¤ç该å个çæ¬ã\n" + +#: ../svnadmin/svnadmin.c:321 msgid "" "usage: svnadmin crashtest REPOS_PATH\n" "\n" -"Open the repository at REPOS_PATH, then abort, thus simulating\n" -"a process that crashes while holding an open repository handle.\n" msgstr "" "ç¨æ³: svnadmin crashtest REPOS_PATH\n" "\n" -"æå¼ä½äº REPOS_PATH ççæ¬åº, ç¶åç»æ¢, ä»è模æä¸ä¸ªææçæ¬åºå¥æè¿ç¨çå´©æºã\n" -#: ../svnadmin/svnadmin.c:352 +#: ../svnadmin/svnadmin.c:323 +msgid "" +"Open the repository at REPOS_PATH, then abort, thus simulating\n" +"a process that crashes while holding an open repository handle.\n" +msgstr "" +"æå¼ REPOS_PATH å¤ççæ¬åºï¼ç¶åä¸æ¢ï¼\n" +"模ææææå¼ççæ¬åºå¥ææ¶å´©æºçè¿ç¨ã\n" + +#: ../svnadmin/svnadmin.c:329 msgid "" "usage: svnadmin create REPOS_PATH\n" "\n" -"Create a new, empty repository at REPOS_PATH.\n" msgstr "" "ç¨æ³: svnadmin create REPOS_PATH\n" "\n" -"å¨ REPOS_PATH å建ä¸ä¸ªæ°ç空çæ¬åºã\n" -#: ../svnadmin/svnadmin.c:361 -#, fuzzy +#: ../svnadmin/svnadmin.c:331 +msgid "Create a new, empty repository at REPOS_PATH.\n" +msgstr "å¨ REPOS_PATH å建ä¸ä¸ªæ°ç空çæ¬åºã\n" + +#: ../svnadmin/svnadmin.c:340 msgid "" "usage: 1. svnadmin delrevprop REPOS_PATH -r REVISION NAME\n" -" 2. svnadmin delrevprop REPO_PATH -t TXN NAME\n" +" 2. svnadmin delrevprop REPOS_PATH -t TXN NAME\n" "\n" +msgstr "" +"ç¨æ³: 1. svnadmin delrevprop REPOS_PATH -r REVISION NAME\n" +" 2. svnadmin delrevprop REPOS_PATH -t TXN N\n" + +#: ../svnadmin/svnadmin.c:343 +msgid "" "1. Delete the property NAME on revision REVISION.\n" "\n" +msgstr "" +"1. å é¤çæ¬ REVISION ä¸å为 NAME çå±æ§ã\n" +"\n" + +#: ../svnadmin/svnadmin.c:345 ../svnadmin/svnadmin.c:584 +msgid "" "Use --use-pre-revprop-change-hook/--use-post-revprop-change-hook to\n" "trigger the revision property-related hooks (for example, if you want\n" "an email notification sent from your post-revprop-change hook).\n" "\n" +msgstr "" +"ä½¿ç¨ --use-pre-revprop-change-hook/--use-post-revprop-change-hook\n" +"æ¥è§¦åçæ¬å±æ§ç¸å ³çé©å(ä¾å¦ï¼å¦æä½ å¸æ post-revprop-change\n" +"é©ååéé®ä»¶éç¥)ã\n" +"\n" + +#: ../svnadmin/svnadmin.c:349 +msgid "" "NOTE: Revision properties are not versioned, so this command will\n" "irreversibly destroy the previous value of the property.\n" "\n" -"2. Delete the property NAME on transaction TXN.\n" msgstr "" -"ç¨æ³: svnadmin setrevprop REPOS_PATH -r REVISION NAME FILE\n" -"\n" -" å°çæ¬ REVISION çå±æ§ NAME 设为 FILE çå 容ã使ç¨\n" -" --use-pre-revprop-change-hook/--use-post-revprop-change-hook æ¥è§¦åä¸ä¿®\n" -" æ¹å±æ§ç¸å ³çé©å(ä¾å¦ï¼ä½ éè¦å¨ä½ ç post-revprop-change é©åä¸åé email\n" -" éç¥)ã\n" -"\n" -" 注æ: 修订å±æ§å¹¶æªçº³å ¥çæ¬ç®¡çï¼æ以è¿ä¸ªå½ä»¤ä¼è¦ç以åçå±æ§åå¼ã\n" +"注æ: çæ¬å±æ§æ²¡æçæ¬æ§å¶ï¼æ以æ¤å½ä»¤å°\n" +"ä¸å¯éå°éæ¯å±æ§çå åå¼ã\n" + +#: ../svnadmin/svnadmin.c:352 +msgid "2. Delete the property NAME on transaction TXN.\n" +msgstr "2. å é¤äºå¡ TXN ä¸å为 NAME çå±æ§ã\n" -#: ../svnadmin/svnadmin.c:374 +#: ../svnadmin/svnadmin.c:359 msgid "" "usage: svnadmin deltify [-r LOWER[:UPPER]] REPOS_PATH\n" "\n" +msgstr "" +"ç¨æ³: svnadmin deltify [-r LOWER[:UPPER]] REPOS_PATH\n" +"\n" + +#: ../svnadmin/svnadmin.c:361 +msgid "" "Run over the requested revision range, performing predecessor delti-\n" "fication on the paths changed in those revisions. Deltification in\n" "essence compresses the repository by only storing the differences or\n" "delta from the preceding revision. If no revisions are specified,\n" "this will simply deltify the HEAD revision.\n" msgstr "" -"ç¨æ³: svnadmin deltify [-r LOWER[:UPPER]] REPOS_PATH\n" -"\n" -"å¨æå®ççæ¬èå´ä¸ï¼å¯¹å ¶ä¸åå¨çè·¯å¾å¢é计ç®ãåå©åªå¨åä¸ä»¥åçæ¬çå·®å¼ï¼\n" -"å®æ¬è´¨ä¸å¯å缩çæ¬åºãå¦æ没ææå®çæ¬åç´æ¥å¯¹ HEAD çæ¬è¿è¡ã\n" +"éå请æ±ççæ¬èå´ï¼å¯¹è¿äºçæ¬ä¸æ´æ¹çè·¯å¾æ§è¡å驱å¢éåã\n" +"å¢éåå®è´¨ä¸æ¯åªä¿åä¸åä¸çæ¬çå·®å¼(å¢é)ï¼ä»èå缩çæ¬åºã\n" +"å¦ææªæå®çæ¬ï¼ååªå¯¹ HEAD çæ¬åå¢éåã\n" -#: ../svnadmin/svnadmin.c:383 +#: ../svnadmin/svnadmin.c:370 msgid "" "usage: svnadmin dump REPOS_PATH [-r LOWER[:UPPER] [--incremental]]\n" "\n" +msgstr "" +"ç¨æ³: svnadmin dump REPOS_PATH [-r LOWER[:UPPER] [--incremental]]\n" +"\n" + +#: ../svnadmin/svnadmin.c:372 +msgid "" "Dump the contents of filesystem to stdout in a 'dumpfile'\n" "portable format, sending feedback to stderr. Dump revisions\n" "LOWER rev through UPPER rev. If no revisions are given, dump all\n" @@ -14036,89 +19175,176 @@ msgid "" "every path present in the repository as of that revision. (In either\n" "case, the second and subsequent revisions, if any, describe only paths\n" "changed in those revisions.)\n" +"\n" msgstr "" -"ç¨æ³: svnadmin dump REPOS_PATH [-r LOWER[:UPPER] [--incremental]]\n" +"å°æ件系ç»çå 容以å¯ç§»æ¤ç转å¨æä»¶æ ¼å¼è¾åºå°æ åè¾åºï¼\n" +"åé¦ä¿¡æ¯è¾åºå°æ åé误ã转å¨ä» LOWER çæ¬å° UPPER çæ¬ã\n" +"å¦ææªæå®çæ¬ï¼å转å¨ææçæ¬æ ãå¦æåªæå®äº LOWERï¼\n" +"ååªè½¬å¨è¯¥çæ¬æ ãå¦æ使ç¨äº --incrementalï¼è½¬å¨ç第ä¸ä¸ª\n" +"çæ¬åªæ述该çæ¬ä¸åæ´çè·¯å¾ï¼å¦åä¼æ述该çæ¬ä¸çæ¬åºé\n" +"åå¨çææè·¯å¾ã(æ 论åªç§æ åµï¼ç¬¬äºä¸ªååç»çæ¬åªæè¿°\n" +"åèªçæ¬ä¸åæ´çè·¯å¾ã)\n" "\n" -"å°æ件系ç»çå 容ï¼ä»¥å¯ç§»æ¤â转åâæ ¼å¼è¾åºå°æ åè¾åºï¼å¹¶å°åé¦è¾åºå°æ åé误ã\n" -"转å LOWER ä¸ UPPER çæ¬ä¹é´çå 容ãå¦æ没ææå®çæ¬ï¼å转å¨ææççæ¬æ ã\n" -"å¦æåªææå® LOWER ï¼ååªè½¬å¨ä¸ä¸ªçæ¬æ ãå¦æ使ç¨äº --incremental é项ï¼é£ä¹\n" -"第ä¸ä¸ªè½¬åççæ¬åªæè¿°å®æ¹åçè·¯å¾ï¼å¦åå®ä¼æè¿°æ¤çæ¬å¨çæ¬åºä¸æ¶åå°çæ¯ä¸ª\n" -"è·¯å¾ã(å¨ä»»ä½æ åµä¸ï¼ç¬¬äºä¸ªä»¥ååç»ççæ¬ï¼åªæè¿°è¿äºçæ¬æ¹åçè·¯å¾ã)\n" -#: ../svnadmin/svnadmin.c:396 +#: ../svnadmin/svnadmin.c:382 msgid "" -"usage: 1. svnadmin freeze REPOS_PATH PROGRAM [ARG...]\n" -" 2. svnadmin freeze -F FILE PROGRAM [ARG...]\n" +"Using --exclude or --include gives results equivalent to authz-based\n" +"path exclusions. In particular, when the source of a copy is\n" +"excluded, the copy is transformed into an add (unlike in 'svndumpfilter').\n" +msgstr "" +"ä½¿ç¨ --exclude æ --include å¾å°çç»æçåäºåºäº authz çè·¯å¾\n" +"æé¤ãç¹å«æ¯ï¼å½å¤å¶çæºè¢«æé¤æ¶ï¼è¯¥å¤å¶ä¼åææ·»å (è¿ä¸\n" +"'svndumpfilter' ä¸å)ã\n" + +#: ../svnadmin/svnadmin.c:388 ../svnadmin/svnadmin.c:400 +#: ../svnrdump/svnrdump.c:94 +msgid "write to file ARG instead of stdout" +msgstr "åå ¥æ件 ARG èä¸æ¯æ åè¾åº" + +#: ../svnadmin/svnadmin.c:391 +msgid "" +"usage: svnadmin dump-revprops REPOS_PATH [-r LOWER[:UPPER]]\n" +"\n" +msgstr "" +"ç¨æ³: svnadmin dump-revprops REPOS_PATH [-r LOWER[:UPPER]]\n" "\n" + +#: ../svnadmin/svnadmin.c:393 +msgid "" +"Dump the revision properties of filesystem to stdout in a 'dumpfile'\n" +"portable format, sending feedback to stderr. Dump revisions\n" +"LOWER rev through UPPER rev. If no revisions are given, dump the\n" +"properties for all revisions. If only LOWER is given, dump the\n" +"properties for that one revision.\n" +msgstr "" +"å°æ件系ç»ççæ¬å±æ§ä»¥'转å¨æ件'å¯ç§»æ¤æ ¼å¼è½¬å¨å°æ åè¾åºï¼\n" +"并æåé¦åéå°æ åé误ãè½¬å¨ LOWER å° UPPER çæ¬ãå¦ææªç»åº\n" +"çæ¬ï¼å转å¨ææçæ¬çå±æ§ãå¦æåªç»åº LOWERï¼ååªè½¬å¨è¯¥çæ¬\n" +"çå±æ§ã\n" + +#: ../svnadmin/svnadmin.c:403 +msgid "" +"usage: 1. svnadmin freeze REPOS_PATH -- PROGRAM [ARG...]\n" +" 2. svnadmin freeze -F FILE -- PROGRAM [ARG...]\n" +"\n" +msgstr "" +"ç¨æ³: 1. svnadmin freeze REPOS_PATH -- PROGRAM [ARG...]\n" +" 2. svnadmin freeze -F FILE -- PROGRAM [ARG...]\n" + +#: ../svnadmin/svnadmin.c:406 +msgid "" "1. Run PROGRAM passing ARGS while holding a write-lock on REPOS_PATH.\n" +" Allows safe use of third-party backup tools on a live repository.\n" "\n" +msgstr "" +"1. å¨ææ REPOS_PATH åéçåæ¶è¿è¡ PROGRAM å¹¶ä¼ é ARGSã\n" +" è¿æ ·å¯ä»¥å¨æ´»å¨ççæ¬åºä¸å®å ¨ä½¿ç¨ç¬¬ä¸æ¹å¤ä»½å·¥å ·ã\n" +"\n" + +#: ../svnadmin/svnadmin.c:409 +msgid "" "2. Like 1 except all repositories listed in FILE are locked. The file\n" " format is repository paths separated by newlines. Repositories are\n" " locked in the same order as they are listed in the file.\n" +"\n" +"The '--' tells svnadmin to stop looking for svnadmin options and pass\n" +"all later arguments to PROGRAM even if they begin with '-'.\n" msgstr "" +"2. ä¸ 1 ç¸åï¼ä½éå® FILE ä¸ååºçææçæ¬åºãæä»¶æ ¼å¼ä¸ºä»¥\n" +" æ¢è¡ç¬¦åéççæ¬åºè·¯å¾ãææ件ä¸ååºç顺åºä¾æ¬¡å éã\n" +"\n" +"'--' åè¯ svnadmin ä¸åæ¥æ¾ svnadmin é项ï¼æåé¢ææåæ°é½ä¼ ç»\n" +"PROGRAMï¼å³ä½¿å®ä»¬ä»¥ '-' å¼å¤´ã\n" -#: ../svnadmin/svnadmin.c:406 +#: ../svnadmin/svnadmin.c:420 msgid "" "usage: svnadmin help [SUBCOMMAND...]\n" "\n" -"Describe the usage of this program or its subcommands.\n" msgstr "" "ç¨æ³: svnadmin help [SUBCOMMAND...]\n" "\n" -"æ¾ç¤ºæ¬ç¨åºæå ¶åå½ä»¤çç¨æ³ã\n" -#: ../svnadmin/svnadmin.c:411 +#: ../svnadmin/svnadmin.c:422 ../svnfsfs/svnfsfs.c:119 ../svnlook/svnlook.c:273 +#: ../svnrdump/svnrdump.c:105 ../svnsync/svnsync.c:172 +msgid "Describe the usage of this program or its subcommands.\n" +msgstr "æè¿°æ¤ç¨åºæå ¶åå½ä»¤çç¨æ³ã\n" + +#: ../svnadmin/svnadmin.c:427 msgid "" "usage: svnadmin hotcopy REPOS_PATH NEW_REPOS_PATH\n" "\n" +msgstr "" +"ç¨æ³: svnadmin hotcopy REPOS_PATH NEW_REPOS_PATH\n" +"\n" + +#: ../svnadmin/svnadmin.c:429 +msgid "" "Make a hot copy of a repository.\n" "If --incremental is passed, data which already exists at the destination\n" "is not copied again. Incremental mode is implemented for FSFS repositories.\n" msgstr "" +"对çæ¬åºåçå¤å¶ã\n" +"å¦æä¼ å ¥ --incrementalï¼ç®æ ä¸å·²åå¨çæ°æ®ä¸ä¼åå¤å¶ä¸éã\n" +"å¢é模å¼ä» 对 FSFS çæ¬åºå®ç°ã\n" -#: ../svnadmin/svnadmin.c:418 -#, fuzzy +#: ../svnadmin/svnadmin.c:436 msgid "" "usage: svnadmin info REPOS_PATH\n" "\n" -"Print information about the repository at REPOS_PATH.\n" msgstr "" -"ç¨æ³: svnadmin create REPOS_PATH\n" +"ç¨æ³: svnadmin info REPOS_PATH\n" "\n" -"å¨ REPOS_PATH å建ä¸ä¸ªæ°ç空çæ¬åºã\n" -#: ../svnadmin/svnadmin.c:423 +#: ../svnadmin/svnadmin.c:438 +msgid "Print information about the repository at REPOS_PATH.\n" +msgstr "æå° REPOS_PATH å¤çæ¬åºçä¿¡æ¯ã\n" + +#: ../svnadmin/svnadmin.c:443 msgid "" "usage: svnadmin list-dblogs REPOS_PATH\n" "\n" +msgstr "" +"ç¨æ³: svnadmin list-dblogs REPOS_PATH\n" +"\n" + +#: ../svnadmin/svnadmin.c:445 +msgid "" "List all Berkeley DB log files.\n" "\n" +msgstr "" +"ååºææ Berkeley DB æ¥å¿æ件ã\n" +"\n" + +#: ../svnadmin/svnadmin.c:447 +msgid "" "WARNING: Modifying or deleting logfiles which are still in use\n" "will cause your repository to be corrupted.\n" msgstr "" -"ç¨æ³: svnadmin list-dblogs REPOS_PATH\n" -"\n" -"ååºææçBDBæ¥å¿æ件ã\n" -"\n" -"è¦å: ä¿®æ¹æå é¤ä»å¨ä½¿ç¨ä¸çè®°å½æ件å°å¯¼è´çæ¬åºæåã\n" +"è¦å: ä¿®æ¹æå é¤ä»å¨ä½¿ç¨çæ¥å¿æ件\n" +"å°å¯¼è´çæ¬åºæåã\n" -#: ../svnadmin/svnadmin.c:430 +#: ../svnadmin/svnadmin.c:453 msgid "" "usage: svnadmin list-unused-dblogs REPOS_PATH\n" "\n" -"List unused Berkeley DB log files.\n" -"\n" msgstr "" "ç¨æ³: svnadmin list-unused-dblogs REPOS_PATH\n" "\n" -"ååºæ ç¨çBDBæ¥å¿æ件ã\n" -"\n" -#: ../svnadmin/svnadmin.c:435 -#, fuzzy +#: ../svnadmin/svnadmin.c:455 +msgid "List unused Berkeley DB log files.\n" +msgstr "ååºæªä½¿ç¨ç Berkeley DB æ¥å¿æ件ã\n" + +#: ../svnadmin/svnadmin.c:460 msgid "" "usage: svnadmin load REPOS_PATH\n" "\n" +msgstr "" +"ç¨æ³: svnadmin load REPOS_PATH\n" +"\n" + +#: ../svnadmin/svnadmin.c:462 +msgid "" "Read a 'dumpfile'-formatted stream from stdin, committing\n" "new revisions into the repository's filesystem. If the repository\n" "was previously empty, its UUID will, by default, be changed to the\n" @@ -14126,93 +19352,178 @@ msgid "" "If --revision is specified, limit the loaded revisions to only those\n" "in the dump stream whose revision numbers match the specified range.\n" msgstr "" -"ç¨æ³: svnadmin load REPOS_PATH\n" +"ä»æ åè¾å ¥è¯»å'转å¨æ件'æ ¼å¼çæµï¼ææ°çæ¬æ交å°çæ¬åºçæ件\n" +"ç³»ç»ä¸ãå¦æçæ¬åºåå æ¯ç©ºçï¼é»è®¤ä¼æå®ç UUID æ¹ææµä¸æå®ç\n" +"UUIDãè¿åº¦åé¦åéå°æ åè¾åºã\n" +"å¦ææå®äº --revisionï¼ååªè£ 载转å¨æµä¸çæ¬å·å¨æå®èå´å ççæ¬ã\n" + +#: ../svnadmin/svnadmin.c:475 ../svnadmin/svnadmin.c:488 +#: ../svnrdump/svnrdump.c:101 +msgid "read from file ARG instead of stdin" +msgstr "ä»æ件 ARG 读åèä¸æ¯æ åè¾å ¥" + +#: ../svnadmin/svnadmin.c:478 +msgid "" +"usage: svnadmin load-revprops REPOS_PATH\n" +"\n" +msgstr "" +"ç¨æ³: svnadmin load-revprops REPOS_PATH\n" "\n" -"ä»æ åè¾å ¥è¯»åâ转åâæ ¼å¼çæµï¼å°æ°ççæ¬æ交è³çæ¬åºçæ件\n" -"ç³»ç»ä¸ãå¦æçæ¬åºåå æ¯ç©ºçï¼é»è®¤ä¼å°å ¶ UUID 以æµä¸çæ°å¼ä»£æ¿ã\n" -"è¿åº¦æ¥åä¼éè³æ åè¾åºã\n" -#: ../svnadmin/svnadmin.c:448 +#: ../svnadmin/svnadmin.c:480 +msgid "" +"Read a 'dumpfile'-formatted stream from stdin, setting the revision\n" +"properties in the repository's filesystem. Revisions not found in the\n" +"repository will cause an error. Progress feedback is sent to stdout.\n" +"If --revision is specified, limit the loaded revisions to only those\n" +"in the dump stream whose revision numbers match the specified range.\n" +msgstr "" +"ä»æ åè¾å ¥è¯»å'转å¨æ件'æ ¼å¼çæµï¼è®¾ç½®çæ¬åºæ件系ç»ä¸ççæ¬\n" +"å±æ§ãçæ¬åºä¸ä¸åå¨ççæ¬ä¼å¯¼è´é误ãè¿åº¦åé¦åéå°æ åè¾åºã\n" +"å¦ææå®äº --revisionï¼ååªè£ 载转å¨æµä¸çæ¬å·å¨æå®èå´å ççæ¬ã\n" + +#: ../svnadmin/svnadmin.c:491 msgid "" "usage: svnadmin lock REPOS_PATH PATH USERNAME COMMENT-FILE [TOKEN]\n" "\n" +msgstr "" +"ç¨æ³: svnadmin lock REPOS_PATH PATH USERNAME COMMENT-FILE [TOKEN]\n" +"\n" + +#: ../svnadmin/svnadmin.c:493 +msgid "" "Lock PATH by USERNAME setting comments from COMMENT-FILE.\n" "If provided, use TOKEN as lock token. Use --bypass-hooks to avoid\n" "triggering the pre-lock and post-lock hook scripts.\n" msgstr "" +"ç± USERNAME éå® PATHï¼æ³¨éä» COMMENT-FILE ä¸è®¾ç½®ã\n" +"å¦ææä¾äº TOKENï¼ä½¿ç¨å ¶ä½ä¸ºéæ è®°ãä½¿ç¨ --bypass-hooks è·³è¿\n" -#: ../svnadmin/svnadmin.c:455 +#: ../svnadmin/svnadmin.c:500 msgid "" "usage: svnadmin lslocks REPOS_PATH [PATH-IN-REPOS]\n" "\n" -"Print descriptions of all locks on or under PATH-IN-REPOS (which,\n" -"if not provided, is the root of the repository).\n" msgstr "" "ç¨æ³: svnadmin lslocks REPOS_PATH [PATH-IN-REPOS]\n" "\n" -"æ¾ç¤ºä½äº PATH-IN-REPOS æå ¶ååä¸çææéçæè¿°(å¦æ没ææä¾ PATH-IN-REPOSï¼\n" -"é£ä¹æ¾ç¤ºçæ¬åºæ ¹çä¿¡æ¯)ã\n" -#: ../svnadmin/svnadmin.c:461 +#: ../svnadmin/svnadmin.c:502 +msgid "" +"Print descriptions of all locks on or under PATH-IN-REPOS (which,\n" +"if not provided, is the root of the repository).\n" +msgstr "" +"æå° PATH-IN-REPOS ä¸æå ¶ä¸ææéçæè¿°\n" +"(å¦ææªæä¾ï¼å为çæ¬åºæ ¹)ã\n" + +#: ../svnadmin/svnadmin.c:508 msgid "" "usage: svnadmin lstxns REPOS_PATH\n" "\n" -"Print the names of all uncommitted transactions.\n" msgstr "" "ç¨æ³: svnadmin lstxns REPOS_PATH\n" "\n" -"æ¾ç¤ºæææªæ交äºå¡çå称ã\n" -#: ../svnadmin/svnadmin.c:466 +#: ../svnadmin/svnadmin.c:510 +msgid "" +"Print the names of uncommitted transactions. With -rN skip the output\n" +"of those that have a base revision more recent than rN. Transactions\n" +"with base revisions much older than HEAD are likely to have been\n" +"abandoned and are candidates to be removed.\n" +msgstr "" +"æå°æªæ交äºå¡çå称ãä½¿ç¨ -rN æ¶ï¼è·³è¿åºç¡çæ¬æ¯ rN æ´æ°ç\n" +"äºå¡ãåºç¡çæ¬æ¯ HEAD èå¾å¤çäºå¡å¾å¯è½å·²è¢«æ¾å¼ï¼å¯ä»¥èè\n" +"å é¤ã\n" + +#: ../svnadmin/svnadmin.c:519 msgid "" "usage: svnadmin pack REPOS_PATH\n" "\n" -"Possibly compact the repository into a more efficient storage model.\n" -"This may not apply to all repositories, in which case, exit.\n" msgstr "" "ç¨æ³: svnadmin pack REPOS_PATH\n" "\n" -"使ç¨æ´ææçåå¨æ¨¡åå缩çæ¬åºã\n" -"å®å¯è½ä¸éç¨äºææççæ¬åºï¼æ¤æ¶ç´æ¥ç»æã\n" -#: ../svnadmin/svnadmin.c:472 +#: ../svnadmin/svnadmin.c:521 +msgid "" +"Possibly compact the repository into a more efficient storage model.\n" +"This may not apply to all repositories, in which case, exit.\n" +msgstr "" +"å¯è½å°çæ¬åºå缩为æ´é«æçåå¨æ¨¡åã\n" +"è¿å¯è½ä¸éç¨äºææçæ¬åºï¼å¨æ¤æ åµä¸\n" + +#: ../svnadmin/svnadmin.c:527 msgid "" "usage: svnadmin recover REPOS_PATH\n" "\n" +msgstr "" +"ç¨æ³: svnadmin recover REPOS_PATH\n" +"\n" + +#: ../svnadmin/svnadmin.c:529 +msgid "" "Run the recovery procedure on a repository. Do this if you've\n" "been getting errors indicating that recovery ought to be run.\n" "Berkeley DB recovery requires exclusive access and will\n" "exit if the repository is in use by another process.\n" msgstr "" -"ç¨æ³: svnadmin recover REPOS_PATH\n" +"å¨çæ¬åºä¸è¿è¡æ¢å¤è¿ç¨ãå½ä½ ä¸ææ¶å°æ示åºè¯¥è¿è¡æ¢å¤çé误æ¶ï¼\n" +"å°±æ§è¡å®ãBerkeley DB çæ¢å¤éè¦ç¬å 访é®ï¼å¦æçæ¬åºæ£è¢«å ¶ä»\n" +"è¿ç¨ä½¿ç¨ï¼å½ä»¤ä¼éåºã\n" + +#: ../svnadmin/svnadmin.c:537 +msgid "" +"usage: svnadmin rev-size REPOS_PATH -r REVISION\n" +"\n" +msgstr "" +"ç¨æ³: svnadmin rev-size REPOS_PATH -r REVISION\n" "\n" -"对çæ¬åºè¿è¡ä¿®å¤ç¨åºãå½ä½ éå°åºå½æ§è¡ä¿®å¤çé误æ示æ¶ï¼è¯·æ§è¡æ¤å½ä»¤ã\n" -"ä¿®å¤ Berkeley DB éè¦ç¬å 访é®ï¼å¦æçæ¬åºè¢«å ¶å®è¿ç¨ä½¿ç¨ï¼å®ä¼ç«å³éåºã\n" -#: ../svnadmin/svnadmin.c:480 +#: ../svnadmin/svnadmin.c:539 +msgid "" +"Print the total size in bytes of the representation on disk of\n" +"revision REVISION.\n" +"\n" +msgstr "" +"æå°çæ¬ REVISION å¨ç£çä¸è¡¨ç¤ºçæ»åè大å°ã\n" +"\n" + +#: ../svnadmin/svnadmin.c:542 +msgid "The size includes revision properties and excludes FSFS indexes.\n" +msgstr "大å°å æ¬çæ¬å±æ§ï¼ä¸å æ¬ FSFS ç´¢å¼ã\n" + +#: ../svnadmin/svnadmin.c:549 msgid "" "usage: svnadmin rmlocks REPOS_PATH LOCKED_PATH...\n" "\n" -"Unconditionally remove lock from each LOCKED_PATH.\n" msgstr "" "ç¨æ³: svnadmin rmlocks REPOS_PATH LOCKED_PATH...\n" "\n" -"æ æ¡ä»¶å°ä»æ¯ä¸ª LOCKED_PATH å é¤éã\n" -#: ../svnadmin/svnadmin.c:485 +#: ../svnadmin/svnadmin.c:551 +msgid "Unconditionally remove lock from each LOCKED_PATH.\n" +msgstr "æ æ¡ä»¶ç§»é¤æ¯ä¸ª LOCKED_PATH ä¸çéã\n" + +#: ../svnadmin/svnadmin.c:556 msgid "" "usage: svnadmin rmtxns REPOS_PATH TXN_NAME...\n" "\n" -"Delete the named transaction(s).\n" msgstr "" "ç¨æ³: svnadmin rmtxns REPOS_PATH TXN_NAME...\n" "\n" -"ä»çæ¬åºå é¤å½åäºå¡ã\n" -#: ../svnadmin/svnadmin.c:490 +#: ../svnadmin/svnadmin.c:558 +msgid "Delete the named transaction(s).\n" +msgstr "å é¤æå®çäºå¡ã\n" + +#: ../svnadmin/svnadmin.c:563 msgid "" "usage: svnadmin setlog REPOS_PATH -r REVISION FILE\n" "\n" +msgstr "" +"ç¨æ³: svnadmin setlog REPOS_PATH -r REVISION FILE\n" +"\n" + +#: ../svnadmin/svnadmin.c:565 +msgid "" "Set the log-message on revision REVISION to the contents of FILE. Use\n" "--bypass-hooks to avoid triggering the revision-property-related hooks\n" "(for example, if you do not want an email notification sent\n" @@ -14220,72 +19531,107 @@ msgid "" "revision properties has not been enabled in the pre-revprop-change\n" "hook).\n" "\n" +msgstr "" +"æçæ¬ REVISION çæ¥å¿æ¶æ¯è®¾ç½®ä¸º FILE çå 容ãä½¿ç¨ --bypass-hooks\n" +"å¯é¿å 触åçæ¬å±æ§ç¸å ³çé©å(ä¾å¦ï¼ä½ ä¸å¸æ post-revprop-change\n" +"é©ååéé®ä»¶éç¥ï¼æè pre-revprop-change é©åä¸å¹¶æªå¯ç¨çæ¬å±æ§\n" +"ä¿®æ¹)ã\n" +"\n" + +#: ../svnadmin/svnadmin.c:572 +msgid "" "NOTE: Revision properties are not versioned, so this command will\n" "overwrite the previous log message.\n" msgstr "" -"ç¨æ³: svnadmin setlog REPOS_PATH -r REVISION FILE\n" -"\n" -" å°çæ¬ REVISION çæ¥å¿ä¿¡æ¯è®¾ä¸º FILE çå 容ãä½¿ç¨ --bypass-hooks æ¥é¿\n" -" å 触åä¸ä¿®æ¹å±æ§ç¸å ³çé©å(ä¾å¦ï¼ä½ ä¸éè¦ä½ ç post-revprop-change é©\n" -" ååé emailéç¥ï¼æè å¨ pre-revprop-change é©åä¸ç¦æ¢äºä¿®æ¹å±æ§)ã\n" -"\n" -" 注æ: 修订å±æ§å¹¶æªçº³å ¥çæ¬ç®¡çï¼æ以è¿ä¸ªå½ä»¤ä¼è¦ç以åçå±æ§åå¼ã\n" +"注æ: çæ¬å±æ§æ²¡æçæ¬æ§å¶ï¼æ以æ¤å½ä»¤å°\n" +"è¦çå åçæ¥å¿æ¶æ¯ã\n" -#: ../svnadmin/svnadmin.c:502 -#, fuzzy +#: ../svnadmin/svnadmin.c:579 msgid "" "usage: 1. svnadmin setrevprop REPOS_PATH -r REVISION NAME FILE\n" " 2. svnadmin setrevprop REPOS_PATH -t TXN NAME FILE\n" "\n" +msgstr "" +"ç¨æ³: 1. svnadmin setrevprop REPOS_PATH -r REVISION NAME FILE\n" +" 2. svnadmin setrevprop REPOS_PATH -t \n" + +#: ../svnadmin/svnadmin.c:582 +msgid "" "1. Set the property NAME on revision REVISION to the contents of FILE.\n" "\n" -"Use --use-pre-revprop-change-hook/--use-post-revprop-change-hook to\n" -"trigger the revision property-related hooks (for example, if you want\n" -"an email notification sent from your post-revprop-change hook).\n" +msgstr "" +"1. å°çæ¬ REVISION ä¸å为 NAME çå±æ§è®¾ç½®ä¸º FILE çå 容ã\n" "\n" + +#: ../svnadmin/svnadmin.c:588 +msgid "" "NOTE: Revision properties are not versioned, so this command will\n" "overwrite the previous value of the property.\n" "\n" -"2. Set the property NAME on transaction TXN to the contents of FILE.\n" msgstr "" -"ç¨æ³: svnadmin setrevprop REPOS_PATH -r REVISION NAME FILE\n" -"\n" -" å°çæ¬ REVISION çå±æ§ NAME 设为 FILE çå 容ã使ç¨\n" -" --use-pre-revprop-change-hook/--use-post-revprop-change-hook æ¥è§¦åä¸ä¿®\n" -" æ¹å±æ§ç¸å ³çé©å(ä¾å¦ï¼ä½ éè¦å¨ä½ ç post-revprop-change é©åä¸åé email\n" -" éç¥)ã\n" +"注æ: çæ¬å±æ§æ²¡æçæ¬æ§å¶ï¼æ以æ¤å½ä»¤å°\n" +"è¦çå±æ§çå åå¼ã\n" "\n" -" 注æ: 修订å±æ§å¹¶æªçº³å ¥çæ¬ç®¡çï¼æ以è¿ä¸ªå½ä»¤ä¼è¦ç以åçå±æ§åå¼ã\n" -#: ../svnadmin/svnadmin.c:515 +#: ../svnadmin/svnadmin.c:591 +msgid "2. Set the property NAME on transaction TXN to the contents of FILE.\n" +msgstr "2. å°äºå¡ TXN ä¸å为 NAME çå±æ§è®¾ç½®ä¸º FILE çå 容ã\n" + +#: ../svnadmin/svnadmin.c:598 msgid "" "usage: svnadmin setuuid REPOS_PATH [NEW_UUID]\n" "\n" +msgstr "" +"ç¨æ³: svnadmin setuuid REPOS_PATH [NEW_UUID]\n" +"\n" + +#: ../svnadmin/svnadmin.c:600 +msgid "" "Reset the repository UUID for the repository located at REPOS_PATH. If\n" "NEW_UUID is provided, use that as the new repository UUID; otherwise,\n" "generate a brand new UUID for the repository.\n" msgstr "" -"ç¨æ³: svnadmin setuuid REPOS_PATH [NEW_UUID]\n" -"\n" -"éç½®ä½äº REPOS_PATH ççæ¬åº UUIDãå¦ææä¾ NEW_UUIDï¼é£ä¹å®å°±æ为çæ¬åºç\n" -"æ° UUIDï¼å¦å就为çæ¬åºçæä¸ä¸ªæ°ç UUIDã\n" +"éç½® REPOS_PATH å¤çæ¬åºç UUIDãå¦ææä¾äº NEW_UUIDï¼å°±ç¨å®\n" +"ä½ä¸ºæ°ççæ¬åº UUIDï¼å¦å为该çæ¬åºçæä¸ä¸ªå ¨æ°ç UUIDã\n" -#: ../svnadmin/svnadmin.c:522 +#: ../svnadmin/svnadmin.c:607 msgid "" "usage: svnadmin unlock REPOS_PATH LOCKED_PATH USERNAME TOKEN\n" "\n" +msgstr "" +"ç¨æ³: svnadmin unlock REPOS_PATH LOCKED_PATH USERNAME TOKEN\n" +"\n" + +#: ../svnadmin/svnadmin.c:609 +msgid "" "Unlock LOCKED_PATH (as USERNAME) after verifying that the token\n" "associated with the lock matches TOKEN. Use --bypass-hooks to avoid\n" "triggering the pre-unlock and post-unlock hook scripts.\n" msgstr "" +"å¨éªè¯ä¸éå ³èç令çä¸ TOKEN å¹é åï¼è§£é LOCKED_PATH (以\n" +"USERNAME 身份)ãä½¿ç¨ --bypass-hooks å¯é¿å 触å pre-unlock å\n" +"post-unlock é©åèæ¬ã\n" -#: ../svnadmin/svnadmin.c:529 +#: ../svnadmin/svnadmin.c:616 msgid "" "usage: svnadmin upgrade REPOS_PATH\n" "\n" +msgstr "" +"ç¨æ³: svnadmin upgrade REPOS_PATH\n" +"\n" + +#: ../svnadmin/svnadmin.c:618 +msgid "" "Upgrade the repository located at REPOS_PATH to the latest supported\n" "schema version.\n" "\n" +msgstr "" +"å° REPOS_PATH å¤ççæ¬åºå级å°ææ°æ¯æç\n" +"模å¼çæ¬ã\n" +"\n" + +#: ../svnadmin/svnadmin.c:621 +msgid "" "This functionality is provided as a convenience for repository\n" "administrators who wish to make use of new Subversion functionality\n" "without having to undertake a potentially costly full repository dump\n" @@ -14294,117 +19640,114 @@ msgid "" "integrity of the repository. It does not guarantee the most optimized\n" "repository state as a dump and subsequent load would.\n" msgstr "" -"ç¨æ³: svnadmin upgrade REPOS_PATH\n" -"\n" -"å级ä½äº REPOS_PATH å¤ççæ¬åºå°æ¯æçææ°æ¹æ¡çæ¬ã\n" -"\n" -"æ¤åè½ä¸ºæ³ä½¿ç¨æ°ç Subversion ç¹æ§ï¼å¹¶ä¸ä¸æ³ä»åºå ¨åºå¯¼åºåå è½½æ°æ®æä½\n" -"ç代价ççæ¬åºç®¡çåæä¾ä¾¿å©ãåæ ·å°ï¼æ¤å级æä½å¨ä¿æçæ¬åºå®æ´æ§çå\n" -"æä¸æ§è¡æå°çå·¥ä½æ¥å®æå级ãå®ä¸æ ä¿çæ¬åºçç¶æä¸å¯¼åºåå è½½çå级æ¹\n" -"æ¡ä¸æ ·æä¼åã\n" +"æ¤åè½æ¯ä¸ºæ¹ä¾¿é£äºå¸æä½¿ç¨ Subversion æ°åè½ãåä¸æ³æ§è¡ä»£ä»·\n" +"å¯è½å¾é«çå®æ´çæ¬åºè½¬å¨åè£ è½½æä½ççæ¬åºç®¡çåèæä¾çã\n" +"å æ¤ï¼å级åªå为æ¤æéçæå°å·¥ä½ï¼åæ¶ä»ä¿æçæ¬åºçå®æ´æ§ã\n" +"å®ä¸å转å¨åè£ è½½é£æ ·ä¿è¯å¾å°æä¼åççæ¬åºç¶æã\n" -#: ../svnadmin/svnadmin.c:542 -#, fuzzy +#: ../svnadmin/svnadmin.c:632 msgid "" "usage: svnadmin verify REPOS_PATH\n" "\n" -"Verify the data stored in the repository.\n" msgstr "" "ç¨æ³: svnadmin verify REPOS_PATH\n" "\n" -"æ ¡éªçæ¬åºä¸çæ°æ®ã\n" -#: ../svnadmin/svnadmin.c:606 +#: ../svnadmin/svnadmin.c:634 +msgid "Verify the data stored in the repository.\n" +msgstr "éªè¯çæ¬åºä¸åå¨çæ°æ®ã\n" + +#: ../svnadmin/svnadmin.c:735 ../svnadmin/svnadmin.c:2926 msgid "Invalid revision specifier" msgstr "æ æççæ¬è¯´æ" -#: ../svnadmin/svnadmin.c:610 +#: ../svnadmin/svnadmin.c:739 #, c-format msgid "Revisions must not be greater than the youngest revision (%ld)" msgstr "çæ¬å·ä¸è½å¤§äºææ°ççæ¬å·(%ld)" -#: ../svnadmin/svnadmin.c:628 -#, fuzzy, c-format +#: ../svnadmin/svnadmin.c:766 +#, c-format msgid "Path '%s' is not a local path" -msgstr "â%sâä¸æ¯æ¬å°è·¯å¾" +msgstr "è·¯å¾ '%s' ä¸æ¯æ¬å°è·¯å¾" -#: ../svnadmin/svnadmin.c:657 -#, fuzzy +#: ../svnadmin/svnadmin.c:795 msgid "Not enough arguments" -msgstr "没ææä¾è¶³å¤çåæ°" - -#: ../svnadmin/svnadmin.c:660 -#, fuzzy -msgid "Too many arguments" -msgstr "åæ°è¿å¤" +msgstr "åæ°ä¸è¶³" -#: ../svnadmin/svnadmin.c:696 +#: ../svnadmin/svnadmin.c:838 #, c-format msgid "" "Successfully opened repository '%s'.\n" "Will now crash to simulate a crashing server process.\n" msgstr "" +"æåæå¼çæ¬åº '%s'ã\n" +"ç°å¨å°å´©æºä»¥æ¨¡æå´©æºçæå¡å¨è¿ç¨ã\n" -#: ../svnadmin/svnadmin.c:735 +#: ../svnadmin/svnadmin.c:877 #, c-format msgid "%swarning: The \"%s\" repository back-end is deprecated, consider using \"%s\" instead.\n" -msgstr "" +msgstr "%sè¦å: \"%s\" çæ¬åºå端已åºå¼ï¼è¯·èèä½¿ç¨ \"%s\" 代æ¿ã\n" -#: ../svnadmin/svnadmin.c:776 +#: ../svnadmin/svnadmin.c:918 msgid "Repositories compatible with 1.0.x must use --fs-type=bdb" -msgstr "" +msgstr "å ¼å®¹ 1.0.x ççæ¬åºå¿ é¡»ä½¿ç¨ --fs-type=bdb" -#: ../svnadmin/svnadmin.c:784 +#: ../svnadmin/svnadmin.c:926 #, c-format msgid "Repositories compatible with 1.8.x or earlier cannot use --fs-type=%s" -msgstr "" +msgstr "å ¼å®¹ 1.8.x ææ´æ©çæ¬ççæ¬åºæ æ³ä½¿ç¨ --fs-type=%s" -#: ../svnadmin/svnadmin.c:829 ../svnadmin/svnadmin.c:1196 -#: ../svnadmin/svnadmin.c:1381 +#: ../svnadmin/svnadmin.c:971 ../svnadmin/svnadmin.c:1371 +#: ../svnadmin/svnadmin.c:1701 ../svnadmin/svnadmin.c:3031 msgid "First revision cannot be higher than second" msgstr "第ä¸ä¸ªçæ¬ä¸å¯å¤§äºç¬¬äºä¸ª" -#: ../svnadmin/svnadmin.c:838 +#: ../svnadmin/svnadmin.c:980 #, c-format msgid "Deltifying revision %ld..." msgstr "æ£å¨è®¡ç®çæ¬ %ld å·®å¼..." -#: ../svnadmin/svnadmin.c:842 ../svnadmin/svnadmin.c:955 -#: ../svnadmin/svnadmin.c:970 +#: ../svnadmin/svnadmin.c:984 ../svnadmin/svnadmin.c:1115 +#: ../svnadmin/svnadmin.c:1130 #, c-format msgid "done.\n" msgstr "å®æã\n" -#: ../svnadmin/svnadmin.c:900 -#, fuzzy, c-format +#: ../svnadmin/svnadmin.c:1033 +msgid "* Error verifying repository metadata.\n" +msgstr "* éªè¯çæ¬åºå æ°æ®æ¶åºéã\n" + +#: ../svnadmin/svnadmin.c:1039 +#, c-format msgid "* Error verifying revision %ld.\n" -msgstr "* å·²æ ¡éªçæ¬ %ldã\n" +msgstr "* éªè¯çæ¬ %ld æ¶åºéã\n" -#: ../svnadmin/svnadmin.c:936 +#: ../svnadmin/svnadmin.c:1096 msgid "* Verifying repository metadata ...\n" -msgstr "" +msgstr "* æ£å¨éªè¯çæ¬åºå æ°æ® ...\n" -#: ../svnadmin/svnadmin.c:939 -#, fuzzy, c-format +#: ../svnadmin/svnadmin.c:1099 +#, c-format msgid "* Verifying metadata at revision %ld ...\n" -msgstr "* å·²æ ¡éªçæ¬ %ldã\n" +msgstr "* æ£å¨éªè¯çæ¬ %ld çå æ°æ® ...\n" -#: ../svnadmin/svnadmin.c:949 +#: ../svnadmin/svnadmin.c:1109 #, c-format msgid "Packing revisions in shard %s..." msgstr "æ£å¨æå çæ¬ç¢ç %s ..." -#: ../svnadmin/svnadmin.c:964 +#: ../svnadmin/svnadmin.c:1124 #, c-format msgid "Packing revprops in shard %s..." msgstr "æ£å¨æå çæ¬å±æ§ç¢ç %s ..." -#: ../svnadmin/svnadmin.c:1039 +#: ../svnadmin/svnadmin.c:1199 #, c-format msgid "<<< Skipped original revision %ld\n" msgstr "<<< 已跳è¿åå§çæ¬ %ld\n" -#: ../svnadmin/svnadmin.c:1056 +#: ../svnadmin/svnadmin.c:1215 msgid "" "Repository lock acquired.\n" "Please wait; recovering the repository may take some time...\n" @@ -14412,7 +19755,7 @@ msgstr "" "å·²åå¾çæ¬åºéå®ã\n" "请ç¨åï¼ä¿®å¤çæ¬åºå¯è½éè¦ä¸æ®µæ¶é´...\n" -#: ../svnadmin/svnadmin.c:1063 +#: ../svnadmin/svnadmin.c:1222 msgid "" "Repository lock acquired.\n" "Please wait; upgrading the repository may take some time...\n" @@ -14420,37 +19763,51 @@ msgstr "" "å·²åå¾çæ¬åºéå®ã\n" "请ç¨åï¼å级çæ¬åºå¯è½éè¦ä¸æ®µæ¶é´...\n" -#: ../svnadmin/svnadmin.c:1074 -#, fuzzy, c-format -msgid "Packing revision properties in shard %s..." -msgstr "æ£å¨æå çæ¬ç¢ç %s ..." +#: ../svnadmin/svnadmin.c:1233 +#, c-format +msgid "Packed revision properties in shard %s\n" +msgstr "å·²æå åç %s ä¸ççæ¬å±æ§\n" -#: ../svnadmin/svnadmin.c:1086 -#, fuzzy, c-format -msgid "Removing non-packed revision properties in shard %s..." -msgstr "æ£å¨æå çæ¬ç¢ç %s ..." +#: ../svnadmin/svnadmin.c:1244 +#, c-format +msgid "Removed non-packed revision properties in shard %s\n" +msgstr "已移é¤åç %s ä¸æªæå ççæ¬å±æ§\n" -#: ../svnadmin/svnadmin.c:1094 -#, fuzzy, c-format +#: ../svnadmin/svnadmin.c:1252 +#, c-format msgid "Bumped repository format to %ld\n" -msgstr "çæ¬åºé©åé误" +msgstr "å·²å°çæ¬åºæ ¼å¼æåå° %ld\n" -#: ../svnadmin/svnadmin.c:1102 -#, fuzzy, c-format +#: ../svnadmin/svnadmin.c:1260 +#, c-format msgid "* Copied revision %ld.\n" -msgstr "* 已转åçæ¬ %ldã\n" +msgstr "* å·²å¤å¶çæ¬ %ldã\n" -#: ../svnadmin/svnadmin.c:1108 -#, fuzzy, c-format +#: ../svnadmin/svnadmin.c:1266 +#, c-format msgid "* Copied revisions from %ld to %ld.\n" -msgstr "* 已转åçæ¬ %ldã\n" +msgstr "* å·²å¤å¶çæ¬ %ld å° %ldã\n" + +#: ../svnadmin/svnadmin.c:1277 +#, c-format +msgid "svnadmin: Warning - this repository is not sharded. Packing has no effect.\n" +msgstr "svnadmin: è¦å - æ¤çæ¬åºæªåçãæå æ ææã\n" -#: ../svnadmin/svnadmin.c:1257 +#: ../svnadmin/svnadmin.c:1284 +#, c-format +msgid "Properties set on revision %ld.\n" +msgstr "å±æ§å·²è®¾ç½®å°çæ¬ %ldã\n" + +#: ../svnadmin/svnadmin.c:1479 +#, c-format +msgid "'--exclude' and '--include' options cannot be used simultaneously" +msgstr "'--exclude' å '--include' é项ä¸è½åæ¶ä½¿ç¨" + +#: ../svnadmin/svnadmin.c:1583 msgid "No program provided" msgstr "没ææä¾ç¨åº" -#: ../svnadmin/svnadmin.c:1295 -#, fuzzy +#: ../svnadmin/svnadmin.c:1623 msgid "" "general usage: svnadmin SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n" "Subversion repository administration tool.\n" @@ -14460,34 +19817,39 @@ msgid "" "Available subcommands:\n" msgstr "" "ä¸è¬ç¨æ³: svnadmin SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n" -"使ç¨âsvnadmin help <subcommand>â å¾å°åå½ä»¤ç帮å©ä¿¡æ¯ã\n" -"使ç¨âsvnadmin --versionâæ¥çç¨åºççæ¬å·åæ件系ç»æ¨¡åã\n" +"Subversion çæ¬åºç®¡çå·¥å ·ã\n" +"è¾å ¥ 'svnadmin help <subcommand>' å¾å°å ³äºæ个åå½ä»¤ç帮å©ã\n" +"è¾å ¥ 'svnadmin --version' æ¥çç¨åºçæ¬åæ件系ç»æ¨¡åã\n" "\n" -"å¯ç¨çåå½ä»¤: \n" +"å¯ç¨çåå½ä»¤:\n" -#: ../svnadmin/svnadmin.c:1303 ../svnlook/svnlook.c:2243 -#: ../svnserve/svnserve.c:427 +#: ../svnadmin/svnadmin.c:1631 ../svnlook/svnlook.c:2252 +#: ../svnserve/svnserve.c:472 msgid "" "The following repository back-end (FS) modules are available:\n" "\n" msgstr "" -"ä¸åçæ¬åºå端(FS) 模åå¯ç¨: \n" +"ä¸åçæ¬åºå端 (FS) 模åå¯ç¨:\n" "\n" -#: ../svnadmin/svnadmin.c:1332 +#: ../svnadmin/svnadmin.c:1660 #, c-format msgid "Invalid revision number (%ld) specified" msgstr "æå®äºæ æççæ¬ (%ld)" -#: ../svnadmin/svnadmin.c:1342 +#: ../svnadmin/svnadmin.c:1670 msgid "Non-numeric revision specified" msgstr "æå®äºéæ°åçæ¬" -#: ../svnadmin/svnadmin.c:1403 +#: ../svnadmin/svnadmin.c:1752 ../svnadmin/svnadmin.c:1810 +msgid "A property with invalid line ending found in dumpstream; consider using --normalize-props while loading." +msgstr "å¨è½¬å¨æµä¸åç°è¡ç»å°¾æ æçå±æ§ï¼è¯·å¨å è½½æ¶èèä½¿ç¨ --normalize-propsã" + +#: ../svnadmin/svnadmin.c:1759 ../svnadmin/svnadmin.c:1817 msgid "Invalid property value found in dumpstream; consider repairing the source or using --bypass-prop-validation while loading." msgstr "å¨è½¬å¨æµä¸åç°éæ³çå±æ§å¼ï¼èèä¿®å¤ï¼æè å¨å è½½æ¶ä½¿ç¨é项 '--bypass-prop-validation' ã" -#: ../svnadmin/svnadmin.c:1469 ../svnadmin/svnadmin.c:2336 +#: ../svnadmin/svnadmin.c:1909 ../svnadmin/svnadmin.c:2809 msgid "" "Failed to get exclusive repository access; perhaps another process\n" "such as httpd, svnserve or svn has it open?" @@ -14495,12 +19857,12 @@ msgstr "" "æ æ³ç¬å 访é®çæ¬åºï¼å¯è½æ¯å ¶å®å¦ httpdï¼svnserve æ svn çè¿ç¨å·²ç»æå¼å®ï¼\n" "å°æªå ³éï¼" -#: ../svnadmin/svnadmin.c:1474 ../svnadmin/svnadmin.c:2341 +#: ../svnadmin/svnadmin.c:1914 ../svnadmin/svnadmin.c:2814 #, c-format msgid "Waiting on repository lock; perhaps another process has it open?\n" msgstr "çå¾ çæ¬åºéå®ä¸ï¼ä¹è®¸å ¶å®çè¿ç¨æå®æå¼äºï¼\n" -#: ../svnadmin/svnadmin.c:1482 +#: ../svnadmin/svnadmin.c:1922 #, c-format msgid "" "\n" @@ -14509,131 +19871,153 @@ msgstr "" "\n" "å®æä¿®å¤ã\n" -#: ../svnadmin/svnadmin.c:1489 +#: ../svnadmin/svnadmin.c:1929 #, c-format msgid "The latest repos revision is %ld.\n" msgstr "ææ°ççæ¬åºçæ¬æ¯ %ldã\n" -#: ../svnadmin/svnadmin.c:1604 +#: ../svnadmin/svnadmin.c:2041 #, c-format msgid "Transaction '%s' removed.\n" -msgstr "äºå¡â%sâ被å é¤ã\n" +msgstr "äºå¡'%s'被å é¤ã\n" -#: ../svnadmin/svnadmin.c:1686 ../svnadmin/svnadmin.c:1800 -#: ../svnadmin/svnadmin.c:2386 -#, fuzzy, c-format +#: ../svnadmin/svnadmin.c:2123 ../svnadmin/svnadmin.c:2237 +#: ../svnadmin/svnadmin.c:2859 +#, c-format msgid "--revision (-r) and --transaction (-t) are mutually exclusive" -msgstr "--message (-m) ä¸ --file (-F) æ¯äºæ¥ç" +msgstr "--revision (-r) å --transaction (-t) äºæ¥" -#: ../svnadmin/svnadmin.c:1692 ../svnadmin/svnadmin.c:2392 +#: ../svnadmin/svnadmin.c:2129 ../svnadmin/svnadmin.c:2865 #, c-format msgid "Calling hooks is incompatible with --transaction (-t)" -msgstr "" +msgstr "è°ç¨é©åä¸ --transaction (-t) ä¸å ¼å®¹" -#: ../svnadmin/svnadmin.c:1697 ../svnadmin/svnadmin.c:1742 -#: ../svnadmin/svnadmin.c:2397 +#: ../svnadmin/svnadmin.c:2134 ../svnadmin/svnadmin.c:2179 +#: ../svnadmin/svnadmin.c:2870 #, c-format msgid "Missing revision" msgstr "丢失çæ¬" -#: ../svnadmin/svnadmin.c:1700 ../svnadmin/svnadmin.c:1745 -#: ../svnadmin/svnadmin.c:2400 +#: ../svnadmin/svnadmin.c:2137 ../svnadmin/svnadmin.c:2182 +#: ../svnadmin/svnadmin.c:2873 #, c-format msgid "Only one revision allowed" msgstr "åªå 许ä¸ä¸ªçæ¬" -#: ../svnadmin/svnadmin.c:1862 +#: ../svnadmin/svnadmin.c:2301 msgid "" "\n" "-----Summary of corrupt revisions-----\n" msgstr "" +"\n" +"-----æåçæ¬æè¦-----\n" -#: ../svnadmin/svnadmin.c:1954 +#: ../svnadmin/svnadmin.c:2353 +#, c-format +msgid "Failed to verify repository '%s'" +msgstr "éªè¯çæ¬åº '%s' 失败" + +#: ../svnadmin/svnadmin.c:2405 #, c-format msgid "UUID: %s\n" msgstr "UUID: %s\n" -#: ../svnadmin/svnadmin.c:1960 +#: ../svnadmin/svnadmin.c:2408 +#, c-format +msgid "Revisions: %ld\n" +msgstr "çæ¬æ°: %ld\n" + +#: ../svnadmin/svnadmin.c:2414 #, c-format msgid "Repository Format: %d\n" msgstr "çæ¬åºæ ¼å¼: %d\n" -#: ../svnadmin/svnadmin.c:1974 +#: ../svnadmin/svnadmin.c:2428 #, c-format msgid "Compatible With Version: %d.%d.0\n" -msgstr "" +msgstr "å ¼å®¹çæ¬: %d.%d.0\n" -#: ../svnadmin/svnadmin.c:1993 +#: ../svnadmin/svnadmin.c:2447 #, c-format msgid "Repository Capability: %s\n" msgstr "çæ¬åºç¹æ§: %s\n" -#: ../svnadmin/svnadmin.c:2002 +#: ../svnadmin/svnadmin.c:2456 #, c-format msgid "Filesystem Type: %s\n" msgstr "æ件系ç»ç±»å: %s\n" -#: ../svnadmin/svnadmin.c:2004 +#: ../svnadmin/svnadmin.c:2458 #, c-format msgid "Filesystem Format: %d\n" msgstr "æ件系ç»æ ¼å¼: %d\n" -#: ../svnadmin/svnadmin.c:2013 +#: ../svnadmin/svnadmin.c:2465 #, c-format msgid "FSFS Sharded: yes\n" -msgstr "" +msgstr "FSFS åç: æ¯\n" -#: ../svnadmin/svnadmin.c:2015 +#: ../svnadmin/svnadmin.c:2467 #, c-format msgid "FSFS Sharded: no\n" -msgstr "" +msgstr "FSFS åç: å¦\n" -#: ../svnadmin/svnadmin.c:2018 +#: ../svnadmin/svnadmin.c:2470 #, c-format msgid "FSFS Shard Size: %d\n" -msgstr "" +msgstr "FSFS åç大å°: %d\n" -#: ../svnadmin/svnadmin.c:2027 +#: ../svnadmin/svnadmin.c:2479 #, c-format msgid "FSFS Shards Packed: %ld/%ld\n" -msgstr "" +msgstr "FSFS å·²æå åç: %ld/%ld\n" -#: ../svnadmin/svnadmin.c:2032 +#: ../svnadmin/svnadmin.c:2484 #, c-format msgid "FSFS Logical Addressing: yes\n" -msgstr "" +msgstr "FSFS é»è¾å¯»å: æ¯\n" -#: ../svnadmin/svnadmin.c:2034 +#: ../svnadmin/svnadmin.c:2486 #, c-format msgid "FSFS Logical Addressing: no\n" -msgstr "" +msgstr "FSFS é»è¾å¯»å: å¦\n" + +#: ../svnadmin/svnadmin.c:2496 +#, c-format +msgid "FSX Shard Size: %d\n" +msgstr "FSX åç大å°: %d\n" + +#: ../svnadmin/svnadmin.c:2498 +#, c-format +msgid "FSX Shards Packed: %ld/%ld\n" +msgstr "FSX å·²æå åç: %ld/%ld\n" -#: ../svnadmin/svnadmin.c:2044 +#: ../svnadmin/svnadmin.c:2509 #, c-format msgid "Configuration File: %s\n" msgstr "é ç½®æ件: %s\n" -#: ../svnadmin/svnadmin.c:2168 ../svnlook/svnlook.c:2306 +#: ../svnadmin/svnadmin.c:2637 ../svnlook/svnlook.c:2315 #, c-format msgid "UUID Token: %s\n" msgstr "UUID æ è¯: %s\n" -#: ../svnadmin/svnadmin.c:2169 ../svnlook/svnlook.c:2307 +#: ../svnadmin/svnadmin.c:2638 ../svnlook/svnlook.c:2316 #, c-format msgid "Owner: %s\n" msgstr "ææè : %s\n" -#: ../svnadmin/svnadmin.c:2170 ../svnlook/svnlook.c:2308 +#: ../svnadmin/svnadmin.c:2639 ../svnlook/svnlook.c:2317 #, c-format msgid "Created: %s\n" msgstr "å·²å建: %s\n" -#: ../svnadmin/svnadmin.c:2171 ../svnlook/svnlook.c:2309 +#: ../svnadmin/svnadmin.c:2640 ../svnlook/svnlook.c:2318 #, c-format msgid "Expires: %s\n" msgstr "è¿æ: %s\n" -#: ../svnadmin/svnadmin.c:2173 +#: ../svnadmin/svnadmin.c:2642 #, c-format msgid "" "Comment (%i line):\n" @@ -14648,34 +20032,34 @@ msgstr[0] "" "%s\n" "\n" -#: ../svnadmin/svnadmin.c:2221 +#: ../svnadmin/svnadmin.c:2690 msgid "No paths to unlock provided" msgstr "没ææä¾è§£éçè·¯å¾" -#: ../svnadmin/svnadmin.c:2239 +#: ../svnadmin/svnadmin.c:2708 #, c-format msgid "Path '%s' isn't locked.\n" -msgstr "è·¯å¾ â%sâ 没æ被éå®ã\n" +msgstr "è·¯å¾ '%s' 没æ被éå®ã\n" -#: ../svnadmin/svnadmin.c:2251 +#: ../svnadmin/svnadmin.c:2722 #, c-format msgid "Removed lock on '%s'.\n" -msgstr "å é¤ â%sâ ä¸çéã\n" +msgstr "å é¤ '%s' ä¸çéã\n" -#: ../svnadmin/svnadmin.c:2304 +#: ../svnadmin/svnadmin.c:2776 #, c-format msgid "'%s' unlocked by user '%s'.\n" -msgstr "â%sâ被ç¨æ·â%sâ解éã\n" +msgstr "'%s'被ç¨æ·'%s'解éã\n" -#: ../svnadmin/svnadmin.c:2351 +#: ../svnadmin/svnadmin.c:2824 msgid "Upgrade of this repository's underlying versioned filesystem is not supported; consider dumping and loading the data elsewhere" -msgstr "æ件系ç»ä¸æ¯æå级æ¤çæ¬åºï¼è¯·èè使ç¨å¯¼åºåå è½½æ°æ®çå级æ¹æ¡" +msgstr "ä¸æ¯æå级æ¤çæ¬åºåºå±ççæ¬åæ件系ç»ï¼è¯·èèææ°æ®è½¬å¨åºæ¥åè£ è½½å°å«å¤" -#: ../svnadmin/svnadmin.c:2358 +#: ../svnadmin/svnadmin.c:2831 msgid "Upgrade of this repository is not supported; consider dumping and loading the data elsewhere" msgstr "ä¸æ¯æå级æ¤çæ¬åºï¼è¯·èè使ç¨å¯¼åºåå è½½æ°æ®çå级æ¹æ¡" -#: ../svnadmin/svnadmin.c:2364 +#: ../svnadmin/svnadmin.c:2837 #, c-format msgid "" "\n" @@ -14684,139 +20068,437 @@ msgstr "" "\n" "å®æå级ã\n" -#: ../svnadmin/svnadmin.c:2478 ../svnfsfs/svnfsfs.c:321 -#: ../svnrdump/svnrdump.c:950 +#: ../svnadmin/svnadmin.c:2904 +#, c-format +msgid "Revision size query is not implemented for the filesystem type found in '%s'" +msgstr "çæ¬å¤§å°æ¥è¯¢æªå¯¹ '%s' ä¸çæ件系ç»ç±»åå®ç°" + +#: ../svnadmin/svnadmin.c:2940 +#, c-format +msgid "%s bytes in revision %ld\n" +msgstr "%s åè(å¨çæ¬ %ld ä¸)\n" + +#: ../svnadmin/svnadmin.c:2952 +#, c-format +msgid "* Processed revision %ld.\n" +msgstr "* å·²å¤ççæ¬ %ldã\n" + +#: ../svnadmin/svnadmin.c:2986 +#, c-format +msgid "Building rep-cache is not implemented for the filesystem type found in '%s'" +msgstr "æ建 rep-cache æªå¯¹ '%s' ä¸çæ件系ç»ç±»åå®ç°" + +#: ../svnadmin/svnadmin.c:2994 +#, c-format +msgid "svnadmin: Warning - this repository has rep-sharing disabled. Building rep-cache has no effect.\n" +msgstr "svnadmin: è¦å - æ¤çæ¬åºå·²ç¦ç¨è¡¨ç¤ºå ±äº«ãæ建 rep-cache æ ææã\n" + +#: ../svnadmin/svnadmin.c:3125 ../svnfsfs/svnfsfs.c:299 +#: ../svnrdump/svnrdump.c:859 msgid "Multiple revision arguments encountered; try '-r N:M' instead of '-r N -r M'" -msgstr "éå°äºå¤ä¸ªçæ¬åæ°ï¼è¯·ä½¿ç¨â-r N:Mâ代æ¿â-r M -r Nâ" +msgstr "éå°äºå¤ä¸ªçæ¬åæ°ï¼è¯·ä½¿ç¨'-r N:M'代æ¿'-r M -r N'" -#: ../svnadmin/svnadmin.c:2558 +#: ../svnadmin/svnadmin.c:3208 #, c-format msgid "Cannot create pre-1.0-compatible repositories" -msgstr "" +msgstr "æ æ³åå»ºå ¼å®¹ 1.0 ä¹åçæ¬ççæ¬åº" -#: ../svnadmin/svnadmin.c:2570 +#: ../svnadmin/svnadmin.c:3220 #, c-format msgid "Cannot guarantee compatibility beyond the current running version (%s)" -msgstr "" +msgstr "æ æ³ä¿è¯è¶ åºå½åè¿è¡çæ¬ (%s) çå ¼å®¹æ§" -#: ../svnadmin/svnadmin.c:2671 ../svnfsfs/svnfsfs.c:386 +#: ../svnadmin/svnadmin.c:3344 ../svnfsfs/svnfsfs.c:368 #, c-format msgid "subcommand argument required\n" msgstr "å¿ é¡»æä¾åå½ä»¤åæ°\n" -#: ../svnadmin/svnadmin.c:2708 ../svnfsfs/svnfsfs.c:421 +#: ../svnadmin/svnadmin.c:3381 ../svnfsfs/svnfsfs.c:403 msgid "Repository argument required" msgstr "éè¦çæ¬åºåæ°" -#: ../svnadmin/svnadmin.c:2716 ../svnfsfs/svnfsfs.c:429 +#: ../svnadmin/svnadmin.c:3389 ../svnfsfs/svnfsfs.c:411 #, c-format msgid "'%s' is a URL when it should be a local path" -msgstr "â%sâåºè¯¥æ¯æ¬å°è·¯å¾ï¼å®é ä¸å´æ¯ URL" +msgstr "'%s'åºè¯¥æ¯æ¬å°è·¯å¾ï¼å®é ä¸å´æ¯ URL" -#: ../svnadmin/svnadmin.c:2746 +#: ../svnadmin/svnadmin.c:3419 #, c-format msgid "" "Subcommand '%s' doesn't accept option '%s'\n" "Type 'svnadmin help %s' for usage.\n" msgstr "" -"åå½ä»¤â%sâä¸æ¥åé项â%sâ\n" -"使ç¨âsvnadmin help %sâå¾å°ç¨æ³ã\n" +"åå½ä»¤'%s'ä¸æ¥åé项'%s'\n" +"使ç¨'svnadmin help %s'å¾å°ç¨æ³ã\n" -#: ../svnadmin/svnadmin.c:2790 +#: ../svnadmin/svnadmin.c:3450 msgid "Try 'svnadmin help' for more info" -msgstr "请使ç¨âsvnadmin helpâ以å¾å°æ´å¤ä¿¡æ¯" +msgstr "请使ç¨'svnadmin help'以å¾å°æ´å¤ä¿¡æ¯" + +#: ../svnbench/help-cmd.c:49 +msgid "" +"usage: svnbench <subcommand> [options] [args]\n" +"Subversion benchmarking tool.\n" +"Type 'svnbench help <subcommand>' for help on a specific subcommand.\n" +"Type 'svnbench --version' to see the program version and RA modules\n" +" or 'svnbench --version --quiet' to see just the version number.\n" +"\n" +"Most subcommands take file and/or directory arguments, recursing\n" +"on the directories. If no arguments are supplied to such a\n" +"command, it recurses on the current directory (inclusive) by default.\n" +"\n" +"Available subcommands:\n" +msgstr "" +"ç¨æ³: svnbench <subcommand> [options] [args]\n" +"Subversion æ§è½æµè¯å·¥å ·ã\n" +"ä½¿ç¨ 'svnbench help <subcommand>' æ¥çåå½ä»¤ç帮å©ä¿¡æ¯ã\n" +"ä½¿ç¨ 'svnbench --version' æ¥çç¨åºçæ¬åçæ¬åºè®¿é®(RA)模åï¼\n" +" æ 'svnbench --version --quiet' åªæ¥ççæ¬å·ã\n" +"\n" +"大å¤æ°åå½ä»¤æ¥åæ件æç®å½åæ°ï¼å¹¶éå½å¤çç®å½ã\n" +"å¦æ没æç»å½ä»¤æä¾åæ°ï¼é»è®¤éå½å¤çå½åç®å½(å å«èªèº«)ã\n" +"\n" +"å¯ç¨çåå½ä»¤:\n" + +#: ../svnbench/null-blame-cmd.c:156 +#, c-format +msgid "" +"%15s revisions\n" +"%15s deltas\n" +"%15s bytes in deltas\n" +msgstr "" +"%15s çæ¬\n" +"%15s å¢é\n" +"%15s å¢éåè\n" + +#: ../svnbench/null-export-cmd.c:352 +#, c-format +msgid "" +"%15s directories\n" +"%15s files\n" +"%15s bytes in files\n" +"%15s properties\n" +"%15s bytes in properties\n" +msgstr "" +"%15s ç®å½\n" +"%15s æ件\n" +"%15s æ件åè\n" +"%15s å±æ§\n" +"%15s å±æ§åè\n" + +#: ../svnbench/null-info-cmd.c:273 +#, c-format +msgid "Number of status notifications received: %d\n" +msgstr "æ¶å°çç¶æéç¥æ°: %d\n" + +#: ../svnbench/null-list-cmd.c:180 +#, c-format +msgid "" +"%15s directories\n" +"%15s files\n" +"%15s locks\n" +msgstr "" +"%15s ç®å½\n" +"%15s æ件\n" +"%15s é\n" + +#: ../svnbench/null-log-cmd.c:190 +#, c-format +msgid "Only relative paths can be specified after a URL for 'svnbench log', but '%s' is not a relative path" +msgstr "å¨ 'svnbench log' ç URL ä¹ååªè½æå®ç¸å¯¹è·¯å¾ï¼ä½ '%s' ä¸æ¯ç¸å¯¹è·¯å¾" + +#: ../svnbench/null-log-cmd.c:226 +#, c-format +msgid "" +"%15s revisions, %15s merged in %s merges\n" +"%15s msg lines, %15s in merged revisions\n" +"%15s changes, %15s in merged revisions\n" +msgstr "" +"%15s çæ¬ï¼%15s å¨ %s 次å并ä¸å并\n" +"%15s æ¶æ¯è¡ï¼%15s å¨å并ççæ¬ä¸\n" +"%15s æ´æ¹ï¼%15s å¨å并ççæ¬ä¸\n" + +#: ../svnbench/null-log-cmd.c:238 +#, c-format +msgid "" +"%15s revisions\n" +"%15s msg lines\n" +"%15s changes\n" +msgstr "" +"%15s çæ¬\n" +"%15s æ¶æ¯è¡\n" +"%15s æ´æ¹\n" + +#: ../svnbench/svnbench.c:87 +msgid "obsolete; try --depth=files or --depth=immediates" +msgstr "è¿æ¶ï¼å°è¯ --depth=files æ --depth=immediates" + +#: ../svnbench/svnbench.c:115 ../svnrdump/svnrdump.c:126 +msgid "specify a password ARG" +msgstr "æå®å¯ç ARG" + +#: ../svnbench/svnbench.c:124 +msgid "use strict semantics" +msgstr "使ç¨ä¸¥æ ¼çè¯æ³" + +#: ../svnbench/svnbench.c:148 +msgid "do no interactive prompting" +msgstr "ä¸è¿è¡äº¤äºå¼æ示" + +#: ../svnbench/svnbench.c:173 +msgid "use ARG as search pattern (glob syntax)" +msgstr "ä½¿ç¨ ARG ä½ä¸ºæ索模å¼(glob è¯æ³)" + +#: ../svnbench/svnbench.c:219 +msgid "" +"Fetch all versions of a file in a batch.\n" +"usage: null-blame [-rM:N] TARGET[@REV]...\n" +"\n" +msgstr "" +"æ¹éè·åæ件çææçæ¬ã\n" +"ç¨æ³: null-blame [-rM:N] TARGET[@REV]...\n" +"\n" + +#: ../svnbench/svnbench.c:240 +msgid "" +"Create an unversioned copy of a tree.\n" +"usage: null-export [-r REV] URL[@PEGREV]\n" +"\n" +msgstr "" +"å建æªçæ¬æ§å¶çç®å½æ å¯æ¬ã\n" +"ç¨æ³: null-export [-r REV] URL[@PEGREV]\n" +"\n" + +#: ../svnbench/svnbench.c:243 +msgid "" +" Exports a clean directory tree from the repository specified by\n" +" URL, at revision REV if it is given, otherwise at HEAD.\n" +"\n" +msgstr "" +" ä» URL æå®ççæ¬åºå¯¼åºå¹²åçç®å½æ ï¼\n" +" å¦æç»å®äº REV å使ç¨è¯¥çæ¬ï¼å¦åä½¿ç¨ HEADã\n" + +#: ../svnbench/svnbench.c:252 +msgid "" +"List directory entries in the repository.\n" +"usage: null-list [TARGET[@REV]...]\n" +"\n" +msgstr "" +"ååºçæ¬åºä¸çç®å½æ¡ç®ã\n" +"ç¨æ³: null-list [TARGET[@REV]...]\n" +"\n" + +#: ../svnbench/svnbench.c:263 +msgid "" +" With --verbose, the following fields will be fetched for each item:\n" +"\n" +msgstr "" +" ä½¿ç¨ --verbose æ¶ï¼å°è·åæ¯ä¸ªé¡¹ç以ä¸å段:\n" +"\n" + +#: ../svnbench/svnbench.c:274 +msgid "" +"Fetch the log messages for a set of revision(s) and/or path(s).\n" +"usage: 1. null-log [PATH][@REV]\n" +" 2. null-log URL[@REV] [PATH...]\n" +"\n" +msgstr "" +"è·åä¸ç»çæ¬å/æè·¯å¾çæ¥å¿æ¶æ¯ã\n" +"ç¨æ³: 1. null-log [PATH][@REV]\n" +" 2. null-log URL\n" + +#: ../svnbench/svnbench.c:278 +msgid "" +" 1. Fetch the log messages for the URL corresponding to PATH\n" +" (default: '.'). If specified, REV is the revision in which the\n" +" URL is first looked up, and the default revision range is REV:1.\n" +" If REV is not specified, the default revision range is BASE:1,\n" +" since the URL might not exist in the HEAD revision.\n" +"\n" +msgstr "" +" 1. è·å PATH (é»è®¤: '.') å¯¹åº URL çæ¥å¿æ¶æ¯ãå¦ææå®äº REVï¼\n" +" å®æ¯å æ¥æ¾è¯¥ URL ççæ¬ï¼é»è®¤çæ¬èå´ä¸º REV:1ãå¦ææªæå®\n" +" REVï¼é»è®¤çæ¬èå´ä¸º BASE:1ï¼å 为该 URL å¯è½å¨ HEAD çæ¬ä¸\n" +" 并ä¸åå¨ã\n" +"\n" + +#: ../svnbench/svnbench.c:284 +msgid "" +" 2. Fetch the log messages for the PATHs (default: '.') under URL.\n" +" If specified, REV is the revision in which the URL is first\n" +" looked up, and the default revision range is REV:1; otherwise,\n" +" the URL is looked up in HEAD, and the default revision range is\n" +" HEAD:1.\n" +"\n" +msgstr "" +" 2. è·å URL ä¸ç PATH (é»è®¤: '.') çæ¥å¿æ¶æ¯ã\n" +" å¦ææå®äº REVï¼å®æ¯å æ¥æ¾è¯¥ URL ççæ¬ï¼é»è®¤çæ¬èå´ä¸º\n" +" REV:1ï¼å¦åå¨ HEAD ä¸æ¥æ¾è¯¥ URLï¼é»è®¤çæ¬èå´ä¸º HEAD:1ã\n" +"\n" + +#: ../svnbench/svnbench.c:294 +msgid "" +" 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" +msgstr "" +" ä½¿ç¨ -v æ¶ï¼ä¹æå°æ¯æ¡æ¥å¿æ¶æ¯çææåå½±åè·¯å¾ã\n" +" ä½¿ç¨ -q æ¶ï¼ä¸æå°æ¥å¿æ¶æ¯æ£ææ¬èº«(注æè¿ä¸ -v å ¼å®¹)ã\n" + +#: ../svnbench/svnbench.c:298 +msgid "" +" 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" +msgstr "" +" æ¯æ¡æ¥å¿æ¶æ¯åªæå°ä¸æ¬¡ï¼å³ä½¿è¯¥çæ¬çå¤ä¸ªåå½±åè·¯å¾é½è¢«æ¾å¼\n" +" 请æ±ãæ¥å¿é»è®¤è·éå¤å¶åå²ãç¨ --stop-on-copy å¯ç¦ç¨æ¤è¡ä¸ºï¼\n" +" è¿å¨ç¡®å®åæ¯ç¹æ¶å¾æç¨ã\n" + +#: ../svnbench/svnbench.c:309 +msgid "" +"Display information about a local or remote item.\n" +"usage: null-info [TARGET[@REV]...]\n" +"\n" +msgstr "" +"æ¾ç¤ºæ¬å°æè¿ç¨é¡¹çä¿¡æ¯ã\n" +"ç¨æ³: null-info [TARGET[@REV]...]\n" +"\n" + +#: ../svnbench/svnbench.c:312 +msgid "" +" Print information about each TARGET (default: '.').\n" +" TARGET may be either a working-copy path or URL. If specified, REV\n" +" determines in which revision the target is first looked up.\n" +msgstr "" +" æå°æ¯ä¸ª TARGET çä¿¡æ¯(é»è®¤: '.')ã\n" +" TARGET å¯ä»¥æ¯å·¥ä½å¯æ¬è·¯å¾æ URLãå¦ææå®äº REVï¼å®å³å®å å¨\n" +" åªä¸ªçæ¬ä¸æ¥æ¾ç®æ ã\n" + +#: ../svnbench/svnbench.c:750 +#, c-format +msgid "" +"Subcommand '%s' doesn't accept option '%s'\n" +"Type 'svnbench help %s' for usage.\n" +msgstr "" +"åå½ä»¤ '%s' ä¸æ¥åé项 '%s'\n" +"è¾å ¥ 'svnbench help %s' è·åç¨æ³ã\n" + +#: ../svnbench/svnbench.c:942 +#, c-format +msgid "Try 'svnbench help %s' for more information" +msgstr "å°è¯ 'svnbench help %s' è·åæ´å¤ä¿¡æ¯" + +#: ../svnbench/svnbench.c:967 +#, c-format +msgid "%15.6f seconds taken\n" +msgstr "%15.6f ç§\n" -#: ../svndumpfilter/svndumpfilter.c:79 +#: ../svnbench/svnbench.c:974 #, c-format -msgid "Can't open stdio file" -msgstr "æ æ³æå¼æ åè¾åº/å ¥æ件" +msgid "%15s bytes transferred over network\n" +msgstr "%15s åèéè¿ç½ç»ä¼ è¾\n" -#: ../svndumpfilter/svndumpfilter.c:406 +#: ../svndumpfilter/svndumpfilter.c:360 msgid "This is an empty revision for padding." msgstr "è¿æ¯ä¸ä¸ªç¨æ¥å¡«å ç空çæ¬ã" -#: ../svndumpfilter/svndumpfilter.c:489 +#: ../svndumpfilter/svndumpfilter.c:412 #, c-format msgid "Revision %ld committed as %ld.\n" msgstr "çæ¬ %ld æ交为 %ldã\n" -#: ../svndumpfilter/svndumpfilter.c:512 +#: ../svndumpfilter/svndumpfilter.c:435 #, c-format msgid "Revision %ld skipped.\n" msgstr "è·³è¿çæ¬ %ldã\n" -#: ../svndumpfilter/svndumpfilter.c:608 +#: ../svndumpfilter/svndumpfilter.c:532 #, c-format -msgid "Invalid copy source path '%s'" -msgstr "å¤å¶æºè·¯å¾â%sâæ æ" +msgid "Invalid copy source path '%s' for '%s'" +msgstr "'%s' å¯¹äº '%s' æ¯æ æçå¤å¶æºè·¯å¾" -#: ../svndumpfilter/svndumpfilter.c:649 -#, fuzzy, c-format +#: ../svndumpfilter/svndumpfilter.c:571 +#, c-format msgid "Missing Node-action for path '%s'" -msgstr "è·¯å¾ â%sâ æä¸æ¯æçèç¹ç§ç±»" +msgstr "è·¯å¾ '%s' ç¼ºå° Node-action" -#: ../svndumpfilter/svndumpfilter.c:692 +#: ../svndumpfilter/svndumpfilter.c:614 #, c-format -msgid "No valid copyfrom revision in filtered stream" -msgstr "å¨è¿æ»¤æµä¸æ²¡æææçcopyfromçæ¬" +msgid "No valid copyfrom revision in filtered stream for '%s'" +msgstr "è¿æ»¤æµä¸ '%s' 没æææç copyfrom çæ¬" -#: ../svndumpfilter/svndumpfilter.c:817 +#: ../svndumpfilter/svndumpfilter.c:683 #, c-format msgid "Missing merge source path '%s'; try with --skip-missing-merge-sources" -msgstr "缺å°å并æºè·¯å¾ â%sâï¼å°è¯ --skip-missing-merge-sources" +msgstr "缺å°å并æºè·¯å¾ '%s'ï¼å°è¯ --skip-missing-merge-sources" -#: ../svndumpfilter/svndumpfilter.c:839 +#: ../svndumpfilter/svndumpfilter.c:705 #, c-format msgid "No valid revision range 'start' in filtered stream" -msgstr "å¨è¿æ»¤æµä¸æ²¡æææççæ¬èå´ âstartâ" +msgstr "å¨è¿æ»¤æµä¸æ²¡æææççæ¬èå´ 'start'" -#: ../svndumpfilter/svndumpfilter.c:846 +#: ../svndumpfilter/svndumpfilter.c:712 #, c-format msgid "No valid revision range 'end' in filtered stream" -msgstr "å¨è¿æ»¤æµä¸æ²¡æææççæ¬èå´ âendâ" +msgstr "å¨è¿æ»¤æµä¸æ²¡æææççæ¬èå´ 'end'" -#: ../svndumpfilter/svndumpfilter.c:892 ../svndumpfilter/svndumpfilter.c:923 +#: ../svndumpfilter/svndumpfilter.c:760 ../svndumpfilter/svndumpfilter.c:791 #, c-format msgid "Delta property block detected, but deltas are not enabled for node '%s' in original revision %ld" -msgstr "" +msgstr "æ£æµå°å¢éå±æ§åï¼ä½èç¹ '%s'(åå§çæ¬ %ld)æªå¯ç¨å¢é" -#: ../svndumpfilter/svndumpfilter.c:1056 +#: ../svndumpfilter/svndumpfilter.c:953 msgid "Do not display filtering statistics." msgstr "ä¸æ¾ç¤ºè¿æ»¤çç»è®¡æ°æ®ã" -#: ../svndumpfilter/svndumpfilter.c:1058 -msgid "Treat the path prefixes as file glob patterns." -msgstr "å°è·¯å¾åç¼è§ä¸ºæ件ç»é 模å¼ã" +#: ../svndumpfilter/svndumpfilter.c:955 +msgid "" +"Treat the path prefixes as file glob patterns.\n" +" Glob special characters are '*' '?' '[]' and '\\'.\n" +" Character '/' is not treated specially, so\n" +" pattern /*/foo matches paths /a/foo and /a/b/foo." +msgstr "" +"å°è·¯å¾åç¼ä½ä¸ºæ件 glob 模å¼å¤çã\n" +" Glob ç¹æ®å符为 '*' '?' '[]' å '\\'ã\n" +" å符 '/' ä¸ä½ç¹æ®å¤çï¼æ以模å¼\n" +" /*/foo å¹é è·¯å¾ /a/foo å /a/b/fooã" -#: ../svndumpfilter/svndumpfilter.c:1060 +#: ../svndumpfilter/svndumpfilter.c:960 msgid "Remove revisions emptied by filtering." msgstr "å é¤å è¿æ»¤è产çç空çæ¬ã" -#: ../svndumpfilter/svndumpfilter.c:1062 +#: ../svndumpfilter/svndumpfilter.c:962 msgid "" "Remove all empty revisions found in dumpstream\n" " except revision 0." msgstr "" +"移é¤è½¬å¨æµä¸åç°çææ空çæ¬\n" +" (çæ¬ 0 é¤å¤)ã" -#: ../svndumpfilter/svndumpfilter.c:1065 +#: ../svndumpfilter/svndumpfilter.c:965 msgid "Renumber revisions left after filtering." msgstr "è¿æ»¤åéç¼ä½ä¸ççæ¬ã" -#: ../svndumpfilter/svndumpfilter.c:1068 +#: ../svndumpfilter/svndumpfilter.c:968 msgid "Skip missing merge sources." msgstr "è·³è¿ç¼ºå°çå并æº" -#: ../svndumpfilter/svndumpfilter.c:1070 +#: ../svndumpfilter/svndumpfilter.c:970 msgid "Don't filter revision properties." msgstr "ä¸è¿æ»¤çæ¬å±æ§ã" -#: ../svndumpfilter/svndumpfilter.c:1072 +#: ../svndumpfilter/svndumpfilter.c:972 msgid "" "Read additional prefixes, one per line, from\n" " file ARG." -msgstr "ä»æ件 ARG ä¸è¯»åé¢å¤çåç¼ï¼æ¯ä¸ªä¸è¡ã" +msgstr "" +"ä»æ件 ARG ä¸è¯»åé¢å¤çåç¼ï¼\n" +" æ¯è¡ä¸ä¸ªã" -#: ../svndumpfilter/svndumpfilter.c:1084 +#: ../svndumpfilter/svndumpfilter.c:984 msgid "" "Filter out nodes with given prefixes from dumpstream.\n" "usage: svndumpfilter exclude PATH_PREFIX...\n" @@ -14824,7 +20506,7 @@ msgstr "" "ä»è½¬åæµå é¤å¹é æå®åç¼çèç¹ã\n" "ç¨æ³: svndumpfilter exclude PATH_PREFIX...\n" -#: ../svndumpfilter/svndumpfilter.c:1093 +#: ../svndumpfilter/svndumpfilter.c:994 msgid "" "Filter out nodes without given prefixes from dumpstream.\n" "usage: svndumpfilter include PATH_PREFIX...\n" @@ -14832,7 +20514,7 @@ msgstr "" "ä»è½¬å¨ä¸²æµä¸å é¤æªå å«æå®åç¼çèç¹ã\n" "ç¨æ³: svndumpfilter include PATH_PREFIX...\n" -#: ../svndumpfilter/svndumpfilter.c:1102 +#: ../svndumpfilter/svndumpfilter.c:1004 msgid "" "Describe the usage of this program or its subcommands.\n" "usage: svndumpfilter help [SUBCOMMAND...]\n" @@ -14840,8 +20522,7 @@ msgstr "" "æè¿°æ¬ç¨åºæå ¶åå½ä»¤çç¨æ³ã\n" "ç¨æ³: svndumpfilter help [SUBCOMMAND...]\n" -#: ../svndumpfilter/svndumpfilter.c:1178 -#, fuzzy +#: ../svndumpfilter/svndumpfilter.c:1079 msgid "" "general usage: svndumpfilter SUBCOMMAND [ARGS & OPTIONS ...]\n" "Subversion repository dump filtering tool.\n" @@ -14851,52 +20532,53 @@ msgid "" "Available subcommands:\n" msgstr "" "ä¸è¬ç¨æ³: svndumpfilter SUBCOMMAND [ARGS & OPTIONS ...]\n" -"è¯·ä½¿ç¨ âsvndumpfilter help <subcommand>âè·å¾æå®åå½ä»¤ç帮å©ä¿¡æ¯ã\n" -"è¯·ä½¿ç¨ âsvndumpfilter --versionâè·å¾æ¬ç¨åºçæ¬ã\n" +"Subversion çæ¬åºè½¬å¨è¿æ»¤å·¥å ·ã\n" +"è¾å ¥ 'svndumpfilter help <subcommand>' å¾å°å ³äºæ个åå½ä»¤ç帮å©ã\n" +"è¾å ¥ 'svndumpfilter --version' æ¥çç¨åºçæ¬ã\n" "\n" -"å¯ç¨çåå½ä»¤: \n" +"å¯ç¨çåå½ä»¤:\n" -#: ../svndumpfilter/svndumpfilter.c:1237 +#: ../svndumpfilter/svndumpfilter.c:1138 #, c-format msgid "Excluding (and dropping empty revisions for) prefix patterns:\n" msgstr "æé¤(以å丢å¼ç©ºçæ¬)çåç¼å¹é 模å¼: \n" -#: ../svndumpfilter/svndumpfilter.c:1239 +#: ../svndumpfilter/svndumpfilter.c:1140 #, c-format msgid "Excluding prefix patterns:\n" msgstr "æé¤åç¼å¹é 模å¼: \n" -#: ../svndumpfilter/svndumpfilter.c:1242 +#: ../svndumpfilter/svndumpfilter.c:1143 #, c-format msgid "Including (and dropping empty revisions for) prefix patterns:\n" msgstr "å å«(以å丢å¼ç©ºçæ¬)çåç¼å¹é 模å¼: \n" -#: ../svndumpfilter/svndumpfilter.c:1244 +#: ../svndumpfilter/svndumpfilter.c:1145 #, c-format msgid "Including prefix patterns:\n" msgstr "å å«çåç¼å¹é 模å¼: \n" -#: ../svndumpfilter/svndumpfilter.c:1252 +#: ../svndumpfilter/svndumpfilter.c:1153 #, c-format msgid "Excluding (and dropping empty revisions for) prefixes:\n" msgstr "æé¤ (以å丢å¼ç©ºçæ¬) çåç¼: \n" -#: ../svndumpfilter/svndumpfilter.c:1254 +#: ../svndumpfilter/svndumpfilter.c:1155 #, c-format msgid "Excluding prefixes:\n" msgstr "æé¤åç¼: \n" -#: ../svndumpfilter/svndumpfilter.c:1257 +#: ../svndumpfilter/svndumpfilter.c:1158 #, c-format msgid "Including (and dropping empty revisions for) prefixes:\n" msgstr "å å« (以å丢å¼ç©ºçæ¬) çåç¼: \n" -#: ../svndumpfilter/svndumpfilter.c:1259 +#: ../svndumpfilter/svndumpfilter.c:1160 #, c-format msgid "Including prefixes:\n" msgstr "å å«çåç¼: \n" -#: ../svndumpfilter/svndumpfilter.c:1287 +#: ../svndumpfilter/svndumpfilter.c:1188 #, c-format msgid "" "Dropped %d revision.\n" @@ -14908,27 +20590,26 @@ msgstr[0] "" "å é¤ %d 个çæ¬ã\n" "\n" -#: ../svndumpfilter/svndumpfilter.c:1295 +#: ../svndumpfilter/svndumpfilter.c:1196 msgid "Revisions renumbered as follows:\n" msgstr "çæ¬è¢«éæ°ç¼å·å¦ä¸: \n" -#: ../svndumpfilter/svndumpfilter.c:1322 +#: ../svndumpfilter/svndumpfilter.c:1223 #, c-format msgid " %ld => (dropped)\n" msgstr " %ld => (丢å¼)\n" -#: ../svndumpfilter/svndumpfilter.c:1337 +#: ../svndumpfilter/svndumpfilter.c:1238 #, c-format msgid "Dropped %d node:\n" msgid_plural "Dropped %d nodes:\n" msgstr[0] "ä¸¢å¼ %d 个èç¹: \n" -#: ../svndumpfilter/svndumpfilter.c:1495 -#, fuzzy +#: ../svndumpfilter/svndumpfilter.c:1403 msgid "--drop-empty-revs cannot be used with --drop-all-empty-revs" -msgstr "--depth ä¸è½ä¸ --reintegrate å ±å" +msgstr "--drop-empty-revs ä¸è½ä¸ --drop-all-empty-revs ä¸èµ·ä½¿ç¨" -#: ../svndumpfilter/svndumpfilter.c:1612 +#: ../svndumpfilter/svndumpfilter.c:1514 #, c-format msgid "" "\n" @@ -14937,35 +20618,35 @@ msgstr "" "\n" "é误: 没ææä¾åç¼ã\n" -#: ../svndumpfilter/svndumpfilter.c:1643 +#: ../svndumpfilter/svndumpfilter.c:1545 #, c-format msgid "" "Subcommand '%s' doesn't accept option '%s'\n" "Type 'svndumpfilter help %s' for usage.\n" msgstr "" -"åå½ä»¤â%sâä¸æ¥åé项â%sâ\n" -"使ç¨âsvndumpfilter help %sâå¾å°ç¨æ³ã\n" +"åå½ä»¤'%s'ä¸æ¥åé项'%s'\n" +"使ç¨'svndumpfilter help %s'å¾å°ç¨æ³ã\n" -#: ../svndumpfilter/svndumpfilter.c:1661 +#: ../svndumpfilter/svndumpfilter.c:1563 msgid "Try 'svndumpfilter help' for more info" -msgstr "请使ç¨âsvndumpfilter helpâ以å¾å°æ´å¤ä¿¡æ¯" +msgstr "请使ç¨'svndumpfilter help'以å¾å°æ´å¤ä¿¡æ¯" #: ../svnfsfs/load-index-cmd.c:54 -#, fuzzy, c-format +#, c-format msgid "Unknown item type '%s'" -msgstr "æªç¥çæ件系ç»ç±»å â%sâ" +msgstr "æªç¥ç项类å '%s'" -#: ../svnfsfs/load-index-cmd.c:73 +#: ../svnfsfs/load-index-cmd.c:75 #, c-format msgid "%i columns needed, %i provided" -msgstr "" +msgstr "éè¦ %i åï¼æä¾äº %i å" -#: ../svnfsfs/load-index-cmd.c:83 -#, fuzzy, c-format +#: ../svnfsfs/load-index-cmd.c:85 +#, c-format msgid "%s is not a value HEX string" -msgstr "è·¯å¾ä¸æ¯å符串" +msgstr "%s ä¸æ¯ææç HEX å符串" -#: ../svnfsfs/stats-cmd.c:41 +#: ../svnfsfs/stats-cmd.c:72 #, c-format msgid "" "%20s bytes in %12s reps\n" @@ -14974,30 +20655,39 @@ msgid "" "%20s bytes expanded shared size\n" "%20s bytes with rep-sharing off\n" "%20s shared references\n" +"%20.3f average delta chain length\n" msgstr "" +"%20s åèå¨ %12s 表示ä¸\n" +"%20s åèå¨ %12s å ±äº«è¡¨ç¤ºä¸\n" +"%20s åèå±å¼å¤§å°\n" +"%20s åèå±å¼å ±äº«å¤§å°\n" +"%20s åè(ä¸å ±äº«è¡¨ç¤ºæ¶)\n" +"%20s å ±äº«å¼ç¨\n" +"%20.3f å¹³åå¢éé¾é¿åº¦\n" -#: ../svnfsfs/stats-cmd.c:65 +#: ../svnfsfs/stats-cmd.c:98 #, c-format msgid "%12s r%-8ld %s\n" -msgstr "" +msgstr "%12s r%-8ld %s\n" -#: ../svnfsfs/stats-cmd.c:91 +#: ../svnfsfs/stats-cmd.c:124 #, c-format -msgid " [2^%2d, 2^%2d) %15s (%2d%%) bytes in %12s (%2d%%) items\n" -msgstr "" +msgid " %4s .. < %-4s %19s (%2d%%) bytes in %12s (%2d%%) items\n" +msgstr " %4s .. < %-4s %19s (%2d%%) åèå¨ %12s (%2d%%) 项ä¸\n" -#: ../svnfsfs/stats-cmd.c:210 ../svnfsfs/stats-cmd.c:217 +#: ../svnfsfs/stats-cmd.c:247 ../svnfsfs/stats-cmd.c:256 #, c-format msgid "%11s %20s (%2d%%) representations\n" -msgstr "" +msgstr "%11s %20s (%2d%%) 表示\n" -#: ../svnfsfs/stats-cmd.c:240 ../svnfsfs/stats-cmd.c:247 -#: ../svnfsfs/stats-cmd.c:270 ../svnfsfs/stats-cmd.c:277 +#. Total sum can't be zero here. +#: ../svnfsfs/stats-cmd.c:294 ../svnfsfs/stats-cmd.c:304 +#: ../svnfsfs/stats-cmd.c:329 ../svnfsfs/stats-cmd.c:339 #, c-format msgid "%11s %20s (%2d%%) bytes\n" -msgstr "" +msgstr "%11s %20s (%2d%%) åè\n" -#: ../svnfsfs/stats-cmd.c:318 +#: ../svnfsfs/stats-cmd.c:381 #, c-format msgid "" "%20s bytes in %12s revisions\n" @@ -15007,16 +20697,25 @@ msgid "" "%20s bytes expanded representation size\n" "%20s bytes with rep-sharing off\n" msgstr "" +"%20s åèå¨ %12s çæ¬ä¸\n" +"%20s åèå¨ %12s æ´æ¹ä¸\n" +"%20s åèå¨ %12s èç¹çæ¬è®°å½ä¸\n" +"%20s åèå¨ %12s 表示ä¸\n" +"%20s åèå±å¼è¡¨ç¤ºå¤§å°\n" +"%20s åè(ä¸å ±äº«è¡¨ç¤ºæ¶)\n" -#: ../svnfsfs/stats-cmd.c:338 +#: ../svnfsfs/stats-cmd.c:401 #, c-format msgid "" "%20s bytes in %12s nodes total\n" "%20s bytes in %12s directory noderevs\n" "%20s bytes in %12s file noderevs\n" msgstr "" +"%20s åèå¨ %12s èç¹æ»è®¡ä¸\n" +"%20s åèå¨ %12s ç®å½èç¹çæ¬ä¸\n" +"%20s åèå¨ %12s æ件èç¹çæ¬ä¸\n" -#: ../svnfsfs/stats-cmd.c:349 +#: ../svnfsfs/stats-cmd.c:412 #, c-format msgid "" "%20s bytes in %12s representations total\n" @@ -15025,43 +20724,69 @@ msgid "" "%20s bytes in %12s representations of added file nodes\n" "%20s bytes in %12s directory property representations\n" "%20s bytes in %12s file property representations\n" +" with %12.3f average delta chain length\n" "%20s bytes in header & footer overhead\n" msgstr "" +"%20s åèå¨ %12s 表示æ»è®¡ä¸\n" +"%20s åèå¨ %12s ç®å½è¡¨ç¤ºä¸\n" +"%20s åèå¨ %12s æ件表示ä¸\n" +"%20s åèå¨ %12s æ°å¢æ件èç¹ç表示ä¸\n" +"%20s åèå¨ %12s ç®å½å±æ§è¡¨ç¤ºä¸\n" +"%20s åèå¨ %12s æ件å±æ§è¡¨ç¤ºä¸\n" +" å¹³åå¢éé¾é¿åº¦ %12.3f\n" +"%20s åèå¨å¤´é¨åå°¾é¨å¼éä¸\n" -#: ../svnfsfs/svnfsfs.c:144 -#, fuzzy +#: ../svnfsfs/svnfsfs.c:104 msgid "" "size of the extra in-memory cache in MB used to\n" " minimize redundant operations. Default: 16." msgstr "" -"ç¨æ¥åå°åä½æä½çå åä¸çé¢å¤ç¼åç大å°(MB)\n" -" é»è®¤å¼: 16ã\n" -" [ä» ç¨äº FSFS ä»åº]" +"ç¨äºæå°ååä½æä½çé¢å¤å åç¼å\n" +" 大å°(MB)ãé»è®¤: 16" -#: ../svnfsfs/svnfsfs.c:157 -#, fuzzy +#: ../svnfsfs/svnfsfs.c:117 msgid "" "usage: svnfsfs help [SUBCOMMAND...]\n" "\n" -"Describe the usage of this program or its subcommands.\n" msgstr "" -"ç¨æ³: svnsync help [SUBCOMMAND...]\n" +"ç¨æ³: svnfsfs help [SUBCOMMAND...]\n" "\n" -"æ¾ç¤ºæ¬ç¨åºæå ¶åå½ä»¤çç¨æ³ã\n" -#: ../svnfsfs/svnfsfs.c:162 +#: ../svnfsfs/svnfsfs.c:124 msgid "" "usage: svnfsfs dump-index REPOS_PATH -r REV\n" "\n" +msgstr "" +"ç¨æ³: svnfsfs dump-index REPOS_PATH -r REV\n" +"\n" + +#: ../svnfsfs/svnfsfs.c:126 +msgid "" "Dump the index contents for the revision / pack file containing revision REV\n" "to console. This is only available for FSFS format 7 (SVN 1.9+) repositories.\n" "The table produced contains a header in the first line followed by one line\n" "per index entry, ordered by location in the revision / pack file. Columns:\n" "\n" +msgstr "" +"å°å å«çæ¬ REV ççæ¬ / pack æ件çç´¢å¼å 容转å¨å°æ§å¶å°ã\n" +"æ¤åè½ä» éç¨äº FSFS æ ¼å¼ 7 (SVN 1.9+) ççæ¬åºã\n" +"çæçè¡¨æ ¼ç¬¬ä¸è¡æ¯è¡¨å¤´ï¼ä¹åæ¯ä¸ªç´¢å¼æ¡ç®ä¸è¡ï¼æå ¶å¨çæ¬ /\n" +"pack æ件ä¸çä½ç½®æåºãå:\n" +"\n" + +#: ../svnfsfs/svnfsfs.c:131 +msgid "" " * Byte offset (hex) at which the item starts\n" " * Length (hex) of the item in bytes\n" " * Item type (string) is one of the following:\n" "\n" +msgstr "" +" * 项å¼å§çåèå移é(åå è¿å¶)\n" +" * 项çé¿åº¦(åå è¿å¶)åè\n" +" * 项类å(å符串)æ¯ä»¥ä¸ä¹ä¸\n" + +#: ../svnfsfs/svnfsfs.c:135 +msgid "" " none ... Unused section. File contents shall be NULs.\n" " frep ... File representation.\n" " drep ... Directory representation.\n" @@ -15072,43 +20797,76 @@ msgid "" " rep .... Representation of unknown type. Should not be used.\n" " ??? .... Invalid. Index data is corrupt.\n" "\n" +msgstr "" +" none ... æªä½¿ç¨çèãæ件å 容åºä¸º NULã\n" +" frep ... æ件表示ã\n" +" drep ... ç®å½è¡¨ç¤ºã\n" +" fprop .. æ件å±æ§ã\n" +" dprop .. ç®å½å±æ§ã\n" +" node ... èç¹çæ¬ã\n" +" chgs ... åæ´è·¯å¾å表ã\n" +" rep .... æªç¥ç±»åç表示ãä¸åºä½¿ç¨ã\n" +" ??? .... æ æãç´¢å¼æ°æ®å·²æåã\n" +"\n" + +#: ../svnfsfs/svnfsfs.c:145 +msgid "" " The distinction between frep, drep, fprop and dprop is a mere internal\n" " classification used for various optimizations and does not affect the\n" " operational correctness.\n" "\n" +msgstr "" +" frepãdrepãfprop å dprop ä¹é´çåºå«åªæ¯ç¨äºåç§ä¼åç\n" +" å é¨åç±»ï¼ä¸å½±åæä½çæ£ç¡®æ§ã\n" +"\n" + +#: ../svnfsfs/svnfsfs.c:149 +msgid "" " * Revision that the item belongs to (decimal)\n" " * Item number (decimal) within that revision\n" " * Modified FNV1a checksum (8 hex digits)\n" msgstr "" +" * 项æå±ççæ¬(åè¿å¶)\n" +" * 该çæ¬ä¸ç项ç¼å·(åè¿å¶)\n" +" * ä¿®æ¹ç FNV1a æ ¡éªå\n" -#: ../svnfsfs/svnfsfs.c:188 +#: ../svnfsfs/svnfsfs.c:156 msgid "" "usage: svnfsfs load-index REPOS_PATH\n" "\n" +msgstr "" +"ç¨æ³: svnfsfs load-index REPOS_PATH\n" +"\n" + +#: ../svnfsfs/svnfsfs.c:158 +msgid "" "Read index contents from console. The format is the same as produced by the\n" "dump-index command, except that checksum as well as header are optional and will\n" "be ignored. The data must cover the full revision / pack file; the revision\n" "number is automatically extracted from input stream. No ordering is required.\n" msgstr "" +"ä»æ§å¶å°è¯»åç´¢å¼å 容ãæ ¼å¼ä¸ dump-index å½ä»¤äº§ççç¸åï¼åªæ¯\n" +"æ ¡éªåä¸è¡¨å¤´æ¯å¯éçï¼å¹¶ä¸ä¼è¢«å¿½ç¥ãæ°æ®å¿ é¡»è¦çå®æ´ççæ¬ /\n" +"pack æ件ï¼çæ¬å·ä¼èªå¨ä»è¾å ¥æµä¸æåãä¸è¦æ±æåºã\n" -#: ../svnfsfs/svnfsfs.c:196 -#, fuzzy +#: ../svnfsfs/svnfsfs.c:166 msgid "" "usage: svnfsfs stats REPOS_PATH\n" "\n" -"Write object size statistics to console.\n" msgstr "" -"ç¨æ³: svnlook youngest REPOS_PATH\n" +"ç¨æ³: svnfsfs stats REPOS_PATH\n" "\n" -"æ¾ç¤ºææ°ççæ¬å·ã\n" -#: ../svnfsfs/svnfsfs.c:216 -#, fuzzy, c-format +#: ../svnfsfs/svnfsfs.c:168 +msgid "Write object size statistics to console.\n" +msgstr "å°å¯¹è±¡å¤§å°ç»è®¡åå ¥æ§å¶å°ã\n" + +#: ../svnfsfs/svnfsfs.c:188 +#, c-format msgid "%s repositories are not supported" -msgstr "ä¸æ¯æçæ¬åºå级" +msgstr "ä¸æ¯æ %s çæ¬åº" -#: ../svnfsfs/svnfsfs.c:232 -#, fuzzy +#: ../svnfsfs/svnfsfs.c:204 msgid "" "general usage: svnfsfs SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n" "Subversion FSFS repository manipulation tool.\n" @@ -15117,25 +20875,25 @@ msgid "" "\n" "Available subcommands:\n" msgstr "" -"ä¸è¬ç¨æ³: svnadmin SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n" -"使ç¨âsvnadmin help <subcommand>â å¾å°åå½ä»¤ç帮å©ä¿¡æ¯ã\n" -"使ç¨âsvnadmin --versionâæ¥çç¨åºççæ¬å·åæ件系ç»æ¨¡åã\n" +"ä¸è¬ç¨æ³: svnfsfs SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n" +"Subversion FSFS çæ¬åºæä½å·¥å ·ã\n" +"è¾å ¥ 'svnfsfs help <subcommand>' å¾å°å ³äºæ个åå½ä»¤ç帮å©ã\n" +"è¾å ¥ 'svnfsfs --version' æ¥çç¨åºçæ¬ã\n" "\n" -"å¯ç¨çåå½ä»¤: \n" +"å¯ç¨çåå½ä»¤:\n" -#: ../svnfsfs/svnfsfs.c:459 -#, fuzzy, c-format +#: ../svnfsfs/svnfsfs.c:441 +#, c-format msgid "" "Subcommand '%s' doesn't accept option '%s'\n" "Type 'svnfsfs help %s' for usage.\n" msgstr "" -"åå½ä»¤â%sâä¸æ¥åé项â%sâ\n" -"è¾å ¥âsvn help %sâå¾å°ç¨æ³ã\n" +"åå½ä»¤ '%s' ä¸æ¥åé项 '%s'\n" +"è¾å ¥ 'svnfsfs help %s' è·åç¨æ³ã\n" -#: ../svnfsfs/svnfsfs.c:503 -#, fuzzy +#: ../svnfsfs/svnfsfs.c:473 msgid "Try 'svnfsfs help' for more info" -msgstr "è¯·ä½¿ç¨ âsvnsync helpâ 以å¾å°æ´å¤ä¿¡æ¯" +msgstr "å°è¯ 'svnfsfs help' è·åæ´å¤ä¿¡æ¯" #: ../svnlook/svnlook.c:118 msgid "show details for copies" @@ -15153,33 +20911,31 @@ msgstr "æ¾ç¤ºå®æ´è·¯å¾(代æ¿ç¼©è¿) msgid "maximum number of history entries" msgstr "åå²é¡¹æ大æ°é" -#: ../svnlook/svnlook.c:151 +#: ../svnlook/svnlook.c:158 msgid "operate on single directory only" msgstr "åªå¨å个ç®å½æä½" -#: ../svnlook/svnlook.c:154 +#: ../svnlook/svnlook.c:161 msgid "specify revision number ARG" msgstr "æå®çæ¬ç¼å· ARG" -#: ../svnlook/svnlook.c:157 +#: ../svnlook/svnlook.c:164 msgid "operate on a revision property (use with -r or -t)" msgstr "æä½çæ¬çå±æ§(ä½¿ç¨ -r æ -t)" -#: ../svnlook/svnlook.c:160 +#: ../svnlook/svnlook.c:167 msgid "show node revision ids for each path" msgstr "为æ¯ä¸ªè·¯å¾æ¾ç¤ºèç¹çæ¬ç¼å·" -#: ../svnlook/svnlook.c:163 -#, fuzzy +#: ../svnlook/svnlook.c:170 msgid "show path's inherited properties" -msgstr "æ¾ç¤ºå®æ´è·¯å¾(代æ¿ç¼©è¿)" +msgstr "æ¾ç¤ºè·¯å¾ç继æ¿å±æ§" -#: ../svnlook/svnlook.c:169 +#: ../svnlook/svnlook.c:176 msgid "be verbose" msgstr "详ç»" -#: ../svnlook/svnlook.c:178 -#, fuzzy +#: ../svnlook/svnlook.c:185 msgid "" "Specify differencing options for external diff or\n" " internal diff. Default: '-u'. Options are\n" @@ -15192,232 +20948,276 @@ msgid "" " -U ARG, --context ARG: Show ARG lines of context\n" " -p, --show-c-function: Show C function name" msgstr "" -"缺ç: â-uâãå½ Subversion è°ç¨å¤é¨æ¯è¾ç¨åºæ¶ï¼ARG ç´æ¥ä¼ ç»å®ãä½æ¯å½\n" -" Subversion 使ç¨ç¼ºççå ç½®æ¯è¾å®ç°ï¼æè æ£\n" -" æ¾ç¤ºè¿½æº¯æ¶, ARG å¯ä»¥æ¯: \n" -" -u (--unified):\n" -" è¾åºä¸è¡ç»ä¸ä¸ä¸æã\n" -" -b (--ignore-space-change):\n" -" 忽ç¥ç©ºç½æ°éçä¿®æ¹ã\n" -" -w (--ignore-all-space):\n" -" 忽ç¥ææç空ç½ã\n" -" --ignore-eol-style:\n" -" 忽ç¥è¡å°¾æ ·å¼çæ¹åã\n" -" -p (--show-c-function):\n" -" å¨æ¯è¾è¾åºä¸æ¾ç¤º C å½æ°å称ã" +"为å¤é¨å¼ç¨å·®å¼æ¯è¾æå é¨å·®å¼æ¯è¾æå®é项ã\n" +" é»è®¤: '-u'ãé项ç¨ç©ºæ ¼åéã\n" +" å é¨å·®å¼æ¯è¾æ¥å:\n" +" -u, --unified: æ¾ç¤º3è¡ç»ä¸ä¸ä¸æ\n" +" -b, --ignore-space-change: 忽ç¥ç©ºç½éåå\n" +" -w, --ignore-all-space: 忽ç¥ææ空ç½\n" +" --ignore-eol-style: 忽ç¥è¡å°¾é£æ ¼åå\n" +" -U ARG, --context ARG: æ¾ç¤º ARG è¡ä¸ä¸æ\n" +" -p, --show-c-function: æ¾ç¤º C å½æ°å" -#: ../svnlook/svnlook.c:199 ../svnrdump/svnrdump.c:133 -#: ../svnserve/svnserve.c:378 ../svnversion/svnversion.c:146 +#: ../svnlook/svnlook.c:206 ../svnrdump/svnrdump.c:116 +#: ../svnserve/svnserve.c:423 ../svnversion/svnversion.c:149 msgid "no progress (only errors) to stderr" msgstr "å¨æ åé误è¾åºä¸æ¾ç¤ºè¿åº¦ (ä» é误)" -#: ../svnlook/svnlook.c:211 +#: ../svnlook/svnlook.c:218 msgid "" "usage: svnlook author REPOS_PATH\n" "\n" -"Print the author.\n" msgstr "" "ç¨æ³: svnlook author REPOS_PATH\n" "\n" -"æ¾ç¤ºä½è ã\n" -#: ../svnlook/svnlook.c:216 +#: ../svnlook/svnlook.c:220 +msgid "Print the author.\n" +msgstr "æå°ä½è ã\n" + +#: ../svnlook/svnlook.c:225 msgid "" "usage: svnlook cat REPOS_PATH FILE_PATH\n" "\n" -"Print the contents of a file. Leading '/' on FILE_PATH is optional.\n" msgstr "" "ç¨æ³: svnlook cat REPOS_PATH FILE_PATH\n" "\n" -"æ¾ç¤ºæ件çå 容ãå¯çç¥ FILE_PATH åçâ/âã\n" -#: ../svnlook/svnlook.c:221 +#: ../svnlook/svnlook.c:227 +msgid "Print the contents of a file. Leading '/' on FILE_PATH is optional.\n" +msgstr "æå°æ件å 容ãFILE_PATH çå导 '/' å¯éã\n" + +#: ../svnlook/svnlook.c:232 msgid "" "usage: svnlook changed REPOS_PATH\n" "\n" -"Print the paths that were changed.\n" msgstr "" "ç¨æ³: svnlook changed REPOS_PATH\n" "\n" -"æ¾ç¤ºå·²æ¹åçè·¯å¾ã\n" -#: ../svnlook/svnlook.c:226 +#: ../svnlook/svnlook.c:234 +msgid "Print the paths that were changed.\n" +msgstr "æå°å·²æ´æ¹çè·¯å¾ã\n" + +#: ../svnlook/svnlook.c:239 msgid "" "usage: svnlook date REPOS_PATH\n" "\n" -"Print the datestamp.\n" msgstr "" "ç¨æ³: svnlook date REPOS_PATH\n" "\n" -"æ¾ç¤ºæ¶æ³ã\n" -#: ../svnlook/svnlook.c:231 +#: ../svnlook/svnlook.c:241 +msgid "Print the datestamp.\n" +msgstr "æå°æ¥ææ³ã\n" + +#: ../svnlook/svnlook.c:246 msgid "" "usage: svnlook diff REPOS_PATH\n" "\n" -"Print GNU-style diffs of changed files and properties.\n" msgstr "" "ç¨æ³: svnlook diff REPOS_PATH\n" "\n" -"以 GNU æ ·å¼ï¼æ¾ç¤ºçæ¬åºä¸æ¹åçæ件ä¸å±æ§å·®å¼ã\n" -#: ../svnlook/svnlook.c:238 +#: ../svnlook/svnlook.c:248 +msgid "Print GNU-style diffs of changed files and properties.\n" +msgstr "æå°å·²æ´æ¹æ件åå±æ§ç GNU é£æ ¼å·®å¼ã\n" + +#: ../svnlook/svnlook.c:255 msgid "" "usage: svnlook dirs-changed REPOS_PATH\n" "\n" -"Print the directories that were themselves changed (property edits)\n" -"or whose file children were changed.\n" msgstr "" "ç¨æ³: svnlook dirs-changed REPOS_PATH\n" "\n" -"æ¾ç¤ºæ¬èº«æ¹å (ç¼è¾å±æ§) çç®å½ï¼ææ¯å ¶ä¸çæ件修æ¹è¿çç®å½ã\n" -#: ../svnlook/svnlook.c:244 +#: ../svnlook/svnlook.c:257 +msgid "" +"Print the directories that were themselves changed (property edits)\n" +"or whose file children were changed.\n" +msgstr "" +"æå°èªèº«è¢«æ´æ¹(å±æ§ç¼è¾)çç®å½\n" +"æå ¶æ件å项被æ´æ¹çç®å½ã\n" + +#: ../svnlook/svnlook.c:263 msgid "" "usage: svnlook filesize REPOS_PATH PATH_IN_REPOS\n" "\n" -"Print the size (in bytes) of the file located at PATH_IN_REPOS as\n" -"it is represented in the repository.\n" msgstr "" "ç¨æ³: svnlook filesize REPOS_PATH PATH_IN_REPOS\n" "\n" -"æ¾ç¤ºä½äº PATH_IN_REPOS çæ件å¨çæ¬åºä¸å±ç°ç大å°(åè)\n" -#: ../svnlook/svnlook.c:250 +#: ../svnlook/svnlook.c:265 +msgid "" +"Print the size (in bytes) of the file located at PATH_IN_REPOS as\n" +"it is represented in the repository.\n" +msgstr "" +"æå° PATH_IN_REPOS å¤æ件å¨çæ¬åºä¸è¡¨ç¤ºç\n" +"大å°(åè)ã\n" + +#: ../svnlook/svnlook.c:271 msgid "" "usage: svnlook help [SUBCOMMAND...]\n" "\n" -"Describe the usage of this program or its subcommands.\n" msgstr "" "ç¨æ³: svnlook help [SUBCOMMAND...]\n" "\n" -"æ¾ç¤ºæ¬ç¨åºæå ¶åå½ä»¤çç¨æ³ã\n" -#: ../svnlook/svnlook.c:255 +#: ../svnlook/svnlook.c:278 msgid "" "usage: svnlook history REPOS_PATH [PATH_IN_REPOS]\n" "\n" -"Print information about the history of a path in the repository (or\n" -"the root directory if no path is supplied).\n" msgstr "" "ç¨æ³: svnlook history REPOS_PATH [PATH_IN_REPOS]\n" "\n" -"æ¾ç¤ºçæ¬åºä¸ï¼æ个路å¾çåå²è®°å½ä¿¡æ¯ (å¦æ没ææå®è·¯å¾ï¼åä¸ºæ ¹ç®å½)ã\n" -#: ../svnlook/svnlook.c:261 +#: ../svnlook/svnlook.c:280 +msgid "" +"Print information about the history of a path in the repository (or\n" +"the root directory if no path is supplied).\n" +msgstr "" +"æå°çæ¬åºä¸è·¯å¾åå²çä¿¡æ¯(å¦ææªæä¾è·¯å¾\n" +"åä¸ºæ ¹ç®å½)ã\n" + +#: ../svnlook/svnlook.c:286 msgid "" "usage: svnlook info REPOS_PATH\n" "\n" -"Print the author, datestamp, log message size, and log message.\n" msgstr "" "ç¨æ³: svnlook info REPOS_PATH\n" "\n" -"æ¾ç¤ºä½è ï¼æ¶æ³ï¼æ¥å¿ä¿¡æ¯å¤§å°ï¼ä»¥åæ¥å¿ä¿¡æ¯ã\n" -#: ../svnlook/svnlook.c:266 +#: ../svnlook/svnlook.c:288 +msgid "Print the author, datestamp, log message size, and log message.\n" +msgstr "æå°ä½è ãæ¥ææ³ãæ¥å¿æ¶æ¯å¤§å°åæ¥å¿æ¶æ¯ã\n" + +#: ../svnlook/svnlook.c:293 msgid "" "usage: svnlook lock REPOS_PATH PATH_IN_REPOS\n" "\n" -"If a lock exists on a path in the repository, describe it.\n" msgstr "" "ç¨æ³: svnlook lock REPOS_PATH PATH_IN_REPOS\n" "\n" -"å¦æçæ¬åºä¸çè·¯å¾åå¨éï¼æ¾ç¤ºå ¶è¯¦ç»ä¿¡æ¯ã\n" -#: ../svnlook/svnlook.c:271 +#: ../svnlook/svnlook.c:295 +msgid "If a lock exists on a path in the repository, describe it.\n" +msgstr "å¦æçæ¬åºä¸çè·¯å¾ä¸åå¨éï¼åæè¿°å®ã\n" + +#: ../svnlook/svnlook.c:300 msgid "" "usage: svnlook log REPOS_PATH\n" "\n" -"Print the log message.\n" msgstr "" "ç¨æ³: svnlook log REPOS_PATH\n" "\n" -"æ¾ç¤ºæ¥å¿ä¿¡æ¯ã\n" -#: ../svnlook/svnlook.c:276 +#: ../svnlook/svnlook.c:302 +msgid "Print the log message.\n" +msgstr "æå°æ¥å¿æ¶æ¯ã\n" + +#: ../svnlook/svnlook.c:307 msgid "" "usage: 1. svnlook propget REPOS_PATH PROPNAME PATH_IN_REPOS\n" " 2. svnlook propget --revprop REPOS_PATH PROPNAME\n" "\n" +msgstr "" +"ç¨æ³: 1. svnlook propget REPOS_PATH PROPNAME PATH_IN_REPOS\n" +" 2. svnlook propget --revprop REP\n" + +#: ../svnlook/svnlook.c:312 +msgid "" "Print the raw value of a property on a path in the repository.\n" "With --revprop, print the raw value of a revision property.\n" msgstr "" -"ç¨æ³: 1ãsvnlook propget REPOS_PATH PROPNAME PATH_IN_REPOS\n" -" 2ãsvnlook propget --revprop REPOS_PATH PROPNAME\n" -"\n" -"æ¾ç¤ºçæ¬åºä¸æå®è·¯å¾ä¸å±æ§çåå§å¼ã\n" -"ç¨ --revprop é项æ¾ç¤ºçæ¬å±æ§çåå§å¼ã\n" +"æå°çæ¬åºä¸è·¯å¾ä¸å±æ§çåå§å¼ã\n" +"ä½¿ç¨ --revprop æå°çæ¬å±æ§çåå§å¼ã\n" -#: ../svnlook/svnlook.c:285 +#: ../svnlook/svnlook.c:318 msgid "" "usage: 1. svnlook proplist REPOS_PATH PATH_IN_REPOS\n" " 2. svnlook proplist --revprop REPOS_PATH\n" "\n" +msgstr "" +"ç¨æ³: 1. svnlook proplist REPOS_PATH PATH_IN_REPOS\n" +" 2. svnlook proplist --revprop REPOS_PA\n" + +#: ../svnlook/svnlook.c:323 +msgid "" "List the properties of a path in the repository, or\n" "with the --revprop option, revision properties.\n" "With -v, show the property values too.\n" msgstr "" -"ç¨æ³: 1ãsvnlook proplist REPOS_PATH PATH_IN_REPOS\n" -" 2ãsvnlook proplist --revprop REPOS_PATH\n" -"\n" -"ååºçæ¬åºä¸æ个路å¾çå±æ§ã\n" +"ååºçæ¬åºä¸è·¯å¾çå±æ§ï¼æ\n" "ä½¿ç¨ --revprop é项ååºçæ¬å±æ§ã\n" -"ä½¿ç¨ -v é项æ¾ç¤ºå±æ§çå 容ã\n" +"ä½¿ç¨ -v æ¾ç¤ºå±æ§å¼ã\n" -#: ../svnlook/svnlook.c:296 +#: ../svnlook/svnlook.c:331 msgid "" "usage: svnlook tree REPOS_PATH [PATH_IN_REPOS]\n" "\n" -"Print the tree, starting at PATH_IN_REPOS (if supplied, at the root\n" -"of the tree otherwise), optionally showing node revision ids.\n" msgstr "" "ç¨æ³: svnlook tree REPOS_PATH [PATH_IN_REPOS]\n" "\n" -"æ¾ç¤ºç®å½æ ï¼ä» PATH_IN_REPOS å¼å§ (å¦æçç¥æ¤åæ°å°±ä»çæ¬åºçæ ¹ç®å½å¼å§)ï¼\n" -"å¯éçæ¾ç¤ºèç¹çæ¬ idã\n" -#: ../svnlook/svnlook.c:302 +#: ../svnlook/svnlook.c:333 +msgid "" +"Print the tree, starting at PATH_IN_REPOS (if supplied, at the root\n" +"of the tree otherwise), optionally showing node revision ids.\n" +msgstr "" +"æå°ä» PATH_IN_REPOS å¼å§çç®å½æ (å¦ææä¾ï¼\n" +"å¦åä»æ æ ¹å¼å§)ï¼å¯éæ¾ç¤ºèç¹çæ¬ IDã\n" + +#: ../svnlook/svnlook.c:339 msgid "" "usage: svnlook uuid REPOS_PATH\n" "\n" -"Print the repository's UUID.\n" msgstr "" "ç¨æ³: svnlook uuid REPOS_PATH\n" "\n" -"æ¾ç¤ºçæ¬åºç UUIDã\n" -#: ../svnlook/svnlook.c:307 +#: ../svnlook/svnlook.c:341 +msgid "Print the repository's UUID.\n" +msgstr "æå°çæ¬åºç UUIDã\n" + +#: ../svnlook/svnlook.c:346 msgid "" "usage: svnlook youngest REPOS_PATH\n" "\n" -"Print the youngest revision number.\n" msgstr "" "ç¨æ³: svnlook youngest REPOS_PATH\n" "\n" -"æ¾ç¤ºææ°ççæ¬å·ã\n" -#: ../svnlook/svnlook.c:870 +#: ../svnlook/svnlook.c:348 +msgid "Print the youngest revision number.\n" +msgstr "æå°ææ°ççæ¬å·ã\n" + +#: ../svnlook/svnlook.c:824 +#, c-format +msgid "%sProperty changes on: %s%s" +msgstr "%s å±æ§æ¹å: %s%s" + +#: ../svnlook/svnlook.c:891 #, c-format msgid "Copied: %s (from rev %ld, %s)\n" msgstr "å·²å¤å¶: %s (æ¥èªçæ¬ %ldï¼%s)\n" -#: ../svnlook/svnlook.c:938 +#: ../svnlook/svnlook.c:959 msgid "Added" msgstr "å·²å¢å " -#: ../svnlook/svnlook.c:939 +#: ../svnlook/svnlook.c:960 msgid "Deleted" msgstr "å·²å é¤" -#: ../svnlook/svnlook.c:940 +#: ../svnlook/svnlook.c:961 msgid "Modified" msgstr "已修æ¹" -#: ../svnlook/svnlook.c:941 +#: ../svnlook/svnlook.c:962 msgid "Index" msgstr "ç´¢å¼" -#: ../svnlook/svnlook.c:952 +#: ../svnlook/svnlook.c:973 msgid "" "(Binary files differ)\n" "\n" @@ -15425,30 +21225,30 @@ msgstr "" "(äºè¿å¶æ件ä¸å)\n" "\n" -#: ../svnlook/svnlook.c:1232 +#: ../svnlook/svnlook.c:1242 msgid "unknown" msgstr "æªç¥" -#: ../svnlook/svnlook.c:1289 +#: ../svnlook/svnlook.c:1299 #, c-format msgid "Transaction '%s' is not based on a revision; how odd" -msgstr "äºå¡â%sâ并éåºäºæ个çæ¬ï¼å¤ç¥ç§åï¼" +msgstr "äºå¡'%s'并éåºäºæ个çæ¬ï¼å¤ç¥ç§åï¼" -#: ../svnlook/svnlook.c:1432 +#: ../svnlook/svnlook.c:1442 #, c-format msgid "'%s' is a URL, probably should be a path" -msgstr "â%sâæ¯ URLï¼ä¹è®¸åºè¯¥æ¯è·¯å¾ã" +msgstr "'%s'æ¯ URLï¼ä¹è®¸åºè¯¥æ¯è·¯å¾ã" -#: ../svnlook/svnlook.c:1455 ../svnlook/svnlook.c:1478 +#: ../svnlook/svnlook.c:1465 ../svnlook/svnlook.c:1488 #, c-format msgid "Path '%s' is not a file" -msgstr "è·¯å¾â%sâä¸æ¯æ件" +msgstr "è·¯å¾'%s'ä¸æ¯æ件" -#: ../svnlook/svnlook.c:1614 +#: ../svnlook/svnlook.c:1622 msgid "History item limit reached" msgstr "è¾¾å°åå²é¡¹ç®éå¶" -#: ../svnlook/svnlook.c:1633 +#: ../svnlook/svnlook.c:1641 #, c-format msgid "" "REVISION PATH <ID>\n" @@ -15457,7 +21257,7 @@ msgstr "" "ä¿® 订 ç è·¯å¾ <ID>\n" "-------- ---------\n" -#: ../svnlook/svnlook.c:1638 +#: ../svnlook/svnlook.c:1646 #, c-format msgid "" "REVISION PATH\n" @@ -15466,42 +21266,41 @@ msgstr "" "ä¿® 订 ç è·¯å¾\n" "-------- ----\n" -#: ../svnlook/svnlook.c:1711 +#: ../svnlook/svnlook.c:1719 #, c-format msgid "Property '%s' not found on revision %ld" -msgstr "å±æ§â%sâå¨çæ¬ %ld ä¸æ¾ä¸å°" +msgstr "å±æ§'%s'å¨çæ¬ %ld ä¸æ¾ä¸å°" -#: ../svnlook/svnlook.c:1715 -#, fuzzy, c-format +#: ../svnlook/svnlook.c:1723 +#, c-format msgid "Property '%s' not found on transaction %s" -msgstr "å±æ§â%sâå¨çæ¬ %ld ä¸æ¾ä¸å°" +msgstr "äºå¡ %s ä¸æªæ¾å°å±æ§ '%s'" -#: ../svnlook/svnlook.c:1724 -#, fuzzy, c-format +#: ../svnlook/svnlook.c:1732 +#, c-format msgid "Property '%s' not found on path '%s' or inherited from a parent in revision %ld" -msgstr "å±æ§ â%sâ ä¸å¨è·¯å¾ â%sâ ççæ¬ %ld ä¸" +msgstr "å±æ§ '%s' å¨è·¯å¾ '%s' ä¸æªæ¾å°ï¼ä¹æªä»çæ¬ %ld çç¶çº§ç»§æ¿" -#: ../svnlook/svnlook.c:1730 +#: ../svnlook/svnlook.c:1738 #, c-format msgid "Property '%s' not found on path '%s' in revision %ld" -msgstr "å±æ§ â%sâ ä¸å¨è·¯å¾ â%sâ ççæ¬ %ld ä¸" +msgstr "å±æ§ '%s' ä¸å¨è·¯å¾ '%s' ççæ¬ %ld ä¸" -#: ../svnlook/svnlook.c:1738 -#, fuzzy, c-format +#: ../svnlook/svnlook.c:1746 +#, c-format msgid "Property '%s' not found on path '%s' or inherited from a parent in transaction %s" -msgstr "å±æ§ â%sâ ä¸å¨è·¯å¾ â%sâ ä¸ï¼äºå¡ â%sâ" +msgstr "äºå¡ %s ä¸è·¯å¾ '%s' ä¸æªæ¾å°å±æ§ '%s'ï¼ä¹æªä»ç¶çº§ç»§æ¿" -#: ../svnlook/svnlook.c:1744 +#: ../svnlook/svnlook.c:1752 #, c-format msgid "Property '%s' not found on path '%s' in transaction %s" -msgstr "å±æ§ â%sâ ä¸å¨è·¯å¾ â%sâ ä¸ï¼äºå¡ â%sâ" +msgstr "å±æ§ '%s' ä¸å¨è·¯å¾ '%s' ä¸ï¼äºå¡ '%s'" -#: ../svnlook/svnlook.c:2080 +#: ../svnlook/svnlook.c:2089 msgid "Missing repository path argument" msgstr "æªæä¾çæ¬åºè·¯å¾åæ°" -#: ../svnlook/svnlook.c:2232 -#, fuzzy +#: ../svnlook/svnlook.c:2241 msgid "" "general usage: svnlook SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n" "Subversion repository inspection tool.\n" @@ -15514,14 +21313,15 @@ msgid "" "Available subcommands:\n" msgstr "" "ä¸è¬ç¨æ³: svnlook SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n" -"注æ: ä»»ä½æ¥å â--revisionâä¸ â--transactionâé项çåå½ä»¤ï¼å¨æ²¡æ\n" -" æå®ä¸¤è å ¶ä¸çæ åµä¸ä¼ç´æ¥ä½ç¨å¨çæ¬åºææ°ççæ¬ä¸ã\n" -"使ç¨âsvnlook help <subcommand>âå¾å°åå½ä»¤ç帮å©ä¿¡æ¯ã\n" -"使ç¨âsvnlook --versionâæ¥çç¨åºççæ¬å·åæ件系ç»æ¨¡åã\n" +"Subversion çæ¬åºæ£æ¥å·¥å ·ã\n" +"è¾å ¥ 'svnlook help <subcommand>' å¾å°å ³äºæ个åå½ä»¤ç帮å©ã\n" +"è¾å ¥ 'svnlook --version' æ¥çç¨åºçæ¬åæ件系ç»æ¨¡åã\n" +"注æ: ä»»ä½æ¥å '--revision' å '--transaction' é项çåå½ä»¤ï¼\n" +" å¦æè°ç¨æ¶æªç»åºè¿ä¸¤ä¸ªé项ä¹ä¸ï¼å°ä½ç¨äºçæ¬åºçææ°çæ¬ã\n" "\n" -"å¯ç¨çåå½ä»¤: \n" +"å¯ç¨çåå½ä»¤:\n" -#: ../svnlook/svnlook.c:2311 +#: ../svnlook/svnlook.c:2320 #, c-format msgid "" "Comment (%i line):\n" @@ -15533,66 +21333,62 @@ msgstr[0] "" "注é (%i è¡): \n" "%s\n" -#: ../svnlook/svnlook.c:2363 +#: ../svnlook/svnlook.c:2372 #, c-format msgid "Missing propname argument" msgstr "丢失å±æ§ååæ°" -#: ../svnlook/svnlook.c:2364 +#: ../svnlook/svnlook.c:2373 #, c-format msgid "Missing propname and repository path arguments" msgstr "æªæä¾å±æ§å称ä¸çæ¬åºè·¯å¾åæ°" -#: ../svnlook/svnlook.c:2370 +#: ../svnlook/svnlook.c:2379 msgid "Missing propname or repository path argument" msgstr "æªæä¾å±æ§å称æçæ¬åºè·¯å¾åæ°" -#: ../svnlook/svnlook.c:2523 -msgid "Invalid revision number supplied" -msgstr "æä¾äºæ æççæ¬å·ç " - -#: ../svnlook/svnlook.c:2637 +#: ../svnlook/svnlook.c:2655 msgid "The '--transaction' (-t) and '--revision' (-r) arguments cannot co-exist" -msgstr "â--transactionâ (-t) ä¸ â--revisionâ (-r) åæ°ä¸è½åæ¶åå¨" +msgstr "'--transaction' (-t) ä¸ '--revision' (-r) åæ°ä¸è½åæ¶åå¨" -#: ../svnlook/svnlook.c:2644 +#: ../svnlook/svnlook.c:2662 msgid "Cannot use the '--show-inherited-props' option with the '--revprop' option" -msgstr "" +msgstr "ä¸è½å° '--show-inherited-props' éé¡¹ä¸ '--revprop' é项ä¸èµ·ä½¿ç¨" -#: ../svnlook/svnlook.c:2701 -#, fuzzy, c-format +#: ../svnlook/svnlook.c:2719 +#, c-format msgid "Try 'svnadmin verify' instead.\n" -msgstr "å°è¯ âsvn revert --depth infinityâï¼" +msgstr "请å°è¯ 'svnadmin verify'ã\n" -#: ../svnlook/svnlook.c:2734 +#: ../svnlook/svnlook.c:2752 #, c-format msgid "Repository argument required\n" msgstr "éè¦çæ¬åºåæ°\n" -#: ../svnlook/svnlook.c:2743 +#: ../svnlook/svnlook.c:2761 #, c-format msgid "'%s' is a URL when it should be a path\n" -msgstr "â%sâåºè¯¥æ¯è·¯å¾ï¼å´æ¯URL\n" +msgstr "'%s'åºè¯¥æ¯è·¯å¾ï¼å´æ¯URL\n" -#: ../svnlook/svnlook.c:2793 +#: ../svnlook/svnlook.c:2811 #, c-format msgid "" "Subcommand '%s' doesn't accept option '%s'\n" "Type 'svnlook help %s' for usage.\n" msgstr "" -"åå½ä»¤â%sâ并ä¸æ¥åé项â%sâ\n" -"使ç¨âsvnlook help %sâå¾å°ç¨æ³ã\n" +"åå½ä»¤'%s'并ä¸æ¥åé项'%s'\n" +"使ç¨'svnlook help %s'å¾å°ç¨æ³ã\n" -#: ../svnlook/svnlook.c:2836 +#: ../svnlook/svnlook.c:2842 msgid "Try 'svnlook help' for more info" -msgstr "请使ç¨âsvnlook helpâ以å¾å°æ´å¤ä¿¡æ¯" +msgstr "请使ç¨'svnlook help'以å¾å°æ´å¤ä¿¡æ¯" -#: ../svnmucc/svnmucc.c:258 -#, fuzzy, c-format +#: ../svnmucc/svnmucc.c:302 +#, c-format msgid "Type 'svnmucc --help' for usage.\n" -msgstr "使ç¨â%s --helpâå¾å°ç¨æ³ã\n" +msgstr "è¾å ¥ 'svnmucc --help' è·åç¨æ³ã\n" -#: ../svnmucc/svnmucc.c:266 +#: ../svnmucc/svnmucc.c:310 msgid "" "usage: svnmucc ACTION...\n" "Subversion multiple URL command client.\n" @@ -15607,7 +21403,9 @@ msgid "" " mv SRC-URL DST-URL : move SRC-URL to DST-URL\n" " rm URL : delete URL\n" " put SRC-FILE URL : add or modify file URL with contents copied from\n" -" SRC-FILE (use \"-\" to read from standard input)\n" +" SRC-FILE (to read from standard input, use \"--\"\n" +" to stop option processing followed by \"-\" to\n" +" indicate standard input)\n" " propset NAME VALUE URL : set property NAME on URL to VALUE\n" " propsetf NAME FILE URL : set property NAME on URL to value read from FILE\n" " propdel NAME URL : delete property NAME from URL\n" @@ -15618,6 +21416,7 @@ msgid "" " -F [--file] ARG : read log message from file ARG\n" " -u [--username] ARG : commit the changes as username ARG\n" " -p [--password] ARG : use ARG as the password\n" +" --password-from-stdin : read password from stdin\n" " -U [--root-url] ARG : interpret all action URLs relative to ARG\n" " -r [--revision] ARG : use revision ARG as baseline for changes\n" " --with-revprop ARG : set revision property in the following format:\n" @@ -15626,18 +21425,16 @@ msgid "" " prompt only if standard input is a terminal)\n" " --force-interactive : do interactive prompting even if standard\n" " input is not a terminal\n" -" --trust-server-cert : deprecated; same as --trust-unknown-ca\n" -" --trust-unknown-ca : with --non-interactive, accept SSL server\n" -" certificates from unknown certificate authorities\n" -" --trust-cn-mismatch : with --non-interactive, accept SSL server\n" -" certificates even if the server hostname does not\n" -" match the certificate's common name attribute\n" -" --trust-expired : with --non-interactive, accept expired SSL server\n" -" certificates\n" -" --trust-not-yet-valid : with --non-interactive, accept SSL server\n" -" certificates from the future\n" -" --trust-other-failure : with --non-interactive, accept SSL server\n" -" certificates with failures other than the above\n" +" --trust-server-cert : deprecated;\n" +" same as --trust-server-cert-failures=unknown-ca\n" +" --trust-server-cert-failures ARG\n" +" with --non-interactive, accept SSL server\n" +" certificates with failures; ARG is comma-separated\n" +" list of 'unknown-ca' (Unknown Authority),\n" +" 'cn-mismatch' (Hostname mismatch), 'expired'\n" +" (Expired certificate),'not-yet-valid' (Not yet\n" +" valid certificate) and 'other' (all other not\n" +" separately classified certificate errors).\n" " -X [--extra-args] ARG : append arguments from file ARG (one per line;\n" " use \"-\" to read from standard input)\n" " --config-dir ARG : use ARG to override the config directory\n" @@ -15645,74 +21442,127 @@ msgid "" " --no-auth-cache : do not cache authentication tokens\n" " --version : print version information\n" msgstr "" +"ç¨æ³: svnmucc ACTION...\n" +"Subversion å¤ URL å½ä»¤å®¢æ·ç«¯ã\n" +"ä½¿ç¨ 'svnmucc --version' æ¥çç¨åºçæ¬å RA 模åã\n" +"\n" +" æ§è¡ä¸ä¸ªæå¤ä¸ªåºäº Subversion çæ¬åº URL ç ACTIONï¼å¹¶å°ç»æä½ä¸º\n" +" (å个)æ°çæ¬æ交ã\n" +"\n" +"å¨ä½:\n" +" cp REV SRC-URL DST-URL : å¤å¶ SRC-URL@REV å° DST-URL\n" +" mkdir URL : å建æ°ç®å½ URL\n" +" mv SRC-URL DST-URL : ç§»å¨ SRC-URL å° DST-URL\n" +" rm URL : å é¤ URL\n" +" put SRC-FILE URL : æ·»å æä¿®æ¹æ件 URLï¼å å®¹ä» SRC-FILE å¤å¶\n" +" (è¦ä»æ åè¾å ¥è¯»åï¼ç¨ \"--\" åæ¢é项å¤çï¼\n" +" åç¨ \"-\" 表示æ åè¾å ¥)\n" +" propset NAME VALUE URL : å° URL ä¸çå±æ§ NAME 设为 VALUE\n" +" propsetf NAME FILE URL : å° URL ä¸çå±æ§ NAME è®¾ä¸ºä» FILE 读åçå¼\n" +" propdel NAME URL : å é¤ URL ä¸çå±æ§ NAME\n" +"\n" +"ææé项:\n" +" -h, -? [--help] : æ¾ç¤ºæ¤ææ¬\n" +" -m [--message] ARG : ç¨ ARG ä½ä¸ºæ¥å¿æ¶æ¯\n" +" -F [--file] ARG : ä»æ件 ARG 读åæ¥å¿æ¶æ¯\n" +" -u [--username] ARG : 以ç¨æ·å ARG æ交修æ¹\n" +" -p [--password] ARG : ç¨ ARG ä½ä¸ºå¯ç \n" +" --password-from-stdin : ä»æ åè¾å ¥è¯»åå¯ç \n" +" -U [--root-url] ARG : ææå¨ä½ URL é½ç¸å¯¹äº ARG 解é\n" +" -r [--revision] ARG : ç¨çæ¬ ARG ä½ä¸ºä¿®æ¹çåºçº¿\n" +" --with-revprop ARG : æ以ä¸æ ¼å¼è®¾ç½®çæ¬å±æ§:\n" +" NAME[=VALUE]\n" +" --non-interactive : ä¸è¿è¡äº¤äºå¼æ示(é»è®¤ä» å½æ åè¾å ¥æ¯\n" +" ç»ç«¯æ¶ææ示)\n" +" --force-interactive : å³ä½¿æ åè¾å ¥ä¸æ¯ç»ç«¯ä¹è¿è¡äº¤äºå¼æ示\n" +" --trust-server-cert : å·²åºå¼;\n" +" å --trust-server-cert-failures=unknown-ca\n" +" --trust-server-cert-failures ARG\n" +" é å --non-interactiveï¼æ¥åæé®é¢ç SSL\n" +" æå¡å¨è¯ä¹¦; ARG æ¯éå·åéçå表ï¼å å«\n" +" 'unknown-ca' (æªç¥é¢åæºæ)ã'cn-mismatch'\n" +" (主æºåä¸å¹é )ã'expired' (è¯ä¹¦è¿æ)ã\n" +" 'not-yet-valid' (è¯ä¹¦å°æªçæ) å 'other'\n" +" (å ¶ä»æªåç¬åç±»çè¯ä¹¦é误)ã\n" +" -X [--extra-args] ARG : ä»æ件 ARG 追å åæ°(æ¯è¡ä¸ä¸ª;\n" +" ç¨ \"-\" ä»æ åè¾å ¥è¯»å)\n" +" --config-dir ARG : ç¨ ARG è¦çé ç½®ç®å½\n" +" --config-option ARG : ç¨ ARG è¦çæ个é ç½®é项\n" +" --no-auth-cache : ä¸ç¼å认è¯ä»¤ç\n" +" --version : æå°çæ¬ä¿¡æ¯\n" -#: ../svnmucc/svnmucc.c:349 -#, fuzzy +#: ../svnmucc/svnmucc.c:394 msgid "--message (-m), --file (-F), and --with-revprop=svn:log are mutually exclusive" -msgstr "--message (-m) ä¸ --file (-F) æ¯äºæ¥ç" +msgstr "--message (-m)ã--file (-F) å --with-revprop=svn:log äºæ¥" -#: ../svnmucc/svnmucc.c:590 -#, fuzzy, c-format -msgid "Invalid revision number '%s'" -msgstr "æ æççæ¬å·â%ldâ" +#: ../svnrdump/load_editor.c:717 +msgid "This dumpstream reader requires a delta format dumpstream" +msgstr "æ¤è½¬å¨æµè¯»åå¨éè¦å¢éæ ¼å¼ç转å¨æµ" -#: ../svnrdump/load_editor.c:386 ../svnsync/svnsync.c:362 +#: ../svnrdump/load_editor.c:1368 ../svnsync/svnsync.c:358 #, c-format msgid "Failed to get lock on destination repos, currently held by '%s'\n" -msgstr "ä»ç®æ çæ¬åºè·å¾é失败ï¼å½å被â%sâææ\n" +msgstr "ä»ç®æ çæ¬åºè·å¾é失败ï¼å½å被'%s'ææ\n" -#: ../svnrdump/load_editor.c:530 +#: ../svnrdump/load_editor.c:1399 msgid "Target server does not support atomic revision property edits; consider upgrading it to 1.7." msgstr "ç®æ æå¡å¨ä¸æ¯æååçæ¬çå±æ§ç¼è¾; 请èèåçº§å° 1.7 ã" -#: ../svnrdump/svnrdump.c:112 +#: ../svnrdump/svnrdump.c:87 msgid "" "usage: svnrdump dump URL [-r LOWER[:UPPER]]\n" "\n" +msgstr "" +"ç¨æ³: svnrdump dump URL [-r LOWER[:UPPER]]\n" +"\n" + +#: ../svnrdump/svnrdump.c:89 +msgid "" "Dump revisions LOWER to UPPER of repository at remote URL to stdout\n" "in a 'dumpfile' portable format. If only LOWER is given, dump that\n" "one revision.\n" msgstr "" -"ç¨æ³: svnrdump dump URL [-r LOWER[:UPPER]]\n" -"\n" -"以å¯ç§»æ¤ç 'dumpfile' æ ¼å¼å¯¼åºè¿ç¨çæ¬åº URL ä¸ç LOWER å° UPPER çææçæ¬å°æ åè¾åºã\n" -"å¦æåªç»åº LOWERï¼é£ä¹å°±å¯¼åºè¿ä¸ä¸ªçæ¬ã\n" +"å°è¿ç¨ URL å¤çæ¬åºç LOWER å° UPPER çæ¬ä»¥'转å¨æ件'å¯ç§»æ¤\n" +"æ ¼å¼è½¬å¨å°æ åè¾åºãå¦æåªç»åº LOWERï¼ååªè½¬å¨è¯¥çæ¬ã\n" -#: ../svnrdump/svnrdump.c:118 +#: ../svnrdump/svnrdump.c:96 msgid "" "usage: svnrdump load URL\n" "\n" -"Load a 'dumpfile' given on stdin to a repository at remote URL.\n" msgstr "" "ç¨æ³: svnrdump load URL\n" "\n" -"ä»æ åè¾å ¥å è½½ 'dumpfile' å°è¿ç¨çæ¬åº URLã\n" -#: ../svnrdump/svnrdump.c:122 +#: ../svnrdump/svnrdump.c:98 +msgid "Load a 'dumpfile' given on stdin to a repository at remote URL.\n" +msgstr "å°æ åè¾å ¥ä¸ç»å®ç'转å¨æ件'å è½½å°è¿ç¨ URL å¤ççæ¬åºã\n" + +#: ../svnrdump/svnrdump.c:103 msgid "" "usage: svnrdump help [SUBCOMMAND...]\n" "\n" -"Describe the usage of this program or its subcommands.\n" msgstr "" "ç¨æ³: svnrdump help [SUBCOMMAND...]\n" "\n" -"æ¾ç¤ºæ¬ç¨åºæå ¶åå½ä»¤çç¨æ³ã\n" -#: ../svnrdump/svnrdump.c:135 +#: ../svnrdump/svnrdump.c:118 msgid "dump incrementally" msgstr "以å¢éæ¹å¼è¿è¡è½¬å" -#: ../svnrdump/svnrdump.c:137 +#: ../svnrdump/svnrdump.c:120 msgid "skip revision property ARG (e.g., \"svn:author\")" -msgstr "" +msgstr "è·³è¿çæ¬å±æ§ ARG (ä¾å¦ \"svn:author\")" -#: ../svnrdump/svnrdump.c:155 ../svnserve/svnserve.c:370 -#: ../svnversion/svnversion.c:142 +#: ../svnrdump/svnrdump.c:140 ../svnserve/svnserve.c:415 +#: ../svnversion/svnversion.c:145 msgid "display this help" msgstr "æ¾ç¤ºæ¬å¸®å©" -#: ../svnrdump/svnrdump.c:755 -#, fuzzy +#: ../svnrdump/svnrdump.c:170 +msgid "read/write file ARG instead of stdin/stdout" +msgstr "读/åæ件 ARG èä¸æ¯æ åè¾å ¥/è¾åº" + +#: ../svnrdump/svnrdump.c:677 msgid "" "general usage: svnrdump SUBCOMMAND URL [-r LOWER[:UPPER]]\n" "Subversion remote repository dump and load tool.\n" @@ -15722,153 +21572,161 @@ msgid "" "Available subcommands:\n" msgstr "" "ä¸è¬ç¨æ³: svnrdump SUBCOMMAND URL [-r LOWER[:UPPER]]\n" -"ä½¿ç¨ âsvnrdump help <subcommand>â å¾å°åå½ä»¤ç帮å©ä¿¡æ¯ã\n" -"ä½¿ç¨ âsvnrdump --versionâ å¯çç¨åºççæ¬å·åçæ¬åºè®¿é®æ¨¡åã\n" +"Subversion è¿ç¨çæ¬åºè½¬å¨åè£ è½½å·¥å ·ã\n" +"è¾å ¥ 'svnrdump help <subcommand>' å¾å°å ³äºæ个åå½ä»¤ç帮å©ã\n" +"è¾å ¥ 'svnrdump --version' æ¥çç¨åºçæ¬åçæ¬åºè®¿é®æ¨¡åã\n" "\n" -"å¯ç¨çåå½ä»¤: \n" +"å¯ç¨çåå½ä»¤:\n" -#: ../svnrdump/svnrdump.c:800 ../svnrdump/svnrdump.c:834 +#: ../svnrdump/svnrdump.c:722 ../svnrdump/svnrdump.c:756 msgid "Unsupported revision specifier used; use only integer values or 'HEAD'" msgstr "使ç¨äºä¸æ¯æççæ¬æ ¼å¼ï¼è¯·åªä½¿ç¨ 'HEAD' ææ´æ°" -#: ../svnrdump/svnrdump.c:808 ../svnrdump/svnrdump.c:842 +#: ../svnrdump/svnrdump.c:730 ../svnrdump/svnrdump.c:764 #, c-format msgid "Revision '%ld' does not exist" msgstr "çæ¬ '%ld' ä¸åå¨" -#: ../svnrdump/svnrdump.c:852 +#: ../svnrdump/svnrdump.c:774 msgid "LOWER revision cannot be greater than UPPER revision; consider reversing your revision range" msgstr "LOWER çæ¬å·ä¸è½å¤§äº UPPER çæ¬å·ï¼èèå°ä½ ççæ¬èå´ç¿»è½¬" -#: ../svnrdump/svnrdump.c:1111 +#: ../svnrdump/svnrdump.c:1027 #, c-format msgid "" "Subcommand '%s' doesn't accept option '%s'\n" "Type 'svnrdump help %s' for usage.\n" msgstr "" -"åå½ä»¤â%sâä¸æ¥åé项â%sâ\n" -"è¾å ¥âsvnrdump help %sâå¾å°ç¨æ³ã\n" +"åå½ä»¤'%s'ä¸æ¥åé项'%s'\n" +"è¾å ¥'svnrdump help %s'å¾å°ç¨æ³ã\n" + +#: ../svnrdump/svnrdump.c:1070 +msgid "load subcommand with --password-from-stdin requires -F" +msgstr "带 --password-from-stdin ç load åå½ä»¤éè¦ -F" -#: ../svnserve/cyrus_auth.c:119 +#: ../svnserve/cyrus_auth.c:122 msgid "Could not initialize the SASL library" msgstr "ä¸è½åå§å SASL åº" -#: ../svnserve/cyrus_auth.c:191 -#, fuzzy, c-format +#: ../svnserve/cyrus_auth.c:194 +#, c-format msgid "Initial token is too long" -msgstr "ååçå称太é¿" +msgstr "åå§æ 记太é¿" -#: ../svnserve/cyrus_auth.c:222 -#, fuzzy, c-format +#: ../svnserve/cyrus_auth.c:226 +#, c-format msgid "Step response is too long" -msgstr "ååçå称太é¿" +msgstr "æ¥éª¤ååºå¤ªé¿" -#: ../svnserve/cyrus_auth.c:272 +#: ../svnserve/cyrus_auth.c:277 #, c-format msgid "Can't get hostname" msgstr "æ æ³è·å主æºå称" -#: ../svnserve/cyrus_auth.c:329 +#: ../svnserve/cyrus_auth.c:335 msgid "Could not obtain the list of SASL mechanisms" msgstr "ä¸è½è·å¾SASLæºå¶å表" -#: ../svnserve/cyrus_auth.c:372 +#: ../svnserve/cyrus_auth.c:378 msgid "Couldn't obtain the authenticated username" msgstr "ä¸è½è·å¾å·²ç»è®¤è¯çç¨æ·å称" -#: ../svnserve/serve.c:2079 +#: ../svnserve/serve.c:2272 msgid "Path is not a string" msgstr "è·¯å¾ä¸æ¯å符串" -#: ../svnserve/serve.c:2249 +#: ../svnserve/serve.c:2479 msgid "Log revprop entry not a string" msgstr "æ¥å¿ revprop å ¥å£ä¸æ¯å符串" -#: ../svnserve/serve.c:2255 +#: ../svnserve/serve.c:2485 #, c-format msgid "Unknown revprop word '%s' in log command" -msgstr "æ¥å¿å½ä»¤ä¸ææªç¥ç revprop åè¯ â%sâ" +msgstr "æ¥å¿å½ä»¤ä¸ææªç¥ç revprop åè¯ '%s'" -#: ../svnserve/serve.c:2271 +#: ../svnserve/serve.c:2501 msgid "Log path entry not a string" msgstr "æ¥å¿è·¯å¾å ¥å£ä¸æ¯å符串" -#: ../svnserve/serve.c:2871 ../svnserve/serve.c:3047 -#, fuzzy, c-format +#: ../svnserve/serve.c:3156 ../svnserve/serve.c:3339 +#, c-format msgid "No result for '%s'." -msgstr "'%s' çæ°æ®æå" +msgstr "'%s' 没æç»æã" + +#: ../svnserve/serve.c:3997 +#, c-format +msgid "SASL requested but not compiled in; set '%s' to 'false' or recompile svnserve with SASL support" +msgstr "请æ±äº SASL ä½æªç¼è¯æ¯æï¼å° '%s' 设为 'false' æéæ°ç¼è¯å¸¦ SASL æ¯æç svnserve" -#: ../svnserve/svnserve.c:216 +#: ../svnserve/svnserve.c:241 msgid "daemon mode" msgstr "åå°æ¨¡å¼" -#: ../svnserve/svnserve.c:217 +#: ../svnserve/svnserve.c:242 msgid "inetd mode" msgstr "inetd 模å¼" -#: ../svnserve/svnserve.c:218 +#: ../svnserve/svnserve.c:243 msgid "tunnel mode" msgstr "é§é模å¼" -#: ../svnserve/svnserve.c:219 +#: ../svnserve/svnserve.c:244 msgid "listen-once mode (useful for debugging)" msgstr "çå¬ä¸æ¬¡æ¹å¼(è°è¯ç¨)" -#: ../svnserve/svnserve.c:222 +#: ../svnserve/svnserve.c:247 msgid "Windows service mode (Service Control Manager)" msgstr "Windows æå¡æ¹å¼(æå¡ç®¡çå¨)" -#: ../svnserve/svnserve.c:224 +#: ../svnserve/svnserve.c:249 msgid "root of directory to serve" msgstr "æå¡çæ ¹ç®å½" -#: ../svnserve/svnserve.c:226 +#: ../svnserve/svnserve.c:251 msgid "force read only, overriding repository config file" msgstr "强å¶åªè¯»ï¼è¦ççæ¬åºé ç½®æ件" -#: ../svnserve/svnserve.c:228 +#: ../svnserve/svnserve.c:253 msgid "read configuration from file ARG" msgstr "ä»æ件 ARG 读åé ç½®" -#: ../svnserve/svnserve.c:231 -#, fuzzy +#: ../svnserve/svnserve.c:256 msgid "" "listen port. The default port is 3690.\n" " [mode: daemon, service, listen-once]" msgstr "" -"åè¿ç¨ PID å°æ件 ARG\n" -" [æ¹å¼: daemon, listen-once]" +"çå¬ç«¯å£ãé»è®¤ç«¯å£ä¸º 3690ã\n" +" [模å¼: daemonãserviceãlisten-once]" -#: ../svnserve/svnserve.c:235 -#, fuzzy +#: ../svnserve/svnserve.c:260 msgid "" "listen port. The default port is 3690.\n" " [mode: daemon, listen-once]" msgstr "" -"åè¿ç¨ PID å°æ件 ARG\n" -" [æ¹å¼: daemon, listen-once]" +"çå¬ç«¯å£ãé»è®¤ç«¯å£ä¸º 3690ã\n" +" [模å¼: daemonãlisten-once]" -#: ../svnserve/svnserve.c:241 -#, fuzzy +#: ../svnserve/svnserve.c:266 msgid "" "listen hostname or IP address\n" " By default svnserve listens on all addresses.\n" " [mode: daemon, service, listen-once]" msgstr "" -"çå¬ä¸»æºå称æIPå°å\n" -" [æ¹å¼: daemon, service, listen-once]" +"çå¬ç主æºåæ IP å°å\n" +" é»è®¤ svnserve çå¬ææå°åã\n" +" [模å¼: daemon, service, listen-once]" -#: ../svnserve/svnserve.c:247 -#, fuzzy +#: ../svnserve/svnserve.c:272 msgid "" "listen hostname or IP address\n" " By default svnserve listens on all addresses.\n" " [mode: daemon, listen-once]" msgstr "" -"çå¬ä¸»æºå称æIPå°å\n" -" [æ¹å¼: daemon, listen-once]" +"çå¬ç主æºåæ IP å°å\n" +" é»è®¤ svnserve çå¬ææå°åã\n" +" [模å¼: daemon, listen-once]" -#: ../svnserve/svnserve.c:254 +#: ../svnserve/svnserve.c:279 msgid "" "prefer IPv6 when resolving the listen hostname\n" " [IPv4 is preferred by default. Using IPv4 and IPv6\n" @@ -15879,7 +21737,7 @@ msgstr "" " [é»è®¤é¦é IPv4ãä¸æ¯æå¨å®æ¤è¿ç¨æ¨¡å¼ä¸åæ¶ä½¿ç¨ IPv4\n" " å IPv6ãå¦æéè¦ï¼è¯·ä½¿ç¨ inetd 模å¼æé§é模å¼ã]" -#: ../svnserve/svnserve.c:262 +#: ../svnserve/svnserve.c:287 msgid "" "compression level to use for network transmissions\n" " [0 .. no compression, 5 .. default, \n" @@ -15889,120 +21747,141 @@ msgstr "" " [0 .. ä¸å缩, 5 .. é»è®¤, \n" " 9 .. æ大å缩]" -#: ../svnserve/svnserve.c:268 -#, fuzzy +#: ../svnserve/svnserve.c:293 msgid "" "size of the extra in-memory cache in MB used to\n" " minimize redundant operations.\n" " Default is 16.\n" +" 0 switches to dynamically sized caches.\n" " [used for FSFS and FSX repositories only]" msgstr "" -"ç¨æ¥åå°åä½æä½çå åä¸çé¢å¤ç¼åç大å°(MB)\n" -" é»è®¤å¼: 16ã\n" -" [ä» ç¨äº FSFS ä»åº]" +"ç¨äºåå°åä½æä½çé¢å¤å åç¼å大å°(MB)ã\n" +" é»è®¤ä¸º 16ã\n" +" 0 表示æ¹ç¨å¨æ大å°çç¼åã\n" +" [ä» ç¨äº FSFS å FSX çæ¬åº]" -#: ../svnserve/svnserve.c:276 -#, fuzzy +#: ../svnserve/svnserve.c:303 msgid "" "enable or disable caching of deltas between older\n" " revisions.\n" " Default is yes.\n" " [used for FSFS and FSX repositories only]" msgstr "" -"æ¯å¦å¯¹æ§çæ¬ä¹é´çå·®å¼å¯ç¨ç¼å\n" -" é»è®¤å¼: å¦ã\n" -" [ä» ç¨äº FSFS ä»åº]" +"å¯ç¨æç¦ç¨è¾èçæ¬ä¹é´å¢éçç¼åã\n" +" é»è®¤ä¸º yesã\n" +" [ä» ç¨äº FSFS å FSX çæ¬åº]" -#: ../svnserve/svnserve.c:284 -#, fuzzy +#: ../svnserve/svnserve.c:311 msgid "" "enable or disable caching of file contents\n" " Default is yes.\n" " [used for FSFS and FSX repositories only]" msgstr "" -"æ¯å¦å¯¹æ件å 容å¯ç¨ç¼å\n" -" é»è®¤å¼: æ¯ã\n" -" [ä» ç¨äº FSFS ä»åº]" +"å¯ç¨æç¦ç¨æ件å 容çç¼å\n" +" é»è®¤ä¸º yesã\n" +" [" -#: ../svnserve/svnserve.c:290 -#, fuzzy +#: ../svnserve/svnserve.c:317 msgid "" "enable or disable caching of revision properties.\n" " Consult the documentation before activating this.\n" " Default is no.\n" " [used for FSFS and FSX repositories only]" msgstr "" -"æ¯å¦å¯¹æ§çæ¬ä¹é´çå·®å¼å¯ç¨ç¼å\n" -" é»è®¤å¼: å¦ã\n" -" [ä» ç¨äº FSFS ä»åº]" +"å¯ç¨æç¦ç¨çæ¬å±æ§çç¼åã\n" +" å¯ç¨å请å æ¥é ææ¡£ã\n" +" é»è®¤ä¸º noã\n" +" [ä» ç¨äº FSFS å FSX çæ¬åº]" + +#: ../svnserve/svnserve.c:325 +msgid "" +"enable or disable caching of node properties\n" +" Default is yes.\n" +" [used for FSFS repositories only]" +msgstr "" +"å¯ç¨æç¦ç¨èç¹å±æ§çç¼å\n" +" é»è®¤ä¸º yesã\n" +" [ä» ç¨äº FSFS çæ¬åº]" -#: ../svnserve/svnserve.c:298 -#, fuzzy +#: ../svnserve/svnserve.c:331 msgid "" "Optimize network handling based on the assumption\n" " that most clients are connected with a bitrate of\n" " ARG Mbit/s.\n" " Default is 0 (optimizations disabled)." msgstr "" -"æ¯å¦å¯¹æ§çæ¬ä¹é´çå·®å¼å¯ç¨ç¼å\n" -" é»è®¤å¼: å¦ã\n" -" [ä» ç¨äº FSFS ä»åº]" +"å设大å¤æ°å®¢æ·ç«¯ä»¥ ARG Mbit/s çæ¯ç¹çè¿æ¥ï¼\n" +" æ®æ¤ä¼åç½ç»å¤çã\n" +" é»è®¤ä¸º 0 (ç¦ç¨ä¼å)ã" -#: ../svnserve/svnserve.c:306 -#, fuzzy +#: ../svnserve/svnserve.c:339 msgid "" "Parse and cache all data found in block instead\n" " of just the requested item.\n" " Default is no.\n" " [used for FSFS repositories in 1.9 format only]" msgstr "" -"æ¯å¦å¯¹æ§çæ¬ä¹é´çå·®å¼å¯ç¨ç¼å\n" -" é»è®¤å¼: å¦ã\n" -" [ä» ç¨äº FSFS ä»åº]" +"解æ并ç¼ååä¸çæææ°æ®ï¼èä¸åªæ¯\n" +" 请æ±ç项ã\n" +" é»è®¤ä¸º noã\n" +" [ä» ç¨äº 1.9 æ ¼å¼ç FSFS çæ¬åº]" #. ### Making the assumption here that WIN32 never has fork and so #. * ### this option never exists when --service exists. -#: ../svnserve/svnserve.c:316 +#: ../svnserve/svnserve.c:349 msgid "use threads instead of fork [mode: daemon]" msgstr "使ç¨çº¿ç¨ä»£æ¿è¿ç¨ [æ¹å¼: daemon]" -#: ../svnserve/svnserve.c:319 -#, fuzzy +#: ../svnserve/svnserve.c:354 msgid "" "Minimum number of server threads, even if idle.\n" -" Caped to max-threads; minimum value is 0.\n" -" Default is 1.\n" -" [used only with --threads]" -msgstr "" -"æ¯å¦å¯¹æ§çæ¬ä¹é´çå·®å¼å¯ç¨ç¼å\n" -" é»è®¤å¼: å¦ã\n" -" [ä» ç¨äº FSFS ä»åº]" - -#: ../svnserve/svnserve.c:328 -#, fuzzy -msgid "" -"Maximum number of server threads, even if there\n" -" are more connections. Minimum value is 1.\n" -" Default is 64.\n" -" [used only with --threads]" +" Capped to max-threads; minimum value is 0.\n" +" Default is 1." msgstr "" -"æ¯å¦å¯¹æ§çæ¬ä¹é´çå·®å¼å¯ç¨ç¼å\n" -" é»è®¤å¼: å¦ã\n" -" [ä» ç¨äº FSFS ä»åº]" +"æå¡å¨çº¿ç¨çæå°æ°éï¼å³ä½¿ç©ºé²ä¹ä¿çã\n" +" ä¸é为 max-threadsï¼æå°å¼ä¸º 0ã\n" +" é»è®¤ä¸º 1ã" -#: ../svnserve/svnserve.c:337 -#, fuzzy +#: ../svnserve/svnserve.c:361 msgid "" "Maximum number of server threads, even if there\n" " are more connections. Minimum value is 1.\n" -" Default is 256.\n" -" [used only with --threads]" +" Default is " msgstr "" -"æ¯å¦å¯¹æ§çæ¬ä¹é´çå·®å¼å¯ç¨ç¼å\n" -" é»è®¤å¼: å¦ã\n" -" [ä» ç¨äº FSFS ä»åº]" +"æå¡å¨çº¿ç¨çæ大æ°éï¼å³ä½¿ææ´å¤è¿æ¥\n" +" ä¹ä¸è¶ è¿ãæå°å¼ä¸º 1ã\n" +" é»è®¤ä¸º " + +#: ../svnserve/svnserve.c:369 +msgid "" +"Maximum acceptable size of a client request in MB.\n" +" This implicitly limits the length of paths and\n" +" property values that can be sent to the server.\n" +" Also the peak memory usage for protocol handling\n" +" per server thread or sub-process.\n" +" 0 disables the size check; default is " +msgstr "" +"客æ·ç«¯è¯·æ±å¯æ¥åçæ大大å°(MB)ã\n" +" è¿éå«éå¶äºå¯åéå°æå¡å¨çè·¯å¾å\n" +" å±æ§å¼çé¿åº¦ï¼ä¹éå¶äºæ¯ä¸ªæå¡å¨çº¿ç¨\n" +" æåè¿ç¨å¤çåè®®æ¶çå åå³°å¼ã\n" +" 0 表示ç¦ç¨å¤§å°æ£æ¥ï¼é»è®¤ä¸º " + +#: ../svnserve/svnserve.c:382 +msgid "" +"Maximum acceptable server response size in MB.\n" +" Longer responses get truncated and return an\n" +" error. This limits the server load e.g. when\n" +" checking out at the wrong path level.\n" +" Default is 0 (disabled)." +msgstr "" +"æå¡å¨ååºå¯æ¥åçæ大大å°(MB)ã\n" +" è¶ é¿çååºä¼è¢«æªæ并è¿åé误ãè¿å¯ä»¥\n" +" éå¶æå¡å¨è´è½½ï¼ä¾å¦å¨é误çè·¯å¾å±çº§\n" +" ä¸åæ£åºæ¶ã\n" +" é»è®¤ä¸º 0 (ç¦ç¨)ã" -#: ../svnserve/svnserve.c:347 +#: ../svnserve/svnserve.c:392 msgid "" "run in foreground (useful for debugging)\n" " [mode: daemon]" @@ -16010,17 +21889,19 @@ msgstr "" "å¨åå°è¿è¡(è°è¯ç¨)\n" " [æ¹å¼: daemon]" -#: ../svnserve/svnserve.c:351 +#: ../svnserve/svnserve.c:396 msgid "" "handle one connection at a time in the parent\n" " process (useful for debugging)" msgstr "" +"å¨ç¶è¿ç¨ä¸ä¸æ¬¡å¤çä¸ä¸ªè¿æ¥\n" +" (ç¨äºè°è¯)" -#: ../svnserve/svnserve.c:355 +#: ../svnserve/svnserve.c:400 msgid "svnserve log file" msgstr "svnserve æ¥å¿æ件" -#: ../svnserve/svnserve.c:358 +#: ../svnserve/svnserve.c:403 msgid "" "write server process ID to file ARG\n" " [mode: daemon, listen-once, service]" @@ -16028,7 +21909,7 @@ msgstr "" "åè¿ç¨ PID å°æ件 ARG\n" " [æ¹å¼: daemon, listen-once, service]" -#: ../svnserve/svnserve.c:362 +#: ../svnserve/svnserve.c:407 msgid "" "write server process ID to file ARG\n" " [mode: daemon, listen-once]" @@ -16036,7 +21917,7 @@ msgstr "" "åè¿ç¨ PID å°æ件 ARG\n" " [æ¹å¼: daemon, listen-once]" -#: ../svnserve/svnserve.c:367 +#: ../svnserve/svnserve.c:412 msgid "" "tunnel username (default is current uid's name)\n" " [mode: tunnel]" @@ -16044,19 +21925,20 @@ msgstr "" "é§éç¨æ·å(é»è®¤æ¯å½åUID对åºçç¨æ·å)\n" " [æ¹å¼: tunnel]" -#: ../svnserve/svnserve.c:372 +#: ../svnserve/svnserve.c:417 msgid "" "virtual host mode (look for repo in directory\n" " of provided hostname)" msgstr "" +"èæ主æºæ¨¡å¼(å¨æä¾ç主æºåç\n" +" ç®å½ä¸æ¥æ¾çæ¬åº)" -#: ../svnserve/svnserve.c:388 +#: ../svnserve/svnserve.c:433 #, c-format msgid "Type '%s --help' for usage.\n" -msgstr "使ç¨â%s --helpâå¾å°ç¨æ³ã\n" +msgstr "使ç¨'%s --help'å¾å°ç¨æ³ã\n" -#: ../svnserve/svnserve.c:397 -#, fuzzy +#: ../svnserve/svnserve.c:442 msgid "" "usage: svnserve [-d | -i | -t | -X | --service] [options]\n" "Subversion repository server.\n" @@ -16065,10 +21947,10 @@ msgid "" "Valid options:\n" msgstr "" "ç¨æ³: svnserve [-d | -i | -t | -X | --service] [options]\n" -"\n" -"ææé项: \n" +"Subversion çæ¬åºæå¡å¨ã\n" +"è¾å ¥ 'svnserve --version' æ¥ç\n" -#: ../svnserve/svnserve.c:406 +#: ../svnserve/svnserve.c:451 msgid "" "usage: svnserve [-d | -i | -t | -X] [options]\n" "Subversion repository server.\n" @@ -16076,8 +21958,11 @@ msgid "" "\n" "Valid options:\n" msgstr "" +"ç¨æ³: svnserve [-d | -i | -t | -X] [options]\n" +"Subversion çæ¬åºæå¡å¨ã\n" +"è¾å ¥ 'svnserve --version' æ¥çç¨åº\n" -#: ../svnserve/svnserve.c:436 +#: ../svnserve/svnserve.c:481 msgid "" "\n" "Cyrus SASL authentication is available.\n" @@ -16085,78 +21970,72 @@ msgstr "" "\n" "Cyrus SASL 认è¯å¯ç¨ã\n" -#: ../svnserve/svnserve.c:522 +#: ../svnserve/svnserve.c:586 #, c-format msgid "Can't accept client connection" msgstr "æ æ³æ¥å客æ·è¿æ¥" -#: ../svnserve/svnserve.c:794 +#: ../svnserve/svnserve.c:869 #, c-format msgid "Invalid port '%s'" -msgstr "æ æ端å£â%sâ" +msgstr "æ æ端å£'%s'" -#: ../svnserve/svnserve.c:830 -#, fuzzy, c-format +#: ../svnserve/svnserve.c:905 +#, c-format msgid "Root path '%s' does not exist or is not a directory" -msgstr "svnserve: æ ¹è·¯å¾â%sâä¸åå¨ï¼æè ä¸æ¯ç®å½ã\n" +msgstr "æ ¹è·¯å¾ '%s' ä¸åå¨æä¸æ¯ç®å½" -#: ../svnserve/svnserve.c:953 +#: ../svnserve/svnserve.c:1045 msgid "You must specify exactly one of -d, -i, -t, --service or -X.\n" -msgstr "æ¨å¿ é¡»æå® -d, -i, -t, --service æ -X ä¸çä¸ä¸ªã\n" +msgstr "ä½ å¿ é¡»æå® -d, -i, -t, --service æ -X ä¸çä¸ä¸ªã\n" -#: ../svnserve/svnserve.c:956 +#: ../svnserve/svnserve.c:1048 msgid "You must specify exactly one of -d, -i, -t or -X.\n" -msgstr "æ¨å¿ é¡»æå® -d, -i, -t æ -X ä¸çä¸ä¸ªã\n" +msgstr "ä½ å¿ é¡»æå® -d, -i, -t æ -X ä¸çä¸ä¸ªã\n" -#: ../svnserve/svnserve.c:967 +#: ../svnserve/svnserve.c:1059 msgid "You may only specify one of -T or --single-thread\n" -msgstr "" +msgstr "ä½ åªè½æå® -T æ --single-thread ä¹ä¸\n" -#: ../svnserve/svnserve.c:1017 -#, fuzzy +#: ../svnserve/svnserve.c:1106 msgid "Option --tunnel-user is only valid in tunnel mode" -msgstr "é项 --tunnel-user åªå¨é§é模å¼ææã\n" +msgstr "é项 --tunnel-user ä» å¨é§é模å¼ä¸ææ" -#: ../svnserve/svnserve.c:1086 +#: ../svnserve/svnserve.c:1179 #, c-format msgid "svnserve: The --service flag is only valid if the process is started by the Service Control Manager.\n" msgstr "svnserve: åªæ被æå¡æ§å¶ç®¡çå¨å¯å¨æ¶ --service é项æææã\n" -#: ../svnserve/svnserve.c:1137 +#: ../svnserve/svnserve.c:1230 #, c-format msgid "Can't get address info" msgstr "ä¸è½è·åå°åä¿¡æ¯" -#: ../svnserve/svnserve.c:1150 +#: ../svnserve/svnserve.c:1243 #, c-format msgid "Can't create server socket" msgstr "æ æ³å建æå¡å¨å¥æ¥å" -#: ../svnserve/svnserve.c:1158 +#: ../svnserve/svnserve.c:1251 #, c-format msgid "Can't set options on server socket" msgstr "ä¸è½å¯¹æå¡å¨å¥æ¥å设置é项" -#: ../svnserve/svnserve.c:1164 +#: ../svnserve/svnserve.c:1257 #, c-format msgid "Can't bind server socket" msgstr "ä¸è½ç»å®æå¡å¨å¥æ¥å" -#: ../svnserve/svnserve.c:1170 +#: ../svnserve/svnserve.c:1263 #, c-format msgid "Can't listen on server socket" msgstr "ä¸è½çå¬æå¡å¨å¥æ¥å" -#: ../svnserve/svnserve.c:1251 +#: ../svnserve/svnserve.c:1344 #, c-format msgid "Can't create thread pool" msgstr "æ æ³å建线ç¨æ± " -#: ../svnserve/svnserve.c:1314 -#, c-format -msgid "Can't push task" -msgstr "ä¸è½å建线ç¨æ± ä»»å¡" - #: ../svnserve/winservice.c:346 #, c-format msgid "Failed to create winservice_start_event" @@ -16175,18 +22054,37 @@ msgstr "è¿æ¥æå¡ç®¡çå¨å¤±è´¥" #: ../svnserve/winservice.c:416 #, c-format msgid "The service failed to start; an internal error occurred while starting the service" -msgstr "åçå é¨é误ï¼å¯å¨æå¡å¤±è´¥" +msgstr "æå¡å¯å¨å¤±è´¥ï¼å¯å¨æå¡æ¶åçå é¨é误" -#: ../svnsync/svnsync.c:101 +#: ../svnsync/svnsync.c:95 msgid "" "usage: svnsync initialize DEST_URL SOURCE_URL\n" "\n" +msgstr "" +"ç¨æ³: svnsync initialize DEST_URL SOURCE_URL\n" +"\n" + +#: ../svnsync/svnsync.c:97 +msgid "" "Initialize a destination repository for synchronization from\n" "another repository.\n" "\n" +msgstr "" +"åå§åç®æ çæ¬åºä»¥ä»å¦ä¸ä¸ªçæ¬åºè¿è¡åæ¥ã\n" +"\n" + +#: ../svnsync/svnsync.c:100 +msgid "" "If the source URL is not the root of a repository, only the\n" "specified part of the repository will be synchronized.\n" "\n" +msgstr "" +"å¦ææº URL ä¸æ¯çæ¬åºçæ ¹ï¼åªææå®ç\n" +"é¨åå°è¢«åæ¥ã\n" +"\n" + +#: ../svnsync/svnsync.c:103 +msgid "" "The destination URL must point to the root of a repository which\n" "has been configured to allow revision property changes. In\n" "the general case, the destination repository must contain no\n" @@ -16197,108 +22095,143 @@ msgid "" "when initializing a copy of a repository as a mirror of that same\n" "repository, for example.)\n" "\n" +msgstr "" +"ç®æ URL å¿ é¡»æåå·²é 置为å 许修æ¹çæ¬å±æ§ççæ¬åºæ ¹ç®å½ã\n" +"é常ï¼ç®æ çæ¬åºä¸è½å å«å·²æ交ççæ¬ãä½¿ç¨ --allow-non-empty\n" +"å¯è¶è¿æ¤éå¶ï¼è¿ä¼è®© svnsync å设ç®æ çæ¬åºä¸å·²æççæ¬\n" +"ä¸æºçæ¬åºä¸ç对åºçæ¬å®å ¨ä¸è´ã(ä¾å¦ï¼å¨å°çæ¬åºçå¯æ¬\n" +"åå§å为该çæ¬åºçéåæ¶å¾æç¨ã)\n" +"\n" + +#: ../svnsync/svnsync.c:113 +msgid "" "You should not commit to, or make revision property changes in,\n" "the destination repository by any method other than 'svnsync'.\n" "In other words, the destination repository should be a read-only\n" "mirror of the source repository.\n" msgstr "" -"ç¨æ³: svnsync initialize DEST_URL SOURCE_URL\n" -"\n" -"åå§åä¸ä¸ªç®æ çæ¬åºä»¥ä»å¦ä¸ä¸ªçæ¬åºåæ¥ã\n" -"\n" -"å¦ææº URL ä¸æ¯çæ¬åºçæ ¹ï¼åªæçæ¬åºä¸æå®çé¨åä¼è¢«åæ¥ã\n" -"\n" -"ç®æ URL å¿ é¡»æåçæ¬åºçæ ¹ç®å½ï¼å¹¶ä¸å 许修æ¹çæ¬å±æ§ãä¸è¬æ¥è¯´ï¼\n" -"ç®æ çæ¬åºä¸è½å å«å·²ç»æ交ççæ¬ãå¯ä½¿ç¨ --allow-non-empty æ¥è¶\n" -"è¿æ¤éå¶ï¼å®å¯¼è´ svnsync åå®ç®æ çæ¬åºä¸ççæ¬æ¯æºçæ¬åºä¸å¯¹åº\n" -"çæ¬çéå(ä¾å¦ï¼è¿å¯¹äºä»æºçæ¬åºçå¯æ¬åå§åéåç¹å«æç¨)ã\n" -"\n" -"é¤äº svnsync å¤ï¼ä½ ä¸åºè¯¥å¨ç®æ çæ¬åºä¸æ交ï¼æè ä¿®æ¹çæ¬å±æ§ãä¹å°±æ¯è¯´ï¼\n" -"ç®æ çæ¬åºåºè¯¥æ¯æºçæ¬åºçåªè¯»éåã\n" +"é¤äº 'svnsync' ä¹å¤ï¼ä½ ä¸åºä»¥ä»»ä½å ¶ä»æ¹å¼åç®æ çæ¬åºæ交æ\n" +"æ´æ¹çæ¬å±æ§ãæ¢å¥è¯è¯´ï¼ç®æ çæ¬åºåºè¯¥æ¯æºçæ¬åºçåªè¯»éåã\n" -#: ../svnsync/svnsync.c:127 +#: ../svnsync/svnsync.c:122 msgid "" "usage: svnsync synchronize DEST_URL [SOURCE_URL]\n" "\n" +msgstr "" +"ç¨æ³: svnsync synchronize DEST_URL [SOURCE_URL]\n" +"\n" + +#: ../svnsync/svnsync.c:124 +msgid "" "Transfer all pending revisions to the destination from the source\n" "with which it was initialized.\n" "\n" +msgstr "" +"å°ææå¾ å¤çççæ¬ä»æºä¼ è¾å°\n" +"å·²åå§åçç®æ ã\n" +"\n" + +#: ../svnsync/svnsync.c:127 +msgid "" "If SOURCE_URL is provided, use that as the source repository URL,\n" "ignoring what is recorded in the destination repository as the\n" "source URL. Specifying SOURCE_URL is recommended in particular\n" "if untrusted users/administrators may have write access to the\n" "DEST_URL repository.\n" msgstr "" -"ç¨æ³: svnsync synchronize DEST_URL [SOURCE_URL]\n" +"å¦ææä¾äº SOURCE_URLï¼å°±ç¨å®ä½ä¸ºæºçæ¬åº URLï¼å¿½ç¥ç®æ çæ¬åº\n" +"ä¸è®°å½çæº URLãç¹å«æ¯å½ä¸åä¿¡ä»»çç¨æ·/管çåå¯è½å¯¹ DEST_URL\n" +"çæ¬åºæåæéæ¶ï¼å»ºè®®æå® SOURCE_URLã\n" + +#: ../svnsync/svnsync.c:136 +msgid "" +"usage:\n" "\n" -"ä»æºçæ¬åºå¤å¶æææèµ·ççæ¬å°ç®æ çæ¬åºã\n" +msgstr "" +"ç¨æ³:\n" "\n" -"å¦ææä¾äº SOURCE_URLï¼å°±ç¨ä½æºçæ¬åºç URLï¼ä»è忽ç¥å¨ç®æ çæ¬åºä¸è®°å½ç\n" -"æº URLãå¦ææä¸ä¿¡ä»»çç¨æ·/管çåå¯ä»¥åå ¥ä½äº DEST_URL ççæ¬åºï¼é£ä¹ç¹å«\n" -"æ¨èæå® SOURCE_URLã\n" -#: ../svnsync/svnsync.c:140 +#: ../svnsync/svnsync.c:138 msgid "" -"usage:\n" +" 1. svnsync copy-revprops DEST_URL [SOURCE_URL]\n" +" 2. svnsync copy-revprops DEST_URL REV[:REV2]\n" "\n" +msgstr "" " 1. svnsync copy-revprops DEST_URL [SOURCE_URL]\n" " 2. svnsync copy-revprops DEST_URL REV[:REV2]\n" "\n" + +#: ../svnsync/svnsync.c:141 +msgid "" "Copy the revision properties in a given range of revisions to the\n" "destination from the source with which it was initialized. If the\n" "revision range is not specified, it defaults to all revisions in\n" "the DEST_URL repository. Note also that the 'HEAD' revision is the\n" "latest in DEST_URL, not necessarily the latest in SOURCE_URL.\n" "\n" +msgstr "" +"æç»å®çæ¬èå´å ççæ¬å±æ§ä»åå§åæ¶æç¨çæºå¤å¶å°ç®æ ãå¦æ\n" +"æªæå®çæ¬èå´ï¼åé»è®¤ä¸º DEST_URL çæ¬åºä¸çææçæ¬ãå¦è¯·æ³¨æ\n" +"'HEAD' çæ¬æ DEST_URL ä¸çææ°çæ¬ï¼ä¸ä¸å®æ¯ SOURCE_URL ä¸ç\n" +"ææ°çæ¬ã\n" +"\n" + +#: ../svnsync/svnsync.c:147 +msgid "" "If SOURCE_URL is provided, use that as the source repository URL,\n" "ignoring what is recorded in the destination repository as the\n" "source URL. Specifying SOURCE_URL is recommended in particular\n" "if untrusted users/administrators may have write access to the\n" "DEST_URL repository.\n" "\n" -"Form 2 is deprecated syntax, equivalent to specifying \"-rREV[:REV2]\".\n" msgstr "" -"ç¨æ³:\n" +"å¦ææä¾äº SOURCE_URLï¼å°±ç¨å®ä½ä¸ºæºçæ¬åº URLï¼å¿½ç¥ç®æ çæ¬åº\n" +"ä¸è®°å½çæº URLãç¹å«æ¯å½ä¸åä¿¡ä»»çç¨æ·/管çåå¯è½å¯¹ DEST_URL\n" +"çæ¬åºæåæéæ¶ï¼å»ºè®®æå® SOURCE_URLã\n" "\n" -" 1. svnsync copy-revprops DEST_URL [SOURCE_URL]\n" -" 2. svnsync copy-revprops DEST_URL REV[:REV2]\n" -"\n" -"ä»æºçæ¬åºå¤å¶æå®çæ¬èå´ççæ¬å±æ§å°ç®æ çæ¬åºãå¦æ没æ头æå®çæ¬èå´ï¼\n" -"å°±å¤å¶å ¨é¨çæ¬å°ä½äº DEST_URL ççæ¬åºã请注æï¼'HEAD' æ¯ä½äº DEST_URL\n" -"çææ°çæ¬ï¼ä¸éè¦æ¯ä½äº SOURCE_URL çææ°çæ¬ã\n" + +#: ../svnsync/svnsync.c:153 +msgid "" +"Unless you need to trigger the destination repositoy's revprop\n" +"change hooks for all revision properties, it is recommended to use\n" +"the --skip-unchanged option for best performance.\n" "\n" -"å¦ææä¾äº SOURCE_URLï¼å°±ç¨ä½æºçæ¬åºç URLï¼ä»è忽ç¥å¨ç®æ çæ¬åºä¸è®°å½ç\n" -"æº URLãå¦ææä¸ä¿¡ä»»çç¨æ·/管çåå¯ä»¥åå ¥ä½äº DEST_URL ççæ¬åºï¼é£ä¹ç¹å«\n" -"æ¨èæå® SOURCE_URLã\n" +msgstr "" +"é¤éä½ éè¦ä¸ºææçæ¬å±æ§è§¦åç®æ çæ¬åºç revprop æ´æ¹é©åï¼\n" +"å¦åå»ºè®®ä½¿ç¨ --skip-unchanged é项以è·å¾æä½³æ§è½ã\n" "\n" -"æ ¼å¼ 2 æ¯å·²ç»åºå¼çè¯æ³ï¼çä»·äºæå® \"-rREV[:REV2]\" ã\n" -#: ../svnsync/svnsync.c:161 +#: ../svnsync/svnsync.c:157 +msgid "Form 2 is deprecated syntax, equivalent to specifying \"-rREV[:REV2]\".\n" +msgstr "å½¢å¼ 2 æ¯å·²åºå¼çè¯æ³ï¼çåäºæå® \"-rREV[:REV2]\"ã\n" + +#: ../svnsync/svnsync.c:163 msgid "" "usage: svnsync info DEST_URL\n" "\n" -"Print information about the synchronization destination repository\n" -"located at DEST_URL.\n" msgstr "" "ç¨æ³: svnsync info DEST_URL\n" "\n" -"æå°ä½äº DEST_URL çåæ¥ç®æ çæ¬åºä¿¡æ¯ã\n" -#: ../svnsync/svnsync.c:167 +#: ../svnsync/svnsync.c:165 +msgid "" +"Print information about the synchronization destination repository\n" +"located at DEST_URL.\n" +msgstr "æå°ä½äº DEST_URL çåæ¥ç®æ çæ¬åºçä¿¡æ¯ã\n" + +#: ../svnsync/svnsync.c:170 msgid "" "usage: svnsync help [SUBCOMMAND...]\n" "\n" -"Describe the usage of this program or its subcommands.\n" msgstr "" "ç¨æ³: svnsync help [SUBCOMMAND...]\n" "\n" -"æ¾ç¤ºæ¬ç¨åºæå ¶åå½ä»¤çç¨æ³ã\n" -#: ../svnsync/svnsync.c:177 +#: ../svnsync/svnsync.c:181 msgid "print as little as possible" msgstr "å°½å¯è½å°æå°" -#: ../svnsync/svnsync.c:179 +#: ../svnsync/svnsync.c:183 msgid "" "operate on revision ARG (or range ARG1:ARG2)\n" " A revision argument can be one of:\n" @@ -16310,11 +22243,15 @@ msgstr "" " æ´æ° çæ¬å·\n" " 'HEAD' ææ°çæ¬" -#: ../svnsync/svnsync.c:187 +#: ../svnsync/svnsync.c:191 msgid "allow a non-empty destination repository" msgstr "å 许é空ç®æ çæ¬åº" -#: ../svnsync/svnsync.c:199 +#: ../svnsync/svnsync.c:193 +msgid "don't copy unchanged revision properties" +msgstr "ä¸å¤å¶æªæ´æ¹ççæ¬å±æ§" + +#: ../svnsync/svnsync.c:205 msgid "" "specify a username ARG (deprecated;\n" " see --source-username and --sync-username)" @@ -16322,7 +22259,7 @@ msgstr "" "æå®ç¨æ·å称 ARG (å·²ç»è¿æ¶;\n" " åç --source-username å --sync-username)" -#: ../svnsync/svnsync.c:203 +#: ../svnsync/svnsync.c:209 msgid "" "specify a password ARG (deprecated;\n" " see --source-password and --sync-password)" @@ -16330,32 +22267,76 @@ msgstr "" "æå®å¯ç ARG (å·²ç»è¿æ¶;\n" " åç --source-password å --sync-password)" -#: ../svnsync/svnsync.c:231 +#: ../svnsync/svnsync.c:213 +msgid "" +"deprecated; same as\n" +" --source-trust-server-cert-failures=unknown-ca\n" +" --sync-trust-server-cert-failures=unknown-ca" +msgstr "" +"å·²åºå¼ï¼çåäº\n" +" --source-trust-server-cert-failures=unknown-ca\n" +" --sync-trust-server-cert-failures=unknown-ca" + +#: ../svnsync/svnsync.c:219 +msgid "" +"with --non-interactive, accept SSL\n" +" server certificates with failures.\n" +" ARG is a comma-separated list of:\n" +" - 'unknown-ca' (Unknown Authority)\n" +" - 'cn-mismatch' (Hostname mismatch)\n" +" - 'expired' (Expired certificate)\n" +" - 'not-yet-valid' (Not yet valid certificate)\n" +" - 'other' (all other not separately classified\n" +" certificate errors).\n" +" Applied to the source URL." +msgstr "" +"é å --non-interactiveï¼æ¥åæé®é¢ç\n" +" SSL æå¡å¨è¯ä¹¦ã\n" +" ARG æ¯éå·åéçå表:\n" +" - 'unknown-ca' (æªç¥é¢åæºæ)\n" +" - 'cn-mismatch' (主æºåä¸å¹é )\n" +" - 'expired' (è¯ä¹¦è¿æ)\n" +" - 'not-yet-valid' (è¯ä¹¦å°æªçæ)\n" +" - 'other' (å ¶ä»æªåç¬åç±»ç\n" +" è¯ä¹¦é误)ã\n" +" åºç¨äºæº URLã" + +#: ../svnsync/svnsync.c:239 +msgid "" +"Like\n" +" --source-trust-server-cert-failures,\n" +" but applied to the destination URL." +msgstr "" +"类似\n" +" --source-trust-server-cert-failuresï¼\n" +" ä½åºç¨äº" + +#: ../svnsync/svnsync.c:245 msgid "connect to source repository with username ARG" msgstr "使ç¨ç¨æ·å称 ARG è¿æ¥æºçæ¬åº" -#: ../svnsync/svnsync.c:233 +#: ../svnsync/svnsync.c:247 msgid "connect to source repository with password ARG" msgstr "使ç¨å¯ç ARG è¿æ¥æºçæ¬åº" -#: ../svnsync/svnsync.c:235 +#: ../svnsync/svnsync.c:249 msgid "connect to sync repository with username ARG" msgstr "使ç¨ç¨æ·å称 ARG è¿æ¥ç®ççæ¬åº" -#: ../svnsync/svnsync.c:237 +#: ../svnsync/svnsync.c:251 msgid "connect to sync repository with password ARG" msgstr "使ç¨å¯ç ARG è¿æ¥ç®ççæ¬åº" -#: ../svnsync/svnsync.c:249 +#: ../svnsync/svnsync.c:263 msgid "" "convert translatable properties from encoding ARG\n" " to UTF-8. If not specified, then properties are\n" " presumed to be encoded in UTF-8." msgstr "" -"å°å¯ç¿»è¯çå±æ§ä»ç¼ç ARG 转æ¢å° UTF-8ãå¦æä¸æå®ï¼é£ä¹åå®å±æ§çç¼ç æ¯\n" -" UTF-8ã" +"æå¯ç¿»è¯çå±æ§ä»ç¼ç ARG 转æ¢ä¸º UTF-8ã\n" +" å¦æä¸æå®ï¼ååå®å±æ§ä»¥ UTF-8 ç¼ç ã" -#: ../svnsync/svnsync.c:255 +#: ../svnsync/svnsync.c:269 msgid "" "Disable built-in locking. Use of this option can\n" " corrupt the mirror unless you ensure that no other\n" @@ -16365,144 +22346,141 @@ msgstr "" " ä¼æåéåï¼é¤éä½ è½ç¡®è®¤æ²¡æå ¶å® svnsync\n" " å®ä¾åæ¶è¿è¡ã" -#: ../svnsync/svnsync.c:261 +#: ../svnsync/svnsync.c:275 msgid "" "Steal locks as necessary. Use, with caution,\n" " if your mirror repository contains stale locks\n" " and is not being concurrently accessed by another\n" " svnsync instance." msgstr "" -"å¨éè¦æ¶çªåéã请å°å¿ä½¿ç¨\n" -" å¦æä½ çéåå å«è¿æ¶çéï¼å¹¶ä¸æ²¡æå ¶å® svnsync\n" -" å®ä¾åæ¶è¿è¡ã" +"å¿ è¦æ¶çªåéãå¦æä½ çéåçæ¬åºä¸æ\n" +" è¿æ¶çéï¼ä¸æ²¡æå ¶ä» svnsync å®ä¾å¨\n" +" 并å访é®å®ï¼å¯ä»¥è°¨æ 使ç¨ã" -#: ../svnsync/svnsync.c:269 -#, fuzzy +#: ../svnsync/svnsync.c:283 msgid "" "size of the extra in-memory cache in MB used to\n" " minimize operations for local 'file' scheme.\n" msgstr "" -"ç¨æ¥åå°åä½æä½çå åä¸çé¢å¤ç¼åç大å°(MB)\n" -" é»è®¤å¼: 16ã\n" -" [ä» ç¨äº FSFS ä»åº]" +"ç¨äºæå°åæ¬å° 'file' æ¹æ¡\n" +" æä½çé¢å¤å åç¼å大å°(MB)\n" -#: ../svnsync/svnsync.c:392 +#: ../svnsync/svnsync.c:388 msgid "Target server does not support atomic revision property edits; consider upgrading it to 1.7 or using an external locking program" msgstr "ç®æ æå¡å¨ä¸æ¯æååçæ¬çå±æ§ç¼è¾; 请èèåçº§å° 1.7 æè 使ç¨å¤é¨å éç¨åº" -#: ../svnsync/svnsync.c:406 +#: ../svnsync/svnsync.c:402 #, c-format msgid "Stole lock previously held by '%s'\n" msgstr "çªå被 '%s' ææçé\n" -#: ../svnsync/svnsync.c:495 +#: ../svnsync/svnsync.c:492 #, c-format msgid "Session is rooted at '%s' but the repos root is '%s'" -msgstr "ä¼è¯æ ¹æ¯â%sâï¼ä½æ¯çæ¬åºæ ¹æ¯â%sâ" +msgstr "ä¼è¯æ ¹æ¯'%s'ï¼ä½æ¯çæ¬åºæ ¹æ¯'%s'" -#: ../svnsync/svnsync.c:637 +#: ../svnsync/svnsync.c:650 #, c-format msgid "Copied properties for revision %ld (%s* properties skipped).\n" msgstr "ä»çæ¬ %ld (å¿½ç¥ %s* å±æ§)å¤å¶å±æ§ã\n" -#: ../svnsync/svnsync.c:642 +#: ../svnsync/svnsync.c:655 #, c-format msgid "Copied properties for revision %ld.\n" msgstr "å¤å¶çæ¬ %ld çå±æ§ã\n" -#: ../svnsync/svnsync.c:658 +#: ../svnsync/svnsync.c:671 #, c-format msgid "NOTE: Normalized %s* properties to LF line endings (%d rev-props, %d node-props).\n" msgstr "注æ: å·²ç»æ åå %s* å±æ§ä¸º LF è¡å°¾ (%d rev-props, %d node-props)ã\n" -#: ../svnsync/svnsync.c:788 +#: ../svnsync/svnsync.c:810 msgid "Destination repository already contains revision history; consider using --allow-non-empty if the repository's revisions are known to mirror their respective revisions in the source repository" msgstr "" "ç®æ çæ¬åºå·²ç»å å«çæ¬åå²ï¼å¦æä½ ç¡®ä¿¡å®ä»¬æ¯éåæºçæ¬åºç对åºçæ¬çè¯ï¼\n" "èè使ç¨é项 '--allow-non-empty'" -#: ../svnsync/svnsync.c:797 +#: ../svnsync/svnsync.c:819 #, c-format msgid "Destination repository is already synchronizing from '%s'" -msgstr "ç®æ çæ¬åºå·²ç»ä¸â%sâåæ¥" +msgstr "ç®æ çæ¬åºå·²ç»ä¸'%s'åæ¥" -#: ../svnsync/svnsync.c:832 +#: ../svnsync/svnsync.c:854 msgid "Destination repository has more revisions than source repository" msgstr "ç®æ çæ¬åºççæ¬æ°éæ¯æºçæ¬åºå¤" -#: ../svnsync/svnsync.c:897 ../svnsync/svnsync.c:900 ../svnsync/svnsync.c:1570 -#: ../svnsync/svnsync.c:1577 ../svnsync/svnsync.c:1814 -#: ../svnsync/svnsync.c:1817 ../svnsync/svnsync.c:1861 +#: ../svnsync/svnsync.c:919 ../svnsync/svnsync.c:922 ../svnsync/svnsync.c:1595 +#: ../svnsync/svnsync.c:1602 ../svnsync/svnsync.c:1842 +#: ../svnsync/svnsync.c:1845 ../svnsync/svnsync.c:1889 #, c-format msgid "Path '%s' is not a URL" -msgstr "è·¯å¾â%sâä¸æ¯URL" +msgstr "è·¯å¾'%s'ä¸æ¯URL" -#: ../svnsync/svnsync.c:927 +#: ../svnsync/svnsync.c:949 #, c-format msgid "Committed revision %ld.\n" msgstr "å·²æ交çæ¬ %ldã\n" -#: ../svnsync/svnsync.c:970 +#: ../svnsync/svnsync.c:992 msgid "Destination repository has not been initialized" msgstr "ç®æ çæ¬åºæ²¡æåå§å" -#: ../svnsync/svnsync.c:1345 -#, fuzzy, c-format +#: ../svnsync/svnsync.c:1367 +#, c-format msgid "Commit created r%ld but should have created r%ld" -msgstr "æ交å建çæ¬ %ldï¼åºè¯¥å建çæ¬ %ld" +msgstr "æ交åå»ºäº r%ldï¼ä½åºå建 r%ld" -#: ../svnsync/svnsync.c:1463 +#: ../svnsync/svnsync.c:1487 #, c-format msgid "Revision being currently copied (%ld), last merged revision (%ld), and destination HEAD (%ld) are inconsistent; have you committed to the destination without using svnsync?" msgstr "å½åå¤å¶çæ¬(%ld), æåå并çæ¬(%ld), åç®æ HEAD (%ld) ä¸ä¸è´ï¼ä½ æ¯å¦ä½¿ç¨ésvnsyncæ¹æ³æ交å°ç®æ çæ¬åºï¼" -#: ../svnsync/svnsync.c:1500 +#: ../svnsync/svnsync.c:1525 #, c-format msgid "Destination HEAD (%ld) is not the last merged revision (%ld); have you committed to the destination without using svnsync?" msgstr "ç®æ HEAD (%ld)ä¸æ¯æåå并çæ¬(%ld)ï¼ä½ æ¯å¦ä½¿ç¨é svnsync æ¹æ³æ交å°ç®æ çæ¬åºï¼" -#: ../svnsync/svnsync.c:1628 ../svnsync/svnsync.c:1633 +#: ../svnsync/svnsync.c:1655 ../svnsync/svnsync.c:1660 #, c-format msgid "Cannot copy revprops for a revision (%ld) that has not been synchronized yet" msgstr "ä¸è½å¨å°æªåæ¥æ¶å¤å¶çæ¬(%ld)ç revprops" -#: ../svnsync/svnsync.c:1697 ../svnsync/svnsync.c:1717 +#: ../svnsync/svnsync.c:1725 ../svnsync/svnsync.c:1745 #, c-format msgid "Invalid revision number (%ld)" msgstr "æ æççæ¬å· (%ld)" -#: ../svnsync/svnsync.c:1767 +#: ../svnsync/svnsync.c:1795 msgid "Cannot specify revisions via both command-line arguments and the --revision (-r) option" -msgstr "ä¸è½åæ¶ä½¿ç¨ " +msgstr "ä¸è½åæ¶éè¿å½ä»¤è¡åæ°å --revision (-r) é项æå®çæ¬" -#: ../svnsync/svnsync.c:1775 ../svnsync/svnsync.c:2120 +#: ../svnsync/svnsync.c:1803 ../svnsync/svnsync.c:2165 #, c-format msgid "Invalid revision range '%s' provided" msgstr "æä¾äºæ æççæ¬èå´ '%s'" -#: ../svnsync/svnsync.c:1874 +#: ../svnsync/svnsync.c:1902 #, c-format msgid "Repository '%s' is not initialized for synchronization" -msgstr "çæ¬åºâ%sâ没æ为åæ¥åå§å" +msgstr "çæ¬åº'%s'没æ为åæ¥åå§å" #. Print the info. -#: ../svnsync/svnsync.c:1880 +#: ../svnsync/svnsync.c:1908 #, c-format msgid "Source URL: %s\n" msgstr "æº URL: %s\n" -#: ../svnsync/svnsync.c:1882 +#: ../svnsync/svnsync.c:1910 #, c-format msgid "Source Repository UUID: %s\n" msgstr "æºçæ¬åº UUID: %s\n" -#: ../svnsync/svnsync.c:1885 +#: ../svnsync/svnsync.c:1913 #, c-format msgid "Last Merged Revision: %s\n" msgstr "æåå并ççæ¬: %s\n" -#: ../svnsync/svnsync.c:1902 -#, fuzzy +#: ../svnsync/svnsync.c:1930 msgid "" "general usage: svnsync SUBCOMMAND DEST_URL [ARGS & OPTIONS ...]\n" "Subversion repository replication tool.\n" @@ -16512,39 +22490,49 @@ msgid "" "Available subcommands:\n" msgstr "" "ä¸è¬ç¨æ³: svnsync SUBCOMMAND DEST_URL [ARGS & OPTIONS ...]\n" -"ä½¿ç¨ âsvnsync help <subcommand>â å¾å°åå½ä»¤ç帮å©ä¿¡æ¯ã\n" -"ä½¿ç¨ âsvnsync --versionâ å¯çç¨åºççæ¬å·åçæ¬åºè®¿é®æ¨¡åã\n" +"Subversion çæ¬åºå¤å¶å·¥å ·ã\n" +"è¾å ¥ 'svnsync help <subcommand>' å¾å°å ³äºæ个åå½ä»¤ç帮å©ã\n" +"è¾å ¥ 'svnsync --version' æ¥çç¨åºçæ¬åçæ¬åºè®¿é®æ¨¡åã\n" "\n" -"å¯ç¨çåå½ä»¤: \n" +"å¯ç¨çåå½ä»¤:\n" -#: ../svnsync/svnsync.c:2181 +#: ../svnsync/svnsync.c:2222 msgid "Cannot use --username or --password with any of --source-username, --source-password, --sync-username, or --sync-password.\n" msgstr "ä¸è½å° --username æ --password ä¸ --source-username, --source-password, --sync-username, æ --sync-password ä¸èµ·ä½¿ç¨ã\n" -#: ../svnsync/svnsync.c:2204 +#: ../svnsync/svnsync.c:2245 msgid "--disable-locking and --steal-lock are mutually exclusive" msgstr "--disable-locking ä¸ --steal-lock æ¯äºæ¥ç" -#: ../svnsync/svnsync.c:2293 +#: ../svnsync/svnsync.c:2263 +msgid "--source-trust-server-cert-failures and --sync-trust-server-cert-failures require --non-interactive" +msgstr "--source-trust-server-cert-failures å --sync-trust-server-cert-failures éè¦ --non-interactive" + +#: ../svnsync/svnsync.c:2332 #, c-format msgid "" "Subcommand '%s' doesn't accept option '%s'\n" "Type 'svnsync help %s' for usage.\n" msgstr "" -"åå½ä»¤â%sâä¸æ¥åé项â%sâ\n" -"使ç¨âsvnsync help %sâå¾å°ç¨æ³ã\n" +"åå½ä»¤'%s'ä¸æ¥åé项'%s'\n" +"使ç¨'svnsync help %s'å¾å°ç¨æ³ã\n" -#: ../svnsync/svnsync.c:2383 +#: ../svnsync/svnsync.c:2396 msgid "Try 'svnsync help' for more info" -msgstr "è¯·ä½¿ç¨ âsvnsync helpâ 以å¾å°æ´å¤ä¿¡æ¯" +msgstr "è¯·ä½¿ç¨ 'svnsync help' 以å¾å°æ´å¤ä¿¡æ¯" + +#: ../svnsync/sync.c:125 +#, c-format +msgid "Missing colon in svn:mergeinfo property" +msgstr "svn:mergeinfo å±æ§ä¸ç¼ºå°åå·" #: ../svnversion/svnversion.c:49 #, c-format msgid "Type 'svnversion --help' for usage.\n" -msgstr "ä½¿ç¨ âsvnversion --helpâ å¾å°ç¨æ³ã\n" +msgstr "ä½¿ç¨ 'svnversion --help' å¾å°ç¨æ³ã\n" #: ../svnversion/svnversion.c:59 -#, fuzzy, c-format +#, c-format msgid "" "usage: svnversion [OPTIONS] [WC_PATH [TRAIL_URL]]\n" "Subversion working copy identification tool.\n" @@ -16580,142 +22568,66 @@ msgid "" "Valid options:\n" msgstr "" "ç¨æ³: svnversion [OPTIONS] [WC_PATH [TRAIL_URL]]\n" +"Subversion å·¥ä½å¯æ¬æ è¯å·¥å ·ã\n" +"ä½¿ç¨ 'svnversion --version' æ¥çç¨åºçæ¬ã\n" "\n" -" 为工ä½å¯æ¬è·¯å¾ WC_PATH 产çç´§åç âçæ¬å·âã TRAIL_URL æ¯\n" -" URL çç»å°¾é¨åï¼ç¨æ¥å¤æ WC_PATH æ¯å¦å·²åæ¢è¿ (æ£æµ WC_PATH\n" -" å æ¯å¦å·²ç»åæ¢å¹¶ä¸ä¾èµäº TRAIL_URL)ãçæ¬å·ä¼åè³æ åè¾åºã\n" -" ä¾å¦: \n" +" 为工ä½å¯æ¬è·¯å¾ WC_PATH 产çç´§åççæ¬æ è¯ãTRAIL_URL æ¯ URL ç\n" +" å°¾é¨ï¼ç¨äºå¤æ WC_PATH æ¬èº«æ¯å¦å·²åæ¢(æ£æµ WC_PATH å é¨çåæ¢\n" +" ä¸ä¾èµ TRAIL_URL)ãçæ¬æ è¯è¾åºå°æ åè¾åºãä¾å¦:\n" "\n" -" $ svnversion . /repos/svn/trunk \n" +" $ svnversion . /repos/svn/trunk\n" " 4168\n" "\n" -" å¦æå·¥ä½å¯æ¬æ¯åä¸çæ¬ï¼æªç»ä¿®æ¹ï¼æªç»åæ¢ï¼èä¸å ¶ URL å¹é \n" -" TRAIL_URL åæ°ï¼é£ä¹çæ¬å·å°ä¼æ¯åä¸æ°åãå¦æå·¥ä½å¯æ¬åä¹±ï¼\n" -" é£ä¹çæ¬å·å°±ä¼å¤æå¾å¤: \n" -"\n" -" 4123:4168 æ··åçæ¬\n" -" 4168M 已修æ¹\n" -" 4123S å·²åæ¢\n" -" 4123P å±é¨å·¥ä½å¯æ¬ï¼æ²¡æå ¨é¨æ£åºã\n" -" 4123:4168MS æ··åçæ¬ï¼æä¿®æ¹ï¼å·¥ä½å¯æ¬å·²åæ¢\n" -"\n" -" å¦æ WC_PATH ä¸æ¯å·¥ä½å¯æ¬ï¼é£ä¹å®ä¼è¾åº 'æªçæ¬æ§å¶çç®å½'\n" -" æè 'æªçæ¬æ§å¶çæ件'ãå¦æ WC_PATH æ¯æ°å¢ï¼å¤å¶æ移å¨å\n" -" çè·¯å¾ï¼é£ä¹å®ä¼è¾åº 'æªæ交çæ¬å°å¢å ï¼å¤å¶æ移å¨'ã\n" +" å¦æå·¥ä½å¯æ¬æ¯åä¸çæ¬ãæªä¿®æ¹ãæªåæ¢ä¸ URL å¹é TRAIL_URL\n" +" åæ°ï¼çæ¬æ è¯å°æ¯å个æ°åãå¦æå·¥ä½å¯æ¬ç¶æå¼å¸¸ï¼çæ¬æ è¯\n" +" å°æ´å¤æ:\n" +"\n" +" 4123:4168 æ··åçæ¬çå·¥ä½å¯æ¬\n" +" 4168M 已修æ¹çå·¥ä½å¯æ¬\n" +" 4123S å·²åæ¢çå·¥ä½å¯æ¬\n" +" 4123P ç¨çæ£åºçé¨åå·¥ä½å¯æ¬\n" +" 4123:4168MS æ··åçæ¬ã已修æ¹ãå·²åæ¢çå·¥ä½å¯æ¬\n" +"\n" +" å¦æ WC_PATH æ¯æªçæ¬æ§å¶çè·¯å¾ï¼ç¨åºå°è¾åº\n" +" 'Unversioned directory' æ 'Unversioned file'ãå¦æ WC_PATH æ¯\n" +" 已添å ãå·²å¤å¶æ已移å¨çè·¯å¾ï¼ç¨åºå°è¾åº\n" +" 'Uncommitted local addition, copy or move'ã\n" "\n" -" å¦æè°ç¨æ¶æ²¡æåæ°ï¼å WC_PATH é»è®¤ä¸ºå½åç®å½ã\n" +" å¦æä¸å¸¦åæ°è°ç¨ï¼WC_PATH 为å½åç®å½ã\n" "\n" -"ææé项: \n" +"ææé项:\n" -#: ../svnversion/svnversion.c:141 +#: ../svnversion/svnversion.c:144 msgid "last changed rather than current revisions" msgstr "æè¿ä¸æ¬¡æ¹åçï¼èä¸æ¯ç®åççæ¬" -#: ../svnversion/svnversion.c:241 +#: ../svnversion/svnversion.c:247 #, c-format msgid "Unversioned symlink%s" msgstr "æªçæ¬æ§å¶ç符å·é¾æ¥ %s" -#: ../svnversion/svnversion.c:244 +#: ../svnversion/svnversion.c:250 #, c-format msgid "Unversioned directory%s" msgstr "ç®å½ %s æªçæ¬æ§å¶" -#: ../svnversion/svnversion.c:247 +#: ../svnversion/svnversion.c:253 #, c-format msgid "Unversioned file%s" msgstr "æ件 %s æªçæ¬æ§å¶" -#: ../svnversion/svnversion.c:253 +#: ../svnversion/svnversion.c:259 #, c-format msgid "'%s' doesn't exist\n" -msgstr "â%sâ ä¸åå¨\n" +msgstr "'%s' ä¸åå¨\n" -#: ../svnversion/svnversion.c:254 +#: ../svnversion/svnversion.c:260 #, c-format msgid "'%s' is of unknown type\n" -msgstr "â%sâ çç±»åæªç¥\n" +msgstr "'%s' çç±»åæªç¥\n" #. Local uncommitted modifications, no revision info was found. -#: ../svnversion/svnversion.c:268 +#: ../svnversion/svnversion.c:274 #, c-format msgid "Uncommitted local addition, copy or move%s" msgstr "æªæ交çæ¬å°å¢å ï¼å¤å¶æç§»å¨ %s" - -#, fuzzy -#~ msgid "do not output trailing newline" -#~ msgstr "ä¸è¾åºå ¶åçæ¢è¡ç¬¦" - -#~ msgid "Representation key for checksum '%%s' exists in filesystem '%%s' with a different value (%%ld,%%%s,%%%s,%%%s) than what we were about to store (%%ld,%%%s,%%%s,%%%s)" -#~ msgstr "æ ¡éªå â%%sâ çå±ç°é®å·²ç»åå¨äºæä»¶ç³»ç» â%%sâ ä¸ï¼åå¼(%%ld,%%%s,%%%s,%%%s)ä¸æ们è¦åå¨çå¼(%%ld,%%%s,%%%s,%%%s)ä¸å" - -#, fuzzy -#~ msgid "Move-from node is out-of-date" -#~ msgstr "æ¡ç®è¿æ¶" - -#, fuzzy -#~ msgid "Path '%s' has been moved without being deleted" -#~ msgstr "è·¯å¾â%sâä¸æ¯æ件" - -#, fuzzy -#~ msgid "Path '%s' has been moved to more than one target" -#~ msgstr "è·¯å¾â%sâä¸æ¯æ件" - -#~ msgid "Move without a suitable deletion" -#~ msgstr "没æéå½å é¤ç移å¨" - -#~ msgid "Ambiguous move" -#~ msgstr "ä¸æç¡®ç移å¨" - -#~ msgid "" -#~ "Conflict discovered when trying to add '%s'.\n" -#~ "An object of the same name already exists.\n" -#~ msgstr "" -#~ "å¢å â%sâ æ¶åºç°å²çªã\n" -#~ "åå对象已åå¨ã\n" - -#~ msgid "incoming file replace" -#~ msgstr "è¿å ¥çæ件æ¿æ¢" - -#~ msgid "Failed to mark '%s' absent: item of the same name is already scheduled for addition" -#~ msgstr "æ æ³å°â%sâæ 记为ä¸åå¨: åå项ç®å·²å å ¥å¢å è°åº¦" - -#~ msgid "Out of slots for named atomic." -#~ msgstr "å½åååç槽ä½å·²æ»¡" - -#~ msgid "Namespace has not been initialized." -#~ msgstr "å½å空é´æ²¡æåå§å" - -#~ msgid "Atomic's name is too long." -#~ msgstr "ååçå称太é¿" - -#, fuzzy -#~ msgid "Number of atomics in namespace is too large." -#~ msgstr "ååçå称太é¿" - -#, fuzzy -#~ msgid "MMAP failed for file '%s'" -#~ msgstr "â%sâåçå¼æ æ" - -#~ msgid "Not a valid atomic" -#~ msgstr "ä¸æ¯åæ³çååæ°æ®" - -#, fuzzy -#~ msgid "No write access to file '%s'" -#~ msgstr "æ æ³åå ¥æ件â%sâ" - -#, fuzzy -#~ msgid "No read access to file '%s'" -#~ msgstr "ä¸è½è®¾ç½® â%sâ çååæ¶é´" - -#, fuzzy -#~ msgid "Incomplete read in file '%s'" -#~ msgstr "ä¸è½è¯»åæ件â%sâ" - -#, fuzzy -#~ msgid "Revision file (r%ld) has corrupt footer" -#~ msgstr "çæ¬æ件 (r%ld) 缺å°ç»å°¾æ¢è¡" - -#, fuzzy -#~ msgid "Recursive locks are not supported" -#~ msgstr "ä¸æ¯æééå½çéæ°å®ä½"