From c04f5ac3047a4a69e1b92d173568e32f63747b82 Mon Sep 17 00:00:00 2001 From: Jiang Xin <worldhello.net@gmail.com> Date: Mon, 13 Feb 2012 14:41:59 +0800 Subject: [PATCH] l10n: po for zh_CN Git can speak Chinese now. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> --- po/zh_CN.po | 3611 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 3611 insertions(+) create mode 100644 po/zh_CN.po diff --git a/po/zh_CN.po b/po/zh_CN.po new file mode 100644 index 000000000..ef07aa8a6 --- /dev/null +++ b/po/zh_CN.po @@ -0,0 +1,3611 @@ +# Chinese translations for Git package +# Git 软件å çç®ä½ä¸æç¿»è¯. +# Copyright (C) 2012 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> +# - Riku <lu.riku AT gmail.com> +# - Zhuang Ya <zhuangya AT me.com> +# - Lian Cheng <rhythm.mail AT gmail.com> +# +msgid "" +msgstr "" +"Project-Id-Version: Git\n" +"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" +"POT-Creation-Date: 2012-02-13 14:24+0800\n" +"PO-Revision-Date: 2012-01-30 00:00+0800\n" +"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n" +"Language-Team: GitHub <https://github.com/gotgit/git/>\n" +"Language: zh_CN\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: advice.c:34 +#, c-format +msgid "hint: %.*s\n" +msgstr "æ示ï¼%.*s\n" + +#. +#. * Message used both when 'git commit' fails and when +#. * other commands doing a merge do. +#. +#: advice.c:64 +msgid "" +"Fix them up in the work tree,\n" +"and then use 'git add/rm <file>' as\n" +"appropriate to mark resolution and make a commit,\n" +"or use 'git commit -a'." +msgstr "" +"请å å¨å·¥ä½åºæ¹æ£æ件ï¼ç¶åé æ 使ç¨\n" +"'git add/rm <file>' æ 记解å³æ¹æ¡ï¼\n" +"æä½¿ç¨ 'git commit -a'ã" + +#: commit.c:47 +#, c-format +msgid "could not parse %s" +msgstr "ä¸è½è§£æ %s" + +#: commit.c:49 +#, c-format +msgid "%s %s is not a commit!" +msgstr "%s %s ä¸æ¯ä¸ä¸ªæ交!" + +#: compat/obstack.c:406 compat/obstack.c:408 +msgid "memory exhausted" +msgstr "å åèå°½" + +#: connected.c:39 +msgid "Could not run 'git rev-list'" +msgstr "ä¸è½æ§è¡ 'git rev-list'" + +#: connected.c:48 +#, c-format +msgid "failed write to rev-list: %s" +msgstr "æ æ³åå ¥ rev-listï¼%s" + +#: connected.c:56 +#, c-format +msgid "failed to close rev-list's stdin: %s" +msgstr "æ æ³å ³é rev-list çæ åè¾å ¥ï¼%s" + +# 注æä¿æåå¯¼ç©ºæ ¼ +#: diff.c:104 +#, c-format +msgid " Failed to parse dirstat cut-off percentage '%.*s'\n" +msgstr " æ æ³è§£æ dirstat éå¼ '%.*s'\n" + +# 注æä¿æåå¯¼ç©ºæ ¼ +#: diff.c:109 +#, c-format +msgid " Unknown dirstat parameter '%.*s'\n" +msgstr " æªç¥ dirstat åæ° '%.*s'\n" + +#: diff.c:208 +#, c-format +msgid "" +"Found errors in 'diff.dirstat' config variable:\n" +"%s" +msgstr "" +"é ç½®åé 'diff.dirstat' åºéï¼\n" +"%s" + +#: diff.c:3308 +#, c-format +msgid "" +"Failed to parse --dirstat/-X option parameter:\n" +"%s" +msgstr "" +"æ æ³è§£æ --dirstat/-X é项çåæ°ï¼\n" +"%s" + +#: gpg-interface.c:59 +msgid "could not run gpg." +msgstr "ä¸è½æ§è¡ gpgã" + +#: gpg-interface.c:71 +msgid "gpg did not accept the data" +msgstr "gpg 没ææ¥åæ°æ®" + +#: gpg-interface.c:82 +msgid "gpg failed to sign the data" +msgstr "gpg æ æ³ä¸ºæ°æ®ç¾å" + +#: help.c:309 +#, c-format +msgid "" +"'%s' appears to be a git command, but we were not\n" +"able to execute it. Maybe git-%s is broken?" +msgstr "" +"'%s' åæ¯ä¸ä¸ª git å½ä»¤ï¼ä½å´æ æ³è¿è¡ã\n" +"å¯è½æ¯ git-%s åæï¼" + +#: remote.c:1576 +#, 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" + +#: remote.c:1582 +#, c-format +msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" +msgid_plural "" +"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n" +msgstr[0] "æ¨çåæ¯è½å '%s' å ± %d 个æ交ï¼ä¸å¯ä»¥å¿«è¿å¼æ¨éã\n" + +#: remote.c:1590 +#, c-format +msgid "" +"Your branch and '%s' have diverged,\n" +"and have %d and %d different commit each, respectively.\n" +msgid_plural "" +"Your branch and '%s' have diverged,\n" +"and have %d and %d different commits each, respectively.\n" +msgstr[0] "" +"æ¨çåæ¯å '%s' åºç°äºå离ï¼\n" +"并ä¸åèªåå«æ %d å %d å¤ä¸åçæ交ã\n" + +#: sequencer.c:120 builtin/merge.c:862 builtin/merge.c:983 +#: builtin/merge.c:1093 builtin/merge.c:1103 +#, c-format +msgid "Could not open '%s' for writing" +msgstr "æ æ³ä¸ºåå ¥æå¼ '%s'" + +#: sequencer.c:122 builtin/merge.c:334 builtin/merge.c:865 +#: builtin/merge.c:1095 builtin/merge.c:1108 +#, c-format +msgid "Could not write to '%s'" +msgstr "æ æ³åå ¥ '%s'" + +#: sequencer.c:142 +msgid "" +"after resolving the conflicts, mark the corrected paths\n" +"with 'git add <paths>' or 'git rm <paths>'\n" +"and commit the result with 'git commit'" +msgstr "" +"å²çªè§£å³å®æ¯åï¼ç¨ 'git add <paths>' æ 'git rm <paths>'\n" +"对修æ£åçæ件åæ è®°ï¼ç¶åç¨ 'git commit' æ交" + +#: sequencer.c:154 sequencer.c:680 sequencer.c:763 +#, c-format +msgid "Could not write to %s" +msgstr "ä¸è½åå ¥ %s" + +#: sequencer.c:157 +#, c-format +msgid "Error wrapping up %s" +msgstr "é误æ¶å°¾ %s" + +#: sequencer.c:172 +msgid "Your local changes would be overwritten by cherry-pick." +msgstr "æ¨çæ¬å°ä¿®æ¹å°è¢«æ£éæä½è¦çã" + +#: sequencer.c:174 +msgid "Your local changes would be overwritten by revert." +msgstr "æ¨çæ¬å°ä¿®æ¹å°è¢«è¿åæä½è¦çã" + +#: sequencer.c:177 +msgid "Commit your changes or stash them to proceed." +msgstr "æ交æ¨çä¿®æ¹æä¿åè¿åº¦åå继ç»ã" + +#. TRANSLATORS: %s will be "revert" or "cherry-pick" +#: sequencer.c:227 +#, c-format +msgid "%s: Unable to write new index file" +msgstr "%sï¼æ æ³åå ¥æ°æååºæ件" + +#: sequencer.c:293 +msgid "Your index file is unmerged." +msgstr "æ¨çæååºæ件æªå®æå并ã" + +#: sequencer.c:296 +msgid "You do not have a valid HEAD" +msgstr "æ¨æ²¡æä¸ä¸ªææç HEAD" + +#: sequencer.c:311 +#, c-format +msgid "Commit %s is a merge but no -m option was given." +msgstr "æ交 %s æ¯ä¸ä¸ªå并æ交ä½æªæä¾ -m é项ã" + +#: sequencer.c:319 +#, c-format +msgid "Commit %s does not have parent %d" +msgstr "æ交 %s 没æç¶æ交 %d" + +#: sequencer.c:323 +#, 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:334 +#, c-format +msgid "%s: cannot parse parent commit %s" +msgstr "%sï¼ä¸è½è§£æç¶æ交 %s" + +#: sequencer.c:338 +#, c-format +msgid "Cannot get commit message for %s" +msgstr "ä¸è½å¾å° %s çæ交说æ" + +#: sequencer.c:422 +#, c-format +msgid "could not revert %s... %s" +msgstr "ä¸è½è¿å %s... %s" + +#: sequencer.c:423 +#, c-format +msgid "could not apply %s... %s" +msgstr "ä¸è½åºç¨ %s... %s" + +#: sequencer.c:445 sequencer.c:904 builtin/log.c:286 builtin/log.c:709 +#: builtin/log.c:1325 builtin/log.c:1544 builtin/merge.c:348 +#: builtin/shortlog.c:181 +msgid "revision walk setup failed" +msgstr "çæ¬éå设置失败" + +#: sequencer.c:448 +msgid "empty commit set passed" +msgstr "æä¾äºç©ºçæ交é" + +#: sequencer.c:456 +#, c-format +msgid "git %s: failed to read the index" +msgstr "git %s: æ æ³è¯»åæååº" + +#: sequencer.c:461 +#, c-format +msgid "git %s: failed to refresh the index" +msgstr "git %s: æ æ³å·æ°æååº" + +#: sequencer.c:546 +#, c-format +msgid "Cannot %s during a %s" +msgstr "æ æ³ %s å¨ %s è¿ç¨ä¸" + +#: sequencer.c:568 +#, c-format +msgid "Could not parse line %d." +msgstr "æ æ³è§£æ第 %d è¡ã" + +#: sequencer.c:573 +msgid "No commits parsed." +msgstr "æªææ交被解æã" + +#: sequencer.c:586 +#, c-format +msgid "Could not open %s" +msgstr "ä¸è½æå¼ %s" + +#: sequencer.c:590 +#, c-format +msgid "Could not read %s." +msgstr "ä¸è½è¯»å %sã" + +#: sequencer.c:597 +#, c-format +msgid "Unusable instruction sheet: %s" +msgstr "æ ç¨çæ令表åï¼%s" + +#: sequencer.c:625 +#, c-format +msgid "Invalid key: %s" +msgstr "æ æé®åï¼%s" + +#: sequencer.c:628 +#, c-format +msgid "Invalid value for %s: %s" +msgstr "æ æç %s å¼ï¼%s" + +#: sequencer.c:640 +#, c-format +msgid "Malformed options sheet: %s" +msgstr "éæ³çé项表åï¼%s" + +#: sequencer.c:661 +msgid "a cherry-pick or revert is already in progress" +msgstr "ä¸ä¸ªæ£éæè¿åæä½å·²å¨è¿è¡" + +#: sequencer.c:662 +msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" +msgstr "å°è¯ \"git cherry-pick (--continue | --quit | --abort)\"" + +#: sequencer.c:666 +#, c-format +msgid "Could not create sequencer directory %s" +msgstr "æ æ³å建åºåç®å½ %s" + +#: sequencer.c:682 sequencer.c:767 +#, c-format +msgid "Error wrapping up %s." +msgstr "é误æ¶å°¾ %sã" + +#: sequencer.c:701 sequencer.c:835 +msgid "no cherry-pick or revert in progress" +msgstr "没ææ£éæè¿åæä½å¨è¿è¡" + +#: sequencer.c:703 +msgid "cannot resolve HEAD" +msgstr "ä¸è½è§£æ HEAD" + +#: sequencer.c:705 +msgid "cannot abort from a branch yet to be born" +msgstr "ä¸è½ä»æªåå§åæ¯ç»æ¢" + +#: sequencer.c:727 +#, c-format +msgid "cannot open %s: %s" +msgstr "ä¸è½æå¼ %sï¼%s" + +#: sequencer.c:730 +#, c-format +msgid "cannot read %s: %s" +msgstr "ä¸è½è¯»å %sï¼%s" + +#: sequencer.c:731 +msgid "unexpected end of file" +msgstr "æªé¢æçæ件ç»æ" + +#: sequencer.c:737 +#, c-format +msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" +msgstr "ä¿åé¢æ£éæ交ç HEAD æ件 '%s' æå" + +#: sequencer.c:760 +#, c-format +msgid "Could not format %s." +msgstr "ä¸è½æ ¼å¼å %sã" + +#: sequencer.c:922 +msgid "Can't revert as initial commit" +msgstr "ä¸è½ä½ä¸ºåå§æ交è¿å" + +#: sequencer.c:923 +msgid "Can't cherry-pick into empty head" +msgstr "ä¸è½æ£éå°ç©ºåæ¯" + +#: wt-status.c:134 +msgid "Unmerged paths:" +msgstr "æªå并çè·¯å¾ï¼" + +# 注æä¿æåå¯¼ç©ºæ ¼ +#: wt-status.c:140 wt-status.c:157 +#, c-format +msgid " (use \"git reset %s <file>...\" to unstage)" +msgstr " ï¼ä½¿ç¨ \"git reset %s <file>...\" æ¤åºæååºï¼" + +# 注æä¿æåå¯¼ç©ºæ ¼ +#: wt-status.c:142 wt-status.c:159 +msgid " (use \"git rm --cached <file>...\" to unstage)" +msgstr " ï¼ä½¿ç¨ \"git rm --cached <file>...\" æ¤åºæååºï¼" + +# 注æä¿æåå¯¼ç©ºæ ¼ +#: wt-status.c:143 +msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" +msgstr " ï¼é æ ä½¿ç¨ \"git add/rm <file>...\" æ 记解å³æ¹æ¡ï¼" + +#: wt-status.c:151 +msgid "Changes to be committed:" +msgstr "è¦æ交çåæ´ï¼" + +#: wt-status.c:169 +msgid "Changes not staged for commit:" +msgstr "æªæåè³æ交çåæ´ï¼" + +# 注æä¿æåå¯¼ç©ºæ ¼ +#: wt-status.c:173 +msgid " (use \"git add <file>...\" to update what will be committed)" +msgstr " ï¼ä½¿ç¨ \"git add <file>...\" æ´æ°è¦æ交çå 容ï¼" + +# 注æä¿æåå¯¼ç©ºæ ¼ +#: wt-status.c:175 +msgid " (use \"git add/rm <file>...\" to update what will be committed)" +msgstr " ï¼ä½¿ç¨ \"git add/rm <file>...\" æ´æ°è¦æ交çå 容ï¼" + +# 注æä¿æåå¯¼ç©ºæ ¼ +#: wt-status.c:176 +msgid "" +" (use \"git checkout -- <file>...\" to discard changes in working directory)" +msgstr " ï¼ä½¿ç¨ \"git checkout -- <file>...\" 丢å¼å·¥ä½åºçæ¹å¨ï¼" + +# 注æä¿æåå¯¼ç©ºæ ¼ +#: wt-status.c:178 +msgid " (commit or discard the untracked or modified content in submodules)" +msgstr " ï¼æ交æ丢å¼å模ç»ä¸æªè·è¸ªæä¿®æ¹çå 容ï¼" + +#: wt-status.c:187 +#, c-format +msgid "%s files:" +msgstr "%sæ件ï¼" + +# 注æä¿æåå¯¼ç©ºæ ¼ +#: wt-status.c:190 +#, c-format +msgid " (use \"git %s <file>...\" to include in what will be committed)" +msgstr " ï¼ä½¿ç¨ \"git %s <file>...\" å å«å°æ交å表ï¼" + +#: wt-status.c:207 +msgid "bug" +msgstr "bug" + +#: wt-status.c:212 +msgid "both deleted:" +msgstr "åæ¹å é¤ï¼" + +#: wt-status.c:213 +msgid "added by us:" +msgstr "ç±æ们添å ï¼" + +#: wt-status.c:214 +msgid "deleted by them:" +msgstr "ç±ä»ä»¬å é¤ï¼" + +#: wt-status.c:215 +msgid "added by them:" +msgstr "ç±ä»ä»¬æ·»å ï¼" + +#: wt-status.c:216 +msgid "deleted by us:" +msgstr "ç±æ们å é¤ï¼" + +#: wt-status.c:217 +msgid "both added:" +msgstr "åæ¹æ·»å ï¼" + +#: wt-status.c:218 +msgid "both modified:" +msgstr "åæ¹ä¿®æ¹ï¼" + +#: wt-status.c:248 +msgid "new commits, " +msgstr "æ°æ交ï¼" + +#: wt-status.c:250 +msgid "modified content, " +msgstr "ä¿®æ¹çå 容ï¼" + +#: wt-status.c:252 +msgid "untracked content, " +msgstr "æªè·è¸ªçå 容ï¼" + +# 为ä¿è¯å¨è¾åºä¸å¯¹é½ï¼æ³¨æè°æ´å¥ä¸ç©ºæ ¼ï¼ +#: wt-status.c:266 +#, c-format +msgid "new file: %s" +msgstr "æ°æä»¶ï¼ %s" + +# 为ä¿è¯å¨è¾åºä¸å¯¹é½ï¼æ³¨æè°æ´å¥ä¸ç©ºæ ¼ï¼ +#: wt-status.c:269 +#, c-format +msgid "copied: %s -> %s" +msgstr "æ·è´ï¼ %s -> %s" + +# 为ä¿è¯å¨è¾åºä¸å¯¹é½ï¼æ³¨æè°æ´å¥ä¸ç©ºæ ¼ï¼ +#: wt-status.c:272 +#, c-format +msgid "deleted: %s" +msgstr "å é¤ï¼ %s" + +# 为ä¿è¯å¨è¾åºä¸å¯¹é½ï¼æ³¨æè°æ´å¥ä¸ç©ºæ ¼ï¼ +#: wt-status.c:275 +#, c-format +msgid "modified: %s" +msgstr "ä¿®æ¹ï¼ %s" + +# 为ä¿è¯å¨è¾åºä¸å¯¹é½ï¼æ³¨æè°æ´å¥ä¸ç©ºæ ¼ï¼ +#: wt-status.c:278 +#, c-format +msgid "renamed: %s -> %s" +msgstr "éå½åï¼ %s -> %s" + +# 为ä¿è¯å¨è¾åºä¸å¯¹é½ï¼æ³¨æè°æ´å¥ä¸ç©ºæ ¼ï¼ +#: wt-status.c:281 +#, c-format +msgid "typechange: %s" +msgstr "ç±»ååæ´ï¼ %s" + +# 为ä¿è¯å¨è¾åºä¸å¯¹é½ï¼æ³¨æè°æ´å¥ä¸ç©ºæ ¼ï¼ +#: wt-status.c:284 +#, c-format +msgid "unknown: %s" +msgstr "æªç¥ï¼ %s" + +# 为ä¿è¯å¨è¾åºä¸å¯¹é½ï¼æ³¨æè°æ´å¥ä¸ç©ºæ ¼ï¼ +#: wt-status.c:287 +#, c-format +msgid "unmerged: %s" +msgstr "æªåå¹¶ï¼ %s" + +#: wt-status.c:290 +#, c-format +msgid "bug: unhandled diff status %c" +msgstr "bug: æªå¤ççå·®å¼ç¶æ %c" + +#: wt-status.c:713 +msgid "On branch " +msgstr "ä½äºåæ¯ " + +#: wt-status.c:720 +msgid "Not currently on any branch." +msgstr "å½åä¸å¨ä»»ä½åæ¯ä¸ã" + +#: wt-status.c:731 +msgid "Initial commit" +msgstr "åå§æ交" + +#: wt-status.c:745 +msgid "Untracked" +msgstr "æªè·è¸ªç" + +#: wt-status.c:747 +msgid "Ignored" +msgstr "忽ç¥ç" + +#: wt-status.c:749 +#, c-format +msgid "Untracked files not listed%s" +msgstr "æªè·è¸ªçæ件没æååº%s" + +# 注æä¿æåå¯¼ç©ºæ ¼ +#: wt-status.c:751 +msgid " (use -u option to show untracked files)" +msgstr " ï¼ä½¿ç¨ -u åæ°æ¾ç¤ºæªè·è¸ªçæ件ï¼" + +#: wt-status.c:757 +msgid "No changes" +msgstr "没æä¿®æ¹" + +#: wt-status.c:761 +#, c-format +msgid "no changes added to commit%s\n" +msgstr "ä¿®æ¹å°æªå å ¥æ交%s\n" + +# 注æä¿æåå¯¼ç©ºæ ¼ +#: wt-status.c:763 +msgid " (use \"git add\" and/or \"git commit -a\")" +msgstr " ï¼ä½¿ç¨ \"git add\" å/æ \"git commit -a\"ï¼" + +#: wt-status.c:765 +#, c-format +msgid "nothing added to commit but untracked files present%s\n" +msgstr "空æ交ä½åå¨æªè·è¸ªæ件%s\n" + +# 注æä¿æåå¯¼ç©ºæ ¼ +#: wt-status.c:767 +msgid " (use \"git add\" to track)" +msgstr " ï¼ä½¿ç¨ \"git add\" 建ç«è·è¸ªï¼" + +#: wt-status.c:769 wt-status.c:772 wt-status.c:775 +#, c-format +msgid "nothing to commit%s\n" +msgstr "æ é¡»æ交%s\n" + +# 注æä¿æåå¯¼ç©ºæ ¼ +#: wt-status.c:770 +msgid " (create/copy files and use \"git add\" to track)" +msgstr " ï¼æ°å»º/æ·è´çæä»¶ä½¿ç¨ \"git add\" 建ç«è·è¸ªï¼" + +# 注æä¿æåå¯¼ç©ºæ ¼ +#: wt-status.c:773 +msgid " (use -u to show untracked files)" +msgstr " ï¼ä½¿ç¨ -u æ¾ç¤ºæªè·è¸ªæ件ï¼" + +# 注æä¿æåå¯¼ç©ºæ ¼ +#: wt-status.c:776 +msgid " (working directory clean)" +msgstr " ï¼å¹²åçå·¥ä½åºï¼" + +#: wt-status.c:884 +msgid "HEAD (no branch)" +msgstr "头ï¼éåæ¯ï¼" + +# 注æä¿æå¥å°¾ç©ºæ ¼ +#: wt-status.c:890 +msgid "Initial commit on " +msgstr "åå§æäº¤äº " + +# 注æä¿æå¥å°¾ç©ºæ ¼ +#: wt-status.c:905 +msgid "behind " +msgstr "è½å " + +# 注æä¿æå¥å°¾ç©ºæ ¼ +#: wt-status.c:908 wt-status.c:911 +msgid "ahead " +msgstr "é¢å " + +# 注æä¿æå¥å°¾ç©ºæ ¼ +#: wt-status.c:913 +msgid ", behind " +msgstr "ï¼è½å " + +#: builtin/add.c:62 +#, c-format +msgid "unexpected diff status %c" +msgstr "æå¤çå·®å¼ç¶æ %c" + +#: builtin/add.c:67 builtin/commit.c:298 +msgid "updating files failed" +msgstr "æ´æ°æ件失败" + +#: builtin/add.c:77 +#, c-format +msgid "remove '%s'\n" +msgstr "å é¤ '%s'\n" + +#: builtin/add.c:176 +#, c-format +msgid "Path '%s' is in submodule '%.*s'" +msgstr "è·¯å¾ '%s' å±äºæ¨¡ç» '%.*s'" + +#: builtin/add.c:192 +msgid "Unstaged changes after refreshing the index:" +msgstr "å·æ°æååºåæªæåçåæ´ï¼" + +#: builtin/add.c:195 builtin/add.c:456 builtin/rm.c:186 +#, c-format +msgid "pathspec '%s' did not match any files" +msgstr "è·¯å¾ '%s' æªå¹é ä»»ä½æ件" + +#: builtin/add.c:209 +#, c-format +msgid "'%s' is beyond a symbolic link" +msgstr "'%s' ä½äºç¬¦å·é¾æ¥ä¸" + +#: builtin/add.c:276 +msgid "Could not read the index" +msgstr "æ æ³è¯»åæååº" + +#: builtin/add.c:286 +#, c-format +msgid "Could not open '%s' for writing." +msgstr "æ æ³æå¼ '%s' 以åå ¥ã" + +#: builtin/add.c:290 +msgid "Could not write patch" +msgstr "æ æ³åè¡¥ä¸" + +#: builtin/add.c:295 +#, c-format +msgid "Could not stat '%s'" +msgstr "æ æ³æ¥çæ件ç¶æ '%s'" + +#: builtin/add.c:297 +msgid "Empty patch. Aborted." +msgstr "空补ä¸ãå¼å¸¸ç»æ¢ã" + +#: builtin/add.c:303 +#, c-format +msgid "Could not apply '%s'" +msgstr "æ æ³åºç¨ '%s'" + +#: builtin/add.c:312 +msgid "The following paths are ignored by one of your .gitignore files:\n" +msgstr "ä¸åè·¯å¾è¢«æ¨çä¸ä¸ª .gitignore æ件æ忽ç¥ï¼\n" + +#: builtin/add.c:352 +#, c-format +msgid "Use -f if you really want to add them.\n" +msgstr "ä½¿ç¨ -f åæ°å¦æä½ ç¡®å®è¦æ·»å å®ä»¬ã\n" + +#: builtin/add.c:353 +msgid "no files added" +msgstr "没ææ件被添å " + +#: builtin/add.c:359 +msgid "adding files failed" +msgstr "æ·»å æ件失败" + +#: builtin/add.c:391 +msgid "-A and -u are mutually incompatible" +msgstr "-A å -u é项äºæ¥" + +#: builtin/add.c:393 +msgid "Option --ignore-missing can only be used together with --dry-run" +msgstr "é项 --ignore-missing åªè½å --dry-run å ±ç¨" + +#: builtin/add.c:413 +#, c-format +msgid "Nothing specified, nothing added.\n" +msgstr "æªæä¾åæ°ï¼æ²¡ææ件被添å ã\n" + +#: builtin/add.c:414 +#, c-format +msgid "Maybe you wanted to say 'git add .'?\n" +msgstr "ä¹è®¸æ¨æ³è¦æ§è¡ 'git add .'ï¼\n" + +#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:358 builtin/mv.c:82 +#: builtin/rm.c:162 +msgid "index file corrupt" +msgstr "æååºæ件æå" + +#: builtin/add.c:476 builtin/mv.c:229 builtin/rm.c:260 +msgid "Unable to write new index file" +msgstr "æ æ³åå ¥æ°æååºæ件" + +#: builtin/archive.c:17 +#, c-format +msgid "could not create archive file '%s'" +msgstr "æ æ³å建å½æ¡£æ件 '%s'" + +#: builtin/archive.c:20 +msgid "could not redirect output" +msgstr "æ æ³éå®åè¾åº" + +#: builtin/archive.c:37 +msgid "git archive: Remote with no URL" +msgstr "git archive: æªæä¾è¿ç¨URL" + +#: builtin/archive.c:58 +msgid "git archive: expected ACK/NAK, got EOF" +msgstr "git archive: æå¾ ACK/NACKï¼å´å¾å°EOF" + +#: builtin/archive.c:63 +#, c-format +msgid "git archive: NACK %s" +msgstr "git archive: NACK %s" + +#: builtin/archive.c:65 +#, c-format +msgid "remote error: %s" +msgstr "è¿ç¨é误ï¼%s" + +#: builtin/archive.c:66 +msgid "git archive: protocol error" +msgstr "git archive: åè®®é误" + +#: builtin/archive.c:71 +msgid "git archive: expected a flush" +msgstr "git archive: é¢æä¸ä¸ªå·æ°" + +#: builtin/branch.c:137 +#, c-format +msgid "" +"deleting branch '%s' that has been merged to\n" +" '%s', but not yet merged to HEAD." +msgstr "" +"è¦å é¤çåæ¯ '%s' å·²ç»å并å°\n" +" '%s'ï¼ä½æªåå¹¶å° HEADã" + +#: builtin/branch.c:141 +#, c-format +msgid "" +"not deleting branch '%s' that is not yet merged to\n" +" '%s', even though it is merged to HEAD." +msgstr "" +"ä¸è¦å é¤åæ¯ '%s' å ¶å°æªå并å°\n" +" '%s'ï¼è½ç¶å®å·²ç»åå¹¶å° HEADã" + +# æ±åä¹é´æ ç©ºæ ¼ï¼æ å é¤å°¾é¨ç©ºæ ¼ +#. TRANSLATORS: This is "remote " in "remote branch '%s' not found" +#: builtin/branch.c:163 +msgid "remote " +msgstr "è¿ç¨" + +#: builtin/branch.c:171 +msgid "cannot use -a with -d" +msgstr "ä¸è½å° -a å -d å ±ç¨" + +#: builtin/branch.c:177 +msgid "Couldn't look up commit object for HEAD" +msgstr "æ æ³æ¥è¯¢ HEAD æåçæ交对象" + +#: builtin/branch.c:182 +#, c-format +msgid "Cannot delete the branch '%s' which you are currently on." +msgstr "æ æ³å é¤æ¨å½åæå¨çåæ¯ '%s'ã" + +#: builtin/branch.c:192 +#, c-format +msgid "%sbranch '%s' not found." +msgstr "%såæ¯ '%s' æªåç°ã" + +#: builtin/branch.c:200 +#, c-format +msgid "Couldn't look up commit object for '%s'" +msgstr "æ æ³æ¥è¯¢ '%s' æåçæ交对象" + +#: builtin/branch.c:206 +#, 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:214 +#, c-format +msgid "Error deleting %sbranch '%s'" +msgstr "é误å é¤ %såæ¯ '%s'" + +#: builtin/branch.c:219 +#, c-format +msgid "Deleted %sbranch %s (was %s).\n" +msgstr "å·²å é¤ %såæ¯ %sï¼æ¾ä¸º %sï¼ã\n" + +#: builtin/branch.c:224 +msgid "Update of config-file failed" +msgstr "æ æ³æ´æ° config æ件" + +#: builtin/branch.c:322 +#, c-format +msgid "branch '%s' does not point at a commit" +msgstr "åæ¯ '%s' æªæåä¸ä¸ªæ交" + +# 注æä¿æå¥å°¾ç©ºæ ¼ +#: builtin/branch.c:394 +#, c-format +msgid "behind %d] " +msgstr "è½å %d] " + +# 注æä¿æå¥å°¾ç©ºæ ¼ +#: builtin/branch.c:396 +#, c-format +msgid "ahead %d] " +msgstr "é¢å %d] " + +# 注æä¿æå¥å°¾ç©ºæ ¼ +#: builtin/branch.c:398 +#, c-format +msgid "ahead %d, behind %d] " +msgstr "é¢å %dï¼è½å %d] " + +#: builtin/branch.c:501 +msgid "(no branch)" +msgstr "ï¼éåæ¯ï¼" + +#: builtin/branch.c:562 +msgid "some refs could not be read" +msgstr "ä¸äºå¼ç¨æ æ³è¯»å" + +#: builtin/branch.c:575 +msgid "cannot rename the current branch while not on any." +msgstr "æ æ³éå½åä¸åå¨çå½ååæ¯ã" + +#: builtin/branch.c:585 +#, c-format +msgid "Invalid branch name: '%s'" +msgstr "æ æçåæ¯åï¼'%s'" + +#: builtin/branch.c:600 +msgid "Branch rename failed" +msgstr "åæ¯éå½å失败" + +#: builtin/branch.c:604 +#, c-format +msgid "Renamed a misnamed branch '%s' away" +msgstr "éå½åæä¸ä¸ªé误å½åçæ§åæ¯ '%s'" + +#: builtin/branch.c:608 +#, c-format +msgid "Branch renamed to %s, but HEAD is not updated!" +msgstr "åæ¯éå½å为 %sï¼ä½ HEAD 没ææ´æ°ï¼" + +#: builtin/branch.c:615 +msgid "Branch is renamed, but update of config-file failed" +msgstr "åæ¯è¢«éå½åï¼ä½æ´æ° config æ件失败" + +#: builtin/branch.c:630 +#, c-format +msgid "malformed object name %s" +msgstr "éæ³ç对象å %s" + +#: builtin/branch.c:654 +#, c-format +msgid "could not write branch description template: %s\n" +msgstr "ä¸è½ååæ¯æ述模çï¼%s\n" + +#: builtin/branch.c:742 +msgid "Failed to resolve HEAD as a valid ref." +msgstr "æ æ³å° HEAD 解æ为ææå¼ç¨ã" + +#: builtin/branch.c:747 builtin/clone.c:570 +msgid "HEAD not found below refs/heads!" +msgstr "æªå¨ /refs/heads ä¸åç° HEADï¼" + +#: builtin/branch.c:805 +msgid "-a and -r options to 'git branch' do not make sense with a branch name" +msgstr "'git branch' ç -a å -r é项带ä¸ä¸ªåæ¯ååæ°æ²¡ææä¹" + +#: builtin/bundle.c:47 +#, c-format +msgid "%s is okay\n" +msgstr "%s å¯ä»¥\n" + +#: builtin/bundle.c:56 +msgid "Need a repository to create a bundle." +msgstr "éè¦ä¸ä¸ªçæ¬åºæ¥å建å " + +#: builtin/bundle.c:60 +msgid "Need a repository to unbundle." +msgstr "éè¦ä¸ä¸ªçæ¬åºæ¥è§£å " + +#: builtin/checkout.c:113 builtin/checkout.c:146 +#, c-format +msgid "path '%s' does not have our version" +msgstr "è·¯å¾ '%s' 没ææ们ççæ¬" + +#: builtin/checkout.c:115 builtin/checkout.c:148 +#, c-format +msgid "path '%s' does not have their version" +msgstr "è·¯å¾ '%s' 没æä»ä»¬ççæ¬" + +#: builtin/checkout.c:131 +#, c-format +msgid "path '%s' does not have all necessary versions" +msgstr "è·¯å¾ '%s' 没æå ¨é¨å¿ é¡»ççæ¬" + +#: builtin/checkout.c:175 +#, c-format +msgid "path '%s' does not have necessary versions" +msgstr "è·¯å¾ '%s' 没æå¿ é¡»ççæ¬" + +#: builtin/checkout.c:192 +#, c-format +msgid "path '%s': cannot merge" +msgstr "path '%s': æ æ³å并" + +#: builtin/checkout.c:209 +#, c-format +msgid "Unable to add merge result for '%s'" +msgstr "æ æ³ä¸º '%s' æ·»å å并ç»æ" + +#: builtin/checkout.c:212 builtin/reset.c:158 +#, c-format +msgid "make_cache_entry failed for path '%s'" +msgstr "å¯¹è·¯å¾ '%s' ç make_cache_entry æä½å¤±è´¥" + +#: builtin/checkout.c:234 builtin/checkout.c:392 +msgid "corrupt index file" +msgstr "å²çªçæååºæ件" + +#: builtin/checkout.c:264 builtin/checkout.c:271 +#, c-format +msgid "path '%s' is unmerged" +msgstr "è·¯å¾ '%s' æªå并" + +#: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:595 +#: builtin/merge.c:809 +msgid "unable to write new index file" +msgstr "æ æ³åæ°çæååºæ件" + +#: builtin/checkout.c:319 builtin/diff.c:298 builtin/merge.c:406 +msgid "diff_setup_done failed" +msgstr "diff_setup_done 失败" + +#: builtin/checkout.c:414 +msgid "you need to resolve your current index first" +msgstr "æ¨éè¦å 解å³å½åæååºçå²çª" + +#: builtin/checkout.c:533 +#, c-format +msgid "Can not do reflog for '%s'\n" +msgstr "ä¸è½å¯¹ '%s' ä¿åå¼ç¨æ¥å¿\n" + +#: builtin/checkout.c:565 +msgid "HEAD is now at" +msgstr "HEAD ç®åä½äº" + +#: builtin/checkout.c:572 +#, c-format +msgid "Reset branch '%s'\n" +msgstr "éç½®åæ¯ '%s'\n" + +#: builtin/checkout.c:575 +#, c-format +msgid "Already on '%s'\n" +msgstr "å·²ç»ä½äº '%s'\n" + +#: builtin/checkout.c:579 +#, c-format +msgid "Switched to and reset branch '%s'\n" +msgstr "åæ¢å¹¶éç½®åæ¯ '%s'\n" + +#: builtin/checkout.c:581 +#, c-format +msgid "Switched to a new branch '%s'\n" +msgstr "åæ¢å°ä¸ä¸ªæ°åæ¯ '%s'\n" + +#: builtin/checkout.c:583 +#, c-format +msgid "Switched to branch '%s'\n" +msgstr "åæ¢å°åæ¯ '%s'\n" + +# 注æä¿æåå¯¼ç©ºæ ¼ +#: builtin/checkout.c:639 +#, c-format +msgid " ... and %d more.\n" +msgstr " ... å %d æ´å¤ã\n" + +#. The singular version +#: builtin/checkout.c:645 +#, c-format +msgid "" +"Warning: you are leaving %d commit behind, not connected to\n" +"any of your branches:\n" +"\n" +"%s\n" +msgid_plural "" +"Warning: you are leaving %d commits behind, not connected to\n" +"any of your branches:\n" +"\n" +"%s\n" +msgstr[0] "" +"è¦åï¼æ¨æ£ä¸¢ä¸ %d 个æ交ï¼æªåä»»ä½åæ¯å ³èï¼\n" +"\n" +"%s\n" + +#: builtin/checkout.c:663 +#, c-format +msgid "" +"If you want to keep them by creating a new branch, this may be a good time\n" +"to do so with:\n" +"\n" +" git branch new_branch_name %s\n" +"\n" +msgstr "" +"å¦ææ¨æ³è¦éè¿å建æ°åæ¯ä¿åä»ä»¬ï¼è¿å¯è½æ¯ä¸ä¸ªå¥½æ¶åã\n" +"å¦ä¸æä½ï¼\n" +"\n" +" git branch new_branch_name %s\n" +"\n" + +#: builtin/checkout.c:692 +msgid "internal error in revision walk" +msgstr "å¨çæ¬éåæ¶éå°å é¨é误" + +#: builtin/checkout.c:696 +msgid "Previous HEAD position was" +msgstr "ä¹åç HEAD ä½ç½®æ¯" + +#: builtin/checkout.c:722 +msgid "You are on a branch yet to be born" +msgstr "æ¨ä½äºä¸ä¸ªæªåå§åçåæ¯" + +#. case (1) +#: builtin/checkout.c:853 +#, c-format +msgid "invalid reference: %s" +msgstr "æ æå¼ç¨ï¼%s" + +#. case (1): want a tree +#: builtin/checkout.c:892 +#, c-format +msgid "reference is not a tree: %s" +msgstr "å¼ç¨ä¸æ¯ä¸ä¸ªæ ï¼%s" + +#: builtin/checkout.c:961 +msgid "-B cannot be used with -b" +msgstr "-B ä¸è½å -b å ±ç¨" + +#: builtin/checkout.c:970 +msgid "--patch is incompatible with all other options" +msgstr "--patch é项åå ¶ä»é项ä¸å ¼å®¹" + +#: builtin/checkout.c:973 +msgid "--detach cannot be used with -b/-B/--orphan" +msgstr "--detach ä¸è½å -b/-B/--orphan å ±ç¨" + +#: builtin/checkout.c:975 +msgid "--detach cannot be used with -t" +msgstr "--detach ä¸è½å -t å ±ç¨" + +#: builtin/checkout.c:981 +msgid "--track needs a branch name" +msgstr "--track éè¦ä¸ä¸ªåæ¯å" + +#: builtin/checkout.c:988 +msgid "Missing branch name; try -b" +msgstr "缺å°åæ¯åï¼å°è¯ -b" + +#: builtin/checkout.c:994 +msgid "--orphan and -b|-B are mutually exclusive" +msgstr "--orphan å -b|-B äºæ¥" + +#: builtin/checkout.c:996 +msgid "--orphan cannot be used with -t" +msgstr "--orphan ä¸è½å -t å ±ç¨" + +#: builtin/checkout.c:1006 +msgid "git checkout: -f and -m are incompatible" +msgstr "git checkout: -f å -m ä¸å ¼å®¹" + +#: builtin/checkout.c:1040 +msgid "invalid path specification" +msgstr "æ æçè·¯å¾" + +#: builtin/checkout.c:1048 +#, c-format +msgid "" +"git checkout: updating paths is incompatible with switching branches.\n" +"Did you intend to checkout '%s' which can not be resolved as commit?" +msgstr "" +"git checkout: æ´æ°è·¯å¾ååæ¢åæ¯ä¸å ¼å®¹ã\n" +"æ¨æ¯æ³è¦æ£åº '%s' ä½æªè½å°å ¶è§£æ为æ交ä¹ï¼" + +#: builtin/checkout.c:1050 +msgid "git checkout: updating paths is incompatible with switching branches." +msgstr "git checkout: æ´æ°è·¯å¾ååæ¢åæ¯ä¸å ¼å®¹ã" + +#: builtin/checkout.c:1055 +msgid "git checkout: --detach does not take a path argument" +msgstr "git checkout: --detach ä¸è·è·¯å¾åæ°" + +#: builtin/checkout.c:1058 +msgid "" +"git checkout: --ours/--theirs, --force and --merge are incompatible when\n" +"checking out of the index." +msgstr "" +"git checkout: --ours/--theirs, --force å --merge ä¸å ¼å®¹å½\n" +"æ£åºæååºæ¶ã" + +#: builtin/checkout.c:1077 +msgid "Cannot switch branch to a non-commit." +msgstr "æ æ³åæ¢åæ¯å°ä¸ä¸ªéæ交ã" + +#: builtin/checkout.c:1080 +msgid "--ours/--theirs is incompatible with switching branches." +msgstr "--ours/--theirs ååæ¢åæ¯ä¸å ¼å®¹ã" + +#: builtin/clean.c:78 +msgid "-x and -X cannot be used together" +msgstr "-x å -X ä¸è½å ±ç¨" + +#: builtin/clean.c:82 +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 +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:246 +#, c-format +msgid "reference repository '%s' is not a local directory." +msgstr "å¼ç¨çæ¬åº '%s' ä¸æ¯ä¸ä¸ªæ¬å°ç®å½ã" + +#: builtin/clone.c:313 +#, c-format +msgid "failed to open '%s'" +msgstr "æå¼ '%s' 失败" + +#: builtin/clone.c:317 +#, c-format +msgid "failed to create directory '%s'" +msgstr "å建ç®å½ '%s' 失败" + +#: builtin/clone.c:319 builtin/diff.c:75 +#, c-format +msgid "failed to stat '%s'" +msgstr "æ举 '%s' ç¶æ失败" + +#: builtin/clone.c:321 +#, c-format +msgid "%s exists and is not a directory" +msgstr "%s åå¨ä¸ä¸æ¯ä¸ä¸ªç®å½" + +#: builtin/clone.c:335 +#, c-format +msgid "failed to stat %s\n" +msgstr "æ举 %s ç¶æ失败\n" + +#: builtin/clone.c:352 +#, c-format +msgid "failed to unlink '%s'" +msgstr "å é¤ '%s' 失败" + +#: builtin/clone.c:357 +#, c-format +msgid "failed to create link '%s'" +msgstr "å建é¾æ¥ '%s' 失败" + +#: builtin/clone.c:361 +#, c-format +msgid "failed to copy file to '%s'" +msgstr "æ·è´æä»¶è³ '%s' 失败" + +#: builtin/clone.c:384 +#, c-format +msgid "done.\n" +msgstr "å®æã\n" + +#: builtin/clone.c:451 +#, c-format +msgid "Could not find remote branch %s to clone." +msgstr "æ æ³åç°è¦å éçè¿ç¨åæ¯ %sã" + +#: builtin/clone.c:561 +msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" +msgstr "è¿ç¨ HEAD æåä¸ä¸ªä¸åå¨çå¼ç¨ï¼æ æ³æ£åºã\n" + +#: builtin/clone.c:651 +msgid "Too many arguments." +msgstr "太å¤åæ°ã" + +#: builtin/clone.c:655 +msgid "You must specify a repository to clone." +msgstr "ä½ å¿ é¡»æå®ä¸ä¸ªçæ¬åºæ¥å é" + +#: builtin/clone.c:666 +#, c-format +msgid "--bare and --origin %s options are incompatible." +msgstr "--bare å --origin %s é项ä¸å ¼å®¹ã" + +#: builtin/clone.c:680 +#, c-format +msgid "repository '%s' does not exist" +msgstr "çæ¬åº '%s' ä¸åå¨" + +#: builtin/clone.c:685 +msgid "--depth is ignored in local clones; use file:// instead." +msgstr "--depth å¨æ¬å°å é被忽ç¥ï¼æ¹ä¸º file:// åè®®è¯è¯ã" + +#: builtin/clone.c:695 +#, c-format +msgid "destination path '%s' already exists and is not an empty directory." +msgstr "ç®æ è·¯å¾ '%s' å·²ç»åå¨ä¸ä¸æ¯ä¸ä¸ªç©ºç®å½ã" + +#: builtin/clone.c:705 +#, c-format +msgid "working tree '%s' already exists." +msgstr "å·¥ä½åº '%s' å·²ç»åå¨ã" + +#: builtin/clone.c:718 builtin/clone.c:732 +#, c-format +msgid "could not create leading directories of '%s'" +msgstr "æ æ³ä¸º '%s' å建ç®å½" + +#: builtin/clone.c:721 +#, c-format +msgid "could not create work tree dir '%s'." +msgstr "æ æ³ä¸º '%s' å建工ä½åºç®å½ã" + +#: builtin/clone.c:740 +#, c-format +msgid "Cloning into bare repository '%s'...\n" +msgstr "å éå°è£¸çæ¬åº '%s'...\n" + +#: builtin/clone.c:742 +#, c-format +msgid "Cloning into '%s'...\n" +msgstr "æ£å éå° '%s'...\n" + +#: builtin/clone.c:798 +#, c-format +msgid "Don't know how to clone %s" +msgstr "ä¸ç¥éå¦ä½å é %s" + +#: builtin/clone.c:847 +#, c-format +msgid "Remote branch %s not found in upstream %s" +msgstr "è¿ç¨åæ¯ %s å¨ä¸æ¸¸ %s æªåç°" + +#: builtin/clone.c:854 +msgid "You appear to have cloned an empty repository." +msgstr "æ¨ä¼¼ä¹å éäºä¸ä¸ªç©ºçæ¬åºã" + +#: builtin/commit.c:42 +msgid "" +"Your name and email address were configured automatically based\n" +"on your username and hostname. Please check that they are accurate.\n" +"You can suppress this message by setting them explicitly:\n" +"\n" +" git config --global user.name \"Your Name\"\n" +" git config --global user.email you@example.com\n" +"\n" +"After doing this, you may fix the identity used for this commit with:\n" +"\n" +" git commit --amend --reset-author\n" +msgstr "" +"æ¨çå§ååé®ä»¶å°åä¼åºäºæ¨çç¨æ·åå主æºå°åèªå¨é ç½®ã请æ£æ¥å®ä»¬\n" +"æ£ç¡®ä¸å¦ãæ¨å¯éè¿ä¸é¢å½ä»¤å¯¹å ¶æ¾å¼å£°æ以é¿å éå¤åºç°ç±»ä¼¼æ示ï¼\n" +"\n" +" git config --global user.name \"Your Name\"\n" +" git config --global user.email you@example.com\n" +"\n" +"设置å®æ¯åï¼æ¨å¯ç¨ä¸é¢å½ä»¤æ¥æ´æ¹æ¤æ¬¡æ交æ使ç¨çç¨æ·IDï¼\n" +"\n" +" git commit --amend --reset-author\n" + +#: builtin/commit.c:54 +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" +"remove the commit entirely with \"git reset HEAD^\".\n" +msgstr "" +"æ¨è¦æ±ä¿®è¡¥æè¿çæ交ï¼ä½è¿ä¹åä¼é æ空æ交ãæ¨å¯éå¤æ¨çå½ä»¤å¹¶å¸¦ä¸\n" +"--allow-empty é项ï¼æè æ¨å¯ä»¥æ´ä¸ªå é¤è¯¥æäº¤ç¨ \"git reset HEAD^\"ã\n" + +#: builtin/commit.c:59 +msgid "" +"The previous cherry-pick is now empty, possibly due to conflict resolution.\n" +"If you wish to commit it anyway, use:\n" +"\n" +" git commit --allow-empty\n" +"\n" +"Otherwise, please use 'git reset'\n" +msgstr "" +"ä¹åçæ£éæä½ç°å¨ä¸ºç©ºï¼å¯è½æ¯ç±å²çªè§£å³å¯¼è´çãå¦ææ¨æ³ç»§ç»æ交ï¼ç¨ï¼\n" +"\n" +" git commit --allow-empty\n" +"\n" +"å¦åï¼è¯·ç¨ 'git reset'\n" + +#: builtin/commit.c:205 builtin/reset.c:33 +msgid "merge" +msgstr "å并" + +#: builtin/commit.c:208 +msgid "cherry-pick" +msgstr "æ£é" + +#: builtin/commit.c:325 +msgid "failed to unpack HEAD tree object" +msgstr "解å HEAD æ 对象失败" + +#: builtin/commit.c:367 +msgid "unable to create temporary index" +msgstr "ä¸è½å建临æ¶æååº" + +#: builtin/commit.c:373 +msgid "interactive add failed" +msgstr "交äºå¼æ·»å 失败" + +#: builtin/commit.c:406 builtin/commit.c:427 builtin/commit.c:473 +msgid "unable to write new_index file" +msgstr "æ æ³åå ¥æ°æååºæ件" + +# %sè¥ç¿»ä¸ºä¸æï¼ååä¸éè¦ç©ºæ ¼ +#: builtin/commit.c:457 +#, c-format +msgid "cannot do a partial commit during a %s." +msgstr "å¨%sè¿ç¨ä¸ä¸è½åé¨åæ交ã" + +#: builtin/commit.c:466 +msgid "cannot read the index" +msgstr "æ æ³è¯»åæååº" + +#: builtin/commit.c:486 +msgid "unable to write temporary index file" +msgstr "æ æ³å临æ¶æååºæ件" + +#: builtin/commit.c:550 builtin/commit.c:556 +#, c-format +msgid "invalid commit: %s" +msgstr "æ æçæ交ï¼%s" + +#: builtin/commit.c:579 +msgid "malformed --author parameter" +msgstr "éæ³ç --author åæ°" + +#: builtin/commit.c:635 +#, c-format +msgid "Malformed ident string: '%s'" +msgstr "éæ³çè¯å«å串ï¼'%s'" + +#: builtin/commit.c:670 builtin/commit.c:703 builtin/commit.c:1000 +#, c-format +msgid "could not lookup commit %s" +msgstr "ä¸è½æ¥è¯¢æ交 %s" + +#: builtin/commit.c:682 builtin/shortlog.c:296 +#, c-format +msgid "(reading log message from standard input)\n" +msgstr "ï¼æ£ä»æ åè¾å ¥ä¸è¯»å说æä¿¡æ¯ï¼\n" + +#: builtin/commit.c:684 +msgid "could not read log from standard input" +msgstr "æ æ³ä»æ åè¾å ¥ä¸è¯»å说æä¿¡æ¯" + +#: builtin/commit.c:688 +#, c-format +msgid "could not read log file '%s'" +msgstr "æ æ³è¯»å说ææ件 '%s'" + +#: builtin/commit.c:694 +msgid "commit has empty message" +msgstr "æ交说æ为空" + +#: builtin/commit.c:710 +msgid "could not read MERGE_MSG" +msgstr "æ æ³è¯»å MERGE_MSG" + +#: builtin/commit.c:714 +msgid "could not read SQUASH_MSG" +msgstr "æ æ³è¯»å SQUASH_MSG" + +#: builtin/commit.c:718 +#, c-format +msgid "could not read '%s'" +msgstr "æ æ³è¯»å '%s'" + +#: builtin/commit.c:746 +#, c-format +msgid "could not open '%s'" +msgstr "æ æ³æå¼ '%s'" + +#: builtin/commit.c:770 +msgid "could not write commit template" +msgstr "æ æ³åæ交模ç" + +# %sè¥ç¿»ä¸ºä¸æï¼ååä¸éè¦ç©ºæ ¼ +#: builtin/commit.c:783 +#, c-format +msgid "" +"\n" +"It looks like you may be committing a %s.\n" +"If this is not correct, please remove the file\n" +"\t%s\n" +"and try again.\n" +msgstr "" +"\n" +"çèµ·æ¥æ¨æ£å¨æ交ä¸ä¸ª%sã\n" +"å¦æä¸æ¯è¿æ ·ï¼è¯·å é¤æ件\n" +"\t%s\n" +"ç¶åéè¯ã\n" + +# 注æä¿æåå¯¼ç©ºæ ¼ +#: builtin/commit.c:796 +msgid "Please enter the commit message for your changes." +msgstr "请为æ¨çä¿®æ¹è¾å ¥æ交说æã" + +#: builtin/commit.c:799 +msgid "" +" Lines starting\n" +"with '#' will be ignored, and an empty message aborts the commit.\n" +msgstr "" +" 以 '#' å¼å¤´\n" +"çè¡å°è¢«å¿½ç¥ï¼èä¸ç©ºæ交说æå°ä¼ç»æ¢æ交ã\n" + +# 注æä¿æåå¯¼ç©ºæ ¼ +#: builtin/commit.c:804 +msgid "" +" Lines starting\n" +"with '#' will be kept; you may remove them yourself if you want to.\n" +"An empty message aborts the commit.\n" +msgstr "" +" 以 '#' å¼å¤´\n" +"çè¡å°è¢«ä¿çï¼æ¨å¯ä»¥å é¤å®ä»¬å¦ææ¨æ³è¿æ ·åã空æ交说æå°ä¼ç»æ¢æ交ã\n" + +# 为ä¿è¯å¨è¾åºä¸å¯¹é½ï¼æ³¨æè°æ´å¥ä¸ç©ºæ ¼ï¼ +#: builtin/commit.c:816 +#, c-format +msgid "%sAuthor: %s" +msgstr "%sä½è ï¼ %s" + +# 为ä¿è¯å¨è¾åºä¸å¯¹é½ï¼æ³¨æè°æ´å¥ä¸ç©ºæ ¼ï¼ +#: builtin/commit.c:823 +#, c-format +msgid "%sCommitter: %s" +msgstr "%sæ交è ï¼ %s" + +#: builtin/commit.c:843 +msgid "Cannot read index" +msgstr "æ æ³è¯»åæååº" + +#: builtin/commit.c:880 +msgid "Error building trees" +msgstr "æ æ³å建æ 对象" + +#: builtin/commit.c:895 builtin/tag.c:324 +#, c-format +msgid "Please supply the message using either -m or -F option.\n" +msgstr "è¯·ä½¿ç¨ -m æè -F é项æä¾è¯´æã\n" + +#: builtin/commit.c:975 +#, c-format +msgid "No existing author found with '%s'" +msgstr "没ææ¾å°å¹é '%s' çä½è " + +#: builtin/commit.c:990 builtin/commit.c:1182 +#, c-format +msgid "Invalid untracked files mode '%s'" +msgstr "æ æçé追踪æ件åæ° '%s'" + +#: builtin/commit.c:1030 +msgid "Using both --reset-author and --author does not make sense" +msgstr "åæ¶ä½¿ç¨ --reset-author å --author 没ææä¹" + +#: builtin/commit.c:1041 +msgid "You have nothing to amend." +msgstr "æ¨æ²¡æè¦ä¿®è¡¥ã" + +# %sè¥ç¿»ä¸ºä¸æï¼ååä¸éè¦ç©ºæ ¼ +#: builtin/commit.c:1043 +#, c-format +msgid "You are in the middle of a %s -- cannot amend." +msgstr "æ¨æ£å¤äºä¸ä¸ª%sè¿ç¨ä¸ -- æ æ³ä¿®è¡¥æ交ã" + +#: builtin/commit.c:1045 +msgid "Options --squash and --fixup cannot be used together" +msgstr "é项 --squash å --fixup ä¸è½å ±ç¨" + +#: builtin/commit.c:1055 +msgid "Only one of -c/-C/-F/--fixup can be used." +msgstr "åªè½ç¨ä¸ä¸ª -c/-C/-F/--fixup é项ã" + +#: builtin/commit.c:1057 +msgid "Option -m cannot be combined with -c/-C/-F/--fixup." +msgstr "é项 -m ä¸è½å -c/-C/-F/--fixup å ±ç¨ã" + +#: builtin/commit.c:1063 +msgid "--reset-author can be used only with -C, -c or --amend." +msgstr "--reset-author åªè½å -C, -c æ --amend å ±ç¨ã" + +#: builtin/commit.c:1080 +msgid "Only one of --include/--only/--all/--interactive/--patch can be used." +msgstr "åªè½ç¨ä¸ä¸ª --include/--only/--all/--interactive/--patch é项ã" + +#: builtin/commit.c:1082 +msgid "No paths with --include/--only does not make sense." +msgstr "åæ° --include/--only ä¸è·è·¯å¾æ²¡ææä¹ã" + +#: builtin/commit.c:1084 +msgid "Clever... amending the last one with dirty index." +msgstr "èªæ... å¨æååºä¸å¹²åä¸ä¿®è¡¥æåçæ交ã" + +#: builtin/commit.c:1086 +msgid "Explicit paths specified without -i nor -o; assuming --only paths..." +msgstr "没æç¨ -i æ -o é项èæ¾å¼å°æä¾è·¯å¾ï¼è®¤ä¸ºæ¯ --only paths..." + +#: builtin/commit.c:1096 builtin/tag.c:500 +#, c-format +msgid "Invalid cleanup mode %s" +msgstr "æ æçæ¸ çæ¨¡å¼ %s" + +#: builtin/commit.c:1101 +msgid "Paths with -a does not make sense." +msgstr "è·¯å¾å -a éé¡¹å ±ç¨æ²¡ææä¹ã" + +#: builtin/commit.c:1280 +msgid "couldn't look up newly created commit" +msgstr "æ æ³æ¾å°æ°å建çæ交" + +#: builtin/commit.c:1282 +msgid "could not parse newly created commit" +msgstr "æ æ³è§£ææ°å建çæ交" + +#: builtin/commit.c:1323 +msgid "detached HEAD" +msgstr "å离头æé" + +# 注æä¿æåå¯¼ç©ºæ ¼ +#: builtin/commit.c:1325 +msgid " (root-commit)" +msgstr " ï¼æ ¹æ交ï¼" + +#: builtin/commit.c:1415 +msgid "could not parse HEAD commit" +msgstr "æ æ³è§£æ HEAD æ交" + +#: builtin/commit.c:1452 builtin/merge.c:507 +#, c-format +msgid "could not open '%s' for reading" +msgstr "æ æ³æå¼ '%s' 读å" + +#: builtin/commit.c:1459 +#, c-format +msgid "Corrupt MERGE_HEAD file (%s)" +msgstr "æåç MERGE_HEAD æ件 (%s)" + +#: builtin/commit.c:1466 +msgid "could not read MERGE_MODE" +msgstr "æ æ³è¯»å MERGE_MODE" + +#: builtin/commit.c:1485 +#, c-format +msgid "could not read commit message: %s" +msgstr "æ æ³è¯»åæ交说æï¼%s" + +#: builtin/commit.c:1499 +#, c-format +msgid "Aborting commit due to empty commit message.\n" +msgstr "ç»æ¢æ交å 为æ交说æ为空ã\n" + +#: builtin/commit.c:1514 builtin/merge.c:933 builtin/merge.c:966 +msgid "failed to write commit object" +msgstr "åæ交对象失败" + +#: builtin/commit.c:1535 +msgid "cannot lock HEAD ref" +msgstr "æ æ³éå® HEAD å¼ç¨" + +#: builtin/commit.c:1539 +msgid "cannot update HEAD ref" +msgstr "æ æ³æ´æ° HEAD å¼ç¨" + +#: builtin/commit.c:1550 +msgid "" +"Repository has been updated, but unable to write\n" +"new_index file. Check that disk is not full or quota is\n" +"not exceeded, and then \"git reset HEAD\" to recover." +msgstr "" +"çæ¬åºå·²è¢«æ´æ°ï¼ä½æ æ³åå ¥æ°æååºæ件ãæ£æ¥æ¯å¦ç£ç\n" +"已满æç£çé é¢èå°½ï¼ç¶åæ§è¡ \"git reset HEAD\" æ¢å¤ã" + +#: builtin/describe.c:234 +#, c-format +msgid "annotated tag %s not available" +msgstr "注é tag %s æ æ" + +#: builtin/describe.c:238 +#, c-format +msgid "annotated tag %s has no embedded name" +msgstr "注é tag %s 没æåµå ¥å称" + +#: builtin/describe.c:240 +#, c-format +msgid "tag '%s' is really '%s' here" +msgstr "tag '%s' ç¡®æ¯å¨ '%s'" + +#: builtin/describe.c:267 +#, c-format +msgid "Not a valid object name %s" +msgstr "ä¸æ¯ä¸ä¸ªææç对象å %s" + +#: builtin/describe.c:270 +#, c-format +msgid "%s is not a valid '%s' object" +msgstr "%s ä¸æ¯ä¸ä¸ªææç '%s' 对象" + +#: builtin/describe.c:287 +#, c-format +msgid "no tag exactly matches '%s'" +msgstr "没æ tag åç¡®å¹é '%s'" + +#: builtin/describe.c:289 +#, c-format +msgid "searching to describe %s\n" +msgstr "æç´¢æè¿° %s\n" + +#: builtin/describe.c:329 +#, c-format +msgid "finished search at %s\n" +msgstr "å®ææç´¢ %s\n" + +#: builtin/describe.c:353 +#, c-format +msgid "" +"No annotated tags can describe '%s'.\n" +"However, there were unannotated tags: try --tags." +msgstr "" +"没æ注é tag è½æè¿° '%s'ã\n" +"ç¶èï¼æé注é tagï¼å°è¯ --tagsã" + +#: builtin/describe.c:357 +#, c-format +msgid "" +"No tags can describe '%s'.\n" +"Try --always, or create some tags." +msgstr "" +"没æ注é tag è½æè¿° '%s'ã\n" +"å°è¯ --alwaysï¼æå建ä¸äº tagã" + +#: builtin/describe.c:378 +#, c-format +msgid "traversed %lu commits\n" +msgstr "å·²éå %lu 个æ交\n" + +#: builtin/describe.c:381 +#, c-format +msgid "" +"more than %i tags found; listed %i most recent\n" +"gave up search at %s\n" +msgstr "" +"åç°å¤äº %i 个 tagï¼ååºæè¿ç %i 个\n" +"æ¾å¼æç´¢ %s\n" + +#: builtin/describe.c:436 +msgid "--long is incompatible with --abbrev=0" +msgstr "--long ä¸ --abbrev=0 ä¸å ¼å®¹" + +#: builtin/describe.c:462 +msgid "No names found, cannot describe anything." +msgstr "没æåç°å称ï¼æ æ³æè¿°ä»»ä½ä¸è¥¿" + +#: builtin/describe.c:482 +msgid "--dirty is incompatible with committishes" +msgstr "--dirty ä¸è½ä¸æäº¤å ±ç¨" + +#: builtin/diff.c:77 +#, c-format +msgid "'%s': not a regular file or symlink" +msgstr "'%s'ï¼ä¸æ¯ä¸ä¸ªæ£è§æ件æ符å·é¾æ¥" + +#: builtin/diff.c:220 +#, c-format +msgid "invalid option: %s" +msgstr "æ æé项ï¼%s" + +#: builtin/diff.c:293 +msgid "Not a git repository" +msgstr "ä¸æ¯ä¸ä¸ª git çæ¬åº" + +#: builtin/diff.c:343 +#, c-format +msgid "invalid object '%s' given." +msgstr "æä¾äºæ æ对象 '%s'ã" + +#: builtin/diff.c:348 +#, c-format +msgid "more than %d trees given: '%s'" +msgstr "æä¾äºè¶ è¿ %d 个æ 对象ï¼'%s'" + +#: builtin/diff.c:358 +#, c-format +msgid "more than two blobs given: '%s'" +msgstr "æä¾äºè¶ è¿ä¸¤ä¸ª blob 对象ï¼'%s'" + +#: builtin/diff.c:366 +#, c-format +msgid "unhandled object '%s' given." +msgstr "æä¾äºæ æ³å¤çç对象 '%s'ã" + +#: builtin/fetch.c:200 +msgid "Couldn't find remote ref HEAD" +msgstr "æ æ³åç°è¿ç¨ HEAD å¼ç¨" + +#: builtin/fetch.c:252 +#, c-format +msgid "object %s not found" +msgstr "对象 %s æªåç°" + +#: builtin/fetch.c:258 +msgid "[up to date]" +msgstr "[ææ°]" + +#: builtin/fetch.c:272 +#, c-format +msgid "! %-*s %-*s -> %s (can't fetch in current branch)" +msgstr "! %-*s %-*s -> %s ï¼å¨å½ååæ¯ä¸ä¸è½è·åï¼" + +#: builtin/fetch.c:273 builtin/fetch.c:351 +msgid "[rejected]" +msgstr "[å·²æç»]" + +#: builtin/fetch.c:284 +msgid "[tag update]" +msgstr "[tagæ´æ°]" + +# 注æä¿æåå¯¼ç©ºæ ¼ +#: builtin/fetch.c:286 builtin/fetch.c:313 builtin/fetch.c:331 +msgid " (unable to update local ref)" +msgstr " ï¼ä¸è½æ´æ°æ¬å°å¼ç¨ï¼" + +#: builtin/fetch.c:298 +msgid "[new tag]" +msgstr "[æ°tag]" + +#: builtin/fetch.c:302 +msgid "[new branch]" +msgstr "[æ°åæ¯]" + +#: builtin/fetch.c:347 +msgid "unable to update local ref" +msgstr "ä¸è½æ´æ°æ¬å°å¼ç¨" + +#: builtin/fetch.c:347 +msgid "forced update" +msgstr "强å¶æ´æ°" + +#: builtin/fetch.c:353 +msgid "(non-fast-forward)" +msgstr "ï¼éå¿«è¿å¼æ¨éï¼" + +#: builtin/fetch.c:384 builtin/fetch.c:676 +#, c-format +msgid "cannot open %s: %s\n" +msgstr "æ æ³æå¼ %sï¼%s\n" + +#: builtin/fetch.c:393 +#, c-format +msgid "%s did not send all necessary objects\n" +msgstr "%s æªåéææå¿ é¡»ç对象\n" + +#: builtin/fetch.c:479 +#, c-format +msgid "From %.*s\n" +msgstr "æ¥èª %.*s\n" + +#: builtin/fetch.c:490 +#, c-format +msgid "" +"some local refs could not be updated; try running\n" +" 'git remote prune %s' to remove any old, conflicting branches" +msgstr "" +"ä¸äºæ¬å°å¼ç¨ä¸è½è¢«æ´æ°ï¼å°è¯è¿è¡\n" +" 'git remote prune %s' æ¥å é¤æ§çãæå²çªçåæ¯" + +# 注æä¿æåå¯¼ç©ºæ ¼ +#: builtin/fetch.c:540 +#, c-format +msgid " (%s will become dangling)\n" +msgstr " ï¼%s å°æ为æ¬ç©ºç¶æï¼\n" + +# 注æä¿æåå¯¼ç©ºæ ¼ +#: builtin/fetch.c:541 +#, c-format +msgid " (%s has become dangling)\n" +msgstr " ï¼%s å·²æ为æ¬ç©ºç¶æï¼\n" + +#: builtin/fetch.c:548 +msgid "[deleted]" +msgstr "[å·²å é¤]" + +#: builtin/fetch.c:549 +msgid "(none)" +msgstr "ï¼æ ï¼" + +#: builtin/fetch.c:666 +#, c-format +msgid "Refusing to fetch into current branch %s of non-bare repository" +msgstr "æç»è·åå°é裸çæ¬åºçå½ååæ¯ %s" + +#: builtin/fetch.c:700 +#, c-format +msgid "Don't know how to fetch from %s" +msgstr "ä¸ç¥éå¦ä½ä» %s è·å" + +#: builtin/fetch.c:777 +#, c-format +msgid "Option \"%s\" value \"%s\" is not valid for %s" +msgstr "é项 \"%s\" çå¼ \"%s\" å¯¹äº %s æ¯æ æç" + +#: builtin/fetch.c:780 +#, c-format +msgid "Option \"%s\" is ignored for %s\n" +msgstr "é项 \"%s\" å¯¹äº %s 被忽ç¥\n" + +#: builtin/fetch.c:879 +#, c-format +msgid "Fetching %s\n" +msgstr "æ£è·å %s\n" + +#: builtin/fetch.c:881 +#, c-format +msgid "Could not fetch %s" +msgstr "ä¸è½è·å %s" + +#: builtin/fetch.c:898 +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:918 +msgid "You need to specify a tag name." +msgstr "ä½ éè¦æä¾ä¸ä¸ª tag å称" + +#: builtin/fetch.c:970 +msgid "fetch --all does not take a repository argument" +msgstr "fetch --all ä¸è½å¸¦ä¸ä¸ªçæ¬åºåæ°" + +#: builtin/fetch.c:972 +msgid "fetch --all does not make sense with refspecs" +msgstr "fetch --all 带å¼ç¨è¡¨è¾¾å¼æ²¡æä»»ä½æä¹" + +#: builtin/fetch.c:983 +#, c-format +msgid "No such remote or remote group: %s" +msgstr "没æè¿æ ·çè¿ç¨æè¿ç¨ç»ï¼%s" + +#: builtin/fetch.c:991 +msgid "Fetching a group and specifying refspecs does not make sense" +msgstr "è·åç»å¹¶æä¾å¼ç¨è¡¨è¾¾å¼æ²¡ææä¹" + +#: builtin/gc.c:63 +#, c-format +msgid "Invalid %s: '%s'" +msgstr "æ æç %sï¼'%s'" + +#: builtin/gc.c:78 +msgid "Too many options specified" +msgstr "æä¾äºå¤ªå¤çé项" + +#: builtin/gc.c:103 +#, c-format +msgid "insanely long object directory %.*s" +msgstr "ä¸æ£å¸¸çé¿å¯¹è±¡ç®å½ %.*s" + +#: builtin/gc.c:223 +#, c-format +msgid "Auto packing the repository for optimum performance.\n" +msgstr "èªå¨æå çæ¬åºä»¥æ±æä½³æ§è½ã\n" + +#: builtin/gc.c:226 +#, c-format +msgid "" +"Auto packing the repository for optimum performance. You may also\n" +"run \"git gc\" manually. See \"git help gc\" for more information.\n" +msgstr "" +"èªå¨æå çæ¬åºä»¥æ±æä½³æ§è½ãä½ è¿å¯ä»¥\n" +"æå¨è¿è¡ \"git gc\"ã åè§ \"git help gc\" è·åæ´å¤ä¿¡æ¯ã\n" + +#: builtin/gc.c:256 +msgid "" +"There are too many unreachable loose objects; run 'git prune' to remove them." +msgstr "æ太å¤æ æåçæ¾æ£å¯¹è±¡ï¼è¿è¡ 'git prune' å é¤å®ä»¬ã" + +#: builtin/grep.c:275 +#, c-format +msgid "grep: failed to create thread: %s" +msgstr "grep: æ æ³å建线ç¨ï¼%s" + +#: builtin/grep.c:390 +#, c-format +msgid "'%s': unable to read %s" +msgstr "'%s'ï¼æ æ³è¯»å %s" + +#: builtin/grep.c:441 +#, c-format +msgid "'%s': %s" +msgstr "'%s'ï¼%s" + +#: builtin/grep.c:452 +#, c-format +msgid "'%s': short read %s" +msgstr "'%s'ï¼è¯»åä¸å®æ´ %s" + +#: builtin/grep.c:514 +#, c-format +msgid "Failed to chdir: %s" +msgstr "æ æ³åæ¢ç®å½ï¼%s" + +#: builtin/grep.c:590 builtin/grep.c:624 +#, c-format +msgid "unable to read tree (%s)" +msgstr "æ æ³è¯»å代ç æ ï¼%sï¼" + +#: builtin/grep.c:638 +#, c-format +msgid "unable to grep from object of type %s" +msgstr "æ æ³æåæ¥èªäº %s ç±»åç对象" + +#: builtin/grep.c:696 +#, c-format +msgid "switch `%c' expects a numerical value" +msgstr "å¼å ³ `%c' ææä¸ä¸ªæ°åå¼" + +#: builtin/grep.c:713 +#, c-format +msgid "cannot open '%s'" +msgstr "ä¸è½æå¼ '%s'" + +#: builtin/grep.c:1001 +msgid "no pattern given." +msgstr "æªæä¾æ¨¡å¼å¹é ã" + +#: builtin/grep.c:1015 +#, c-format +msgid "bad object %s" +msgstr "å对象 %s" + +#: builtin/grep.c:1058 +msgid "--open-files-in-pager only works on the worktree" +msgstr "--open-files-in-pager ä» ç¨äºå·¥ä½åº" + +#: builtin/grep.c:1081 +msgid "--cached or --untracked cannot be used with --no-index." +msgstr "--cached æ --untracked ä¸è½ä¸ --no-index å ±ç¨" + +#: builtin/grep.c:1086 +msgid "--no-index or --untracked cannot be used with revs." +msgstr "--no-index æ --untracked ä¸è½åçæ¬å ±ç¨ã" + +#: builtin/grep.c:1089 +msgid "--[no-]exclude-standard cannot be used for tracked contents." +msgstr "--[no-]exclude-standard ä¸è½ç¨äºè·è¸ªå 容ã" + +#: builtin/grep.c:1097 +msgid "both --cached and trees are given." +msgstr "åæ¶ç»åºäº --cached åæ 对象ã" + +#: builtin/init-db.c:35 +#, c-format +msgid "Could not make %s writable by group" +msgstr "ä¸è½è®¾ç½® %s 为ç»å¯å" + +#: builtin/init-db.c:62 +#, c-format +msgid "insanely long template name %s" +msgstr "太é¿ç模çå %s" + +#: builtin/init-db.c:67 +#, c-format +msgid "cannot stat '%s'" +msgstr "ä¸è½æ举 '%s' ç¶æ" + +#: builtin/init-db.c:73 +#, c-format +msgid "cannot stat template '%s'" +msgstr "ä¸è½æ举模ç '%s' ç¶æ" + +#: builtin/init-db.c:80 +#, c-format +msgid "cannot opendir '%s'" +msgstr "ä¸è½æå¼ç®å½ '%s'" + +#: builtin/init-db.c:97 +#, c-format +msgid "cannot readlink '%s'" +msgstr "ä¸è½è¯»åé¾æ¥ '%s'" + +#: builtin/init-db.c:99 +#, c-format +msgid "insanely long symlink %s" +msgstr "太é¿ç符å·é¾æ¥ %s" + +#: builtin/init-db.c:102 +#, c-format +msgid "cannot symlink '%s' '%s'" +msgstr "ä¸è½å建符å·é¾æ¥ '%s' å° '%s'" + +#: builtin/init-db.c:106 +#, c-format +msgid "cannot copy '%s' to '%s'" +msgstr "ä¸è½æ·è´ '%s' è³ '%s'" + +#: builtin/init-db.c:110 +#, c-format +msgid "ignoring template %s" +msgstr "忽ç¥æ¨¡ç %s" + +#: builtin/init-db.c:133 +#, c-format +msgid "insanely long template path %s" +msgstr "太é¿ç模çè·¯å¾ %s" + +#: builtin/init-db.c:141 +#, c-format +msgid "templates not found %s" +msgstr "模çæªæ¾å° %s" + +#: builtin/init-db.c:154 +#, c-format +msgid "not copying templates of a wrong format version %d from '%s'" +msgstr "æªå¤å¶é误çæ¬ %d ç模çèª '%s'" + +#: builtin/init-db.c:192 +#, c-format +msgid "insane git directory %s" +msgstr "ä¸æ£å¸¸ç git ç®å½ %s" + +#: builtin/init-db.c:322 builtin/init-db.c:325 +#, c-format +msgid "%s already exists" +msgstr "%s å·²ç»åå¨" + +#: builtin/init-db.c:354 +#, c-format +msgid "unable to handle file type %d" +msgstr "ä¸è½å¤ç %d ç±»åçæ件" + +#: builtin/init-db.c:357 +#, c-format +msgid "unable to move %s to %s" +msgstr "ä¸è½ç§»å¨ %s è³ %s" + +#: builtin/init-db.c:362 +#, c-format +msgid "Could not create git link %s" +msgstr "ä¸è½å建 git link %s" + +#. +#. * TRANSLATORS: The first '%s' is either "Reinitialized +#. * existing" or "Initialized empty", the second " shared" or +#. * "", and the last '%s%s' is the verbatim directory name. +#. +#: builtin/init-db.c:419 +#, c-format +msgid "%s%s Git repository in %s%s\n" +msgstr "%s%s Git çæ¬åºäº %s%s\n" + +#: builtin/init-db.c:420 +msgid "Reinitialized existing" +msgstr "éæ°åå§åç°åç" + +#: builtin/init-db.c:420 +msgid "Initialized empty" +msgstr "åå§å空ç" + +# æ±åå串å并ï¼ä¹é´æ ç©ºæ ¼ï¼æ å é¤åå¯¼ç©ºæ ¼ +#: builtin/init-db.c:421 +msgid " shared" +msgstr "å ±äº«ç" + +#: builtin/init-db.c:440 +msgid "cannot tell cwd" +msgstr "æ æ³è·ç¥å½åè·¯å¾" + +#: builtin/init-db.c:521 builtin/init-db.c:528 +#, c-format +msgid "cannot mkdir %s" +msgstr "ä¸è½å建ç®å½ %s" + +#: builtin/init-db.c:532 +#, c-format +msgid "cannot chdir to %s" +msgstr "ä¸è½åæ¢ç®å½å° %s" + +#: builtin/init-db.c:554 +#, c-format +msgid "" +"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" +"dir=<directory>)" +msgstr "" +"ä¸å 许 %sï¼æ --work-tree=<directory>ï¼è没æ %sï¼æ --git-dir=<directory>ï¼" + +#: builtin/init-db.c:578 +msgid "Cannot access current working directory" +msgstr "ä¸è½è®¿é®å½åå·¥ä½ç®å½" + +#: builtin/init-db.c:585 +#, c-format +msgid "Cannot access work tree '%s'" +msgstr "ä¸è½è®¿é®å·¥ä½åº '%s'" + +#: builtin/log.c:185 +#, c-format +msgid "Final output: %d %s\n" +msgstr "æç»è¾åºï¼%d %s\n" + +#: builtin/log.c:393 builtin/log.c:479 +#, c-format +msgid "Could not read object %s" +msgstr "æ æ³è¯»å对象 %s" + +#: builtin/log.c:503 +#, c-format +msgid "Unknown type: %d" +msgstr "æªç¥ç±»åï¼%d" + +#: builtin/log.c:592 +msgid "format.headers without value" +msgstr "format.headers 没æå¼" + +#: builtin/log.c:665 +msgid "name of output directory is too long" +msgstr "è¾åºç®å½å太é¿" + +#: builtin/log.c:676 +#, c-format +msgid "Cannot open patch file %s" +msgstr "æ æ³æå¼è¡¥ä¸æ件 %s" + +#: builtin/log.c:690 +msgid "Need exactly one range." +msgstr "åªéè¦ä¸ä¸ªèå´ã" + +#: builtin/log.c:698 +msgid "Not a range." +msgstr "ä¸æ¯ä¸ä¸ªèå´ã" + +#: builtin/log.c:735 +msgid "Could not extract email from committer identity." +msgstr "æ æ³ä»æ交è 身份ä¸æåé®ä»¶å°åã" + +#: builtin/log.c:781 +msgid "Cover letter needs email format" +msgstr "ä¿¡å°éè¦é®ä»¶å°åæ ¼å¼" + +#: builtin/log.c:875 +#, c-format +msgid "insane in-reply-to: %s" +msgstr "ä¸æ£å¸¸ç in-reply-toï¼%s" + +#: builtin/log.c:948 +msgid "Two output directories?" +msgstr "两个è¾åºç®å½ï¼" + +#: builtin/log.c:1169 +#, c-format +msgid "bogus committer info %s" +msgstr "èåçæ交è ä¿¡æ¯ %s" + +#: builtin/log.c:1214 +msgid "-n and -k are mutually exclusive." +msgstr "-n å -k äºæ¥ã" + +#: builtin/log.c:1216 +msgid "--subject-prefix and -k are mutually exclusive." +msgstr "--subject-prefix å -k äºæ¥ã" + +#: builtin/log.c:1221 builtin/shortlog.c:284 +#, c-format +msgid "unrecognized argument: %s" +msgstr "æªè¯å«çåæ°ï¼%s" + +#: builtin/log.c:1224 +msgid "--name-only does not make sense" +msgstr "--name-only æ æä¹" + +#: builtin/log.c:1226 +msgid "--name-status does not make sense" +msgstr "--name-status æ æä¹" + +#: builtin/log.c:1228 +msgid "--check does not make sense" +msgstr "--check æ æä¹" + +#: builtin/log.c:1251 +msgid "standard output, or directory, which one?" +msgstr "æ åè¾åºæç®å½ï¼åªä¸ä¸ªï¼" + +#: builtin/log.c:1253 +#, c-format +msgid "Could not create directory '%s'" +msgstr "æ æ³å建ç®å½ '%s'" + +#: builtin/log.c:1406 +msgid "Failed to create output files" +msgstr "æ æ³å建è¾åºæ件" + +#: builtin/log.c:1510 +#, c-format +msgid "" +"Could not find a tracked remote branch, please specify <upstream> manually.\n" +msgstr "æ æ³æ¾å°è·è¸ªçè¿ç¨åæ¯ï¼è¯·æå·¥æä¾ <upstream>ã\n" + +#: builtin/log.c:1526 builtin/log.c:1528 builtin/log.c:1540 +#, c-format +msgid "Unknown commit %s" +msgstr "æªç¥æ交 %s" + +#: builtin/merge.c:91 +msgid "switch `m' requires a value" +msgstr "å¼å ³ `m' éè¦ä¸ä¸ªå¼" + +#: builtin/merge.c:128 +#, c-format +msgid "Could not find merge strategy '%s'.\n" +msgstr "æ æ³æ¾å°å并çç¥ '%s'ã\n" + +#: builtin/merge.c:129 +#, c-format +msgid "Available strategies are:" +msgstr "å¯ç¨ççç¥æï¼" + +#: builtin/merge.c:134 +#, c-format +msgid "Available custom strategies are:" +msgstr "å¯ç¨çèªå®ä¹çç¥æï¼" + +#: builtin/merge.c:241 +msgid "could not run stash." +msgstr "ä¸è½è¿è¡è¿åº¦ä¿åã" + +#: builtin/merge.c:246 +msgid "stash failed" +msgstr "è¿åº¦ä¿å失败" + +#: builtin/merge.c:251 +#, c-format +msgid "not a valid object: %s" +msgstr "ä¸æ¯ä¸ä¸ªææ对象ï¼%s" + +#: builtin/merge.c:270 builtin/merge.c:287 +msgid "read-tree failed" +msgstr "读åæ 失败" + +# 注æä¿æåå¯¼ç©ºæ ¼ +#: builtin/merge.c:317 +msgid " (nothing to squash)" +msgstr " ï¼æ å¯å缩ï¼" + +#: builtin/merge.c:330 +#, c-format +msgid "Squash commit -- not updating HEAD\n" +msgstr "å缩æ交 -- æªæ´æ° HEAD\n" + +#: builtin/merge.c:362 +msgid "Writing SQUASH_MSG" +msgstr "åå ¥ SQUASH_MSG" + +#: builtin/merge.c:364 +msgid "Finishing SQUASH_MSG" +msgstr "å®æ SQUASH_MSG" + +#: builtin/merge.c:386 +#, c-format +msgid "No merge message -- not updating HEAD\n" +msgstr "æ åå¹¶ä¿¡æ¯ -- æªæ´æ° HEAD\n" + +#: builtin/merge.c:435 +#, c-format +msgid "'%s' does not point to a commit" +msgstr "'%s' 没ææåä¸ä¸ªæ交" + +#: builtin/merge.c:534 +#, c-format +msgid "Bad branch.%s.mergeoptions string: %s" +msgstr "éç branch.%s.mergeoptions å串ï¼%s" + +#: builtin/merge.c:627 +msgid "git write-tree failed to write a tree" +msgstr "git write-tree æ æ³åå ¥ä¸æ 对象" + +#: builtin/merge.c:677 +msgid "failed to read the cache" +msgstr "æ æ³è¯»åç¼å" + +#: builtin/merge.c:694 +msgid "Unable to write index." +msgstr "ä¸è½åæååºã" + +#: builtin/merge.c:707 +msgid "Not handling anything other than two heads merge." +msgstr "ä¸è½å¤ç两个头å并ä¹å¤çä»»ä½æä½ã" + +#: builtin/merge.c:721 +#, c-format +msgid "Unknown option for merge-recursive: -X%s" +msgstr "merge-recursive çæªç¥é项ï¼-X%s" + +#: builtin/merge.c:735 +#, c-format +msgid "unable to write %s" +msgstr "ä¸è½å %s" + +#: builtin/merge.c:874 +#, c-format +msgid "Could not read from '%s'" +msgstr "ä¸è½ä» '%s' 读å" + +#: builtin/merge.c:883 +#, c-format +msgid "Not committing merge; use 'git commit' to complete the merge.\n" +msgstr "æªæ交å并ï¼ä½¿ç¨ 'git commit' å®ææ¤æ¬¡å并ã\n" + +#: builtin/merge.c:889 +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" +"\n" +"Lines starting with '#' will be ignored, and an empty message aborts\n" +"the commit.\n" +msgstr "" +"请è¾å ¥ä¸ä¸ªæ交信æ¯ä»¥è§£éæ¤å并çå¿ è¦æ§ï¼å°¤å ¶æ¯å°ä¸ä¸ªæ´æ°åçä¸æ¸¸åæ¯\n" +"å并å°ä¸»é¢åæ¯ã\n" +"\n" +"以 '#' å¼å¤´çè¡å°è¢«å¿½ç¥ï¼èä¸ç©ºæ交说æå°ä¼ç»æ¢æ交ã\n" + +#: builtin/merge.c:913 +msgid "Empty commit message." +msgstr "空æ交信æ¯ã" + +#: builtin/merge.c:925 +#, c-format +msgid "Wonderful.\n" +msgstr "太æ£äºã\n" + +#: builtin/merge.c:998 +#, c-format +msgid "Automatic merge failed; fix conflicts and then commit the result.\n" +msgstr "èªå¨å并失败ï¼ä¿®æ£å²çªç¶åæ交修æ£çç»æã\n" + +#: builtin/merge.c:1014 +#, c-format +msgid "'%s' is not a commit" +msgstr "'%s' ä¸æ¯ä¸ä¸ªæ交" + +#: builtin/merge.c:1055 +msgid "No current branch." +msgstr "å½åä¸å¨åæ¯ä¸ã" + +#: builtin/merge.c:1057 +msgid "No remote for the current branch." +msgstr "å½ååæ¯æ²¡æè¿ç¨çæ¬åºã" + +#: builtin/merge.c:1059 +msgid "No default upstream defined for the current branch." +msgstr "å½ååæ¯æªå®ä¹é»è®¤ä¸æ¸¸åæ¯ã" + +#: builtin/merge.c:1064 +#, c-format +msgid "No remote tracking branch for %s from %s" +msgstr "%s 没ææ¥èª %s çè¿ç¨è·è¸ªåæ¯" + +#: builtin/merge.c:1186 +msgid "There is no merge to abort (MERGE_HEAD missing)." +msgstr "没æè¦ç»æ¢çå并ï¼MERGE_HEAD 丢失ï¼" + +#: builtin/merge.c:1202 git-pull.sh:31 +msgid "" +"You have not concluded your merge (MERGE_HEAD exists).\n" +"Please, commit your changes before you can merge." +msgstr "" +"æ¨å°æªç»ææ¨çå并ï¼åå¨ MERGE_HEADï¼ã\n" +"请å æ交æ¨çä¿®æ¹ï¼æ¨æè½å并ã" + +#: builtin/merge.c:1205 git-pull.sh:34 +msgid "You have not concluded your merge (MERGE_HEAD exists)." +msgstr "æ¨å°æªç»ææ¨çå并ï¼åå¨ MERGE_HEADï¼ã" + +#: builtin/merge.c:1209 +msgid "" +"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" +"Please, commit your changes before you can merge." +msgstr "" +"æ¨å°æªç»ææ¨çæ£éï¼åå¨ CHERRY_PICK_HEADï¼ã\n" +"请å æ交æ¨çä¿®æ¹ï¼æ¨æè½å并ã" + +#: builtin/merge.c:1212 +msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." +msgstr "æ¨å°æªç»ææ¨çæ£éï¼åå¨ CHERRY_PICK_HEADï¼ã" + +#: builtin/merge.c:1221 +msgid "You cannot combine --squash with --no-ff." +msgstr "æ¨ä¸è½å° --squash ä¸ --no-ff å ±ç¨ã" + +#: builtin/merge.c:1226 +msgid "You cannot combine --no-ff with --ff-only." +msgstr "æ¨ä¸è½å° --no-ff ä¸ --ff-only å ±ç¨ã" + +#: builtin/merge.c:1233 +msgid "No commit specified and merge.defaultToUpstream not set." +msgstr "æªæåºæäº¤å¹¶ä¸ merge.defaultToUpstream æªè®¾ç½®ã" + +#: builtin/merge.c:1264 +msgid "Can merge only exactly one commit into empty head" +msgstr "åªå¯å°ä¸ä¸ªæ交å并å°ç©ºåæ¯ä¸" + +#: builtin/merge.c:1267 +msgid "Squash commit into empty head not supported yet" +msgstr "å°ä¸æ¯æå°ç©ºåæ¯çå缩æ交" + +#: builtin/merge.c:1269 +msgid "Non-fast-forward commit does not make sense into an empty head" +msgstr "å°ç©ºåæ¯çéå¿«è¿å¼æ交没ææä¹" + +#: builtin/merge.c:1273 builtin/merge.c:1317 +#, c-format +msgid "%s - not something we can merge" +msgstr "%s - ä¸æ¯æ们å¯ä»¥å并çä¸è¥¿" + +#: builtin/merge.c:1382 +#, c-format +msgid "Updating %s..%s\n" +msgstr "æ´æ° %s..%s\n" + +#: builtin/merge.c:1420 +#, c-format +msgid "Trying really trivial in-index merge...\n" +msgstr "å°è¯é常å°çæååºå å并...\n" + +#: builtin/merge.c:1427 +#, c-format +msgid "Nope.\n" +msgstr "æ ã\n" + +#: builtin/merge.c:1459 +msgid "Not possible to fast-forward, aborting." +msgstr "ä¸å¯è½å¿«è¿å¼ï¼ç»æ¢ã" + +#: builtin/merge.c:1482 builtin/merge.c:1559 +#, c-format +msgid "Rewinding the tree to pristine...\n" +msgstr "å°æ åæ»è³åå§ç¶æ...\n" + +#: builtin/merge.c:1486 +#, c-format +msgid "Trying merge strategy %s...\n" +msgstr "å°è¯å并çç¥ %s...\n" + +#: builtin/merge.c:1550 +#, c-format +msgid "No merge strategy handled the merge.\n" +msgstr "没æå并çç¥å¤çæ¤å并ã\n" + +#: builtin/merge.c:1552 +#, c-format +msgid "Merge with strategy %s failed.\n" +msgstr "使ç¨çç¥ %s å并失败ã\n" + +#: builtin/merge.c:1561 +#, c-format +msgid "Using the %s to prepare resolving by hand.\n" +msgstr "ä½¿ç¨ %s 以åå¤æ工解å³ã\n" + +#: builtin/merge.c:1572 +#, c-format +msgid "Automatic merge went well; stopped before committing as requested\n" +msgstr "èªå¨å并è¿å±é¡ºå©ï¼æè¦æ±å¨æ交ååæ¢\n" + +#: builtin/mv.c:108 +#, c-format +msgid "Checking rename of '%s' to '%s'\n" +msgstr "æ£æ¥ '%s' å° '%s' çéå½å\n" + +#: builtin/mv.c:112 +msgid "bad source" +msgstr "åçæº" + +#: builtin/mv.c:115 +msgid "can not move directory into itself" +msgstr "ä¸è½å°ç®å½ç§»å¨å°èªèº«" + +#: builtin/mv.c:118 +msgid "cannot move directory over file" +msgstr "ä¸è½å°ç®å½ç§»å¨å°æ件" + +#: builtin/mv.c:128 +#, c-format +msgid "Huh? %.*s is in index?" +msgstr "å¯ï¼%.*s å¨æååºä¸ï¼" + +#: builtin/mv.c:140 +msgid "source directory is empty" +msgstr "æºç®å½ä¸ºç©º" + +#: builtin/mv.c:171 +msgid "not under version control" +msgstr "ä¸å¨çæ¬æ§å¶ä¹ä¸" + +#: builtin/mv.c:173 +msgid "destination exists" +msgstr "ç®æ å·²åå¨" + +#: builtin/mv.c:181 +#, c-format +msgid "overwriting '%s'" +msgstr "è¦ç '%s'" + +#: builtin/mv.c:184 +msgid "Cannot overwrite" +msgstr "ä¸è½è¦ç" + +#: builtin/mv.c:187 +msgid "multiple sources for the same target" +msgstr "åä¸ç®æ å ·æå¤ä¸ªæº" + +#: builtin/mv.c:202 +#, c-format +msgid "%s, source=%s, destination=%s" +msgstr "%sï¼æº=%sï¼ç®æ =%s" + +#: builtin/mv.c:212 +#, c-format +msgid "Renaming %s to %s\n" +msgstr "éå½å %s è³ %s\n" + +#: builtin/mv.c:215 +#, c-format +msgid "renaming '%s' failed" +msgstr "éå½å '%s' 失败" + +#: builtin/notes.c:139 +#, c-format +msgid "unable to start 'show' for object '%s'" +msgstr "ä¸è½ä¸ºå¯¹è±¡ '%s' å¼å§ 'show'" + +#: builtin/notes.c:145 +msgid "can't fdopen 'show' output fd" +msgstr "ä¸è½æå¼ 'show' è¾åºæ件å¥æ" + +#: builtin/notes.c:155 +#, c-format +msgid "failed to close pipe to 'show' for object '%s'" +msgstr "æ æ³ä¸ºå¯¹è±¡ '%s' ç 'show' å ³é管é" + +#: builtin/notes.c:158 +#, c-format +msgid "failed to finish 'show' for object '%s'" +msgstr "æ æ³ä¸ºå¯¹è±¡ '%s' å®æ 'show'" + +#: builtin/notes.c:175 builtin/tag.c:310 +#, c-format +msgid "could not create file '%s'" +msgstr "ä¸è½å建æ件 '%s'" + +#: builtin/notes.c:189 +msgid "Please supply the note contents using either -m or -F option" +msgstr "请éè¿ -m æ -F é项为注解æä¾å 容" + +#: builtin/notes.c:210 builtin/notes.c:973 +#, c-format +msgid "Removing note for object %s\n" +msgstr "å é¤å¯¹è±¡ %s ç注解\n" + +#: builtin/notes.c:215 +msgid "unable to write note object" +msgstr "ä¸è½å注解对象" + +#: builtin/notes.c:217 +#, c-format +msgid "The note contents has been left in %s" +msgstr "注解å 容被çå¨æ件 %s ä¸" + +#: builtin/notes.c:251 builtin/tag.c:465 +#, c-format +msgid "cannot read '%s'" +msgstr "ä¸è½è¯»å '%s'" + +#: builtin/notes.c:253 builtin/tag.c:468 +#, 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:481 +#, c-format +msgid "Failed to resolve '%s' as a valid ref." +msgstr "æ æ³è§£æ '%s' 为ä¸ä¸ªææå¼ç¨" + +#: builtin/notes.c:275 +#, c-format +msgid "Failed to read object '%s'." +msgstr "æ æ³è¯»å对象 '%s'ã" + +#: builtin/notes.c:299 +msgid "Cannot commit uninitialized/unreferenced notes tree" +msgstr "ä¸è½æ交æªåå§å/æªå¼ç¨ç注解æ " + +#: builtin/notes.c:340 +#, c-format +msgid "Bad notes.rewriteMode value: '%s'" +msgstr "é误ç notes.rewriteMode å¼ï¼'%s'" + +#: builtin/notes.c:350 +#, 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 +#, c-format +msgid "Bad %s value: '%s'" +msgstr "é误ç %s å¼ï¼'%s'" + +#: builtin/notes.c:441 +#, c-format +msgid "Malformed input line: '%s'." +msgstr "éæ³çè¾å ¥è¡ï¼'%s'ã" + +#: builtin/notes.c:456 +#, 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 +msgid "too many parameters" +msgstr "åæ°å¤ªå¤" + +#: builtin/notes.c:513 builtin/notes.c:772 +#, c-format +msgid "No note found for object %s." +msgstr "æªåç°å¯¹è±¡ %s ç注解ã" + +#: builtin/notes.c:580 +#, 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 +#, c-format +msgid "Overwriting existing notes for object %s\n" +msgstr "è¦ç对象 %s ç°å注解\n" + +#: builtin/notes.c:635 +msgid "too few parameters" +msgstr "åæ°å¤ªå°" + +#: builtin/notes.c:656 +#, 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 +#, c-format +msgid "Missing notes on source object %s. Cannot copy." +msgstr "æºå¯¹è±¡ %s 缺å°æ³¨è§£ãä¸è½æ·è´ã" + +#: builtin/notes.c:717 +#, c-format +msgid "" +"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" +"Please use 'git notes add -f -m/-F/-c/-C' instead.\n" +msgstr "" +"é项 -m/-F/-c/-C 已为 'edit' åå½ä»¤åºå¼ã\n" +"请æ¢ç¨ 'git notes add -f -m/-F/-c/-C'ã\n" + +#: builtin/notes.c:971 +#, c-format +msgid "Object %s has no note\n" +msgstr "对象 %s 没æ注解\n" + +#: builtin/notes.c:1103 +#, c-format +msgid "Unknown subcommand: %s" +msgstr "æªç¥åå½ä»¤ï¼%s" + +#: builtin/push.c:44 +msgid "tag shorthand without <tag>" +msgstr "tag ç®å没æè· <tag> åæ°" + +#: builtin/push.c:63 +msgid "--delete only accepts plain target ref names" +msgstr "--delete åªæ¥åç®åçå¼ç¨å称" + +#: builtin/push.c:73 +#, c-format +msgid "" +"You are not currently on a branch.\n" +"To push the history leading to the current (detached HEAD)\n" +"state now, use\n" +"\n" +" git push %s HEAD:<name-of-remote-branch>\n" +msgstr "" +"æ¨å½åä¸å¨ä¸ä¸ªåæ¯ä¸ã\n" +"ç°å¨ä¸ºæ¨éå½ååå²ï¼å离头æéï¼ï¼ä½¿ç¨\n" +"\n" +" git push %s HEAD:<name-of-remote-branch>\n" + +#: builtin/push.c:80 +#, c-format +msgid "" +"The current branch %s has no upstream branch.\n" +"To push the current branch and set the remote as upstream, use\n" +"\n" +" git push --set-upstream %s %s\n" +msgstr "" +"å½ååæ¯ %s 没æ对åºçä¸æ¸¸åæ¯ã\n" +"为æ¨éå½ååæ¯å¹¶å»ºç«ä¸è¿ç¨ä¸æ¸¸çè·è¸ªï¼ä½¿ç¨\n" +"\n" +" git push --set-upstream %s %s\n" + +#: builtin/push.c:88 +#, c-format +msgid "The current branch %s has multiple upstream branches, refusing to push." +msgstr "å½ååæ¯ %s æå¤ä¸ªä¸æ¸¸åæ¯ï¼æç»æ¨éã" + +#: builtin/push.c:111 +msgid "" +"You didn't specify any refspecs to push, and push.default is \"nothing\"." +msgstr "æ¨æ²¡æ为æ¨éæä¾ä»»ä½å¼ç¨è¡¨è¾¾å¼ï¼å¹¶ä¸ push.default 为 \"nothing\"ã" + +#: builtin/push.c:131 +#, c-format +msgid "Pushing to %s\n" +msgstr "æ¨éå° %s\n" + +#: builtin/push.c:135 +#, c-format +msgid "failed to push some refs to '%s'" +msgstr "æ æ³æ¨éä¸äºå¼ç¨å° '%s'" + +#: builtin/push.c:143 +#, c-format +msgid "" +"To prevent you from losing history, non-fast-forward updates were rejected\n" +"Merge the remote changes (e.g. 'git pull') before pushing again. See the\n" +"'Note about fast-forwards' section of 'git push --help' for details.\n" +msgstr "" +"为é²æ¢æ¨ä¸¢å¤±æ交åå²ï¼ç¦æ¢éå¿«è¿å¼æ¨éã\n" +"å次æ¨éåå ä¸è¿ç¨åæ´å并ï¼å¦ 'git pull'ï¼ã详è§\n" +"'git push --help' ä¸ç 'Note about fast-forwards' å°èã\n" + +#: builtin/push.c:160 +#, c-format +msgid "bad repository '%s'" +msgstr "é误ççæ¬åº '%s'" + +#: builtin/push.c:161 +msgid "" +"No configured push destination.\n" +"Either specify the URL from the command-line or configure a remote " +"repository using\n" +"\n" +" git remote add <name> <url>\n" +"\n" +"and then push using the remote name\n" +"\n" +" git push <name>\n" +msgstr "" +"æªé ç½®æ¨éç®æ ã\n" +"æè éè¿å½ä»¤è¡æä¾URLï¼æè ç¨ä¸é¢å½ä»¤é ç½®ä¸ä¸ªè¿ç¨çæ¬åº\n" +"\n" +" git remote add <name> <url>\n" +"\n" +"ç¶å使ç¨è¯¥è¿ç¨çæ¬åºåæ§è¡æ¨é\n" +"\n" +" git push <name>\n" + +#: builtin/push.c:176 +msgid "--all and --tags are incompatible" +msgstr "--all å --tags ä¸å ¼å®¹" + +#: builtin/push.c:177 +msgid "--all can't be combined with refspecs" +msgstr "--all ä¸è½åå¼ç¨è¡¨è¾¾å¼å ±ç¨" + +#: builtin/push.c:182 +msgid "--mirror and --tags are incompatible" +msgstr "--mirror å --tags ä¸å ¼å®¹" + +#: builtin/push.c:183 +msgid "--mirror can't be combined with refspecs" +msgstr "--mirror ä¸è½åå¼ç¨è¡¨è¾¾å¼å ±ç¨" + +#: builtin/push.c:188 +msgid "--all and --mirror are incompatible" +msgstr "--all å --mirror ä¸å ¼å®¹" + +#: builtin/push.c:272 +msgid "--delete is incompatible with --all, --mirror and --tags" +msgstr "--delete ä¸ --allã--mirror å --tags ä¸å ¼å®¹" + +#: builtin/push.c:274 +msgid "--delete doesn't make sense without any refs" +msgstr "--delete æªæ¥ä»»ä½å¼ç¨æ²¡ææä¹" + +#: builtin/reset.c:33 +msgid "mixed" +msgstr "æ··æ" + +#: builtin/reset.c:33 +msgid "soft" +msgstr "软æ§" + +#: builtin/reset.c:33 +msgid "hard" +msgstr "硬æ§" + +#: builtin/reset.c:33 +msgid "keep" +msgstr "ä¿æ" + +#: builtin/reset.c:77 +msgid "You do not have a valid HEAD." +msgstr "æ¨æ²¡æä¸ä¸ªææç HEADã" + +#: builtin/reset.c:79 +msgid "Failed to find tree of HEAD." +msgstr "æ æ³æ¾å° HEAD æåçæ ã" + +#: builtin/reset.c:85 +#, 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 +#, 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 +#, c-format +msgid "Cannot do a %s reset in the middle of a merge." +msgstr "å¨å并è¿ç¨ä¸ä¸è½å%séç½®æä½ã" + +#: builtin/reset.c:297 +#, c-format +msgid "Could not parse object '%s'." +msgstr "ä¸è½è§£æ对象 '%s'ã" + +#: builtin/reset.c:302 +msgid "--patch is incompatible with --{hard,mixed,soft}" +msgstr "--patch ä¸ --{hard,mixed,soft} ä¸å ¼å®¹" + +#: builtin/reset.c:311 +msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." +msgstr "--mixed 带路å¾å·²å¼ç¨ï¼ä»£ä¹ä»¥ 'git reset -- <paths>'ã" + +# æ±åä¹é´æ ç©ºæ ¼ï¼æ å é¤%sååç©ºæ ¼ +#: builtin/reset.c:313 +#, c-format +msgid "Cannot do %s reset with paths." +msgstr "ä¸è½å¸¦è·¯å¾è¿è¡%séç½®ã" + +# æ±åä¹é´æ ç©ºæ ¼ï¼æ å é¤%sååç©ºæ ¼ +#: builtin/reset.c:325 +#, c-format +msgid "%s reset is not allowed in a bare repository" +msgstr "ä¸è½å¯¹è£¸çæ¬åºè¿è¡%séç½®" + +#: builtin/reset.c:341 +#, c-format +msgid "Could not reset index file to revision '%s'." +msgstr "ä¸è½éç½®æååºè³çæ¬ '%s'ã" + +#: builtin/revert.c:70 builtin/revert.c:91 +#, c-format +msgid "%s: %s cannot be used with %s" +msgstr "%s: %s ä¸è½å %s å ±ç¨" + +#: builtin/revert.c:126 +msgid "program error" +msgstr "ç¨åºé误" + +#: builtin/revert.c:209 +msgid "revert failed" +msgstr "è¿å失败" + +#: builtin/revert.c:224 +msgid "cherry-pick failed" +msgstr "æ£é失败" + +#: builtin/rm.c:109 +#, c-format +msgid "" +"'%s' has staged content different from both the file and the HEAD\n" +"(use -f to force removal)" +msgstr "" +"'%s' æåçå 容åå·¥ä½åºæ件å HEAD ä¸çé½ä¸ä¸æ ·\n" +"ï¼ä½¿ç¨ -f 强å¶å é¤ï¼" + +#: builtin/rm.c:115 +#, c-format +msgid "" +"'%s' has changes staged in the index\n" +"(use --cached to keep the file, or -f to force removal)" +msgstr "" +"'%s' æåæ´å·²å å ¥æååºä¸\n" +"ï¼ä½¿ç¨ --cached ä¿åæ件ï¼æç¨ -f 强å¶å é¤ï¼" + +#: builtin/rm.c:119 +#, c-format +msgid "" +"'%s' has local modifications\n" +"(use --cached to keep the file, or -f to force removal)" +msgstr "" +"'%s' ææ¬å°ä¿®æ¹\n" +"ï¼ä½¿ç¨ --cached ä¿åæ件ï¼æç¨ -f 强å¶å é¤ï¼" + +#: builtin/rm.c:194 +#, c-format +msgid "not removing '%s' recursively without -r" +msgstr "æªæä¾ -r é项ä¸ä¼éå½å é¤ '%s'" + +#: builtin/rm.c:230 +#, c-format +msgid "git rm: unable to remove %s" +msgstr "git rmï¼ä¸è½å é¤ %s" + +#: builtin/shortlog.c:157 +#, c-format +msgid "Missing author: %s" +msgstr "缺å°ä½è ï¼%s" + +#: builtin/tag.c:172 +#, c-format +msgid "tag name too long: %.*s..." +msgstr "tag åå太é¿ï¼%.*s..." + +#: builtin/tag.c:177 +#, c-format +msgid "tag '%s' not found." +msgstr "tag '%s' æªåç°ã" + +#: builtin/tag.c:192 +#, c-format +msgid "Deleted tag '%s' (was %s)\n" +msgstr "å·²å é¤ tag '%s'ï¼æ¾ä¸º %sï¼\n" + +#: builtin/tag.c:204 +#, c-format +msgid "could not verify the tag '%s'" +msgstr "ä¸è½æ ¡éª tag '%s'" + +#: builtin/tag.c:214 +msgid "" +"\n" +"#\n" +"# Write a tag message\n" +"# Lines starting with '#' will be ignored.\n" +"#\n" +msgstr "" +"\n" +"#\n" +"# è¾å ¥ä¸ä¸ª tag 说æ\n" +"# 以 '#' å¼å¤´çè¡å°è¢«å¿½ç¥ã\n" +"#\n" + +#: builtin/tag.c:221 +msgid "" +"\n" +"#\n" +"# Write a tag message\n" +"# Lines starting with '#' will be kept; you may remove them yourself if you " +"want to.\n" +"#\n" +msgstr "" +"\n" +"#\n" +"# è¾å ¥ä¸ä¸ª tag 说æ\n" +"# 以 '#' å¼å¤´çè¡å°è¢«å¿½ç¥ï¼æ¨å¯ä»¥å é¤å®ä»¬å¦ææ¨æ³è¿æ ·åã\n" +"#\n" + +#: builtin/tag.c:261 +msgid "unable to sign the tag" +msgstr "æ æ³ç¾ç½² tag" + +#: builtin/tag.c:263 +msgid "unable to write tag file" +msgstr "æ æ³å tag æ件" + +#: builtin/tag.c:288 +msgid "bad object type." +msgstr "æ æç对象类å" + +#: builtin/tag.c:301 +msgid "tag header too big." +msgstr "tag 头信æ¯å¤ªå¤§" + +#: builtin/tag.c:333 +msgid "no tag message?" +msgstr "æ tag 说æï¼" + +#: builtin/tag.c:339 +#, c-format +msgid "The tag message has been left in %s\n" +msgstr "tag 说æ被ä¿çå¨ %s\n" + +#: builtin/tag.c:448 +msgid "-n option is only allowed with -l." +msgstr "-n é项åªå 许å -l å ±ç¨ã" + +#: builtin/tag.c:450 +msgid "--contains option is only allowed with -l." +msgstr "--contains é项åªå 许å -l å ±ç¨ã" + +#: builtin/tag.c:458 +msgid "only one -F or -m option is allowed." +msgstr "åªå 许ä¸ä¸ª -F æ -m é项ã" + +#: builtin/tag.c:478 +msgid "too many params" +msgstr "太å¤åæ°" + +#: builtin/tag.c:484 +#, c-format +msgid "'%s' is not a valid tag name." +msgstr "'%s' ä¸æ¯ä¸ä¸ªææçtagå称" + +#: builtin/tag.c:489 +#, c-format +msgid "tag '%s' already exists" +msgstr "tag '%s' å·²åå¨" + +#: builtin/tag.c:507 +#, c-format +msgid "%s: cannot lock the ref" +msgstr "%sï¼ä¸è½éå®å¼ç¨" + +#: builtin/tag.c:509 +#, c-format +msgid "%s: cannot update the ref" +msgstr "%sï¼ä¸è½æ´æ°å¼ç¨" + +#: builtin/tag.c:511 +#, c-format +msgid "Updated tag '%s' (was %s)\n" +msgstr "å·²æ´æ°tag '%s'ï¼æ¾ä¸º %sï¼\n" + +#: git-am.sh:49 +msgid "You need to set your committer info first" +msgstr "æ¨éè¦å è®¾ç½®ä½ çæ交è ä¿¡æ¯" + +#: git-am.sh:135 +msgid "Repository lacks necessary blobs to fall back on 3-way merge." +msgstr "çæ¬åºç¼ºä¹å¿ è¦ç blob æ°æ®ä»¥è¿è¡ä¸è·¯å并ã" + +#: git-am.sh:144 +msgid "" +"Did you hand edit your patch?\n" +"It does not apply to blobs recorded in its index." +msgstr "" +"æ¨æ¯å¦æ¾æå¨ç¼è¾è¿æ¨çè¡¥ä¸ï¼\n" +"æ æ³åºç¨è¡¥ä¸å°æååºçæ°æ®ä¸ã" + +#: git-am.sh:153 +msgid "Falling back to patching base and 3-way merge..." +msgstr "转è使ç¨è¡¥ä¸åºç¨çåºç¡çæ¬åä¸è·¯å并..." + +#: git-am.sh:265 +msgid "Only one StGIT patch series can be applied at once" +msgstr "ä¸æ¬¡åªè½æä¸ä¸ª StGIT è¡¥ä¸éå被åºç¨" + +#: git-am.sh:352 +#, sh-format +msgid "Patch format $patch_format is not supported." +msgstr "ä¸æ¯æ $patch_format è¡¥ä¸æ ¼å¼ã" + +#: git-am.sh:354 +msgid "Patch format detection failed." +msgstr "è¡¥ä¸æ ¼å¼æ£æµå¤±è´¥ã" + +#: git-am.sh:406 +msgid "-d option is no longer supported. Do not use." +msgstr "ä¸åæ¯æ -d é项ãä¸è¦ä½¿ç¨ã" + +#: git-am.sh:469 +#, sh-format +msgid "previous rebase directory $dotest still exists but mbox given." +msgstr "ä¹åçååºç®å½ $dotest ä»ç¶åå¨ä½ç»åºäºmboxã" + +#: git-am.sh:474 +msgid "Please make up your mind. --skip or --abort?" +msgstr "请ä¸å³å¿ã--skip ææ¯ --abort ï¼" + +#: git-am.sh:501 +msgid "Resolve operation not in progress, we are not resuming." +msgstr "解å³æä½æªè¿è¡ï¼æ们ä¸ä¼ç»§ç»ã" + +#: git-am.sh:567 +#, sh-format +msgid "Dirty index: cannot apply patches (dirty: $files)" +msgstr "èçæååºï¼ä¸è½åºç¨è¡¥ä¸ï¼èæ件ï¼$filesï¼" + +#: git-am.sh:743 +msgid "cannot be interactive without stdin connected to a terminal." +msgstr "没æåç»ç«¯å ³èçæ åè¾å ¥ä¸è½è¿è¡äº¤äºå¼æä½ã" + +# 注æä¿æå¥å°¾ç©ºæ ¼ +#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] +#. in your translation. The program will only accept English +#. input at this point. +#: git-am.sh:754 +msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " +msgstr "åºç¨ï¼[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " + +#: git-am.sh:790 +#, sh-format +msgid "Applying: $FIRSTLINE" +msgstr "æ£åºç¨ï¼$FIRSTLINE" + +#: git-am.sh:835 +msgid "No changes -- Patch already applied." +msgstr "没æåæ´ -- è¡¥ä¸å·²ç»åºç¨è¿ã" + +#: git-am.sh:861 +msgid "applying to an empty history" +msgstr "æ£åºç¨å°ä¸ä¸ªç©ºåå²ä¸" + +# 注æä¿æå¥å°¾ç©ºæ ¼ +#. TRANSLATORS: Make sure to include [Y] and [n] in your +#. translation. The program will only accept English input +#. at this point. +#: git-bisect.sh:54 +msgid "Do you want me to do it for you [Y/n]? " +msgstr "æ¨æ³è®©æ为æ¨è¿æ ·åä¹[Y/n]ï¼ " + +#: git-bisect.sh:95 +#, sh-format +msgid "unrecognised option: '$arg'" +msgstr "æªè¯å«çé项ï¼'$arg'" + +#: git-bisect.sh:99 +#, sh-format +msgid "'$arg' does not appear to be a valid revision" +msgstr "'$arg' çèµ·æ¥ä¸åæ¯ä¸ä¸ªææççæ¬" + +#: git-bisect.sh:117 +msgid "Bad HEAD - I need a HEAD" +msgstr "åç HEAD - æéè¦ä¸ä¸ª HEAD" + +#: git-bisect.sh:130 +#, sh-format +msgid "" +"Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'." +msgstr "æ£åº '$start_head' 失败ãå°è¯ 'git bisect reset <validbranch>'ã" + +#: git-bisect.sh:140 +msgid "won't bisect on seeked tree" +msgstr "ä¸ä¼å¨å·²æ¥æ¾è¿çæ ä¸äºåæ¥æ¾" + +#: git-bisect.sh:144 +msgid "Bad HEAD - strange symbolic ref" +msgstr "é误ç HEAD - å¥æªç符å·å¼ç¨" + +#: git-bisect.sh:189 +#, sh-format +msgid "Bad bisect_write argument: $state" +msgstr "é误çbisect_writeåæ°ï¼$state" + +#: git-bisect.sh:218 +#, sh-format +msgid "Bad rev input: $arg" +msgstr "è¾å ¥é误çæ¬ï¼$arg" + +#: git-bisect.sh:232 +msgid "Please call 'bisect_state' with at least one argument." +msgstr "请å¨è°ç¨ 'bisect_state' æ¶è·è³å°ä¸ä¸ªåæ°ã" + +#: git-bisect.sh:244 +#, sh-format +msgid "Bad rev input: $rev" +msgstr "è¾å ¥åççæ¬ï¼$rev" + +#: git-bisect.sh:250 +msgid "'git bisect bad' can take only one argument." +msgstr "'git bisect bad' åªè½å¸¦ä¸ä¸ªåæ°ã" + +# 注æä¿æå¥å°¾ç©ºæ ¼ +#. TRANSLATORS: Make sure to include [Y] and [n] in your +#. translation. The program will only accept English input +#. at this point. +#: git-bisect.sh:279 +msgid "Are you sure [Y/n]? " +msgstr "æ¨ç¡®è®¤ä¹[Y/n]ï¼ " + +#: git-bisect.sh:354 +#, sh-format +msgid "'$invalid' is not a valid commit" +msgstr "'$invalid' ä¸æ¯ä¸ä¸ªææçæ交" + +#: git-bisect.sh:363 +#, sh-format +msgid "" +"Could not check out original HEAD '$branch'.\n" +"Try 'git bisect reset <commit>'." +msgstr "" +"ä¸è½æ£åºåå§ HEAD '$branch'ã\n" +"å°è¯ 'git bisect reset <commit>'ã" + +#: git-bisect.sh:390 +msgid "No logfile given" +msgstr "æªæä¾æ¥å¿æ件" + +#: git-bisect.sh:391 +#, sh-format +msgid "cannot read $file for replaying" +msgstr "ä¸è½è¯»å $file æ¥éæ¾" + +#: git-bisect.sh:408 +msgid "?? what are you talking about?" +msgstr "?? æ¨å¨è¯´ä»ä¹?" + +#: git-bisect.sh:474 +msgid "We are not bisecting." +msgstr "æ们没æè¿è¡äºåæ¥æ¾ã" + +#: git-pull.sh:21 +msgid "" +"Pull is not possible because you have unmerged files.\n" +"Please, fix them up in the work tree, and then use 'git add/rm <file>'\n" +"as appropriate to mark resolution, or use 'git commit -a'." +msgstr "" +"Pull ä¸å¯ç¨ï¼å ä¸ºä½ å°ææªå并çæ件ã请å å¨å·¥ä½åºæ¹æ£æ件ï¼\n" +"ç¶åé æ ä½¿ç¨ 'git add/rm <file>' æ 记解å³æ¹æ¡ï¼\n" +"æä½¿ç¨ 'git commit -a'ã" + +#: git-pull.sh:25 +msgid "Pull is not possible because you have unmerged files." +msgstr "Pull ä¸å¯ç¨ï¼å ä¸ºä½ å°ææªå并çæ件ã" + +#: git-pull.sh:193 +msgid "updating an unborn branch with changes added to the index" +msgstr "æ´æ°å°æªè¯ççåæ¯ï¼åæ´æ·»å è³æååº" + +#: git-pull.sh:249 +msgid "Cannot merge multiple branches into empty head" +msgstr "æ æ³å°å¤ä¸ªåæ¯å并å°ç©ºåæ¯" + +#: git-pull.sh:253 +msgid "Cannot rebase onto multiple branches" +msgstr "æ æ³ååºå°å¤ä¸ªåæ¯" + +#: git-stash.sh:51 +msgid "git stash clear with parameters is unimplemented" +msgstr "git stash clear ä¸æ¯æåæ°" + +#: git-stash.sh:74 +msgid "You do not have the initial commit yet" +msgstr "æ¨å°æªå»ºç«åå§æ交" + +#: git-stash.sh:89 +msgid "Cannot save the current index state" +msgstr "æ æ³ä¿åå½åæååºç¶æ" + +#: git-stash.sh:123 git-stash.sh:136 +msgid "Cannot save the current worktree state" +msgstr "æ æ³ä¿åå½åå·¥ä½åºç¶æ" + +#: git-stash.sh:140 +msgid "No changes selected" +msgstr "没æä¿®æ¹è¢«éæ©" + +#: git-stash.sh:143 +msgid "Cannot remove temporary index (can't happen)" +msgstr "æ æ³å é¤ä¸´æ¶æååºï¼ä¸åºåçï¼" + +#: git-stash.sh:156 +msgid "Cannot record working tree state" +msgstr "ä¸è½è®°å½å·¥ä½åºç¶æ" + +#: git-stash.sh:223 +msgid "No local changes to save" +msgstr "没æè¦ä¿åçæ¬å°ä¿®æ¹" + +#: git-stash.sh:227 +msgid "Cannot initialize stash" +msgstr "æ æ³åå§åstash" + +#: git-stash.sh:235 +msgid "Cannot save the current status" +msgstr "æ æ³ä¿åå½åç¶æ" + +#: git-stash.sh:253 +msgid "Cannot remove worktree changes" +msgstr "æ æ³å é¤å·¥ä½åºåæ´" + +#: git-stash.sh:352 +msgid "No stash found." +msgstr "æªåç°stashã" + +#: git-stash.sh:359 +#, sh-format +msgid "Too many revisions specified: $REV" +msgstr "æä¾å¤ªå¤ççæ¬ï¼$REV" + +#: git-stash.sh:365 +#, sh-format +msgid "$reference is not valid reference" +msgstr "$reference ä¸æ¯ææçå¼ç¨" + +#: git-stash.sh:393 +#, sh-format +msgid "'$args' is not a stash-like commit" +msgstr "'$args' ä¸æ¯stashæ ·æ交" + +#: git-stash.sh:404 +#, sh-format +msgid "'$args' is not a stash reference" +msgstr "'$args' ä¸æ¯ä¸ä¸ªstashå¼ç¨" + +#: git-stash.sh:412 +msgid "unable to refresh index" +msgstr "æ æ³å·æ°æååº" + +#: git-stash.sh:416 +msgid "Cannot apply a stash in the middle of a merge" +msgstr "æ æ³å¨å并è¿ç¨ä¸æ¢å¤è¿åº¦" + +#: git-stash.sh:424 +msgid "Conflicts in index. Try without --index." +msgstr "æååºå²çªãå°è¯ä¸ç¨ --indexã" + +#: git-stash.sh:426 +msgid "Could not save index tree" +msgstr "æ æ³ä¿åæååº" + +#: git-stash.sh:460 +msgid "Cannot unstage modified files" +msgstr "æ æ³è¿åä¿®æ¹çæ件" + +#: git-stash.sh:491 +#, sh-format +msgid "Dropped ${REV} ($s)" +msgstr "丢å¼äº ${REV} ($s)" + +#: git-stash.sh:492 +#, sh-format +msgid "${REV}: Could not drop stash entry" +msgstr "${REV}: æ æ³ä¸¢å¼è¿åº¦æ¡ç®" + +#: git-stash.sh:499 +msgid "No branch name specified" +msgstr "æªæå®åæ¯å" + +#: git-stash.sh:570 +msgid "(To restore them type \"git stash apply\")" +msgstr "ï¼ä¸ºæ¢å¤æ°æ®è¾å ¥ \"git stash apply\"ï¼" + +#: git-submodule.sh:56 +#, sh-format +msgid "cannot strip one component off url '$remoteurl'" +msgstr "æ æ³ä» url '$remoteurl' å¥ç¦»ä¸ä¸ªç»ä»¶" + +#: git-submodule.sh:108 +#, sh-format +msgid "No submodule mapping found in .gitmodules for path '$path'" +msgstr "æªå¨ .gitmodules ä¸åç°è·¯å¾ '$path' çå模ç»æ å°" + +#: git-submodule.sh:173 +#, sh-format +msgid "Clone of '$url' into submodule path '$path' failed" +msgstr "å é '$url' å°å模ç»è·¯å¾ '$path' 失败" + +#: git-submodule.sh:247 +#, sh-format +msgid "repo URL: '$repo' must be absolute or begin with ./|../" +msgstr "çæ¬åºURLï¼'$repo' å¿ é¡»æ¯ç»å¯¹è·¯å¾æ以 ./|../ èµ·å§" + +#: git-submodule.sh:264 +#, sh-format +msgid "'$path' already exists in the index" +msgstr "'$path' å·²ç»åå¨äºæååºä¸" + +#: git-submodule.sh:281 +#, sh-format +msgid "'$path' already exists and is not a valid git repo" +msgstr "'$path' å·²åå¨ä¸ä¸æ¯ä¸ä¸ªææç git çæ¬åº" + +#: git-submodule.sh:295 +#, sh-format +msgid "Unable to checkout submodule '$path'" +msgstr "ä¸è½æ£åºåæ¨¡ç» '$path'" + +#: git-submodule.sh:300 +#, sh-format +msgid "Failed to add submodule '$path'" +msgstr "æ æ³æ·»å åæ¨¡ç» '$path'" + +#: git-submodule.sh:305 +#, sh-format +msgid "Failed to register submodule '$path'" +msgstr "æ æ³æ³¨ååæ¨¡ç» '$path'" + +#: git-submodule.sh:347 +#, sh-format +msgid "Entering '$prefix$path'" +msgstr "æ£å¨è¿å ¥ '$prefix$path'" + +#: git-submodule.sh:359 +#, sh-format +msgid "Stopping at '$path'; script returned non-zero status." +msgstr "åæ¢äº '$path'ï¼èæ¬è¿åéé¶å¼ã" + +#: git-submodule.sh:401 +#, sh-format +msgid "No url found for submodule path '$path' in .gitmodules" +msgstr "å¨ .gitmodules ä¸æªæ¾å°å模ç»è·¯å¾ '$path' çurl" + +#: git-submodule.sh:410 +#, sh-format +msgid "Failed to register url for submodule path '$path'" +msgstr "æ æ³ä¸ºå模ç»è·¯å¾ '$path' 注å url" + +#: git-submodule.sh:418 +#, sh-format +msgid "Failed to register update mode for submodule path '$path'" +msgstr "æ æ³ä¸ºå模ç»è·¯å¾ '$path' 注åæ´æ°æ¨¡å¼" + +#: git-submodule.sh:420 +#, sh-format +msgid "Submodule '$name' ($url) registered for path '$path'" +msgstr "åæ¨¡ç» '$name' ($url) å·²ä¸ºè·¯å¾ '$path' 注å" + +#: git-submodule.sh:519 +#, sh-format +msgid "" +"Submodule path '$path' not initialized\n" +"Maybe you want to use 'update --init'?" +msgstr "" +"å模ç»è·¯å¾ '$path' 没æåå§å\n" +"ä¹è®¸ä½ æ³ç¨ 'update --init'ï¼" + +#: git-submodule.sh:532 +#, sh-format +msgid "Unable to find current revision in submodule path '$path'" +msgstr "æ æ³å¨å模ç»è·¯å¾ '$path' ä¸æ¾å°å½åçæ¬" + +#: git-submodule.sh:551 +#, sh-format +msgid "Unable to fetch in submodule path '$path'" +msgstr "æ æ³å¨å模ç»è·¯å¾ '$path' ä¸è·å" + +#: git-submodule.sh:565 +#, sh-format +msgid "Unable to rebase '$sha1' in submodule path '$path'" +msgstr "æ æ³å¨å模ç»è·¯å¾ '$path' ä¸ååº '$sha1'" + +#: git-submodule.sh:566 +#, sh-format +msgid "Submodule path '$path': rebased into '$sha1'" +msgstr "å模ç»è·¯å¾ '$path'ï¼ååºè³ '$sha1'" + +#: git-submodule.sh:571 +#, sh-format +msgid "Unable to merge '$sha1' in submodule path '$path'" +msgstr "æ æ³å并 '$sha1' å°å模ç»è·¯å¾ '$path' ä¸" + +#: git-submodule.sh:572 +#, sh-format +msgid "Submodule path '$path': merged in '$sha1'" +msgstr "å模ç»è·¯å¾ '$path'ï¼å·²åå¹¶å ¥ '$sha1'" + +#: git-submodule.sh:577 +#, sh-format +msgid "Unable to checkout '$sha1' in submodule path '$path'" +msgstr "æ æ³å¨å模ç»è·¯å¾ '$path' ä¸æ£åº '$sha1'" + +#: git-submodule.sh:578 +#, sh-format +msgid "Submodule path '$path': checked out '$sha1'" +msgstr "å模ç»è·¯å¾ '$path'ï¼æ£åº '$sha1'" + +#: git-submodule.sh:600 git-submodule.sh:923 +#, sh-format +msgid "Failed to recurse into submodule path '$path'" +msgstr "æ æ³éå½è¿å模ç»è·¯å¾ '$path'" + +#: git-submodule.sh:708 +msgid "--" +msgstr "--" + +# 注æä¿æåå¯¼ç©ºæ ¼ +#: git-submodule.sh:766 +#, sh-format +msgid " Warn: $name doesn't contain commit $sha1_src" +msgstr " è¦åï¼$name æªå å«æ交 $sha1_src" + +# 注æä¿æåå¯¼ç©ºæ ¼ +#: git-submodule.sh:769 +#, sh-format +msgid " Warn: $name doesn't contain commit $sha1_dst" +msgstr " è¦åï¼$name æªå å«æ交 $sha1_dst" + +# 注æä¿æåå¯¼ç©ºæ ¼ +#: git-submodule.sh:772 +#, sh-format +msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst" +msgstr " è¦åï¼$name æªå å«æ交 $sha1_src å $sha1_dst" + +#: git-submodule.sh:797 +msgid "blob" +msgstr "blob" + +#: git-submodule.sh:798 +msgid "submodule" +msgstr "å模ç»" + +#: git-submodule.sh:969 +#, sh-format +msgid "Synchronizing submodule url for '$name'" +msgstr "为 '$name' åæ¥å模ç»url" -- 2.26.2