From 07432cef2c14389a591e368a779eae9d46d882bc Mon Sep 17 00:00:00 2001 From: Wang Sheng <wangsheng2008love@163.com> Date: Wed, 30 Jan 2013 17:23:08 +0800 Subject: [PATCH] l10n: zh_CN.po: 800+ new translations on command usages Most of the 800+ new translations are contributed by Wang Sheng. So he is a zh_CN l10n maintainer for Git now. Also fixed translations for some terms, such as blob, dangling. Signed-off-by: Wang Sheng <wangsheng2008love@163.com> Signed-off-by: Jiang Xin <worldhello.net@gmail.com> --- po/TEAMS | 1 + po/zh_CN.po | 4258 +++++++++++++++++++++++++-------------------------- 2 files changed, 2123 insertions(+), 2136 deletions(-) diff --git a/po/TEAMS b/po/TEAMS index 1b9e9940eb..5eb5aadb3a 100644 --- a/po/TEAMS +++ b/po/TEAMS @@ -46,3 +46,4 @@ Members: Riku <lu.riku AT gmail.com> Yichao Yu <yyc1992 AT gmail.com> ws3389 <willsmith3389 AT gmail.com> Thynson <lanxingcan AT gmail.com> + Wang Sheng <wangsheng2008love@163.com> diff --git a/po/zh_CN.po b/po/zh_CN.po index 46d158ffd1..1fb9c22a17 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -1,6 +1,6 @@ # Chinese translations for Git package # Git 软件å çç®ä½ä¸æç¿»è¯. -# Copyright (C) 2012 Jiang Xin <worldhello.net AT gmail.com> +# Copyright (C) 2012,2013 Jiang Xin <worldhello.net AT gmail.com> # This file is distributed under the same license as the Git package. # Contributers: # - Jiang Xin <worldhello.net AT gmail.com> @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2012-09-15 10:21+0800\n" -"PO-Revision-Date: 2012-09-07 17:56+0800\n" +"POT-Creation-Date: 2013-01-25 12:33+0800\n" +"PO-Revision-Date: 2013-02-09 00:47+0800\n" "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n" "Language-Team: GitHub <https://github.com/gotgit/git/>\n" "Language: zh_CN\n" @@ -22,7 +22,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: advice.c:40 +#: advice.c:45 #, c-format msgid "hint: %.*s\n" msgstr "æ示ï¼%.*s\n" @@ -31,7 +31,7 @@ msgstr "æ示ï¼%.*s\n" #. * Message used both when 'git commit' fails and when #. * other commands doing a merge do. #. -#: advice.c:70 +#: advice.c:75 msgid "" "Fix them up in the work tree,\n" "and then use 'git add/rm <file>' as\n" @@ -43,93 +43,98 @@ msgstr "" "æä½¿ç¨ 'git commit -a'ã" #: archive.c:10 -#, fuzzy msgid "git archive [options] <tree-ish> [<path>...]" -msgstr "git apply [é项] [<è¡¥ä¸>...]" +msgstr "git archive [é项] <æ ææ交> [<è·¯å¾>...]" #: archive.c:11 -#, fuzzy msgid "git archive --list" -msgstr "git archiveï¼NACK %s" +msgstr "git archive --list" #: archive.c:12 msgid "" "git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]" msgstr "" +"git archive --remote <çæ¬åº> [--exec <å½ä»¤>] [é项] <æ ææ交> [<è·¯å¾>...]" #: archive.c:13 msgid "git archive --remote <repo> [--exec <cmd>] --list" -msgstr "" +msgstr "git archive --remote <çæ¬åº> [--exec <å½ä»¤>] --list" -#: archive.c:322 +#: archive.c:323 msgid "fmt" -msgstr "" +msgstr "æ ¼å¼" -#: archive.c:322 +#: archive.c:323 msgid "archive format" -msgstr "" +msgstr "å½æ¡£æ ¼å¼" -#: archive.c:323 builtin/log.c:1079 +#: archive.c:324 builtin/log.c:1115 msgid "prefix" -msgstr "" +msgstr "åç¼" -#: archive.c:324 +#: archive.c:325 msgid "prepend prefix to each pathname in the archive" -msgstr "" +msgstr "为å½æ¡£ä¸æ¯ä¸ªè·¯å¾åå ä¸åç¼" -#: archive.c:325 builtin/archive.c:91 builtin/blame.c:2332 -#: builtin/blame.c:2333 builtin/config.c:56 builtin/fast-export.c:642 -#: builtin/fast-export.c:644 builtin/grep.c:800 builtin/hash-object.c:77 -#: builtin/ls-files.c:494 builtin/ls-files.c:497 builtin/notes.c:537 -#: builtin/notes.c:694 builtin/read-tree.c:107 parse-options.h:149 +#: archive.c:326 builtin/archive.c:91 builtin/blame.c:2380 +#: builtin/blame.c:2381 builtin/config.c:55 builtin/fast-export.c:653 +#: builtin/fast-export.c:655 builtin/grep.c:715 builtin/hash-object.c:77 +#: builtin/ls-files.c:494 builtin/ls-files.c:497 builtin/notes.c:540 +#: builtin/notes.c:697 builtin/read-tree.c:107 parse-options.h:149 msgid "file" msgstr "æ件" -#: archive.c:326 builtin/archive.c:92 +#: archive.c:327 builtin/archive.c:92 msgid "write the archive to this file" -msgstr "" +msgstr "å½æ¡£åå ¥æ¤æ件" -#: archive.c:328 -#, fuzzy +#: archive.c:329 msgid "read .gitattributes in working directory" -msgstr "%sï¼å·²ç»åå¨äºå·¥ä½åºä¸" +msgstr "读åå·¥ä½åºä¸ç .gitattributes" -#: archive.c:329 +#: archive.c:330 msgid "report archived files on stderr" -msgstr "" +msgstr "å¨æ åé误ä¸æ¥åå½æ¡£æ件" -#: archive.c:330 +#: archive.c:331 msgid "store only" -msgstr "" +msgstr "åªåå¨" -#: archive.c:331 +#: archive.c:332 msgid "compress faster" -msgstr "" +msgstr "å缩é度æ´å¿«" -#: archive.c:339 +#: archive.c:340 msgid "compress better" -msgstr "" +msgstr "å缩æææ´å¥½" -#: archive.c:342 +#: archive.c:343 msgid "list supported archive formats" -msgstr "" +msgstr "ååºæ¯æçå½æ¡£æ ¼å¼" -#: archive.c:344 builtin/archive.c:93 builtin/clone.c:85 +#: archive.c:345 builtin/archive.c:93 builtin/clone.c:85 msgid "repo" -msgstr "" +msgstr "çæ¬åº" -#: archive.c:345 builtin/archive.c:94 +#: archive.c:346 builtin/archive.c:94 msgid "retrieve the archive from remote repository <repo>" -msgstr "" +msgstr "ä»è¿ç¨çæ¬åºï¼<çæ¬åº>ï¼æåå½æ¡£æ件" -#: archive.c:346 builtin/archive.c:95 builtin/notes.c:616 -#, fuzzy +#: archive.c:347 builtin/archive.c:95 builtin/notes.c:619 msgid "command" -msgstr "è¿è¡ $command" +msgstr "å½ä»¤" -#: archive.c:347 builtin/archive.c:96 +#: archive.c:348 builtin/archive.c:96 msgid "path to the remote git-upload-archive command" +msgstr "è¿ç¨ git-upload-archive å½ä»¤çè·¯å¾" + +#: attr.c:259 +msgid "" +"Negative patterns are forbidden in git attributes\n" +"Use '\\!' for literal leading exclamation." msgstr "" +"å¨ git attributes ä¸ä¸å 许使ç¨è´å¼æ¨¡ç\n" +"å½å符串确å®è¦ä»¥æå¹å·å¼å§æ¶ï¼ä½¿ç¨ '\\!'ã" #: bundle.c:36 #, c-format @@ -141,7 +146,7 @@ msgstr "'%s' ä¸åæ¯ä¸ä¸ª v2 çæ¬çå æ件" msgid "unrecognized header: %s%s (%d)" msgstr "æªè½è¯å«çå 头ï¼%s%s (%d)" -#: bundle.c:89 builtin/commit.c:714 +#: bundle.c:89 builtin/commit.c:674 #, c-format msgid "could not open '%s'" msgstr "ä¸è½æå¼ '%s'" @@ -150,9 +155,9 @@ msgstr "ä¸è½æå¼ '%s'" msgid "Repository lacks these prerequisite commits:" msgstr "çæ¬åºç¼ºå°è¿äºå¿ å¤çæ交ï¼" -#: bundle.c:164 sequencer.c:557 sequencer.c:989 builtin/log.c:290 -#: builtin/log.c:727 builtin/log.c:1313 builtin/log.c:1529 builtin/merge.c:347 -#: builtin/shortlog.c:181 +#: bundle.c:164 sequencer.c:566 sequencer.c:998 builtin/log.c:299 +#: builtin/log.c:751 builtin/log.c:1358 builtin/log.c:1574 builtin/merge.c:347 +#: builtin/shortlog.c:157 msgid "revision walk setup failed" msgstr "çæ¬éå设置失败" @@ -178,7 +183,7 @@ msgstr[1] "è¿ä¸ªå éè¦ %d 个è¿äºå¼ç¨" msgid "rev-list died" msgstr "rev-list ç»æ¢" -#: bundle.c:300 builtin/log.c:1209 builtin/shortlog.c:284 +#: bundle.c:300 builtin/log.c:1254 builtin/shortlog.c:260 #, c-format msgid "unrecognized argument: %s" msgstr "æªè½è¯å«çåæ°ï¼%s" @@ -209,12 +214,12 @@ msgstr "ä¸è½å建 '%s'" msgid "index-pack died" msgstr "index-pack ç»æ¢" -#: commit.c:48 +#: commit.c:50 #, c-format msgid "could not parse %s" msgstr "ä¸è½è§£æ %s" -#: commit.c:50 +#: commit.c:52 #, c-format msgid "%s %s is not a commit!" msgstr "%s %s ä¸æ¯ä¸ä¸ªæ交!" @@ -305,18 +310,23 @@ msgstr[0] "%lu å¹´å" msgstr[1] "%lu å¹´å" # è¯è ï¼æ³¨æä¿æåå¯¼ç©ºæ ¼ -#: diff.c:105 +#: diff.c:111 #, c-format -msgid " Failed to parse dirstat cut-off percentage '%.*s'\n" -msgstr " æ æ³è§£æ dirstat éå¼ '%.*s'\n" +msgid " Failed to parse dirstat cut-off percentage '%s'\n" +msgstr " æ æ³è§£æ dirstat æªæ¢ï¼cut-offï¼ç¾åæ¯ '%s'\n" # è¯è ï¼æ³¨æä¿æåå¯¼ç©ºæ ¼ -#: diff.c:110 +#: diff.c:116 #, c-format -msgid " Unknown dirstat parameter '%.*s'\n" -msgstr " æªç¥ dirstat åæ° '%.*s'\n" +msgid " Unknown dirstat parameter '%s'\n" +msgstr " æªç¥ç dirstat åæ° '%s'\n" -#: diff.c:210 +#: diff.c:194 +#, c-format +msgid "Unknown value for 'diff.submodule' config variable: '%s'" +msgstr "é ç½®åé 'diff.submodule' æªç¥çåå¼ï¼'%s'" + +#: diff.c:237 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -325,32 +335,7 @@ msgstr "" "åç°é ç½®åé 'diff.dirstat' ä¸çé误ï¼\n" "%s" -#: diff.c:1401 -msgid " 0 files changed" -msgstr " 0 个æ件被修æ¹" - -#: diff.c:1405 -#, c-format -msgid " %d file changed" -msgid_plural " %d files changed" -msgstr[0] " %d 个æ件被修æ¹" -msgstr[1] " %d 个æ件被修æ¹" - -#: diff.c:1422 -#, c-format -msgid ", %d insertion(+)" -msgid_plural ", %d insertions(+)" -msgstr[0] "ï¼æå ¥ %d è¡(+)" -msgstr[1] "ï¼æå ¥ %d è¡(+)" - -#: diff.c:1433 -#, c-format -msgid ", %d deletion(-)" -msgid_plural ", %d deletions(-)" -msgstr[0] "ï¼å é¤ %d è¡(-)" -msgstr[1] "ï¼å é¤ %d è¡(-)" - -#: diff.c:3460 +#: diff.c:3494 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -359,6 +344,11 @@ msgstr "" "æ æ³è§£æ --dirstat/-X é项çåæ°ï¼\n" "%s" +#: diff.c:3508 +#, c-format +msgid "Failed to parse --submodule option parameter: '%s'" +msgstr "æ æ³è§£æ --submodule é项çåæ°ï¼'%s'" + #: gpg-interface.c:59 msgid "could not run gpg." msgstr "ä¸è½æ§è¡ gpgã" @@ -371,17 +361,17 @@ msgstr "gpg 没ææ¥åæ°æ®" msgid "gpg failed to sign the data" msgstr "gpg æ æ³ä¸ºæ°æ®ç¾å" -#: grep.c:1320 +#: grep.c:1622 #, c-format msgid "'%s': unable to read %s" msgstr "'%s'ï¼æ æ³è¯»å %s" -#: grep.c:1337 +#: grep.c:1639 #, c-format msgid "'%s': %s" msgstr "'%s'ï¼%s" -#: grep.c:1348 +#: grep.c:1650 #, c-format msgid "'%s': short read %s" msgstr "'%s'ï¼è¯»åä¸å®æ´ %s" @@ -441,6 +431,15 @@ msgstr[1] "" "\n" "æ¨æçæ¯è¿å ¶ä¸çæä¸ä¸ªä¹ï¼" +#: merge.c:56 +msgid "failed to read the cache" +msgstr "æ æ³è¯»åç¼å" + +#: merge.c:110 builtin/checkout.c:333 builtin/checkout.c:534 +#: builtin/clone.c:586 +msgid "unable to write new index file" +msgstr "æ æ³åæ°çç´¢å¼æ件" + #: merge-recursive.c:190 #, c-format msgid "(bad commit)\n" @@ -484,7 +483,7 @@ msgstr "ä¸è½è¯»å对象 %s '%s'" #: merge-recursive.c:750 #, c-format msgid "blob expected for %s '%s'" -msgstr "%s '%s' åºä¸ºäºè¿å¶å¯¹è±¡ï¼blobï¼" +msgstr "%s '%s' åºä¸ºæ°æ®ï¼blobï¼å¯¹è±¡" #: merge-recursive.c:773 builtin/clone.c:302 #, c-format @@ -568,7 +567,7 @@ msgstr "" #: merge-recursive.c:1248 #, c-format msgid "Renaming %s to %s and %s to %s instead" -msgstr "èæ¯éå½å %s è³ %s 以å %s è³ %s" +msgstr "èæ¯éå½å %s è³ %sï¼ä»¥å %s è³ %s" #: merge-recursive.c:1447 #, c-format @@ -593,7 +592,7 @@ msgstr "ä¸è½è¯»å对象 %s" #: merge-recursive.c:1516 #, c-format msgid "object %s is not a blob" -msgstr "对象 %s ä¸æ¯ä¸ä¸ªäºè¿å¶å¯¹è±¡ï¼blobï¼" +msgstr "对象 %s ä¸æ¯ä¸ä¸ªæ°æ®ï¼blobï¼å¯¹è±¡" #: merge-recursive.c:1564 msgid "modify" @@ -621,7 +620,7 @@ msgstr "ç¥è¿ %sï¼å·²ç»åè¿ç¸åå并ï¼" msgid "Auto-merging %s" msgstr "èªå¨å并 %s" -#: merge-recursive.c:1633 git-submodule.sh:869 +#: merge-recursive.c:1633 git-submodule.sh:942 msgid "submodule" msgstr "å模ç»" @@ -691,40 +690,44 @@ msgstr "å并æªè¿åæ交" msgid "Could not parse object '%s'" msgstr "ä¸è½è§£æ对象 '%s'" -#: merge-recursive.c:2009 builtin/merge.c:696 +#: merge-recursive.c:2009 builtin/merge.c:643 msgid "Unable to write index." msgstr "ä¸è½åå ¥ç´¢å¼ã" -#: parse-options.c:494 +#: parse-options.c:485 msgid "..." msgstr "..." -#: parse-options.c:512 +#: parse-options.c:503 #, c-format msgid "usage: %s" msgstr "ç¨æ³ï¼%s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation -#: parse-options.c:516 +#: parse-options.c:507 #, c-format msgid " or: %s" msgstr " æï¼%s" # è¯è ï¼ä¸ºä¿è¯å¨è¾åºä¸å¯¹é½ï¼æ³¨æè°æ´å¥ä¸ç©ºæ ¼ï¼ -#: parse-options.c:519 +#: parse-options.c:510 #, c-format msgid " %s" msgstr " %s" -#: remote.c:1632 +#: remote.c:1686 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "æ¨çåæ¯é¢å '%s' å ± %d 个æ交ã\n" msgstr[1] "æ¨çåæ¯é¢å '%s' å ± %d 个æ交ã\n" -#: remote.c:1638 +#: remote.c:1692 +msgid " (use \"git push\" to publish your local commits)\n" +msgstr " ï¼ä½¿ç¨ \"git push\" æ¥åå¸æ¨çæ¬å°æ交ï¼\n" + +#: remote.c:1695 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -732,7 +735,12 @@ msgid_plural "" msgstr[0] "æ¨çåæ¯è½å '%s' å ± %d 个æ交ï¼å¹¶ä¸å¯ä»¥å¿«è¿ã\n" msgstr[1] "æ¨çåæ¯è½å '%s' å ± %d 个æ交ï¼å¹¶ä¸å¯ä»¥å¿«è¿ã\n" -#: remote.c:1646 +# è¯è ï¼æ³¨æä¿æåå¯¼ç©ºæ ¼ +#: remote.c:1703 +msgid " (use \"git pull\" to update your local branch)\n" +msgstr " ï¼ä½¿ç¨ \"git pull\" æ¥æ´æ°æ¨çæ¬å°åæ¯ï¼\n" + +#: remote.c:1706 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -747,19 +755,24 @@ msgstr[1] "" "æ¨çåæ¯å '%s' åºç°äºå离ï¼\n" "并ä¸åå«æ %d å %d å¤ä¸åçæ交ã\n" -#: sequencer.c:121 builtin/merge.c:864 builtin/merge.c:977 -#: builtin/merge.c:1087 builtin/merge.c:1097 +# è¯è ï¼æ³¨æä¿æåå¯¼ç©ºæ ¼ +#: remote.c:1716 +msgid " (use \"git pull\" to merge the remote branch into yours)\n" +msgstr " ï¼ä½¿ç¨ \"git pull\" æ¥å并è¿ç¨åæ¯ï¼\n" + +#: sequencer.c:123 builtin/merge.c:761 builtin/merge.c:875 builtin/merge.c:985 +#: builtin/merge.c:995 #, c-format msgid "Could not open '%s' for writing" msgstr "ä¸è½ä¸ºåå ¥æå¼ '%s'" -#: sequencer.c:123 builtin/merge.c:333 builtin/merge.c:867 -#: builtin/merge.c:1089 builtin/merge.c:1102 +#: sequencer.c:125 builtin/merge.c:333 builtin/merge.c:764 builtin/merge.c:987 +#: builtin/merge.c:1000 #, c-format msgid "Could not write to '%s'" msgstr "ä¸è½åå ¥ '%s'" -#: sequencer.c:144 +#: sequencer.c:146 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -767,7 +780,7 @@ msgstr "" "å²çªè§£å³å®æ¯åï¼ç¨ 'git add <paths>' æ 'git rm <paths>'\n" "å½ä»¤æ è®°ä¿®æ£åçæ件" -#: sequencer.c:147 +#: sequencer.c:149 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -776,214 +789,210 @@ msgstr "" "å²çªè§£å³å®æ¯åï¼ç¨ 'git add <paths>' æ 'git rm <paths>'\n" "对修æ£åçæ件åæ è®°ï¼ç¶åç¨ 'git commit' æ交" -#: sequencer.c:160 sequencer.c:765 sequencer.c:848 +#: sequencer.c:162 sequencer.c:774 sequencer.c:857 #, c-format msgid "Could not write to %s" msgstr "ä¸è½åå ¥ %s" -#: sequencer.c:163 +#: sequencer.c:165 #, c-format msgid "Error wrapping up %s" msgstr "é误æ¶å°¾ %s" -#: sequencer.c:178 +#: sequencer.c:180 msgid "Your local changes would be overwritten by cherry-pick." msgstr "æ¨çæ¬å°ä¿®æ¹å°è¢«æ£éæä½è¦çã" -#: sequencer.c:180 +#: sequencer.c:182 msgid "Your local changes would be overwritten by revert." msgstr "æ¨çæ¬å°ä¿®æ¹å°è¢«è¿åæä½è¦çã" -#: sequencer.c:183 +#: sequencer.c:185 msgid "Commit your changes or stash them to proceed." msgstr "æ交æ¨çä¿®æ¹æä¿åè¿åº¦åå继ç»ã" #. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: sequencer.c:233 +#: sequencer.c:236 #, c-format msgid "%s: Unable to write new index file" msgstr "%sï¼æ æ³åå ¥æ°ç´¢å¼æ件" -#: sequencer.c:261 +#: sequencer.c:267 msgid "Could not resolve HEAD commit\n" msgstr "ä¸è½è§£æ HEAD æ交\n" -#: sequencer.c:282 +#: sequencer.c:288 msgid "Unable to update cache tree\n" msgstr "ä¸è½æ´æ°ç¼å\n" -#: sequencer.c:327 +#: sequencer.c:333 #, c-format msgid "Could not parse commit %s\n" msgstr "ä¸è½è§£ææ交 %s\n" -#: sequencer.c:332 +#: sequencer.c:338 #, c-format msgid "Could not parse parent commit %s\n" msgstr "ä¸è½è§£æç¶æ交 %s\n" -#: sequencer.c:398 +#: sequencer.c:404 msgid "Your index file is unmerged." msgstr "æ¨çç´¢å¼æ件æªå®æå并ã" -#: sequencer.c:401 -msgid "You do not have a valid HEAD" -msgstr "æ¨æ²¡æä¸ä¸ªææç HEAD" - -#: sequencer.c:416 +#: sequencer.c:423 #, c-format msgid "Commit %s is a merge but no -m option was given." msgstr "æ交 %s æ¯ä¸ä¸ªå并æ交ä½æªæä¾ -m é项ã" -#: sequencer.c:424 +#: sequencer.c:431 #, c-format msgid "Commit %s does not have parent %d" msgstr "æ交 %s 没æç¶æ交 %d" -#: sequencer.c:428 +#: sequencer.c:435 #, c-format msgid "Mainline was specified but commit %s is not a merge." msgstr "æå®äºä¸»çº¿ä½æ交 %s ä¸æ¯ä¸ä¸ªå并ã" #. TRANSLATORS: The first %s will be "revert" or #. "cherry-pick", the second %s a SHA1 -#: sequencer.c:439 +#: sequencer.c:448 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%sï¼ä¸è½è§£æç¶æ交 %s" -#: sequencer.c:443 +#: sequencer.c:452 #, c-format msgid "Cannot get commit message for %s" msgstr "ä¸è½å¾å° %s çæ交说æ" -#: sequencer.c:527 +#: sequencer.c:536 #, c-format msgid "could not revert %s... %s" msgstr "ä¸è½è¿å %s... %s" -#: sequencer.c:528 +#: sequencer.c:537 #, c-format msgid "could not apply %s... %s" msgstr "ä¸è½åºç¨ %s... %s" -#: sequencer.c:560 +#: sequencer.c:569 msgid "empty commit set passed" msgstr "æä¾äºç©ºçæ交é" -#: sequencer.c:568 +#: sequencer.c:577 #, c-format msgid "git %s: failed to read the index" msgstr "git %sï¼æ æ³è¯»åç´¢å¼" -#: sequencer.c:573 +#: sequencer.c:582 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %sï¼æ æ³å·æ°ç´¢å¼" -#: sequencer.c:631 +#: sequencer.c:640 #, c-format msgid "Cannot %s during a %s" msgstr "æ æ³ %s å¨ä¸ä¸ª %s è¿ç¨ä¸" -#: sequencer.c:653 +#: sequencer.c:662 #, c-format msgid "Could not parse line %d." msgstr "ä¸è½è§£æ第 %d è¡ã" -#: sequencer.c:658 +#: sequencer.c:667 msgid "No commits parsed." msgstr "没ææ交被解æã" -#: sequencer.c:671 +#: sequencer.c:680 #, c-format msgid "Could not open %s" msgstr "ä¸è½æå¼ %s" -#: sequencer.c:675 +#: sequencer.c:684 #, c-format msgid "Could not read %s." msgstr "ä¸è½è¯»å %sã" -#: sequencer.c:682 +#: sequencer.c:691 #, c-format msgid "Unusable instruction sheet: %s" msgstr "æ ç¨çæ令表åï¼%s" -#: sequencer.c:710 +#: sequencer.c:719 #, c-format msgid "Invalid key: %s" msgstr "æ æé®åï¼%s" -#: sequencer.c:713 +#: sequencer.c:722 #, c-format msgid "Invalid value for %s: %s" msgstr "%s çå¼æ æï¼%s" -#: sequencer.c:725 +#: sequencer.c:734 #, c-format msgid "Malformed options sheet: %s" msgstr "éæ³çé项表åï¼%s" -#: sequencer.c:746 +#: sequencer.c:755 msgid "a cherry-pick or revert is already in progress" msgstr "ä¸ä¸ªæ£éæè¿åæä½å·²å¨è¿è¡" -#: sequencer.c:747 +#: sequencer.c:756 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "å°è¯ \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:751 +#: sequencer.c:760 #, c-format msgid "Could not create sequencer directory %s" msgstr "ä¸è½å建åºåç®å½ %s" -#: sequencer.c:767 sequencer.c:852 +#: sequencer.c:776 sequencer.c:861 #, c-format msgid "Error wrapping up %s." msgstr "é误æ¶å°¾ %sã" -#: sequencer.c:786 sequencer.c:920 +#: sequencer.c:795 sequencer.c:929 msgid "no cherry-pick or revert in progress" msgstr "æ£éæè¿åæä½å¹¶æªè¿è¡" -#: sequencer.c:788 +#: sequencer.c:797 msgid "cannot resolve HEAD" msgstr "ä¸è½è§£æ HEAD" -#: sequencer.c:790 +#: sequencer.c:799 msgid "cannot abort from a branch yet to be born" msgstr "ä¸è½ä»å°æªå»ºç«çåæ¯ç»æ¢" -#: sequencer.c:812 builtin/apply.c:4005 +#: sequencer.c:821 builtin/apply.c:4016 #, c-format msgid "cannot open %s: %s" msgstr "ä¸è½æå¼ %sï¼%s" -#: sequencer.c:815 +#: sequencer.c:824 #, c-format msgid "cannot read %s: %s" msgstr "ä¸è½è¯»å %sï¼%s" -#: sequencer.c:816 +#: sequencer.c:825 msgid "unexpected end of file" msgstr "æå¤çæ件ç»æ" -#: sequencer.c:822 +#: sequencer.c:831 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "ä¿åæ£éæ交åç HEAD æ件 '%s' æå" -#: sequencer.c:845 +#: sequencer.c:854 #, c-format msgid "Could not format %s." msgstr "ä¸è½æ ¼å¼å %sã" -#: sequencer.c:1007 +#: sequencer.c:1016 msgid "Can't revert as initial commit" msgstr "ä¸è½ä½ä¸ºåå§æ交è¿å" -#: sequencer.c:1008 +#: sequencer.c:1017 msgid "Can't cherry-pick into empty head" msgstr "ä¸è½æ£éå°ç©ºåæ¯" @@ -1007,16 +1016,21 @@ msgid "Upstream branch '%s' not stored as a remote-tracking branch" msgstr "ä¸æ¸¸åæ¯ '%s' 没æåå¨ä¸ºä¸ä¸ªè¿ç¨è·è¸ªåæ¯" #: wrapper.c:408 -#, fuzzy, c-format +#, c-format msgid "unable to access '%s': %s" -msgstr "ä¸è½å建 '%s'" +msgstr "ä¸è½è®¿é® '%s'ï¼%s" + +#: wrapper.c:423 +#, c-format +msgid "unable to access '%s'" +msgstr "ä¸è½è®¿é® '%s'" -#: wrapper.c:426 +#: wrapper.c:434 #, c-format msgid "unable to look up current user in the passwd file: %s" -msgstr "æ æ³å¨ passwd æ件ä¸æ¥è¯¢å°è¯¥ç¨æ·ï¼%s" +msgstr "æ æ³å¨å£ä»¤æ件ä¸æ¥è¯¢å°å½åç¨æ·ï¼%s" -#: wrapper.c:427 +#: wrapper.c:435 msgid "no such user" msgstr "æ æ¤ç¨æ·" @@ -1185,235 +1199,227 @@ msgstr "æªåå¹¶ï¼ %s" msgid "bug: unhandled diff status %c" msgstr "bugï¼æªå¤ççå·®å¼ç¶æ %c" -#: wt-status.c:785 +#: wt-status.c:787 msgid "You have unmerged paths." msgstr "æ¨æå°æªå并çè·¯å¾ã" # è¯è ï¼æ³¨æä¿æåå¯¼ç©ºæ ¼ -#: wt-status.c:788 wt-status.c:912 +#: wt-status.c:790 wt-status.c:914 msgid " (fix conflicts and run \"git commit\")" msgstr " ï¼è§£å³å²çªå¹¶è¿è¡ \"git commit\"ï¼" -#: wt-status.c:791 +#: wt-status.c:793 msgid "All conflicts fixed but you are still merging." msgstr "ææå²çªå·²è§£å³ä½æ¨ä»å¤äºå并ä¸ã" # è¯è ï¼æ³¨æä¿æåå¯¼ç©ºæ ¼ -#: wt-status.c:794 +#: wt-status.c:796 msgid " (use \"git commit\" to conclude merge)" msgstr " ï¼ä½¿ç¨ \"git commit\" ç»æå并ï¼" -#: wt-status.c:804 +#: wt-status.c:806 msgid "You are in the middle of an am session." msgstr "æ¨æ£å¤äºä¸ä¸ª am è¿ç¨ä¸ã" -#: wt-status.c:807 +#: wt-status.c:809 msgid "The current patch is empty." msgstr "å½åçè¡¥ä¸ä¸ºç©ºã" # è¯è ï¼æ³¨æä¿æåå¯¼ç©ºæ ¼ -#: wt-status.c:811 +#: wt-status.c:813 msgid " (fix conflicts and then run \"git am --resolved\")" msgstr " ï¼è§£å³å²çªï¼ç¶åè¿è¡ \"git am --resolved\"ï¼" # è¯è ï¼æ³¨æä¿æåå¯¼ç©ºæ ¼ -#: wt-status.c:813 +#: wt-status.c:815 msgid " (use \"git am --skip\" to skip this patch)" msgstr " ï¼ä½¿ç¨ \"git am --skip\" è·³è¿æ¤è¡¥ä¸ï¼" # è¯è ï¼æ³¨æä¿æåå¯¼ç©ºæ ¼ -#: wt-status.c:815 +#: wt-status.c:817 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " ï¼ä½¿ç¨ \"git am --abort\" æ¢å¤åæåæ¯ï¼" -#: wt-status.c:873 wt-status.c:883 +#: wt-status.c:875 wt-status.c:885 msgid "You are currently rebasing." msgstr "æ¨æ£å¨ååºã" # è¯è ï¼æ³¨æä¿æåå¯¼ç©ºæ ¼ -#: wt-status.c:876 +#: wt-status.c:878 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " ï¼è§£å³å²çªï¼ç¶åè¿è¡ \"git rebase --continue\"ï¼" # è¯è ï¼æ³¨æä¿æåå¯¼ç©ºæ ¼ -#: wt-status.c:878 +#: wt-status.c:880 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " ï¼ä½¿ç¨ \"git rebase --skip\" è·³è¿æ¤è¡¥ä¸ï¼" # è¯è ï¼æ³¨æä¿æåå¯¼ç©ºæ ¼ -#: wt-status.c:880 +#: wt-status.c:882 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " ï¼ä½¿ç¨ \"git rebase --abort\" 以æ£åºåæåæ¯ï¼" # è¯è ï¼æ³¨æä¿æåå¯¼ç©ºæ ¼ -#: wt-status.c:886 +#: wt-status.c:888 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " ï¼ææå²çªå·²è§£å³ï¼è¿è¡ \"git rebase --continue\"ï¼" -#: wt-status.c:888 +#: wt-status.c:890 msgid "You are currently splitting a commit during a rebase." msgstr "æ¨æ£å¨ååºè¿ç¨ä¸æåä¸ä¸ªæ交ã" # è¯è ï¼æ³¨æä¿æåå¯¼ç©ºæ ¼ -#: wt-status.c:891 +#: wt-status.c:893 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr " ï¼ä¸æ¦æ¨å·¥ä½ç®å½æ交干ååï¼è¿è¡ \"git rebase --continue\"ï¼" -#: wt-status.c:893 +#: wt-status.c:895 msgid "You are currently editing a commit during a rebase." msgstr "æ¨æ£å¨ååºè¿ç¨ä¸ç¼è¾ä¸ä¸ªæ交ã" # è¯è ï¼æ³¨æä¿æåå¯¼ç©ºæ ¼ -#: wt-status.c:896 +#: wt-status.c:898 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " ï¼ä½¿ç¨ \"git commit --amend\" 修补å½åæ交ï¼" # è¯è ï¼æ³¨æä¿æåå¯¼ç©ºæ ¼ -#: wt-status.c:898 +#: wt-status.c:900 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr " ï¼å½æ¨å¯¹æ¨çä¿®æ¹æ»¡æåæ§è¡ \"git rebase --continue\"ï¼" -#: wt-status.c:908 +#: wt-status.c:910 msgid "You are currently cherry-picking." msgstr "æ¨æ£å¨åæ£éæä½ã" # è¯è ï¼æ³¨æä¿æåå¯¼ç©ºæ ¼ -#: wt-status.c:915 +#: wt-status.c:917 msgid " (all conflicts fixed: run \"git commit\")" msgstr " ï¼è§£å³ææå²çªåï¼æ§è¡ \"git commit\"ï¼" -#: wt-status.c:924 +#: wt-status.c:926 msgid "You are currently bisecting." msgstr "æ¨æ£å¨åäºåæ¥æ¾ã" # è¯è ï¼æ³¨æä¿æåå¯¼ç©ºæ ¼ -#: wt-status.c:927 +#: wt-status.c:929 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " ï¼ä½¿ç¨ \"git bisect reset\" 以åå°åæåæ¯ï¼" -#: wt-status.c:978 +#: wt-status.c:980 msgid "On branch " msgstr "ä½äºåæ¯ " -#: wt-status.c:985 +#: wt-status.c:987 msgid "Not currently on any branch." msgstr "å½åä¸å¨ä»»ä½åæ¯ä¸ã" -#: wt-status.c:997 +#: wt-status.c:999 msgid "Initial commit" msgstr "åå§æ交" -#: wt-status.c:1011 -#, fuzzy +#: wt-status.c:1013 msgid "Untracked files" -msgstr "æªè·è¸ªç" +msgstr "æªè·è¸ªçæ件" -#: wt-status.c:1013 -#, fuzzy +#: wt-status.c:1015 msgid "Ignored files" -msgstr "忽ç¥ç" +msgstr "忽ç¥çæ件" -#: wt-status.c:1015 +#: wt-status.c:1017 #, c-format msgid "Untracked files not listed%s" msgstr "æªè·è¸ªçæ件没æååº%s" # è¯è ï¼ä¸æå符串æ¼æ¥ï¼å¯å é¤åå¯¼ç©ºæ ¼ -#: wt-status.c:1017 +#: wt-status.c:1019 msgid " (use -u option to show untracked files)" msgstr "ï¼ä½¿ç¨ -u åæ°æ¾ç¤ºæªè·è¸ªçæ件ï¼" -#: wt-status.c:1023 +#: wt-status.c:1025 msgid "No changes" msgstr "没æä¿®æ¹" # è¯è ï¼ä¸æå符串æ¼æ¥ï¼å¯å é¤åå¯¼ç©ºæ ¼ -#: wt-status.c:1028 -#, fuzzy, c-format +#: wt-status.c:1030 +#, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" -msgstr "ï¼ä½¿ç¨ \"git add\" å/æ \"git commit -a\"ï¼" +msgstr "ä¿®æ¹å°æªå å ¥æ交ï¼ä½¿ç¨ \"git add\" å/æ \"git commit -a\"ï¼\n" -#: wt-status.c:1031 -#, fuzzy, c-format +#: wt-status.c:1033 +#, c-format msgid "no changes added to commit\n" -msgstr "ä¿®æ¹å°æªå å ¥æ交%s\n" +msgstr "ä¿®æ¹å°æªå å ¥æ交\n" -#: wt-status.c:1034 -#, fuzzy, c-format +#: wt-status.c:1036 +#, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" -msgstr "空æ交ä½åå¨æªè·è¸ªæ件%s\n" +msgstr "æ交为空ï¼ä½æ¯åå¨å°æªè·è¸ªçæ件ï¼ä½¿ç¨ \"git add\" 建ç«è·è¸ªï¼\n" -#: wt-status.c:1037 -#, fuzzy, c-format +#: wt-status.c:1039 +#, c-format msgid "nothing added to commit but untracked files present\n" -msgstr "空æ交ä½åå¨æªè·è¸ªæ件%s\n" +msgstr "æ交为空ï¼ä½æ¯åå¨å°æªè·è¸ªçæ件\n" # è¯è ï¼ä¸æå符串æ¼æ¥ï¼å¯å é¤åå¯¼ç©ºæ ¼ -#: wt-status.c:1040 -#, fuzzy, c-format +#: wt-status.c:1042 +#, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" -msgstr "ï¼æ°å»º/æ·è´çæä»¶ä½¿ç¨ \"git add\" 建ç«è·è¸ªï¼" +msgstr "æ æ件è¦æ交ï¼å建/æ·è´æä»¶å¹¶ä½¿ç¨ \"git add\" 建ç«è·è¸ªï¼\n" -#: wt-status.c:1043 wt-status.c:1048 -#, fuzzy, c-format +#: wt-status.c:1045 wt-status.c:1050 +#, c-format msgid "nothing to commit\n" -msgstr "æ é¡»æ交%s\n" +msgstr "æ æ件è¦æ交\n" # è¯è ï¼ä¸æå符串æ¼æ¥ï¼å¯å é¤åå¯¼ç©ºæ ¼ -#: wt-status.c:1046 -#, fuzzy, c-format +#: wt-status.c:1048 +#, c-format msgid "nothing to commit (use -u to show untracked files)\n" -msgstr "ï¼ä½¿ç¨ -u æ¾ç¤ºæªè·è¸ªæ件ï¼" +msgstr "æ æ件è¦æ交ï¼ä½¿ç¨ -u æ¾ç¤ºæªè·è¸ªçæ件ï¼\n" # è¯è ï¼ä¸æå符串æ¼æ¥ï¼å¯å é¤åå¯¼ç©ºæ ¼ -#: wt-status.c:1050 -#, fuzzy, c-format +#: wt-status.c:1052 +#, c-format msgid "nothing to commit, working directory clean\n" -msgstr "ï¼å¹²åçå·¥ä½åºï¼" +msgstr "æ æ件è¦æ交ï¼å¹²åçå·¥ä½åº\n" -#: wt-status.c:1158 +#: wt-status.c:1160 msgid "HEAD (no branch)" msgstr "HEADï¼éåæ¯ï¼" # è¯è ï¼æ³¨æä¿æå¥å°¾ç©ºæ ¼ -#: wt-status.c:1164 +#: wt-status.c:1166 msgid "Initial commit on " msgstr "åå§æäº¤äº " # è¯è ï¼æ³¨æä¿æå¥å°¾ç©ºæ ¼ -#: wt-status.c:1179 +#: wt-status.c:1181 msgid "behind " msgstr "è½å " # è¯è ï¼æ³¨æä¿æå¥å°¾ç©ºæ ¼ -#: wt-status.c:1182 wt-status.c:1185 +#: wt-status.c:1184 wt-status.c:1187 msgid "ahead " msgstr "é¢å " # è¯è ï¼æ³¨æä¿æå¥å°¾ç©ºæ ¼ -#: wt-status.c:1187 +#: wt-status.c:1189 msgid ", behind " msgstr "ï¼è½å " -#: compat/precompose_utf8.c:58 builtin/clone.c:341 -#, c-format -msgid "failed to unlink '%s'" -msgstr "æ æ³å é¤ '%s'" - #: builtin/add.c:19 -#, fuzzy msgid "git add [options] [--] <filepattern>..." -msgstr "git apply [é项] [<è¡¥ä¸>...]" +msgstr "git add [é项] [--] <filepattern>..." #: builtin/add.c:62 #, c-format msgid "unexpected diff status %c" msgstr "æå¤çå·®å¼ç¶æ %c" -#: builtin/add.c:67 builtin/commit.c:229 +#: builtin/add.c:67 builtin/commit.c:231 msgid "updating files failed" msgstr "æ´æ°æ件失败" @@ -1431,7 +1437,7 @@ msgstr "è·¯å¾ '%s' å±äºæ¨¡ç» '%.*s'" msgid "Unstaged changes after refreshing the index:" msgstr "å·æ°ç´¢å¼ä¹åå°æªè¢«æåçåæ´ï¼" -#: builtin/add.c:195 builtin/add.c:460 builtin/rm.c:186 +#: builtin/add.c:195 builtin/add.c:460 builtin/rm.c:275 #, c-format msgid "pathspec '%s' did not match any files" msgstr "è·¯å¾ '%s' æªå¹é ä»»ä½æ件" @@ -1472,60 +1478,57 @@ msgstr "ä¸è½åºç¨ '%s'" msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "ä¸åè·¯å¾æ ¹æ®æ¨çä¸ä¸ª .gitignore æ件è被忽ç¥ï¼\n" -#: builtin/add.c:319 builtin/clean.c:52 builtin/fetch.c:78 builtin/mv.c:63 -#: builtin/prune-packed.c:76 builtin/push.c:388 builtin/remote.c:1253 -#: builtin/rm.c:133 +#: builtin/add.c:319 builtin/clean.c:160 builtin/fetch.c:78 builtin/mv.c:63 +#: builtin/prune-packed.c:76 builtin/push.c:396 builtin/remote.c:1253 +#: builtin/rm.c:206 msgid "dry run" -msgstr "" +msgstr "æ¼ä¹ " -#: builtin/add.c:320 builtin/apply.c:4354 builtin/commit.c:1187 -#: builtin/count-objects.c:82 builtin/fsck.c:613 builtin/log.c:1477 +#: builtin/add.c:320 builtin/apply.c:4365 builtin/commit.c:1160 +#: builtin/count-objects.c:82 builtin/fsck.c:613 builtin/log.c:1522 #: builtin/mv.c:62 builtin/read-tree.c:112 msgid "be verbose" msgstr "åé¿è¾åº" #: builtin/add.c:322 -#, fuzzy msgid "interactive picking" -msgstr "交äºå¼æ·»å 失败" +msgstr "交äºå¼æ£é" -#: builtin/add.c:323 builtin/checkout.c:1028 builtin/reset.c:248 +#: builtin/add.c:323 builtin/checkout.c:1031 builtin/reset.c:258 msgid "select hunks interactively" -msgstr "" +msgstr "交äºå¼æéæ°æ®å" #: builtin/add.c:324 msgid "edit current diff and apply" -msgstr "" +msgstr "ç¼è¾å½åå·®å¼å¹¶åºç¨" #: builtin/add.c:325 msgid "allow adding otherwise ignored files" -msgstr "" +msgstr "å 许添å 忽ç¥çæ件" #: builtin/add.c:326 -#, fuzzy msgid "update tracked files" -msgstr "æ æ³åå¨å æ件" +msgstr "æ´æ°å·²è·è¸ªçæ件" #: builtin/add.c:327 msgid "record only the fact that the path will be added later" -msgstr "" +msgstr "åªè®°å½ï¼è¯¥è·¯å¾ç¨ååæ·»å " #: builtin/add.c:328 msgid "add changes from all tracked and untracked files" -msgstr "" +msgstr "æ·»å æææ¹åçå·²è·è¸ªæ件åæªè·è¸ªæ件" #: builtin/add.c:329 -#, fuzzy msgid "don't add, only refresh the index" -msgstr "git %sï¼æ æ³å·æ°ç´¢å¼" +msgstr "ä¸æ·»å ï¼åªå·æ°ç´¢å¼" #: builtin/add.c:330 msgid "just skip files which cannot be added because of errors" -msgstr "" +msgstr "è·³è¿å åºéä¸è½æ·»å çæ件" #: builtin/add.c:331 msgid "check if - even missing - files are ignored in dry run" -msgstr "" +msgstr "æ£æ¥å¨æ¼ä¹ 模å¼ä¸æ件ï¼å³ä½¿ä¸åå¨ï¼æ¯å¦è¢«å¿½ç¥" #: builtin/add.c:353 #, c-format @@ -1558,12 +1561,12 @@ msgstr "没ææå®æ件ï¼ä¹æ²¡ææ件被添å ã\n" msgid "Maybe you wanted to say 'git add .'?\n" msgstr "ä¹è®¸æ¨æ³è¦æ§è¡ 'git add .'ï¼\n" -#: builtin/add.c:421 builtin/clean.c:95 builtin/commit.c:289 builtin/mv.c:82 -#: builtin/rm.c:162 +#: builtin/add.c:421 builtin/clean.c:203 builtin/commit.c:291 builtin/mv.c:82 +#: builtin/rm.c:235 msgid "index file corrupt" msgstr "ç´¢å¼æ件æå" -#: builtin/add.c:481 builtin/apply.c:4450 builtin/mv.c:229 builtin/rm.c:260 +#: builtin/add.c:481 builtin/apply.c:4461 builtin/mv.c:229 builtin/rm.c:370 msgid "Unable to write new index file" msgstr "æ æ³åå ¥æ°ç´¢å¼æ件" @@ -1691,28 +1694,24 @@ msgstr "æ æ³è¯»å符å·é¾æ¥ %s" msgid "unable to open or read %s" msgstr "ä¸è½æå¼æ读å %s" -#: builtin/apply.c:2149 -msgid "oops" -msgstr "åå" - -#: builtin/apply.c:2671 +#: builtin/apply.c:2682 #, c-format msgid "invalid start of line: '%c'" msgstr "æ æçè¡é¦å符ï¼'%c'" -#: builtin/apply.c:2789 +#: builtin/apply.c:2800 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." -msgstr[0] "å #%d æååºç¨äº %d (å移 %d è¡ï¼" -msgstr[1] "å #%d æååºç¨äº %d (å移 %d è¡ï¼" +msgstr[0] "å #%d æååºç¨äº %dï¼å移 %d è¡ï¼" +msgstr[1] "å #%d æååºç¨äº %dï¼å移 %d è¡ï¼" -#: builtin/apply.c:2801 +#: builtin/apply.c:2812 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "ä¸ä¸æåå°å°ï¼%ld/%ldï¼ä»¥å¨ç¬¬ %d è¡åºç¨è¡¥ä¸ç段" -#: builtin/apply.c:2807 +#: builtin/apply.c:2818 #, c-format msgid "" "while searching for:\n" @@ -1721,319 +1720,318 @@ msgstr "" "å½æ¥è¯¢ï¼\n" "%.*s" -#: builtin/apply.c:2826 +#: builtin/apply.c:2837 #, c-format msgid "missing binary patch data for '%s'" msgstr "缺失 '%s' çäºè¿å¶è¡¥ä¸æ°æ®" -#: builtin/apply.c:2929 +#: builtin/apply.c:2940 #, c-format msgid "binary patch does not apply to '%s'" msgstr "äºè¿å¶è¡¥ä¸æªåºç¨å° '%s'" -#: builtin/apply.c:2935 +#: builtin/apply.c:2946 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "å° '%s' çäºè¿å¶è¡¥ä¸äº§çäºä¸æ£ç¡®çç»æï¼åºä¸º %sï¼å´ä¸º %sï¼" -#: builtin/apply.c:2956 +#: builtin/apply.c:2967 #, c-format msgid "patch failed: %s:%ld" msgstr "æè¡¥ä¸å¤±è´¥ï¼%s:%ld" -#: builtin/apply.c:3078 +#: builtin/apply.c:3089 #, c-format msgid "cannot checkout %s" msgstr "ä¸è½æ£åº %s" -#: builtin/apply.c:3123 builtin/apply.c:3132 builtin/apply.c:3176 +#: builtin/apply.c:3134 builtin/apply.c:3143 builtin/apply.c:3187 #, c-format msgid "read of %s failed" msgstr "读å %s 失败" -#: builtin/apply.c:3156 builtin/apply.c:3378 +#: builtin/apply.c:3167 builtin/apply.c:3389 #, c-format msgid "path %s has been renamed/deleted" msgstr "è·¯å¾ %s å·²ç»è¢«éå½å/å é¤" -#: builtin/apply.c:3237 builtin/apply.c:3392 +#: builtin/apply.c:3248 builtin/apply.c:3403 #, c-format msgid "%s: does not exist in index" msgstr "%sï¼ä¸åå¨äºç´¢å¼ä¸" -#: builtin/apply.c:3241 builtin/apply.c:3384 builtin/apply.c:3406 +#: builtin/apply.c:3252 builtin/apply.c:3395 builtin/apply.c:3417 #, c-format msgid "%s: %s" msgstr "%sï¼%s" -#: builtin/apply.c:3246 builtin/apply.c:3400 +#: builtin/apply.c:3257 builtin/apply.c:3411 #, c-format msgid "%s: does not match index" msgstr "%sï¼åç´¢å¼ä¸å¹é " -#: builtin/apply.c:3348 +#: builtin/apply.c:3359 msgid "removal patch leaves file contents" msgstr "移é¤è¡¥ä¸ä»çä¸äºæ件å 容" -#: builtin/apply.c:3417 +#: builtin/apply.c:3428 #, c-format msgid "%s: wrong type" msgstr "%sï¼é误类å" -#: builtin/apply.c:3419 +#: builtin/apply.c:3430 #, c-format msgid "%s has type %o, expected %o" msgstr "%s çç±»åæ¯ %oï¼åºä¸º %o" -#: builtin/apply.c:3520 +#: builtin/apply.c:3531 #, c-format msgid "%s: already exists in index" msgstr "%sï¼å·²ç»åå¨äºç´¢å¼ä¸" -#: builtin/apply.c:3523 +#: builtin/apply.c:3534 #, c-format msgid "%s: already exists in working directory" msgstr "%sï¼å·²ç»åå¨äºå·¥ä½åºä¸" -#: builtin/apply.c:3543 +#: builtin/apply.c:3554 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "%2$s çæ°æ¨¡å¼ï¼%1$oï¼åæ§æ¨¡å¼ï¼%3$oï¼ä¸å¹é " -#: builtin/apply.c:3548 +#: builtin/apply.c:3559 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "%2$s çæ°æ¨¡å¼ï¼%1$oï¼å %4$s çæ§æ¨¡å¼ï¼%3$oï¼ä¸å¹é " -#: builtin/apply.c:3556 +#: builtin/apply.c:3567 #, c-format msgid "%s: patch does not apply" msgstr "%sï¼è¡¥ä¸æªåºç¨" -#: builtin/apply.c:3569 +#: builtin/apply.c:3580 #, c-format msgid "Checking patch %s..." msgstr "æ£æ¥è¡¥ä¸ %s..." -#: builtin/apply.c:3624 builtin/checkout.c:215 builtin/reset.c:158 +#: builtin/apply.c:3635 builtin/checkout.c:215 builtin/reset.c:124 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "å¯¹è·¯å¾ '%s' ç make_cache_entry æä½å¤±è´¥" -#: builtin/apply.c:3767 +#: builtin/apply.c:3778 #, c-format msgid "unable to remove %s from index" msgstr "ä¸è½ä»ç´¢å¼ä¸ç§»é¤ %s" -#: builtin/apply.c:3795 +#: builtin/apply.c:3806 #, c-format msgid "corrupt patch for subproject %s" msgstr "åé¡¹ç® %s æåçè¡¥ä¸" -#: builtin/apply.c:3799 +#: builtin/apply.c:3810 #, c-format msgid "unable to stat newly created file '%s'" msgstr "ä¸è½æ举æ°å»ºæ件 '%s' çç¶æ" -#: builtin/apply.c:3804 +#: builtin/apply.c:3815 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "ä¸è½ä¸ºæ°å»ºæ件 %s å建å端åå¨" -#: builtin/apply.c:3807 builtin/apply.c:3915 +#: builtin/apply.c:3818 builtin/apply.c:3926 #, c-format msgid "unable to add cache entry for %s" msgstr "æ æ³ä¸º %s æ·»å ç¼åæ¡ç®" -#: builtin/apply.c:3840 +#: builtin/apply.c:3851 #, c-format msgid "closing file '%s'" msgstr "å ³éæ件 '%s'" -#: builtin/apply.c:3889 +#: builtin/apply.c:3900 #, c-format msgid "unable to write file '%s' mode %o" msgstr "ä¸è½åæ件 '%s' æé %o" -#: builtin/apply.c:3976 +#: builtin/apply.c:3987 #, c-format msgid "Applied patch %s cleanly." msgstr "æååºç¨è¡¥ä¸ %sã" -#: builtin/apply.c:3984 +#: builtin/apply.c:3995 msgid "internal error" msgstr "å é¨é误" #. Say this even without --verbose -#: builtin/apply.c:3987 +#: builtin/apply.c:3998 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "åºç¨ %%s 个补ä¸ï¼å ¶ä¸ %d 个被æç»..." msgstr[1] "åºç¨ %%s 个补ä¸ï¼å ¶ä¸ %d 个被æç»..." -#: builtin/apply.c:3997 +#: builtin/apply.c:4008 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "æªç .rej æ件å为 %.*s.rej" -#: builtin/apply.c:4018 +#: builtin/apply.c:4029 #, c-format msgid "Hunk #%d applied cleanly." msgstr "第 #%d 个ç段æååºç¨ã" -#: builtin/apply.c:4021 +#: builtin/apply.c:4032 #, c-format msgid "Rejected hunk #%d." msgstr "æç»ç¬¬ #%d 个ç段ã" -#: builtin/apply.c:4171 +#: builtin/apply.c:4182 msgid "unrecognized input" msgstr "æªè½è¯å«çè¾å ¥" -#: builtin/apply.c:4182 +#: builtin/apply.c:4193 msgid "unable to read index file" msgstr "æ æ³è¯»åç´¢å¼æ件" -#: builtin/apply.c:4301 builtin/apply.c:4304 builtin/clone.c:91 +#: builtin/apply.c:4312 builtin/apply.c:4315 builtin/clone.c:91 #: builtin/fetch.c:63 msgid "path" msgstr "è·¯å¾" -#: builtin/apply.c:4302 +#: builtin/apply.c:4313 msgid "don't apply changes matching the given path" msgstr "ä¸è¦åºç¨ä¸ç»åºè·¯å¾åå¹é çåæ´" -#: builtin/apply.c:4305 +#: builtin/apply.c:4316 msgid "apply changes matching the given path" msgstr "åºç¨ä¸ç»åºè·¯å¾åå¹é çåæ´" -#: builtin/apply.c:4307 +#: builtin/apply.c:4318 msgid "num" msgstr "æ°å" -#: builtin/apply.c:4308 +#: builtin/apply.c:4319 msgid "remove <num> leading slashes from traditional diff paths" -msgstr "ä»ä¼ ç»ç diff è·¯å¾ä¸ç§»é¤ <æ°å> 个å导路å¾" +msgstr "ä»ä¼ ç»ç diff è·¯å¾ä¸ç§»é¤æå®æ°éçå导æ线" -#: builtin/apply.c:4311 +#: builtin/apply.c:4322 msgid "ignore additions made by the patch" msgstr "忽ç¥è¡¥ä¸ä¸çæ·»å çæ件" -#: builtin/apply.c:4313 +#: builtin/apply.c:4324 msgid "instead of applying the patch, output diffstat for the input" msgstr "ä¸åºç¨è¡¥ä¸ï¼èæ¯æ¾ç¤ºè¾å ¥çå·®å¼ç»è®¡ï¼diffstatï¼" -#: builtin/apply.c:4317 -#, fuzzy +#: builtin/apply.c:4328 msgid "show number of added and deleted lines in decimal notation" -msgstr "以æ°åæ¹å¼æ¾ç¤ºæ·»å æå é¤è¡çæ°é" +msgstr "以åè¿å¶æ°æ¾ç¤ºæ·»å åå é¤çè¡æ°" -#: builtin/apply.c:4319 +#: builtin/apply.c:4330 msgid "instead of applying the patch, output a summary for the input" msgstr "ä¸åºç¨è¡¥ä¸ï¼èæ¯æ¾ç¤ºè¾å ¥çæ¦è¦" -#: builtin/apply.c:4321 +#: builtin/apply.c:4332 msgid "instead of applying the patch, see if the patch is applicable" msgstr "ä¸åºç¨è¡¥ä¸ï¼èæ¯æ¥çè¡¥ä¸æ¯å¦å¯åºç¨" -#: builtin/apply.c:4323 +#: builtin/apply.c:4334 msgid "make sure the patch is applicable to the current index" msgstr "确认补ä¸å¯ä»¥åºç¨å°å½åç´¢å¼" -#: builtin/apply.c:4325 +#: builtin/apply.c:4336 msgid "apply a patch without touching the working tree" msgstr "åºç¨è¡¥ä¸èä¸ä¿®æ¹å·¥ä½åº" -#: builtin/apply.c:4327 +#: builtin/apply.c:4338 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "è¿åºç¨æ¤è¡¥ä¸ï¼ä¸ --stat/--summary/--check é项åæ¶ä½¿ç¨ï¼" -#: builtin/apply.c:4329 +#: builtin/apply.c:4340 msgid "attempt three-way merge if a patch does not apply" msgstr "å¦æä¸ä¸ªè¡¥ä¸ä¸è½åºç¨åå°è¯ä¸è·¯å并" -#: builtin/apply.c:4331 +#: builtin/apply.c:4342 msgid "build a temporary index based on embedded index information" msgstr "å建ä¸ä¸ªä¸´æ¶ç´¢å¼åºäºåµå ¥çç´¢å¼ä¿¡æ¯" -#: builtin/apply.c:4333 builtin/checkout-index.c:197 builtin/ls-files.c:460 +#: builtin/apply.c:4344 builtin/checkout-index.c:197 builtin/ls-files.c:460 msgid "paths are separated with NUL character" msgstr "è·¯å¾ä»¥ NUL å符åé" -#: builtin/apply.c:4336 +#: builtin/apply.c:4347 msgid "ensure at least <n> lines of context match" msgstr "ç¡®ä¿è³å°å¹é <n> è¡ä¸ä¸æ" -#: builtin/apply.c:4337 +#: builtin/apply.c:4348 msgid "action" msgstr "å¨ä½" -#: builtin/apply.c:4338 +#: builtin/apply.c:4349 msgid "detect new or modified lines that have whitespace errors" msgstr "æ£æ¥æ°å¢åä¿®æ¹çè¡ä¸é´ç空ç½å符滥ç¨" -#: builtin/apply.c:4341 builtin/apply.c:4344 +#: builtin/apply.c:4352 builtin/apply.c:4355 msgid "ignore changes in whitespace when finding context" msgstr "æ¥æ¾ä¸ä¸ææ¶å¿½ç¥ç©ºç½å符çåæ´" -#: builtin/apply.c:4347 +#: builtin/apply.c:4358 msgid "apply the patch in reverse" msgstr "åååºç¨è¡¥ä¸" -#: builtin/apply.c:4349 +#: builtin/apply.c:4360 msgid "don't expect at least one line of context" msgstr "æ éè³å°ä¸è¡ä¸ä¸æ" -#: builtin/apply.c:4351 +#: builtin/apply.c:4362 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "å°æç»çè¡¥ä¸ç段ä¿åå¨å¯¹åºç *.rej æ件ä¸" -#: builtin/apply.c:4353 +#: builtin/apply.c:4364 msgid "allow overlapping hunks" msgstr "å 许éå çè¡¥ä¸ç段" -#: builtin/apply.c:4356 +#: builtin/apply.c:4367 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "å 许ä¸æ£ç¡®çæ件æ«å°¾æ¢è¡ç¬¦" -#: builtin/apply.c:4359 +#: builtin/apply.c:4370 msgid "do not trust the line counts in the hunk headers" msgstr "ä¸ä¿¡ä»»è¡¥ä¸ç段ç头信æ¯ä¸çè¡å·" -#: builtin/apply.c:4361 +#: builtin/apply.c:4372 msgid "root" msgstr "æ ¹ç®å½" -#: builtin/apply.c:4362 +#: builtin/apply.c:4373 msgid "prepend <root> to all filenames" msgstr "为æææ件ååæ·»å <æ ¹ç®å½>" -#: builtin/apply.c:4384 +#: builtin/apply.c:4395 msgid "--3way outside a repository" msgstr "--3way å¨ä¸ä¸ªçæ¬åºä¹å¤" -#: builtin/apply.c:4392 +#: builtin/apply.c:4403 msgid "--index outside a repository" msgstr "--index å¨ä¸ä¸ªçæ¬åºä¹å¤" -#: builtin/apply.c:4395 +#: builtin/apply.c:4406 msgid "--cached outside a repository" msgstr "--cached å¨ä¸ä¸ªçæ¬åºä¹å¤" -#: builtin/apply.c:4411 +#: builtin/apply.c:4422 #, c-format msgid "can't open patch '%s'" msgstr "ä¸è½æå¼è¡¥ä¸ '%s'" -#: builtin/apply.c:4425 +#: builtin/apply.c:4436 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "æå¶ä¸ä»æ %d 个空ç½å符误ç¨" msgstr[1] "æå¶ä¸ä»æ %d 个空ç½å符误ç¨" -#: builtin/apply.c:4431 builtin/apply.c:4441 +#: builtin/apply.c:4442 builtin/apply.c:4452 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -2077,135 +2075,131 @@ msgstr "git archiveï¼åºä¸ºå·æ°" #: builtin/bisect--helper.c:7 msgid "git bisect--helper --next-all [--no-checkout]" -msgstr "" +msgstr "git bisect--helper --next-all [--no-checkout]" #: builtin/bisect--helper.c:17 msgid "perform 'git bisect next'" -msgstr "" +msgstr "æ§è¡ 'git bisect next'" #: builtin/bisect--helper.c:19 msgid "update BISECT_HEAD instead of checking out the current commit" -msgstr "" +msgstr "æ´æ° BISECT_HEAD èéæ£åºå½åæ交" #: builtin/blame.c:25 msgid "git blame [options] [rev-opts] [rev] [--] file" -msgstr "" +msgstr "git blame [é项] [çæ¬é项] [çæ¬] [--] æ件" #: builtin/blame.c:30 builtin/shortlog.c:15 msgid "[rev-opts] are documented in git-rev-list(1)" -msgstr "" +msgstr "[çæ¬é项] çæ档记å½å¨ git-rev-list(1) ä¸" -#: builtin/blame.c:2316 +#: builtin/blame.c:2364 msgid "Show blame entries as we find them, incrementally" -msgstr "" +msgstr "å¢éå¼å°æ¾ç¤ºåç°ç blame æ¡ç®" -#: builtin/blame.c:2317 +#: builtin/blame.c:2365 msgid "Show blank SHA-1 for boundary commits (Default: off)" -msgstr "" +msgstr "è¾¹çæ交æ¾ç¤ºç©ºç SHA-1ï¼é»è®¤ï¼å ³éï¼" -#: builtin/blame.c:2318 +#: builtin/blame.c:2366 msgid "Do not treat root commits as boundaries (Default: off)" -msgstr "" +msgstr "ä¸ææ ¹æ交ä½ä¸ºè¾¹çï¼é»è®¤ï¼å ³éï¼" -#: builtin/blame.c:2319 -#, fuzzy +#: builtin/blame.c:2367 msgid "Show work cost statistics" -msgstr "æ¾ç¤ºå·¥ä½åºç¶æ" +msgstr "æ¾ç¤ºå½ä»¤æ¶èç»è®¡" -#: builtin/blame.c:2320 +#: builtin/blame.c:2368 msgid "Show output score for blame entries" -msgstr "" +msgstr "æ¾ç¤ºå¤æ blame æ¡ç®ä½ç§»çå¾åè¯æä¿¡æ¯" -#: builtin/blame.c:2321 +#: builtin/blame.c:2369 msgid "Show original filename (Default: auto)" -msgstr "" +msgstr "æ¾ç¤ºåå§æ件åï¼é»è®¤ï¼èªå¨ï¼" -#: builtin/blame.c:2322 +#: builtin/blame.c:2370 msgid "Show original linenumber (Default: off)" -msgstr "" +msgstr "æ¾ç¤ºåå§çè¡å·ï¼é»è®¤ï¼å ³éï¼" -#: builtin/blame.c:2323 +#: builtin/blame.c:2371 msgid "Show in a format designed for machine consumption" -msgstr "" +msgstr "æ¾ç¤ºä¸ºä¸ä¸ªéåæºå¨è¯»åçæ ¼å¼" -#: builtin/blame.c:2324 +#: builtin/blame.c:2372 msgid "Show porcelain format with per-line commit information" -msgstr "" +msgstr "为æ¯ä¸è¡æ¾ç¤ºæºå¨éç¨çæ交信æ¯" -#: builtin/blame.c:2325 +#: builtin/blame.c:2373 msgid "Use the same output mode as git-annotate (Default: off)" -msgstr "" +msgstr "使ç¨å git-annotate ç¸åçè¾åºæ¨¡å¼ï¼é»è®¤ï¼å ³éï¼" -#: builtin/blame.c:2326 +#: builtin/blame.c:2374 msgid "Show raw timestamp (Default: off)" -msgstr "" +msgstr "æ¾ç¤ºåå§æ¶é´æ³ï¼é»è®¤ï¼å ³éï¼" -#: builtin/blame.c:2327 +#: builtin/blame.c:2375 msgid "Show long commit SHA1 (Default: off)" -msgstr "" +msgstr "æ¾ç¤ºé¿çSHA1æ交å·ï¼é»è®¤ï¼å ³éï¼" -#: builtin/blame.c:2328 +#: builtin/blame.c:2376 msgid "Suppress author name and timestamp (Default: off)" -msgstr "" +msgstr "éèä½è åååæ¶é´æ³ï¼é»è®¤ï¼å ³éï¼" -#: builtin/blame.c:2329 +#: builtin/blame.c:2377 msgid "Show author email instead of name (Default: off)" -msgstr "" +msgstr "æ¾ç¤ºä½è çé®ç®±èä¸æ¯ååï¼é»è®¤ï¼å ³éï¼" -#: builtin/blame.c:2330 +#: builtin/blame.c:2378 msgid "Ignore whitespace differences" -msgstr "" +msgstr "忽ç¥ç©ºç½å·®å¼" -#: builtin/blame.c:2331 +#: builtin/blame.c:2379 msgid "Spend extra cycles to find better match" -msgstr "" +msgstr "è±è´¹é¢å¤ç循ç¯æ¥æ¾å°æ´å¥½çå¹é " -#: builtin/blame.c:2332 +#: builtin/blame.c:2380 msgid "Use revisions from <file> instead of calling git-rev-list" -msgstr "" +msgstr "使ç¨æ¥èª <file> ç修订éèä¸æ¯è°ç¨ git-rev-list" -#: builtin/blame.c:2333 -#, fuzzy +#: builtin/blame.c:2381 msgid "Use <file>'s contents as the final image" -msgstr "æ·»å æ件å 容è³ç´¢å¼" +msgstr "ä½¿ç¨ <file> çå 容ä½ä¸ºæç»çå¾ç" -#: builtin/blame.c:2334 builtin/blame.c:2335 +#: builtin/blame.c:2382 builtin/blame.c:2383 msgid "score" -msgstr "" +msgstr "å¾å" -#: builtin/blame.c:2334 +#: builtin/blame.c:2382 msgid "Find line copies within and across files" -msgstr "" +msgstr "æ¾å°æ件å åè·¨æ件çè¡æ·è´" -#: builtin/blame.c:2335 +#: builtin/blame.c:2383 msgid "Find line movements within and across files" -msgstr "" +msgstr "æ¾å°æ件å åè·¨æ件çè¡ç§»å¨" -#: builtin/blame.c:2336 -#, fuzzy +#: builtin/blame.c:2384 msgid "n,m" -msgstr "æ°å" +msgstr "n,m" -#: builtin/blame.c:2336 +#: builtin/blame.c:2384 msgid "Process only line range n,m, counting from 1" -msgstr "" +msgstr "åªå¤çè¡èå´å¨ n å m ä¹é´çï¼ä» 1 å¼å§" #: builtin/branch.c:23 msgid "git branch [options] [-r | -a] [--merged | --no-merged]" -msgstr "" +msgstr "git branch [é项] [-r | -a] [--merged | --no-merged]" #: builtin/branch.c:24 msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]" -msgstr "" +msgstr "git branch [é项] [-l] [-f] <åæ¯å> [<èµ·å§ç¹>]" #: builtin/branch.c:25 -#, fuzzy msgid "git branch [options] [-r] (-d | -D) <branchname>..." -msgstr "git apply [é项] [<è¡¥ä¸>...]" +msgstr "git branch [é项] [-r] (-d | -D) <åæ¯å>..." #: builtin/branch.c:26 msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>" -msgstr "" +msgstr "git branch [é项] (-m | -M) [<æ§åæ¯>] <æ°åæ¯>" # è¯è ï¼ä¿æåæ¢è¡æ ¼å¼ï¼å¨è¾åºæ¶ %s çæ¿ä»£å 容ä¼è®©å符串åé¿ #: builtin/branch.c:145 @@ -2227,294 +2221,291 @@ msgstr "" "并æªå é¤åæ¯ '%s'ï¼ è½ç¶å®å·²ç»åå¹¶å° HEADï¼\n" " ç¶èå´å°æªè¢«å并å°åæ¯ '%s' ã" -#: builtin/branch.c:181 +#: builtin/branch.c:163 +#, c-format +msgid "Couldn't look up commit object for '%s'" +msgstr "æ æ³æ¥è¯¢ '%s' æåçæ交对象" + +#: builtin/branch.c:167 +#, c-format +msgid "" +"The branch '%s' is not fully merged.\n" +"If you are sure you want to delete it, run 'git branch -D %s'." +msgstr "" +"åæ¯ '%s' 没æå®å ¨å并ã\n" +"å¦ææ¨ç¡®è®¤è¦å é¤å®ï¼æ§è¡ 'git branch -D %s'ã" + +#: builtin/branch.c:180 +msgid "Update of config-file failed" +msgstr "æ æ³æ´æ° config æ件" + +#: builtin/branch.c:208 msgid "cannot use -a with -d" msgstr "ä¸è½å° -a å -d åæ¶ä½¿ç¨" -#: builtin/branch.c:187 +#: builtin/branch.c:214 msgid "Couldn't look up commit object for HEAD" msgstr "æ æ³æ¥è¯¢ HEAD æåçæ交对象" -#: builtin/branch.c:192 +#: builtin/branch.c:222 #, c-format msgid "Cannot delete the branch '%s' which you are currently on." msgstr "æ æ³å é¤æ¨å½åæå¨çåæ¯ '%s'ã" -#: builtin/branch.c:203 +#: builtin/branch.c:235 #, c-format msgid "remote branch '%s' not found." msgstr "è¿ç¨åæ¯ '%s' æªåç°ã" -#: builtin/branch.c:204 +#: builtin/branch.c:236 #, c-format msgid "branch '%s' not found." msgstr "åæ¯ '%s' æªåç°ã" -#: builtin/branch.c:211 -#, c-format -msgid "Couldn't look up commit object for '%s'" -msgstr "æ æ³æ¥è¯¢ '%s' æåçæ交对象" - -#: builtin/branch.c:217 -#, c-format -msgid "" -"The branch '%s' is not fully merged.\n" -"If you are sure you want to delete it, run 'git branch -D %s'." -msgstr "" -"åæ¯ '%s' 没æå®å ¨å并ã\n" -"å¦ææ¨ç¡®è®¤è¦å é¤å®ï¼æ§è¡ 'git branch -D %s'ã" - -#: builtin/branch.c:226 +#: builtin/branch.c:250 #, c-format msgid "Error deleting remote branch '%s'" msgstr "å é¤è¿ç¨åæ¯ '%s' æ¶åºé" -#: builtin/branch.c:227 +#: builtin/branch.c:251 #, c-format msgid "Error deleting branch '%s'" msgstr "å é¤åæ¯ '%s' æ¶åºé" -#: builtin/branch.c:234 +#: builtin/branch.c:258 #, c-format msgid "Deleted remote branch %s (was %s).\n" msgstr "å·²å é¤è¿ç¨åæ¯ %sï¼æ¾ä¸º %sï¼ã\n" -#: builtin/branch.c:235 +#: builtin/branch.c:259 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "å·²å é¤åæ¯ %sï¼æ¾ä¸º %sï¼ã\n" -#: builtin/branch.c:240 -msgid "Update of config-file failed" -msgstr "æ æ³æ´æ° config æ件" - -#: builtin/branch.c:338 +#: builtin/branch.c:361 #, c-format msgid "branch '%s' does not point at a commit" msgstr "åæ¯ '%s' æªæåä¸ä¸ªæ交" -#: builtin/branch.c:410 +#: builtin/branch.c:433 #, c-format msgid "[%s: behind %d]" msgstr "[%sï¼è½å %d]" -#: builtin/branch.c:412 +#: builtin/branch.c:435 #, c-format msgid "[behind %d]" msgstr "[è½å %d]" -#: builtin/branch.c:416 +#: builtin/branch.c:439 #, c-format msgid "[%s: ahead %d]" msgstr "[%sï¼é¢å %d]" -#: builtin/branch.c:418 +#: builtin/branch.c:441 #, c-format msgid "[ahead %d]" msgstr "[é¢å %d]" -#: builtin/branch.c:421 +#: builtin/branch.c:444 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "[%sï¼é¢å %dï¼è½å %d]" -#: builtin/branch.c:424 +#: builtin/branch.c:447 #, c-format msgid "[ahead %d, behind %d]" msgstr "[é¢å %dï¼è½å %d]" -#: builtin/branch.c:537 +#: builtin/branch.c:560 msgid "(no branch)" msgstr "ï¼éåæ¯ï¼" -#: builtin/branch.c:602 +#: builtin/branch.c:625 msgid "some refs could not be read" msgstr "ä¸äºå¼ç¨ä¸è½è¯»å" -#: builtin/branch.c:615 +#: builtin/branch.c:638 msgid "cannot rename the current branch while not on any." msgstr "æ æ³éå½åå½ååæ¯å 为ä¸å¤äºä»»ä½åæ¯ä¸ã" -#: builtin/branch.c:625 +#: builtin/branch.c:648 #, c-format msgid "Invalid branch name: '%s'" msgstr "æ æçåæ¯åï¼'%s'" -#: builtin/branch.c:640 +#: builtin/branch.c:663 msgid "Branch rename failed" msgstr "åæ¯éå½å失败" -#: builtin/branch.c:644 +#: builtin/branch.c:667 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "éå½åæä¸ä¸ªé误å½åçæ§åæ¯ '%s'" -#: builtin/branch.c:648 +#: builtin/branch.c:671 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "åæ¯éå½å为 %sï¼ä½ HEAD 没ææ´æ°ï¼" -#: builtin/branch.c:655 +#: builtin/branch.c:678 msgid "Branch is renamed, but update of config-file failed" msgstr "åæ¯è¢«éå½åï¼ä½æ´æ° config æ件失败" -#: builtin/branch.c:670 +#: builtin/branch.c:693 #, c-format msgid "malformed object name %s" msgstr "éæ³ç对象å %s" -#: builtin/branch.c:694 +#: builtin/branch.c:717 #, c-format msgid "could not write branch description template: %s" msgstr "ä¸è½ååæ¯æ述模çï¼%s" -#: builtin/branch.c:724 -#, fuzzy +#: builtin/branch.c:747 msgid "Generic options" -msgstr "æ æé项ï¼%s" +msgstr "éç¨é项" -#: builtin/branch.c:726 +#: builtin/branch.c:749 msgid "show hash and subject, give twice for upstream branch" -msgstr "" +msgstr "æ¾ç¤ºåå¸å¼å主é¢ï¼è¥åæ°åºç°ä¸¤æ¬¡åæ¾ç¤ºä¸æ¸¸åæ¯" -#: builtin/branch.c:727 +#: builtin/branch.c:750 msgid "suppress informational messages" -msgstr "" +msgstr "ä¸æ¾ç¤ºä¿¡æ¯" -#: builtin/branch.c:728 +#: builtin/branch.c:751 msgid "set up tracking mode (see git-pull(1))" -msgstr "" +msgstr "设置è·è¸ªæ¨¡å¼ï¼åè§ git-pull(1)ï¼" -#: builtin/branch.c:730 +#: builtin/branch.c:753 msgid "change upstream info" -msgstr "" +msgstr "æ¹åä¸æ¸¸ä¿¡æ¯" -#: builtin/branch.c:734 -#, fuzzy +#: builtin/branch.c:757 msgid "use colored output" -msgstr "ä¸è½è¾åºéå®å" +msgstr "使ç¨å½©è²è¾åº" -#: builtin/branch.c:735 -#, fuzzy +#: builtin/branch.c:758 msgid "act on remote-tracking branches" -msgstr "%s 没ææ¥èª %s çè¿ç¨è·è¸ªåæ¯" +msgstr "ä½ç¨äºè¿ç¨è·è¸ªåæ¯" -#: builtin/branch.c:738 builtin/branch.c:744 builtin/branch.c:765 -#: builtin/branch.c:771 builtin/commit.c:1395 builtin/commit.c:1396 -#: builtin/commit.c:1397 builtin/commit.c:1398 builtin/tag.c:470 -#, fuzzy +#: builtin/branch.c:761 builtin/branch.c:767 builtin/branch.c:788 +#: builtin/branch.c:794 builtin/commit.c:1378 builtin/commit.c:1379 +#: builtin/commit.c:1380 builtin/commit.c:1381 builtin/tag.c:470 msgid "commit" -msgstr "ï¼åæ交ï¼\n" +msgstr "æ交" -#: builtin/branch.c:739 builtin/branch.c:745 +#: builtin/branch.c:762 builtin/branch.c:768 msgid "print only branches that contain the commit" -msgstr "" +msgstr "åªæå°å å«è¯¥æ交çåæ¯" -#: builtin/branch.c:751 +#: builtin/branch.c:774 msgid "Specific git-branch actions:" -msgstr "" +msgstr "å ·ä½ç git-branch å¨ä½ï¼" -#: builtin/branch.c:752 +#: builtin/branch.c:775 msgid "list both remote-tracking and local branches" -msgstr "" +msgstr "ååºè¿ç¨è·è¸ªåæ¬å°åæ¯" -#: builtin/branch.c:754 +#: builtin/branch.c:777 msgid "delete fully merged branch" -msgstr "" +msgstr "å é¤å®å ¨å并çåæ¯" -#: builtin/branch.c:755 +#: builtin/branch.c:778 msgid "delete branch (even if not merged)" -msgstr "" +msgstr "å é¤åæ¯ï¼å³ä½¿æ²¡æå并ï¼" -#: builtin/branch.c:756 +#: builtin/branch.c:779 msgid "move/rename a branch and its reflog" -msgstr "" +msgstr "移å¨/éå½åä¸ä¸ªåæ¯ï¼ä»¥åå®çå¼ç¨æ¥å¿" -#: builtin/branch.c:757 +#: builtin/branch.c:780 msgid "move/rename a branch, even if target exists" -msgstr "" +msgstr "移å¨/éå½åä¸ä¸ªåæ¯ï¼å³ä½¿ç®æ å·²åå¨" -#: builtin/branch.c:758 -#, fuzzy +#: builtin/branch.c:781 msgid "list branch names" -msgstr "æ æçåæ¯åï¼'%s'" +msgstr "ååºåæ¯å" -#: builtin/branch.c:759 +#: builtin/branch.c:782 msgid "create the branch's reflog" -msgstr "" +msgstr "å建åæ¯çå¼ç¨æ¥å¿" -#: builtin/branch.c:761 +#: builtin/branch.c:784 msgid "edit the description for the branch" -msgstr "" +msgstr "æ è®°åæ¯çæè¿°" -#: builtin/branch.c:762 -#, fuzzy +#: builtin/branch.c:785 msgid "force creation (when already exists)" -msgstr "è¿ç¨ %s å·²ç»åå¨ã" +msgstr "强å¶å建ï¼å½å·²ç»åå¨ï¼" -#: builtin/branch.c:765 -#, fuzzy +#: builtin/branch.c:788 msgid "print only not merged branches" -msgstr "æ æ³ç§»é¤åæ¯ %s" +msgstr "åªæå°æ²¡æå并çåæ¯" -#: builtin/branch.c:771 +#: builtin/branch.c:794 msgid "print only merged branches" -msgstr "" +msgstr "åªæå°å并çåæ¯" -#: builtin/branch.c:775 +#: builtin/branch.c:798 msgid "list branches in columns" -msgstr "" +msgstr "以åçæ¹å¼æ¾ç¤ºåæ¯" -#: builtin/branch.c:788 +#: builtin/branch.c:811 msgid "Failed to resolve HEAD as a valid ref." msgstr "æ æ³å° HEAD 解æ为ææå¼ç¨ã" -#: builtin/branch.c:793 builtin/clone.c:561 +#: builtin/branch.c:816 builtin/clone.c:561 msgid "HEAD not found below refs/heads!" msgstr "HEAD 没æä½äº /refs/heads ä¹ä¸ï¼" -#: builtin/branch.c:813 +#: builtin/branch.c:836 msgid "--column and --verbose are incompatible" msgstr "--column å --verbose ä¸å ¼å®¹" -#: builtin/branch.c:864 -#, fuzzy, c-format +#: builtin/branch.c:887 +#, c-format msgid "branch '%s' does not exist" -msgstr "çæ¬åº '%s' ä¸åå¨" +msgstr "åæ¯ '%s' ä¸åå¨" -#: builtin/branch.c:876 +#: builtin/branch.c:899 #, c-format msgid "Branch '%s' has no upstream information" -msgstr "" +msgstr "åæ¯ '%s' 没æä¸æ¸¸ä¿¡æ¯" -#: builtin/branch.c:891 +#: builtin/branch.c:914 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "'git branch' ç -a å -r é项带ä¸ä¸ªåæ¯ååæ°æ²¡ææä¹" -#: builtin/branch.c:894 +#: builtin/branch.c:917 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" "track or --set-upstream-to\n" msgstr "" +"é项 --set-upstream å·²å¼ç¨å¹¶å°è¢«ç§»é¤ãèèä½¿ç¨ --track æ --set-upstream-to\n" -#: builtin/branch.c:911 +#: builtin/branch.c:934 #, c-format msgid "" "\n" "If you wanted to make '%s' track '%s', do this:\n" "\n" msgstr "" +"\n" +"å¦æä½ æ³ç¨ '%s' è·è¸ª '%s', è¿ä¹åï¼\n" +"\n" -#: builtin/branch.c:912 -#, fuzzy, c-format +#: builtin/branch.c:935 +#, c-format msgid " git branch -d %s\n" -msgstr " HEADåæ¯ï¼%s" +msgstr " git branch -d %s\n" -#: builtin/branch.c:913 +#: builtin/branch.c:936 #, c-format msgid " git branch --set-upstream-to %s\n" -msgstr "" +msgstr " git branch --set-upstream-to %s\n" #: builtin/bundle.c:47 #, c-format @@ -2531,129 +2522,119 @@ msgstr "éè¦ä¸ä¸ªçæ¬åºæ¥è§£å ã" #: builtin/cat-file.c:247 msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>" -msgstr "" +msgstr "git cat-file (-t|-s|-e|-p|<ç±»å>|--textconv) <对象>" #: builtin/cat-file.c:248 msgid "git cat-file (--batch|--batch-check) < <list_of_objects>" -msgstr "" +msgstr "git cat-file (--batch|--batch-check) < <对象å表>" #: builtin/cat-file.c:266 msgid "<type> can be one of: blob, tree, commit, tag" -msgstr "" +msgstr "<ç±»å> å¯ä»¥æ¯å ¶ä¸ä¹ä¸ï¼blobãtreeãcommitãtag" #: builtin/cat-file.c:267 -#, fuzzy msgid "show object type" -msgstr "åç对象类åã" +msgstr "æ¾ç¤ºå¯¹è±¡ç±»å" #: builtin/cat-file.c:268 -#, fuzzy msgid "show object size" -msgstr "å对象 %s" +msgstr "æ¾ç¤ºå¯¹è±¡å¤§å°" #: builtin/cat-file.c:270 msgid "exit with zero when there's no error" -msgstr "" +msgstr "å½æ²¡æé误æ¶éåºå¹¶è¿åé¶" #: builtin/cat-file.c:271 msgid "pretty-print object's content" -msgstr "" +msgstr "ç¾è§å°æå°å¯¹è±¡çå 容" #: builtin/cat-file.c:273 msgid "for blob objects, run textconv on object's content" -msgstr "" +msgstr "对äºæ°æ®ï¼blobï¼å¯¹è±¡ï¼å¯¹å ¶å 容æ§è¡ textconv" #: builtin/cat-file.c:275 msgid "show info and content of objects fed from the standard input" -msgstr "" +msgstr "æ¾ç¤ºä»æ åè¾å ¥æä¾ç对象çä¿¡æ¯åå 容" #: builtin/cat-file.c:278 -#, fuzzy msgid "show info about objects fed from the standard input" -msgstr "ä¸è½ä»æ åè¾å ¥ä¸è¯»åæ¥å¿ä¿¡æ¯" +msgstr "æ¾ç¤ºä»æ åè¾å ¥æä¾ç对象çä¿¡æ¯" #: builtin/check-attr.c:11 msgid "git check-attr [-a | --all | attr...] [--] pathname..." -msgstr "" +msgstr "git check-attr [-a | --all | attr...] [--] è·¯å¾å..." #: builtin/check-attr.c:12 -msgid "git check-attr --stdin [-a | --all | attr...] < <list-of-paths>" -msgstr "" +msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>" +msgstr "git check-attr --stdin [-z] [-a | --all | attr...] < <è·¯å¾å表>" #: builtin/check-attr.c:19 msgid "report all attributes set on file" -msgstr "" +msgstr "æ¥å设置å¨æ件ä¸çææå±æ§" #: builtin/check-attr.c:20 msgid "use .gitattributes only from the index" -msgstr "" +msgstr "åªä½¿ç¨ç´¢å¼ä¸ç .gitattributes" #: builtin/check-attr.c:21 builtin/hash-object.c:75 -#, fuzzy msgid "read file names from stdin" -msgstr "ï¼æ£ä»æ åè¾å ¥ä¸è¯»åæ¥å¿ä¿¡æ¯ï¼\n" +msgstr "ä»æ åè¾å ¥è¯»åºæ件å" #: builtin/check-attr.c:23 -#, fuzzy msgid "input paths are terminated by a null character" -msgstr "è·¯å¾ä»¥ NUL å符åé" +msgstr "è¾å ¥è·¯å¾ä»¥nullå符ç»æ¢" #: builtin/checkout-index.c:126 msgid "git checkout-index [options] [--] [<file>...]" -msgstr "" +msgstr "git checkout-index [é项] [--] [<æ件>...]" #: builtin/checkout-index.c:187 msgid "check out all files in the index" -msgstr "" +msgstr "æ£åºç´¢å¼åºçæææ件" #: builtin/checkout-index.c:188 msgid "force overwrite of existing files" -msgstr "" +msgstr "强å¶è¦çç°æçæ件" #: builtin/checkout-index.c:190 msgid "no warning for existing files and files not in index" -msgstr "" +msgstr "åå¨æä¸å¨ç´¢å¼ä¸çæ件é½æ²¡æè¦å" #: builtin/checkout-index.c:192 -#, fuzzy msgid "don't checkout new files" -msgstr "ä¸è½æ£åº %s" +msgstr "ä¸æ£åºæ°æ件" #: builtin/checkout-index.c:194 -#, fuzzy msgid "update stat information in the index file" -msgstr "æ æ³åæ°çç´¢å¼æ件" +msgstr "æ´æ°ç´¢å¼ä¸æ件çç¶æä¿¡æ¯" #: builtin/checkout-index.c:200 -#, fuzzy msgid "read list of paths from the standard input" -msgstr "ï¼æ£ä»æ åè¾å ¥ä¸è¯»åæ¥å¿ä¿¡æ¯ï¼\n" +msgstr "ä»æ åè¾å ¥è¯»åè·¯å¾å表" #: builtin/checkout-index.c:202 msgid "write the content to temporary files" -msgstr "" +msgstr "å°å 容åå ¥ä¸´æ¶æ件" #: builtin/checkout-index.c:203 builtin/column.c:30 msgid "string" -msgstr "" +msgstr "å符串" #: builtin/checkout-index.c:204 msgid "when creating files, prepend <string>" -msgstr "" +msgstr "å¨å建æ件æ¶ï¼å¨åé¢å ä¸<å符串>" #: builtin/checkout-index.c:207 msgid "copy out the files from named stage" -msgstr "" +msgstr "ä»æå®æååºä¸æ·åºæ件" #: builtin/checkout.c:25 -#, fuzzy msgid "git checkout [options] <branch>" -msgstr "git apply [é项] [<è¡¥ä¸>...]" +msgstr "git checkout [é项] <åæ¯>" #: builtin/checkout.c:26 -#, fuzzy msgid "git checkout [options] [<branch>] -- <file>..." -msgstr "git apply [é项] [<è¡¥ä¸>...]" +msgstr "git checkout [é项] [<åæ¯>] -- <æ件>..." #: builtin/checkout.c:116 builtin/checkout.c:149 #, c-format @@ -2687,19 +2668,19 @@ msgstr "æ æ³ä¸º '%s' æ·»å å并ç»æ" #: builtin/checkout.c:236 builtin/checkout.c:239 builtin/checkout.c:242 #: builtin/checkout.c:245 -#, fuzzy, c-format +#, c-format msgid "'%s' cannot be used with updating paths" -msgstr "%sï¼%s ä¸è½å %s åæ¶ä½¿ç¨" +msgstr "'%s' ä¸è½å¨æ´æ°è·¯å¾æ¶ä½¿ç¨" #: builtin/checkout.c:248 builtin/checkout.c:251 -#, fuzzy, c-format +#, c-format msgid "'%s' cannot be used with %s" -msgstr "%sï¼%s ä¸è½å %s åæ¶ä½¿ç¨" +msgstr "'%s' ä¸è½å %s åæ¶ä½¿ç¨" #: builtin/checkout.c:254 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." -msgstr "" +msgstr "ä¸è½åæ¶æ´æ°è·¯å¾å¹¶åæ¢å°åæ¯'%s'ã" #: builtin/checkout.c:265 builtin/checkout.c:426 msgid "corrupt index file" @@ -2710,11 +2691,6 @@ msgstr "æåçç´¢å¼æ件" msgid "path '%s' is unmerged" msgstr "è·¯å¾ '%s' æªå并" -#: builtin/checkout.c:333 builtin/checkout.c:534 builtin/clone.c:586 -#: builtin/merge.c:811 -msgid "unable to write new index file" -msgstr "æ æ³åæ°çç´¢å¼æ件" - #: builtin/checkout.c:448 msgid "you need to resolve your current index first" msgstr "æ¨éè¦å 解å³å½åç´¢å¼çå²çª" @@ -2743,7 +2719,7 @@ msgstr "å·²ç»ä½äº '%s'\n" msgid "Switched to and reset branch '%s'\n" msgstr "åæ¢å¹¶éç½®åæ¯ '%s'\n" -#: builtin/checkout.c:618 +#: builtin/checkout.c:618 builtin/checkout.c:955 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "åæ¢å°ä¸ä¸ªæ°åæ¯ '%s'\n" @@ -2820,313 +2796,299 @@ msgstr "æ æå¼ç¨ï¼%s" msgid "reference is not a tree: %s" msgstr "å¼ç¨ä¸æ¯ä¸ä¸ªæ ï¼%s" -#: builtin/checkout.c:961 -#, fuzzy +#: builtin/checkout.c:964 msgid "paths cannot be used with switching branches" -msgstr "--ours/--theirs ååæ¢åæ¯ä¸å ¼å®¹ã" +msgstr "è·¯å¾ä¸è½ååæ¢åæ¯åæ¶ä½¿ç¨" -#: builtin/checkout.c:964 builtin/checkout.c:968 -#, fuzzy, c-format +#: builtin/checkout.c:967 builtin/checkout.c:971 +#, c-format msgid "'%s' cannot be used with switching branches" -msgstr "%sï¼%s ä¸è½å %s åæ¶ä½¿ç¨" +msgstr "'%s' ä¸è½ååæ¢åæ¯åæ¶ä½¿ç¨" -#: builtin/checkout.c:972 builtin/checkout.c:975 builtin/checkout.c:980 -#: builtin/checkout.c:983 -#, fuzzy, c-format +#: builtin/checkout.c:975 builtin/checkout.c:978 builtin/checkout.c:983 +#: builtin/checkout.c:986 +#, c-format msgid "'%s' cannot be used with '%s'" -msgstr "%sï¼%s ä¸è½å %s åæ¶ä½¿ç¨" +msgstr "'%s' ä¸è½å '%s' åæ¶ä½¿ç¨" -#: builtin/checkout.c:988 -#, fuzzy, c-format +#: builtin/checkout.c:991 +#, c-format msgid "Cannot switch branch to a non-commit '%s'" -msgstr "æ æ³åæ¢åæ¯å°ä¸ä¸ªéæ交ã" +msgstr "ä¸è½åæ¢åæ¯å°ä¸ä¸ªéæ交 '%s'" -#: builtin/checkout.c:1009 builtin/gc.c:177 +#: builtin/checkout.c:1012 builtin/gc.c:177 msgid "suppress progress reporting" -msgstr "" +msgstr "ä¸æ¾ç¤ºè¿åº¦æ¥å" -#: builtin/checkout.c:1010 builtin/checkout.c:1012 builtin/clone.c:89 +#: builtin/checkout.c:1013 builtin/checkout.c:1015 builtin/clone.c:89 #: builtin/remote.c:169 builtin/remote.c:171 -#, fuzzy msgid "branch" -msgstr "ä½äºåæ¯ " +msgstr "åæ¯" -#: builtin/checkout.c:1011 +#: builtin/checkout.c:1014 msgid "create and checkout a new branch" -msgstr "" +msgstr "å建并æ£åºä¸ä¸ªæ°çåæ¯" -#: builtin/checkout.c:1013 +#: builtin/checkout.c:1016 msgid "create/reset and checkout a branch" -msgstr "" +msgstr "å建/é置并æ£åºä¸ä¸ªåæ¯" -#: builtin/checkout.c:1014 -#, fuzzy +#: builtin/checkout.c:1017 msgid "create reflog for new branch" -msgstr "ååºãå建æå é¤åæ¯" +msgstr "为æ°çåæ¯å建å¼ç¨æ¥å¿" -#: builtin/checkout.c:1015 +#: builtin/checkout.c:1018 msgid "detach the HEAD at named commit" -msgstr "" +msgstr "æ为æå该æ交çå离头æé" -#: builtin/checkout.c:1016 -#, fuzzy +#: builtin/checkout.c:1019 msgid "set upstream info for new branch" -msgstr "å°æªç»åæ¯ '%s' 设置ä¸æ¸¸" +msgstr "为æ°çåæ¯è®¾ç½®ä¸æ¸¸ä¿¡æ¯" -#: builtin/checkout.c:1018 -#, fuzzy +#: builtin/checkout.c:1021 msgid "new branch" -msgstr "[æ°åæ¯]" +msgstr "æ°åæ¯" -#: builtin/checkout.c:1018 -#, fuzzy +#: builtin/checkout.c:1021 msgid "new unparented branch" -msgstr "没æå½ååæ¯ã" +msgstr "æ°ç没æç¶æ交çåæ¯" -#: builtin/checkout.c:1019 +#: builtin/checkout.c:1022 msgid "checkout our version for unmerged files" -msgstr "" +msgstr "对å°æªå并çæ件æ£åºæ们ççæ¬" -#: builtin/checkout.c:1021 +#: builtin/checkout.c:1024 msgid "checkout their version for unmerged files" -msgstr "" +msgstr "对å°æªå并çæ件æ£åºä»ä»¬ççæ¬" -#: builtin/checkout.c:1023 +#: builtin/checkout.c:1026 msgid "force checkout (throw away local modifications)" -msgstr "" +msgstr "强å¶æ£åºï¼ä¸¢å¼æ¬å°ä¿®æ¹ï¼" -#: builtin/checkout.c:1024 +#: builtin/checkout.c:1027 msgid "perform a 3-way merge with the new branch" -msgstr "" +msgstr "åæ°çåæ¯æ§è¡ä¸è·¯å并" -#: builtin/checkout.c:1025 builtin/merge.c:215 -#, fuzzy +#: builtin/checkout.c:1028 builtin/merge.c:215 msgid "update ignored files (default)" -msgstr "æ´æ°æ件失败" +msgstr "æ´æ°å¿½ç¥çæ件ï¼é»è®¤ï¼" -#: builtin/checkout.c:1026 builtin/log.c:1111 parse-options.h:241 +#: builtin/checkout.c:1029 builtin/log.c:1147 parse-options.h:245 msgid "style" -msgstr "" +msgstr "é£æ ¼" -#: builtin/checkout.c:1027 +#: builtin/checkout.c:1030 msgid "conflict style (merge or diff3)" -msgstr "" +msgstr "å²çªè¾åºé£æ ¼ï¼merge æ diff3ï¼" -#: builtin/checkout.c:1030 +#: builtin/checkout.c:1033 msgid "second guess 'git checkout no-such-branch'" -msgstr "" +msgstr "åè çæµ'git checkout no-such-branch'" -#: builtin/checkout.c:1054 -#, fuzzy +#: builtin/checkout.c:1057 msgid "-b, -B and --orphan are mutually exclusive" -msgstr "-n å -k äºæ¥ã" +msgstr "-bã-B å --orphan æ¯äºæ¥ç" -#: builtin/checkout.c:1071 +#: builtin/checkout.c:1074 msgid "--track needs a branch name" msgstr "--track éè¦ä¸ä¸ªåæ¯å" -#: builtin/checkout.c:1078 +#: builtin/checkout.c:1081 msgid "Missing branch name; try -b" msgstr "缺å°åæ¯åï¼å°è¯ -b" -#: builtin/checkout.c:1113 +#: builtin/checkout.c:1116 msgid "invalid path specification" msgstr "æ æçè·¯å¾è§æ ¼" -#: builtin/checkout.c:1120 -#, fuzzy, c-format +#: builtin/checkout.c:1123 +#, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" "Did you intend to checkout '%s' which can not be resolved as commit?" msgstr "" -"git checkoutï¼æ´æ°è·¯å¾ååæ¢åæ¯ä¸å ¼å®¹ã\n" -"æ¨æ¯æ³è¦æ£åº '%s' ä½æªè½å°å ¶è§£æ为æ交ä¹ï¼" +"ä¸è½åæ¶æ´æ°è·¯å¾å¹¶åæ¢å°åæ¯'%s'ã\n" +"æ¨æ¯æ³è¦æ£åº '%s' ä½å ¶æªè½è§£æ为æ交ä¹ï¼" -#: builtin/checkout.c:1125 -#, fuzzy, c-format +#: builtin/checkout.c:1128 +#, c-format msgid "git checkout: --detach does not take a path argument '%s'" -msgstr "git checkoutï¼--detach ä¸è·è·¯å¾åæ°" +msgstr "git checkoutï¼--detach ä¸è½æ¥æ¶è·¯å¾åæ° '%s'" -#: builtin/checkout.c:1129 +#: builtin/checkout.c:1132 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." msgstr "" "git checkoutï¼å¨ä»ç´¢å¼æ£åºæ¶ï¼--ours/--theirsã--force å --merge ä¸å ¼å®¹ã" -#: builtin/clean.c:19 +#: builtin/clean.c:20 msgid "git clean [-d] [-f] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." -msgstr "" +msgstr "git clean [-d] [-f] [-n] [-q] [-e <模å¼>] [-x | -X] [--] <è·¯å¾>..." -#: builtin/clean.c:51 +#: builtin/clean.c:24 +#, c-format +msgid "Removing %s\n" +msgstr "æ£å é¤ %s\n" + +#: builtin/clean.c:25 +#, c-format +msgid "Would remove %s\n" +msgstr "å°å é¤ %s\n" + +#: builtin/clean.c:26 +#, c-format +msgid "Skipping repository %s\n" +msgstr "忽ç¥çæ¬åº %s\n" + +#: builtin/clean.c:27 +#, c-format +msgid "Would skip repository %s\n" +msgstr "å°å¿½ç¥çæ¬åº %s\n" + +#: builtin/clean.c:28 +#, c-format +msgid "failed to remove %s" +msgstr "æ æ³å é¤ %s" + +#: builtin/clean.c:159 msgid "do not print names of files removed" -msgstr "" +msgstr "ä¸æå°å é¤æ件çå称" -#: builtin/clean.c:53 +#: builtin/clean.c:161 msgid "force" -msgstr "" +msgstr "强å¶" -#: builtin/clean.c:55 -#, fuzzy +#: builtin/clean.c:163 msgid "remove whole directories" -msgstr "两个è¾åºç®å½ï¼" +msgstr "å é¤æ´ä¸ªç®å½" -#: builtin/clean.c:56 builtin/describe.c:413 builtin/grep.c:802 -#: builtin/ls-files.c:491 builtin/name-rev.c:231 builtin/show-ref.c:199 +#: builtin/clean.c:164 builtin/describe.c:413 builtin/grep.c:717 +#: builtin/ls-files.c:491 builtin/name-rev.c:231 builtin/show-ref.c:182 msgid "pattern" -msgstr "" +msgstr "模å¼" -#: builtin/clean.c:57 +#: builtin/clean.c:165 msgid "add <pattern> to ignore rules" -msgstr "" +msgstr "æ·»å <模å¼>å°å¿½ç¥è§å" -#: builtin/clean.c:58 +#: builtin/clean.c:166 msgid "remove ignored files, too" -msgstr "" +msgstr "ä¹å é¤å¿½ç¥çæ件" -#: builtin/clean.c:60 +#: builtin/clean.c:168 msgid "remove only ignored files" -msgstr "" +msgstr "åªå é¤å¿½ç¥çæ件" -#: builtin/clean.c:78 +#: builtin/clean.c:186 msgid "-x and -X cannot be used together" msgstr "-x å -X ä¸è½åæ¶ä½¿ç¨" -#: builtin/clean.c:82 +#: builtin/clean.c:190 msgid "" "clean.requireForce set to true and neither -n nor -f given; refusing to clean" msgstr "" "clean.requireForce 设置为 true ä¸æªæä¾ -n æ -f é项ï¼æç»æ§è¡æ¸ çå¨ä½" -#: builtin/clean.c:85 +#: builtin/clean.c:193 msgid "" "clean.requireForce defaults to true and neither -n nor -f given; refusing to " "clean" msgstr "" "clean.requireForce é»è®¤ä¸º true ä¸æªæä¾ -n æ -f é项ï¼æç»æ§è¡æ¸ çå¨ä½" -#: builtin/clean.c:155 builtin/clean.c:176 -#, c-format -msgid "Would remove %s\n" -msgstr "å°å é¤ %s\n" - -#: builtin/clean.c:159 builtin/clean.c:179 -#, c-format -msgid "Removing %s\n" -msgstr "æ£å é¤ %s\n" - -#: builtin/clean.c:162 builtin/clean.c:182 -#, c-format -msgid "failed to remove %s" -msgstr "æ æ³å é¤ %s" - -#: builtin/clean.c:166 -#, c-format -msgid "Would not remove %s\n" -msgstr "ä¸ä¼å é¤ %s\n" - -#: builtin/clean.c:168 -#, c-format -msgid "Not removing %s\n" -msgstr "æªå é¤ %s\n" - #: builtin/clone.c:36 msgid "git clone [options] [--] <repo> [<dir>]" -msgstr "" +msgstr "git clone [é项] [--] <çæ¬åº> [<è·¯å¾>]" #: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:212 -#: builtin/push.c:399 +#: builtin/push.c:407 msgid "force progress reporting" -msgstr "" +msgstr "强å¶æ¾ç¤ºè¿åº¦æ¥å" #: builtin/clone.c:66 msgid "don't create a checkout" -msgstr "" +msgstr "ä¸å建ä¸ä¸ªæ£åº" #: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:488 -#, fuzzy msgid "create a bare repository" -msgstr "ä¸æ¯ä¸ä¸ª git çæ¬åº" +msgstr "å建ä¸ä¸ªè£¸çæ¬åº" #: builtin/clone.c:72 msgid "create a mirror repository (implies bare)" -msgstr "" +msgstr "å建ä¸ä¸ªéåçæ¬åºï¼ä¹æ¯è£¸çæ¬åºï¼" #: builtin/clone.c:74 msgid "to clone from a local repository" -msgstr "" +msgstr "ä»æ¬å°çæ¬åºå é" #: builtin/clone.c:76 msgid "don't use local hardlinks, always copy" -msgstr "" +msgstr "ä¸ä½¿ç¨æ¬å°ç¡¬é¾æ¥ï¼å§ç»å¤å¶" #: builtin/clone.c:78 -#, fuzzy msgid "setup as shared repository" -msgstr "ä¸æ¯ä¸ä¸ª git çæ¬åº" +msgstr "è®¾ç½®ä¸ºå ±äº«çæ¬åº" #: builtin/clone.c:80 builtin/clone.c:82 msgid "initialize submodules in the clone" -msgstr "" +msgstr "å¨å éæ¶åå§åå模ç»" #: builtin/clone.c:83 builtin/init-db.c:485 -#, fuzzy msgid "template-directory" -msgstr "æ件/ç®å½" +msgstr "模æ¿ç®å½" #: builtin/clone.c:84 builtin/init-db.c:486 msgid "directory from which templates will be used" -msgstr "" +msgstr "模æ¿ç®å½å°è¢«ä½¿ç¨" #: builtin/clone.c:86 msgid "reference repository" -msgstr "" +msgstr "å¼ç¨çæ¬åº" #: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44 -#, fuzzy msgid "name" -msgstr "éå½å" +msgstr "å称" #: builtin/clone.c:88 msgid "use <name> instead of 'origin' to track upstream" -msgstr "" +msgstr "使ç¨<å称>èä¸æ¯ 'origin' å»è·è¸ªä¸æ¸¸" #: builtin/clone.c:90 msgid "checkout <branch> instead of the remote's HEAD" -msgstr "" +msgstr "æ£åº<åæ¯>èä¸æ¯è¿ç¨HEAD" #: builtin/clone.c:92 msgid "path to git-upload-pack on the remote" -msgstr "" +msgstr "è¿ç¨ git-upload-pack è·¯å¾" -#: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:747 +#: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:662 msgid "depth" -msgstr "" +msgstr "深度" #: builtin/clone.c:94 msgid "create a shallow clone of that depth" -msgstr "" +msgstr "å建ä¸ä¸ªæå®æ·±åº¦çæµ å é" #: builtin/clone.c:96 msgid "clone only one branch, HEAD or --branch" -msgstr "" +msgstr "åªå éä¸ä¸ªåæ¯ãHEAD æ --branch" #: builtin/clone.c:97 builtin/init-db.c:494 msgid "gitdir" -msgstr "" +msgstr "gitç®å½" #: builtin/clone.c:98 builtin/init-db.c:495 msgid "separate git dir from working tree" -msgstr "" +msgstr "gitç®å½åå·¥ä½åºå离" #: builtin/clone.c:99 msgid "key=value" -msgstr "" +msgstr "key=value" #: builtin/clone.c:100 -#, fuzzy msgid "set config inside the new repository" -msgstr "è®°å½åæ´å°çæ¬åº" +msgstr "å¨æ°çæ¬åºä¸è®¾ç½®é 置信æ¯" #: builtin/clone.c:243 #, c-format @@ -3153,6 +3115,11 @@ msgstr "%s åå¨ä¸ä¸æ¯ä¸ä¸ªç®å½" msgid "failed to stat %s\n" msgstr "æ æ³æ举 %s ç¶æ\n" +#: builtin/clone.c:341 +#, c-format +msgid "failed to unlink '%s'" +msgstr "æ æ³å é¤ '%s'" + #: builtin/clone.c:346 #, c-format msgid "failed to create link '%s'" @@ -3177,116 +3144,117 @@ msgstr "ä¸è½åç°è¦å éçè¿ç¨åæ¯ %sã" msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "è¿ç¨ HEAD æåä¸ä¸ªä¸åå¨çå¼ç¨ï¼æ æ³æ£åºã\n" -#: builtin/clone.c:642 +#: builtin/clone.c:690 msgid "Too many arguments." msgstr "太å¤åæ°ã" -#: builtin/clone.c:646 +#: builtin/clone.c:694 msgid "You must specify a repository to clone." msgstr "æ¨å¿ é¡»æå®ä¸ä¸ªçæ¬åºæ¥å éã" -#: builtin/clone.c:657 +#: builtin/clone.c:705 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "--bare å --origin %s é项ä¸å ¼å®¹ã" -#: builtin/clone.c:671 +#: builtin/clone.c:708 +msgid "--bare and --separate-git-dir are incompatible." +msgstr "--bare å --separate-git-dir é项ä¸å ¼å®¹ã" + +#: builtin/clone.c:721 #, c-format msgid "repository '%s' does not exist" msgstr "çæ¬åº '%s' ä¸åå¨" -#: builtin/clone.c:676 +#: builtin/clone.c:726 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth å¨æ¬å°å é被忽ç¥ï¼æ¹ä¸º file:// åè®®è¯è¯ã" -#: builtin/clone.c:686 +#: builtin/clone.c:736 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "ç®æ è·¯å¾ '%s' å·²ç»åå¨ï¼å¹¶ä¸ä¸æ¯ä¸ä¸ªç©ºç®å½ã" -#: builtin/clone.c:696 +#: builtin/clone.c:746 #, c-format msgid "working tree '%s' already exists." msgstr "å·¥ä½åº '%s' å·²ç»åå¨ã" -#: builtin/clone.c:709 builtin/clone.c:723 +#: builtin/clone.c:759 builtin/clone.c:773 #, c-format msgid "could not create leading directories of '%s'" msgstr "ä¸è½ä¸º '%s' å建å 导ç®å½" -#: builtin/clone.c:712 +#: builtin/clone.c:762 #, c-format msgid "could not create work tree dir '%s'." msgstr "ä¸è½ä¸º '%s' å建工ä½åºç®å½ã" -#: builtin/clone.c:731 +#: builtin/clone.c:783 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "å éå°è£¸çæ¬åº '%s'...\n" -#: builtin/clone.c:733 +#: builtin/clone.c:785 #, c-format msgid "Cloning into '%s'...\n" msgstr "æ£å éå° '%s'...\n" -#: builtin/clone.c:789 +#: builtin/clone.c:827 #, c-format msgid "Don't know how to clone %s" msgstr "ä¸ç¥éå¦ä½å é %s" -#: builtin/clone.c:838 +#: builtin/clone.c:876 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "è¿ç¨åæ¯ %s å¨ä¸æ¸¸ %s æªåç°" -#: builtin/clone.c:845 +#: builtin/clone.c:883 msgid "You appear to have cloned an empty repository." msgstr "æ¨ä¼¼ä¹å éäºä¸ä¸ªç©ºçæ¬åºã" #: builtin/column.c:9 msgid "git column [options]" -msgstr "" +msgstr "git column [é项]" #: builtin/column.c:26 msgid "lookup config vars" -msgstr "" +msgstr "æ¥æ¾é ç½®åé" #: builtin/column.c:27 builtin/column.c:28 -#, fuzzy msgid "layout to use" -msgstr "æ¬å°å·²è¿æ¶" +msgstr "è¦ä½¿ç¨çå¸å±" #: builtin/column.c:29 msgid "Maximum width" -msgstr "" +msgstr "æ大宽度" #: builtin/column.c:30 msgid "Padding space on left border" -msgstr "" +msgstr "左边æ¡çå¡«å 空é´" #: builtin/column.c:31 msgid "Padding space on right border" -msgstr "" +msgstr "å³è¾¹æ¡çå¡«å 空é´" #: builtin/column.c:32 msgid "Padding space between columns" -msgstr "" +msgstr "两åä¹é´çå¡«å 空é´" #: builtin/column.c:51 msgid "--command must be the first argument" msgstr "--command å¿ é¡»æ¯ç¬¬ä¸ä¸ªåæ°" -#: builtin/commit.c:33 -#, fuzzy +#: builtin/commit.c:34 msgid "git commit [options] [--] <filepattern>..." -msgstr "git apply [é项] [<è¡¥ä¸>...]" +msgstr "git commit [é项] [--] <æ件模å¼>..." -#: builtin/commit.c:38 -#, fuzzy +#: builtin/commit.c:39 msgid "git status [options] [--] <filepattern>..." -msgstr "git apply [é项] [<è¡¥ä¸>...]" +msgstr "git status [é项] [--] <æ件模å¼>..." -#: builtin/commit.c:43 +#: builtin/commit.c:44 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -3309,7 +3277,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: builtin/commit.c:55 +#: builtin/commit.c:56 msgid "" "You asked to amend the most recent commit, but doing so would make\n" "it empty. You can repeat your command with --allow-empty, or you can\n" @@ -3318,7 +3286,7 @@ msgstr "" "æ¨è¦ä¿®è¡¥æè¿çæ交ï¼ä½è¿ä¹åä¼è®©å®æ为空æ交ãæ¨å¯ä»¥éå¤æ¨çå½ä»¤å¹¶å¸¦ä¸\n" "--allow-empty é项ï¼æè æ¨å¯ç¨å½ä»¤ \"git reset HEAD^\" æ´ä¸ªå é¤è¯¥æ交ã\n" -#: builtin/commit.c:60 +#: builtin/commit.c:61 msgid "" "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" "If you wish to commit it anyway, use:\n" @@ -3334,93 +3302,93 @@ msgstr "" "\n" "å¦åï¼è¯·ä½¿ç¨å½ä»¤ 'git reset'\n" -#: builtin/commit.c:256 +#: builtin/commit.c:258 msgid "failed to unpack HEAD tree object" msgstr "æ æ³è§£å HEAD æ 对象" -#: builtin/commit.c:298 +#: builtin/commit.c:300 msgid "unable to create temporary index" msgstr "ä¸è½å建临æ¶ç´¢å¼" -#: builtin/commit.c:304 +#: builtin/commit.c:306 msgid "interactive add failed" msgstr "交äºå¼æ·»å 失败" -#: builtin/commit.c:337 builtin/commit.c:358 builtin/commit.c:408 +#: builtin/commit.c:339 builtin/commit.c:360 builtin/commit.c:410 msgid "unable to write new_index file" msgstr "æ æ³å new_index æ件" -#: builtin/commit.c:389 +#: builtin/commit.c:391 msgid "cannot do a partial commit during a merge." msgstr "å¨å并è¿ç¨ä¸ä¸è½åé¨åæ交ã" -#: builtin/commit.c:391 +#: builtin/commit.c:393 msgid "cannot do a partial commit during a cherry-pick." msgstr "å¨æ£éè¿ç¨ä¸ä¸è½åé¨åæ交ã" -#: builtin/commit.c:401 +#: builtin/commit.c:403 msgid "cannot read the index" msgstr "æ æ³è¯»åç´¢å¼" -#: builtin/commit.c:421 +#: builtin/commit.c:423 msgid "unable to write temporary index file" msgstr "æ æ³å临æ¶ç´¢å¼æ件" -#: builtin/commit.c:510 builtin/commit.c:516 +#: builtin/commit.c:511 builtin/commit.c:517 #, c-format msgid "invalid commit: %s" msgstr "æ æçæ交ï¼%s" -#: builtin/commit.c:539 +#: builtin/commit.c:540 msgid "malformed --author parameter" msgstr "éæ³ç --author åæ°" -#: builtin/commit.c:600 +#: builtin/commit.c:560 #, c-format msgid "Malformed ident string: '%s'" msgstr "éæ³ç身份å符串ï¼'%s'" -#: builtin/commit.c:638 builtin/commit.c:671 builtin/commit.c:985 +#: builtin/commit.c:598 builtin/commit.c:631 builtin/commit.c:954 #, c-format msgid "could not lookup commit %s" msgstr "ä¸è½æ¥è¯¢æ交 %s" -#: builtin/commit.c:650 builtin/shortlog.c:296 +#: builtin/commit.c:610 builtin/shortlog.c:272 #, c-format msgid "(reading log message from standard input)\n" msgstr "ï¼æ£ä»æ åè¾å ¥ä¸è¯»åæ¥å¿ä¿¡æ¯ï¼\n" -#: builtin/commit.c:652 +#: builtin/commit.c:612 msgid "could not read log from standard input" msgstr "ä¸è½ä»æ åè¾å ¥ä¸è¯»åæ¥å¿ä¿¡æ¯" -#: builtin/commit.c:656 +#: builtin/commit.c:616 #, c-format msgid "could not read log file '%s'" msgstr "ä¸è½è¯»åæ¥å¿æ件 '%s'" -#: builtin/commit.c:662 +#: builtin/commit.c:622 msgid "commit has empty message" msgstr "æ交说æ为空" -#: builtin/commit.c:678 +#: builtin/commit.c:638 msgid "could not read MERGE_MSG" msgstr "ä¸è½è¯»å MERGE_MSG" -#: builtin/commit.c:682 +#: builtin/commit.c:642 msgid "could not read SQUASH_MSG" msgstr "ä¸è½è¯»å SQUASH_MSG" -#: builtin/commit.c:686 +#: builtin/commit.c:646 #, c-format msgid "could not read '%s'" msgstr "ä¸è½è¯»å '%s'" -#: builtin/commit.c:738 +#: builtin/commit.c:707 msgid "could not write commit template" msgstr "ä¸è½åæ交模ç" -#: builtin/commit.c:749 +#: builtin/commit.c:718 #, c-format msgid "" "\n" @@ -3434,7 +3402,7 @@ msgstr "" "\t%s\n" "ç¶åéè¯ã\n" -#: builtin/commit.c:754 +#: builtin/commit.c:723 #, c-format msgid "" "\n" @@ -3448,7 +3416,7 @@ msgstr "" "\t%s\n" "ç¶åéè¯ã\n" -#: builtin/commit.c:766 +#: builtin/commit.c:735 msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '#' will be ignored, and an empty message aborts the commit.\n" @@ -3456,7 +3424,7 @@ msgstr "" "请为æ¨çåæ´è¾å ¥æ交说æã以 '#' å¼å§çè¡å°è¢«å¿½ç¥ï¼èä¸ä¸ªç©ºçæ交\n" "说æå°ä¼ç»æ¢æ交ã\n" -#: builtin/commit.c:771 +#: builtin/commit.c:740 msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '#' will be kept; you may remove them yourself if you want to.\n" @@ -3466,357 +3434,355 @@ msgstr "" "å¦ææ¨æ³è¿æ ·åçè¯ãèä¸ä¸ªç©ºçæ交说æå°ä¼ç»æ¢æ交ã\n" # è¯è ï¼ä¸ºä¿è¯å¨è¾åºä¸å¯¹é½ï¼æ³¨æè°æ´å¥ä¸ç©ºæ ¼ï¼ -#: builtin/commit.c:784 +#: builtin/commit.c:753 #, c-format msgid "%sAuthor: %s" msgstr "%sä½è ï¼ %s" # è¯è ï¼ä¸ºä¿è¯å¨è¾åºä¸å¯¹é½ï¼æ³¨æè°æ´å¥ä¸ç©ºæ ¼ï¼ -#: builtin/commit.c:791 +#: builtin/commit.c:760 #, c-format msgid "%sCommitter: %s" msgstr "%sæ交è ï¼ %s" -#: builtin/commit.c:811 +#: builtin/commit.c:780 msgid "Cannot read index" msgstr "æ æ³è¯»åç´¢å¼" -#: builtin/commit.c:848 +#: builtin/commit.c:817 msgid "Error building trees" msgstr "æ æ³å建æ 对象" -#: builtin/commit.c:863 builtin/tag.c:361 +#: builtin/commit.c:832 builtin/tag.c:361 #, c-format msgid "Please supply the message using either -m or -F option.\n" -msgstr "è¯·ä½¿ç¨ -m æè -F é项æä¾æ交说æã\n" +msgstr "è¯·ä½¿ç¨ -m æ -F é项æä¾æ交说æã\n" -#: builtin/commit.c:960 +#: builtin/commit.c:929 #, c-format msgid "No existing author found with '%s'" msgstr "没ææ¾å°å¹é '%s' çä½è " -#: builtin/commit.c:975 builtin/commit.c:1175 +#: builtin/commit.c:944 builtin/commit.c:1148 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "æ æçæªè¿½è¸ªæ件åæ° '%s'" -#: builtin/commit.c:1015 +#: builtin/commit.c:984 msgid "Using both --reset-author and --author does not make sense" msgstr "åæ¶ä½¿ç¨ --reset-author å --author 没ææä¹" -#: builtin/commit.c:1026 +#: builtin/commit.c:995 msgid "You have nothing to amend." msgstr "æ¨æ²¡æå¯ä¿®è¡¥çæ交ã" -#: builtin/commit.c:1029 +#: builtin/commit.c:998 msgid "You are in the middle of a merge -- cannot amend." msgstr "æ¨æ£å¤äºä¸ä¸ªå并è¿ç¨ä¸ -- æ æ³ä¿®è¡¥æ交ã" -#: builtin/commit.c:1031 +#: builtin/commit.c:1000 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "æ¨æ£å¤äºä¸ä¸ªæ£éè¿ç¨ä¸ -- æ æ³ä¿®è¡¥æ交ã" -#: builtin/commit.c:1034 +#: builtin/commit.c:1003 msgid "Options --squash and --fixup cannot be used together" msgstr "é项 --squash å --fixup ä¸è½åæ¶ä½¿ç¨" -#: builtin/commit.c:1044 +#: builtin/commit.c:1013 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "åªè½ç¨ä¸ä¸ª -c/-C/-F/--fixup é项ã" -#: builtin/commit.c:1046 +#: builtin/commit.c:1015 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "é项 -m ä¸è½å -c/-C/-F/--fixup åæ¶ä½¿ç¨ã" -#: builtin/commit.c:1054 +#: builtin/commit.c:1023 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author åªè½å -Cã-c æ --amend åæ¶ä½¿ç¨ã" -#: builtin/commit.c:1071 +#: builtin/commit.c:1040 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "åªè½ç¨ä¸ä¸ª --include/--only/--all/--interactive/--patch é项ã" -#: builtin/commit.c:1073 +#: builtin/commit.c:1042 msgid "No paths with --include/--only does not make sense." msgstr "åæ° --include/--only ä¸è·è·¯å¾æ²¡ææä¹ã" -#: builtin/commit.c:1075 +#: builtin/commit.c:1044 msgid "Clever... amending the last one with dirty index." msgstr "èªæ... å¨ç´¢å¼ä¸å¹²åä¸ä¿®è¡¥æåçæ交ã" -#: builtin/commit.c:1077 +#: builtin/commit.c:1046 msgid "Explicit paths specified without -i nor -o; assuming --only paths..." msgstr "æå®äºæç¡®çè·¯å¾è没æä½¿ç¨ -i æ -o é项ï¼è®¤ä¸ºæ¯ --only paths..." -#: builtin/commit.c:1087 builtin/tag.c:577 +#: builtin/commit.c:1056 builtin/tag.c:577 #, c-format msgid "Invalid cleanup mode %s" msgstr "æ æçæ¸ çæ¨¡å¼ %s" -#: builtin/commit.c:1092 +#: builtin/commit.c:1061 msgid "Paths with -a does not make sense." msgstr "è·¯å¾å -a é项åæ¶ä½¿ç¨æ²¡ææä¹ã" -#: builtin/commit.c:1189 builtin/commit.c:1417 +#: builtin/commit.c:1067 builtin/commit.c:1202 +msgid "--long and -z are incompatible" +msgstr "--long å -z é项ä¸å ¼å®¹" + +#: builtin/commit.c:1162 builtin/commit.c:1400 msgid "show status concisely" -msgstr "" +msgstr "以ç®æ´çæ ¼å¼æ¾ç¤ºç¶æ" -#: builtin/commit.c:1191 builtin/commit.c:1419 +#: builtin/commit.c:1164 builtin/commit.c:1402 msgid "show branch information" -msgstr "" +msgstr "æ¾ç¤ºåæ¯ä¿¡æ¯" -#: builtin/commit.c:1193 builtin/commit.c:1421 builtin/push.c:389 +#: builtin/commit.c:1166 builtin/commit.c:1404 builtin/push.c:397 msgid "machine-readable output" -msgstr "" +msgstr "æºå¨å¯è¯»çè¾åº" + +#: builtin/commit.c:1169 builtin/commit.c:1406 +msgid "show status in long format (default)" +msgstr "以é¿æ ¼å¼æ¾ç¤ºç¶æï¼é»è®¤ï¼" -#: builtin/commit.c:1196 builtin/commit.c:1423 +#: builtin/commit.c:1172 builtin/commit.c:1409 msgid "terminate entries with NUL" -msgstr "" +msgstr "æ¡ç®ä»¥NULå符ç»å°¾" -#: builtin/commit.c:1198 builtin/commit.c:1426 builtin/fast-export.c:636 -#: builtin/fast-export.c:639 builtin/tag.c:461 +#: builtin/commit.c:1174 builtin/commit.c:1412 builtin/fast-export.c:647 +#: builtin/fast-export.c:650 builtin/tag.c:461 msgid "mode" -msgstr "" +msgstr "模å¼" -#: builtin/commit.c:1199 builtin/commit.c:1426 +#: builtin/commit.c:1175 builtin/commit.c:1412 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" -msgstr "" +msgstr "æ¾ç¤ºæªè·è¸ªçæ件ï¼â模å¼âçå¯éåæ°ï¼allãnormalãnoãï¼é»è®¤ï¼allï¼" -#: builtin/commit.c:1202 +#: builtin/commit.c:1178 msgid "show ignored files" -msgstr "" +msgstr "æ¾ç¤ºå¿½ç¥çæ件" -#: builtin/commit.c:1203 parse-options.h:151 +#: builtin/commit.c:1179 parse-options.h:151 msgid "when" msgstr "ä½æ¶" -#: builtin/commit.c:1204 +#: builtin/commit.c:1180 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" +"忽ç¥å模ç»çæ´æ¹ï¼âä½æ¶âçå¯éåæ°ï¼allãdirtyãuntrackedãï¼é»è®¤ï¼allï¼" -#: builtin/commit.c:1206 -#, fuzzy +#: builtin/commit.c:1182 msgid "list untracked files in columns" -msgstr "æ æçæªè¿½è¸ªæ件åæ° '%s'" +msgstr "以åçæ¹å¼æ¾ç¤ºæªè·è¸ªçæ件" -#: builtin/commit.c:1275 +#: builtin/commit.c:1256 msgid "couldn't look up newly created commit" msgstr "æ æ³æ¾å°æ°å建çæ交" -#: builtin/commit.c:1277 +#: builtin/commit.c:1258 msgid "could not parse newly created commit" msgstr "ä¸è½è§£ææ°å建çæ交" -#: builtin/commit.c:1318 +#: builtin/commit.c:1299 msgid "detached HEAD" msgstr "å离头æé" # è¯è ï¼ä¸æå符串æ¼æ¥ï¼å¯å é¤åå¯¼ç©ºæ ¼ -#: builtin/commit.c:1320 +#: builtin/commit.c:1301 msgid " (root-commit)" msgstr "ï¼æ ¹æ交ï¼" -#: builtin/commit.c:1387 +#: builtin/commit.c:1370 msgid "suppress summary after successful commit" -msgstr "" +msgstr "æ交æååä¸æ¾ç¤ºæ¦è¿°ä¿¡æ¯" -#: builtin/commit.c:1388 +#: builtin/commit.c:1371 msgid "show diff in commit message template" -msgstr "" +msgstr "å¨æ交说æ模æ¿éæ¾ç¤ºå·®å¼" -#: builtin/commit.c:1390 -#, fuzzy +#: builtin/commit.c:1373 msgid "Commit message options" -msgstr "ä¸è½å¾å° %s çæ交说æ" +msgstr "æ交说æé项" -#: builtin/commit.c:1391 builtin/tag.c:459 +#: builtin/commit.c:1374 builtin/tag.c:459 msgid "read message from file" -msgstr "" +msgstr "ä»æ件ä¸è¯»åæ交说æ" -#: builtin/commit.c:1392 +#: builtin/commit.c:1375 msgid "author" -msgstr "" +msgstr "ä½è " -#: builtin/commit.c:1392 -#, fuzzy +#: builtin/commit.c:1375 msgid "override author for commit" -msgstr "å并æªè¿åæ交" +msgstr "æ交æ¶è¦çä½è " -#: builtin/commit.c:1393 builtin/gc.c:178 +#: builtin/commit.c:1376 builtin/gc.c:178 msgid "date" -msgstr "" +msgstr "æ¥æ" -#: builtin/commit.c:1393 -#, fuzzy +#: builtin/commit.c:1376 msgid "override date for commit" -msgstr "å并æªè¿åæ交" +msgstr "æ交æ¶è¦çæ¥æ" -#: builtin/commit.c:1394 builtin/merge.c:206 builtin/notes.c:534 -#: builtin/notes.c:691 builtin/tag.c:457 -#, fuzzy +#: builtin/commit.c:1377 builtin/merge.c:206 builtin/notes.c:537 +#: builtin/notes.c:694 builtin/tag.c:457 msgid "message" -msgstr "æ tag 说æï¼" +msgstr "说æ" -#: builtin/commit.c:1394 -#, fuzzy +#: builtin/commit.c:1377 msgid "commit message" -msgstr "空æ交信æ¯ã" +msgstr "æ交说æ" -#: builtin/commit.c:1395 +#: builtin/commit.c:1378 msgid "reuse and edit message from specified commit" -msgstr "" +msgstr "éç¨å¹¶ç¼è¾æå®æ交çæ交说æ" -#: builtin/commit.c:1396 +#: builtin/commit.c:1379 msgid "reuse message from specified commit" -msgstr "" +msgstr "éç¨æå®æ交çæ交说æ" -#: builtin/commit.c:1397 +#: builtin/commit.c:1380 msgid "use autosquash formatted message to fixup specified commit" -msgstr "" +msgstr "ä½¿ç¨ autosquash æ ¼å¼çæ交说æç¨ä»¥ä¿®æ£æå®çæ交" -#: builtin/commit.c:1398 +#: builtin/commit.c:1381 msgid "use autosquash formatted message to squash specified commit" -msgstr "" +msgstr "ä½¿ç¨ autosquash æ ¼å¼çæ交说æç¨ä»¥å缩è³æå®çæ交" -#: builtin/commit.c:1399 +#: builtin/commit.c:1382 msgid "the commit is authored by me now (used with -C/-c/--amend)" -msgstr "" +msgstr "ç°å¨å°è¯¥æ交çä½è æ¹ä¸ºæï¼å -C/-c/--amend åæ°å ±ç¨ï¼" -#: builtin/commit.c:1400 builtin/log.c:1068 builtin/revert.c:109 +#: builtin/commit.c:1383 builtin/log.c:1102 builtin/revert.c:109 msgid "add Signed-off-by:" -msgstr "" +msgstr "æ·»å Signed-off-by: ç¾å" -#: builtin/commit.c:1401 +#: builtin/commit.c:1384 msgid "use specified template file" -msgstr "" +msgstr "使ç¨æå®ç模æ¿æ件" -#: builtin/commit.c:1402 -#, fuzzy +#: builtin/commit.c:1385 msgid "force edit of commit" -msgstr "å并æªè¿åæ交" +msgstr "强å¶ç¼è¾æ交" -#: builtin/commit.c:1403 +# è¯è ï¼å¯éå¼ï¼ä¸è½ç¿»è¯ï¼ææ¯åæä¸ç¬è¯¯ï¼åºä¸º modeï¼ +#: builtin/commit.c:1386 msgid "default" -msgstr "" +msgstr "default" -#: builtin/commit.c:1403 builtin/tag.c:462 +#: builtin/commit.c:1386 builtin/tag.c:462 msgid "how to strip spaces and #comments from message" -msgstr "" +msgstr "设置å¦ä½å é¤æ交说æéçç©ºæ ¼å#注é" -#: builtin/commit.c:1404 -#, fuzzy +#: builtin/commit.c:1387 msgid "include status in commit message template" -msgstr "ä¸è½åæ交模ç" +msgstr "å¨æ交说æ模æ¿éå å«ç¶æä¿¡æ¯" -#: builtin/commit.c:1405 builtin/merge.c:213 builtin/tag.c:463 +#: builtin/commit.c:1388 builtin/merge.c:213 builtin/tag.c:463 msgid "key id" -msgstr "" +msgstr "key id" -#: builtin/commit.c:1406 builtin/merge.c:214 +#: builtin/commit.c:1389 builtin/merge.c:214 msgid "GPG sign commit" -msgstr "" +msgstr "GPG æ交ç¾å" #. end commit message options -#: builtin/commit.c:1409 +#: builtin/commit.c:1392 msgid "Commit contents options" -msgstr "" +msgstr "æ交å 容é项" -#: builtin/commit.c:1410 +#: builtin/commit.c:1393 msgid "commit all changed files" -msgstr "" +msgstr "æ交æææ¹å¨çæ件" -#: builtin/commit.c:1411 +#: builtin/commit.c:1394 msgid "add specified files to index for commit" -msgstr "" +msgstr "æ·»å æå®çæ件å°ç´¢å¼åºçå¾ æ交" -#: builtin/commit.c:1412 -#, fuzzy +#: builtin/commit.c:1395 msgid "interactively add files" -msgstr "交äºå¼æ·»å 失败" +msgstr "交äºå¼æ·»å æ件" -#: builtin/commit.c:1413 -#, fuzzy +#: builtin/commit.c:1396 msgid "interactively add changes" -msgstr "交äºå¼æ·»å 失败" +msgstr "交äºå¼æ·»å åæ´" -#: builtin/commit.c:1414 -#, fuzzy +#: builtin/commit.c:1397 msgid "commit only specified files" -msgstr "æ æ³è¿åä¿®æ¹çæ件" +msgstr "åªæ交æå®çæ件" -#: builtin/commit.c:1415 +#: builtin/commit.c:1398 msgid "bypass pre-commit hook" -msgstr "" +msgstr "ç»è¿ pre-commit é©å" -#: builtin/commit.c:1416 -#, fuzzy +#: builtin/commit.c:1399 msgid "show what would be committed" -msgstr "è¦æ交çåæ´ï¼" +msgstr "æ¾ç¤ºå°è¦æ交çå 容" -#: builtin/commit.c:1424 +#: builtin/commit.c:1410 msgid "amend previous commit" -msgstr "" +msgstr "ä¿®æ¹å åçæ交" -#: builtin/commit.c:1425 +#: builtin/commit.c:1411 msgid "bypass post-rewrite hook" -msgstr "" +msgstr "ç»è¿ post-rewrite é©å" -#: builtin/commit.c:1430 +#: builtin/commit.c:1416 msgid "ok to record an empty change" -msgstr "" +msgstr "å 许ä¸ä¸ªç©ºæ交" -#: builtin/commit.c:1433 +#: builtin/commit.c:1419 msgid "ok to record a change with an empty message" -msgstr "" +msgstr "å 许空çæ交说æ" -#: builtin/commit.c:1464 +#: builtin/commit.c:1451 msgid "could not parse HEAD commit" msgstr "ä¸è½è§£æ HEAD æ交" -#: builtin/commit.c:1502 builtin/merge.c:508 +#: builtin/commit.c:1489 builtin/merge.c:508 #, c-format msgid "could not open '%s' for reading" msgstr "ä¸è½ä¸ºè¯»å ¥æå¼ '%s'" -#: builtin/commit.c:1509 +#: builtin/commit.c:1496 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "æåç MERGE_HEAD æ件ï¼%sï¼" -#: builtin/commit.c:1516 +#: builtin/commit.c:1503 msgid "could not read MERGE_MODE" msgstr "ä¸è½è¯»å MERGE_MODE" -#: builtin/commit.c:1535 +#: builtin/commit.c:1522 #, c-format msgid "could not read commit message: %s" msgstr "ä¸è½è¯»åæ交说æï¼%s" -#: builtin/commit.c:1549 +#: builtin/commit.c:1536 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "ç»æ¢æ交ï¼æ¨æªæ´æ¹æ¥èªæ¨¡ççæ交说æã\n" -#: builtin/commit.c:1554 +#: builtin/commit.c:1541 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "ç»æ¢æ交å 为æ交说æ为空ã\n" -#: builtin/commit.c:1569 builtin/merge.c:935 builtin/merge.c:960 +#: builtin/commit.c:1556 builtin/merge.c:833 builtin/merge.c:858 msgid "failed to write commit object" msgstr "æ æ³åæ交对象" -#: builtin/commit.c:1590 +#: builtin/commit.c:1577 msgid "cannot lock HEAD ref" msgstr "æ æ³éå® HEAD å¼ç¨" -#: builtin/commit.c:1594 +#: builtin/commit.c:1581 msgid "cannot update HEAD ref" msgstr "æ æ³æ´æ° HEAD å¼ç¨" -#: builtin/commit.c:1605 +#: builtin/commit.c:1592 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full or quota is\n" @@ -3827,135 +3793,131 @@ msgstr "" #: builtin/config.c:7 msgid "git config [options]" -msgstr "" +msgstr "git config [é项]" -#: builtin/config.c:52 +#: builtin/config.c:51 msgid "Config file location" -msgstr "" +msgstr "é ç½®æ件ä½ç½®" -#: builtin/config.c:53 -#, fuzzy +#: builtin/config.c:52 msgid "use global config file" -msgstr "æ æ³æ´æ° config æ件" +msgstr "使ç¨å ¨å±é ç½®æ件" -#: builtin/config.c:54 +#: builtin/config.c:53 msgid "use system config file" -msgstr "" +msgstr "使ç¨ç³»ç»çº§é ç½®æ件" -#: builtin/config.c:55 -#, fuzzy +#: builtin/config.c:54 msgid "use repository config file" -msgstr "éè¦ä¸ä¸ªçæ¬åºæ¥è§£å ã" +msgstr "使ç¨çæ¬åºçº§é ç½®æ件" -#: builtin/config.c:56 -#, fuzzy +#: builtin/config.c:55 msgid "use given config file" -msgstr "æªé¢æçæ件ç»æ" +msgstr "使ç¨æå®çé ç½®æ件" -#: builtin/config.c:57 -#, fuzzy +#: builtin/config.c:56 msgid "Action" -msgstr "å¨ä½" +msgstr "æä½" -#: builtin/config.c:58 +#: builtin/config.c:57 msgid "get value: name [value-regex]" -msgstr "" +msgstr "è·åå¼ï¼name [value-regex]" -#: builtin/config.c:59 +#: builtin/config.c:58 msgid "get all values: key [value-regex]" -msgstr "" +msgstr "è·å¾ææçå¼ï¼key [value-regex]" -#: builtin/config.c:60 +#: builtin/config.c:59 msgid "get values for regexp: name-regex [value-regex]" -msgstr "" +msgstr "æ ¹æ®æ£å表达å¼è·å¾å¼ï¼name-regex [value-regex]" -#: builtin/config.c:61 +#: builtin/config.c:60 msgid "replace all matching variables: name value [value_regex]" -msgstr "" +msgstr "æ¿æ¢ææå¹é çåéï¼name value [value_regex]" -#: builtin/config.c:62 +#: builtin/config.c:61 msgid "add a new variable: name value" -msgstr "" +msgstr "æ·»å ä¸ä¸ªæ°çåéï¼name value" -#: builtin/config.c:63 +#: builtin/config.c:62 msgid "remove a variable: name [value-regex]" -msgstr "" +msgstr "å é¤ä¸ä¸ªåéï¼name [value-regex]" -#: builtin/config.c:64 +#: builtin/config.c:63 msgid "remove all matches: name [value-regex]" -msgstr "" +msgstr "å é¤ææå¹é 项ï¼name [value-regex]" -#: builtin/config.c:65 +#: builtin/config.c:64 msgid "rename section: old-name new-name" -msgstr "" +msgstr "éå½åå°èï¼old-name new-name" -#: builtin/config.c:66 +#: builtin/config.c:65 msgid "remove a section: name" -msgstr "" +msgstr "å é¤ä¸ä¸ªå°èï¼name" -#: builtin/config.c:67 +#: builtin/config.c:66 msgid "list all" -msgstr "" +msgstr "ååºææ" -#: builtin/config.c:68 +#: builtin/config.c:67 msgid "open an editor" -msgstr "" +msgstr "æå¼ä¸ä¸ªç¼è¾å¨" -#: builtin/config.c:69 builtin/config.c:70 +#: builtin/config.c:68 builtin/config.c:69 msgid "slot" -msgstr "" +msgstr "slot" -#: builtin/config.c:69 +#: builtin/config.c:68 msgid "find the color configured: [default]" -msgstr "" +msgstr "æ¾å°é ç½®çé¢è²ï¼[é»è®¤]" -#: builtin/config.c:70 +#: builtin/config.c:69 msgid "find the color setting: [stdout-is-tty]" -msgstr "" +msgstr "æ¾å°é¢è²è®¾ç½®ï¼[stdout-is-tty]" -#: builtin/config.c:71 +#: builtin/config.c:70 msgid "Type" -msgstr "" +msgstr "ç±»å" -#: builtin/config.c:72 +#: builtin/config.c:71 msgid "value is \"true\" or \"false\"" -msgstr "" +msgstr "å¼æ¯ \"true\" æ \"false\"" -#: builtin/config.c:73 +#: builtin/config.c:72 msgid "value is decimal number" -msgstr "" +msgstr "å¼æ¯åè¿å¶æ°" -#: builtin/config.c:74 +#: builtin/config.c:73 msgid "value is --bool or --int" -msgstr "" +msgstr "å¼æ¯ --bool or --int" -#: builtin/config.c:75 +#: builtin/config.c:74 msgid "value is a path (file or directory name)" -msgstr "" +msgstr "å¼æ¯ä¸ä¸ªè·¯å¾ï¼æ件æç®å½åï¼" -#: builtin/config.c:76 +#: builtin/config.c:75 msgid "Other" -msgstr "" +msgstr "å ¶å®" -#: builtin/config.c:77 +#: builtin/config.c:76 msgid "terminate values with NUL byte" -msgstr "" +msgstr "ç»æ¢å¼æ¯NULåè" -#: builtin/config.c:78 +#: builtin/config.c:77 msgid "respect include directives on lookup" -msgstr "" +msgstr "æ¥è¯¢æ¶åç § include æ令éå½æ¥æ¾" #: builtin/count-objects.c:69 msgid "git count-objects [-v]" -msgstr "" +msgstr "git count-objects [-v]" #: builtin/describe.c:15 msgid "git describe [options] <committish>*" -msgstr "" +msgstr "git describe [é项] <æ交å·>*" #: builtin/describe.c:16 msgid "git describe [options] --dirty" -msgstr "" +msgstr "git describe [é项] --dirty" #: builtin/describe.c:234 #, c-format @@ -4031,49 +3993,47 @@ msgstr "" #: builtin/describe.c:403 msgid "find the tag that comes after the commit" -msgstr "" +msgstr "寻æ¾æ交ä¹åç tagï¼ç¨äºæè¿°æ交ï¼" #: builtin/describe.c:404 msgid "debug search strategy on stderr" -msgstr "" +msgstr "å¨æ åé误ä¸è°è¯æç´¢çç¥" #: builtin/describe.c:405 msgid "use any ref in .git/refs" -msgstr "" +msgstr "ä½¿ç¨ .git/refs éçä»»æå¼ç¨" #: builtin/describe.c:406 msgid "use any tag in .git/refs/tags" -msgstr "" +msgstr "ä½¿ç¨ .git/refs/tags éçä»»æ tag" #: builtin/describe.c:407 msgid "always use long format" -msgstr "" +msgstr "å§ç»ä½¿ç¨é¿æ交å·æ ¼å¼" #: builtin/describe.c:410 -#, fuzzy msgid "only output exact matches" -msgstr "没æ tag åç¡®å¹é '%s'" +msgstr "åªè¾åºç²¾ç¡®å¹é " #: builtin/describe.c:412 msgid "consider <n> most recent tags (default: 10)" -msgstr "" +msgstr "èèæè¿ <n> 个 tagsï¼é»è®¤ï¼10ï¼" #: builtin/describe.c:414 -#, fuzzy msgid "only consider tags matching <pattern>" -msgstr "è¾åºå模å¼å¹é çè¡" +msgstr "åªèèå¹é <模å¼> ç tags" #: builtin/describe.c:416 builtin/name-rev.c:238 msgid "show abbreviated commit object as fallback" -msgstr "" +msgstr "æ¾ç¤ºç®åçæ交å·ä½ä¸ºåå¤" #: builtin/describe.c:417 msgid "mark" -msgstr "" +msgstr "æ è®°" #: builtin/describe.c:418 msgid "append <mark> on dirty working tree (default: \"-dirty\")" -msgstr "" +msgstr "è¥å·¥ä½åºèï¼æåæ´ï¼å¨ç»å°¾æ·»å <æ è®°>ï¼é»è®¤ï¼\"-dirty\"ï¼" #: builtin/describe.c:436 msgid "--long is incompatible with --abbrev=0" @@ -4092,160 +4052,155 @@ msgstr "--dirty ä¸è½ä¸æ交åæ¶ä½¿ç¨" msgid "'%s': not a regular file or symlink" msgstr "'%s'ï¼ä¸æ¯ä¸ä¸ªæ£è§æ件æ符å·é¾æ¥" -#: builtin/diff.c:224 +#: builtin/diff.c:228 #, c-format msgid "invalid option: %s" msgstr "æ æé项ï¼%s" -#: builtin/diff.c:301 +#: builtin/diff.c:305 msgid "Not a git repository" msgstr "ä¸æ¯ä¸ä¸ª git çæ¬åº" -#: builtin/diff.c:344 +#: builtin/diff.c:348 #, c-format msgid "invalid object '%s' given." msgstr "æä¾äºæ æ对象 '%s'ã" -#: builtin/diff.c:349 +#: builtin/diff.c:353 #, c-format msgid "more than %d trees given: '%s'" msgstr "æä¾äºè¶ è¿ %d 个æ 对象ï¼'%s'" -#: builtin/diff.c:359 +#: builtin/diff.c:363 #, c-format msgid "more than two blobs given: '%s'" -msgstr "æä¾äºè¶ è¿ä¸¤ä¸ªäºè¿å¶å¯¹è±¡ï¼blobï¼ï¼'%s'" +msgstr "æä¾äºè¶ è¿ä¸¤ä¸ªæ°æ®ï¼blobï¼å¯¹è±¡ï¼'%s'" -#: builtin/diff.c:367 +#: builtin/diff.c:371 #, c-format msgid "unhandled object '%s' given." msgstr "æä¾äºæ æ³å¤çç对象 '%s'ã" #: builtin/fast-export.c:22 msgid "git fast-export [rev-list-opts]" -msgstr "" +msgstr "git fast-export [rev-list-opts]" -#: builtin/fast-export.c:635 -#, fuzzy +#: builtin/fast-export.c:646 msgid "show progress after <n> objects" -msgstr "æ¾ç¤ºåç§ç±»åç对象" +msgstr "å¨ <n> 个对象ä¹åæ¾ç¤ºè¿åº¦" -#: builtin/fast-export.c:637 +#: builtin/fast-export.c:648 msgid "select handling of signed tags" -msgstr "" +msgstr "éæ©å¦ä½å¤çç¾å tags" -#: builtin/fast-export.c:640 +#: builtin/fast-export.c:651 msgid "select handling of tags that tag filtered objects" -msgstr "" +msgstr "éæ©å½ tag æå被è¿æ»¤æ¶ tags çå¤çæ¹å¼" -#: builtin/fast-export.c:643 +#: builtin/fast-export.c:654 msgid "Dump marks to this file" -msgstr "" +msgstr "ææ è®°åå¨å°è¿ä¸ªæ件" -#: builtin/fast-export.c:645 +#: builtin/fast-export.c:656 msgid "Import marks from this file" -msgstr "" +msgstr "ä»è¿ä¸ªæä»¶å¯¼å ¥æ è®°" -#: builtin/fast-export.c:647 +#: builtin/fast-export.c:658 msgid "Fake a tagger when tags lack one" -msgstr "" +msgstr "å½ tags 缺å°æ è®°è å段æ¶ï¼åè£ æä¾ä¸ä¸ª" -#: builtin/fast-export.c:649 +#: builtin/fast-export.c:660 msgid "Output full tree for each commit" -msgstr "" +msgstr "æ¯æ¬¡æ交é½è¾åºæ´ä¸ªæ " -#: builtin/fast-export.c:651 +#: builtin/fast-export.c:662 msgid "Use the done feature to terminate the stream" -msgstr "" +msgstr "ä½¿ç¨ done åè½æ¥ç»æ¢æµ" -#: builtin/fast-export.c:652 +#: builtin/fast-export.c:663 msgid "Skip output of blob data" -msgstr "" +msgstr "è·³è¿æ°æ®å¯¹è±¡çè¾åº" #: builtin/fetch.c:20 -#, fuzzy msgid "git fetch [<options>] [<repository> [<refspec>...]]" -msgstr "git apply [é项] [<è¡¥ä¸>...]" +msgstr "git fetch [<é项>] [<çæ¬åº> [<å¼ç¨è¡¨è¾¾å¼>...]]" #: builtin/fetch.c:21 msgid "git fetch [<options>] <group>" -msgstr "" +msgstr "git fetch [<é项>] <ç»>" #: builtin/fetch.c:22 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" -msgstr "" +msgstr "git fetch --multiple [<é项>] [(<çæ¬åº> | <ç»>)...]" #: builtin/fetch.c:23 msgid "git fetch --all [<options>]" -msgstr "" +msgstr "git fetch --all [<é项>]" #: builtin/fetch.c:60 msgid "fetch from all remotes" -msgstr "" +msgstr "ä»ææçè¿ç¨æå" #: builtin/fetch.c:62 msgid "append to .git/FETCH_HEAD instead of overwriting" -msgstr "" +msgstr "追å å° .git/FETCH_HEAD èä¸æ¯è¦çå®" #: builtin/fetch.c:64 msgid "path to upload pack on remote end" -msgstr "" +msgstr "ä¸ä¼ å å°è¿ç¨çè·¯å¾" #: builtin/fetch.c:65 msgid "force overwrite of local branch" -msgstr "" +msgstr "强å¶è¦çæ¬å°åæ¯" #: builtin/fetch.c:67 msgid "fetch from multiple remotes" -msgstr "" +msgstr "ä»å¤ä¸ªè¿ç¨æå" #: builtin/fetch.c:69 -#, fuzzy msgid "fetch all tags and associated objects" -msgstr "æ´æ°è¿ç¨å¼ç¨åç¸å ³ç对象" +msgstr "æåææç tags åå ³è对象" #: builtin/fetch.c:71 msgid "do not fetch all tags (--no-tags)" -msgstr "" +msgstr "ä¸æåä»»ä½ tags (--no-tags)" #: builtin/fetch.c:73 -#, fuzzy msgid "prune remote-tracking branches no longer on remote" -msgstr "%s 没ææ¥èª %s çè¿ç¨è·è¸ªåæ¯" +msgstr "æ¸ é¤è¿ç¨å·²ç»ä¸åå¨çåæ¯çè·è¸ªåæ¯" +# è¯è ï¼å¯éå¼ï¼ä¸è½ç¿»è¯ #: builtin/fetch.c:74 msgid "on-demand" -msgstr "" +msgstr "on-demand" #: builtin/fetch.c:75 msgid "control recursive fetching of submodules" -msgstr "" +msgstr "æ§å¶å模ç»çéå½æå" #: builtin/fetch.c:79 msgid "keep downloaded pack" -msgstr "" +msgstr "ä¿æä¸è½½å " #: builtin/fetch.c:81 -#, fuzzy msgid "allow updating of HEAD ref" -msgstr "æ æ³æ´æ° HEAD å¼ç¨" +msgstr "å 许æ´æ° HEAD å¼ç¨" #: builtin/fetch.c:84 msgid "deepen history of shallow clone" -msgstr "" +msgstr "æ·±åæµ å éçåå²" -#: builtin/fetch.c:85 builtin/log.c:1083 +#: builtin/fetch.c:85 builtin/log.c:1119 msgid "dir" -msgstr "" +msgstr "ç®å½" #: builtin/fetch.c:86 -#, fuzzy msgid "prepend this to submodule path output" -msgstr "æ æ³éå½è¿å模ç»è·¯å¾ '$sm_path'" +msgstr "å¨å模ç»è·¯å¾è¾åºçåé¢å ä¸æ¤ç®å½" #: builtin/fetch.c:89 msgid "default mode for recursion" -msgstr "" +msgstr "éå½çé»è®¤æ¨¡å¼" #: builtin/fetch.c:201 msgid "Couldn't find remote ref HEAD" @@ -4256,68 +4211,68 @@ msgstr "æ æ³åç°è¿ç¨ HEAD å¼ç¨" msgid "object %s not found" msgstr "对象 %s æªåç°" -#: builtin/fetch.c:260 +#: builtin/fetch.c:259 msgid "[up to date]" msgstr "[ææ°]" -#: builtin/fetch.c:274 +#: builtin/fetch.c:273 #, c-format msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgstr "! %-*s %-*s -> %s ï¼å¨å½ååæ¯ä¸ä¸è½è·åï¼" -#: builtin/fetch.c:275 builtin/fetch.c:361 +#: builtin/fetch.c:274 builtin/fetch.c:360 msgid "[rejected]" msgstr "[å·²æç»]" -#: builtin/fetch.c:286 +#: builtin/fetch.c:285 msgid "[tag update]" msgstr "[tagæ´æ°]" # è¯è ï¼æ³¨æä¿æåå¯¼ç©ºæ ¼ -#: builtin/fetch.c:288 builtin/fetch.c:323 builtin/fetch.c:341 +#: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340 msgid " (unable to update local ref)" msgstr " ï¼ä¸è½æ´æ°æ¬å°å¼ç¨ï¼" -#: builtin/fetch.c:306 +#: builtin/fetch.c:305 msgid "[new tag]" msgstr "[æ°tag]" -#: builtin/fetch.c:309 +#: builtin/fetch.c:308 msgid "[new branch]" msgstr "[æ°åæ¯]" -#: builtin/fetch.c:312 +#: builtin/fetch.c:311 msgid "[new ref]" msgstr "[æ°å¼ç¨]" -#: builtin/fetch.c:357 +#: builtin/fetch.c:356 msgid "unable to update local ref" msgstr "ä¸è½æ´æ°æ¬å°å¼ç¨" -#: builtin/fetch.c:357 +#: builtin/fetch.c:356 msgid "forced update" msgstr "强å¶æ´æ°" -#: builtin/fetch.c:363 +#: builtin/fetch.c:362 msgid "(non-fast-forward)" msgstr "ï¼éå¿«è¿å¼ï¼" -#: builtin/fetch.c:394 builtin/fetch.c:686 +#: builtin/fetch.c:393 builtin/fetch.c:685 #, c-format msgid "cannot open %s: %s\n" msgstr "æ æ³æå¼ %sï¼%s\n" -#: builtin/fetch.c:403 +#: builtin/fetch.c:402 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s æªåéææå¿ é¡»ç对象\n" -#: builtin/fetch.c:489 +#: builtin/fetch.c:488 #, c-format msgid "From %.*s\n" msgstr "æ¥èª %.*s\n" -#: builtin/fetch.c:500 +#: builtin/fetch.c:499 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -4327,203 +4282,200 @@ msgstr "" " 'git remote prune %s' æ¥å é¤æ§çãæå²çªçåæ¯" # è¯è ï¼æ³¨æä¿æåå¯¼ç©ºæ ¼ -#: builtin/fetch.c:550 +#: builtin/fetch.c:549 #, c-format msgid " (%s will become dangling)" -msgstr " ï¼%s å°æ为æ¬ç©ºç¶æï¼" +msgstr " ï¼%s å°æ为ææç¶æï¼" # è¯è ï¼æ³¨æä¿æåå¯¼ç©ºæ ¼ -#: builtin/fetch.c:551 +#: builtin/fetch.c:550 #, c-format msgid " (%s has become dangling)" -msgstr " ï¼%s å·²æ为æ¬ç©ºç¶æï¼" +msgstr " ï¼%s å·²æ为ææç¶æï¼" -#: builtin/fetch.c:558 +#: builtin/fetch.c:557 msgid "[deleted]" msgstr "[å·²å é¤]" -#: builtin/fetch.c:559 builtin/remote.c:1055 +#: builtin/fetch.c:558 builtin/remote.c:1055 msgid "(none)" msgstr "ï¼æ ï¼" -#: builtin/fetch.c:676 +#: builtin/fetch.c:675 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "æç»è·åå°é裸çæ¬åºçå½ååæ¯ %s" -#: builtin/fetch.c:710 +#: builtin/fetch.c:709 #, c-format msgid "Don't know how to fetch from %s" msgstr "ä¸ç¥éå¦ä½ä» %s è·å" -#: builtin/fetch.c:787 +#: builtin/fetch.c:786 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "é项 \"%s\" çå¼ \"%s\" å¯¹äº %s æ¯æ æç" -#: builtin/fetch.c:790 +#: builtin/fetch.c:789 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "é项 \"%s\" 为 %s æ忽ç¥\n" -#: builtin/fetch.c:892 +#: builtin/fetch.c:891 #, c-format msgid "Fetching %s\n" msgstr "æ£å¨è·å %s\n" -#: builtin/fetch.c:894 builtin/remote.c:100 +#: builtin/fetch.c:893 builtin/remote.c:100 #, c-format msgid "Could not fetch %s" msgstr "ä¸è½è·å %s" -#: builtin/fetch.c:913 +#: builtin/fetch.c:912 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." msgstr "æªæå®è¿ç¨çæ¬åºã请éè¿ä¸ä¸ªURLæè¿ç¨çæ¬åºåæå®ï¼ç¨ä»¥è·åæ°æ交ã" -#: builtin/fetch.c:933 +#: builtin/fetch.c:932 msgid "You need to specify a tag name." msgstr "æ¨éè¦æå®ä¸ä¸ª tag å称ã" -#: builtin/fetch.c:985 +#: builtin/fetch.c:984 msgid "fetch --all does not take a repository argument" msgstr "fetch --all ä¸è½å¸¦ä¸ä¸ªçæ¬åºåæ°" -#: builtin/fetch.c:987 +#: builtin/fetch.c:986 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all 带å¼ç¨è¡¨è¾¾å¼æ²¡æä»»ä½æä¹" -#: builtin/fetch.c:998 +#: builtin/fetch.c:997 #, c-format msgid "No such remote or remote group: %s" msgstr "没æè¿æ ·çè¿ç¨æè¿ç¨ç»ï¼%s" -#: builtin/fetch.c:1006 +#: builtin/fetch.c:1005 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "è·åç»å¹¶æå®å¼ç¨è¡¨è¾¾å¼æ²¡ææä¹" #: builtin/fmt-merge-msg.c:13 msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]" msgstr "" +"git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]" -#: builtin/fmt-merge-msg.c:653 builtin/fmt-merge-msg.c:656 builtin/grep.c:786 -#: builtin/merge.c:188 builtin/show-branch.c:656 builtin/show-ref.c:192 -#: builtin/tag.c:448 parse-options.h:133 parse-options.h:235 +#: builtin/fmt-merge-msg.c:659 builtin/fmt-merge-msg.c:662 builtin/grep.c:701 +#: builtin/merge.c:188 builtin/show-branch.c:656 builtin/show-ref.c:175 +#: builtin/tag.c:448 parse-options.h:133 parse-options.h:239 msgid "n" -msgstr "æ°å" +msgstr "n" -#: builtin/fmt-merge-msg.c:654 +#: builtin/fmt-merge-msg.c:660 msgid "populate log with at most <n> entries from shortlog" -msgstr "" +msgstr "åæ交说æä¸æå¤å¤å¶æå®æ¡ç®ï¼å并èæ¥çæ交ï¼çç®ç说æ" -#: builtin/fmt-merge-msg.c:657 +#: builtin/fmt-merge-msg.c:663 msgid "alias for --log (deprecated)" -msgstr "" +msgstr "åæ° --log çå«åï¼å·²å¼ç¨ï¼" -#: builtin/fmt-merge-msg.c:660 +#: builtin/fmt-merge-msg.c:666 msgid "text" -msgstr "" +msgstr "ææ¬" -#: builtin/fmt-merge-msg.c:661 +#: builtin/fmt-merge-msg.c:667 msgid "use <text> as start of message" -msgstr "" +msgstr "ä½¿ç¨ <ææ¬> ä½ä¸ºæ交说æçå¼å§" -#: builtin/fmt-merge-msg.c:662 -#, fuzzy +#: builtin/fmt-merge-msg.c:668 msgid "file to read from" -msgstr "ä¸è½è¯» %s" +msgstr "ä»æ件ä¸è¯»å" #: builtin/for-each-ref.c:979 -#, fuzzy msgid "git for-each-ref [options] [<pattern>]" -msgstr "git apply [é项] [<è¡¥ä¸>...]" +msgstr "git for-each-ref [é项] [<模å¼>]" #: builtin/for-each-ref.c:994 msgid "quote placeholders suitably for shells" -msgstr "" +msgstr "å¼ç¨å ä½ç¬¦éç¨äº shells" #: builtin/for-each-ref.c:996 msgid "quote placeholders suitably for perl" -msgstr "" +msgstr "å¼ç¨å ä½ç¬¦éç¨äº perl" #: builtin/for-each-ref.c:998 msgid "quote placeholders suitably for python" -msgstr "" +msgstr "å¼ç¨å ä½ç¬¦éç¨äº python" #: builtin/for-each-ref.c:1000 msgid "quote placeholders suitably for tcl" -msgstr "" +msgstr "å¼ç¨å ä½ç¬¦éç¨äº tcl" #: builtin/for-each-ref.c:1003 msgid "show only <n> matched refs" -msgstr "" +msgstr "åªæ¾ç¤º <n> 个å¹é çå¼ç¨" #: builtin/for-each-ref.c:1004 msgid "format" -msgstr "" +msgstr "æ ¼å¼" #: builtin/for-each-ref.c:1004 msgid "format to use for the output" -msgstr "" +msgstr "è¾åºæ ¼å¼" #: builtin/for-each-ref.c:1005 msgid "key" -msgstr "" +msgstr "key" #: builtin/for-each-ref.c:1006 msgid "field name to sort on" -msgstr "" +msgstr "æåºçå段å" #: builtin/fsck.c:608 -#, fuzzy msgid "git fsck [options] [<object>...]" -msgstr "git apply [é项] [<è¡¥ä¸>...]" +msgstr "git fsck [é项] [<对象>...]" #: builtin/fsck.c:614 msgid "show unreachable objects" -msgstr "" +msgstr "æ¾ç¤ºä¸å¯è¾¾ç对象" #: builtin/fsck.c:615 -#, fuzzy msgid "show dangling objects" -msgstr "ç´¢å¼å¯¹è±¡ä¸" +msgstr "æ¾ç¤ºææç对象" #: builtin/fsck.c:616 msgid "report tags" -msgstr "" +msgstr "æ¥å tags" #: builtin/fsck.c:617 msgid "report root nodes" -msgstr "" +msgstr "æ¥åæ ¹èç¹" #: builtin/fsck.c:618 msgid "make index objects head nodes" -msgstr "" +msgstr "å°ç´¢å¼äº¦ä½ä¸ºæ£æ¥ç头èç¹" #: builtin/fsck.c:619 msgid "make reflogs head nodes (default)" -msgstr "" +msgstr "å°å¼ç¨æ¥å¿ä½ä¸ºæ£æ¥ç头èç¹ï¼é»è®¤ï¼" #: builtin/fsck.c:620 msgid "also consider packs and alternate objects" -msgstr "" +msgstr "ä¹èèå åå¤ç¨å¯¹è±¡" #: builtin/fsck.c:621 msgid "enable more strict checking" -msgstr "" +msgstr "å¯ç¨æ´ä¸¥æ ¼çæ£æ¥" #: builtin/fsck.c:623 msgid "write dangling objects in .git/lost-found" -msgstr "" +msgstr "å°ææ对象åå ¥ .git/lost-found ä¸" #: builtin/fsck.c:624 builtin/prune.c:134 msgid "show progress" -msgstr "" +msgstr "æ¾ç¤ºè¿åº¦" #: builtin/gc.c:22 msgid "git gc [options]" -msgstr "" +msgstr "git gc [é项]" #: builtin/gc.c:63 #, c-format @@ -4537,22 +4489,17 @@ msgstr "ä¸æ£å¸¸çé¿å¯¹è±¡ç®å½ %.*s" #: builtin/gc.c:179 msgid "prune unreferenced objects" -msgstr "" +msgstr "æ¸ é¤æªå¼ç¨ç对象" #: builtin/gc.c:181 msgid "be more thorough (increased runtime)" -msgstr "" +msgstr "æ´å½»åºï¼å¢å è¿è¡æ¶é´ï¼" #: builtin/gc.c:182 msgid "enable auto-gc mode" -msgstr "" +msgstr "å¯ç¨èªå¨åå¾åæ¶æ¨¡å¼" -#: builtin/gc.c:221 -#, c-format -msgid "Auto packing the repository for optimum performance.\n" -msgstr "èªå¨æå çæ¬åºä»¥æ±æä½³æ§è½ã\n" - -#: builtin/gc.c:224 +#: builtin/gc.c:222 #, c-format msgid "" "Auto packing the repository for optimum performance. You may also\n" @@ -4561,239 +4508,240 @@ msgstr "" "èªå¨æå çæ¬åºä»¥æ±æä½³æ§è½ãæ¨è¿å¯ä»¥æå¨è¿è¡ \"git gc\"ã\n" "åè§ \"git help gc\" 以è·åæ´å¤ä¿¡æ¯ã\n" -#: builtin/gc.c:251 +#: builtin/gc.c:249 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "æ太å¤ä¸å¯è¾¾çæ¾æ£å¯¹è±¡ï¼è¿è¡ 'git prune' å é¤å®ä»¬ã" #: builtin/grep.c:22 msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]" -msgstr "" +msgstr "git grep [é项] [-e] <模å¼> [<修订>...] [[--] <è·¯å¾>...]" -#: builtin/grep.c:216 +#: builtin/grep.c:217 #, c-format msgid "grep: failed to create thread: %s" msgstr "grepï¼æ æ³å建线ç¨ï¼%s" -#: builtin/grep.c:454 +#: builtin/grep.c:365 #, c-format msgid "Failed to chdir: %s" msgstr "æ æ³åæ¢ç®å½ï¼%s" -#: builtin/grep.c:530 builtin/grep.c:564 +#: builtin/grep.c:443 builtin/grep.c:478 #, c-format msgid "unable to read tree (%s)" msgstr "æ æ³è¯»åæ ï¼%sï¼" -#: builtin/grep.c:578 +#: builtin/grep.c:493 #, c-format msgid "unable to grep from object of type %s" msgstr "æ æ³æåæ¥èªäº %s ç±»åç对象" -#: builtin/grep.c:636 +#: builtin/grep.c:551 #, c-format msgid "switch `%c' expects a numerical value" msgstr "å¼å ³ `%c' ææä¸ä¸ªæ°åå¼" -#: builtin/grep.c:653 +#: builtin/grep.c:568 #, c-format msgid "cannot open '%s'" msgstr "ä¸è½æå¼ '%s'" -#: builtin/grep.c:728 +#: builtin/grep.c:643 msgid "search in index instead of in the work tree" -msgstr "" +msgstr "å¨ç´¢å¼åºæç´¢èä¸æ¯å¨å·¥ä½åº" -#: builtin/grep.c:730 +#: builtin/grep.c:645 msgid "find in contents not managed by git" -msgstr "" +msgstr "å¨æªè¢« git 管ççå 容ä¸æ¥æ¾" # è¯è ï¼ä¸æå符串æ¼æ¥ï¼å¯å é¤åå¯¼ç©ºæ ¼ -#: builtin/grep.c:732 -#, fuzzy +#: builtin/grep.c:647 msgid "search in both tracked and untracked files" -msgstr "ï¼ä½¿ç¨ -u åæ°æ¾ç¤ºæªè·è¸ªçæ件ï¼" +msgstr "å¨è·è¸ªåæªè·è¸ªçæ件ä¸æç´¢" -#: builtin/grep.c:734 +#: builtin/grep.c:649 msgid "search also in ignored files" -msgstr "" +msgstr "ä¹å¨å¿½ç¥çæ件ä¸æç´¢" -#: builtin/grep.c:737 +#: builtin/grep.c:652 msgid "show non-matching lines" -msgstr "" +msgstr "æ¾ç¤ºæªå¹é çè¡" -#: builtin/grep.c:739 +#: builtin/grep.c:654 msgid "case insensitive matching" -msgstr "" +msgstr "ä¸åºå大å°åå¹é " -#: builtin/grep.c:741 +#: builtin/grep.c:656 msgid "match patterns only at word boundaries" -msgstr "" +msgstr "åªå¨åè¯è¾¹çå¹é 模å¼" -#: builtin/grep.c:743 +#: builtin/grep.c:658 msgid "process binary files as text" -msgstr "" +msgstr "æäºè¿å¶æ件å½åææ¬å¤ç" -#: builtin/grep.c:745 +#: builtin/grep.c:660 msgid "don't match patterns in binary files" -msgstr "" +msgstr "ä¸å¨äºè¿å¶æ件ä¸å¹é 模å¼" -#: builtin/grep.c:748 +#: builtin/grep.c:663 msgid "descend at most <depth> levels" -msgstr "" +msgstr "æå¤ä»¥æå®ç深度åä¸å¯»æ¾" -#: builtin/grep.c:752 +#: builtin/grep.c:667 msgid "use extended POSIX regular expressions" -msgstr "" +msgstr "使ç¨æ©å±ç POSIX æ£å表达å¼" -#: builtin/grep.c:755 +#: builtin/grep.c:670 msgid "use basic POSIX regular expressions (default)" -msgstr "" +msgstr "使ç¨åºæ¬ç POSIX æ£å表达å¼ï¼é»è®¤ï¼" -#: builtin/grep.c:758 +#: builtin/grep.c:673 msgid "interpret patterns as fixed strings" -msgstr "" +msgstr "æ模å¼è§£æ为åºå®çå符串" -#: builtin/grep.c:761 +#: builtin/grep.c:676 msgid "use Perl-compatible regular expressions" -msgstr "" +msgstr "ä½¿ç¨ Perl å ¼å®¹çæ£å表达å¼" -#: builtin/grep.c:764 +#: builtin/grep.c:679 msgid "show line numbers" -msgstr "" +msgstr "æ¾ç¤ºè¡å·" -#: builtin/grep.c:765 +#: builtin/grep.c:680 msgid "don't show filenames" -msgstr "" +msgstr "ä¸æ¾ç¤ºæ件å" -#: builtin/grep.c:766 -#, fuzzy +#: builtin/grep.c:681 msgid "show filenames" -msgstr "%sæ件ï¼" +msgstr "æ¾ç¤ºæ件å" -#: builtin/grep.c:768 +#: builtin/grep.c:683 msgid "show filenames relative to top directory" -msgstr "" +msgstr "æ¾ç¤ºç¸å¯¹äºé¡¶çº§ç®å½çæ件å" -#: builtin/grep.c:770 +#: builtin/grep.c:685 msgid "show only filenames instead of matching lines" -msgstr "" +msgstr "åªæ¾ç¤ºæ件åèä¸æ¾ç¤ºå¹é çè¡" -#: builtin/grep.c:772 +#: builtin/grep.c:687 msgid "synonym for --files-with-matches" -msgstr "" +msgstr "å --files-with-matches åä¹" -#: builtin/grep.c:775 +#: builtin/grep.c:690 msgid "show only the names of files without match" -msgstr "" +msgstr "åªæ¾ç¤ºæªå¹é çæ件å" -#: builtin/grep.c:777 -#, fuzzy +#: builtin/grep.c:692 msgid "print NUL after filenames" -msgstr "为æææ件ååæ·»å <æ ¹ç®å½>" +msgstr "å¨æ件ååè¾åº NUL å符" -#: builtin/grep.c:779 +#: builtin/grep.c:694 msgid "show the number of matches instead of matching lines" -msgstr "" +msgstr "æ¾ç¤ºæ»å¹é è¡æ°ï¼èä¸æ¾ç¤ºå¹é çè¡" -#: builtin/grep.c:780 +#: builtin/grep.c:695 msgid "highlight matches" -msgstr "" +msgstr "é«äº®æ¾ç¤ºå¹é 项" -#: builtin/grep.c:782 +#: builtin/grep.c:697 msgid "print empty line between matches from different files" -msgstr "" +msgstr "å¨ä¸åæ件çå¹é 项ä¹é´æå°ç©ºè¡" -#: builtin/grep.c:784 +#: builtin/grep.c:699 msgid "show filename only once above matches from same file" -msgstr "" +msgstr "åªå¨åä¸æ件çå¹é 项çä¸é¢æ¾ç¤ºä¸æ¬¡æ件å" -#: builtin/grep.c:787 +#: builtin/grep.c:702 msgid "show <n> context lines before and after matches" -msgstr "" +msgstr "æ¾ç¤ºå¹é 项ååç <n> è¡ä¸ä¸æ" -#: builtin/grep.c:790 +#: builtin/grep.c:705 msgid "show <n> context lines before matches" -msgstr "" +msgstr "æ¾ç¤ºå¹é 项å <n> è¡ä¸ä¸æ" -#: builtin/grep.c:792 +#: builtin/grep.c:707 msgid "show <n> context lines after matches" -msgstr "" +msgstr "æ¾ç¤ºå¹é 项å <n> è¡ä¸ä¸æ" -#: builtin/grep.c:793 +#: builtin/grep.c:708 msgid "shortcut for -C NUM" -msgstr "" +msgstr "å¿«æ·é® -C æ°å" -#: builtin/grep.c:796 +#: builtin/grep.c:711 msgid "show a line with the function name before matches" -msgstr "" +msgstr "å¨å¹é çåé¢æ¾ç¤ºä¸è¡å½æ°å" -#: builtin/grep.c:798 +#: builtin/grep.c:713 msgid "show the surrounding function" -msgstr "" +msgstr "æ¾ç¤ºæå¨å½æ°çååå 容" -#: builtin/grep.c:801 +#: builtin/grep.c:716 msgid "read patterns from file" -msgstr "" +msgstr "ä»æ件读å模å¼" -#: builtin/grep.c:803 +#: builtin/grep.c:718 msgid "match <pattern>" -msgstr "" +msgstr "å¹é <模å¼>" -#: builtin/grep.c:805 +#: builtin/grep.c:720 msgid "combine patterns specified with -e" -msgstr "" +msgstr "ç»åç¨ -e åæ°è®¾å®ç模å¼" -#: builtin/grep.c:817 +#: builtin/grep.c:732 msgid "indicate hit with exit status without output" -msgstr "" +msgstr "ä¸è¾åºï¼èç¨éåºç æ è¯å½ä¸ç¶æ" -#: builtin/grep.c:819 +#: builtin/grep.c:734 msgid "show only matches from files that match all patterns" -msgstr "" +msgstr "åªæ¾ç¤ºå¹é ææ模å¼çæ件ä¸çå¹é " -#: builtin/grep.c:822 +#: builtin/grep.c:736 +msgid "show parse tree for grep expression" +msgstr "æ¾ç¤º grep 表达å¼ç解ææ " + +#: builtin/grep.c:740 msgid "pager" -msgstr "" +msgstr "å页" -#: builtin/grep.c:822 +#: builtin/grep.c:740 msgid "show matching files in the pager" -msgstr "" +msgstr "å页æ¾ç¤ºå¹é çæ件" -#: builtin/grep.c:825 +#: builtin/grep.c:743 msgid "allow calling of grep(1) (ignored by this build)" -msgstr "" +msgstr "å 许è°ç¨ grep(1)ï¼æ¬æ¬¡æ建忽ç¥ï¼" -#: builtin/grep.c:826 builtin/show-ref.c:201 +#: builtin/grep.c:744 builtin/show-ref.c:184 msgid "show usage" -msgstr "" +msgstr "æ¾ç¤ºç¨æ³" -#: builtin/grep.c:917 +#: builtin/grep.c:811 msgid "no pattern given." msgstr "æªæä¾æ¨¡å¼å¹é ã" -#: builtin/grep.c:931 +#: builtin/grep.c:825 #, c-format msgid "bad object %s" msgstr "å对象 %s" -#: builtin/grep.c:972 +#: builtin/grep.c:866 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager ä» ç¨äºå·¥ä½åº" -#: builtin/grep.c:995 +#: builtin/grep.c:889 msgid "--cached or --untracked cannot be used with --no-index." msgstr "--cached æ --untracked ä¸è½ä¸ --no-index åæ¶ä½¿ç¨ã" -#: builtin/grep.c:1000 +#: builtin/grep.c:894 msgid "--no-index or --untracked cannot be used with revs." msgstr "--no-index æ --untracked ä¸è½åçæ¬åæ¶ä½¿ç¨ã" -#: builtin/grep.c:1003 +#: builtin/grep.c:897 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "--[no-]exclude-standard ä¸è½ç¨äºå·²è·è¸ªå 容ã" -#: builtin/grep.c:1011 +#: builtin/grep.c:905 msgid "both --cached and trees are given." msgstr "åæ¶ç»åºäº --cached åæ 对象ã" @@ -4802,56 +4750,56 @@ msgid "" "git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] " "<file>..." msgstr "" +"git hash-object [-t <ç±»å>] [-w] [--path=<æ件>|--no-filters] [--stdin] [--] " +"<æ件>..." #: builtin/hash-object.c:61 msgid "git hash-object --stdin-paths < <list-of-paths>" -msgstr "" +msgstr "git hash-object --stdin-paths < <è·¯å¾å表>" #: builtin/hash-object.c:72 msgid "type" -msgstr "" +msgstr "ç±»å" #: builtin/hash-object.c:72 -#, fuzzy msgid "object type" -msgstr "åç对象类åã" +msgstr "对象类å" #: builtin/hash-object.c:73 msgid "write the object into the object database" -msgstr "" +msgstr "å°å¯¹è±¡åå ¥å¯¹è±¡æ°æ®åº" #: builtin/hash-object.c:74 msgid "read the object from stdin" -msgstr "" +msgstr "ä»æ åè¾å ¥è¯»å对象" #: builtin/hash-object.c:76 msgid "store file as is without filters" -msgstr "" +msgstr "åæ ·åå¨æ件ä¸ä½¿ç¨è¿æ»¤å¨" #: builtin/hash-object.c:77 msgid "process file as it were from this path" -msgstr "" +msgstr "å¤çæ件并åè®¾å ¶æ¥èªäºæ¤è·¯å¾" #: builtin/help.c:43 -#, fuzzy msgid "print all available commands" -msgstr "å¨ '%s' ä¸å¯ç¨ç git å½ä»¤" +msgstr "æå°ææå¯ç¨çå½ä»¤" #: builtin/help.c:44 msgid "show man page" -msgstr "" +msgstr "æ¾ç¤º man æå" #: builtin/help.c:45 msgid "show manual in web browser" -msgstr "" +msgstr "å¨ web æµè§å¨ä¸æ¾ç¤ºæå" #: builtin/help.c:47 msgid "show info page" -msgstr "" +msgstr "æ¾ç¤º info æå" #: builtin/help.c:53 msgid "git help [--all] [--man|--web|--info] [command]" -msgstr "" +msgstr "git help [--all] [--man|--web|--info] [å½ä»¤]" #: builtin/help.c:65 #, c-format @@ -4869,7 +4817,7 @@ msgstr "æ æ³è§£æ emacsclient çæ¬ã" #: builtin/help.c:114 #, c-format msgid "emacsclient version '%d' too old (< 22)." -msgstr "emacsclient çæ¬ '%d' 太è (< 22)ã" +msgstr "emacsclient çæ¬ '%d' 太èï¼< 22ï¼ã" #: builtin/help.c:132 builtin/help.c:160 builtin/help.c:169 builtin/help.c:177 #, c-format @@ -4970,7 +4918,7 @@ msgstr "å ç¾åä¸å¹é " #: builtin/index-pack.c:294 #, c-format msgid "pack version %<PRIu32> unsupported" -msgstr "" +msgstr "ä¸æ¯æå çæ¬ %<PRIu32>" #: builtin/index-pack.c:312 #, c-format @@ -5030,7 +4978,7 @@ msgstr "ä¸è½è¯»åç°å对象 %s" #: builtin/index-pack.c:732 #, c-format msgid "invalid blob object %s" -msgstr "æ æçäºè¿å¶å¯¹è±¡ï¼blobï¼%s" +msgstr "æ æçæ°æ®ï¼blobï¼å¯¹è±¡ %s" #: builtin/index-pack.c:747 #, c-format @@ -5079,9 +5027,9 @@ msgid "Resolving deltas" msgstr "å¤ç delta ä¸" #: builtin/index-pack.c:1064 -#, fuzzy, c-format +#, c-format msgid "unable to create thread: %s" -msgstr "grepï¼æ æ³å建线ç¨ï¼%s" +msgstr "ä¸è½å建线ç¨ï¼%s" #: builtin/index-pack.c:1106 msgid "confusion beyond insanity" @@ -5090,12 +5038,12 @@ msgstr "ä¸å¯çå»" #: builtin/index-pack.c:1112 #, c-format msgid "completed with %d local objects" -msgstr "" +msgstr "å®æ %d 个æ¬å°å¯¹è±¡" #: builtin/index-pack.c:1121 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" -msgstr "" +msgstr "对 %s çå°¾é¨æ ¡éªåºç°æå¤ï¼ç£çæåï¼ï¼" #: builtin/index-pack.c:1125 #, c-format @@ -5107,7 +5055,7 @@ msgstr[1] "å æ %d 个æªè§£å³ç delta" #: builtin/index-pack.c:1150 #, c-format msgid "unable to deflate appended object (%d)" -msgstr "ä¸è½ç¼©å°éå 对象ï¼%dï¼" +msgstr "ä¸è½å缩éå 对象ï¼%dï¼" #: builtin/index-pack.c:1229 #, c-format @@ -5137,19 +5085,19 @@ msgid "cannot store index file" msgstr "æ æ³åå¨ç´¢å¼æ件" #: builtin/index-pack.c:1331 -#, fuzzy, c-format +#, c-format msgid "bad pack.indexversion=%<PRIu32>" -msgstr "åçç´¢å¼çæ¬ '%s'" +msgstr "åç pack.indexversion=%<PRIu32>" #: builtin/index-pack.c:1337 #, c-format msgid "invalid number of threads specified (%d)" -msgstr "" +msgstr "æå®ç线ç¨æ°æ æï¼%dï¼" #: builtin/index-pack.c:1341 builtin/index-pack.c:1514 #, c-format msgid "no threads support, ignoring %s" -msgstr "" +msgstr "没æ线ç¨æ¯æï¼å¿½ç¥ %s" #: builtin/index-pack.c:1399 #, c-format @@ -5320,19 +5268,20 @@ msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--shared" "[=<permissions>]] [directory]" msgstr "" +"git init [-q | --quiet] [--bare] [--template=<模æ¿ç®å½>] [--shared[=<æé>]] " +"[ç®å½]" #: builtin/init-db.c:490 msgid "permissions" -msgstr "" +msgstr "æé" #: builtin/init-db.c:491 msgid "specify that the git repository is to be shared amongst several users" -msgstr "" +msgstr "æå® git çæ¬åºæ¯å¤ä¸ªç¨æ·ä¹é´å ±äº«ç" #: builtin/init-db.c:493 builtin/prune-packed.c:77 -#, fuzzy msgid "be quiet" -msgstr "æ´å å®é" +msgstr "ä¿æå®é" #: builtin/init-db.c:522 builtin/init-db.c:529 #, c-format @@ -5362,403 +5311,395 @@ msgstr "ä¸è½è®¿é®å½åå·¥ä½ç®å½" msgid "Cannot access work tree '%s'" msgstr "ä¸è½è®¿é®å·¥ä½åº '%s'" -#: builtin/log.c:37 -#, fuzzy +#: builtin/log.c:39 msgid "git log [<options>] [<since>..<until>] [[--] <path>...]\n" -msgstr "git apply [é项] [<è¡¥ä¸>...]" +msgstr "git log [<é项>] [<ä»>..<å°>] [[--] <è·¯å¾>...]\n" -#: builtin/log.c:38 -#, fuzzy +#: builtin/log.c:40 msgid " or: git show [options] <object>..." -msgstr "git apply [é项] [<è¡¥ä¸>...]" +msgstr " æè ï¼git show [é项] <对象>..." -#: builtin/log.c:100 +#: builtin/log.c:102 msgid "suppress diff output" -msgstr "" +msgstr "ä¸æ¾ç¤ºå·®å¼è¾åº" -#: builtin/log.c:101 -#, fuzzy +#: builtin/log.c:103 msgid "show source" -msgstr "åçæº" +msgstr "æ¾ç¤ºæº" -#: builtin/log.c:102 +#: builtin/log.c:104 +msgid "Use mail map file" +msgstr "使ç¨é®ä»¶æ å°æ件" + +#: builtin/log.c:105 msgid "decorate options" -msgstr "" +msgstr "修饰é项" -#: builtin/log.c:189 +#: builtin/log.c:198 #, c-format msgid "Final output: %d %s\n" msgstr "æç»è¾åºï¼%d %s\n" -#: builtin/log.c:403 builtin/log.c:494 +#: builtin/log.c:419 builtin/log.c:511 #, c-format msgid "Could not read object %s" msgstr "ä¸è½è¯»å对象 %s" -#: builtin/log.c:518 +#: builtin/log.c:535 #, c-format msgid "Unknown type: %d" msgstr "æªç¥ç±»åï¼%d" -#: builtin/log.c:608 +#: builtin/log.c:627 msgid "format.headers without value" msgstr "format.headers 没æå¼" -#: builtin/log.c:682 +#: builtin/log.c:701 msgid "name of output directory is too long" msgstr "è¾åºç®å½å太é¿" -#: builtin/log.c:693 +#: builtin/log.c:717 #, c-format msgid "Cannot open patch file %s" msgstr "æ æ³æå¼è¡¥ä¸æ件 %s" -#: builtin/log.c:707 +#: builtin/log.c:731 msgid "Need exactly one range." msgstr "åªéè¦ä¸ä¸ªèå´ã" -#: builtin/log.c:715 +#: builtin/log.c:739 msgid "Not a range." msgstr "ä¸æ¯ä¸ä¸ªèå´ã" -#: builtin/log.c:789 +#: builtin/log.c:812 msgid "Cover letter needs email format" msgstr "ä¿¡å°éè¦é®ä»¶å°åæ ¼å¼" -#: builtin/log.c:862 +#: builtin/log.c:885 #, c-format msgid "insane in-reply-to: %s" msgstr "ä¸æ£å¸¸ç in-reply-toï¼%s" -#: builtin/log.c:890 +#: builtin/log.c:913 msgid "git format-patch [options] [<since> | <revision range>]" -msgstr "" +msgstr "git format-patch [é项] [<ä»> | <修订éèå´>]" -#: builtin/log.c:935 +#: builtin/log.c:958 msgid "Two output directories?" msgstr "两个è¾åºç®å½ï¼" -#: builtin/log.c:1063 +#: builtin/log.c:1097 msgid "use [PATCH n/m] even with a single patch" -msgstr "" +msgstr "ä½¿ç¨ [PATCH n/m]ï¼å³ä½¿åªæä¸ä¸ªè¡¥ä¸" -#: builtin/log.c:1066 +#: builtin/log.c:1100 msgid "use [PATCH] even with multiple patches" -msgstr "" +msgstr "ä½¿ç¨ [PATCH]ï¼å³ä½¿æå¤ä¸ªè¡¥ä¸" -#: builtin/log.c:1070 +#: builtin/log.c:1104 msgid "print patches to standard out" -msgstr "" +msgstr "æå°è¡¥ä¸å°æ åè¾åº" -#: builtin/log.c:1072 +#: builtin/log.c:1106 msgid "generate a cover letter" -msgstr "" +msgstr "çæä¸å°éä¿¡" -#: builtin/log.c:1074 +#: builtin/log.c:1108 msgid "use simple number sequence for output file names" -msgstr "" +msgstr "使ç¨ç®åçæ°ååºåä½ä¸ºè¾åºæ件å" -#: builtin/log.c:1075 +#: builtin/log.c:1109 msgid "sfx" -msgstr "" +msgstr "åç¼" -#: builtin/log.c:1076 +#: builtin/log.c:1110 msgid "use <sfx> instead of '.patch'" -msgstr "" +msgstr "ä½¿ç¨ <åç¼> ä»£æ¿ '.patch'" -#: builtin/log.c:1078 +#: builtin/log.c:1112 msgid "start numbering patches at <n> instead of 1" -msgstr "" +msgstr "è¡¥ä¸ä»¥ <n> å¼å§ç¼å·ï¼èä¸æ¯1" + +#: builtin/log.c:1114 +msgid "mark the series as Nth re-roll" +msgstr "æ è®°è¡¥ä¸ç³»åæ¯ç¬¬å 次éå¶" -#: builtin/log.c:1080 +#: builtin/log.c:1116 msgid "Use [<prefix>] instead of [PATCH]" -msgstr "" +msgstr "ä½¿ç¨ [<åç¼>] ä»£æ¿ [PATCH]" -#: builtin/log.c:1083 +#: builtin/log.c:1119 msgid "store resulting files in <dir>" -msgstr "" +msgstr "æç»ææ件åå¨å¨ <dir>" -#: builtin/log.c:1086 +#: builtin/log.c:1122 msgid "don't strip/add [PATCH]" -msgstr "" +msgstr "ä¸å é¤/æ·»å [PATCH]" -#: builtin/log.c:1089 +#: builtin/log.c:1125 msgid "don't output binary diffs" -msgstr "" +msgstr "ä¸è¾åºäºè¿å¶å·®å¼" -#: builtin/log.c:1091 +#: builtin/log.c:1127 msgid "don't include a patch matching a commit upstream" -msgstr "" +msgstr "ä¸å å«å·²å¨ä¸æ¸¸æ交ä¸çè¡¥ä¸" -#: builtin/log.c:1093 +#: builtin/log.c:1129 msgid "show patch format instead of default (patch + stat)" -msgstr "" +msgstr "æ¾ç¤ºçº¯è¡¥ä¸æ ¼å¼èéé»è®¤çï¼è¡¥ä¸+ç¶æï¼" -#: builtin/log.c:1095 -#, fuzzy +#: builtin/log.c:1131 msgid "Messaging" -msgstr "å并ï¼" +msgstr "é®ä»¶åé" -# è¯è ï¼æ³¨æä¿æå¥å°¾ç©ºæ ¼ -#: builtin/log.c:1096 -#, fuzzy +#: builtin/log.c:1132 msgid "header" -msgstr "é¢å " +msgstr "header" -#: builtin/log.c:1097 +#: builtin/log.c:1133 msgid "add email header" -msgstr "" +msgstr "æ·»å é®ä»¶å¤´" -#: builtin/log.c:1098 builtin/log.c:1100 +#: builtin/log.c:1134 builtin/log.c:1136 msgid "email" -msgstr "" +msgstr "é®ä»¶å°å" -#: builtin/log.c:1098 +#: builtin/log.c:1134 msgid "add To: header" -msgstr "" +msgstr "æ·»å æ¶ä»¶äºº" -#: builtin/log.c:1100 +#: builtin/log.c:1136 msgid "add Cc: header" -msgstr "" +msgstr "æ·»å æé" -#: builtin/log.c:1102 +#: builtin/log.c:1138 msgid "message-id" -msgstr "" +msgstr "message-id" -#: builtin/log.c:1103 +#: builtin/log.c:1139 msgid "make first mail a reply to <message-id>" -msgstr "" +msgstr "使第ä¸å°é®ä»¶ä½ä¸ºå¯¹ <message-id> çåå¤" -#: builtin/log.c:1104 builtin/log.c:1107 +#: builtin/log.c:1140 builtin/log.c:1143 msgid "boundary" -msgstr "" +msgstr "è¾¹ç" -#: builtin/log.c:1105 +#: builtin/log.c:1141 msgid "attach the patch" -msgstr "" +msgstr "é件æ¹å¼æ·»å è¡¥ä¸" -#: builtin/log.c:1108 -#, fuzzy +#: builtin/log.c:1144 msgid "inline the patch" -msgstr "忽ç¥è¡¥ä¸ä¸çæ·»å çæ件" +msgstr "å èæ¾ç¤ºè¡¥ä¸" -#: builtin/log.c:1112 +#: builtin/log.c:1148 msgid "enable message threading, styles: shallow, deep" -msgstr "" +msgstr "å¯ç¨é®ä»¶çº¿ç´¢ï¼é£æ ¼ï¼æµ ï¼æ·±" -#: builtin/log.c:1114 +#: builtin/log.c:1150 msgid "signature" -msgstr "" +msgstr "ç¾å" -#: builtin/log.c:1115 +#: builtin/log.c:1151 msgid "add a signature" -msgstr "" +msgstr "æ·»å ä¸ä¸ªç¾å" -#: builtin/log.c:1117 -#, fuzzy +#: builtin/log.c:1153 msgid "don't print the patch filenames" -msgstr "æ æ³æå¼è¡¥ä¸æ件 %s" +msgstr "ä¸è¦æå°è¡¥ä¸æ件å" -#: builtin/log.c:1157 +#: builtin/log.c:1202 #, c-format msgid "bogus committer info %s" msgstr "èåçæ交è ä¿¡æ¯ %s" -#: builtin/log.c:1202 +#: builtin/log.c:1247 msgid "-n and -k are mutually exclusive." msgstr "-n å -k äºæ¥ã" -#: builtin/log.c:1204 +#: builtin/log.c:1249 msgid "--subject-prefix and -k are mutually exclusive." msgstr "--subject-prefix å -k äºæ¥ã" -#: builtin/log.c:1212 +#: builtin/log.c:1257 msgid "--name-only does not make sense" msgstr "--name-only æ æä¹" -#: builtin/log.c:1214 +#: builtin/log.c:1259 msgid "--name-status does not make sense" msgstr "--name-status æ æä¹" -#: builtin/log.c:1216 +#: builtin/log.c:1261 msgid "--check does not make sense" msgstr "--check æ æä¹" -#: builtin/log.c:1239 +#: builtin/log.c:1284 msgid "standard output, or directory, which one?" msgstr "æ åè¾åºæç®å½ï¼åªä¸ä¸ªï¼" -#: builtin/log.c:1241 +#: builtin/log.c:1286 #, c-format msgid "Could not create directory '%s'" msgstr "ä¸è½å建ç®å½ '%s'" -#: builtin/log.c:1394 +#: builtin/log.c:1439 msgid "Failed to create output files" msgstr "æ æ³å建è¾åºæ件" -#: builtin/log.c:1443 +#: builtin/log.c:1488 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" -msgstr "" +msgstr "git cherry [-v] [<ä¸æ¸¸> [<头> [<éå¶>]]]" -#: builtin/log.c:1498 +#: builtin/log.c:1543 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "ä¸è½æ¾å°è·è¸ªçè¿ç¨åæ¯ï¼è¯·æå·¥æå® <upstream>ã\n" -#: builtin/log.c:1511 builtin/log.c:1513 builtin/log.c:1525 +#: builtin/log.c:1556 builtin/log.c:1558 builtin/log.c:1570 #, c-format msgid "Unknown commit %s" msgstr "æªç¥æ交 %s" #: builtin/ls-files.c:408 -#, fuzzy msgid "git ls-files [options] [<file>...]" -msgstr "git apply [é项] [<è¡¥ä¸>...]" +msgstr "git ls-files [é项] [<æ件>...]" #: builtin/ls-files.c:463 msgid "identify the file status with tags" -msgstr "" +msgstr "ç¨æ ç¾æ è¯æ件çç¶æ" #: builtin/ls-files.c:465 msgid "use lowercase letters for 'assume unchanged' files" -msgstr "" +msgstr "使ç¨å°ååæ¯è¡¨ç¤º 'å设æªæ¹åç' æ件" #: builtin/ls-files.c:467 msgid "show cached files in the output (default)" -msgstr "" +msgstr "æ¾ç¤ºç¼åçæ件ï¼é»è®¤ï¼" #: builtin/ls-files.c:469 -#, fuzzy msgid "show deleted files in the output" -msgstr "å é¤çæ件 %s ä»æå 容" +msgstr "æ¾ç¤ºå·²å é¤çæ件" #: builtin/ls-files.c:471 msgid "show modified files in the output" -msgstr "" +msgstr "æ¾ç¤ºå·²ä¿®æ¹çæ件" #: builtin/ls-files.c:473 msgid "show other files in the output" -msgstr "" +msgstr "æ¾ç¤ºå ¶å®æ件" #: builtin/ls-files.c:475 msgid "show ignored files in the output" -msgstr "" +msgstr "æ¾ç¤ºå¿½ç¥çæ件" #: builtin/ls-files.c:478 msgid "show staged contents' object name in the output" -msgstr "" +msgstr "æ¾ç¤ºæååºå 容ç对象å称" #: builtin/ls-files.c:480 msgid "show files on the filesystem that need to be removed" -msgstr "" +msgstr "æ¾ç¤ºæ件系ç»éè¦å é¤çæ件" #: builtin/ls-files.c:482 msgid "show 'other' directories' name only" -msgstr "" +msgstr "åªæ¾ç¤ºâå ¶ä»âç®å½çå称" #: builtin/ls-files.c:485 -#, fuzzy msgid "don't show empty directories" -msgstr "两个è¾åºç®å½ï¼" +msgstr "ä¸æ¾ç¤ºç©ºç®å½" #: builtin/ls-files.c:488 msgid "show unmerged files in the output" -msgstr "" +msgstr "æ¾ç¤ºæªå并çæ件" #: builtin/ls-files.c:490 msgid "show resolve-undo information" -msgstr "" +msgstr "æ¾ç¤º resolve-undo ä¿¡æ¯" #: builtin/ls-files.c:492 -#, fuzzy msgid "skip files matching pattern" -msgstr "è¾åºå模å¼å¹é çè¡" +msgstr "å¹é æé¤æ件ç模å¼" #: builtin/ls-files.c:495 msgid "exclude patterns are read from <file>" -msgstr "" +msgstr "ä» <æ件> ä¸è¯»åæé¤æ¨¡å¼" #: builtin/ls-files.c:498 msgid "read additional per-directory exclude patterns in <file>" -msgstr "" +msgstr "ä» <æ件> 读åé¢å¤çæ¯ä¸ªç®å½çæé¤æ¨¡å¼" #: builtin/ls-files.c:500 msgid "add the standard git exclusions" -msgstr "" +msgstr "æ·»å æ åç git æé¤" #: builtin/ls-files.c:503 msgid "make the output relative to the project top directory" -msgstr "" +msgstr "æ¾ç¤ºç¸å¯¹äºé¡¶çº§ç®å½çæ件å" #: builtin/ls-files.c:506 msgid "if any <file> is not in the index, treat this as an error" -msgstr "" +msgstr "å¦æä»»ä½ <æ件> é½ä¸å¨ç´¢å¼åºï¼è§ä¸ºé误" #: builtin/ls-files.c:507 msgid "tree-ish" -msgstr "" +msgstr "æ ææ交" #: builtin/ls-files.c:508 msgid "pretend that paths removed since <tree-ish> are still present" -msgstr "" +msgstr "åè£ èªä» <æ ææ交> ä¹åå é¤çè·¯å¾ä»ç¶åå¨" #: builtin/ls-files.c:510 msgid "show debugging data" -msgstr "" +msgstr "æ¾ç¤ºè°è¯æ°æ®" #: builtin/ls-tree.c:27 -#, fuzzy msgid "git ls-tree [<options>] <tree-ish> [<path>...]" -msgstr "git apply [é项] [<è¡¥ä¸>...]" +msgstr "git ls-tree [<é项>] <æ ææ交> [<è·¯å¾>...]" #: builtin/ls-tree.c:125 msgid "only show trees" -msgstr "" +msgstr "åªæ¾ç¤ºæ " #: builtin/ls-tree.c:127 -#, fuzzy msgid "recurse into subtrees" -msgstr "ååºå°è¿ç¨ %s" +msgstr "éå½å°åæ " #: builtin/ls-tree.c:129 msgid "show trees when recursing" -msgstr "" +msgstr "å½éå½æ¶æ¾ç¤ºæ " #: builtin/ls-tree.c:132 msgid "terminate entries with NUL byte" -msgstr "" +msgstr "æ¡ç®ä»¥NULå符ç»æ¢" #: builtin/ls-tree.c:133 -#, fuzzy msgid "include object size" -msgstr "æä¾äºæ æ对象 '%s'ã" +msgstr "å æ¬å¯¹è±¡å¤§å°" #: builtin/ls-tree.c:135 builtin/ls-tree.c:137 msgid "list only filenames" -msgstr "" +msgstr "åªååºæ件å" #: builtin/ls-tree.c:140 msgid "use full path names" -msgstr "" +msgstr "使ç¨æ件çå ¨è·¯å¾" #: builtin/ls-tree.c:142 msgid "list entire tree; not just current directory (implies --full-name)" -msgstr "" +msgstr "ååºæ´ä¸ªæ ï¼ä¸ä» ä» å½åç®å½ï¼éå« --full-nameï¼" #: builtin/merge.c:43 -#, fuzzy msgid "git merge [options] [<commit>...]" -msgstr "git apply [é项] [<è¡¥ä¸>...]" +msgstr "git merge [é项] [<æ交>...]" #: builtin/merge.c:44 msgid "git merge [options] <msg> HEAD <commit>" -msgstr "" +msgstr "git merge [é项] <说æ> HEAD <æ交>" #: builtin/merge.c:45 msgid "git merge --abort" -msgstr "" +msgstr "git merge --abort" #: builtin/merge.c:90 msgid "switch `m' requires a value" @@ -5781,68 +5722,63 @@ msgstr "å¯ç¨çèªå®ä¹çç¥æï¼" #: builtin/merge.c:183 msgid "do not show a diffstat at the end of the merge" -msgstr "" +msgstr "å¨å并çæåä¸æ¾ç¤ºå·®å¼ç»è®¡" #: builtin/merge.c:186 msgid "show a diffstat at the end of the merge" -msgstr "" +msgstr "å¨å并çæåæ¾ç¤ºå·®å¼ç»è®¡" #: builtin/merge.c:187 msgid "(synonym to --stat)" -msgstr "" +msgstr "ï¼å --stat åä¹ï¼" #: builtin/merge.c:189 msgid "add (at most <n>) entries from shortlog to merge commit message" -msgstr "" +msgstr "å¨å并æ交信æ¯ä¸æ·»å ï¼æå¤ <n> æ¡ï¼ç²¾ç®æ交记å½" #: builtin/merge.c:192 -#, fuzzy msgid "create a single commit instead of doing a merge" -msgstr "å¨å并è¿ç¨ä¸ä¸è½åé¨åæ交ã" +msgstr "å建ä¸ä¸ªåç¬çæ交èä¸æ¯åä¸æ¬¡å并" #: builtin/merge.c:194 msgid "perform a commit if the merge succeeds (default)" -msgstr "" +msgstr "å¦æå并æåï¼æ§è¡ä¸æ¬¡æ交ï¼é»è®¤ï¼" #: builtin/merge.c:196 -#, fuzzy msgid "edit message before committing" -msgstr "å°æªæå以å¤æ交çåæ´ï¼" +msgstr "å¨æ交åç¼è¾æ交说æ" #: builtin/merge.c:198 -#, fuzzy msgid "allow fast-forward (default)" -msgstr "å¯å¿«è¿" +msgstr "å 许快è¿ï¼é»è®¤ï¼" #: builtin/merge.c:200 msgid "abort if fast-forward is not possible" -msgstr "" +msgstr "å¦æä¸è½å¿«è¿å°±æ¾å¼å并" -#: builtin/merge.c:202 builtin/notes.c:867 builtin/revert.c:112 +#: builtin/merge.c:202 builtin/notes.c:870 builtin/revert.c:112 msgid "strategy" -msgstr "" +msgstr "çç¥" #: builtin/merge.c:203 -#, fuzzy msgid "merge strategy to use" -msgstr "å°è¯å并çç¥ %s...\n" +msgstr "è¦ä½¿ç¨çå并çç¥" #: builtin/merge.c:204 msgid "option=value" -msgstr "" +msgstr "option=value" #: builtin/merge.c:205 msgid "option for selected merge strategy" -msgstr "" +msgstr "æéçå并çç¥çé项" #: builtin/merge.c:207 msgid "merge commit message (for a non-fast-forward merge)" -msgstr "" +msgstr "å并çæ交说æï¼é对éå¿«è¿å¼å并ï¼" #: builtin/merge.c:211 -#, fuzzy msgid "abort the current in-progress merge" -msgstr "æ æ³ä¿åå½åç´¢å¼ç¶æ" +msgstr "æ¾å¼å½åæ£å¨è¿è¡çå并" #: builtin/merge.c:240 msgid "could not run stash." @@ -5898,35 +5834,31 @@ msgstr "åç branch.%s.mergeoptions å符串ï¼%s" msgid "git write-tree failed to write a tree" msgstr "git write-tree æ æ³åå ¥ä¸æ 对象" -#: builtin/merge.c:678 -msgid "failed to read the cache" -msgstr "æ æ³è¯»åç¼å" - -#: builtin/merge.c:709 +#: builtin/merge.c:656 msgid "Not handling anything other than two heads merge." msgstr "ä¸è½å¤ç两个头å并ä¹å¤çä»»ä½æä½ã" -#: builtin/merge.c:723 +#: builtin/merge.c:670 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "merge-recursive çæªç¥é项ï¼-X%s" -#: builtin/merge.c:737 +#: builtin/merge.c:684 #, c-format msgid "unable to write %s" msgstr "ä¸è½å %s" -#: builtin/merge.c:876 +#: builtin/merge.c:773 #, c-format msgid "Could not read from '%s'" msgstr "ä¸è½ä» '%s' 读å" -#: builtin/merge.c:885 +#: builtin/merge.c:782 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "æªæ交å并ï¼ä½¿ç¨ 'git commit' å®ææ¤æ¬¡å并ã\n" -#: builtin/merge.c:891 +#: builtin/merge.c:788 msgid "" "Please enter a commit message to explain why this merge is necessary,\n" "especially if it merges an updated upstream into a topic branch.\n" @@ -5939,52 +5871,52 @@ msgstr "" "\n" "以 '#' å¼å¤´çè¡å°è¢«å¿½ç¥ï¼èä¸ç©ºæ交说æå°ä¼ç»æ¢æ交ã\n" -#: builtin/merge.c:915 +#: builtin/merge.c:813 msgid "Empty commit message." msgstr "空æ交信æ¯ã" -#: builtin/merge.c:927 +#: builtin/merge.c:825 #, c-format msgid "Wonderful.\n" msgstr "太æ£äºã\n" -#: builtin/merge.c:992 +#: builtin/merge.c:890 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "èªå¨å并失败ï¼ä¿®æ£å²çªç¶åæ交修æ£çç»æã\n" -#: builtin/merge.c:1008 +#: builtin/merge.c:906 #, c-format msgid "'%s' is not a commit" msgstr "'%s' ä¸æ¯ä¸ä¸ªæ交" -#: builtin/merge.c:1049 +#: builtin/merge.c:947 msgid "No current branch." msgstr "没æå½ååæ¯ã" -#: builtin/merge.c:1051 +#: builtin/merge.c:949 msgid "No remote for the current branch." msgstr "å½ååæ¯æ²¡æ对åºçè¿ç¨çæ¬åºã" -#: builtin/merge.c:1053 +#: builtin/merge.c:951 msgid "No default upstream defined for the current branch." msgstr "å½ååæ¯æ²¡æå®ä¹é»è®¤çä¸æ¸¸åæ¯ã" -#: builtin/merge.c:1058 +#: builtin/merge.c:956 #, c-format msgid "No remote tracking branch for %s from %s" msgstr "%s 没ææ¥èª %s çè¿ç¨è·è¸ªåæ¯" -#: builtin/merge.c:1145 builtin/merge.c:1302 +#: builtin/merge.c:1043 builtin/merge.c:1200 #, c-format msgid "%s - not something we can merge" msgstr "%s - ä¸è½è¢«å并" -#: builtin/merge.c:1213 +#: builtin/merge.c:1111 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "没æè¦ç»æ¢çå并ï¼MERGE_HEAD 丢失ï¼ã" -#: builtin/merge.c:1229 git-pull.sh:31 +#: builtin/merge.c:1127 git-pull.sh:31 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you can merge." @@ -5992,11 +5924,11 @@ msgstr "" "æ¨å°æªç»ææ¨çå并ï¼åå¨ MERGE_HEADï¼ã\n" "请å¨å并åå æ交æ¨çä¿®æ¹ã" -#: builtin/merge.c:1232 git-pull.sh:34 +#: builtin/merge.c:1130 git-pull.sh:34 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "æ¨å°æªç»ææ¨çå并ï¼åå¨ MERGE_HEADï¼ã" -#: builtin/merge.c:1236 +#: builtin/merge.c:1134 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you can merge." @@ -6004,183 +5936,181 @@ msgstr "" "æ¨å°æªç»ææ¨çæ£éï¼åå¨ CHERRY_PICK_HEADï¼ã\n" "请å¨å并åå æ交æ¨çä¿®æ¹ã" -#: builtin/merge.c:1239 +#: builtin/merge.c:1137 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "æ¨å°æªç»ææ¨çæ£éï¼åå¨ CHERRY_PICK_HEADï¼ã" -#: builtin/merge.c:1248 +#: builtin/merge.c:1146 msgid "You cannot combine --squash with --no-ff." msgstr "æ¨ä¸è½å° --squash ä¸ --no-ff åæ¶ä½¿ç¨ã" -#: builtin/merge.c:1253 +#: builtin/merge.c:1151 msgid "You cannot combine --no-ff with --ff-only." msgstr "æ¨ä¸è½å° --no-ff ä¸ --ff-only åæ¶ä½¿ç¨ã" -#: builtin/merge.c:1260 +#: builtin/merge.c:1158 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "æªæå®æäº¤å¹¶ä¸ merge.defaultToUpstream æªè®¾ç½®ã" -#: builtin/merge.c:1292 +#: builtin/merge.c:1190 msgid "Can merge only exactly one commit into empty head" msgstr "åªè½å°ä¸ä¸ªæ交å并å°ç©ºåæ¯ä¸" -#: builtin/merge.c:1295 +#: builtin/merge.c:1193 msgid "Squash commit into empty head not supported yet" msgstr "å°ä¸æ¯æå°ç©ºåæ¯çå缩æ交" -#: builtin/merge.c:1297 +#: builtin/merge.c:1195 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "å°ç©ºåæ¯çéå¿«è¿å¼æ交没ææä¹" -#: builtin/merge.c:1412 +#: builtin/merge.c:1311 #, c-format msgid "Updating %s..%s\n" msgstr "æ´æ° %s..%s\n" -#: builtin/merge.c:1450 +#: builtin/merge.c:1350 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "å°è¯é常å°çç´¢å¼å å并...\n" -#: builtin/merge.c:1457 +#: builtin/merge.c:1357 #, c-format msgid "Nope.\n" msgstr "æ ã\n" -#: builtin/merge.c:1489 +#: builtin/merge.c:1389 msgid "Not possible to fast-forward, aborting." msgstr "æ æ³å¿«è¿ï¼ç»æ¢ã" -#: builtin/merge.c:1512 builtin/merge.c:1591 +#: builtin/merge.c:1412 builtin/merge.c:1491 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "å°æ åæ»è³åå§ç¶æ...\n" -#: builtin/merge.c:1516 +#: builtin/merge.c:1416 #, c-format msgid "Trying merge strategy %s...\n" msgstr "å°è¯å并çç¥ %s...\n" -#: builtin/merge.c:1582 +#: builtin/merge.c:1482 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "没æå并çç¥å¤çæ¤å并ã\n" -#: builtin/merge.c:1584 +#: builtin/merge.c:1484 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "使ç¨çç¥ %s å并失败ã\n" -#: builtin/merge.c:1593 +#: builtin/merge.c:1493 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "ä½¿ç¨ %s 以åå¤æ工解å³ã\n" -#: builtin/merge.c:1605 +#: builtin/merge.c:1505 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "èªå¨å并è¿å±é¡ºå©ï¼æè¦æ±å¨æ交ååæ¢\n" #: builtin/merge-base.c:26 msgid "git merge-base [-a|--all] <commit> <commit>..." -msgstr "" +msgstr "git merge-base [-a|--all] <æ交> <æ交>..." #: builtin/merge-base.c:27 msgid "git merge-base [-a|--all] --octopus <commit>..." -msgstr "" +msgstr "git merge-base [-a|--all] --octopus <æ交>..." #: builtin/merge-base.c:28 msgid "git merge-base --independent <commit>..." -msgstr "" +msgstr "git merge-base --independent <æ交>..." #: builtin/merge-base.c:29 msgid "git merge-base --is-ancestor <commit> <commit>" -msgstr "" +msgstr "git merge-base --is-ancestor <æ交> <æ交>" #: builtin/merge-base.c:98 -#, fuzzy msgid "output all common ancestors" -msgstr "åç° %u ä¸ªå ±åç¥å ï¼" +msgstr "è¾åºææå ±åçç¥å " #: builtin/merge-base.c:99 msgid "find ancestors for a single n-way merge" -msgstr "" +msgstr "æ¥æ¾ä¸ä¸ªå¤è·¯å并çç¥å æ交" #: builtin/merge-base.c:100 msgid "list revs not reachable from others" -msgstr "" +msgstr "æ¾ç¤ºä¸è½è¢«å ¶ä»è®¿é®å°ççæ¬" #: builtin/merge-base.c:102 msgid "is the first one ancestor of the other?" -msgstr "" +msgstr "第ä¸ä¸ªæ¯å ¶ä»çç¥å æ交ä¹ï¼" #: builtin/merge-file.c:8 msgid "" "git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file " "file2" msgstr "" +"git merge-file [é项] [-L name1 [-L orig [-L name2]]] file1 orig_file file2" #: builtin/merge-file.c:33 msgid "send results to standard output" -msgstr "" +msgstr "å°ç»æåéå°æ åè¾åº" #: builtin/merge-file.c:34 msgid "use a diff3 based merge" -msgstr "" +msgstr "使ç¨åºäº diff3 çå并" #: builtin/merge-file.c:35 msgid "for conflicts, use our version" -msgstr "" +msgstr "å¦æå²çªï¼ä½¿ç¨æ们ççæ¬" #: builtin/merge-file.c:37 msgid "for conflicts, use their version" -msgstr "" +msgstr "å¦æå²çªï¼ä½¿ç¨ä»ä»¬ççæ¬" #: builtin/merge-file.c:39 msgid "for conflicts, use a union version" -msgstr "" +msgstr "å¦æå²çªï¼ä½¿ç¨èåçæ¬" #: builtin/merge-file.c:42 msgid "for conflicts, use this marker size" -msgstr "" +msgstr "å¦æå²çªï¼ä½¿ç¨æå®é¿åº¦çæ è®°" #: builtin/merge-file.c:43 msgid "do not warn about conflicts" -msgstr "" +msgstr "ä¸è¦è¦åå²çª" #: builtin/merge-file.c:45 msgid "set labels for file1/orig_file/file2" -msgstr "" +msgstr "为 file1/orig_file/file2 设置æ ç¾" #: builtin/mktree.c:67 msgid "git mktree [-z] [--missing] [--batch]" -msgstr "" +msgstr "git mktree [-z] [--missing] [--batch]" #: builtin/mktree.c:153 msgid "input is NUL terminated" -msgstr "" +msgstr "è¾å ¥ä»¥ NUL å符ç»æ¢" #: builtin/mktree.c:154 builtin/write-tree.c:24 -#, fuzzy msgid "allow missing objects" -msgstr "æ¥æ¶å¯¹è±¡ä¸" +msgstr "å 许丢失ç对象" #: builtin/mktree.c:155 msgid "allow creation of more than one tree" -msgstr "" +msgstr "å 许å建ä¸ä¸ªä»¥ä¸çæ " #: builtin/mv.c:14 msgid "git mv [options] <source>... <destination>" -msgstr "" +msgstr "git mv [é项] <æº>... <ç®æ >" #: builtin/mv.c:64 msgid "force move/rename even if target exists" -msgstr "" +msgstr "强å¶ç§»å¨/éå½ä»¤ï¼å³ä½¿ç®æ åå¨" #: builtin/mv.c:65 -#, fuzzy msgid "skip move/rename errors" -msgstr "ç¨åºé误" +msgstr "è·³è¿ç§»å¨/éå½åé误" #: builtin/mv.c:108 #, c-format @@ -6245,326 +6175,319 @@ msgid "renaming '%s' failed" msgstr "éå½å '%s' 失败" #: builtin/name-rev.c:175 -#, fuzzy msgid "git name-rev [options] <commit>..." -msgstr "git apply [é项] [<è¡¥ä¸>...]" +msgstr "git name-rev [é项] <æ交>..." #: builtin/name-rev.c:176 msgid "git name-rev [options] --all" -msgstr "" +msgstr "git name-rev [é项] --all" #: builtin/name-rev.c:177 msgid "git name-rev [options] --stdin" -msgstr "" +msgstr "git name-rev [é项] --stdin" #: builtin/name-rev.c:229 msgid "print only names (no SHA-1)" -msgstr "" +msgstr "åªæå°å称ï¼æ SHA-1ï¼" #: builtin/name-rev.c:230 msgid "only use tags to name the commits" -msgstr "" +msgstr "åªä½¿ç¨ tags æ¥å½åæ交" #: builtin/name-rev.c:232 -#, fuzzy msgid "only use refs matching <pattern>" -msgstr "è¾åºå模å¼å¹é çè¡" +msgstr "åªä½¿ç¨å <模å¼> ç¸å¹é çå¼ç¨" #: builtin/name-rev.c:234 msgid "list all commits reachable from all refs" -msgstr "" +msgstr "ååºå¯ä»¥ä»ææå¼ç¨è®¿é®çæ交" #: builtin/name-rev.c:235 msgid "read from stdin" -msgstr "" +msgstr "ä»æ åè¾å ¥è¯»å" #: builtin/name-rev.c:236 msgid "allow to print `undefined` names" -msgstr "" +msgstr "å 许æå° `æªå®ä¹` çå称" -#: builtin/notes.c:23 +#: builtin/notes.c:26 msgid "git notes [--ref <notes_ref>] [list [<object>]]" -msgstr "" +msgstr "git notes [--ref <注解å¼ç¨>] [list [<对象>]]" -#: builtin/notes.c:24 +#: builtin/notes.c:27 msgid "" "git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) " "<object>] [<object>]" msgstr "" +"git notes [--ref <注解å¼ç¨>] add [-f] [-m <说æ> | -F <æ件> | (-c | -C) <对" +"象>] [<对象>]" -#: builtin/notes.c:25 +#: builtin/notes.c:28 msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>" -msgstr "" +msgstr "git notes [--ref <注解å¼ç¨>] copy [-f] <æºå¯¹è±¡> <ç®æ 对象>" -#: builtin/notes.c:26 +#: builtin/notes.c:29 msgid "" "git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) " "<object>] [<object>]" msgstr "" +"git notes [--ref <注解å¼ç¨>] append [-m <说æ> | -F <æ件> | (-c | -C) <对象" +">] [<对象>]" -#: builtin/notes.c:27 +#: builtin/notes.c:30 msgid "git notes [--ref <notes_ref>] edit [<object>]" -msgstr "" +msgstr "git notes [--ref <注解å¼ç¨>] edit [<对象>]" -#: builtin/notes.c:28 +#: builtin/notes.c:31 msgid "git notes [--ref <notes_ref>] show [<object>]" -msgstr "" +msgstr "git notes [--ref <注解å¼ç¨>] show [<对象>]" -#: builtin/notes.c:29 +#: builtin/notes.c:32 msgid "" "git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>" -msgstr "" +msgstr "git notes [--ref <注解å¼ç¨>] merge [-v | -q] [-s <çç¥> ] <注解å¼ç¨>" -#: builtin/notes.c:30 +#: builtin/notes.c:33 msgid "git notes merge --commit [-v | -q]" -msgstr "" +msgstr "git notes merge --commit [-v | -q]" -#: builtin/notes.c:31 +#: builtin/notes.c:34 msgid "git notes merge --abort [-v | -q]" -msgstr "" +msgstr "git notes merge --abort [-v | -q]" -#: builtin/notes.c:32 +#: builtin/notes.c:35 msgid "git notes [--ref <notes_ref>] remove [<object>...]" -msgstr "" +msgstr "git notes [--ref <注解å¼ç¨>] remove [<对象>...]" -#: builtin/notes.c:33 +#: builtin/notes.c:36 msgid "git notes [--ref <notes_ref>] prune [-n | -v]" -msgstr "" +msgstr "git notes [--ref <注解å¼ç¨>] prune [-n | -v]" -#: builtin/notes.c:34 +#: builtin/notes.c:37 msgid "git notes [--ref <notes_ref>] get-ref" -msgstr "" +msgstr "git notes [--ref <注解å¼ç¨>] get-ref" -#: builtin/notes.c:39 +#: builtin/notes.c:42 msgid "git notes [list [<object>]]" -msgstr "" +msgstr "git notes [list [<对象>]]" -#: builtin/notes.c:44 -#, fuzzy +#: builtin/notes.c:47 msgid "git notes add [<options>] [<object>]" -msgstr "git apply [é项] [<è¡¥ä¸>...]" +msgstr "git notes add [<é项>] [<对象>]" -#: builtin/notes.c:49 +#: builtin/notes.c:52 msgid "git notes copy [<options>] <from-object> <to-object>" -msgstr "" +msgstr "git notes copy [<é项>] <æºå¯¹è±¡> <ç®æ 对象>" -#: builtin/notes.c:50 +#: builtin/notes.c:53 msgid "git notes copy --stdin [<from-object> <to-object>]..." -msgstr "" +msgstr "git notes copy --stdin [<æºå¯¹è±¡> <ç®æ 对象>]..." -#: builtin/notes.c:55 -#, fuzzy +#: builtin/notes.c:58 msgid "git notes append [<options>] [<object>]" -msgstr "git apply [é项] [<è¡¥ä¸>...]" +msgstr "git notes append [<é项>] [<对象>]" -#: builtin/notes.c:60 +#: builtin/notes.c:63 msgid "git notes edit [<object>]" -msgstr "" +msgstr "git notes edit [<对象>]" -#: builtin/notes.c:65 +#: builtin/notes.c:68 msgid "git notes show [<object>]" -msgstr "" +msgstr "git notes show [<对象>]" -#: builtin/notes.c:70 +#: builtin/notes.c:73 msgid "git notes merge [<options>] <notes_ref>" -msgstr "" +msgstr "git notes merge [<é项>] <注解å¼ç¨>" -#: builtin/notes.c:71 +#: builtin/notes.c:74 msgid "git notes merge --commit [<options>]" -msgstr "" +msgstr "git notes merge --commit [<é项>]" -#: builtin/notes.c:72 +#: builtin/notes.c:75 msgid "git notes merge --abort [<options>]" -msgstr "" +msgstr "git notes merge --abort [<é项>]" -#: builtin/notes.c:77 +#: builtin/notes.c:80 msgid "git notes remove [<object>]" -msgstr "" +msgstr "git notes remove [<对象>]" -#: builtin/notes.c:82 +#: builtin/notes.c:85 msgid "git notes prune [<options>]" -msgstr "" +msgstr "git notes prune [<é项>]" -#: builtin/notes.c:87 +#: builtin/notes.c:90 msgid "git notes get-ref" -msgstr "" +msgstr "git notes get-ref" -#: builtin/notes.c:139 +#: builtin/notes.c:142 #, c-format msgid "unable to start 'show' for object '%s'" msgstr "ä¸è½ä¸ºå¯¹è±¡ '%s' å¼å§ 'show'" -#: builtin/notes.c:145 +#: builtin/notes.c:148 msgid "can't fdopen 'show' output fd" msgstr "ä¸è½æå¼ 'show' è¾åºæ件å¥æ" -#: builtin/notes.c:155 +#: builtin/notes.c:158 #, c-format msgid "failed to close pipe to 'show' for object '%s'" msgstr "æ æ³ä¸ºå¯¹è±¡ '%s' ç 'show' å ³é管é" -#: builtin/notes.c:158 +#: builtin/notes.c:161 #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "æ æ³ä¸ºå¯¹è±¡ '%s' å®æ 'show'" -#: builtin/notes.c:175 builtin/tag.c:347 +#: builtin/notes.c:178 builtin/tag.c:347 #, c-format msgid "could not create file '%s'" msgstr "ä¸è½å建æ件 '%s'" -#: builtin/notes.c:189 +#: builtin/notes.c:192 msgid "Please supply the note contents using either -m or -F option" msgstr "请éè¿ -m æ -F é项为注解æä¾å 容" -#: builtin/notes.c:210 builtin/notes.c:973 +#: builtin/notes.c:213 builtin/notes.c:976 #, c-format msgid "Removing note for object %s\n" msgstr "å é¤å¯¹è±¡ %s ç注解\n" -#: builtin/notes.c:215 +#: builtin/notes.c:218 msgid "unable to write note object" msgstr "ä¸è½å注解对象" -#: builtin/notes.c:217 +#: builtin/notes.c:220 #, c-format msgid "The note contents has been left in %s" msgstr "注解å 容被çå¨æ件 %s ä¸" -#: builtin/notes.c:251 builtin/tag.c:542 +#: builtin/notes.c:254 builtin/tag.c:542 #, c-format msgid "cannot read '%s'" msgstr "ä¸è½è¯»å '%s'" -#: builtin/notes.c:253 builtin/tag.c:545 +#: builtin/notes.c:256 builtin/tag.c:545 #, c-format msgid "could not open or read '%s'" msgstr "ä¸è½æå¼æ读å '%s'" -#: builtin/notes.c:272 builtin/notes.c:445 builtin/notes.c:447 -#: builtin/notes.c:507 builtin/notes.c:561 builtin/notes.c:644 -#: builtin/notes.c:649 builtin/notes.c:724 builtin/notes.c:766 -#: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:558 +#: builtin/notes.c:275 builtin/notes.c:448 builtin/notes.c:450 +#: builtin/notes.c:510 builtin/notes.c:564 builtin/notes.c:647 +#: builtin/notes.c:652 builtin/notes.c:727 builtin/notes.c:769 +#: builtin/notes.c:971 builtin/tag.c:558 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "æ æ³è§£æ '%s' 为ä¸ä¸ªææå¼ç¨ã" -#: builtin/notes.c:275 +#: builtin/notes.c:278 #, c-format msgid "Failed to read object '%s'." msgstr "æ æ³è¯»å对象 '%s'ã" -#: builtin/notes.c:299 +#: builtin/notes.c:302 msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "ä¸è½æ交æªåå§å/æªå¼ç¨ç注解æ " -#: builtin/notes.c:340 +#: builtin/notes.c:343 #, c-format msgid "Bad notes.rewriteMode value: '%s'" msgstr "åç notes.rewriteMode å¼ï¼'%s'" -#: builtin/notes.c:350 +#: builtin/notes.c:353 #, c-format msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" msgstr "æç»å %sï¼å¨ refs/notes/ ä¹å¤ï¼åå ¥æ³¨è§£" #. TRANSLATORS: The first %s is the name of the #. environment variable, the second %s is its value -#: builtin/notes.c:377 +#: builtin/notes.c:380 #, c-format msgid "Bad %s value: '%s'" msgstr "åç %s å¼ï¼'%s'" -#: builtin/notes.c:441 +#: builtin/notes.c:444 #, c-format msgid "Malformed input line: '%s'." msgstr "éæ³çè¾å ¥è¡ï¼'%s'ã" -#: builtin/notes.c:456 +#: builtin/notes.c:459 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "æ æ³ä» '%s' å° '%s' æ·è´æ³¨è§£" -#: builtin/notes.c:500 builtin/notes.c:554 builtin/notes.c:627 -#: builtin/notes.c:639 builtin/notes.c:712 builtin/notes.c:759 -#: builtin/notes.c:1033 +#: builtin/notes.c:503 builtin/notes.c:557 builtin/notes.c:630 +#: builtin/notes.c:642 builtin/notes.c:715 builtin/notes.c:762 +#: builtin/notes.c:1036 msgid "too many parameters" msgstr "åæ°å¤ªå¤" -#: builtin/notes.c:513 builtin/notes.c:772 +#: builtin/notes.c:516 builtin/notes.c:775 #, c-format msgid "No note found for object %s." msgstr "æªåç°å¯¹è±¡ %s ç注解ã" -#: builtin/notes.c:535 builtin/notes.c:692 -#, fuzzy +#: builtin/notes.c:538 builtin/notes.c:695 msgid "note contents as a string" -msgstr "注解å 容被çå¨æ件 %s ä¸" +msgstr "注解å 容ä½ä¸ºä¸ä¸ªå符串" -#: builtin/notes.c:538 builtin/notes.c:695 -#, fuzzy +#: builtin/notes.c:541 builtin/notes.c:698 msgid "note contents in a file" -msgstr "æ æ³åå¨ç´¢å¼æ件" +msgstr "注解å 容å°ä¸ä¸ªæ件ä¸" -#: builtin/notes.c:540 builtin/notes.c:543 builtin/notes.c:697 -#: builtin/notes.c:700 builtin/tag.c:476 -#, fuzzy +#: builtin/notes.c:543 builtin/notes.c:546 builtin/notes.c:700 +#: builtin/notes.c:703 builtin/tag.c:476 msgid "object" -msgstr "å对象 %s" +msgstr "对象" -#: builtin/notes.c:541 builtin/notes.c:698 -#, fuzzy +#: builtin/notes.c:544 builtin/notes.c:701 msgid "reuse and edit specified note object" -msgstr "ä¸è½å注解对象" +msgstr "éç¨åç¼è¾æå®ç注解对象" -#: builtin/notes.c:544 builtin/notes.c:701 -#, fuzzy +#: builtin/notes.c:547 builtin/notes.c:704 msgid "reuse specified note object" -msgstr "ä¸è½å注解对象" +msgstr "éç¨æå®ç注解对象" -#: builtin/notes.c:546 builtin/notes.c:614 -#, fuzzy +#: builtin/notes.c:549 builtin/notes.c:617 msgid "replace existing notes" -msgstr "ä¸è½è¯»åç°å对象 %s" +msgstr "æ¿æ¢å·²åå¨ç注解" -#: builtin/notes.c:580 +#: builtin/notes.c:583 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "ä¸è½æ·»å 注解ãåç°å¯¹è±¡ %s å·²åå¨æ³¨è§£ãä½¿ç¨ '-f' è¦çç°å注解" -#: builtin/notes.c:585 builtin/notes.c:662 +#: builtin/notes.c:588 builtin/notes.c:665 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "è¦ç对象 %s ç°å注解\n" -#: builtin/notes.c:615 -#, fuzzy +#: builtin/notes.c:618 msgid "read objects from stdin" -msgstr "å对象 %s" +msgstr "ä»æ åè¾å ¥è¯»å对象" -#: builtin/notes.c:617 +#: builtin/notes.c:620 msgid "load rewriting config for <command> (implies --stdin)" -msgstr "" +msgstr "éæ°å è½½ <å½ä»¤> çé ç½®ï¼éå« --stdinï¼" -#: builtin/notes.c:635 +#: builtin/notes.c:638 msgid "too few parameters" msgstr "åæ°å¤ªå°" -#: builtin/notes.c:656 +#: builtin/notes.c:659 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "ä¸è½æ·è´æ³¨è§£ãåç°å¯¹è±¡ %s å·²åå¨æ³¨è§£ãä½¿ç¨ '-f' è¦çç°å注解" -#: builtin/notes.c:668 +#: builtin/notes.c:671 #, c-format msgid "Missing notes on source object %s. Cannot copy." msgstr "æºå¯¹è±¡ %s 缺å°æ³¨è§£ãä¸è½æ·è´ã" -#: builtin/notes.c:717 +#: builtin/notes.c:720 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" @@ -6573,262 +6496,250 @@ msgstr "" "åå½ä»¤ 'edit' çé项 -m/-F/-c/-C å·²å¼ç¨ã\n" "请æ¢ç¨ 'git notes add -f -m/-F/-c/-C'ã\n" -#: builtin/notes.c:864 -#, fuzzy +#: builtin/notes.c:867 msgid "General options" -msgstr "æ æé项ï¼%s" +msgstr "éç¨é项" -#: builtin/notes.c:866 +#: builtin/notes.c:869 msgid "Merge options" -msgstr "" +msgstr "å并é项" -#: builtin/notes.c:868 +#: builtin/notes.c:871 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" -msgstr "" +msgstr "使ç¨æå®ççç¥è§£å³æ³¨è§£å²çª (manual/ours/theirs/union/cat_sort_uniq)" -#: builtin/notes.c:870 +#: builtin/notes.c:873 msgid "Committing unmerged notes" -msgstr "" +msgstr "æ交æªå并ç注解" -#: builtin/notes.c:872 +#: builtin/notes.c:875 msgid "finalize notes merge by committing unmerged notes" -msgstr "" +msgstr "éè¿æ交æªå并ç注解æ¥å®æ注解å并" -#: builtin/notes.c:874 +#: builtin/notes.c:877 msgid "Aborting notes merge resolution" -msgstr "" +msgstr "ä¸æ¢æ³¨è§£å并çæ¹æ¡" -#: builtin/notes.c:876 -#, fuzzy +#: builtin/notes.c:879 msgid "abort notes merge" -msgstr "path '%s'ï¼æ æ³å并" +msgstr "ä¸æ¢æ³¨è§£å并" -#: builtin/notes.c:971 +#: builtin/notes.c:974 #, c-format msgid "Object %s has no note\n" msgstr "对象 %s 没æ注解\n" -#: builtin/notes.c:983 +#: builtin/notes.c:986 msgid "attempt to remove non-existent note is not an error" -msgstr "" +msgstr "å°è¯å é¤ä¸åå¨ç注解ä¸æ¯ä¸ä¸ªé误" -#: builtin/notes.c:986 -#, fuzzy +#: builtin/notes.c:989 msgid "read object names from the standard input" -msgstr "ï¼æ£ä»æ åè¾å ¥ä¸è¯»åæ¥å¿ä¿¡æ¯ï¼\n" +msgstr "ä»æ åè¾å ¥è¯»å对象å称" -#: builtin/notes.c:1067 +#: builtin/notes.c:1070 msgid "notes_ref" -msgstr "" +msgstr "注解å¼ç¨" -#: builtin/notes.c:1068 +#: builtin/notes.c:1071 msgid "use notes from <notes_ref>" -msgstr "" +msgstr "ä» <注解å¼ç¨> 使ç¨æ³¨è§£" -#: builtin/notes.c:1103 builtin/remote.c:1598 +#: builtin/notes.c:1106 builtin/remote.c:1598 #, c-format msgid "Unknown subcommand: %s" msgstr "æªç¥åå½ä»¤ï¼%s" #: builtin/pack-objects.c:23 msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]" -msgstr "" +msgstr "git pack-objects --stdout [é项...] [< å¼ç¨å表 | < 对象å表]" #: builtin/pack-objects.c:24 msgid "git pack-objects [options...] base-name [< ref-list | < object-list]" -msgstr "" +msgstr "git pack-objects [é项...] base-name [< å¼ç¨å表 | < 对象å表]" #: builtin/pack-objects.c:183 builtin/pack-objects.c:186 #, c-format msgid "deflate error (%d)" msgstr "å缩é误 (%d)" -#: builtin/pack-objects.c:2398 +#: builtin/pack-objects.c:2397 #, c-format msgid "unsupported index version %s" msgstr "ä¸æ¯æçç´¢å¼çæ¬ %s" -#: builtin/pack-objects.c:2402 +#: builtin/pack-objects.c:2401 #, c-format msgid "bad index version '%s'" msgstr "åçç´¢å¼çæ¬ '%s'" -#: builtin/pack-objects.c:2425 +#: builtin/pack-objects.c:2424 #, c-format msgid "option %s does not accept negative form" msgstr "é项 %s ä¸æ¥åå¦å®æ ¼å¼" -#: builtin/pack-objects.c:2429 +#: builtin/pack-objects.c:2428 #, c-format msgid "unable to parse value '%s' for option %s" msgstr "ä¸è½è§£æé项 %1$s çå¼ '%2$s'" -#: builtin/pack-objects.c:2448 +#: builtin/pack-objects.c:2447 msgid "do not show progress meter" -msgstr "" +msgstr "ä¸æ¾ç¤ºè¿åº¦è¡¨" -#: builtin/pack-objects.c:2450 +#: builtin/pack-objects.c:2449 msgid "show progress meter" -msgstr "" +msgstr "æ¾ç¤ºè¿åº¦è¡¨" -#: builtin/pack-objects.c:2452 +#: builtin/pack-objects.c:2451 msgid "show progress meter during object writing phase" -msgstr "" +msgstr "å¨å¯¹è±¡åå ¥é¶æ®µæ¾ç¤ºè¿åº¦è¡¨" -#: builtin/pack-objects.c:2455 +#: builtin/pack-objects.c:2454 msgid "similar to --all-progress when progress meter is shown" -msgstr "" +msgstr "å½è¿åº¦è¡¨æ¾ç¤ºæ¶ç±»ä¼¼äº --all-progress" -#: builtin/pack-objects.c:2456 +#: builtin/pack-objects.c:2455 msgid "version[,offset]" -msgstr "" +msgstr "çæ¬[,å移]" -#: builtin/pack-objects.c:2457 +#: builtin/pack-objects.c:2456 msgid "write the pack index file in the specified idx format version" -msgstr "" +msgstr "ç¨æå®ç idx æ ¼å¼çæ¬æ¥åå ç´¢å¼æ件" -#: builtin/pack-objects.c:2460 -#, fuzzy +#: builtin/pack-objects.c:2459 msgid "maximum size of each output pack file" -msgstr "æ æ³å建è¾åºæ件" +msgstr "æ¯ä¸ªè¾åºå çæ大尺寸" -#: builtin/pack-objects.c:2462 +#: builtin/pack-objects.c:2461 msgid "ignore borrowed objects from alternate object store" -msgstr "" +msgstr "忽ç¥ä»æ¿ä»£å¯¹è±¡åå¨éåç¨å¯¹è±¡" -#: builtin/pack-objects.c:2464 -#, fuzzy +#: builtin/pack-objects.c:2463 msgid "ignore packed objects" -msgstr "ä¸è½è¯»å对象 %s" +msgstr "忽ç¥å 对象" -#: builtin/pack-objects.c:2466 +#: builtin/pack-objects.c:2465 msgid "limit pack window by objects" -msgstr "" +msgstr "éå¶æå çªå£ç对象æ°" -#: builtin/pack-objects.c:2468 +#: builtin/pack-objects.c:2467 msgid "limit pack window by memory in addition to object limit" -msgstr "" +msgstr "é¤å¯¹è±¡æ°ééå¶å¤è®¾ç½®æå çªå£çå åéå¶" -#: builtin/pack-objects.c:2470 +#: builtin/pack-objects.c:2469 msgid "maximum length of delta chain allowed in the resulting pack" -msgstr "" +msgstr "æå å 许ç delta é¾çæ大é¿åº¦" -#: builtin/pack-objects.c:2472 -#, fuzzy +#: builtin/pack-objects.c:2471 msgid "reuse existing deltas" -msgstr "å¤ç delta ä¸" +msgstr "éç¨å·²åå¨ç deltas" -#: builtin/pack-objects.c:2474 -#, fuzzy +#: builtin/pack-objects.c:2473 msgid "reuse existing objects" -msgstr "ä¸è½è¯»åç°å对象 %s" +msgstr "éç¨å·²åå¨ç对象" -#: builtin/pack-objects.c:2476 +#: builtin/pack-objects.c:2475 msgid "use OFS_DELTA objects" -msgstr "" +msgstr "ä½¿ç¨ OFS_DELTA 对象" -#: builtin/pack-objects.c:2478 +#: builtin/pack-objects.c:2477 msgid "use threads when searching for best delta matches" -msgstr "" +msgstr "使ç¨çº¿ç¨æ¥è¯¢æä½³ delta å¹é " -#: builtin/pack-objects.c:2480 +#: builtin/pack-objects.c:2479 msgid "do not create an empty pack output" -msgstr "" +msgstr "ä¸å建空çå è¾åº" -#: builtin/pack-objects.c:2482 -#, fuzzy +#: builtin/pack-objects.c:2481 msgid "read revision arguments from standard input" -msgstr "ï¼æ£ä»æ åè¾å ¥ä¸è¯»åæ¥å¿ä¿¡æ¯ï¼\n" +msgstr "ä»æ åè¾å ¥è¯»å修订å·åæ°" -#: builtin/pack-objects.c:2484 +#: builtin/pack-objects.c:2483 msgid "limit the objects to those that are not yet packed" -msgstr "" +msgstr "éå¶é£äºå°æªæå ç对象" -#: builtin/pack-objects.c:2487 +#: builtin/pack-objects.c:2486 msgid "include objects reachable from any reference" -msgstr "" +msgstr "å æ¬å¯ä»¥ä»ä»»ä½å¼ç¨è®¿é®å°ç对象" -#: builtin/pack-objects.c:2490 +#: builtin/pack-objects.c:2489 msgid "include objects referred by reflog entries" -msgstr "" +msgstr "å æ¬è¢«å¼ç¨æ¥å¿å¼ç¨å°ç对象" -#: builtin/pack-objects.c:2493 +#: builtin/pack-objects.c:2492 msgid "output pack to stdout" -msgstr "" +msgstr "è¾åºå å°æ åè¾åº" -#: builtin/pack-objects.c:2495 +#: builtin/pack-objects.c:2494 msgid "include tag objects that refer to objects to be packed" -msgstr "" +msgstr "å æ¬å¼ç¨äºæå 对象ç tag" -#: builtin/pack-objects.c:2497 +#: builtin/pack-objects.c:2496 msgid "keep unreachable objects" -msgstr "" +msgstr "ç»´æä¸å¯è¾¾ç对象" -#: builtin/pack-objects.c:2498 parse-options.h:141 +#: builtin/pack-objects.c:2497 parse-options.h:141 msgid "time" msgstr "æ¶é´" -#: builtin/pack-objects.c:2499 +#: builtin/pack-objects.c:2498 msgid "unpack unreachable objects newer than <time>" -msgstr "" +msgstr "å°æ¯ç»å® <æ¶é´> æ°çæ æ³è®¿é®ç对象解å " -#: builtin/pack-objects.c:2502 +#: builtin/pack-objects.c:2501 msgid "create thin packs" -msgstr "" +msgstr "å建精ç®å " -#: builtin/pack-objects.c:2504 +#: builtin/pack-objects.c:2503 msgid "ignore packs that have companion .keep file" -msgstr "" +msgstr "忽ç¥é æ .keep æ件çå " -#: builtin/pack-objects.c:2506 +#: builtin/pack-objects.c:2505 msgid "pack compression level" -msgstr "" +msgstr "æå å缩级å«" -#: builtin/pack-objects.c:2508 -#, fuzzy +#: builtin/pack-objects.c:2507 msgid "do not hide commits by grafts" -msgstr "ä¸è½åæ交模ç" +msgstr "ä¸éè移æ¤è¦ççæ交" #: builtin/pack-refs.c:6 msgid "git pack-refs [options]" -msgstr "" +msgstr "git pack-refs [é项]" #: builtin/pack-refs.c:14 msgid "pack everything" -msgstr "" +msgstr "æå ä¸å" #: builtin/pack-refs.c:15 msgid "prune loose refs (default)" -msgstr "" +msgstr "æ¸ é¤æ¾æ£çå¼ç¨ï¼é»è®¤ï¼" #: builtin/prune-packed.c:7 msgid "git prune-packed [-n|--dry-run] [-q|--quiet]" -msgstr "" +msgstr "git prune-packed [-n|--dry-run] [-q|--quiet]" #: builtin/prune.c:12 msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" -msgstr "" +msgstr "git prune [-n] [-v] [--expire <æ¶é´>] [--] [<头>...]" #: builtin/prune.c:132 -#, fuzzy msgid "do not remove, show only" -msgstr "ä¸ä¼å é¤ %s\n" +msgstr "ä¸å é¤ï¼åªæ¾ç¤º" #: builtin/prune.c:133 -#, fuzzy msgid "report pruned objects" -msgstr "ä¸è½è¯»å对象 %s" +msgstr "æ¥åæ¸ é¤ç对象" #: builtin/prune.c:136 msgid "expire objects older than <time>" -msgstr "" +msgstr "使æ©äºç»å®æ¶é´ç对象è¿æ" #: builtin/push.c:14 -#, fuzzy msgid "git push [<options>] [<repository> [<refspec>...]]" -msgstr "git apply [é项] [<è¡¥ä¸>...]" +msgstr "git push [<é项>] [<çæ¬åº> [<å¼ç¨è¡¨è¾¾å¼>...]]" #: builtin/push.c:45 msgid "tag shorthand without <tag>" @@ -6983,22 +6894,28 @@ msgstr "" "æ£åºè¯¥åæ¯å¹¶ä¸è¿ç¨åæ´å并ï¼å¦ 'git pull'ï¼ï¼ç¶ååæ¨éã详è§\n" "'git push --help' ä¸ç 'Note about fast-forwards' å°èã" -#: builtin/push.c:258 +#: builtin/push.c:224 +msgid "" +"Updates were rejected because the destination reference already exists\n" +"in the remote." +msgstr "æ´æ°è¢«æç»å 为ç®æ å¼ç¨å¨è¿ç¨å·²ç»åå¨ã" + +#: builtin/push.c:269 #, c-format msgid "Pushing to %s\n" msgstr "æ¨éå° %s\n" -#: builtin/push.c:262 +#: builtin/push.c:273 #, c-format msgid "failed to push some refs to '%s'" msgstr "æ æ³æ¨éä¸äºå¼ç¨å° '%s'" -#: builtin/push.c:294 +#: builtin/push.c:302 #, c-format msgid "bad repository '%s'" msgstr "åççæ¬åº '%s'" -#: builtin/push.c:295 +#: builtin/push.c:303 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -7011,7 +6928,7 @@ msgid "" " git push <name>\n" msgstr "" "没æé ç½®æ¨éç®æ ã\n" -"æè éè¿å½ä»¤è¡æå®URLï¼æè ç¨ä¸é¢å½ä»¤é ç½®ä¸ä¸ªè¿ç¨çæ¬åº\n" +"æéè¿å½ä»¤è¡æå®URLï¼æç¨ä¸é¢å½ä»¤é ç½®ä¸ä¸ªè¿ç¨çæ¬åº\n" "\n" " git remote add <name> <url>\n" "\n" @@ -7019,82 +6936,79 @@ msgstr "" "\n" " git push <name>\n" -#: builtin/push.c:310 +#: builtin/push.c:318 msgid "--all and --tags are incompatible" msgstr "--all å --tags ä¸å ¼å®¹" -#: builtin/push.c:311 +#: builtin/push.c:319 msgid "--all can't be combined with refspecs" msgstr "--all ä¸è½åå¼ç¨è¡¨è¾¾å¼åæ¶ä½¿ç¨" -#: builtin/push.c:316 +#: builtin/push.c:324 msgid "--mirror and --tags are incompatible" msgstr "--mirror å --tags ä¸å ¼å®¹" -#: builtin/push.c:317 +#: builtin/push.c:325 msgid "--mirror can't be combined with refspecs" msgstr "--mirror ä¸è½åå¼ç¨è¡¨è¾¾å¼åæ¶ä½¿ç¨" -#: builtin/push.c:322 +#: builtin/push.c:330 msgid "--all and --mirror are incompatible" msgstr "--all å --mirror ä¸å ¼å®¹" -#: builtin/push.c:382 -#, fuzzy +#: builtin/push.c:390 msgid "repository" -msgstr "åççæ¬åº '%s'" +msgstr "çæ¬åº" -#: builtin/push.c:383 +#: builtin/push.c:391 msgid "push all refs" -msgstr "" +msgstr "æ¨éææå¼ç¨" -#: builtin/push.c:384 +#: builtin/push.c:392 msgid "mirror all refs" -msgstr "" +msgstr "éåææå¼ç¨" -#: builtin/push.c:386 -#, fuzzy +#: builtin/push.c:394 msgid "delete refs" -msgstr "å é¤" +msgstr "å é¤å¼ç¨" -#: builtin/push.c:387 +#: builtin/push.c:395 msgid "push tags (can't be used with --all or --mirror)" -msgstr "" +msgstr "æ¨é tagsï¼ä¸è½ä½¿ç¨ --all or --mirrorï¼" -#: builtin/push.c:390 -#, fuzzy +#: builtin/push.c:398 msgid "force updates" msgstr "强å¶æ´æ°" -#: builtin/push.c:391 +#: builtin/push.c:399 msgid "check" -msgstr "" +msgstr "æ£æ¥" -#: builtin/push.c:392 +#: builtin/push.c:400 msgid "control recursive pushing of submodules" -msgstr "" +msgstr "æ§å¶å模ç»çéå½æ¨é" -#: builtin/push.c:394 +#: builtin/push.c:402 msgid "use thin pack" -msgstr "" +msgstr "使ç¨ç²¾ç®æå " -#: builtin/push.c:395 builtin/push.c:396 +#: builtin/push.c:403 builtin/push.c:404 msgid "receive pack program" -msgstr "" +msgstr "æ¥æ¶å ç¨åº" -#: builtin/push.c:397 +#: builtin/push.c:405 msgid "set upstream for git pull/status" -msgstr "" +msgstr "设置 git pull/status çä¸æ¸¸" -#: builtin/push.c:400 +#: builtin/push.c:408 msgid "prune locally removed refs" -msgstr "" +msgstr "æ¸ é¤æ¬å°å é¤çå¼ç¨" -#: builtin/push.c:410 +#: builtin/push.c:418 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete ä¸ --allã--mirror å --tags ä¸å ¼å®¹" -#: builtin/push.c:412 +#: builtin/push.c:420 msgid "--delete doesn't make sense without any refs" msgstr "--delete æªæ¥ä»»ä½å¼ç¨æ²¡ææä¹" @@ -7104,155 +7018,150 @@ msgid "" "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" msgstr "" +"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<åç¼>] [-" +"u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" +"index-output=<æ件>] (--empty | <æ ææ交1> [<æ ææ交2> [<æ ææ交3>]])" #: builtin/read-tree.c:108 -#, fuzzy msgid "write resulting index to <file>" -msgstr "æåçç´¢å¼æ件" +msgstr "å°ç´¢å¼ç»æåå ¥ <file>" #: builtin/read-tree.c:111 -#, fuzzy msgid "only empty the index" -msgstr "ä¸è½è¯»åç´¢å¼" +msgstr "åªæ¯æ¸ 空索å¼" #: builtin/read-tree.c:113 -#, fuzzy msgid "Merging" -msgstr "å并ï¼" +msgstr "å并" #: builtin/read-tree.c:115 msgid "perform a merge in addition to a read" -msgstr "" +msgstr "读åä¹ä½åæ§è¡ä¸ä¸ªå并" #: builtin/read-tree.c:117 msgid "3-way merge if no file level merging required" -msgstr "" +msgstr "å¦æ没ææ件级å并éè¦ï¼æ§è¡ä¸è·¯å并" #: builtin/read-tree.c:119 msgid "3-way merge in presence of adds and removes" -msgstr "" +msgstr "åå¨æ·»å åå é¤æ¶ï¼ä¹æ§è¡ä¸è·¯å并" #: builtin/read-tree.c:121 msgid "same as -m, but discard unmerged entries" -msgstr "" +msgstr "ç±»ä¼¼äº -mï¼ä½ä¸¢å¼æªå并çæ¡ç®" #: builtin/read-tree.c:122 -#, fuzzy msgid "<subdirectory>/" -msgstr "ç®å½/æ件" +msgstr "<åç®å½>/" #: builtin/read-tree.c:123 msgid "read the tree into the index under <subdirectory>/" -msgstr "" +msgstr "读åæ 对象å°ç´¢å¼ç <åç®å½>/ ä¸" #: builtin/read-tree.c:126 msgid "update working tree with merge result" -msgstr "" +msgstr "ç¨å并çç»ææ´æ°å·¥ä½åº" #: builtin/read-tree.c:128 -#, fuzzy msgid "gitignore" -msgstr "忽ç¥ç" +msgstr "gitignore" #: builtin/read-tree.c:129 msgid "allow explicitly ignored files to be overwritten" -msgstr "" +msgstr "å 许忽ç¥æ件ä¸è®¾å®çæ件å¯ä»¥è¢«è¦ç" #: builtin/read-tree.c:132 -#, fuzzy msgid "don't check the working tree after merging" -msgstr "æ¾ç¤ºå·¥ä½åºç¶æ" +msgstr "å并åä¸æ£æ¥å·¥ä½åº" #: builtin/read-tree.c:133 msgid "don't update the index or the work tree" -msgstr "" +msgstr "ä¸æ´æ°ç´¢å¼åºåå·¥ä½åº" #: builtin/read-tree.c:135 msgid "skip applying sparse checkout filter" -msgstr "" +msgstr "è·³è¿åºç¨ç¨çæ£åºè¿æ»¤å¨" #: builtin/read-tree.c:137 msgid "debug unpack-trees" -msgstr "" +msgstr "è°è¯ unpack-trees" #: builtin/remote.c:11 msgid "git remote [-v | --verbose]" -msgstr "" +msgstr "git remote [-v | --verbose]" #: builtin/remote.c:12 msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--" "mirror=<fetch|push>] <name> <url>" msgstr "" +"git remote add [-t <åæ¯>] [-m <master>] [-f] [--tags|--no-tags] [--" +"mirror=<fetch|push>] <å称> <url>" #: builtin/remote.c:13 builtin/remote.c:32 msgid "git remote rename <old> <new>" -msgstr "" +msgstr "git remote rename <æ§å称> <æ°å称>" #: builtin/remote.c:14 builtin/remote.c:37 msgid "git remote remove <name>" -msgstr "" +msgstr "git remote remove <å称>" -#: builtin/remote.c:15 +#: builtin/remote.c:15 builtin/remote.c:42 msgid "git remote set-head <name> (-a | -d | <branch>)" -msgstr "" +msgstr "git remote set-head <å称> (-a | -d | <åæ¯>)" #: builtin/remote.c:16 msgid "git remote [-v | --verbose] show [-n] <name>" -msgstr "" +msgstr "git remote [-v | --verbose] show [-n] <å称>" #: builtin/remote.c:17 msgid "git remote prune [-n | --dry-run] <name>" -msgstr "" +msgstr "git remote prune [-n | --dry-run] <å称>" #: builtin/remote.c:18 msgid "" "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" -msgstr "" +msgstr "git remote [-v | --verbose] update [-p | --prune] [(<ç»> | <è¿ç¨>)...]" #: builtin/remote.c:19 msgid "git remote set-branches [--add] <name> <branch>..." -msgstr "" +msgstr "git remote set-branches [--add] <å称> <åæ¯>..." #: builtin/remote.c:20 builtin/remote.c:68 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" -msgstr "" +msgstr "git remote set-url [--push] <å称> <æ°çå°å> [<æ§çå°å>]" #: builtin/remote.c:21 builtin/remote.c:69 msgid "git remote set-url --add <name> <newurl>" -msgstr "" +msgstr "git remote set-url --add <å称> <æ°çå°å>" #: builtin/remote.c:22 builtin/remote.c:70 msgid "git remote set-url --delete <name> <url>" -msgstr "" +msgstr "git remote set-url --delete <å称> <å°å>" #: builtin/remote.c:27 msgid "git remote add [<options>] <name> <url>" -msgstr "" - -#: builtin/remote.c:42 -msgid "git remote set-head <name> (-a | -d | <branch>])" -msgstr "" +msgstr "git remote add [<é项>] <å称> <å°å>" #: builtin/remote.c:47 msgid "git remote set-branches <name> <branch>..." -msgstr "" +msgstr "git remote set-branches <å称> <åæ¯>..." #: builtin/remote.c:48 msgid "git remote set-branches --add <name> <branch>..." -msgstr "" +msgstr "git remote set-branches --add <å称> <åæ¯>..." #: builtin/remote.c:53 msgid "git remote show [<options>] <name>" -msgstr "" +msgstr "git remote show [<é项>] <å称>" #: builtin/remote.c:58 msgid "git remote prune [<options>] <name>" -msgstr "" +msgstr "git remote prune [<é项>] <å称>" #: builtin/remote.c:63 msgid "git remote update [<options>] [<group> | <remote>]..." -msgstr "" +msgstr "git remote update [<é项>] [<ç»> | <è¿ç¨>]..." #: builtin/remote.c:98 #, c-format @@ -7273,34 +7182,32 @@ msgid "unknown mirror argument: %s" msgstr "æªç¥çéååæ°ï¼%s" #: builtin/remote.c:163 -#, fuzzy msgid "fetch the remote branches" -msgstr " è¿ç¨åæ¯ï¼%s" +msgstr "æåè¿ç¨çåæ¯" #: builtin/remote.c:165 msgid "import all tags and associated objects when fetching" -msgstr "" +msgstr "æåæ¶å¯¼å ¥ææç tags åå ³è对象" #: builtin/remote.c:168 msgid "or do not fetch any tag at all (--no-tags)" -msgstr "" +msgstr "æä¸æåä»»ä½ tagï¼--no-tagsï¼" #: builtin/remote.c:170 msgid "branch(es) to track" -msgstr "" +msgstr "è·è¸ªçåæ¯" #: builtin/remote.c:171 -#, fuzzy msgid "master branch" -msgstr " è¿ç¨åæ¯ï¼%s" +msgstr "主线åæ¯" #: builtin/remote.c:172 msgid "push|fetch" -msgstr "" +msgstr "push|fetch" #: builtin/remote.c:173 msgid "set up remote as a mirror to push to or fetch from" -msgstr "" +msgstr "æè¿ç¨è®¾ç½®ä¸ºç¨ä»¥æ¨éææåçéå" #: builtin/remote.c:185 msgid "specifying a master branch makes no sense with --mirror" @@ -7495,9 +7402,8 @@ msgid " %-*s pushes to %s" msgstr " %-*s æ¨éè³ %s" #: builtin/remote.c:1091 -#, fuzzy msgid "do not query remotes" -msgstr "ä¸ä¼å é¤ %s\n" +msgstr "ä¸æ¥è¯¢è¿ç¨" #: builtin/remote.c:1118 #, c-format @@ -7560,11 +7466,11 @@ msgstr[1] " 为 'git push' é ç½®çæ¬å°å¼ç¨%sï¼" #: builtin/remote.c:1199 msgid "set refs/remotes/<name>/HEAD according to remote" -msgstr "" +msgstr "æ ¹æ®è¿ç¨è®¾ç½® refs/remotes/<å称>/HEAD" #: builtin/remote.c:1201 msgid "delete refs/remotes/<name>/HEAD" -msgstr "" +msgstr "å é¤ refs/remotes/<å称>/HEAD" #: builtin/remote.c:1216 msgid "Cannot determine remote HEAD" @@ -7593,13 +7499,13 @@ msgstr "ä¸è½è®¾ç½® %s" #: builtin/remote.c:1274 #, c-format msgid " %s will become dangling!" -msgstr " %s å°æ为æ¬ç©ºç¶æï¼" +msgstr " %s å°æ为ææç¶æï¼" # è¯è ï¼æ³¨æä¿æåå¯¼ç©ºæ ¼ #: builtin/remote.c:1275 #, c-format msgid " %s has become dangling!" -msgstr " %s å·²æ为æ¬ç©ºç¶æï¼" +msgstr " %s å·²æ为ææç¶æï¼" #: builtin/remote.c:1281 #, c-format @@ -7623,7 +7529,7 @@ msgstr " * [å·²å é¤] %s" #: builtin/remote.c:1321 msgid "prune remotes after fetching" -msgstr "" +msgstr "æååæ¸ é¤è¿ç¨" #: builtin/remote.c:1387 builtin/remote.c:1461 #, c-format @@ -7631,9 +7537,8 @@ msgid "No such remote '%s'" msgstr "没ææ¤è¿ç¨ '%s'" #: builtin/remote.c:1407 -#, fuzzy msgid "add branch" -msgstr "ä½äºåæ¯ " +msgstr "æ·»å åæ¯" #: builtin/remote.c:1414 msgid "no remote specified" @@ -7641,16 +7546,15 @@ msgstr "æªæå®è¿ç¨" #: builtin/remote.c:1436 msgid "manipulate push URLs" -msgstr "" +msgstr "æä½æ¨é URLS" #: builtin/remote.c:1438 msgid "add URL" -msgstr "" +msgstr "æ·»å URL" #: builtin/remote.c:1440 -#, fuzzy msgid "delete URLs" -msgstr "å é¤" +msgstr "å é¤ URLS" #: builtin/remote.c:1447 msgid "--add --delete doesn't make sense" @@ -7672,53 +7576,52 @@ msgstr "å°ä¸ä¼å é¤ææéæ¨éURLå°å" #: builtin/remote.c:1569 msgid "be verbose; must be placed before a subcommand" -msgstr "" +msgstr "åé¿è¾åºï¼å¿ 须置äºåå½ä»¤ä¹å" #: builtin/replace.c:17 msgid "git replace [-f] <object> <replacement>" -msgstr "" +msgstr "git replace [-f] <对象> <æ¿æ¢ç©>" #: builtin/replace.c:18 msgid "git replace -d <object>..." -msgstr "" +msgstr "git replace -d <对象>..." #: builtin/replace.c:19 msgid "git replace -l [<pattern>]" -msgstr "" +msgstr "git replace -l [<模å¼>]" -#: builtin/replace.c:118 +#: builtin/replace.c:121 msgid "list replace refs" -msgstr "" +msgstr "ååºæ¿æ¢çå¼ç¨" -#: builtin/replace.c:119 +#: builtin/replace.c:122 msgid "delete replace refs" -msgstr "" +msgstr "å é¤æ¿æ¢çå¼ç¨" -#: builtin/replace.c:120 +#: builtin/replace.c:123 msgid "replace the ref if it exists" -msgstr "" +msgstr "å¦æåå¨åæ¿æ¢å¼ç¨" #: builtin/rerere.c:11 msgid "git rerere [clear | forget path... | status | remaining | diff | gc]" -msgstr "" +msgstr "git rerere [clear | forget path... | status | remaining | diff | gc]" #: builtin/rerere.c:56 -#, fuzzy msgid "register clean resolutions in index" -msgstr "%sï¼å·²ç»åå¨äºç´¢å¼ä¸" +msgstr "å¨ç´¢å¼ä¸æ³¨åå¹²åç解å³æ¹æ¡" #: builtin/reset.c:25 msgid "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" -msgstr "" +msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<æ交>]" #: builtin/reset.c:26 -msgid "git reset [-q] <commit> [--] <paths>..." -msgstr "" +msgid "git reset [-q] <tree-ish> [--] <paths>..." +msgstr "git reset [-q] <æ ææ交> [--] <è·¯å¾>..." #: builtin/reset.c:27 -msgid "git reset --patch [<commit>] [--] [<paths>...]" -msgstr "" +msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" +msgstr "git reset --patch [<æ ææ交>] [--] [<è·¯å¾>...]" #: builtin/reset.c:33 msgid "mixed" @@ -7740,104 +7643,109 @@ msgstr "å并" msgid "keep" msgstr "ä¿æ" -#: builtin/reset.c:77 +#: builtin/reset.c:73 msgid "You do not have a valid HEAD." msgstr "æ¨æ²¡æä¸ä¸ªææç HEADã" -#: builtin/reset.c:79 +#: builtin/reset.c:75 msgid "Failed to find tree of HEAD." msgstr "æ æ³æ¾å° HEAD æåçæ ã" -#: builtin/reset.c:85 +#: builtin/reset.c:81 #, c-format msgid "Failed to find tree of %s." msgstr "æ æ³æ¾å° %s æåçæ ã" -#: builtin/reset.c:96 -msgid "Could not write new index file." -msgstr "ä¸è½åå ¥æ°çç´¢å¼æ件ã" - -#: builtin/reset.c:106 +#: builtin/reset.c:98 #, c-format msgid "HEAD is now at %s" msgstr "HEAD ç°å¨ä½äº %s" -#: builtin/reset.c:130 -msgid "Could not read index" -msgstr "ä¸è½è¯»åç´¢å¼" - -#: builtin/reset.c:133 -msgid "Unstaged changes after reset:" -msgstr "éç½®åæ¤åºæååºçåæ´ï¼" - # è¯è ï¼æ±åä¹é´æ ç©ºæ ¼ï¼æ å é¤%sååç©ºæ ¼ -#: builtin/reset.c:223 +#: builtin/reset.c:169 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "å¨å并è¿ç¨ä¸ä¸è½å%séç½®æä½ã" -#: builtin/reset.c:238 +#: builtin/reset.c:248 msgid "be quiet, only report errors" -msgstr "" +msgstr "å®é模å¼ï¼åªæ¥åé误" -#: builtin/reset.c:240 +#: builtin/reset.c:250 msgid "reset HEAD and index" -msgstr "" +msgstr "éç½® HEAD åç´¢å¼" -#: builtin/reset.c:241 +#: builtin/reset.c:251 msgid "reset only HEAD" -msgstr "" +msgstr "åªéç½® HEAD" -#: builtin/reset.c:243 builtin/reset.c:245 +#: builtin/reset.c:253 builtin/reset.c:255 msgid "reset HEAD, index and working tree" -msgstr "" +msgstr "éç½® HEADãç´¢å¼åå·¥ä½åº" -#: builtin/reset.c:247 +#: builtin/reset.c:257 msgid "reset HEAD but keep local changes" -msgstr "" +msgstr "éç½® HEAD ä½ä¿åæ¬å°åæ´" -#: builtin/reset.c:303 +#: builtin/reset.c:275 +#, c-format +msgid "Failed to resolve '%s' as a valid revision." +msgstr "æ æ³å° '%s' 解æ为ä¸ä¸ªææççæ¬ã" + +#: builtin/reset.c:278 builtin/reset.c:286 #, c-format msgid "Could not parse object '%s'." msgstr "ä¸è½è§£æ对象 '%s'ã" -#: builtin/reset.c:308 +#: builtin/reset.c:283 +#, c-format +msgid "Failed to resolve '%s' as a valid tree." +msgstr "æ æ³å° '%s' 解æ为ä¸ä¸ªææçæ 对象ã" + +#: builtin/reset.c:292 msgid "--patch is incompatible with --{hard,mixed,soft}" -msgstr "--patch ä¸ --{hard,mixed,soft} ä¸å ¼å®¹" +msgstr "--patch ä¸ --{hardãmixedãsoft} é项ä¸å ¼å®¹" -#: builtin/reset.c:317 +#: builtin/reset.c:301 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "--mixed 带路å¾å·²å¼ç¨ï¼èæ¯ç¨ 'git reset -- <paths>'ã" # è¯è ï¼æ±åä¹é´æ ç©ºæ ¼ï¼æ å é¤%sååç©ºæ ¼ -#: builtin/reset.c:319 +#: builtin/reset.c:303 #, c-format msgid "Cannot do %s reset with paths." msgstr "ä¸è½å¸¦è·¯å¾è¿è¡%séç½®ã" # è¯è ï¼æ±åä¹é´æ ç©ºæ ¼ï¼æ å é¤%sååç©ºæ ¼ -#: builtin/reset.c:331 +#: builtin/reset.c:313 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "ä¸è½å¯¹è£¸çæ¬åºè¿è¡%séç½®" -#: builtin/reset.c:347 +#: builtin/reset.c:333 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "ä¸è½é置索å¼æ件è³çæ¬ '%s'ã" +#: builtin/reset.c:339 +msgid "Unstaged changes after reset:" +msgstr "éç½®åæ¤åºæååºçåæ´ï¼" + +#: builtin/reset.c:344 +msgid "Could not write new index file." +msgstr "ä¸è½åå ¥æ°çç´¢å¼æ件ã" + #: builtin/rev-parse.c:339 -#, fuzzy msgid "git rev-parse --parseopt [options] -- [<args>...]" -msgstr "git apply [é项] [<è¡¥ä¸>...]" +msgstr "git rev-parse --parseopt [é项] -- [<åæ°>...]" #: builtin/rev-parse.c:344 msgid "keep the `--` passed as an arg" -msgstr "" +msgstr "ä¿æ `--` ä½ä¸ºä¸ä¸ªåæ°ä¼ é" #: builtin/rev-parse.c:346 msgid "stop parsing after the first non-option argument" -msgstr "" +msgstr "éå°ç¬¬ä¸ä¸ªéé项åæ°ååæ¢è§£æ" #: builtin/rev-parse.c:464 msgid "" @@ -7847,23 +7755,27 @@ msgid "" "\n" "Run \"git rev-parse --parseopt -h\" for more information on the first usage." msgstr "" +"git rev-parse --parseopt [é项] -- [<åæ°>...]\n" +" æè ï¼git rev-parse --sq-quote [<é项>...]\n" +" æè ï¼git rev-parse [options] [<é项>...]\n" +"\n" +"å次使ç¨æ¶æ§è¡ \"git rev-parse --parseopt -h\" æ¥è·å¾æ´å¤ä¿¡æ¯ã" #: builtin/revert.c:22 msgid "git revert [options] <commit-ish>" -msgstr "" +msgstr "git revert [é项] <æ交å·>" #: builtin/revert.c:23 msgid "git revert <subcommand>" -msgstr "" +msgstr "git revert <åå½ä»¤>" #: builtin/revert.c:28 msgid "git cherry-pick [options] <commit-ish>" -msgstr "" +msgstr "git cherry-pick [é项] <æ交å·>" #: builtin/revert.c:29 -#, fuzzy msgid "git cherry-pick <subcommand>" -msgstr "æ£é失败" +msgstr "git cherry-pick <åå½ä»¤>" #: builtin/revert.c:70 builtin/revert.c:92 #, c-format @@ -7872,68 +7784,59 @@ msgstr "%sï¼%s ä¸è½å %s åæ¶ä½¿ç¨" #: builtin/revert.c:103 msgid "end revert or cherry-pick sequence" -msgstr "" +msgstr "ç»æ¢å转ææ£éæä½" #: builtin/revert.c:104 msgid "resume revert or cherry-pick sequence" -msgstr "" +msgstr "继ç»å转ææ£éæä½" #: builtin/revert.c:105 msgid "cancel revert or cherry-pick sequence" -msgstr "" +msgstr "åæ¶å转ææ£éæä½" #: builtin/revert.c:106 -#, fuzzy msgid "don't automatically commit" -msgstr "ä¸è½ä½ä¸ºåå§æ交è¿å" +msgstr "ä¸è¦èªå¨æ交" #: builtin/revert.c:107 -#, fuzzy msgid "edit the commit message" -msgstr "空æ交信æ¯ã" +msgstr "ç¼è¾æ交说æ" #: builtin/revert.c:110 msgid "parent number" -msgstr "" +msgstr "ç¶ç¼å·" #: builtin/revert.c:112 -#, fuzzy msgid "merge strategy" -msgstr "å°è¯å并çç¥ %s...\n" +msgstr "å并çç¥" #: builtin/revert.c:113 -#, fuzzy msgid "option" -msgstr "å¨ä½" +msgstr "é项" #: builtin/revert.c:114 -#, fuzzy msgid "option for merge strategy" -msgstr "å°è¯å并çç¥ %s...\n" +msgstr "å并çç¥çé项" #: builtin/revert.c:125 msgid "append commit name" -msgstr "" +msgstr "追å æ交å称" #: builtin/revert.c:126 -#, fuzzy msgid "allow fast-forward" -msgstr "ï¼éå¿«è¿å¼ï¼" +msgstr "å 许快è¿å¼" #: builtin/revert.c:127 -#, fuzzy msgid "preserve initially empty commits" -msgstr "ä¸è½ä½ä¸ºåå§æ交è¿å" +msgstr "ä¿çåå§åç空æ交" #: builtin/revert.c:128 -#, fuzzy msgid "allow commits with empty messages" -msgstr "æ交说æ为空" +msgstr "å 许æ交说æ为空" #: builtin/revert.c:129 -#, fuzzy msgid "keep redundant, empty commits" -msgstr "å并æªè¿åæ交" +msgstr "ä¿æå¤ä½çã空çæ交" #: builtin/revert.c:133 msgid "program error" @@ -7947,12 +7850,20 @@ msgstr "è¿å失败" msgid "cherry-pick failed" msgstr "æ£é失败" -#: builtin/rm.c:14 -#, fuzzy +#: builtin/rm.c:15 msgid "git rm [options] [--] <file>..." -msgstr "git apply [é项] [<è¡¥ä¸>...]" +msgstr "git rm [é项] [--] <æ件>..." + +#: builtin/rm.c:64 builtin/rm.c:186 +#, c-format +msgid "" +"submodule '%s' (or one of its nested submodules) uses a .git directory\n" +"(use 'rm -rf' if you really want to remove it including all of its history)" +msgstr "" +"åæ¨¡ç» '%s'ï¼æè å®çä¸ä¸ªåµå¥å模ç»ï¼ä½¿ç¨ä¸ä¸ª .git ç®å½\n" +"ï¼ä½¿ç¨ 'rm -rf' å½ä»¤å¦ææ¨ççæ³å é¤å®åå ¶å ¨é¨åå²ï¼" -#: builtin/rm.c:109 +#: builtin/rm.c:174 #, c-format msgid "" "'%s' has staged content different from both the file and the HEAD\n" @@ -7961,7 +7872,7 @@ msgstr "" "'%s' æåçå 容åå·¥ä½åºå HEAD ä¸çé½ä¸ä¸æ ·\n" "ï¼ä½¿ç¨ -f 强å¶å é¤ï¼" -#: builtin/rm.c:115 +#: builtin/rm.c:180 #, c-format msgid "" "'%s' has changes staged in the index\n" @@ -7970,7 +7881,7 @@ msgstr "" "'%s' æåæ´å·²æåè³ç´¢å¼ä¸\n" "ï¼ä½¿ç¨ --cached ä¿åæ件ï¼æç¨ -f 强å¶å é¤ï¼" -#: builtin/rm.c:119 +#: builtin/rm.c:191 #, c-format msgid "" "'%s' has local modifications\n" @@ -7979,66 +7890,64 @@ msgstr "" "'%s' ææ¬å°ä¿®æ¹\n" "ï¼ä½¿ç¨ --cached ä¿åæ件ï¼æç¨ -f 强å¶å é¤ï¼" -#: builtin/rm.c:134 -#, fuzzy +#: builtin/rm.c:207 msgid "do not list removed files" -msgstr "æ æ³è¿åä¿®æ¹çæ件" +msgstr "ä¸ååºå é¤çæ件" -#: builtin/rm.c:135 -#, fuzzy +#: builtin/rm.c:208 msgid "only remove from the index" -msgstr "ä¸è½ä»ç´¢å¼ä¸ç§»é¤ %s" +msgstr "åªä»ç´¢å¼åºå é¤" -#: builtin/rm.c:136 +#: builtin/rm.c:209 msgid "override the up-to-date check" -msgstr "" +msgstr "忽ç¥æ件æ´æ°ç¶ææ£æ¥" -#: builtin/rm.c:137 +#: builtin/rm.c:210 msgid "allow recursive removal" -msgstr "" +msgstr "å 许éå½å é¤" -#: builtin/rm.c:139 +#: builtin/rm.c:212 msgid "exit with a zero status even if nothing matched" -msgstr "" +msgstr "å³ä½¿æ²¡æå¹é ï¼ä¹ä»¥é¶ç¶æéåº" -#: builtin/rm.c:194 +#: builtin/rm.c:283 #, c-format msgid "not removing '%s' recursively without -r" msgstr "æªæä¾ -r é项ä¸ä¼éå½å é¤ '%s'" -#: builtin/rm.c:230 +#: builtin/rm.c:322 #, c-format msgid "git rm: unable to remove %s" msgstr "git rmï¼ä¸è½å é¤ %s" #: builtin/shortlog.c:13 msgid "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]" -msgstr "" +msgstr "git shortlog [-n] [-s] [-e] [-w] [çæ¬é项] [--] [<æ交å·>... ]" -#: builtin/shortlog.c:157 +#: builtin/shortlog.c:133 #, c-format msgid "Missing author: %s" msgstr "缺å°ä½è ï¼%s" -#: builtin/shortlog.c:253 +#: builtin/shortlog.c:229 msgid "sort output according to the number of commits per author" -msgstr "" +msgstr "æ ¹æ®æ¯ä¸ªä½è çæ交æ°éæåº" -#: builtin/shortlog.c:255 +#: builtin/shortlog.c:231 msgid "Suppress commit descriptions, only provides commit count" -msgstr "" +msgstr "éèæ交说æï¼åªæä¾æ交æ°é" -#: builtin/shortlog.c:257 +#: builtin/shortlog.c:233 msgid "Show the email address of each author" -msgstr "" +msgstr "æ¾ç¤ºæ¯ä¸ªä½è ççµåé®ä»¶å°å" -#: builtin/shortlog.c:258 +#: builtin/shortlog.c:234 msgid "w[,i1[,i2]]" -msgstr "" +msgstr "w[,i1[,i2]]" -#: builtin/shortlog.c:259 +#: builtin/shortlog.c:235 msgid "Linewrap output" -msgstr "" +msgstr "æè¡è¾åº" #: builtin/show-branch.c:9 msgid "" @@ -8047,162 +7956,172 @@ msgid "" "independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | " "<glob>)...]" msgstr "" +"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--" +"current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --" +"independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | " +"<glob>)...]" #: builtin/show-branch.c:10 msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]" -msgstr "" +msgstr "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]" #: builtin/show-branch.c:651 -#, fuzzy msgid "show remote-tracking and local branches" -msgstr "%s 没ææ¥èª %s çè¿ç¨è·è¸ªåæ¯" +msgstr "æ¾ç¤ºè¿ç¨è·è¸ªçåæ¬å°çåæ¯" #: builtin/show-branch.c:653 -#, fuzzy msgid "show remote-tracking branches" -msgstr "%s 没ææ¥èª %s çè¿ç¨è·è¸ªåæ¯" +msgstr "æ¾ç¤ºè¿ç¨è·è¸ªçåæ¯" #: builtin/show-branch.c:655 msgid "color '*!+-' corresponding to the branch" -msgstr "" +msgstr "çè² '*!+-' å°ç¸åºçåæ¯" #: builtin/show-branch.c:657 msgid "show <n> more commits after the common ancestor" -msgstr "" +msgstr "æ¾ç¤ºå ±åç¥å åç <n> 个æ交" #: builtin/show-branch.c:659 msgid "synonym to more=-1" -msgstr "" +msgstr "å more=-1 åä¹" #: builtin/show-branch.c:660 msgid "suppress naming strings" -msgstr "" +msgstr "ä¸æ¾ç¤ºå符串å½å" #: builtin/show-branch.c:662 -#, fuzzy msgid "include the current branch" -msgstr "没æå½ååæ¯ã" +msgstr "å æ¬å½ååæ¯" #: builtin/show-branch.c:664 -#, fuzzy msgid "name commits with their object names" -msgstr "ä¸è½å注解对象" +msgstr "以对象ååå½åæ交" #: builtin/show-branch.c:666 msgid "show possible merge bases" -msgstr "" +msgstr "æ¾ç¤ºå¯è½å并çåºçº¿" #: builtin/show-branch.c:668 msgid "show refs unreachable from any other ref" -msgstr "" +msgstr "æ¾ç¤ºæ²¡æä»»ä½å¼ç¨ççå¼ç¨" #: builtin/show-branch.c:670 msgid "show commits in topological order" -msgstr "" +msgstr "以ææ顺åºæ¾ç¤ºæ交" #: builtin/show-branch.c:672 msgid "show only commits not on the first branch" -msgstr "" +msgstr "åªæ¾ç¤ºä¸å¨ç¬¬ä¸ä¸ªåæ¯ä¸çæ交" #: builtin/show-branch.c:674 msgid "show merges reachable from only one tip" -msgstr "" +msgstr "æ¾ç¤ºä» ä¸ä¸ªåæ¯å¯è®¿é®çå并æ交" #: builtin/show-branch.c:676 msgid "show commits where no parent comes before its children" -msgstr "" +msgstr "æ¾ç¤ºæ交æ¶ä»¥æ¶é´ä¸ºåºä¸ç¶æ交ä¸è½é¢å åæ交" #: builtin/show-branch.c:678 msgid "<n>[,<base>]" -msgstr "" +msgstr "<n>[,<base>]" #: builtin/show-branch.c:679 msgid "show <n> most recent ref-log entries starting at base" -msgstr "" +msgstr "æ¾ç¤ºä» base å¼å§ç <n> æ¡æè¿çå¼ç¨æ¥å¿è®°å½" #: builtin/show-ref.c:10 msgid "" "git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--hash" "[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] " msgstr "" +"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--hash" +"[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] " #: builtin/show-ref.c:11 msgid "git show-ref --exclude-existing[=pattern] < ref-list" -msgstr "" +msgstr "git show-ref --exclude-existing[=模å¼] < å¼ç¨å表" -#: builtin/show-ref.c:182 -#, fuzzy +#: builtin/show-ref.c:165 msgid "only show tags (can be combined with heads)" -msgstr "--all ä¸è½åå¼ç¨è¡¨è¾¾å¼åæ¶ä½¿ç¨" +msgstr "åªæ¾ç¤º tagsï¼å¯ä»¥åå¤´å ±ç¨ï¼" -#: builtin/show-ref.c:183 -#, fuzzy +#: builtin/show-ref.c:166 msgid "only show heads (can be combined with tags)" -msgstr "--all ä¸è½åå¼ç¨è¡¨è¾¾å¼åæ¶ä½¿ç¨" +msgstr "åªæ¾ç¤ºå¤´ï¼å¯ä»¥å tags å ±ç¨ï¼" -#: builtin/show-ref.c:184 +#: builtin/show-ref.c:167 msgid "stricter reference checking, requires exact ref path" -msgstr "" +msgstr "æ´ä¸¥æ ¼çå¼ç¨æ£æµï¼éè¦ç²¾ç¡®çå¼ç¨è·¯å¾" -#: builtin/show-ref.c:187 builtin/show-ref.c:189 +#: builtin/show-ref.c:170 builtin/show-ref.c:172 msgid "show the HEAD reference" -msgstr "" +msgstr "æ¾ç¤º HEAD å¼ç¨" -#: builtin/show-ref.c:191 -#, fuzzy +#: builtin/show-ref.c:174 msgid "dereference tags into object IDs" -msgstr "å¼ç¨ä¸æ¯ä¸ä¸ªæ ï¼%s" +msgstr "è½¬æ¢ tags å°å¯¹è±¡ID" -#: builtin/show-ref.c:193 +#: builtin/show-ref.c:176 msgid "only show SHA1 hash using <n> digits" -msgstr "" +msgstr "åªæ¾ç¤ºä½¿ç¨ <n> 个æ°åç SHA1 åå¸" -#: builtin/show-ref.c:197 +#: builtin/show-ref.c:180 msgid "do not print results to stdout (useful with --verify)" -msgstr "" +msgstr "ä¸æå°ç»æå°æ åè¾åºï¼ä¾å¦ä¸ --verify åæ°å ±ç¨ï¼" -#: builtin/show-ref.c:199 +#: builtin/show-ref.c:182 msgid "show refs from stdin that aren't in local repository" -msgstr "" +msgstr "æ¾ç¤ºä»æ åè¾å ¥ä¸è¯»å ¥çä¸å¨æ¬å°çæ¬åºä¸çå¼ç¨" #: builtin/symbolic-ref.c:7 msgid "git symbolic-ref [options] name [ref]" -msgstr "" +msgstr "git symbolic-ref [é项] å称 [å¼ç¨]" + +#: builtin/symbolic-ref.c:8 +msgid "git symbolic-ref -d [-q] name" +msgstr "git symbolic-ref -d [-q] å称" -#: builtin/symbolic-ref.c:38 +#: builtin/symbolic-ref.c:40 msgid "suppress error message for non-symbolic (detached) refs" -msgstr "" +msgstr "ä¸æ¾ç¤ºé符å·ï¼å离çï¼å¼ç¨çé误信æ¯" + +#: builtin/symbolic-ref.c:41 +msgid "delete symbolic ref" +msgstr "å é¤ç¬¦å·å¼ç¨" -#: builtin/symbolic-ref.c:39 +#: builtin/symbolic-ref.c:42 msgid "shorten ref output" -msgstr "" +msgstr "ç®ççå¼ç¨è¾åº" -#: builtin/symbolic-ref.c:40 builtin/update-ref.c:18 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:18 msgid "reason" -msgstr "" +msgstr "åå " -#: builtin/symbolic-ref.c:40 builtin/update-ref.c:18 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:18 msgid "reason of the update" -msgstr "" +msgstr "æ´æ°çåå " #: builtin/tag.c:22 msgid "" "git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]" msgstr "" +"git tag [-a|-s|-u <key-id>] [-f] [-m <说æ>|-F <æ件>] <æ ç¾å> [<头>]" #: builtin/tag.c:23 msgid "git tag -d <tagname>..." -msgstr "" +msgstr "git tag -d <æ ç¾å>..." #: builtin/tag.c:24 msgid "" "git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n" "\t\t[<pattern>...]" msgstr "" +"git tag -l [-n[<num>]] [--contains <æ交>] [--points-at <对象>] \n" +"\t\t[<模å¼>...]" #: builtin/tag.c:26 msgid "git tag -v <tagname>..." -msgstr "" +msgstr "git tag -v <æ ç¾å>..." #: builtin/tag.c:60 #, c-format @@ -8294,63 +8213,59 @@ msgstr "éæ³ç对象å '%s'" #: builtin/tag.c:447 msgid "list tag names" -msgstr "" +msgstr "ååºtagå称" #: builtin/tag.c:449 msgid "print <n> lines of each tag message" -msgstr "" +msgstr "æ¯ä¸ª tag ä¿¡æ¯æå° <n> è¡" #: builtin/tag.c:451 -#, fuzzy msgid "delete tags" -msgstr "å é¤" +msgstr "å é¤ tags" #: builtin/tag.c:452 msgid "verify tags" -msgstr "" +msgstr "éªè¯ tags" #: builtin/tag.c:454 msgid "Tag creation options" -msgstr "" +msgstr "Tag å建é项" #: builtin/tag.c:456 -#, fuzzy msgid "annotated tag, needs a message" -msgstr "注é tag %s 没æåµå ¥å称" +msgstr "注解 tagï¼éè¦ä¸ä¸ªè¯´æ" #: builtin/tag.c:458 -#, fuzzy msgid "tag message" -msgstr "æ tag 说æï¼" +msgstr "tag 说æ" #: builtin/tag.c:460 msgid "annotated and GPG-signed tag" -msgstr "" +msgstr "注解并 GPG ç¾åç tag" #: builtin/tag.c:464 -#, fuzzy msgid "use another key to sign the tag" -msgstr "æ æ³ç¾ç½² tag" +msgstr "使ç¨å¦å¤çç§é¥ç¾å tag" #: builtin/tag.c:465 msgid "replace the tag if exists" -msgstr "" +msgstr "å¦æåå¨ï¼æ¿æ¢ç°æç tag" #: builtin/tag.c:466 msgid "show tag list in columns" -msgstr "" +msgstr "以åçæ¹å¼æ¾ç¤º tag" #: builtin/tag.c:468 msgid "Tag listing options" -msgstr "" +msgstr "Tag å表é项" #: builtin/tag.c:471 msgid "print only tags that contain the commit" -msgstr "" +msgstr "åªæå°å å«æ交çtags" #: builtin/tag.c:477 msgid "print only tags of the object" -msgstr "" +msgstr "åªæå°tags对象" #: builtin/tag.c:506 msgid "--column and -n are incompatible" @@ -8402,182 +8317,176 @@ msgid "Updated tag '%s' (was %s)\n" msgstr "å·²æ´æ°tag '%s'ï¼æ¾ä¸º %sï¼\n" #: builtin/update-index.c:401 -#, fuzzy msgid "git update-index [options] [--] [<file>...]" -msgstr "git apply [é项] [<è¡¥ä¸>...]" +msgstr "git update-index [é项] [--] [<æ件>...]" -#: builtin/update-index.c:717 +#: builtin/update-index.c:718 msgid "continue refresh even when index needs update" -msgstr "" +msgstr "å½ç´¢å¼éè¦æ´æ°æ¶ç»§ç»å·æ°" -#: builtin/update-index.c:720 +#: builtin/update-index.c:721 msgid "refresh: ignore submodules" -msgstr "" +msgstr "å·æ°ï¼å¿½ç¥å模ç»" -#: builtin/update-index.c:723 -#, fuzzy +#: builtin/update-index.c:724 msgid "do not ignore new files" -msgstr "æ æ³åå¨ç´¢å¼æ件" +msgstr "ä¸å¿½ç¥æ°çæ件" -#: builtin/update-index.c:725 +#: builtin/update-index.c:726 msgid "let files replace directories and vice-versa" -msgstr "" +msgstr "让æ件æ¿æ¢ç®å½ï¼åä¹äº¦ç¶ï¼" -#: builtin/update-index.c:727 +#: builtin/update-index.c:728 msgid "notice files missing from worktree" -msgstr "" +msgstr "éç¥æ件ä»å·¥ä½åºä¸¢å¤±" -#: builtin/update-index.c:729 +#: builtin/update-index.c:730 msgid "refresh even if index contains unmerged entries" -msgstr "" +msgstr "å³ä½¿ç´¢å¼åºå å«æªå并çæ¡ç®ä¹æ§è¡å·æ°" -#: builtin/update-index.c:732 +#: builtin/update-index.c:733 msgid "refresh stat information" -msgstr "" +msgstr "å·æ°ç»è®¡ä¿¡æ¯" -#: builtin/update-index.c:736 +#: builtin/update-index.c:737 msgid "like --refresh, but ignore assume-unchanged setting" -msgstr "" +msgstr "ç±»ä¼¼äº --refreshï¼ä½æ¯å¿½ç¥ assume-unchanged 设置" -#: builtin/update-index.c:740 +#: builtin/update-index.c:741 msgid "<mode> <object> <path>" -msgstr "" +msgstr "<mode> <object> <path>" -#: builtin/update-index.c:741 -#, fuzzy +#: builtin/update-index.c:742 msgid "add the specified entry to the index" -msgstr "æ·»å æ件å 容è³ç´¢å¼" +msgstr "æ·»å æå®çæ¡ç®å°ç´¢å¼åº" -#: builtin/update-index.c:745 +#: builtin/update-index.c:746 msgid "(+/-)x" -msgstr "" +msgstr "(+/-)x" -#: builtin/update-index.c:746 +#: builtin/update-index.c:747 msgid "override the executable bit of the listed files" -msgstr "" +msgstr "è¦çå表éæ件çå¯æ§è¡ä½" -#: builtin/update-index.c:750 +#: builtin/update-index.c:751 msgid "mark files as \"not changing\"" -msgstr "" +msgstr "ææ件æ 记为 \"没æåæ´\"" -#: builtin/update-index.c:753 +#: builtin/update-index.c:754 msgid "clear assumed-unchanged bit" -msgstr "" +msgstr "æ¸ é¤ assumed-unchanged ä½" -#: builtin/update-index.c:756 +#: builtin/update-index.c:757 msgid "mark files as \"index-only\"" -msgstr "" +msgstr "ææ件æ 记为 \"ä» ç´¢å¼\"" -#: builtin/update-index.c:759 +#: builtin/update-index.c:760 msgid "clear skip-worktree bit" -msgstr "" +msgstr "æ¸ é¤ skip-worktree ä½" -#: builtin/update-index.c:762 +#: builtin/update-index.c:763 msgid "add to index only; do not add content to object database" -msgstr "" +msgstr "åªæ·»å å°ç´¢å¼åºï¼ä¸æ·»å 对象å°å¯¹è±¡åº" -#: builtin/update-index.c:764 +#: builtin/update-index.c:765 msgid "remove named paths even if present in worktree" -msgstr "" +msgstr "å³ä½¿åå¨å·¥ä½åºéï¼ä¹å é¤è·¯å¾" -#: builtin/update-index.c:766 +#: builtin/update-index.c:767 msgid "with --stdin: input lines are terminated by null bytes" -msgstr "" +msgstr "æºå¸¦ --stdinï¼è¾å ¥çè¡ä»¥ null å符ç»æ¢" -#: builtin/update-index.c:768 -#, fuzzy +#: builtin/update-index.c:769 msgid "read list of paths to be updated from standard input" -msgstr "ï¼æ£ä»æ åè¾å ¥ä¸è¯»åæ¥å¿ä¿¡æ¯ï¼\n" +msgstr "ä»æ åè¾å ¥ä¸è¯»åéè¦æ´æ°çè·¯å¾å表" -#: builtin/update-index.c:772 -#, fuzzy +#: builtin/update-index.c:773 msgid "add entries from standard input to the index" -msgstr "ä¸è½ä»æ åè¾å ¥ä¸è¯»åæ¥å¿ä¿¡æ¯" +msgstr "ä»æ åè¾å ¥æ·»å æ¡ç®å°ç´¢å¼åº" -#: builtin/update-index.c:776 +#: builtin/update-index.c:777 msgid "repopulate stages #2 and #3 for the listed paths" -msgstr "" +msgstr "为æå®æ件éæ°çæ第2å第3æååº" -#: builtin/update-index.c:780 +#: builtin/update-index.c:781 msgid "only update entries that differ from HEAD" -msgstr "" +msgstr "åªæ´æ°ä¸ HEAD ä¸åçæ¡ç®" -#: builtin/update-index.c:784 +#: builtin/update-index.c:785 msgid "ignore files missing from worktree" -msgstr "" +msgstr "忽ç¥å·¥ä½åºä¸¢å¤±çæ件" -#: builtin/update-index.c:787 +#: builtin/update-index.c:788 msgid "report actions to standard output" -msgstr "" +msgstr "å¨æ åè¾åºæ¾ç¤ºæä½" -#: builtin/update-index.c:789 +#: builtin/update-index.c:790 msgid "(for porcelains) forget saved unresolved conflicts" -msgstr "" +msgstr "(for porcelains) å¿è®°ä¿åçæªè§£å³çå²çª" -#: builtin/update-index.c:793 +#: builtin/update-index.c:794 msgid "write index in this format" -msgstr "" +msgstr "以è¿ç§æ ¼å¼åå ¥ç´¢å¼åº" #: builtin/update-ref.c:7 msgid "git update-ref [options] -d <refname> [<oldval>]" -msgstr "" +msgstr "git update-ref [options] -d <å¼ç¨å> [<æ§å¼>]" #: builtin/update-ref.c:8 msgid "git update-ref [options] <refname> <newval> [<oldval>]" -msgstr "" +msgstr "git update-ref [options] <å¼ç¨å> <æ°å¼> [<æ§å¼>]" #: builtin/update-ref.c:19 msgid "delete the reference" -msgstr "" +msgstr "å é¤å¼ç¨" #: builtin/update-ref.c:21 msgid "update <refname> not the one it points to" -msgstr "" +msgstr "æ´æ° <å¼ç¨å> æ¬èº«èä¸æ¯å®æåçå¼ç¨" #: builtin/update-server-info.c:6 msgid "git update-server-info [--force]" -msgstr "" +msgstr "git update-server-info [--force]" #: builtin/update-server-info.c:14 msgid "update the info files from scratch" -msgstr "" +msgstr "ä»å¤´å¼å§æ´æ°æ件信æ¯" #: builtin/verify-pack.c:56 msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..." -msgstr "" +msgstr "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..." #: builtin/verify-pack.c:66 -#, fuzzy msgid "verbose" msgstr "åé¿è¾åº" #: builtin/verify-pack.c:68 msgid "show statistics only" -msgstr "" +msgstr "åªæ¾ç¤ºç»è®¡" #: builtin/verify-tag.c:17 msgid "git verify-tag [-v|--verbose] <tag>..." -msgstr "" +msgstr "git verify-tag [-v|--verbose] <tag>..." #: builtin/verify-tag.c:73 msgid "print tag contents" -msgstr "" +msgstr "æå° tag å 容" #: builtin/write-tree.c:13 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" -msgstr "" +msgstr "git write-tree [--missing-ok] [--prefix=<åç¼>/]" #: builtin/write-tree.c:26 msgid "<prefix>/" -msgstr "" +msgstr "<åç¼>/" #: builtin/write-tree.c:27 msgid "write tree object for a subdirectory <prefix>" -msgstr "" +msgstr "å° <åç¼> åç®å½å 容åå°ä¸ä¸ªæ 对象" #: builtin/write-tree.c:30 msgid "only useful for debugging" -msgstr "" +msgstr "åªå¯¹è°è¯æç¨" #: git.c:16 msgid "See 'git help <command>' for more information on a specific command." @@ -8587,15 +8496,15 @@ msgstr "åè§ 'git help <command>' 以è·å¾è¯¥ç¹å®å½ä»¤ç详ç»ä¿¡æ¯ã" msgid "no-op (backward compatibility)" msgstr "空æä½ï¼ååå ¼å®¹ï¼" -#: parse-options.h:228 +#: parse-options.h:232 msgid "be more verbose" msgstr "æ´å 详ç»" -#: parse-options.h:230 +#: parse-options.h:234 msgid "be more quiet" msgstr "æ´å å®é" -#: parse-options.h:236 +#: parse-options.h:240 msgid "use <n> digits to display SHA-1s" msgstr "ç¨ <n> ä½æ°åæ¾ç¤º SHA-1 åå¸å¼" @@ -8637,7 +8546,7 @@ msgstr "è¾åºå模å¼å¹é çè¡" #: common-cmds.h:17 msgid "Create an empty git repository or reinitialize an existing one" -msgstr "å建ä¸ä¸ªç©ºç git çæ¬åºæè éæ°åå§åä¸ä¸ª" +msgstr "å建ä¸ä¸ªç©ºç git çæ¬åºæéæ°åå§åä¸ä¸ª" #: common-cmds.h:18 msgid "Show commit logs" @@ -8710,7 +8619,7 @@ msgstr "æ æ³æ±å©äºä¸è·¯å并ã" #: git-am.sh:137 msgid "Repository lacks necessary blobs to fall back on 3-way merge." -msgstr "çæ¬åºç¼ºä¹å¿ è¦çäºè¿å¶å¯¹è±¡ï¼blobï¼ä»¥è¿è¡ä¸è·¯å并ã" +msgstr "çæ¬åºç¼ºä¹å¿ è¦çæ°æ®ï¼blobï¼å¯¹è±¡ä»¥è¿è¡ä¸è·¯å并ã" #: git-am.sh:139 msgid "Using index info to reconstruct a base tree..." @@ -8722,7 +8631,7 @@ msgid "" "It does not apply to blobs recorded in its index." msgstr "" "æ¨æ¯å¦æ¾æå¨ç¼è¾è¿æ¨çè¡¥ä¸ï¼\n" -"æ æ³åºç¨è¡¥ä¸å°ç´¢å¼ä¸çäºè¿å¶å¯¹è±¡ï¼blobï¼ä¸ã" +"æ æ³åºç¨è¡¥ä¸å°ç´¢å¼ä¸çæ°æ®ï¼blobï¼å¯¹è±¡ä¸ã" #: git-am.sh:163 msgid "Falling back to patching base and 3-way merge..." @@ -8838,6 +8747,8 @@ msgid "" "The copy of the patch that failed is found in:\n" " $dotest/patch" msgstr "" +"失败çè¡¥ä¸æ件å¯æ¬ä½äºï¼\n" +" $dotest/patch" #: git-am.sh:876 msgid "applying to an empty history" @@ -8954,7 +8865,7 @@ msgid "" "Try 'git bisect reset <commit>'." msgstr "" "ä¸è½æ£åºåå§ HEAD '$branch'ã\n" -"å°è¯ 'git bisect reset <commit>'ã" +"å°è¯ 'git bisect reset <æ交>'ã" #: git-bisect.sh:390 msgid "No logfile given" @@ -8981,7 +8892,7 @@ msgid "" "exit code $res from '$command' is < 0 or >= 128" msgstr "" "äºåæ¥æ¾è¿è¡å¤±è´¥ï¼\n" -"å½ä»¤ '$command' çéåºç $res æè å°äº 0 æè 大äºçäº 128" +"å½ä»¤ '$command' çéåºç $res å°äº 0 æ大äºçäº 128" #: git-bisect.sh:453 msgid "bisect run cannot continue any more" @@ -9022,7 +8933,7 @@ msgstr "æ´æ°å°æªè¯ççåæ¯ï¼åæ´æ·»å è³ç´¢å¼" #. The working tree and the index file is still based on the #. $orig_head commit, but we are merging into $curr_head. #. First update the working tree to match $curr_head. -#: git-pull.sh:228 +#: git-pull.sh:229 #, sh-format msgid "" "Warning: fetch updated the current branch head.\n" @@ -9032,15 +8943,15 @@ msgstr "" "è¦åï¼fetch æ´æ°äºå½åçåæ¯ãæ¨çå·¥ä½åº\n" "è¦åï¼ä»åæ交 $orig_head å¿«è¿ã" -#: git-pull.sh:253 +#: git-pull.sh:254 msgid "Cannot merge multiple branches into empty head" msgstr "æ æ³å°å¤ä¸ªåæ¯å并å°ç©ºåæ¯" -#: git-pull.sh:257 +#: git-pull.sh:258 msgid "Cannot rebase onto multiple branches" msgstr "æ æ³ååºå°å¤ä¸ªåæ¯" -#: git-rebase.sh:52 +#: git-rebase.sh:53 msgid "" "When you have resolved this problem, run \"git rebase --continue\".\n" "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n" @@ -9051,27 +8962,31 @@ msgstr "" "å¦ææ¨æ³è·³è¿æ¤è¡¥ä¸ï¼åæ§è¡ \"git rebase --skip\"ã\n" "è¦æ¢å¤ååæ¯å¹¶åæ¢ååºï¼æ§è¡ \"git rebase --abort\"ã" -#: git-rebase.sh:159 +#: git-rebase.sh:160 msgid "The pre-rebase hook refused to rebase." msgstr "é©å pre-rebase æç»ååºã" -#: git-rebase.sh:164 +#: git-rebase.sh:165 msgid "It looks like git-am is in progress. Cannot rebase." msgstr "ä¼¼ä¹æ£å¤äºå¨ git-am çæ§è¡è¿ç¨ä¸ãæ æ³ååºã" -#: git-rebase.sh:295 +#: git-rebase.sh:296 msgid "The --exec option must be used with the --interactive option" msgstr "é项 --exec å¿ é¡»åé项 --interactive åæ¶ä½¿ç¨" -#: git-rebase.sh:300 +#: git-rebase.sh:301 msgid "No rebase in progress?" msgstr "没ææ£å¨è¿è¡çååºï¼" -#: git-rebase.sh:313 +#: git-rebase.sh:312 +msgid "The --edit-todo action can only be used during interactive rebase." +msgstr "å¨ä½ --edit-todo åªè½ç¨å¨äº¤äºå¼ååºè¿ç¨ä¸ã" + +#: git-rebase.sh:319 msgid "Cannot read HEAD" msgstr "ä¸è½è¯»å HEAD" -#: git-rebase.sh:316 +#: git-rebase.sh:322 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -9079,12 +8994,12 @@ msgstr "" "æ¨å¿ é¡»ç¼è¾ææçå并å²çªï¼ç¶åéè¿ git add\n" "å½ä»¤å°å®ä»¬æ 记为已解å³" -#: git-rebase.sh:334 +#: git-rebase.sh:340 #, sh-format msgid "Could not move back to $head_name" msgstr "æ æ³ç§»å $head_name" -#: git-rebase.sh:350 +#: git-rebase.sh:359 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -9103,56 +9018,56 @@ msgstr "" "\t$cmd_clear_stale_rebase\n" "ç¶ååéæ°æ§è¡ååºã为é¿å æ¨ä¸¢å¤±éè¦æ°æ®ï¼æå·²ç»åæ¢å½åæä½ã" -#: git-rebase.sh:395 +#: git-rebase.sh:404 #, sh-format msgid "invalid upstream $upstream_name" msgstr "æ æçä¸æ¸¸ $upstream_name" -#: git-rebase.sh:419 +#: git-rebase.sh:428 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "$onto_name: æä¸ä¸ªä»¥ä¸çå并åºå" -#: git-rebase.sh:422 git-rebase.sh:426 +#: git-rebase.sh:431 git-rebase.sh:435 #, sh-format msgid "$onto_name: there is no merge base" msgstr "$onto_name: 没æå并åºå" -#: git-rebase.sh:431 +#: git-rebase.sh:440 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "没ææåä¸ä¸ªææçæ交ï¼$onto_name" -#: git-rebase.sh:454 +#: git-rebase.sh:463 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "严éé误ï¼æ æ¤åæ¯ï¼$branch_name" -#: git-rebase.sh:474 +#: git-rebase.sh:483 msgid "Please commit or stash them." msgstr "请æ交æ为å®ä»¬ä¿åè¿åº¦ã" -#: git-rebase.sh:492 +#: git-rebase.sh:501 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "å½ååæ¯ $branch_name æ¯ææ°çã" -#: git-rebase.sh:495 +#: git-rebase.sh:504 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "å½ååæ¯ $branch_name æ¯ææ°çï¼å¼ºå¶ååºã" -#: git-rebase.sh:506 +#: git-rebase.sh:515 #, sh-format msgid "Changes from $mb to $onto:" msgstr "åæ´ä» $mb å° $ontoï¼" #. Detach HEAD and reset the tree -#: git-rebase.sh:515 +#: git-rebase.sh:524 msgid "First, rewinding head to replay your work on top of it..." msgstr "é¦å ï¼é置头æé以便å¨ä¸é¢éæ¾æ¨çå·¥ä½..." -#: git-rebase.sh:523 +#: git-rebase.sh:532 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "å¿«è¿ $branch_name è³ $onto_nameã" @@ -9286,37 +9201,37 @@ msgstr "æªæå®åæ¯å" msgid "(To restore them type \"git stash apply\")" msgstr "ï¼ä¸ºæ¢å¤æ°æ®è¾å ¥ \"git stash apply\"ï¼" -#: git-submodule.sh:88 +#: git-submodule.sh:90 #, sh-format msgid "cannot strip one component off url '$remoteurl'" msgstr "æ æ³ä» url '$remoteurl' å¥ç¦»ä¸ä¸ªç»ä»¶" -#: git-submodule.sh:167 +#: git-submodule.sh:195 #, sh-format msgid "No submodule mapping found in .gitmodules for path '$sm_path'" msgstr "æªå¨ .gitmodules ä¸åç°è·¯å¾ '$sm_path' çå模ç»æ å°" -#: git-submodule.sh:211 +#: git-submodule.sh:238 #, sh-format msgid "Clone of '$url' into submodule path '$sm_path' failed" msgstr "æ æ³å é '$url' å°å模ç»è·¯å¾ '$sm_path'" -#: git-submodule.sh:223 +#: git-submodule.sh:250 #, sh-format msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa" -msgstr "Gitdir '$a' å¨å模ç»è·¯å¾ '$b' ä¹ä¸æè ç¸å" +msgstr "Gitdir '$a' å¨å模ç»è·¯å¾ '$b' ä¹ä¸æç¸å" -#: git-submodule.sh:312 +#: git-submodule.sh:343 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "çæ¬åºURLï¼'$repo' å¿ é¡»æ¯ç»å¯¹è·¯å¾æ以 ./|../ èµ·å§" -#: git-submodule.sh:329 +#: git-submodule.sh:360 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "'$sm_path' å·²ç»åå¨äºç´¢å¼ä¸" -#: git-submodule.sh:333 +#: git-submodule.sh:364 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -9327,62 +9242,91 @@ msgstr "" "$sm_path\n" "å¦ææ¨ç¡®å®æ³æ·»å å®ï¼ä½¿ç¨ -f åæ°ã" -#: git-submodule.sh:344 +#: git-submodule.sh:382 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "æ·»å ä½äº '$sm_path' çç°åçæ¬åºå°ç´¢å¼" -#: git-submodule.sh:346 +#: git-submodule.sh:384 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "'$sm_path' å·²åå¨ä¸ä¸æ¯ä¸ä¸ªææç git çæ¬åº" -#: git-submodule.sh:360 +#: git-submodule.sh:392 +#, sh-format +msgid "A git directory for '$sm_name' is found locally with remote(s):" +msgstr "æ¬å°åç° '$sm_name' çä¸ä¸ª git ç®å½ï¼ä¸å ¶å¯¹åºçè¿ç¨çæ¬åºï¼" + +#: git-submodule.sh:394 +#, sh-format +msgid "" +"If you want to reuse this local git directory instead of cloning again from" +msgstr "å¦ææ¨æ³éç¨æ¤æ¬å° git ç®å½èä¸æ¯éæ°å éèª" + +#: git-submodule.sh:396 +#, sh-format +msgid "" +"use the '--force' option. If the local git directory is not the correct repo" +msgstr "ä½¿ç¨ '--force' åæ°ãå¦ææ¬å° git ç®å½ä¸æ¯æ£ç¡®ççæ¬åº" + +#: git-submodule.sh:397 +#, sh-format +msgid "" +"or you are unsure what this means choose another name with the '--name' " +"option." +msgstr "æè æ¨ä¸ç¡®å®å ¶ä¸å«ä¹ä½¿ç¨ '--name' åæ°éæ©å¦å¤ä¸ä¸ªå称ã" + +#: git-submodule.sh:399 +#, sh-format +msgid "Reactivating local git directory for submodule '$sm_name'." +msgstr "æ¿æ´»æ¬å° git ç®å½å°åæ¨¡ç» '$sm_name'ã" + +#: git-submodule.sh:411 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "ä¸è½æ£åºåæ¨¡ç» '$sm_path'" -#: git-submodule.sh:365 +#: git-submodule.sh:416 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "æ æ³æ·»å åæ¨¡ç» '$sm_path'" -#: git-submodule.sh:370 +#: git-submodule.sh:425 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "æ æ³æ³¨ååæ¨¡ç» '$sm_path'" -#: git-submodule.sh:413 +#: git-submodule.sh:468 #, sh-format msgid "Entering '$prefix$sm_path'" msgstr "æ£å¨è¿å ¥ '$prefix$sm_path'" -#: git-submodule.sh:427 +#: git-submodule.sh:482 #, sh-format msgid "Stopping at '$sm_path'; script returned non-zero status." msgstr "åæ¢äº '$sm_path'ï¼èæ¬è¿åéé¶å¼ã" -#: git-submodule.sh:471 +#: git-submodule.sh:526 #, sh-format msgid "No url found for submodule path '$sm_path' in .gitmodules" msgstr "å¨ .gitmodules ä¸æªæ¾å°å模ç»è·¯å¾ '$sm_path' ç url" -#: git-submodule.sh:480 +#: git-submodule.sh:535 #, sh-format msgid "Failed to register url for submodule path '$sm_path'" msgstr "æ æ³ä¸ºå模ç»è·¯å¾ '$sm_path' 注å url" -#: git-submodule.sh:482 +#: git-submodule.sh:537 #, sh-format msgid "Submodule '$name' ($url) registered for path '$sm_path'" msgstr "åæ¨¡ç» '$name' ($url) å·²ä¸ºè·¯å¾ '$sm_path' 注å" -#: git-submodule.sh:490 +#: git-submodule.sh:545 #, sh-format msgid "Failed to register update mode for submodule path '$sm_path'" msgstr "æ æ³ä¸ºå模ç»è·¯å¾ '$sm_path' 注åæ´æ°æ¨¡å¼" -#: git-submodule.sh:590 +#: git-submodule.sh:649 #, sh-format msgid "" "Submodule path '$sm_path' not initialized\n" @@ -9391,95 +9335,137 @@ msgstr "" "å模ç»è·¯å¾ '$sm_path' 没æåå§å\n" "ä¹è®¸æ¨æ³ç¨ 'update --init'ï¼" -#: git-submodule.sh:603 +#: git-submodule.sh:662 #, sh-format msgid "Unable to find current revision in submodule path '$sm_path'" msgstr "æ æ³å¨å模ç»è·¯å¾ '$sm_path' ä¸æ¾å°å½åçæ¬" -#: git-submodule.sh:622 +#: git-submodule.sh:671 git-submodule.sh:695 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "æ æ³å¨å模ç»è·¯å¾ '$sm_path' ä¸è·å" -#: git-submodule.sh:636 +#: git-submodule.sh:709 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$sm_path'" msgstr "æ æ³å¨å模ç»è·¯å¾ '$sm_path' ä¸ååº '$sha1'" -#: git-submodule.sh:637 +#: git-submodule.sh:710 #, sh-format msgid "Submodule path '$sm_path': rebased into '$sha1'" msgstr "å模ç»è·¯å¾ '$sm_path'ï¼ååºè³ '$sha1'" -#: git-submodule.sh:642 +#: git-submodule.sh:715 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$sm_path'" msgstr "æ æ³å并 '$sha1' å°å模ç»è·¯å¾ '$sm_path' ä¸" -#: git-submodule.sh:643 +#: git-submodule.sh:716 #, sh-format msgid "Submodule path '$sm_path': merged in '$sha1'" msgstr "å模ç»è·¯å¾ '$sm_path'ï¼å·²åå¹¶å ¥ '$sha1'" -#: git-submodule.sh:648 +#: git-submodule.sh:721 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$sm_path'" msgstr "æ æ³å¨å模ç»è·¯å¾ '$sm_path' ä¸æ£åº '$sha1'" -#: git-submodule.sh:649 +#: git-submodule.sh:722 #, sh-format msgid "Submodule path '$sm_path': checked out '$sha1'" msgstr "å模ç»è·¯å¾ '$sm_path'ï¼æ£åº '$sha1'" -#: git-submodule.sh:671 git-submodule.sh:995 +#: git-submodule.sh:744 git-submodule.sh:1066 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "æ æ³éå½è¿å模ç»è·¯å¾ '$sm_path'" -#: git-submodule.sh:779 +#: git-submodule.sh:852 msgid "The --cached option cannot be used with the --files option" msgstr "é项 --cached ä¸è½åé项 --files åæ¶ä½¿ç¨" #. unexpected type -#: git-submodule.sh:819 +#: git-submodule.sh:892 #, sh-format msgid "unexpected mode $mod_dst" msgstr "æå¤çæ¨¡å¼ $mod_dst" # è¯è ï¼æ³¨æä¿æåå¯¼ç©ºæ ¼ -#: git-submodule.sh:837 +#: git-submodule.sh:910 #, sh-format msgid " Warn: $name doesn't contain commit $sha1_src" msgstr " è¦åï¼$name æªå å«æ交 $sha1_src" # è¯è ï¼æ³¨æä¿æåå¯¼ç©ºæ ¼ -#: git-submodule.sh:840 +#: git-submodule.sh:913 #, sh-format msgid " Warn: $name doesn't contain commit $sha1_dst" msgstr " è¦åï¼$name æªå å«æ交 $sha1_dst" # è¯è ï¼æ³¨æä¿æåå¯¼ç©ºæ ¼ -#: git-submodule.sh:843 +#: git-submodule.sh:916 #, sh-format msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst" msgstr " è¦åï¼$name æªå å«æ交 $sha1_src å $sha1_dst" -#: git-submodule.sh:868 +#: git-submodule.sh:941 msgid "blob" -msgstr "äºè¿å¶å¯¹è±¡" +msgstr "æ°æ®å¯¹è±¡" -#: git-submodule.sh:906 +#: git-submodule.sh:979 msgid "# Submodules changed but not updated:" msgstr "# å模ç»å·²ä¿®æ¹ä½å°æªæ´æ°ï¼" -#: git-submodule.sh:908 +#: git-submodule.sh:981 msgid "# Submodule changes to be committed:" msgstr "è¦æ交çå模ç»åæ´ï¼" -#: git-submodule.sh:1054 +#: git-submodule.sh:1129 #, sh-format -msgid "Synchronizing submodule url for '$name'" -msgstr "为 '$name' åæ¥åæ¨¡ç» url" +msgid "Synchronizing submodule url for '$prefix$sm_path'" +msgstr "为 '$prefix$sm_path' åæ¥åæ¨¡ç» url" + +#~ msgid "-NUM" +#~ msgstr "-æ°å" + +#~ msgid " 0 files changed" +#~ msgstr " 0 个æ件被修æ¹" + +#~ msgid " %d file changed" +#~ msgid_plural " %d files changed" +#~ msgstr[0] " %d 个æ件被修æ¹" +#~ msgstr[1] " %d 个æ件被修æ¹" + +#~ msgid ", %d insertion(+)" +#~ msgid_plural ", %d insertions(+)" +#~ msgstr[0] "ï¼æå ¥ %d è¡(+)" +#~ msgstr[1] "ï¼æå ¥ %d è¡(+)" + +#~ msgid ", %d deletion(-)" +#~ msgid_plural ", %d deletions(-)" +#~ msgstr[0] "ï¼å é¤ %d è¡(-)" +#~ msgstr[1] "ï¼å é¤ %d è¡(-)" + +#~ msgid "You do not have a valid HEAD" +#~ msgstr "æ¨æ²¡æä¸ä¸ªææç HEAD" + +#~ msgid "oops" +#~ msgstr "åå" + +#~ msgid "Would not remove %s\n" +#~ msgstr "ä¸ä¼å é¤ %s\n" + +#~ msgid "Not removing %s\n" +#~ msgstr "æªå é¤ %s\n" + +#~ msgid "Auto packing the repository for optimum performance.\n" +#~ msgstr "èªå¨æå çæ¬åºä»¥æ±æä½³æ§è½ã\n" + +#~ msgid "git remote set-head <name> (-a | -d | <branch>])" +#~ msgstr "git remote set-head <å称> (-a | -d | <åæ¯>])" + +#~ msgid "Could not read index" +#~ msgstr "ä¸è½è¯»åç´¢å¼" # è¯è ï¼ä¸æå符串æ¼æ¥ï¼å¯å é¤åå¯¼ç©ºæ ¼ #~ msgid " (use \"git add\" to track)" -- 2.40.0