# 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-07-03 10:23+0800\n" "PO-Revision-Date: 2012-07-04 22:38+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=2; plural=(n != 1);\n" #: advice.c:40 #, 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:70 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'。" #: bundle.c:36 #, c-format msgid "'%s' does not look like a v2 bundle file" msgstr "'%s' ä¸åƒæ˜¯ä¸€ä¸ª v2 版本的包文件" #: bundle.c:63 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "未能识别的包头:%s%s (%d)" #: bundle.c:89 builtin/commit.c:696 #, c-format msgid "could not open '%s'" msgstr "ä¸èƒ½æ‰“å¼€ '%s'" #: bundle.c:140 msgid "Repository lacks these prerequisite commits:" msgstr "版本库缺少这些必备的æ交:" #: bundle.c:164 sequencer.c:550 sequencer.c:982 builtin/log.c:290 #: builtin/log.c:721 builtin/log.c:1310 builtin/log.c:1529 builtin/merge.c:347 #: builtin/shortlog.c:181 msgid "revision walk setup failed" msgstr "版本é历设置失败" #: bundle.c:186 #, c-format msgid "The bundle contains %d ref" msgid_plural "The bundle contains %d refs" msgstr[0] "这个包ä¸å«æœ‰ %d 个引用" msgstr[1] "这个包ä¸å«æœ‰ %d 个引用" #: bundle.c:192 msgid "The bundle records a complete history." msgstr "这个包记录一个完整历å²ã€‚" #: bundle.c:195 #, c-format msgid "The bundle requires this ref" msgid_plural "The bundle requires these %d refs" msgstr[0] "这个包需è¦è¿™ä¸ªå¼•ç”¨" msgstr[1] "è¿™ä¸ªåŒ…éœ€è¦ %d 个这些引用" #: bundle.c:294 msgid "rev-list died" msgstr "rev-list 终æ¢" #: bundle.c:300 builtin/log.c:1206 builtin/shortlog.c:284 #, c-format msgid "unrecognized argument: %s" msgstr "未能识别的å‚数:%s" #: bundle.c:335 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "引用 '%s' 被 rev-list 选项排除" #: bundle.c:380 msgid "Refusing to create empty bundle." msgstr "ä¸èƒ½åˆ›å»ºç©ºåŒ…。" #: bundle.c:398 msgid "Could not spawn pack-objects" msgstr "ä¸èƒ½ç”Ÿæˆ pack-objects 进程" #: bundle.c:416 msgid "pack-objects died" msgstr "pack-objects 终æ¢" #: bundle.c:419 #, c-format msgid "cannot create '%s'" msgstr "ä¸èƒ½åˆ›å»º '%s'" #: bundle.c:441 msgid "index-pack died" msgstr "index-pack 终æ¢" #: commit.c:48 #, c-format msgid "could not parse %s" msgstr "ä¸èƒ½è§£æž %s" #: commit.c:50 #, 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" #: date.c:95 msgid "in the future" msgstr "在将æ¥" #: date.c:101 #, c-format msgid "%lu second ago" msgid_plural "%lu seconds ago" msgstr[0] "%lu 秒钟之å‰" msgstr[1] "%lu 秒钟之å‰" #: date.c:108 #, c-format msgid "%lu minute ago" msgid_plural "%lu minutes ago" msgstr[0] "%lu 分钟之å‰" msgstr[1] "%lu 分钟之å‰" #: date.c:115 #, c-format msgid "%lu hour ago" msgid_plural "%lu hours ago" msgstr[0] "%lu å°æ—¶ä¹‹å‰" msgstr[1] "%lu å°æ—¶ä¹‹å‰" #: date.c:122 #, c-format msgid "%lu day ago" msgid_plural "%lu days ago" msgstr[0] "%lu 天之å‰" msgstr[1] "%lu 天之å‰" #: date.c:128 #, c-format msgid "%lu week ago" msgid_plural "%lu weeks ago" msgstr[0] "%lu 周之å‰" msgstr[1] "%lu 周之å‰" #: date.c:135 #, c-format msgid "%lu month ago" msgid_plural "%lu months ago" msgstr[0] "%lu 个月之å‰" msgstr[1] "%lu 个月之å‰" #: date.c:146 #, c-format msgid "%lu year" msgid_plural "%lu years" msgstr[0] "%lu å¹´" msgstr[1] "%lu å¹´" #: date.c:149 #, c-format msgid "%s, %lu month ago" msgid_plural "%s, %lu months ago" msgstr[0] "%s,%lu 个月之å‰" msgstr[1] "%s,%lu 个月之å‰" #: date.c:154 date.c:159 #, c-format msgid "%lu year ago" msgid_plural "%lu years ago" msgstr[0] "%lu å¹´å‰" msgstr[1] "%lu å¹´å‰" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: diff.c:105 #, c-format msgid " Failed to parse dirstat cut-off percentage '%.*s'\n" msgstr " æ— æ³•è§£æž dirstat 阈值 '%.*s'\n" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: diff.c:110 #, c-format msgid " Unknown dirstat parameter '%.*s'\n" msgstr " 未知 dirstat å‚æ•° '%.*s'\n" #: diff.c:210 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" "%s" msgstr "" "å‘现é…ç½®å˜é‡ 'diff.dirstat' ä¸çš„错误:\n" "%s" #: diff.c:1400 msgid " 0 files changed\n" msgstr " 0 个文件被修改\n" #: diff.c:1404 #, c-format msgid " %d file changed" msgid_plural " %d files changed" msgstr[0] " %d 个文件被修改" msgstr[1] " %d 个文件被修改" #: diff.c:1421 #, c-format msgid ", %d insertion(+)" msgid_plural ", %d insertions(+)" msgstr[0] ",æ’å…¥ %d è¡Œ(+)" msgstr[1] ",æ’å…¥ %d è¡Œ(+)" #: diff.c:1432 #, c-format msgid ", %d deletion(-)" msgid_plural ", %d deletions(-)" msgstr[0] "ï¼Œåˆ é™¤ %d è¡Œ(-)" msgstr[1] "ï¼Œåˆ é™¤ %d è¡Œ(-)" #: diff.c:3478 #, 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 æ— æ³•ä¸ºæ•°æ®ç¾å" #: grep.c:1320 #, c-format msgid "'%s': unable to read %s" msgstr "'%s'ï¼šæ— æ³•è¯»å– %s" #: grep.c:1337 #, c-format msgid "'%s': %s" msgstr "'%s':%s" #: grep.c:1348 #, c-format msgid "'%s': short read %s" msgstr "'%s':读å–ä¸å®Œæ•´ %s" #: help.c:208 #, c-format msgid "available git commands in '%s'" msgstr "在 '%s' 下å¯ç”¨çš„ git 命令" #: help.c:215 msgid "git commands available from elsewhere on your $PATH" msgstr "在 $PATH 路径ä¸çš„其他地方å¯ç”¨çš„ git 命令" #: help.c:271 #, 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 å—æŸï¼Ÿ" #: help.c:328 msgid "Uh oh. Your system reports no Git commands at all." msgstr "唉呀,您的系统ä¸æœªå‘现 Git 命令。" #: help.c:350 #, c-format msgid "" "WARNING: You called a Git command named '%s', which does not exist.\n" "Continuing under the assumption that you meant '%s'" msgstr "" "è¦å‘Šï¼šæ‚¨è¿è¡Œä¸€ä¸ªä¸å˜åœ¨çš„ Git 命令 '%s'。继ç»æ‰§è¡Œå‡å®šæ‚¨è¦è¦è¿è¡Œçš„\n" "是 '%s'" #: help.c:355 #, c-format msgid "in %0.1f seconds automatically..." msgstr "在 %0.1f 秒钟åŽè‡ªåŠ¨è¿è¡Œ..." #: help.c:362 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git:'%s' ä¸æ˜¯ä¸€ä¸ª git 命令。å‚è§ 'git --help'。" #: help.c:366 msgid "" "\n" "Did you mean this?" msgid_plural "" "\n" "Did you mean one of these?" msgstr[0] "" "\n" "您指的是这个么?" msgstr[1] "" "\n" "您指的是这些其ä¸ä¸€ä¸ªä¹ˆï¼Ÿ" #: parse-options.c:493 msgid "..." msgstr "..." #: parse-options.c:511 #, c-format msgid "usage: %s" msgstr "用法:%s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation #: parse-options.c:515 #, c-format msgid " or: %s" msgstr " 或:%s" # 译者:为ä¿è¯åœ¨è¾“出ä¸å¯¹é½ï¼Œæ³¨æ„调整å¥ä¸ç©ºæ ¼ï¼ #: parse-options.c:518 #, c-format msgid " %s" msgstr " %s" #: remote.c:1629 #, 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:1635 #, 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" msgstr[1] "您的分支è½åŽ '%s' å…± %d 个æ交,并且å¯ä»¥å¿«è¿›ã€‚\n" #: remote.c:1643 #, 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" msgstr[1] "" "您的分支和 '%s' 出现了å离,\n" "并且å„自分别有 %d å’Œ %d 处ä¸åŒçš„æ交。\n" #: sequencer.c:121 builtin/merge.c:865 builtin/merge.c:978 #: builtin/merge.c:1088 builtin/merge.c:1098 #, c-format msgid "Could not open '%s' for writing" msgstr "ä¸èƒ½ä¸ºå†™å…¥æ‰“å¼€ '%s'" #: sequencer.c:123 builtin/merge.c:333 builtin/merge.c:868 #: builtin/merge.c:1090 builtin/merge.c:1103 #, c-format msgid "Could not write to '%s'" msgstr "ä¸èƒ½å†™å…¥ '%s'" #: sequencer.c:144 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" msgstr "" "冲çªè§£å†³å®Œæ¯•åŽï¼Œç”¨ 'git add <paths>' 或 'git rm <paths>'\n" "å‘½ä»¤æ ‡è®°ä¿®æ£åŽçš„文件" #: sequencer.c:147 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:160 sequencer.c:758 sequencer.c:841 #, c-format msgid "Could not write to %s" msgstr "ä¸èƒ½å†™å…¥ %s" #: sequencer.c:163 #, c-format msgid "Error wrapping up %s" msgstr "错误收尾 %s" #: sequencer.c:178 msgid "Your local changes would be overwritten by cherry-pick." msgstr "您的本地修改将被拣选æ“作覆盖。" #: sequencer.c:180 msgid "Your local changes would be overwritten by revert." msgstr "您的本地修改将被还原æ“作覆盖。" #: sequencer.c:183 msgid "Commit your changes or stash them to proceed." msgstr "æ交您的修改或ä¿å˜è¿›åº¦åŽå†ç»§ç»ã€‚" #. TRANSLATORS: %s will be "revert" or "cherry-pick" #: sequencer.c:233 #, c-format msgid "%s: Unable to write new index file" msgstr "%sï¼šæ— æ³•å†™å…¥æ–°ç´¢å¼•æ–‡ä»¶" #: sequencer.c:261 msgid "Could not resolve HEAD commit\n" msgstr "ä¸èƒ½è§£æž HEAD æ交\n" #: sequencer.c:282 msgid "Unable to update cache tree\n" msgstr "ä¸èƒ½æ›´æ–°ç¼“å˜\n" #: sequencer.c:324 #, c-format msgid "Could not parse commit %s\n" msgstr "ä¸èƒ½è§£æžæ交 %s\n" #: sequencer.c:329 #, c-format msgid "Could not parse parent commit %s\n" msgstr "ä¸èƒ½è§£æžçˆ¶æ交 %s\n" #: sequencer.c:395 msgid "Your index file is unmerged." msgstr "您的索引文件未完æˆåˆå¹¶ã€‚" #: sequencer.c:398 msgid "You do not have a valid HEAD" msgstr "您没有一个有效的 HEAD" #: sequencer.c:413 #, c-format msgid "Commit %s is a merge but no -m option was given." msgstr "æ交 %s 是一个åˆå¹¶æ交但未æä¾› -m 选项。" #: sequencer.c:421 #, c-format msgid "Commit %s does not have parent %d" msgstr "æ交 %s 没有父æ交 %d" #: sequencer.c:425 #, 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:436 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s:ä¸èƒ½è§£æžçˆ¶æ交 %s" #: sequencer.c:440 #, c-format msgid "Cannot get commit message for %s" msgstr "ä¸èƒ½å¾—到 %s çš„æ交说明" #: sequencer.c:524 #, c-format msgid "could not revert %s... %s" msgstr "ä¸èƒ½è¿˜åŽŸ %s... %s" #: sequencer.c:525 #, c-format msgid "could not apply %s... %s" msgstr "ä¸èƒ½åº”用 %s... %s" #: sequencer.c:553 msgid "empty commit set passed" msgstr "æ供了空的æ交集" #: sequencer.c:561 #, c-format msgid "git %s: failed to read the index" msgstr "git %sï¼šæ— æ³•è¯»å–索引" #: sequencer.c:566 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %sï¼šæ— æ³•åˆ·æ–°ç´¢å¼•" #: sequencer.c:624 #, c-format msgid "Cannot %s during a %s" msgstr "æ— æ³• %s 在一个 %s 过程ä¸" #: sequencer.c:646 #, c-format msgid "Could not parse line %d." msgstr "ä¸èƒ½è§£æžç¬¬ %d 行。" #: sequencer.c:651 msgid "No commits parsed." msgstr "没有æ交被解æžã€‚" #: sequencer.c:664 #, c-format msgid "Could not open %s" msgstr "ä¸èƒ½æ‰“å¼€ %s" #: sequencer.c:668 #, c-format msgid "Could not read %s." msgstr "ä¸èƒ½è¯»å– %s。" #: sequencer.c:675 #, c-format msgid "Unusable instruction sheet: %s" msgstr "æ— ç”¨çš„æŒ‡ä»¤è¡¨å•ï¼š%s" #: sequencer.c:703 #, c-format msgid "Invalid key: %s" msgstr "æ— æ•ˆé”®å:%s" #: sequencer.c:706 #, c-format msgid "Invalid value for %s: %s" msgstr "%s çš„å€¼æ— æ•ˆï¼š%s" #: sequencer.c:718 #, c-format msgid "Malformed options sheet: %s" msgstr "éžæ³•çš„选项表å•ï¼š%s" #: sequencer.c:739 msgid "a cherry-pick or revert is already in progress" msgstr "一个拣选或还原æ“作已在进行" #: sequencer.c:740 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "å°è¯• \"git cherry-pick (--continue | --quit | --abort)\"" #: sequencer.c:744 #, c-format msgid "Could not create sequencer directory %s" msgstr "ä¸èƒ½åˆ›å»ºåºåˆ—目录 %s" #: sequencer.c:760 sequencer.c:845 #, c-format msgid "Error wrapping up %s." msgstr "错误收尾 %s。" #: sequencer.c:779 sequencer.c:913 msgid "no cherry-pick or revert in progress" msgstr "没有拣选或还原æ“作在进行" #: sequencer.c:781 msgid "cannot resolve HEAD" msgstr "ä¸èƒ½è§£æž HEAD" #: sequencer.c:783 msgid "cannot abort from a branch yet to be born" msgstr "ä¸èƒ½ä»Žå°šæœªå»ºç«‹çš„分支终æ¢" #: sequencer.c:805 builtin/apply.c:3697 #, c-format msgid "cannot open %s: %s" msgstr "ä¸èƒ½æ‰“å¼€ %s:%s" #: sequencer.c:808 #, c-format msgid "cannot read %s: %s" msgstr "ä¸èƒ½è¯»å– %s:%s" #: sequencer.c:809 msgid "unexpected end of file" msgstr "未预期的文件结æŸ" #: sequencer.c:815 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "ä¿å˜æ‹£é€‰æ交å‰çš„ HEAD 文件 '%s' æŸå" #: sequencer.c:838 #, c-format msgid "Could not format %s." msgstr "ä¸èƒ½æ ¼å¼åŒ– %s。" #: sequencer.c:1000 msgid "Can't revert as initial commit" msgstr "ä¸èƒ½ä½œä¸ºåˆå§‹æ交还原" #: sequencer.c:1001 msgid "Can't cherry-pick into empty head" msgstr "ä¸èƒ½æ‹£é€‰åˆ°ç©ºåˆ†æ”¯" #: sha1_name.c:864 msgid "HEAD does not point to a branch" msgstr "HEAD 没有指å‘一个分支" #: sha1_name.c:867 #, c-format msgid "No such branch: '%s'" msgstr "没有æ¤åˆ†æ”¯ï¼š'%s'" #: sha1_name.c:869 #, c-format msgid "No upstream configured for branch '%s'" msgstr "尚未给分支 '%s' 设置上游" #: sha1_name.c:872 #, c-format msgid "Upstream branch '%s' not stored as a remote-tracking branch" msgstr "上游分支 '%s' 没有å˜å‚¨ä¸ºä¸€ä¸ªè¿œç¨‹è·Ÿè¸ªåˆ†æ”¯" #: wrapper.c:413 #, c-format msgid "unable to look up current user in the passwd file: %s" msgstr "æ— æ³•åœ¨ passwd 文件ä¸æŸ¥è¯¢åˆ°å½“å‰ç”¨æˆ·ï¼š%s" #: wrapper.c:414 msgid "no such user" msgstr "æ— æ¤ç”¨æˆ·" #: wt-status.c:141 msgid "Unmerged paths:" msgstr "未åˆå¹¶çš„路径:" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:168 wt-status.c:195 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" msgstr " (使用 \"git reset %s <file>...\" 撤出暂å˜åŒºï¼‰" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:170 wt-status.c:197 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr " (使用 \"git rm --cached <file>...\" 撤出暂å˜åŒºï¼‰" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:174 msgid " (use \"git add <file>...\" to mark resolution)" msgstr " (使用 \"git add <file>...\" æ ‡è®°è§£å†³æ–¹æ¡ˆï¼‰" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:176 wt-status.c:180 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr " (酌情使用 \"git add/rm <file>...\" æ ‡è®°è§£å†³æ–¹æ¡ˆï¼‰" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:178 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (使用 \"git rm <file>...\" æ ‡è®°è§£å†³æ–¹æ¡ˆï¼‰" #: wt-status.c:189 msgid "Changes to be committed:" msgstr "è¦æ交的å˜æ›´ï¼š" #: wt-status.c:207 msgid "Changes not staged for commit:" msgstr "尚未暂å˜ä»¥å¤‡æ交的å˜æ›´ï¼š" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:211 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr " (使用 \"git add <file>...\" æ›´æ–°è¦æ交的内容)" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:213 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr " (使用 \"git add/rm <file>...\" æ›´æ–°è¦æ交的内容)" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:214 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr " (使用 \"git checkout -- <file>...\" 丢弃工作区的改动)" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:216 msgid " (commit or discard the untracked or modified content in submodules)" msgstr " (æ交或丢弃å模组ä¸æœªè·Ÿè¸ªæˆ–修改的内容)" #: wt-status.c:225 #, c-format msgid "%s files:" msgstr "%s文件:" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:228 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr " (使用 \"git %s <file>...\" 以包å«è¦æ交的内容)" #: wt-status.c:245 msgid "bug" msgstr "bug" #: wt-status.c:250 msgid "both deleted:" msgstr "åŒæ–¹åˆ 除:" #: wt-status.c:251 msgid "added by us:" msgstr "ç”±æˆ‘ä»¬æ·»åŠ ï¼š" #: wt-status.c:252 msgid "deleted by them:" msgstr "ç”±ä»–ä»¬åˆ é™¤ï¼š" #: wt-status.c:253 msgid "added by them:" msgstr "ç”±ä»–ä»¬æ·»åŠ ï¼š" #: wt-status.c:254 msgid "deleted by us:" msgstr "ç”±æˆ‘ä»¬åˆ é™¤ï¼š" #: wt-status.c:255 msgid "both added:" msgstr "åŒæ–¹æ·»åŠ :" #: wt-status.c:256 msgid "both modified:" msgstr "åŒæ–¹ä¿®æ”¹ï¼š" # 译者:末尾两个å—节å¯èƒ½è¢«åˆ å‡ï¼Œå¦‚果翻译为ä¸æ–‡æ ‡ç‚¹ä¼šå‡ºçŽ°åŠä¸ªæ±‰å— #: wt-status.c:286 msgid "new commits, " msgstr "æ–°æ交, " # 译者:末尾两个å—节å¯èƒ½è¢«åˆ å‡ï¼Œå¦‚果翻译为ä¸æ–‡æ ‡ç‚¹ä¼šå‡ºçŽ°åŠä¸ªæ±‰å— #: wt-status.c:288 msgid "modified content, " msgstr "修改的内容, " # 译者:末尾两个å—节å¯èƒ½è¢«åˆ å‡ï¼Œå¦‚果翻译为ä¸æ–‡æ ‡ç‚¹ä¼šå‡ºçŽ°åŠä¸ªæ±‰å— #: wt-status.c:290 msgid "untracked content, " msgstr "未跟踪的内容, " # 译者:为ä¿è¯åœ¨è¾“出ä¸å¯¹é½ï¼Œæ³¨æ„调整å¥ä¸ç©ºæ ¼ï¼ #: wt-status.c:304 #, c-format msgid "new file: %s" msgstr "新文件: %s" # 译者:为ä¿è¯åœ¨è¾“出ä¸å¯¹é½ï¼Œæ³¨æ„调整å¥ä¸ç©ºæ ¼ï¼ #: wt-status.c:307 #, c-format msgid "copied: %s -> %s" msgstr "æ‹·è´ï¼š %s -> %s" # 译者:为ä¿è¯åœ¨è¾“出ä¸å¯¹é½ï¼Œæ³¨æ„调整å¥ä¸ç©ºæ ¼ï¼ #: wt-status.c:310 #, c-format msgid "deleted: %s" msgstr "åˆ é™¤ï¼š %s" # 译者:为ä¿è¯åœ¨è¾“出ä¸å¯¹é½ï¼Œæ³¨æ„调整å¥ä¸ç©ºæ ¼ï¼ #: wt-status.c:313 #, c-format msgid "modified: %s" msgstr "修改: %s" # 译者:为ä¿è¯åœ¨è¾“出ä¸å¯¹é½ï¼Œæ³¨æ„调整å¥ä¸ç©ºæ ¼ï¼ #: wt-status.c:316 #, c-format msgid "renamed: %s -> %s" msgstr "é‡å‘½å: %s -> %s" # 译者:为ä¿è¯åœ¨è¾“出ä¸å¯¹é½ï¼Œæ³¨æ„调整å¥ä¸ç©ºæ ¼ï¼ #: wt-status.c:319 #, c-format msgid "typechange: %s" msgstr "类型å˜æ›´ï¼š %s" # 译者:为ä¿è¯åœ¨è¾“出ä¸å¯¹é½ï¼Œæ³¨æ„调整å¥ä¸ç©ºæ ¼ï¼ #: wt-status.c:322 #, c-format msgid "unknown: %s" msgstr "未知: %s" # 译者:为ä¿è¯åœ¨è¾“出ä¸å¯¹é½ï¼Œæ³¨æ„调整å¥ä¸ç©ºæ ¼ï¼ #: wt-status.c:325 #, c-format msgid "unmerged: %s" msgstr "未åˆå¹¶ï¼š %s" #: wt-status.c:328 #, c-format msgid "bug: unhandled diff status %c" msgstr "bug:未处ç†çš„å·®å¼‚çŠ¶æ€ %c" #: wt-status.c:786 msgid "You have unmerged paths." msgstr "您有路径尚未åˆå¹¶ã€‚" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:789 wt-status.c:913 msgid " (fix conflicts and run \"git commit\")" msgstr " (解决冲çªå¹¶è¿è¡Œ \"git commit\")" #: wt-status.c:792 msgid "All conflicts fixed but you are still merging." msgstr "所有冲çªå·²è§£å†³ä½†æ‚¨ä»å¤„于åˆå¹¶ä¸ã€‚" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:795 msgid " (use \"git commit\" to conclude merge)" msgstr " (使用 \"git commit\" 结æŸåˆå¹¶ï¼‰" #: wt-status.c:805 msgid "You are in the middle of an am session." msgstr "您æ£å¤„于一个 am 过程ä¸ã€‚" #: wt-status.c:808 msgid "The current patch is empty." msgstr "当å‰çš„è¡¥ä¸ä¸ºç©ºã€‚" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:812 msgid " (fix conflicts and then run \"git am --resolved\")" msgstr " (解决冲çªï¼Œç„¶åŽè¿è¡Œ \"git am --resolved\")" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:814 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (使用 \"git am --skip\" 跳过æ¤è¡¥ä¸ï¼‰" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:816 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (使用 \"git am --abort\" æ¢å¤åŽŸæœ‰åˆ†æ”¯ï¼‰" #: wt-status.c:874 wt-status.c:884 msgid "You are currently rebasing." msgstr "您æ£åœ¨å˜åŸºã€‚" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:877 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (解决冲çªï¼Œç„¶åŽè¿è¡Œ \"git rebase --continue\")" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:879 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (使用 \"git rebase --skip\" 跳过æ¤è¡¥ä¸ï¼‰" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:881 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " (使用 \"git rebase --abort\" 以检出原有分支)" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:887 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (所有冲çªå·²è§£å†³ï¼šè¿è¡Œ \"git rebase --continue\")" #: wt-status.c:889 msgid "You are currently splitting a commit during a rebase." msgstr "您æ£åœ¨å˜åŸºè¿‡ç¨‹ä¸æ‹†åˆ†ä¸€ä¸ªæ交。" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:892 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr " (一旦您工作目录æ交干净åŽï¼Œè¿è¡Œ \"git rebase --continue\")" #: wt-status.c:894 msgid "You are currently editing a commit during a rebase." msgstr "您æ£åœ¨å˜åŸºè¿‡ç¨‹ä¸ç¼–辑一个æ交。" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:897 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " (使用 \"git commit --amend\" 修补当å‰æ交)" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:899 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" " (执行 \"git rebase --continue\" 一旦您满æ„您的修改)" #: wt-status.c:909 msgid "You are currently cherry-picking." msgstr "您æ£åœ¨åšæ‹£é€‰æ“作。" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:916 msgid " (all conflicts fixed: run \"git commit\")" msgstr " (解决所有冲çªåŽï¼Œæ‰§è¡Œ \"git commit\")" #: wt-status.c:925 msgid "You are currently bisecting." msgstr "您æ£åœ¨åšäºŒåˆ†æŸ¥æ‰¾ã€‚" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:928 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " (使用 \"git bisect reset\" 以回到原有分支)" #: wt-status.c:979 msgid "On branch " msgstr "ä½äºŽåˆ†æ”¯ " #: wt-status.c:986 msgid "Not currently on any branch." msgstr "当å‰ä¸åœ¨ä»»ä½•åˆ†æ”¯ä¸Šã€‚" #: wt-status.c:998 msgid "Initial commit" msgstr "åˆå§‹æ交" #: wt-status.c:1012 msgid "Untracked" msgstr "未跟踪的" #: wt-status.c:1014 msgid "Ignored" msgstr "忽略的" #: wt-status.c:1016 #, c-format msgid "Untracked files not listed%s" msgstr "未跟踪的文件没有列出%s" # 译者:ä¸æ–‡å—符串拼接,å¯åˆ 除å‰å¯¼ç©ºæ ¼ #: wt-status.c:1018 msgid " (use -u option to show untracked files)" msgstr "(使用 -u å‚数显示未跟踪的文件)" #: wt-status.c:1024 msgid "No changes" msgstr "没有修改" #: wt-status.c:1028 #, c-format msgid "no changes added to commit%s\n" msgstr "ä¿®æ”¹å°šæœªåŠ å…¥æ交%s\n" # 译者:ä¸æ–‡å—符串拼接,å¯åˆ 除å‰å¯¼ç©ºæ ¼ #: wt-status.c:1030 msgid " (use \"git add\" and/or \"git commit -a\")" msgstr "(使用 \"git add\" å’Œ/或 \"git commit -a\")" #: wt-status.c:1032 #, c-format msgid "nothing added to commit but untracked files present%s\n" msgstr "空æ交但å˜åœ¨æœªè·Ÿè¸ªæ–‡ä»¶%s\n" # 译者:ä¸æ–‡å—符串拼接,å¯åˆ 除å‰å¯¼ç©ºæ ¼ #: wt-status.c:1034 msgid " (use \"git add\" to track)" msgstr "(使用 \"git add\" 建立跟踪)" #: wt-status.c:1036 wt-status.c:1039 wt-status.c:1042 #, c-format msgid "nothing to commit%s\n" msgstr "æ— é¡»æ交%s\n" # 译者:ä¸æ–‡å—符串拼接,å¯åˆ 除å‰å¯¼ç©ºæ ¼ #: wt-status.c:1037 msgid " (create/copy files and use \"git add\" to track)" msgstr "(新建/æ‹·è´çš„文件使用 \"git add\" 建立跟踪)" # 译者:ä¸æ–‡å—符串拼接,å¯åˆ 除å‰å¯¼ç©ºæ ¼ #: wt-status.c:1040 msgid " (use -u to show untracked files)" msgstr "(使用 -u 显示未跟踪文件)" # 译者:ä¸æ–‡å—符串拼接,å¯åˆ 除å‰å¯¼ç©ºæ ¼ #: wt-status.c:1043 msgid " (working directory clean)" msgstr "(干净的工作区)" #: wt-status.c:1151 msgid "HEAD (no branch)" msgstr "HEAD(éžåˆ†æ”¯ï¼‰" # 译者:注æ„ä¿æŒå¥å°¾ç©ºæ ¼ #: wt-status.c:1157 msgid "Initial commit on " msgstr "åˆå§‹æ交于 " # 译者:注æ„ä¿æŒå¥å°¾ç©ºæ ¼ #: wt-status.c:1172 msgid "behind " msgstr "è½åŽ " # 译者:注æ„ä¿æŒå¥å°¾ç©ºæ ¼ #: wt-status.c:1175 wt-status.c:1178 msgid "ahead " msgstr "领先 " # 译者:注æ„ä¿æŒå¥å°¾ç©ºæ ¼ #: wt-status.c:1180 msgid ", behind " msgstr ",è½åŽ " #: builtin/add.c:62 #, c-format msgid "unexpected diff status %c" msgstr "æ„å¤–çš„å·®å¼‚çŠ¶æ€ %c" #: builtin/add.c:67 builtin/commit.c:226 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:459 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:286 builtin/mv.c:82 #: builtin/rm.c:162 msgid "index file corrupt" msgstr "索引文件æŸå" #: builtin/add.c:480 builtin/apply.c:4108 builtin/mv.c:229 builtin/rm.c:260 msgid "Unable to write new index file" msgstr "æ— æ³•å†™å…¥æ–°ç´¢å¼•æ–‡ä»¶" #: builtin/apply.c:53 msgid "git apply [options] [<patch>...]" msgstr "git apply [选项] [<è¡¥ä¸>...]" #: builtin/apply.c:106 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "未能识别的空白å—符选项 '%s'" #: builtin/apply.c:121 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "未能识别的空白å—符忽略选项 '%s'" #: builtin/apply.c:815 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "æ— æ³•å‡†å¤‡æ—¶é—´æˆ³æ£åˆ™è¡¨è¾¾å¼ %s" #: builtin/apply.c:824 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec 返回 %d,输入为:%s" #: builtin/apply.c:905 #, c-format msgid "unable to find filename in patch at line %d" msgstr "ä¸èƒ½åœ¨è¡¥ä¸çš„第 %d 行找到文件å" #: builtin/apply.c:937 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "git apply:错误的 git-diff - 期望 /dev/null,但在第 %2$d 行得到 %1$s" #: builtin/apply.c:941 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "git apply:错误的 git-diff - 第 %d 行上新文件åä¸ä¸€è‡´" #: builtin/apply.c:942 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件åä¸ä¸€è‡´" #: builtin/apply.c:949 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply:错误的 git-diff - 期望 /dev/null 于第 %d è¡Œ" #: builtin/apply.c:1394 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount:æ„外的行:%.*s" #: builtin/apply.c:1451 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "第 %d 行的补ä¸ç‰‡æ®µæ²¡æœ‰å¤´ä¿¡æ¯ï¼š%.*s" #: builtin/apply.c:1468 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " "component (line %d)" msgid_plural "" "git diff header lacks filename information when removing %d leading pathname " "components (line %d)" msgstr[0] "当移除 %d 个å‰å¯¼è·¯å¾„åŽ git diff 头缺ä¹æ–‡ä»¶åä¿¡æ¯ï¼ˆç¬¬ %d 行)" msgstr[1] "当移除 %d 个å‰å¯¼è·¯å¾„åŽ git diff 头缺ä¹æ–‡ä»¶åä¿¡æ¯ï¼ˆç¬¬ %d 行)" #: builtin/apply.c:1628 msgid "new file depends on old contents" msgstr "新文件ä¾èµ–旧内容" #: builtin/apply.c:1630 msgid "deleted file still has contents" msgstr "åˆ é™¤çš„æ–‡ä»¶ä»æœ‰å†…容" #: builtin/apply.c:1656 #, c-format msgid "corrupt patch at line %d" msgstr "è¡¥ä¸æŸåä½äºŽç¬¬ %d è¡Œ" #: builtin/apply.c:1692 #, c-format msgid "new file %s depends on old contents" msgstr "新文件 %s ä¾èµ–旧内容" #: builtin/apply.c:1694 #, c-format msgid "deleted file %s still has contents" msgstr "åˆ é™¤çš„æ–‡ä»¶ %s ä»æœ‰å†…容" #: builtin/apply.c:1697 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** è¦å‘Šï¼šæ–‡ä»¶ %s æˆä¸ºç©ºæ–‡ä»¶ä½†å¹¶æœªåˆ 除" #: builtin/apply.c:1843 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "二进制补ä¸åœ¨ç¬¬ %d è¡ŒæŸå:%.*s" #. there has to be one hunk (forward hunk) #: builtin/apply.c:1872 #, c-format msgid "unrecognized binary patch at line %d" msgstr "未能识别的二进制补ä¸ä½äºŽç¬¬ %d è¡Œ" #: builtin/apply.c:1958 #, c-format msgid "patch with only garbage at line %d" msgstr "è¡¥ä¸æ–‡ä»¶çš„第 %d è¡Œåªæœ‰åžƒåœ¾æ•°æ®" #: builtin/apply.c:2048 #, c-format msgid "unable to read symlink %s" msgstr "æ— æ³•è¯»å–符å·é“¾æŽ¥ %s" #: builtin/apply.c:2052 #, c-format msgid "unable to open or read %s" msgstr "ä¸èƒ½æ‰“å¼€æˆ–è¯»å– %s" #: builtin/apply.c:2123 msgid "oops" msgstr "å“Žå“Ÿ" #: builtin/apply.c:2645 #, c-format msgid "invalid start of line: '%c'" msgstr "æ— æ•ˆçš„è¡Œé¦–å—符:'%c'" #: builtin/apply.c:2763 #, 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 行)" #: builtin/apply.c:2775 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "上下文å‡å°‘到(%ld/%ld)以在第 %d 行应用补ä¸ç‰‡æ®µ" #: builtin/apply.c:2781 #, c-format msgid "" "while searching for:\n" "%.*s" msgstr "" "当查询:\n" "%.*s" #: builtin/apply.c:2800 #, c-format msgid "missing binary patch data for '%s'" msgstr "缺失 '%s' 的二进制补ä¸æ•°æ®" #: builtin/apply.c:2903 #, c-format msgid "binary patch does not apply to '%s'" msgstr "二进制补ä¸æœªåº”用到 '%s'" #: builtin/apply.c:2909 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "到 '%s' 的二进制补ä¸äº§ç”Ÿäº†ä¸æ£ç¡®çš„结果(预期 %s,得到 %s)" #: builtin/apply.c:2930 #, c-format msgid "patch failed: %s:%ld" msgstr "打补ä¸å¤±è´¥ï¼š%s:%ld" #: builtin/apply.c:3045 #, c-format msgid "patch %s has been renamed/deleted" msgstr "è¡¥ä¸ %s å·²ç»è¢«é‡å‘½å/åˆ é™¤" #: builtin/apply.c:3052 builtin/apply.c:3069 #, c-format msgid "read of %s failed" msgstr "è¯»å– %s 失败" #: builtin/apply.c:3084 msgid "removal patch leaves file contents" msgstr "移除补ä¸ä»ç•™ä¸‹äº†æ–‡ä»¶å†…容" #: builtin/apply.c:3105 #, c-format msgid "%s: already exists in working directory" msgstr "%s:已ç»å˜åœ¨äºŽå·¥ä½œåŒºä¸" #: builtin/apply.c:3143 #, c-format msgid "%s: has been deleted/renamed" msgstr "%s:已ç»è¢«åˆ 除/é‡å‘½å" #: builtin/apply.c:3148 builtin/apply.c:3179 #, c-format msgid "%s: %s" msgstr "%s:%s" #: builtin/apply.c:3159 #, c-format msgid "%s: does not exist in index" msgstr "%s:ä¸å˜åœ¨äºŽç´¢å¼•ä¸" #: builtin/apply.c:3173 #, c-format msgid "%s: does not match index" msgstr "%s:和索引ä¸åŒ¹é…" #: builtin/apply.c:3190 #, c-format msgid "%s: wrong type" msgstr "%s:错误类型" #: builtin/apply.c:3192 #, c-format msgid "%s has type %o, expected %o" msgstr "%s 的类型是 %o,预期是 %o" #: builtin/apply.c:3247 #, c-format msgid "%s: already exists in index" msgstr "%s:已ç»å˜åœ¨äºŽç´¢å¼•ä¸" #: builtin/apply.c:3267 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "%2$s 的新模å¼ï¼ˆ%1$o)和旧模å¼ï¼ˆ%3$o)ä¸åŒ¹é…" #: builtin/apply.c:3272 #, 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:3280 #, c-format msgid "%s: patch does not apply" msgstr "%s:补ä¸æœªåº”用" #: builtin/apply.c:3293 #, c-format msgid "Checking patch %s..." msgstr "æ£€æŸ¥è¡¥ä¸ %s..." #: builtin/apply.c:3348 builtin/checkout.c:212 builtin/reset.c:158 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "对路径 '%s' çš„ make_cache_entry æ“作失败" #: builtin/apply.c:3491 #, c-format msgid "unable to remove %s from index" msgstr "ä¸èƒ½ä»Žç´¢å¼•ä¸ç§»é™¤ %s" #: builtin/apply.c:3518 #, c-format msgid "corrupt patch for subproject %s" msgstr "å项目 %s æŸåçš„è¡¥ä¸" #: builtin/apply.c:3522 #, c-format msgid "unable to stat newly created file '%s'" msgstr "ä¸èƒ½æžšä¸¾æ–°å»ºæ–‡ä»¶ '%s' 的状æ€" #: builtin/apply.c:3527 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "ä¸èƒ½ä¸ºæ–°å»ºæ–‡ä»¶ %s 创建åŽç«¯å˜å‚¨" #: builtin/apply.c:3530 #, c-format msgid "unable to add cache entry for %s" msgstr "æ— æ³•ä¸º %s æ·»åŠ ç¼“å˜æ¡ç›®" #: builtin/apply.c:3563 #, c-format msgid "closing file '%s'" msgstr "å…³é—文件 '%s'" #: builtin/apply.c:3612 #, c-format msgid "unable to write file '%s' mode %o" msgstr "ä¸èƒ½å†™æ–‡ä»¶ '%s' æƒé™ %o" #: builtin/apply.c:3668 #, c-format msgid "Applied patch %s cleanly." msgstr "æˆåŠŸåº”ç”¨è¡¥ä¸ %s。" #: builtin/apply.c:3676 msgid "internal error" msgstr "内部错误" #. Say this even without --verbose #: builtin/apply.c:3679 #, 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:3689 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "æˆªçŸ .rej 文件å为 %.*s.rej" #: builtin/apply.c:3710 #, c-format msgid "Hunk #%d applied cleanly." msgstr "第 #%d 个片段æˆåŠŸåº”用。" #: builtin/apply.c:3713 #, c-format msgid "Rejected hunk #%d." msgstr "æ‹’ç»ç¬¬ #%d 个片段。" #: builtin/apply.c:3844 msgid "unrecognized input" msgstr "未能识别的输入" #: builtin/apply.c:3855 msgid "unable to read index file" msgstr "æ— æ³•è¯»å–索引文件" #: builtin/apply.c:3970 builtin/apply.c:3973 msgid "path" msgstr "路径" #: builtin/apply.c:3971 msgid "don't apply changes matching the given path" msgstr "ä¸è¦åº”用与给出路径å‘匹é…çš„å˜æ›´" #: builtin/apply.c:3974 msgid "apply changes matching the given path" msgstr "应用与给出路径å‘匹é…çš„å˜æ›´" #: builtin/apply.c:3976 msgid "num" msgstr "æ•°å—" #: builtin/apply.c:3977 msgid "remove <num> leading slashes from traditional diff paths" msgstr "ä»Žä¼ ç»Ÿçš„ diff 路径ä¸ç§»é™¤ <æ•°å—> 个å‰å¯¼è·¯å¾„" #: builtin/apply.c:3980 msgid "ignore additions made by the patch" msgstr "忽略补ä¸ä¸çš„æ·»åŠ çš„æ–‡ä»¶" #: builtin/apply.c:3982 msgid "instead of applying the patch, output diffstat for the input" msgstr "ä¸åº”用补ä¸ï¼Œè€Œæ˜¯æ˜¾ç¤ºè¾“入的差异统计(diffstat)" #: builtin/apply.c:3986 msgid "shows number of added and deleted lines in decimal notation" msgstr "以数å—æ–¹å¼æ˜¾ç¤ºæ·»åŠ æˆ–åˆ é™¤è¡Œçš„æ•°é‡" #: builtin/apply.c:3988 msgid "instead of applying the patch, output a summary for the input" msgstr "ä¸åº”用补ä¸ï¼Œè€Œæ˜¯æ˜¾ç¤ºè¾“入的概è¦" #: builtin/apply.c:3990 msgid "instead of applying the patch, see if the patch is applicable" msgstr "ä¸åº”用补ä¸ï¼Œè€Œæ˜¯æŸ¥çœ‹è¡¥ä¸æ˜¯å¦å¯åº”用" #: builtin/apply.c:3992 msgid "make sure the patch is applicable to the current index" msgstr "确认补ä¸å¯ä»¥åº”用到当å‰ç´¢å¼•" #: builtin/apply.c:3994 msgid "apply a patch without touching the working tree" msgstr "应用补ä¸è€Œä¸ä¿®æ”¹å·¥ä½œåŒº" #: builtin/apply.c:3996 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "åŒæ—¶åº”用æ¤è¡¥ä¸ï¼ˆå’Œ --stat/--summary/--check 共用)" #: builtin/apply.c:3998 msgid "build a temporary index based on embedded index information" msgstr "创建一个临时索引基于嵌入的索引信æ¯" #: builtin/apply.c:4000 msgid "paths are separated with NUL character" msgstr "路径以 NUL å—符分隔" #: builtin/apply.c:4003 msgid "ensure at least <n> lines of context match" msgstr "ç¡®ä¿è‡³å°‘åŒ¹é… <n> 行上下文" #: builtin/apply.c:4004 msgid "action" msgstr "动作" #: builtin/apply.c:4005 msgid "detect new or modified lines that have whitespace errors" msgstr "检查新增和修改的行ä¸é—´çš„空白å—符滥用" #: builtin/apply.c:4008 builtin/apply.c:4011 msgid "ignore changes in whitespace when finding context" msgstr "查找上下文时忽略空白å—符的å˜æ›´" #: builtin/apply.c:4014 msgid "apply the patch in reverse" msgstr "åå‘应用补ä¸" #: builtin/apply.c:4016 msgid "don't expect at least one line of context" msgstr "æ— éœ€è‡³å°‘ä¸€è¡Œä¸Šä¸‹æ–‡" #: builtin/apply.c:4018 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "将拒ç»çš„è¡¥ä¸ç‰‡æ®µä¿å˜åœ¨å¯¹åº”çš„ *.rej 文件ä¸" #: builtin/apply.c:4020 msgid "allow overlapping hunks" msgstr "å…许é‡å çš„è¡¥ä¸ç‰‡æ®µ" #: builtin/apply.c:4021 msgid "be verbose" msgstr "冗长输出" #: builtin/apply.c:4023 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "宽容ä¸æ£ç¡®çš„文件末尾æ¢è¡Œç¬¦" #: builtin/apply.c:4026 msgid "do not trust the line counts in the hunk headers" msgstr "ä¸ä¿¡ä»»è¡¥ä¸ç‰‡æ®µçš„头信æ¯ä¸çš„è¡Œå·" #: builtin/apply.c:4028 msgid "root" msgstr "æ ¹ç›®å½•" #: builtin/apply.c:4029 msgid "prepend <root> to all filenames" msgstr "为所有文件åå‰æ·»åŠ <æ ¹ç›®å½•>" #: builtin/apply.c:4050 msgid "--index outside a repository" msgstr "--index 在一个版本库之外" #: builtin/apply.c:4053 msgid "--cached outside a repository" msgstr "--cached 在一个版本库之外" #: builtin/apply.c:4069 #, c-format msgid "can't open patch '%s'" msgstr "ä¸èƒ½æ‰“å¼€è¡¥ä¸ '%s'" #: builtin/apply.c:4083 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "抑制下ä»æœ‰ %d 个空白å—符误用" msgstr[1] "抑制下ä»æœ‰ %d 个空白å—符误用" #: builtin/apply.c:4089 builtin/apply.c:4099 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d 行有空白å—符误用。" msgstr[1] "%d 行有空白å—符误用。" #: 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:预期一个刷新" # 译者:ä¿æŒåŽŸæ¢è¡Œæ ¼å¼ï¼Œåœ¨è¾“出时 %s 的替代内容会让å—符串å˜é•¿ #: builtin/branch.c:144 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" " '%s', but not yet merged to HEAD." msgstr "" "å°†è¦åˆ 除的分支 '%s' å·²ç»è¢«åˆå¹¶åˆ°\n" " '%s',但未åˆå¹¶åˆ° HEAD。" # 译者:ä¿æŒåŽŸæ¢è¡Œæ ¼å¼ï¼Œåœ¨è¾“出时 %s 的替代内容会让å—符串å˜é•¿ #: builtin/branch.c:148 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" " '%s', even though it is merged to HEAD." msgstr "" "å¹¶æœªåˆ é™¤åˆ†æ”¯ '%s', 虽然它已ç»åˆå¹¶åˆ° HEAD,\n" " 然而å´å°šæœªè¢«åˆå¹¶åˆ°åˆ†æ”¯ '%s' 。" #: builtin/branch.c:180 msgid "cannot use -a with -d" msgstr "ä¸èƒ½å°† -a å’Œ -d 共用" #: builtin/branch.c:186 msgid "Couldn't look up commit object for HEAD" msgstr "æ— æ³•æŸ¥è¯¢ HEAD 指å‘çš„æ交对象" #: builtin/branch.c:191 #, c-format msgid "Cannot delete the branch '%s' which you are currently on." msgstr "æ— æ³•åˆ é™¤æ‚¨å½“å‰æ‰€åœ¨çš„分支 '%s'。" #: builtin/branch.c:202 #, c-format msgid "remote branch '%s' not found." msgstr "远程分支 '%s' 未å‘现。" #: builtin/branch.c:203 #, c-format msgid "branch '%s' not found." msgstr "分支 '%s' 未å‘现。" #: builtin/branch.c:210 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "æ— æ³•æŸ¥è¯¢ '%s' 指å‘çš„æ交对象" #: builtin/branch.c:216 #, 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:225 #, c-format msgid "Error deleting remote branch '%s'" msgstr "åˆ é™¤è¿œç¨‹åˆ†æ”¯ '%s' 时出错" #: builtin/branch.c:226 #, c-format msgid "Error deleting branch '%s'" msgstr "åˆ é™¤åˆ†æ”¯ '%s' 时出错" #: builtin/branch.c:233 #, c-format msgid "Deleted remote branch %s (was %s).\n" msgstr "å·²åˆ é™¤è¿œç¨‹åˆ†æ”¯ %s(曾为 %s)。\n" #: builtin/branch.c:234 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "å·²åˆ é™¤åˆ†æ”¯ %s(曾为 %s)。\n" #: builtin/branch.c:239 msgid "Update of config-file failed" msgstr "æ— æ³•æ›´æ–° config 文件" #: builtin/branch.c:337 #, c-format msgid "branch '%s' does not point at a commit" msgstr "分支 '%s' 未指å‘一个æ交" #: builtin/branch.c:409 #, c-format msgid "[%s: behind %d]" msgstr "[%s:è½åŽ %d]" #: builtin/branch.c:411 #, c-format msgid "[behind %d]" msgstr "[è½åŽ %d]" #: builtin/branch.c:415 #, c-format msgid "[%s: ahead %d]" msgstr "[%s:领先 %d]" #: builtin/branch.c:417 #, c-format msgid "[ahead %d]" msgstr "[领先 %d]" #: builtin/branch.c:420 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "[%s:领先 %d,è½åŽ %d]" #: builtin/branch.c:423 #, c-format msgid "[ahead %d, behind %d]" msgstr "[领先 %d,è½åŽ %d]" #: builtin/branch.c:535 msgid "(no branch)" msgstr "(éžåˆ†æ”¯ï¼‰" #: builtin/branch.c:600 msgid "some refs could not be read" msgstr "一些引用ä¸èƒ½è¯»å–" #: builtin/branch.c:613 msgid "cannot rename the current branch while not on any." msgstr "æ— æ³•é‡å‘½å当å‰åˆ†æ”¯å› 为ä¸å¤„于任何分支上。" #: builtin/branch.c:623 #, c-format msgid "Invalid branch name: '%s'" msgstr "æ— æ•ˆçš„åˆ†æ”¯å:'%s'" #: builtin/branch.c:638 msgid "Branch rename failed" msgstr "分支é‡å‘½å失败" #: builtin/branch.c:642 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "é‡å‘½å掉一个错误命å的旧分支 '%s'" #: builtin/branch.c:646 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "分支é‡å‘½å为 %s,但 HEAD 没有更新ï¼" #: builtin/branch.c:653 msgid "Branch is renamed, but update of config-file failed" msgstr "分支被é‡å‘½å,但更新 config 文件失败" #: builtin/branch.c:668 #, c-format msgid "malformed object name %s" msgstr "éžæ³•çš„对象å %s" #: builtin/branch.c:692 #, c-format msgid "could not write branch description template: %s" msgstr "ä¸èƒ½å†™åˆ†æ”¯æ述模版:%s" #: builtin/branch.c:783 msgid "Failed to resolve HEAD as a valid ref." msgstr "æ— æ³•å°† HEAD 解æžä¸ºæœ‰æ•ˆå¼•ç”¨ã€‚" #: builtin/branch.c:788 builtin/clone.c:558 msgid "HEAD not found below refs/heads!" msgstr "HEAD 没有ä½äºŽ /refs/heads 之下ï¼" #: builtin/branch.c:808 msgid "--column and --verbose are incompatible" msgstr "--column å’Œ --verbose ä¸å…¼å®¹" #: builtin/branch.c:857 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: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:583 #: builtin/merge.c:812 msgid "unable to write new index file" msgstr "æ— æ³•å†™æ–°çš„ç´¢å¼•æ–‡ä»¶" #: builtin/checkout.c:319 builtin/diff.c:302 builtin/merge.c:408 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' 执行 reflog æ“作\n" #: builtin/checkout.c:566 msgid "HEAD is now at" msgstr "HEAD ç›®å‰ä½äºŽ" #: builtin/checkout.c:573 #, c-format msgid "Reset branch '%s'\n" msgstr "é‡ç½®åˆ†æ”¯ '%s'\n" #: builtin/checkout.c:576 #, c-format msgid "Already on '%s'\n" msgstr "å·²ç»ä½äºŽ '%s'\n" #: builtin/checkout.c:580 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "切æ¢å¹¶é‡ç½®åˆ†æ”¯ '%s'\n" #: builtin/checkout.c:582 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "切æ¢åˆ°ä¸€ä¸ªæ–°åˆ†æ”¯ '%s'\n" #: builtin/checkout.c:584 #, c-format msgid "Switched to branch '%s'\n" msgstr "切æ¢åˆ°åˆ†æ”¯ '%s'\n" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: builtin/checkout.c:640 #, c-format msgid " ... and %d more.\n" msgstr " ... åŠå…¶å®ƒ %d 个。\n" #. The singular version #: builtin/checkout.c:646 #, 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" msgstr[1] "" "è¦å‘Šï¼šæ‚¨æ£ä¸¢ä¸‹ %d 个æ交,未和任何分支关è”:\n" "\n" "%s\n" #: builtin/checkout.c:664 #, 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:694 msgid "internal error in revision walk" msgstr "在版本é历时é‡åˆ°å†…部错误" #: builtin/checkout.c:698 msgid "Previous HEAD position was" msgstr "之å‰çš„ HEAD ä½ç½®æ˜¯" #: builtin/checkout.c:724 msgid "You are on a branch yet to be born" msgstr "您ä½äºŽä¸€ä¸ªå°šæœªåˆå§‹åŒ–的分支" #. case (1) #: builtin/checkout.c:855 #, c-format msgid "invalid reference: %s" msgstr "æ— æ•ˆå¼•ç”¨ï¼š%s" #. case (1): want a tree #: builtin/checkout.c:894 #, c-format msgid "reference is not a tree: %s" msgstr "引用ä¸æ˜¯ä¸€ä¸ªæ ‘:%s" #: builtin/checkout.c:974 msgid "-B cannot be used with -b" msgstr "-B ä¸èƒ½å’Œ -b 共用" #: builtin/checkout.c:983 msgid "--patch is incompatible with all other options" msgstr "--patch 选项和其他选项ä¸å…¼å®¹" #: builtin/checkout.c:986 msgid "--detach cannot be used with -b/-B/--orphan" msgstr "--detach ä¸èƒ½å’Œ -b/-B/--orphan 共用" #: builtin/checkout.c:988 msgid "--detach cannot be used with -t" msgstr "--detach ä¸èƒ½å’Œ -t 共用" #: builtin/checkout.c:994 msgid "--track needs a branch name" msgstr "--track 需è¦ä¸€ä¸ªåˆ†æ”¯å" #: builtin/checkout.c:1001 msgid "Missing branch name; try -b" msgstr "缺少分支åï¼›å°è¯• -b" #: builtin/checkout.c:1007 msgid "--orphan and -b|-B are mutually exclusive" msgstr "--orphan å’Œ -b|-B 互斥" #: builtin/checkout.c:1009 msgid "--orphan cannot be used with -t" msgstr "--orphan ä¸èƒ½å’Œ -t 共用" #: builtin/checkout.c:1019 msgid "git checkout: -f and -m are incompatible" msgstr "git checkout:-f å’Œ -m ä¸å…¼å®¹" #: builtin/checkout.c:1053 msgid "invalid path specification" msgstr "æ— æ•ˆçš„è·¯å¾„è§„æ ¼" #: builtin/checkout.c:1061 #, 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:1063 msgid "git checkout: updating paths is incompatible with switching branches." msgstr "git checkout:更新路径和切æ¢åˆ†æ”¯ä¸å…¼å®¹ã€‚" #: builtin/checkout.c:1068 msgid "git checkout: --detach does not take a path argument" msgstr "git checkout:--detach ä¸è·Ÿè·¯å¾„å‚æ•°" #: builtin/checkout.c:1071 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/checkout.c:1090 msgid "Cannot switch branch to a non-commit." msgstr "æ— æ³•åˆ‡æ¢åˆ†æ”¯åˆ°ä¸€ä¸ªéžæ交。" #: builtin/checkout.c:1093 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:243 #, c-format msgid "reference repository '%s' is not a local directory." msgstr "引用版本库 '%s' ä¸æ˜¯ä¸€ä¸ªæœ¬åœ°ç›®å½•ã€‚" #: builtin/clone.c:302 #, c-format msgid "failed to open '%s'" msgstr "æ— æ³•æ‰“å¼€ '%s'" #: builtin/clone.c:306 #, c-format msgid "failed to create directory '%s'" msgstr "æ— æ³•åˆ›å»ºç›®å½• '%s'" #: builtin/clone.c:308 builtin/diff.c:75 #, c-format msgid "failed to stat '%s'" msgstr "æ— æ³•æžšä¸¾ '%s' 状æ€" #: builtin/clone.c:310 #, c-format msgid "%s exists and is not a directory" msgstr "%s å˜åœ¨ä¸”ä¸æ˜¯ä¸€ä¸ªç›®å½•" #: builtin/clone.c:324 #, c-format 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'" msgstr "æ— æ³•åˆ›å»ºé“¾æŽ¥ '%s'" #: builtin/clone.c:350 #, c-format msgid "failed to copy file to '%s'" msgstr "æ— æ³•æ‹·è´æ–‡ä»¶è‡³ '%s'" #: builtin/clone.c:373 #, c-format msgid "done.\n" msgstr "完æˆã€‚\n" #: builtin/clone.c:440 #, c-format msgid "Could not find remote branch %s to clone." msgstr "ä¸èƒ½å‘现è¦å…‹éš†çš„远程分支 %s。" #: builtin/clone.c:549 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "远程 HEAD 指å‘一个ä¸å˜åœ¨çš„å¼•ç”¨ï¼Œæ— æ³•æ£€å‡ºã€‚\n" #: builtin/clone.c:639 msgid "Too many arguments." msgstr "太多å‚数。" #: builtin/clone.c:643 msgid "You must specify a repository to clone." msgstr "您必须指定一个版本库æ¥å…‹éš†ã€‚" #: builtin/clone.c:654 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "--bare å’Œ --origin %s 选项ä¸å…¼å®¹ã€‚" #: builtin/clone.c:668 #, c-format msgid "repository '%s' does not exist" msgstr "版本库 '%s' ä¸å˜åœ¨" #: builtin/clone.c:673 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth 在本地克隆被忽略,改为 file:// å议试试。" #: builtin/clone.c:683 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "ç›®æ ‡è·¯å¾„ '%s' å·²ç»å˜åœ¨ï¼Œå¹¶ä¸”ä¸æ˜¯ä¸€ä¸ªç©ºç›®å½•ã€‚" #: builtin/clone.c:693 #, c-format msgid "working tree '%s' already exists." msgstr "工作区 '%s' å·²ç»å˜åœ¨ã€‚" #: builtin/clone.c:706 builtin/clone.c:720 #, c-format msgid "could not create leading directories of '%s'" msgstr "ä¸èƒ½ä¸º '%s' 创建先导目录" #: builtin/clone.c:709 #, c-format msgid "could not create work tree dir '%s'." msgstr "ä¸èƒ½ä¸º '%s' 创建工作区目录。" #: builtin/clone.c:728 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "克隆到裸版本库 '%s'...\n" #: builtin/clone.c:730 #, c-format msgid "Cloning into '%s'...\n" msgstr "æ£å…‹éš†åˆ° '%s'...\n" #: builtin/clone.c:786 #, c-format msgid "Don't know how to clone %s" msgstr "ä¸çŸ¥é“如何克隆 %s" #: builtin/clone.c:835 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "远程分支 %s 在上游 %s 未å‘现" #: builtin/clone.c:842 msgid "You appear to have cloned an empty repository." msgstr "您似乎克隆了一个空版本库。" #: builtin/column.c:51 msgid "--command must be the first argument" msgstr "--command 必须是第一个å‚æ•°" #: builtin/commit.c:43 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" "设置完毕åŽï¼Œæ‚¨å¯ä»¥ç”¨ä¸‹é¢çš„命令æ¥ä¿®æ£æœ¬æ¬¡æ交所使用的用户身份:\n" "\n" " git commit --amend --reset-author\n" #: builtin/commit.c:55 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:60 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" "\n" " git commit --allow-empty\n" "\n" "å¦åˆ™ï¼Œè¯·ä½¿ç”¨å‘½ä»¤ 'git reset'\n" #: builtin/commit.c:253 msgid "failed to unpack HEAD tree object" msgstr "æ— æ³•è§£åŒ… HEAD æ ‘å¯¹è±¡" #: builtin/commit.c:295 msgid "unable to create temporary index" msgstr "ä¸èƒ½åˆ›å»ºä¸´æ—¶ç´¢å¼•" #: builtin/commit.c:301 msgid "interactive add failed" msgstr "交互å¼æ·»åŠ 失败" #: builtin/commit.c:334 builtin/commit.c:355 builtin/commit.c:405 msgid "unable to write new_index file" msgstr "æ— æ³•å†™ new_index 文件" #: builtin/commit.c:386 msgid "cannot do a partial commit during a merge." msgstr "在åˆå¹¶è¿‡ç¨‹ä¸ä¸èƒ½åšéƒ¨åˆ†æ交。" #: builtin/commit.c:388 msgid "cannot do a partial commit during a cherry-pick." msgstr "在拣选过程ä¸ä¸èƒ½åšéƒ¨åˆ†æ交。" #: builtin/commit.c:398 msgid "cannot read the index" msgstr "æ— æ³•è¯»å–索引" #: builtin/commit.c:418 msgid "unable to write temporary index file" msgstr "æ— æ³•å†™ä¸´æ—¶ç´¢å¼•æ–‡ä»¶" #: builtin/commit.c:493 builtin/commit.c:499 #, c-format msgid "invalid commit: %s" msgstr "æ— æ•ˆçš„æ交:%s" #: builtin/commit.c:522 msgid "malformed --author parameter" msgstr "éžæ³•çš„ --author å‚æ•°" #: builtin/commit.c:582 #, c-format msgid "Malformed ident string: '%s'" msgstr "éžæ³•çš„身份å—符串:'%s'" #: builtin/commit.c:620 builtin/commit.c:653 builtin/commit.c:967 #, c-format msgid "could not lookup commit %s" msgstr "ä¸èƒ½æŸ¥è¯¢æ交 %s" #: builtin/commit.c:632 builtin/shortlog.c:296 #, c-format msgid "(reading log message from standard input)\n" msgstr "(æ£ä»Žæ ‡å‡†è¾“å…¥ä¸è¯»å–日志信æ¯ï¼‰\n" #: builtin/commit.c:634 msgid "could not read log from standard input" msgstr "ä¸èƒ½ä»Žæ ‡å‡†è¾“å…¥ä¸è¯»å–日志信æ¯" #: builtin/commit.c:638 #, c-format msgid "could not read log file '%s'" msgstr "ä¸èƒ½è¯»å–日志文件 '%s'" #: builtin/commit.c:644 msgid "commit has empty message" msgstr "æ交说明为空" #: builtin/commit.c:660 msgid "could not read MERGE_MSG" msgstr "ä¸èƒ½è¯»å– MERGE_MSG" #: builtin/commit.c:664 msgid "could not read SQUASH_MSG" msgstr "ä¸èƒ½è¯»å– SQUASH_MSG" #: builtin/commit.c:668 #, c-format msgid "could not read '%s'" msgstr "ä¸èƒ½è¯»å– '%s'" #: builtin/commit.c:720 msgid "could not write commit template" msgstr "ä¸èƒ½å†™æ交模版" #: builtin/commit.c:731 #, c-format msgid "" "\n" "It looks like you may be committing a merge.\n" "If this is not correct, please remove the file\n" "\t%s\n" "and try again.\n" msgstr "" "\n" "看起æ¥æ‚¨æ£åœ¨åšä¸€ä¸ªåˆå¹¶æ交。如果ä¸å¯¹ï¼Œè¯·åˆ 除文件\n" "\t%s\n" "然åŽé‡è¯•ã€‚\n" #: builtin/commit.c:736 #, c-format msgid "" "\n" "It looks like you may be committing a cherry-pick.\n" "If this is not correct, please remove the file\n" "\t%s\n" "and try again.\n" msgstr "" "\n" "看起æ¥æ‚¨æ£åœ¨åšä¸€ä¸ªæ‹£é€‰æ交。如果ä¸å¯¹ï¼Œè¯·åˆ 除文件\n" "\t%s\n" "然åŽé‡è¯•ã€‚\n" #: builtin/commit.c:748 msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '#' will be ignored, and an empty message aborts the commit.\n" msgstr "" "请为您的å˜æ›´è¾“å…¥æ交说明。以 '#' 开始的行将被忽略,而一个空的æ交\n" "说明将会终æ¢æ交。\n" #: builtin/commit.c:753 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" "An empty message aborts the commit.\n" msgstr "" "请为您的å˜æ›´è¾“å…¥æ交说明。以 '#' 开始的行将被ä¿ç•™ï¼Œæ‚¨å¯ä»¥åˆ 除它们\n" "å¦‚æžœæ‚¨æƒ³è¿™æ ·åšçš„è¯ã€‚而一个空的æ交说明将会终æ¢æ交。\n" # 译者:为ä¿è¯åœ¨è¾“出ä¸å¯¹é½ï¼Œæ³¨æ„调整å¥ä¸ç©ºæ ¼ï¼ #: builtin/commit.c:766 #, c-format msgid "%sAuthor: %s" msgstr "%s作者: %s" # 译者:为ä¿è¯åœ¨è¾“出ä¸å¯¹é½ï¼Œæ³¨æ„调整å¥ä¸ç©ºæ ¼ï¼ #: builtin/commit.c:773 #, c-format msgid "%sCommitter: %s" msgstr "%sæ交者: %s" #: builtin/commit.c:793 msgid "Cannot read index" msgstr "æ— æ³•è¯»å–索引" #: builtin/commit.c:830 msgid "Error building trees" msgstr "æ— æ³•åˆ›å»ºæ ‘å¯¹è±¡" #: builtin/commit.c:845 builtin/tag.c:361 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "请使用 -m 或者 -F 选项æä¾›æ交说明。\n" #: builtin/commit.c:942 #, c-format msgid "No existing author found with '%s'" msgstr "æ²¡æœ‰æ‰¾åˆ°åŒ¹é… '%s' 的作者" #: builtin/commit.c:957 builtin/commit.c:1157 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "æ— æ•ˆçš„æœªè¿½è¸ªæ–‡ä»¶å‚æ•° '%s'" #: builtin/commit.c:997 msgid "Using both --reset-author and --author does not make sense" msgstr "åŒæ—¶ä½¿ç”¨ --reset-author å’Œ --author 没有æ„义" #: builtin/commit.c:1008 msgid "You have nothing to amend." msgstr "您没有å¯ä¿®è¡¥çš„æ交。" #: builtin/commit.c:1011 msgid "You are in the middle of a merge -- cannot amend." msgstr "您æ£å¤„于一个åˆå¹¶è¿‡ç¨‹ä¸ -- æ— æ³•ä¿®è¡¥æ交。" #: builtin/commit.c:1013 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "您æ£å¤„äºŽä¸€ä¸ªæ‹£é€‰è¿‡ç¨‹ä¸ -- æ— æ³•ä¿®è¡¥æ交。" #: builtin/commit.c:1016 msgid "Options --squash and --fixup cannot be used together" msgstr "选项 --squash å’Œ --fixup ä¸èƒ½å…±ç”¨" #: builtin/commit.c:1026 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "åªèƒ½ç”¨ä¸€ä¸ª -c/-C/-F/--fixup 选项。" #: builtin/commit.c:1028 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "选项 -m ä¸èƒ½å’Œ -c/-C/-F/--fixup 共用。" #: builtin/commit.c:1036 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author åªèƒ½å’Œ -Cã€-c 或 --amend 共用。" #: builtin/commit.c:1053 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "åªèƒ½ç”¨ä¸€ä¸ª --include/--only/--all/--interactive/--patch 选项。" #: builtin/commit.c:1055 msgid "No paths with --include/--only does not make sense." msgstr "å‚æ•° --include/--only ä¸è·Ÿè·¯å¾„没有æ„义。" #: builtin/commit.c:1057 msgid "Clever... amending the last one with dirty index." msgstr "èªæ˜Ž... 在索引ä¸å¹²å‡€ä¸‹ä¿®è¡¥æœ€åŽçš„æ交。" #: builtin/commit.c:1059 msgid "Explicit paths specified without -i nor -o; assuming --only paths..." msgstr "指定了明确的路径而没有使用 -i 或 -o 选项;认为是 --only paths..." #: builtin/commit.c:1069 builtin/tag.c:577 #, c-format msgid "Invalid cleanup mode %s" msgstr "æ— æ•ˆçš„æ¸…ç†æ¨¡å¼ %s" #: builtin/commit.c:1074 msgid "Paths with -a does not make sense." msgstr "路径和 -a 选项共用没有æ„义。" #: builtin/commit.c:1257 msgid "couldn't look up newly created commit" msgstr "æ— æ³•æ‰¾åˆ°æ–°åˆ›å»ºçš„æ交" #: builtin/commit.c:1259 msgid "could not parse newly created commit" msgstr "ä¸èƒ½è§£æžæ–°åˆ›å»ºçš„æ交" #: builtin/commit.c:1300 msgid "detached HEAD" msgstr "分离头指针" # 译者:ä¸æ–‡å—符串拼接,å¯åˆ 除å‰å¯¼ç©ºæ ¼ #: builtin/commit.c:1302 msgid " (root-commit)" msgstr "ï¼ˆæ ¹æ交)" #: builtin/commit.c:1446 msgid "could not parse HEAD commit" msgstr "ä¸èƒ½è§£æž HEAD æ交" #: builtin/commit.c:1484 builtin/merge.c:509 #, c-format msgid "could not open '%s' for reading" msgstr "ä¸èƒ½ä¸ºè¯»å…¥æ‰“å¼€ '%s'" #: builtin/commit.c:1491 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "æŸåçš„ MERGE_HEAD 文件(%s)" #: builtin/commit.c:1498 msgid "could not read MERGE_MODE" msgstr "ä¸èƒ½è¯»å– MERGE_MODE" #: builtin/commit.c:1517 #, c-format msgid "could not read commit message: %s" msgstr "ä¸èƒ½è¯»å–æ交说明:%s" #: builtin/commit.c:1531 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "终æ¢æ交;您未更改æ¥è‡ªæ¨¡ç‰ˆçš„æ交说明。\n" #: builtin/commit.c:1536 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "终æ¢æäº¤å› ä¸ºæ交说明为空。\n" #: builtin/commit.c:1551 builtin/merge.c:936 builtin/merge.c:961 msgid "failed to write commit object" msgstr "æ— æ³•å†™æ交对象" #: builtin/commit.c:1572 msgid "cannot lock HEAD ref" msgstr "æ— æ³•é”定 HEAD 引用" #: builtin/commit.c:1576 msgid "cannot update HEAD ref" msgstr "æ— æ³•æ›´æ–° HEAD 引用" #: builtin/commit.c:1587 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 "" "ç‰ˆæœ¬åº“å·²æ›´æ–°ï¼Œä½†æ— æ³•å†™ new_index 文件。检查是å¦ç£ç›˜å·²æ»¡\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:297 msgid "Not a git repository" msgstr "ä¸æ˜¯ä¸€ä¸ª git 版本库" #: builtin/diff.c:341 #, c-format msgid "invalid object '%s' given." msgstr "æä¾›äº†æ— æ•ˆå¯¹è±¡ '%s'。" #: builtin/diff.c:346 #, c-format msgid "more than %d trees given: '%s'" msgstr "æ供了超过 %d ä¸ªæ ‘å¯¹è±¡ï¼š'%s'" #: builtin/diff.c:356 #, c-format msgid "more than two blobs given: '%s'" msgstr "æ供了超过两个 blob 对象:'%s'" #: builtin/diff.c:364 #, 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:253 #, c-format msgid "object %s not found" msgstr "对象 %s 未å‘现" #: builtin/fetch.c:259 msgid "[up to date]" msgstr "[最新]" #: builtin/fetch.c:273 #, c-format msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgstr "! %-*s %-*s -> %s (在当å‰åˆ†æ”¯ä¸‹ä¸èƒ½èŽ·å–)" #: builtin/fetch.c:274 builtin/fetch.c:360 msgid "[rejected]" msgstr "[已拒ç»]" #: builtin/fetch.c:285 msgid "[tag update]" msgstr "[tagæ›´æ–°]" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340 msgid " (unable to update local ref)" msgstr " (ä¸èƒ½æ›´æ–°æœ¬åœ°å¼•ç”¨ï¼‰" #: builtin/fetch.c:305 msgid "[new tag]" msgstr "[æ–°tag]" #: builtin/fetch.c:308 msgid "[new branch]" msgstr "[新分支]" #: builtin/fetch.c:311 msgid "[new ref]" msgstr "[新引用]" #: builtin/fetch.c:356 msgid "unable to update local ref" msgstr "ä¸èƒ½æ›´æ–°æœ¬åœ°å¼•ç”¨" #: builtin/fetch.c:356 msgid "forced update" msgstr "强制更新" #: builtin/fetch.c:362 msgid "(non-fast-forward)" msgstr "(éžå¿«è¿›å¼ï¼‰" #: builtin/fetch.c:393 builtin/fetch.c:685 #, c-format msgid "cannot open %s: %s\n" msgstr "æ— æ³•æ‰“å¼€ %s:%s\n" #: builtin/fetch.c:402 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s 未å‘é€æ‰€æœ‰å¿…须的对象\n" #: builtin/fetch.c:488 #, c-format msgid "From %.*s\n" msgstr "æ¥è‡ª %.*s\n" #: builtin/fetch.c:499 #, 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:549 #, c-format msgid " (%s will become dangling)" msgstr " (%s å°†æˆä¸ºæ‚¬ç©ºçŠ¶æ€ï¼‰" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: builtin/fetch.c:550 #, c-format msgid " (%s has become dangling)" msgstr " (%s å·²æˆä¸ºæ‚¬ç©ºçŠ¶æ€ï¼‰" #: builtin/fetch.c:557 msgid "[deleted]" msgstr "[å·²åˆ é™¤]" #: builtin/fetch.c:558 builtin/remote.c:1055 msgid "(none)" msgstr "ï¼ˆæ— ï¼‰" #: builtin/fetch.c:675 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "æ‹’ç»èŽ·å–到éžè£¸ç‰ˆæœ¬åº“的当å‰åˆ†æ”¯ %s" #: builtin/fetch.c:709 #, c-format msgid "Don't know how to fetch from %s" msgstr "ä¸çŸ¥é“如何从 %s 获å–" #: builtin/fetch.c:786 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s æ˜¯æ— æ•ˆçš„" #: builtin/fetch.c:789 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "选项 \"%s\" 为 %s 所忽略\n" #: builtin/fetch.c:888 #, c-format msgid "Fetching %s\n" msgstr "æ£åœ¨èŽ·å– %s\n" #: builtin/fetch.c:890 builtin/remote.c:100 #, c-format msgid "Could not fetch %s" msgstr "ä¸èƒ½èŽ·å– %s" #: builtin/fetch.c:907 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:927 msgid "You need to specify a tag name." msgstr "您需è¦æŒ‡å®šä¸€ä¸ª tag å称。" #: builtin/fetch.c:979 msgid "fetch --all does not take a repository argument" msgstr "fetch --all ä¸èƒ½å¸¦ä¸€ä¸ªç‰ˆæœ¬åº“å‚æ•°" #: builtin/fetch.c:981 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all 带引用表达å¼æ²¡æœ‰ä»»ä½•æ„义" #: builtin/fetch.c:992 #, c-format msgid "No such remote or remote group: %s" msgstr "æ²¡æœ‰è¿™æ ·çš„è¿œç¨‹æˆ–è¿œç¨‹ç»„ï¼š%s" #: builtin/fetch.c:1000 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:90 #, c-format msgid "insanely long object directory %.*s" msgstr "ä¸æ£å¸¸çš„长对象目录 %.*s" #: builtin/gc.c:221 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "自动打包版本库以求最佳性能。\n" #: builtin/gc.c:224 #, 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 "" "自动打包版本库以求最佳性能。您还å¯ä»¥æ‰‹åŠ¨è¿è¡Œ \"git gc\"。\n" "å‚è§ \"git help gc\" 以获å–更多信æ¯ã€‚\n" #: builtin/gc.c:251 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "有太多ä¸å¯è¾¾çš„æ¾æ•£å¯¹è±¡ï¼Œè¿è¡Œ 'git prune' åˆ é™¤å®ƒä»¬ã€‚" #: builtin/grep.c:216 #, c-format msgid "grep: failed to create thread: %s" msgstr "grepï¼šæ— æ³•åˆ›å»ºçº¿ç¨‹ï¼š%s" #: builtin/grep.c:402 #, c-format msgid "Failed to chdir: %s" msgstr "æ— æ³•åˆ‡æ¢ç›®å½•ï¼š%s" #: builtin/grep.c:478 builtin/grep.c:512 #, c-format msgid "unable to read tree (%s)" msgstr "æ— æ³•è¯»å–æ ‘ï¼ˆ%s)" #: builtin/grep.c:526 #, c-format msgid "unable to grep from object of type %s" msgstr "æ— æ³•æŠ“å–æ¥è‡ªäºŽ %s 类型的对象" #: builtin/grep.c:584 #, c-format msgid "switch `%c' expects a numerical value" msgstr "开关 `%c' 期望一个数å—值" #: builtin/grep.c:601 #, c-format msgid "cannot open '%s'" msgstr "ä¸èƒ½æ‰“å¼€ '%s'" #: builtin/grep.c:885 msgid "no pattern given." msgstr "未æ供模å¼åŒ¹é…。" #: builtin/grep.c:899 #, c-format msgid "bad object %s" msgstr "å对象 %s" #: builtin/grep.c:940 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager 仅用于工作区" #: builtin/grep.c:963 msgid "--cached or --untracked cannot be used with --no-index." msgstr "--cached 或 --untracked ä¸èƒ½ä¸Ž --no-index 共用。" #: builtin/grep.c:968 msgid "--no-index or --untracked cannot be used with revs." msgstr "--no-index 或 --untracked ä¸èƒ½å’Œç‰ˆæœ¬å…±ç”¨ã€‚" #: builtin/grep.c:971 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "--[no-]exclude-standard ä¸èƒ½ç”¨äºŽå·²è·Ÿè¸ªå†…容。" #: builtin/grep.c:979 msgid "both --cached and trees are given." msgstr "åŒæ—¶ç»™å‡ºäº† --cached å’Œæ ‘å¯¹è±¡ã€‚" #: builtin/help.c:63 #, c-format msgid "unrecognized help format '%s'" msgstr "æœªèƒ½è¯†åˆ«çš„å¸®åŠ©æ ¼å¼ '%s'" #: builtin/help.c:91 msgid "Failed to start emacsclient." msgstr "æ— æ³•å¯åŠ¨ emacsclient。" #: builtin/help.c:104 msgid "Failed to parse emacsclient version." msgstr "æ— æ³•è§£æž emacsclient 版本。" #: builtin/help.c:112 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "emacsclient 版本 '%d' å¤ªè€ (< 22)。" #: builtin/help.c:130 builtin/help.c:158 builtin/help.c:167 builtin/help.c:175 #, c-format msgid "failed to exec '%s': %s" msgstr "æ— æ³•æ‰§è¡Œ '%s':%s" #: builtin/help.c:215 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" "Please consider using 'man.<tool>.cmd' instead." msgstr "" "'%s':ä¸æ”¯æŒçš„ man 手册查看器的路径。\n" "请使用 'man.<tool>.cmd'。" #: builtin/help.c:227 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" "Please consider using 'man.<tool>.path' instead." msgstr "" "'%s': 支æŒçš„ man 手册查看器命令。\n" "请使用 'man.<tool>.path'。" #: builtin/help.c:291 msgid "The most commonly used git commands are:" msgstr "最常用的 git 命令有:" #: builtin/help.c:359 #, c-format msgid "'%s': unknown man viewer." msgstr "'%s':未知的 man 查看器。" #: builtin/help.c:376 msgid "no man viewer handled the request" msgstr "没有 man 查看器处ç†æ¤è¯·æ±‚" #: builtin/help.c:384 msgid "no info viewer handled the request" msgstr "没有 info 查看器处ç†æ¤è¯·æ±‚" #: builtin/help.c:395 #, c-format msgid "'%s': not a documentation directory." msgstr "'%s':ä¸æ˜¯ä¸€ä¸ªæ–‡æ¡£ç›®å½•ã€‚" #: builtin/help.c:436 builtin/help.c:443 #, c-format msgid "usage: %s%s" msgstr "用法:%s%s" #: builtin/help.c:459 #, c-format msgid "`git %s' is aliased to `%s'" msgstr "`git %s' 是 `%s' 的别å" #: builtin/index-pack.c:170 #, c-format msgid "object type mismatch at %s" msgstr "%s 的对象类型ä¸åŒ¹é…" #: builtin/index-pack.c:190 msgid "object of unexpected type" msgstr "æ„外的类型的对象" #: builtin/index-pack.c:227 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "æ— æ³•å¡«å…… %d å—节" msgstr[1] "æ— æ³•å¡«å…… %d å—节" #: builtin/index-pack.c:237 msgid "early EOF" msgstr "过早的文件结æŸç¬¦ï¼ˆEOF)" #: builtin/index-pack.c:238 msgid "read error on input" msgstr "输入上的读错误" #: builtin/index-pack.c:250 msgid "used more bytes than were available" msgstr "用掉了超过å¯ç”¨çš„å—节" #: builtin/index-pack.c:257 msgid "pack too large for current definition of off_t" msgstr "åŒ…å¤ªå¤§è¶…è¿‡äº†å½“å‰ off_t 的定义" #: builtin/index-pack.c:273 #, c-format msgid "unable to create '%s'" msgstr "ä¸èƒ½åˆ›å»º '%s'" #: builtin/index-pack.c:278 #, c-format msgid "cannot open packfile '%s'" msgstr "æ— æ³•æ‰“å¼€åŒ…æ–‡ä»¶ '%s'" #: builtin/index-pack.c:292 msgid "pack signature mismatch" msgstr "包ç¾åä¸åŒ¹é…" #: builtin/index-pack.c:312 #, c-format msgid "pack has bad object at offset %lu: %s" msgstr "包ä¸æœ‰é”™è¯¯çš„对象ä½äºŽ %lu:%s" #: builtin/index-pack.c:434 #, c-format msgid "inflate returned %d" msgstr "解压缩返回 %d" #: builtin/index-pack.c:483 msgid "offset value overflow for delta base object" msgstr "å移值覆盖了 delta 基准对象" #: builtin/index-pack.c:491 msgid "delta base offset is out of bound" msgstr "delta 基准å移越界" #: builtin/index-pack.c:499 #, c-format msgid "unknown object type %d" msgstr "未知对象类型 %d" #: builtin/index-pack.c:531 msgid "cannot pread pack file" msgstr "æ— æ³•è¯»å–包文件" #: builtin/index-pack.c:533 #, c-format msgid "premature end of pack file, %lu byte missing" msgid_plural "premature end of pack file, %lu bytes missing" msgstr[0] "包文件过早结æŸï¼Œç¼ºå°‘ %lu å—节" msgstr[1] "包文件过早结æŸï¼Œç¼ºå°‘ %lu å—节" #: builtin/index-pack.c:555 msgid "serious inflate inconsistency" msgstr "解压缩严é‡çš„ä¸ä¸€è‡´" #: builtin/index-pack.c:646 builtin/index-pack.c:652 builtin/index-pack.c:675 #: builtin/index-pack.c:709 builtin/index-pack.c:718 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "å‘现 %s 出现 SHA1 冲çªï¼" #: builtin/index-pack.c:649 builtin/pack-objects.c:170 #: builtin/pack-objects.c:262 #, c-format msgid "unable to read %s" msgstr "ä¸èƒ½è¯» %s" #: builtin/index-pack.c:715 #, c-format msgid "cannot read existing object %s" msgstr "ä¸èƒ½è¯»å–现å˜å¯¹è±¡ %s" #: builtin/index-pack.c:729 #, c-format msgid "invalid blob object %s" msgstr "æ— æ•ˆçš„ blob 对象 %s" #: builtin/index-pack.c:744 #, c-format msgid "invalid %s" msgstr "æ— æ•ˆçš„ %s" #: builtin/index-pack.c:746 msgid "Error in object" msgstr "对象ä¸å‡ºé”™" #: builtin/index-pack.c:748 #, c-format msgid "Not all child objects of %s are reachable" msgstr "%s 的所有å对象并éžéƒ½å¯è¾¾" #: builtin/index-pack.c:818 builtin/index-pack.c:844 msgid "failed to apply delta" msgstr "æ— æ³•åº”ç”¨ delta" #: builtin/index-pack.c:983 msgid "Receiving objects" msgstr "接收对象ä¸" #: builtin/index-pack.c:983 msgid "Indexing objects" msgstr "索引对象ä¸" #: builtin/index-pack.c:1009 msgid "pack is corrupted (SHA1 mismatch)" msgstr "包冲çªï¼ˆSHA1 ä¸åŒ¹é…)" #: builtin/index-pack.c:1014 msgid "cannot fstat packfile" msgstr "ä¸èƒ½æžšä¸¾åŒ…文件状æ€" #: builtin/index-pack.c:1017 msgid "pack has junk at the end" msgstr "包的结尾有垃圾数æ®" #: builtin/index-pack.c:1028 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "parse_pack_objects() ä¸é‡åˆ°ä¸å¯ç†å–»çš„问题" #: builtin/index-pack.c:1051 msgid "Resolving deltas" msgstr "å¤„ç† delta ä¸" #: builtin/index-pack.c:1102 msgid "confusion beyond insanity" msgstr "ä¸å¯ç†å–»" #: builtin/index-pack.c:1121 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "包有 %d 个未解决的 delta" msgstr[1] "包有 %d 个未解决的 delta" #: builtin/index-pack.c:1146 #, c-format msgid "unable to deflate appended object (%d)" msgstr "ä¸èƒ½ç¼©å°é™„åŠ å¯¹è±¡ï¼ˆ%d)" #: builtin/index-pack.c:1225 #, c-format msgid "local object %s is corrupt" msgstr "本地对象 %s å·²æŸå" #: builtin/index-pack.c:1249 msgid "error while closing pack file" msgstr "å…³é—包文件时出错" #: builtin/index-pack.c:1262 #, c-format msgid "cannot write keep file '%s'" msgstr "æ— æ³•å†™ä¿ç•™æ–‡ä»¶ '%s'" #: builtin/index-pack.c:1270 #, c-format msgid "cannot close written keep file '%s'" msgstr "æ— æ³•å…³é—ä¿ç•™æ–‡ä»¶ '%s'" #: builtin/index-pack.c:1283 msgid "cannot store pack file" msgstr "æ— æ³•å˜å‚¨åŒ…文件" #: builtin/index-pack.c:1294 msgid "cannot store index file" msgstr "æ— æ³•å˜å‚¨ç´¢å¼•æ–‡ä»¶" #: builtin/index-pack.c:1395 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "æ— æ³•æ‰“å¼€çŽ°å˜åŒ…文件 '%s'" #: builtin/index-pack.c:1397 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "æ— æ³•ä¸º %s 打开包索引文件" #: builtin/index-pack.c:1444 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "éž delta:%d 个对象" msgstr[1] "éž delta:%d 个对象" #: builtin/index-pack.c:1451 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "链长 = %d: %lu 对象" msgstr[1] "链长 = %d: %lu 对象" #: builtin/index-pack.c:1478 msgid "Cannot come back to cwd" msgstr "æ— æ³•è¿”å›žå½“å‰å·¥ä½œç›®å½•" #: builtin/index-pack.c:1522 builtin/index-pack.c:1525 #: builtin/index-pack.c:1537 builtin/index-pack.c:1541 #, c-format msgid "bad %s" msgstr "错误选项 %s" #: builtin/index-pack.c:1555 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin ä¸èƒ½å’Œ --stdin 共用" #: builtin/index-pack.c:1559 builtin/index-pack.c:1569 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "包å '%s' 没有以 '.pack' 结尾" #: builtin/index-pack.c:1578 msgid "--verify with no packfile name given" msgstr "--verify 没有æ供包åå‚æ•°" #: 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 "没有从 '%2$s' å¤åˆ¶å¸¦æœ‰é”™è¯¯ç‰ˆæœ¬ %1$d 的模版" #: 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:189 #, c-format msgid "Final output: %d %s\n" msgstr "最终输出:%d %s\n" #: builtin/log.c:402 builtin/log.c:490 #, c-format msgid "Could not read object %s" msgstr "ä¸èƒ½è¯»å–对象 %s" #: builtin/log.c:514 #, c-format msgid "Unknown type: %d" msgstr "未知类型:%d" #: builtin/log.c:603 msgid "format.headers without value" msgstr "format.headers 没有值" #: builtin/log.c:677 msgid "name of output directory is too long" msgstr "输出目录å太长" #: builtin/log.c:688 #, c-format msgid "Cannot open patch file %s" msgstr "æ— æ³•æ‰“å¼€è¡¥ä¸æ–‡ä»¶ %s" #: builtin/log.c:702 msgid "Need exactly one range." msgstr "åªéœ€è¦ä¸€ä¸ªèŒƒå›´ã€‚" #: builtin/log.c:710 msgid "Not a range." msgstr "ä¸æ˜¯ä¸€ä¸ªèŒƒå›´ã€‚" #: builtin/log.c:787 msgid "Cover letter needs email format" msgstr "ä¿¡å°éœ€è¦é‚®ä»¶åœ°å€æ ¼å¼" #: builtin/log.c:860 #, c-format msgid "insane in-reply-to: %s" msgstr "ä¸æ£å¸¸çš„ in-reply-to:%s" #: builtin/log.c:933 msgid "Two output directories?" msgstr "两个输出目录?" #: builtin/log.c:1154 #, c-format msgid "bogus committer info %s" msgstr "虚å‡çš„æäº¤è€…ä¿¡æ¯ %s" #: builtin/log.c:1199 msgid "-n and -k are mutually exclusive." msgstr "-n å’Œ -k 互斥。" #: builtin/log.c:1201 msgid "--subject-prefix and -k are mutually exclusive." msgstr "--subject-prefix å’Œ -k 互斥。" #: builtin/log.c:1209 msgid "--name-only does not make sense" msgstr "--name-only æ— æ„义" #: builtin/log.c:1211 msgid "--name-status does not make sense" msgstr "--name-status æ— æ„义" #: builtin/log.c:1213 msgid "--check does not make sense" msgstr "--check æ— æ„义" #: builtin/log.c:1236 msgid "standard output, or directory, which one?" msgstr "æ ‡å‡†è¾“å‡ºæˆ–ç›®å½•ï¼Œå“ªä¸€ä¸ªï¼Ÿ" #: builtin/log.c:1238 #, c-format msgid "Could not create directory '%s'" msgstr "ä¸èƒ½åˆ›å»ºç›®å½• '%s'" #: builtin/log.c:1391 msgid "Failed to create output files" msgstr "æ— æ³•åˆ›å»ºè¾“å‡ºæ–‡ä»¶" #: builtin/log.c:1495 #, 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 #, c-format msgid "Unknown commit %s" msgstr "未知æ交 %s" #: builtin/merge.c:90 msgid "switch `m' requires a value" msgstr "开关 `m' 需è¦ä¸€ä¸ªå€¼" #: builtin/merge.c:127 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "ä¸èƒ½æ‰¾åˆ°åˆå¹¶ç–ç•¥ '%s'。\n" #: builtin/merge.c:128 #, c-format msgid "Available strategies are:" msgstr "å¯ç”¨çš„ç–略有:" #: builtin/merge.c:133 #, c-format msgid "Available custom strategies are:" msgstr "å¯ç”¨çš„自定义ç–略有:" #: builtin/merge.c:240 msgid "could not run stash." msgstr "ä¸èƒ½è¿›è¡Œè¿›åº¦ä¿å˜ã€‚" #: builtin/merge.c:245 msgid "stash failed" msgstr "进度ä¿å˜å¤±è´¥" #: builtin/merge.c:250 #, c-format msgid "not a valid object: %s" msgstr "ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆå¯¹è±¡ï¼š%s" #: builtin/merge.c:269 builtin/merge.c:286 msgid "read-tree failed" msgstr "读å–æ ‘å¤±è´¥" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: builtin/merge.c:316 msgid " (nothing to squash)" msgstr " ï¼ˆæ— å¯åŽ‹ç¼©ï¼‰" #: builtin/merge.c:329 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "压缩æ交 -- 未更新 HEAD\n" #: builtin/merge.c:361 msgid "Writing SQUASH_MSG" msgstr "写入 SQUASH_MSG" #: builtin/merge.c:363 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:437 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' 没有指å‘一个æ交" #: builtin/merge.c:536 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "åçš„ branch.%s.mergeoptions å—符串:%s" #: builtin/merge.c:629 msgid "git write-tree failed to write a tree" msgstr "git write-tree æ— æ³•å†™å…¥ä¸€æ ‘å¯¹è±¡" #: builtin/merge.c:679 msgid "failed to read the cache" msgstr "æ— æ³•è¯»å–缓å˜" #: builtin/merge.c:697 msgid "Unable to write index." msgstr "ä¸èƒ½å†™ç´¢å¼•ã€‚" #: builtin/merge.c:710 msgid "Not handling anything other than two heads merge." msgstr "ä¸èƒ½å¤„ç†ä¸¤ä¸ªå¤´åˆå¹¶ä¹‹å¤–的任何æ“作。" #: builtin/merge.c:724 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "merge-recursive 的未知选项:-X%s" #: builtin/merge.c:738 #, c-format msgid "unable to write %s" msgstr "ä¸èƒ½å†™ %s" #: builtin/merge.c:877 #, c-format msgid "Could not read from '%s'" msgstr "ä¸èƒ½ä»Ž '%s' 读å–" #: builtin/merge.c:886 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "未æ交åˆå¹¶ï¼Œä½¿ç”¨ 'git commit' 完æˆæ¤æ¬¡åˆå¹¶ã€‚\n" #: builtin/merge.c:892 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:916 msgid "Empty commit message." msgstr "空æ交信æ¯ã€‚" #: builtin/merge.c:928 #, c-format msgid "Wonderful.\n" msgstr "太棒了。\n" #: builtin/merge.c:993 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "自动åˆå¹¶å¤±è´¥ï¼Œä¿®æ£å†²çªç„¶åŽæ交修æ£çš„结果。\n" #: builtin/merge.c:1009 #, c-format msgid "'%s' is not a commit" msgstr "'%s' ä¸æ˜¯ä¸€ä¸ªæ交" #: builtin/merge.c:1050 msgid "No current branch." msgstr "没有当å‰åˆ†æ”¯ã€‚" #: builtin/merge.c:1052 msgid "No remote for the current branch." msgstr "当å‰åˆ†æ”¯æ²¡æœ‰å¯¹åº”的远程版本库。" #: builtin/merge.c:1054 msgid "No default upstream defined for the current branch." msgstr "当å‰åˆ†æ”¯æ²¡æœ‰å®šä¹‰é»˜è®¤çš„上游分支。" #: builtin/merge.c:1059 #, c-format msgid "No remote tracking branch for %s from %s" msgstr "%s 没有æ¥è‡ª %s 的远程跟踪分支" #: builtin/merge.c:1146 builtin/merge.c:1303 #, c-format msgid "%s - not something we can merge" msgstr "%s - ä¸èƒ½è¢«åˆå¹¶" #: builtin/merge.c:1214 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "没有è¦ç»ˆæ¢çš„åˆå¹¶ï¼ˆMERGE_HEAD 丢失)。" #: builtin/merge.c:1230 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:1233 git-pull.sh:34 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "您尚未结æŸæ‚¨çš„åˆå¹¶ï¼ˆå˜åœ¨ MERGE_HEAD)。" #: builtin/merge.c:1237 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:1240 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "您尚未结æŸæ‚¨çš„拣选(å˜åœ¨ CHERRY_PICK_HEAD)。" #: builtin/merge.c:1249 msgid "You cannot combine --squash with --no-ff." msgstr "您ä¸èƒ½å°† --squash 与 --no-ff 共用。" #: builtin/merge.c:1254 msgid "You cannot combine --no-ff with --ff-only." msgstr "您ä¸èƒ½å°† --no-ff 与 --ff-only 共用。" #: builtin/merge.c:1261 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "未指定æ交并且 merge.defaultToUpstream 未设置。" #: builtin/merge.c:1293 msgid "Can merge only exactly one commit into empty head" msgstr "åªèƒ½å°†ä¸€ä¸ªæ交åˆå¹¶åˆ°ç©ºåˆ†æ”¯ä¸Š" #: builtin/merge.c:1296 msgid "Squash commit into empty head not supported yet" msgstr "å°šä¸æ”¯æŒåˆ°ç©ºåˆ†æ”¯çš„压缩æ交" #: builtin/merge.c:1298 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "到空分支的éžå¿«è¿›å¼æ交没有æ„义" #: builtin/merge.c:1413 #, c-format msgid "Updating %s..%s\n" msgstr "æ›´æ–° %s..%s\n" #: builtin/merge.c:1451 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "å°è¯•éžå¸¸å°çš„索引内åˆå¹¶...\n" #: builtin/merge.c:1458 #, c-format msgid "Nope.\n" msgstr "æ— ã€‚\n" #: builtin/merge.c:1490 msgid "Not possible to fast-forward, aborting." msgstr "æ— æ³•å¿«è¿›ï¼Œç»ˆæ¢ã€‚" #: builtin/merge.c:1513 builtin/merge.c:1592 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "å°†æ ‘å›žæ»šè‡³åŽŸå§‹çŠ¶æ€...\n" #: builtin/merge.c:1517 #, c-format msgid "Trying merge strategy %s...\n" msgstr "å°è¯•åˆå¹¶ç–ç•¥ %s...\n" #: builtin/merge.c:1583 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "没有åˆå¹¶ç–略处ç†æ¤åˆå¹¶ã€‚\n" #: builtin/merge.c:1585 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "使用ç–ç•¥ %s åˆå¹¶å¤±è´¥ã€‚\n" #: builtin/merge.c:1594 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "使用 %s 以准备手工解决。\n" #: builtin/merge.c:1606 #, 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 builtin/remote.c:731 #, 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:347 #, 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:542 #, c-format msgid "cannot read '%s'" msgstr "ä¸èƒ½è¯»å– '%s'" #: builtin/notes.c:253 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 #, 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 "" "å命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\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 builtin/remote.c:1598 #, c-format msgid "Unknown subcommand: %s" msgstr "未知å命令:%s" #: builtin/pack-objects.c:183 builtin/pack-objects.c:186 #, c-format msgid "deflate error (%d)" msgstr "压缩错误 (%d)" #: builtin/pack-objects.c:2398 #, c-format msgid "unsupported index version %s" msgstr "ä¸æ”¯æŒçš„索引版本 %s" #: builtin/pack-objects.c:2402 #, c-format msgid "bad index version '%s'" msgstr "å的索引版本 '%s'" #: builtin/pack-objects.c:2425 #, c-format msgid "option %s does not accept negative form" msgstr "选项 %s ä¸æŽ¥å—å¦å®šæ ¼å¼" #: builtin/pack-objects.c:2429 #, c-format msgid "unable to parse value '%s' for option %s" msgstr "ä¸èƒ½è§£æžé€‰é¡¹ %1$s 的值 '%2$s'" #: builtin/push.c:45 msgid "tag shorthand without <tag>" msgstr "tag 简写没有跟 <tag> å‚æ•°" #: builtin/push.c:64 msgid "--delete only accepts plain target ref names" msgstr "--delete åªæŽ¥å—简å•çš„ç›®æ ‡å¼•ç”¨å" #: builtin/push.c:99 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." msgstr "" "\n" "为了永久地选择任一选项,å‚è§ 'git help config' ä¸çš„ push.default。" #: builtin/push.c:102 #, c-format msgid "" "The upstream branch of your current branch does not match\n" "the name of your current branch. To push to the upstream branch\n" "on the remote, use\n" "\n" " git push %s HEAD:%s\n" "\n" "To push to the branch of the same name on the remote, use\n" "\n" " git push %s %s\n" "%s" msgstr "" "如果您当å‰åˆ†æ”¯çš„上游分支和您当å‰åˆ†æ”¯åä¸åŒ¹é…,为推é€åˆ°è¿œç¨‹çš„\n" "上游分支,使用\n" "\n" " git push %s HEAD:%s\n" "\n" "为推é€è‡³è¿œç¨‹åŒå分支,使用\n" "\n" " git push %s %s\n" "%s" #: builtin/push.c:121 #, 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:128 #, 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:136 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "当å‰åˆ†æ”¯ %s 有多个上游分支,拒ç»æŽ¨é€ã€‚" #: builtin/push.c:139 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" "your current branch '%s', without telling me what to push\n" "to update which remote branch." msgstr "" "您æ£æŽ¨é€è‡³è¿œç¨‹ '%s'(其并éžå½“å‰åˆ†æ”¯ '%s' 的上游),\n" "而没有告诉我è¦æŽ¨é€ä»€ä¹ˆã€æ›´æ–°å“ªä¸ªè¿œç¨‹åˆ†æ”¯ã€‚" #: builtin/push.c:174 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "您没有为推é€æŒ‡å®šä»»ä½•å¼•ç”¨è¡¨è¾¾å¼ï¼Œå¹¶ä¸” push.default 为 \"nothing\"。" #: builtin/push.c:181 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Merge the remote changes (e.g. 'git pull')\n" "before pushing again.\n" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" "更新被拒ç»ï¼Œå› 为您当å‰åˆ†æ”¯çš„最新æ交è½åŽäºŽå…¶å¯¹åº”的远程分支。\n" "å†æ¬¡æŽ¨é€å‰ï¼Œå…ˆä¸Žè¿œç¨‹å˜æ›´åˆå¹¶ï¼ˆå¦‚ 'git pull')。详è§\n" "'git push --help' ä¸çš„ 'Note about fast-forwards' å°èŠ‚。" #: builtin/push.c:187 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. If you did not intend to push that branch, you may want to\n" "specify branches to push or set the 'push.default' configuration\n" "variable to 'current' or 'upstream' to push only the current branch." msgstr "" "更新被拒ç»ï¼Œå› 为推é€çš„一个分支的最新æ交è½åŽäºŽå…¶å¯¹åº”的远程分支。\n" "如果您并éžæœ‰æ„推é€è¯¥åˆ†æ”¯ï¼Œæ‚¨å¯ä»¥åœ¨æŽ¨é€æ—¶æŒ‡å®šè¦æŽ¨é€çš„分支,或者将\n" "é…ç½®å˜é‡ 'push.default' 设置为 'current' 或 'upstream' 以便åªæŽ¨é€å½“å‰åˆ†æ”¯ã€‚" #: builtin/push.c:193 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. Check out this branch and merge the remote changes\n" "(e.g. 'git pull') before pushing again.\n" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" "更新被拒ç»ï¼Œå› 为推é€çš„一个分支的最新æ交è½åŽäºŽå…¶å¯¹åº”的远程分支。\n" "检出该分支并与远程å˜æ›´åˆå¹¶ï¼ˆå¦‚ 'git pull'),然åŽå†æŽ¨é€ã€‚详è§\n" "'git push --help' ä¸çš„ 'Note about fast-forwards' å°èŠ‚。" #: builtin/push.c:233 #, c-format msgid "Pushing to %s\n" msgstr "推é€åˆ° %s\n" #: builtin/push.c:237 #, c-format msgid "failed to push some refs to '%s'" msgstr "æ— æ³•æŽ¨é€ä¸€äº›å¼•ç”¨åˆ° '%s'" #: builtin/push.c:269 #, c-format msgid "bad repository '%s'" msgstr "å的版本库 '%s'" #: builtin/push.c:270 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:285 msgid "--all and --tags are incompatible" msgstr "--all å’Œ --tags ä¸å…¼å®¹" #: builtin/push.c:286 msgid "--all can't be combined with refspecs" msgstr "--all ä¸èƒ½å’Œå¼•ç”¨è¡¨è¾¾å¼å…±ç”¨" #: builtin/push.c:291 msgid "--mirror and --tags are incompatible" msgstr "--mirror å’Œ --tags ä¸å…¼å®¹" #: builtin/push.c:292 msgid "--mirror can't be combined with refspecs" msgstr "--mirror ä¸èƒ½å’Œå¼•ç”¨è¡¨è¾¾å¼å…±ç”¨" #: builtin/push.c:297 msgid "--all and --mirror are incompatible" msgstr "--all å’Œ --mirror ä¸å…¼å®¹" #: builtin/push.c:385 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete 与 --allã€--mirror åŠ --tags ä¸å…¼å®¹" #: builtin/push.c:387 msgid "--delete doesn't make sense without any refs" msgstr "--delete 未接任何引用没有æ„义" #: builtin/remote.c:98 #, c-format msgid "Updating %s" msgstr "æ›´æ–° %s ä¸" #: builtin/remote.c:130 msgid "" "--mirror is dangerous and deprecated; please\n" "\t use --mirror=fetch or --mirror=push instead" msgstr "" "--mirror 选项å±é™©ä¸”过时,请使用 --mirror=fetch\n" "\t 或 --mirror=push" #: builtin/remote.c:147 #, c-format msgid "unknown mirror argument: %s" msgstr "未知的镜åƒå‚数:%s" #: builtin/remote.c:185 msgid "specifying a master branch makes no sense with --mirror" msgstr "指定一个 master 分支并使用 --mirror 选项没有æ„义" #: builtin/remote.c:187 msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "指定è¦è·Ÿè¸ªçš„分支åªåœ¨ä¸ŽèŽ·å–é•œåƒå…±ç”¨æ‰æœ‰æ„义" #: builtin/remote.c:195 builtin/remote.c:646 #, c-format msgid "remote %s already exists." msgstr "远程 %s å·²ç»å˜åœ¨ã€‚" #: builtin/remote.c:199 builtin/remote.c:650 #, c-format msgid "'%s' is not a valid remote name" msgstr "'%s' ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„远程å称" #: builtin/remote.c:243 #, c-format msgid "Could not setup master '%s'" msgstr "æ— æ³•è®¾ç½® master '%s'" #: builtin/remote.c:299 #, c-format msgid "more than one %s" msgstr "多于一个 %s" #: builtin/remote.c:339 #, c-format msgid "Could not get fetch map for refspec %s" msgstr "æ— æ³•å¾—åˆ°å¼•ç”¨è¡¨è¾¾å¼ %s 的获å–列表" #: builtin/remote.c:440 builtin/remote.c:448 msgid "(matching)" msgstr "(匹é…)" #: builtin/remote.c:452 msgid "(delete)" msgstr "ï¼ˆåˆ é™¤ï¼‰" #: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607 #, c-format msgid "Could not append '%s' to '%s'" msgstr "ä¸èƒ½æ·»åŠ '%s' 至 '%s'" #: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890 #, c-format msgid "No such remote: %s" msgstr "æ²¡æœ‰è¿™æ ·çš„è¿œç¨‹ï¼š%s" #: builtin/remote.c:656 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "ä¸èƒ½é‡å‘½åé…ç½®å°èŠ‚ '%s' 到 '%s'" #: builtin/remote.c:662 builtin/remote.c:799 #, c-format msgid "Could not remove config section '%s'" msgstr "ä¸èƒ½ç§»é™¤é…ç½®å°èŠ‚ '%s'" #: builtin/remote.c:677 #, c-format msgid "" "Not updating non-default fetch refspec\n" "\t%s\n" "\tPlease update the configuration manually if necessary." msgstr "" "没有更新éžé»˜è®¤çš„获å–引用表达å¼\n" "\t%s\n" "\t如果必è¦è¯·æ‰‹åŠ¨æ›´æ–°é…置。" #: builtin/remote.c:683 #, c-format msgid "Could not append '%s'" msgstr "ä¸èƒ½è¿½åŠ '%s'" #: builtin/remote.c:694 #, c-format msgid "Could not set '%s'" msgstr "ä¸èƒ½è®¾ç½® '%s'" #: builtin/remote.c:716 #, c-format msgid "deleting '%s' failed" msgstr "åˆ é™¤ '%s' 失败" #: builtin/remote.c:750 #, c-format msgid "creating '%s' failed" msgstr "创建 '%s' 失败" #: builtin/remote.c:764 #, c-format msgid "Could not remove branch %s" msgstr "æ— æ³•ç§»é™¤åˆ†æ”¯ %s" #: builtin/remote.c:834 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" msgid_plural "" "Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n" "to delete them, use:" msgstr[0] "注æ„:ref/remotes 层级之外的一个分支未被移除。è¦åˆ 除它,使用:" msgstr[1] "注æ„:ref/remotes 层级之外的一些分支未被移除。è¦åˆ 除它们,使用:" #: builtin/remote.c:943 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " 新的(下一次获å–å°†å˜å‚¨äºŽ remotes/%s)" #: builtin/remote.c:946 msgid " tracked" msgstr " 已跟踪" #: builtin/remote.c:948 msgid " stale (use 'git remote prune' to remove)" msgstr " 过时(使用 'git remote prune' æ¥ç§»é™¤ï¼‰" #: builtin/remote.c:950 msgid " ???" msgstr " ???" #: builtin/remote.c:991 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "æ— æ•ˆçš„ branch.%s.merge,ä¸èƒ½å˜åŸºåˆ°ä¸€ä¸ªä»¥ä¸Šçš„分支" #: builtin/remote.c:998 #, c-format msgid "rebases onto remote %s" msgstr "å˜åŸºåˆ°è¿œç¨‹ %s" #: builtin/remote.c:1001 #, c-format msgid " merges with remote %s" msgstr " 与远程 %s åˆå¹¶" #: builtin/remote.c:1002 msgid " and with remote" msgstr " 且有远程" #: builtin/remote.c:1004 #, c-format msgid "merges with remote %s" msgstr "与远程 %s åˆå¹¶" #: builtin/remote.c:1005 msgid " and with remote" msgstr " 且有远程" #: builtin/remote.c:1051 msgid "create" msgstr "创建" #: builtin/remote.c:1054 msgid "delete" msgstr "åˆ é™¤" #: builtin/remote.c:1058 msgid "up to date" msgstr "最新" #: builtin/remote.c:1061 msgid "fast-forwardable" msgstr "å¯å¿«è¿›" #: builtin/remote.c:1064 msgid "local out of date" msgstr "本地已过时" #: builtin/remote.c:1071 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s 强制推é€è‡³ %-*s (%s)" #: builtin/remote.c:1074 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s 推é€è‡³ %-*s (%s)" #: builtin/remote.c:1078 #, c-format msgid " %-*s forces to %s" msgstr " %-*s 强制推é€è‡³ %s" #: builtin/remote.c:1081 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s 推é€è‡³ %s" #: builtin/remote.c:1118 #, c-format msgid "* remote %s" msgstr "* 远程 %s" #: builtin/remote.c:1119 #, c-format msgid " Fetch URL: %s" msgstr " 获å–地å€ï¼š%s" #: builtin/remote.c:1120 builtin/remote.c:1285 msgid "(no URL)" msgstr "(æ— URL)" #: builtin/remote.c:1129 builtin/remote.c:1131 #, c-format msgid " Push URL: %s" msgstr " 推é€åœ°å€ï¼š%s" #: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137 #, c-format msgid " HEAD branch: %s" msgstr " HEAD分支:%s" #: builtin/remote.c:1139 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr " HEAD 分支(远程 HEAD 模糊,å¯èƒ½æ˜¯ä¸‹åˆ—ä¸çš„一个):\n" #: builtin/remote.c:1151 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " 远程分支:%s" msgstr[1] " 远程分支:%s" # 译者:ä¸æ–‡å—符串拼接,å¯åˆ 除å‰å¯¼ç©ºæ ¼ #: builtin/remote.c:1154 builtin/remote.c:1181 msgid " (status not queried)" msgstr "(状æ€æœªæŸ¥è¯¢ï¼‰" #: builtin/remote.c:1163 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " 为 'git pull' é…置的本地分支:" msgstr[1] " 为 'git pull' é…置的本地分支:" #: builtin/remote.c:1171 msgid " Local refs will be mirrored by 'git push'" msgstr " 本地引用将在 'git push' 时被镜åƒ" #: builtin/remote.c:1178 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] " 为 'git push' é…置的本地引用%s:" msgstr[1] " 为 'git push' é…置的本地引用%s:" #: builtin/remote.c:1216 msgid "Cannot determine remote HEAD" msgstr "æ— æ³•ç¡®å®šè¿œç¨‹ HEAD" #: builtin/remote.c:1218 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:" #: builtin/remote.c:1228 #, c-format msgid "Could not delete %s" msgstr "æ— æ³•åˆ é™¤ %s" #: builtin/remote.c:1236 #, c-format msgid "Not a valid ref: %s" msgstr "ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆå¼•ç”¨ï¼š%s" #: builtin/remote.c:1238 #, c-format msgid "Could not setup %s" msgstr "ä¸èƒ½è®¾ç½® %s" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: builtin/remote.c:1274 #, c-format msgid " %s will become dangling!" msgstr " %s å°†æˆä¸ºæ‚¬ç©ºçŠ¶æ€ï¼" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: builtin/remote.c:1275 #, c-format msgid " %s has become dangling!" msgstr " %s å·²æˆä¸ºæ‚¬ç©ºçŠ¶æ€ï¼" #: builtin/remote.c:1281 #, c-format msgid "Pruning %s" msgstr "修剪 %s" #: builtin/remote.c:1282 #, c-format msgid "URL: %s" msgstr "URL:%s" #: builtin/remote.c:1295 #, c-format msgid " * [would prune] %s" msgstr " * [å°†åˆ é™¤] %s" #: builtin/remote.c:1298 #, c-format msgid " * [pruned] %s" msgstr " * [å·²åˆ é™¤] %s" #: builtin/remote.c:1387 builtin/remote.c:1461 #, c-format msgid "No such remote '%s'" msgstr "没有æ¤è¿œç¨‹ '%s'" #: builtin/remote.c:1414 msgid "no remote specified" msgstr "未指定远程" #: builtin/remote.c:1447 msgid "--add --delete doesn't make sense" msgstr "--add --delete æ— æ„义" #: builtin/remote.c:1487 #, c-format msgid "Invalid old URL pattern: %s" msgstr "æ— æ•ˆçš„æ—§URL匹é…模版:%s" #: builtin/remote.c:1495 #, c-format msgid "No such URL found: %s" msgstr "未找到æ¤URL:%s" #: builtin/remote.c:1497 msgid "Will not delete all non-push URLs" msgstr "å°†ä¸ä¼šåˆ 除所有éžæŽ¨é€URL地å€" #: 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 "merge" 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:92 #, c-format msgid "%s: %s cannot be used with %s" msgstr "%s:%s ä¸èƒ½å’Œ %s 共用" #: builtin/revert.c:131 msgid "program error" msgstr "程åºé”™è¯¯" #: builtin/revert.c:221 msgid "revert failed" msgstr "还原失败" #: builtin/revert.c:236 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:60 #, c-format msgid "malformed object at '%s'" msgstr "éžæ³•çš„对象于 '%s'" #: builtin/tag.c:207 #, c-format msgid "tag name too long: %.*s..." msgstr "tag åå—太长:%.*s..." #: builtin/tag.c:212 #, c-format msgid "tag '%s' not found." msgstr "tag '%s' 未å‘现。" #: builtin/tag.c:227 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "å·²åˆ é™¤ tag '%s'(曾为 %s)\n" #: builtin/tag.c:239 #, c-format msgid "could not verify the tag '%s'" msgstr "ä¸èƒ½æ ¡éªŒ tag '%s'" #: builtin/tag.c:249 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:256 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:298 msgid "unable to sign the tag" msgstr "æ— æ³•ç¾ç½² tag" #: builtin/tag.c:300 msgid "unable to write tag file" msgstr "æ— æ³•å†™ tag 文件" #: builtin/tag.c:325 msgid "bad object type." msgstr "å的对象类型。" #: builtin/tag.c:338 msgid "tag header too big." msgstr "tag 头信æ¯å¤ªå¤§ã€‚" #: builtin/tag.c:370 msgid "no tag message?" msgstr "æ— tag 说明?" #: builtin/tag.c:376 #, c-format msgid "The tag message has been left in %s\n" msgstr "tag 说明被ä¿ç•™åœ¨ %s\n" #: builtin/tag.c:425 msgid "switch 'points-at' requires an object" msgstr "开关 'points-at' 需è¦ä¸€ä¸ªå¯¹è±¡" #: builtin/tag.c:427 #, c-format msgid "malformed object name '%s'" msgstr "éžæ³•çš„对象å '%s'" #: builtin/tag.c:506 msgid "--column and -n are incompatible" msgstr "--column å’Œ -n ä¸å…¼å®¹" #: builtin/tag.c:523 msgid "-n option is only allowed with -l." msgstr "-n 选项åªå…许和 -l 共用。" #: builtin/tag.c:525 msgid "--contains option is only allowed with -l." msgstr "--contains 选项åªå…许和 -l 共用。" #: builtin/tag.c:527 msgid "--points-at option is only allowed with -l." msgstr "--points-at 选项åªå…许和 -l 共用。" #: builtin/tag.c:535 msgid "only one -F or -m option is allowed." msgstr "åªå…许一个 -F 或 -m 选项。" #: builtin/tag.c:555 msgid "too many params" msgstr "太多å‚æ•°" #: builtin/tag.c:561 #, c-format msgid "'%s' is not a valid tag name." msgstr "'%s' ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„tagå称。" #: builtin/tag.c:566 #, c-format msgid "tag '%s' already exists" msgstr "tag '%s' å·²å˜åœ¨" #: builtin/tag.c:584 #, c-format msgid "%s: cannot lock the ref" msgstr "%s:ä¸èƒ½é”定引用" #: builtin/tag.c:586 #, c-format msgid "%s: cannot update the ref" msgstr "%s:ä¸èƒ½æ›´æ–°å¼•ç”¨" #: builtin/tag.c:588 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "已更新tag '%s'(曾为 %s)\n" #: git.c:16 msgid "See 'git help <command>' for more information on a specific command." msgstr "å‚è§ 'git help <command>' 以获得该特定命令的详细信æ¯ã€‚" #: parse-options.h:133 parse-options.h:235 msgid "n" msgstr "æ•°å—" #: parse-options.h:141 msgid "time" msgstr "时间" #: parse-options.h:149 msgid "file" msgstr "文件" #: parse-options.h:151 msgid "when" msgstr "何时" #: parse-options.h:156 msgid "no-op (backward compatibility)" msgstr "空æ“作(å‘åŽå…¼å®¹ï¼‰" #: parse-options.h:228 msgid "be more verbose" msgstr "æ›´åŠ è¯¦ç»†" #: parse-options.h:230 msgid "be more quiet" msgstr "æ›´åŠ å®‰é™" #: parse-options.h:236 msgid "use <n> digits to display SHA-1s" msgstr "用 <n> ä½æ•°å—显示 SHA-1 哈希值" #: common-cmds.h:8 msgid "Add file contents to the index" msgstr "æ·»åŠ æ–‡ä»¶å†…å®¹è‡³ç´¢å¼•" #: common-cmds.h:9 msgid "Find by binary search the change that introduced a bug" msgstr "通过二分查找定ä½å¼•å…¥ bug çš„å˜æ›´" #: common-cmds.h:10 msgid "List, create, or delete branches" msgstr "列出ã€åˆ›å»ºæˆ–åˆ é™¤åˆ†æ”¯" #: common-cmds.h:11 msgid "Checkout a branch or paths to the working tree" msgstr "检出一个分支或路径到工作区" #: common-cmds.h:12 msgid "Clone a repository into a new directory" msgstr "克隆一个版本库到一个新目录" #: common-cmds.h:13 msgid "Record changes to the repository" msgstr "记录å˜æ›´åˆ°ç‰ˆæœ¬åº“" #: common-cmds.h:14 msgid "Show changes between commits, commit and working tree, etc" msgstr "显示æ交之间ã€æ交和工作区之间ç‰çš„差异" #: common-cmds.h:15 msgid "Download objects and refs from another repository" msgstr "从å¦å¤–一个版本库下载对象和引用" #: common-cmds.h:16 msgid "Print lines matching a pattern" msgstr "输出和模å¼åŒ¹é…çš„è¡Œ" #: common-cmds.h:17 msgid "Create an empty git repository or reinitialize an existing one" msgstr "创建一个空的 git 版本库或者é‡æ–°åˆå§‹åŒ–一个" #: common-cmds.h:18 msgid "Show commit logs" msgstr "显示æ交日志" #: common-cmds.h:19 msgid "Join two or more development histories together" msgstr "åˆå¹¶ä¸¤ä¸ªæˆ–更多开å‘历å²" #: common-cmds.h:20 msgid "Move or rename a file, a directory, or a symlink" msgstr "移动或é‡å‘½å一个文件ã€ç›®å½•æˆ–符å·é“¾æŽ¥" #: common-cmds.h:21 msgid "Fetch from and merge with another repository or a local branch" msgstr "获å–并åˆå¹¶å¦å¤–的版本库或一个本地分支" #: common-cmds.h:22 msgid "Update remote refs along with associated objects" msgstr "更新远程引用和相关的对象" #: common-cmds.h:23 msgid "Forward-port local commits to the updated upstream head" msgstr "本地æ交转移至更新åŽçš„上游分支ä¸" #: common-cmds.h:24 msgid "Reset current HEAD to the specified state" msgstr "é‡ç½®å½“å‰HEAD到指定状æ€" #: common-cmds.h:25 msgid "Remove files from the working tree and from the index" msgstr "从工作区和索引ä¸åˆ 除文件" #: common-cmds.h:26 msgid "Show various types of objects" msgstr "显示å„ç§ç±»åž‹çš„对象" #: common-cmds.h:27 msgid "Show the working tree status" msgstr "显示工作区状æ€" #: common-cmds.h:28 msgid "Create, list, delete or verify a tag object signed with GPG" msgstr "创建ã€åˆ—出ã€åˆ é™¤æˆ–æ ¡éªŒä¸€ä¸ªGPGç¾åçš„ tag 对象" #: git-am.sh:50 msgid "You need to set your committer info first" msgstr "您需è¦å…ˆè®¾ç½®ä½ çš„æ交者信æ¯" #: git-am.sh:95 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" msgstr "您好åƒåœ¨ä¸Šä¸€æ¬¡ 'am' 失败åŽç§»åŠ¨äº† HEAD。未回退至 ORIG_HEAD" #: git-am.sh:105 #, sh-format msgid "" "When you have resolved this problem run \"$cmdline --resolved\".\n" "If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n" "To restore the original branch and stop patching run \"$cmdline --abort\"." msgstr "" "当您解决了æ¤é—®é¢˜åŽï¼Œæ‰§è¡Œ \"$cmdline --resolved\"。\n" "如果您想跳过æ¤è¡¥ä¸ï¼Œåˆ™æ‰§è¡Œ \"$cmdline --skip\"。\n" "è¦æ¢å¤åŽŸåˆ†æ”¯å¹¶åœæ¢æ‰“è¡¥ä¸ï¼Œæ‰§è¡Œ \"$cmdline --abort\"。" #: git-am.sh:121 msgid "Cannot fall back to three-way merge." msgstr "æ— æ³•æ±‚åŠ©äºŽä¸‰è·¯åˆå¹¶ã€‚" #: git-am.sh:137 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "版本库缺ä¹å¿…è¦çš„ blob æ•°æ®ä»¥è¿›è¡Œä¸‰è·¯åˆå¹¶ã€‚" #: git-am.sh:154 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." msgstr "" "您是å¦æ›¾æ‰‹åŠ¨ç¼–辑过您的补ä¸ï¼Ÿ\n" "æ— æ³•åº”ç”¨è¡¥ä¸åˆ°ç´¢å¼•ä¸çš„æ•°æ®ä¸Šã€‚" #: git-am.sh:163 msgid "Falling back to patching base and 3-way merge..." msgstr "转而在基础版本上打补ä¸åŠè¿›è¡Œä¸‰è·¯åˆå¹¶..." #: git-am.sh:275 msgid "Only one StGIT patch series can be applied at once" msgstr "一次åªèƒ½æœ‰ä¸€ä¸ª StGIT è¡¥ä¸é˜Ÿåˆ—被应用" #: git-am.sh:362 #, sh-format msgid "Patch format $patch_format is not supported." msgstr "ä¸æ”¯æŒ $patch_format è¡¥ä¸æ ¼å¼ã€‚" #: git-am.sh:364 msgid "Patch format detection failed." msgstr "è¡¥ä¸æ ¼å¼æ£€æµ‹å¤±è´¥ã€‚" #: git-am.sh:418 msgid "-d option is no longer supported. Do not use." msgstr "ä¸å†æ”¯æŒ -d 选项。ä¸è¦ä½¿ç”¨ã€‚" #: git-am.sh:481 #, sh-format msgid "previous rebase directory $dotest still exists but mbox given." msgstr "之å‰çš„å˜åŸºç›®å½• $dotest ä»ç„¶å˜åœ¨ä½†ç»™å‡ºäº†mbox。" #: git-am.sh:486 msgid "Please make up your mind. --skip or --abort?" msgstr "请下决心。--skip 或是 --abort ?" #: git-am.sh:513 msgid "Resolve operation not in progress, we are not resuming." msgstr "解决æ“作未进行,我们ä¸ä¼šç»§ç»ã€‚" #: git-am.sh:579 #, sh-format msgid "Dirty index: cannot apply patches (dirty: $files)" msgstr "è„的索引:ä¸èƒ½åº”用补ä¸ï¼ˆè„文件:$files)" #: git-am.sh:671 #, sh-format msgid "" "Patch is empty. Was it split wrong?\n" "If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n" "To restore the original branch and stop patching run \"$cmdline --abort\"." msgstr "" "è¡¥ä¸ä¸ºç©ºã€‚是ä¸æ˜¯åˆ‡åˆ†é”™è¯¯ï¼Ÿ\n" "如果您想è¦è·³è¿‡è¿™ä¸ªè¡¥ä¸ï¼Œæ‰§è¡Œ \"$cmdline --skip\"。\n" "è¦æ¢å¤åŽŸåˆ†æ”¯å¹¶åœæ¢æ‰“è¡¥ä¸ï¼Œæ‰§è¡Œ \"$cmdline --abort\"。" #: git-am.sh:708 msgid "Patch does not have a valid e-mail address." msgstr "è¡¥ä¸ä¸æ²¡æœ‰ä¸€ä¸ªæœ‰æ•ˆçš„邮件地å€ã€‚" #: git-am.sh:755 msgid "cannot be interactive without stdin connected to a terminal." msgstr "æ ‡å‡†è¾“å…¥æ²¡æœ‰å’Œç»ˆç«¯å…³è”,ä¸èƒ½è¿›è¡Œäº¤äº’å¼æ“作。" #: git-am.sh:759 msgid "Commit Body is:" 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:766 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:802 #, sh-format msgid "Applying: $FIRSTLINE" msgstr "æ£åº”用:$FIRSTLINE" #: git-am.sh:823 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" "already introduced the same changes; you might want to skip this patch." msgstr "" "没有å˜æ›´ —— 您是ä¸æ˜¯å¿˜äº†æ‰§è¡Œ 'git add'?\n" "如果没有什么è¦æ·»åŠ 到暂å˜åŒºçš„,则很å¯èƒ½æ˜¯å…¶å®ƒæ交已ç»å¼•å…¥äº†ç›¸åŒçš„å˜æ›´ã€‚\n" "您也许想è¦è·³è¿‡è¿™ä¸ªè¡¥ä¸ã€‚" #: git-am.sh:831 msgid "" "You still have unmerged paths in your index\n" "did you forget to use 'git add'?" msgstr "您的索引ä¸ä»æœ‰æœªåˆå¹¶çš„路径。您是å¦å¿˜äº†æ‰§è¡Œ 'git add'?" #: git-am.sh:847 msgid "No changes -- Patch already applied." msgstr "没有å˜æ›´ -- è¡¥ä¸å·²ç»åº”用过。" #: git-am.sh:857 #, sh-format msgid "Patch failed at $msgnum $FIRSTLINE" msgstr "è¡¥ä¸å¤±è´¥äºŽ $msgnum $FIRSTLINE" #: git-am.sh:873 msgid "applying to an empty history" msgstr "æ£åº”用到一个空历å²ä¸Š" #: git-bisect.sh:48 msgid "You need to start by \"git bisect start\"" msgstr "您需è¦æ‰§è¡Œ \"git bisect start\" æ¥å¼€å§‹" # 译者:注æ„ä¿æŒå¥å°¾ç©ºæ ¼ #. 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' åªèƒ½å¸¦ä¸€ä¸ªå‚数。" #. have bad but not good. we could bisect although #. this is less optimum. #: git-bisect.sh:273 msgid "Warning: bisecting only with a bad commit." 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:279 msgid "Are you sure [Y/n]? " msgstr "您确认么[Y/n]? " #: git-bisect.sh:289 msgid "" "You need to give me at least one good and one bad revisions.\n" "(You can use \"git bisect bad\" and \"git bisect good\" for that.)" msgstr "" "您需è¦ç»™æˆ‘至少一个好版本和一个å版本。\n" "(您å¯ä»¥ç”¨ \"git bisect bad\" å’Œ \"git bisect good\" 命令æ¥æ ‡è¯†ã€‚)" #: git-bisect.sh:292 msgid "" "You need to start by \"git bisect start\".\n" "You then need to give me at least one good and one bad revisions.\n" "(You can use \"git bisect bad\" and \"git bisect good\" for that.)" msgstr "" "您需è¦æ‰§è¡Œ \"git bisect start\" æ¥å¼€å§‹ã€‚\n" "然åŽéœ€è¦æ供我至少一个好版本和一个å版本。\n" "(您å¯ä»¥ç”¨ \"git bisect bad\" å’Œ \"git bisect good\" 命令æ¥æ ‡è¯†ã€‚)" #: git-bisect.sh:347 git-bisect.sh:474 msgid "We are not bisecting." msgstr "我们没有在二分查找。" #: 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:420 #, sh-format msgid "running $command" msgstr "è¿è¡Œ $command" #: git-bisect.sh:427 #, sh-format msgid "" "bisect run failed:\n" "exit code $res from '$command' is < 0 or >= 128" msgstr "" "二分查找è¿è¡Œå¤±è´¥ï¼š\n" "命令 '$command' 的退出ç $res 或者å°äºŽ 0 或者大于ç‰äºŽ 128" #: git-bisect.sh:453 msgid "bisect run cannot continue any more" msgstr "二分查找ä¸èƒ½ç»§ç»è¿è¡Œ" #: git-bisect.sh:459 #, sh-format msgid "" "bisect run failed:\n" "'bisect_state $state' exited with error code $res" msgstr "" "二分查找è¿è¡Œå¤±è´¥ï¼š\n" "'bisect_state $state' 退出ç 为 $res" #: git-bisect.sh:466 msgid "bisect run success" 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:197 msgid "updating an unborn branch with changes added to the index" msgstr "更新尚未诞生的分支,å˜æ›´æ·»åŠ 至索引" #. The fetch involved updating the current branch. #. 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 #, sh-format msgid "" "Warning: fetch updated the current branch head.\n" "Warning: fast-forwarding your working tree from\n" "Warning: commit $orig_head." msgstr "" "è¦å‘Šï¼šfetch 更新了当å‰çš„分支。您的工作区\n" "è¦å‘Šï¼šä»ŽåŽŸæ交 $orig_head 快进。" #: git-pull.sh:253 msgid "Cannot merge multiple branches into empty head" msgstr "æ— æ³•å°†å¤šä¸ªåˆ†æ”¯åˆå¹¶åˆ°ç©ºåˆ†æ”¯" #: git-pull.sh:257 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 "ä¸èƒ½è®°å½•å·¥ä½œåŒºçŠ¶æ€" #. TRANSLATORS: $option is an invalid option, like #. `--blah-blah'. The 7 spaces at the beginning of the #. second line correspond to "error: ". So you should line #. up the second line with however many characters the #. translation of "error: " takes in your language. E.g. in #. English this is: #. #. $ git stash save --blah-blah 2>&1 | head -n 2 #. error: unknown option for 'stash save': --blah-blah #. To provide a message, use git stash save -- '--blah-blah' #: git-stash.sh:202 #, sh-format msgid "" "error: unknown option for 'stash save': $option\n" " To provide a message, use git stash save -- '$option'" msgstr "" "错误:'stash save' 的未知选项:$option\n" " è¦æ供一个æè¿°ä¿¡æ¯ï¼Œä½¿ç”¨ git stash save -- '$option'" #: 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:474 msgid "Index was not unstashed." 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:88 #, sh-format msgid "cannot strip one component off url '$remoteurl'" msgstr "æ— æ³•ä»Ž url '$remoteurl' 剥离一个组件" #: git-submodule.sh:145 #, sh-format msgid "No submodule mapping found in .gitmodules for path '$sm_path'" msgstr "未在 .gitmodules ä¸å‘现路径 '$sm_path' çš„åæ¨¡ç»„æ˜ å°„" #: git-submodule.sh:186 #, sh-format msgid "Clone of '$url' into submodule path '$sm_path' failed" msgstr "æ— æ³•å…‹éš† '$url' 到å模组路径 '$sm_path'" #: git-submodule.sh:196 #, sh-format msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa" msgstr "Gitdir '$a' 在å模组路径 '$b' 之下或者相å" #: git-submodule.sh:285 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "版本库URL:'$repo' 必须是ç»å¯¹è·¯å¾„或以 ./|../ 起始" #: git-submodule.sh:302 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "'$sm_path' å·²ç»å˜åœ¨äºŽç´¢å¼•ä¸" #: git-submodule.sh:306 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" "$sm_path\n" "Use -f if you really want to add it." msgstr "" "以下路径被您的一个 .gitignore 文件所忽略:\n" "$sm_path\n" "å¦‚æžœæ‚¨ç¡®å®žæƒ³æ·»åŠ å®ƒï¼Œä½¿ç”¨ -f å‚数。" #: git-submodule.sh:317 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "æ·»åŠ ä½äºŽ '$sm_path' 的现å˜ç‰ˆæœ¬åº“到索引" #: git-submodule.sh:319 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "'$sm_path' å·²å˜åœ¨ä¸”ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„ git 版本库" #: git-submodule.sh:333 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "ä¸èƒ½æ£€å‡ºå模组 '$sm_path'" #: git-submodule.sh:338 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "æ— æ³•æ·»åŠ å模组 '$sm_path'" #: git-submodule.sh:343 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "æ— æ³•æ³¨å†Œå模组 '$sm_path'" #: git-submodule.sh:385 #, sh-format msgid "Entering '$prefix$sm_path'" msgstr "æ£åœ¨è¿›å…¥ '$prefix$sm_path'" #: git-submodule.sh:399 #, sh-format msgid "Stopping at '$sm_path'; script returned non-zero status." msgstr "åœæ¢äºŽ '$sm_path',脚本返回éžé›¶å€¼ã€‚" #: git-submodule.sh:442 #, sh-format msgid "No url found for submodule path '$sm_path' in .gitmodules" msgstr "在 .gitmodules ä¸æœªæ‰¾åˆ°å模组路径 '$sm_path' çš„ url" #: git-submodule.sh:451 #, sh-format msgid "Failed to register url for submodule path '$sm_path'" msgstr "æ— æ³•ä¸ºå模组路径 '$sm_path' 注册 url" #: git-submodule.sh:453 #, sh-format msgid "Submodule '$name' ($url) registered for path '$sm_path'" msgstr "å模组 '$name' ($url) 已为路径 '$sm_path' 注册" #: git-submodule.sh:461 #, sh-format msgid "Failed to register update mode for submodule path '$sm_path'" msgstr "æ— æ³•ä¸ºå模组路径 '$sm_path' 注册更新模å¼" #: git-submodule.sh:560 #, sh-format msgid "" "Submodule path '$sm_path' not initialized\n" "Maybe you want to use 'update --init'?" msgstr "" "å模组路径 '$sm_path' 没有åˆå§‹åŒ–\n" "也许您想用 'update --init'?" #: git-submodule.sh:573 #, sh-format msgid "Unable to find current revision in submodule path '$sm_path'" msgstr "æ— æ³•åœ¨å模组路径 '$sm_path' ä¸æ‰¾åˆ°å½“å‰ç‰ˆæœ¬" #: git-submodule.sh:592 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "æ— æ³•åœ¨å模组路径 '$sm_path' ä¸èŽ·å–" #: git-submodule.sh:606 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$sm_path'" msgstr "æ— æ³•åœ¨å模组路径 '$sm_path' ä¸å˜åŸº '$sha1'" #: git-submodule.sh:607 #, sh-format msgid "Submodule path '$sm_path': rebased into '$sha1'" msgstr "å模组路径 '$sm_path':å˜åŸºè‡³ '$sha1'" #: git-submodule.sh:612 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$sm_path'" msgstr "æ— æ³•åˆå¹¶ '$sha1' 到å模组路径 '$sm_path' ä¸" #: git-submodule.sh:613 #, sh-format msgid "Submodule path '$sm_path': merged in '$sha1'" msgstr "å模组路径 '$sm_path':已åˆå¹¶å…¥ '$sha1'" #: git-submodule.sh:618 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$sm_path'" msgstr "æ— æ³•åœ¨å模组路径 '$sm_path' ä¸æ£€å‡º '$sha1'" #: git-submodule.sh:619 #, sh-format msgid "Submodule path '$sm_path': checked out '$sha1'" msgstr "å模组路径 '$sm_path':检出 '$sha1'" #: git-submodule.sh:641 git-submodule.sh:964 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "æ— æ³•é€’å½’è¿›å模组路径 '$sm_path'" #: git-submodule.sh:749 msgid "--cached cannot be used with --files" msgstr "--cached ä¸èƒ½å’Œ --files 共用" #. unexpected type #: git-submodule.sh:789 #, sh-format msgid "unexpected mode $mod_dst" msgstr "æ„å¤–çš„æ¨¡å¼ $mod_dst" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: git-submodule.sh:807 #, sh-format msgid " Warn: $name doesn't contain commit $sha1_src" msgstr " è¦å‘Šï¼š$name 未包å«æ交 $sha1_src" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: git-submodule.sh:810 #, sh-format msgid " Warn: $name doesn't contain commit $sha1_dst" msgstr " è¦å‘Šï¼š$name 未包å«æ交 $sha1_dst" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: git-submodule.sh:813 #, sh-format msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst" msgstr " è¦å‘Šï¼š$name 未包å«æ交 $sha1_src å’Œ $sha1_dst" #: git-submodule.sh:838 msgid "blob" msgstr "blob" #: git-submodule.sh:839 msgid "submodule" msgstr "å模组" #: git-submodule.sh:876 msgid "# Submodules changed but not updated:" msgstr "# å模组已修改但尚未更新:" #: git-submodule.sh:878 msgid "# Submodule changes to be committed:" msgstr "è¦æ交的å模组å˜æ›´ï¼š" #: git-submodule.sh:1022 #, sh-format msgid "Synchronizing submodule url for '$name'" msgstr "为 '$name' åŒæ¥å模组 url"