# Chinese translations for Git package # Git 软件包的简体ä¸æ–‡ç¿»è¯‘. # Copyright (C) 2012,2013 Jiang Xin <worldhello.net AT gmail.com> # This file is distributed under the same license as the Git package. # Contributers: # - Jiang Xin <worldhello.net AT gmail.com> # - 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: 2013-04-30 08:25+0800\n" "PO-Revision-Date: 2013-04-12 09:23+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:53 #, 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:83 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'。" #: archive.c:10 msgid "git archive [options] <tree-ish> [<path>...]" msgstr "git archive [选项] <æ ‘æˆ–æ交> [<路径>...]" #: archive.c:11 msgid "git archive --list" msgstr "git archive --list" #: archive.c:12 msgid "" "git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]" msgstr "" "git archive --remote <版本库> [--exec <命令>] [选项] <æ ‘æˆ–æ交> [<路径>...]" #: archive.c:13 msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <版本库> [--exec <命令>] --list" #: archive.c:323 msgid "fmt" msgstr "æ ¼å¼" #: archive.c:323 msgid "archive format" msgstr "å½’æ¡£æ ¼å¼" #: archive.c:324 builtin/log.c:1126 msgid "prefix" msgstr "å‰ç¼€" #: archive.c:325 msgid "prepend prefix to each pathname in the archive" msgstr "为归档ä¸æ¯ä¸ªè·¯å¾„ååŠ ä¸Šå‰ç¼€" #: archive.c:326 builtin/archive.c:88 builtin/blame.c:2371 #: builtin/blame.c:2372 builtin/config.c:55 builtin/fast-export.c:665 #: builtin/fast-export.c:667 builtin/grep.c:715 builtin/hash-object.c:77 #: builtin/ls-files.c:490 builtin/ls-files.c:493 builtin/notes.c:536 #: builtin/notes.c:693 builtin/read-tree.c:107 parse-options.h:149 msgid "file" msgstr "文件" #: archive.c:327 builtin/archive.c:89 msgid "write the archive to this file" msgstr "归档写入æ¤æ–‡ä»¶" #: archive.c:329 msgid "read .gitattributes in working directory" msgstr "读å–工作区ä¸çš„ .gitattributes" #: archive.c:330 msgid "report archived files on stderr" msgstr "åœ¨æ ‡å‡†é”™è¯¯ä¸ŠæŠ¥å‘Šå½’æ¡£æ–‡ä»¶" #: archive.c:331 msgid "store only" msgstr "åªå˜å‚¨" #: archive.c:332 msgid "compress faster" msgstr "压缩速度更快" #: archive.c:340 msgid "compress better" msgstr "压缩效果更好" #: archive.c:343 msgid "list supported archive formats" msgstr "列出支æŒçš„å½’æ¡£æ ¼å¼" #: archive.c:345 builtin/archive.c:90 builtin/clone.c:86 msgid "repo" msgstr "版本库" #: archive.c:346 builtin/archive.c:91 msgid "retrieve the archive from remote repository <repo>" msgstr "从远程版本库(<版本库>)æå–归档文件" #: archive.c:347 builtin/archive.c:92 builtin/notes.c:615 msgid "command" msgstr "命令" #: archive.c:348 builtin/archive.c:93 msgid "path to the remote git-upload-archive command" msgstr "远程 git-upload-archive 命令的路径" #: attr.c:259 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." msgstr "" "负值模版在 git attributes ä¸è¢«å¿½ç•¥\n" "当å—符串确实è¦ä»¥æ„Ÿå¹å·å¼€å§‹æ—¶ï¼Œä½¿ç”¨ '\\!'。" #: branch.c:60 #, c-format msgid "Not setting branch %s as its own upstream." msgstr "未设置分支 %s 作为它自己的上游。" #: branch.c:82 #, c-format msgid "Branch %s set up to track remote branch %s from %s by rebasing." msgstr "分支 %1$s 设置为使用å˜åŸºæ¥è·Ÿè¸ªæ¥è‡ª %3$s 的远程分支 %2$s。" #: branch.c:83 #, c-format msgid "Branch %s set up to track remote branch %s from %s." msgstr "分支 %1$s 设置为跟踪æ¥è‡ª %3$s 的远程分支 %2$s。" #: branch.c:87 #, c-format msgid "Branch %s set up to track local branch %s by rebasing." msgstr "分支 %s 设置为使用å˜åŸºæ¥è·Ÿè¸ªæœ¬åœ°åˆ†æ”¯ %s。" #: branch.c:88 #, c-format msgid "Branch %s set up to track local branch %s." msgstr "分支 %s 设置为跟踪本地分支 %s。" #: branch.c:92 #, c-format msgid "Branch %s set up to track remote ref %s by rebasing." msgstr "分支 %s 设置为使用å˜åŸºæ¥è·Ÿè¸ªè¿œç¨‹å¼•ç”¨ %s。" #: branch.c:93 #, c-format msgid "Branch %s set up to track remote ref %s." msgstr "分支 %s 设置为跟踪远程引用 %s。" #: branch.c:97 #, c-format msgid "Branch %s set up to track local ref %s by rebasing." msgstr "分支 %s 设置为使用å˜åŸºæ¥è·Ÿè¸ªæœ¬åœ°å¼•ç”¨ %s。" #: branch.c:98 #, c-format msgid "Branch %s set up to track local ref %s." msgstr "分支 %s 设置为跟踪本地引用 %s。" #: branch.c:118 #, c-format msgid "Tracking not set up: name too long: %s" msgstr "跟踪未设置:åå—太长:%s" #: branch.c:137 #, c-format msgid "Not tracking: ambiguous information for ref %s" msgstr "未跟踪:引用 %s 有æ§ä¹‰" #: branch.c:182 #, c-format msgid "'%s' is not a valid branch name." msgstr "'%s' ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„分支å称。" #: branch.c:187 #, c-format msgid "A branch named '%s' already exists." msgstr "一个分支å '%s' å·²ç»å˜åœ¨ã€‚" #: branch.c:195 msgid "Cannot force update the current branch." msgstr "æ— æ³•å¼ºåˆ¶æ›´æ–°å½“å‰åˆ†æ”¯ã€‚" #: branch.c:201 #, c-format msgid "Cannot setup tracking information; starting point '%s' is not a branch." msgstr "æ— æ³•è®¾ç½®è·Ÿè¸ªä¿¡æ¯ï¼›èµ·å§‹ç‚¹ '%s' ä¸æ˜¯ä¸€ä¸ªåˆ†æ”¯ã€‚" #: branch.c:203 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "请求的上游分支 '%s' ä¸å˜åœ¨" #: branch.c:205 msgid "" "\n" "If you are planning on basing your work on an upstream\n" "branch that already exists at the remote, you may need to\n" "run \"git fetch\" to retrieve it.\n" "\n" "If you are planning to push out a new local branch that\n" "will track its remote counterpart, you may want to use\n" "\"git push -u\" to set the upstream config as you push." msgstr "" "\n" "如果您æ£è®¡åˆ’基于远程一个现å˜çš„ä¸Šæ¸¸åˆ†æ”¯å¼€å§‹ä½ çš„å·¥ä½œï¼Œ\n" "您å¯èƒ½éœ€è¦æ‰§è¡Œ \"git fetch\" æ¥èŽ·å–分支。\n" "\n" "如果您æ£è®¡åˆ’推é€ä¸€ä¸ªèƒ½ä¸Žå¯¹åº”远程分支建立跟踪的新的本地分支,\n" "您å¯èƒ½éœ€è¦ä½¿ç”¨ \"git push -u\" 推é€åˆ†æ”¯å¹¶é…置和上游的关è”。" #: branch.c:250 #, c-format msgid "Not a valid object name: '%s'." msgstr "ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„对象å:'%s'。" #: branch.c:270 #, c-format msgid "Ambiguous object name: '%s'." msgstr "æ§ä¹‰çš„对象å:'%s'。" #: branch.c:275 #, c-format msgid "Not a valid branch point: '%s'." msgstr "æ— æ•ˆçš„åˆ†æ”¯ç‚¹ï¼š'%s'。" #: branch.c:281 msgid "Failed to lock ref for update" msgstr "æ— æ³•ä¸ºæ›´æ–°é”定引用" #: branch.c:299 msgid "Failed to write ref" msgstr "ä¸èƒ½å†™å¼•ç”¨" #: 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:676 #, c-format msgid "could not open '%s'" msgstr "ä¸èƒ½æ‰“å¼€ '%s'" #: bundle.c:140 msgid "Repository lacks these prerequisite commits:" msgstr "版本库缺少这些必备的æ交:" #: bundle.c:164 sequencer.c:651 sequencer.c:1101 builtin/log.c:300 #: builtin/log.c:770 builtin/log.c:1344 builtin/log.c:1570 builtin/merge.c:349 #: builtin/shortlog.c:155 msgid "revision walk setup failed" msgstr "版本é历设置失败" #: bundle.c:186 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "这个包ä¸å«æœ‰è¿™ä¸ªå¼•ç”¨ï¼š" msgstr[1] "这个包ä¸å«æœ‰ %d 个引用:" #: bundle.c:193 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:1255 builtin/shortlog.c:258 #, 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:50 #, c-format msgid "could not parse %s" msgstr "ä¸èƒ½è§£æž %s" #: commit.c:52 #, 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:112 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr " æ— æ³•è§£æž dirstat 截æ¢ï¼ˆcut-off)百分比 '%s'\n" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: diff.c:117 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " 未知的 dirstat å‚æ•° '%s'\n" #: diff.c:210 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "é…ç½®å˜é‡ 'diff.submodule' 未知的å–值:'%s'" #: diff.c:260 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" "%s" msgstr "" "å‘现é…ç½®å˜é‡ 'diff.dirstat' ä¸çš„错误:\n" "%s" #: diff.c:3481 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" "%s" msgstr "" "æ— æ³•è§£æž --dirstat/-X 选项的å‚数:\n" "%s" #: diff.c:3495 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "æ— æ³•è§£æž --submodule 选项的å‚数:'%s'" #: gpg-interface.c:59 gpg-interface.c:131 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 æ— æ³•ä¸ºæ•°æ®ç¾å" #: gpg-interface.c:115 #, c-format msgid "could not create temporary file '%s': %s" msgstr "ä¸èƒ½åˆ›å»ºä¸´æ—¶æ–‡ä»¶ '%s':%s" #: gpg-interface.c:118 #, c-format msgid "failed writing detached signature to '%s': %s" msgstr "æ— æ³•å°†åˆ†ç¦»å¼ç¾å写入 '%s':%s" #: grep.c:1623 #, c-format msgid "'%s': unable to read %s" msgstr "'%s'ï¼šæ— æ³•è¯»å– %s" #: grep.c:1640 #, c-format msgid "'%s': %s" msgstr "'%s':%s" #: grep.c:1651 #, c-format msgid "'%s': short read %s" msgstr "'%s':读å–ä¸å®Œæ•´ %s" #: help.c:212 #, c-format msgid "available git commands in '%s'" msgstr "在 '%s' 下å¯ç”¨çš„ git 命令" #: help.c:219 msgid "git commands available from elsewhere on your $PATH" msgstr "在 $PATH 路径ä¸çš„其他地方å¯ç”¨çš„ git 命令" #: help.c:235 msgid "The most commonly used git commands are:" msgstr "最常用的 git 命令有:" #: help.c:292 #, 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:349 msgid "Uh oh. Your system reports no Git commands at all." msgstr "唉呀,您的系统ä¸æœªå‘现 Git 命令。" #: help.c:371 #, 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:376 #, c-format msgid "in %0.1f seconds automatically..." msgstr "在 %0.1f 秒钟åŽè‡ªåŠ¨è¿è¡Œ..." #: help.c:383 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git:'%s' ä¸æ˜¯ä¸€ä¸ª git 命令。å‚è§ 'git --help'。" #: help.c:387 msgid "" "\n" "Did you mean this?" msgid_plural "" "\n" "Did you mean one of these?" msgstr[0] "" "\n" "您指的是这个么?" msgstr[1] "" "\n" "您指的是这其ä¸çš„æŸä¸€ä¸ªä¹ˆï¼Ÿ" #: merge.c:56 msgid "failed to read the cache" msgstr "æ— æ³•è¯»å–缓å˜" #: merge.c:110 builtin/checkout.c:365 builtin/checkout.c:566 #: builtin/clone.c:645 msgid "unable to write new index file" msgstr "æ— æ³•å†™æ–°çš„ç´¢å¼•æ–‡ä»¶" #: merge-recursive.c:190 #, c-format msgid "(bad commit)\n" msgstr "(åæ交)\n" #: merge-recursive.c:206 #, c-format msgid "addinfo_cache failed for path '%s'" msgstr "为路径 '%s' addinfo_cache 失败" #: merge-recursive.c:268 msgid "error building trees" msgstr "æ— æ³•åˆ›å»ºæ ‘" #: merge-recursive.c:672 #, c-format msgid "failed to create path '%s'%s" msgstr "æ— æ³•åˆ›å»ºè·¯å¾„ '%s'%s" #: merge-recursive.c:683 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "åˆ é™¤ %s 以便为å目录留出空间\n" #. something else exists #. .. but not some other error (who really cares what?) #: merge-recursive.c:697 merge-recursive.c:718 msgid ": perhaps a D/F conflict?" msgstr ":å¯èƒ½æ˜¯ä¸€ä¸ªç›®å½•/文件冲çªï¼Ÿ" #: merge-recursive.c:708 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "æ‹’ç»ä¸¢å¼ƒ '%s' ä¸çš„未跟踪文件" #: merge-recursive.c:748 #, c-format msgid "cannot read object %s '%s'" msgstr "ä¸èƒ½è¯»å–对象 %s '%s'" #: merge-recursive.c:750 #, c-format msgid "blob expected for %s '%s'" msgstr "%s '%s' 应为数æ®ï¼ˆblob)对象" #: merge-recursive.c:773 builtin/clone.c:313 #, c-format msgid "failed to open '%s'" msgstr "æ— æ³•æ‰“å¼€ '%s'" #: merge-recursive.c:781 #, c-format msgid "failed to symlink '%s'" msgstr "æ— æ³•åˆ›å»ºç¬¦å·é“¾æŽ¥ '%s'" #: merge-recursive.c:784 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "ä¸çŸ¥é“å¦‚ä½•å¤„ç† %06o %s '%s'" #: merge-recursive.c:922 msgid "Failed to execute internal merge" msgstr "æ— æ³•æ‰§è¡Œå†…éƒ¨åˆå¹¶" #: merge-recursive.c:926 #, c-format msgid "Unable to add %s to database" msgstr "ä¸èƒ½æ·»åŠ %s 至对象库" #: merge-recursive.c:942 msgid "unsupported object type in the tree" msgstr "åœ¨æ ‘ä¸æœ‰ä¸æ”¯æŒçš„对象类型" #: merge-recursive.c:1021 merge-recursive.c:1035 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " "in tree." msgstr "" "冲çªï¼ˆ%1$s/åˆ é™¤ï¼‰ï¼š%2$s 在 %3$s ä¸è¢«åˆ 除,在 %5$s ä¸è¢« %4$s。%7$s 在 %6$s ä¸" "的版本被ä¿ç•™ã€‚" #: merge-recursive.c:1027 merge-recursive.c:1040 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " "in tree at %s." msgstr "" "冲çªï¼ˆ%1$s/åˆ é™¤ï¼‰ï¼š%2$s 在 %3$s ä¸è¢«åˆ 除,在 %5$s ä¸è¢« %4$s。%7$s 在 %6$s ä¸" "的版本ä¿ç•™äºŽ %8$s ä¸ã€‚" #: merge-recursive.c:1081 msgid "rename" msgstr "é‡å‘½å" #: merge-recursive.c:1081 msgid "renamed" msgstr "é‡å‘½å" #: merge-recursive.c:1137 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s 是 %s ä¸çš„一个目录而以 %s 为åè¢«æ·»åŠ " #: merge-recursive.c:1159 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" "\"->\"%s\" in \"%s\"%s" msgstr "" "冲çªï¼ˆé‡å‘½å/é‡å‘½å):在分支 \"%3$s\" ä¸é‡å‘½å \"%1$s\"->\"%2$s\",在分支 " "\"%6$s\" ä¸é‡å‘½å \"%4$s\"->\"%5$s\"%7$s" #: merge-recursive.c:1164 msgid " (left unresolved)" msgstr "(留下未解决)" #: merge-recursive.c:1218 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "冲çªï¼ˆé‡å‘½å/é‡å‘½å):在 %3$s ä¸é‡å‘½å %1$s->%2$s,在 %6$s ä¸é‡å‘½å %4$s->" "%5$s" #: merge-recursive.c:1248 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "而是é‡å‘½å %s 至 %sï¼Œä»¥åŠ %s 至 %s" #: merge-recursive.c:1447 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "冲çªï¼ˆé‡å‘½å/æ·»åŠ ï¼‰ï¼šåœ¨ %3$s ä¸é‡å‘½å %1$s->%2$s。在 %5$s ä¸æ·»åŠ %4$s" #: merge-recursive.c:1457 #, c-format msgid "Adding merged %s" msgstr "æ·»åŠ åˆå¹¶åŽçš„ %s" #: merge-recursive.c:1462 merge-recursive.c:1660 #, c-format msgid "Adding as %s instead" msgstr "而是以 %s 为åæ·»åŠ " #: merge-recursive.c:1513 #, c-format msgid "cannot read object %s" msgstr "ä¸èƒ½è¯»å–对象 %s" #: merge-recursive.c:1516 #, c-format msgid "object %s is not a blob" msgstr "对象 %s ä¸æ˜¯ä¸€ä¸ªæ•°æ®ï¼ˆblob)对象" #: merge-recursive.c:1564 msgid "modify" msgstr "修改" #: merge-recursive.c:1564 msgid "modified" msgstr "修改" #: merge-recursive.c:1574 msgid "content" msgstr "内容" #: merge-recursive.c:1581 msgid "add/add" msgstr "æ·»åŠ /æ·»åŠ " #: merge-recursive.c:1615 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "略过 %s(已ç»åšè¿‡ç›¸åŒåˆå¹¶ï¼‰" #: merge-recursive.c:1629 #, c-format msgid "Auto-merging %s" msgstr "自动åˆå¹¶ %s" #: merge-recursive.c:1633 git-submodule.sh:1029 msgid "submodule" msgstr "å模组" #: merge-recursive.c:1634 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "冲çªï¼ˆ%s):åˆå¹¶å†²çªäºŽ %s" #: merge-recursive.c:1724 #, c-format msgid "Removing %s" msgstr "åˆ é™¤ %s" #: merge-recursive.c:1749 msgid "file/directory" msgstr "文件/目录" #: merge-recursive.c:1755 msgid "directory/file" msgstr "目录/文件" #: merge-recursive.c:1760 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "冲çªï¼ˆ%1$s):在 %3$s ä¸æœ‰ä¸€ä¸ªå为 %2$s 的目录。以 %5$s 为åæ·»åŠ %4$s" #: merge-recursive.c:1770 #, c-format msgid "Adding %s" msgstr "æ·»åŠ %s" #: merge-recursive.c:1787 msgid "Fatal merge failure, shouldn't happen." msgstr "严é‡çš„åˆå¹¶é”™è¯¯ï¼Œä¸åº”å‘生。" #: merge-recursive.c:1806 msgid "Already up-to-date!" msgstr "å·²ç»æ˜¯æœ€æ–°çš„ï¼" #: merge-recursive.c:1815 #, c-format msgid "merging of trees %s and %s failed" msgstr "æ— æ³•åˆå¹¶æ ‘ %s å’Œ %s" #: merge-recursive.c:1845 #, c-format msgid "Unprocessed path??? %s" msgstr "未处ç†çš„路径??? %s" #: merge-recursive.c:1890 msgid "Merging:" msgstr "åˆå¹¶ï¼š" #: merge-recursive.c:1903 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "å‘现 %u 个共åŒç¥–先:" msgstr[1] "å‘现 %u 个共åŒç¥–先:" #: merge-recursive.c:1940 msgid "merge returned no commit" msgstr "åˆå¹¶æœªè¿”回æ交" #: merge-recursive.c:1997 #, c-format msgid "Could not parse object '%s'" msgstr "ä¸èƒ½è§£æžå¯¹è±¡ '%s'" #: merge-recursive.c:2009 builtin/merge.c:658 msgid "Unable to write index." msgstr "ä¸èƒ½å†™å…¥ç´¢å¼•ã€‚" #: object.c:195 #, c-format msgid "unable to parse object: %s" msgstr "ä¸èƒ½è§£æžå¯¹è±¡ï¼š%s" #: parse-options.c:489 msgid "..." msgstr "..." #: parse-options.c:507 #, c-format msgid "usage: %s" msgstr "用法:%s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation #: parse-options.c:511 #, c-format msgid " or: %s" msgstr " 或:%s" # 译者:为ä¿è¯åœ¨è¾“出ä¸å¯¹é½ï¼Œæ³¨æ„调整å¥ä¸ç©ºæ ¼ï¼ #: parse-options.c:514 #, c-format msgid " %s" msgstr " %s" #: parse-options.c:548 msgid "-NUM" msgstr "-æ•°å—" #: pathspec.c:83 #, c-format msgid "Path '%s' is in submodule '%.*s'" msgstr "路径 '%s' 属于模组 '%.*s'" #: pathspec.c:99 #, c-format msgid "'%s' is beyond a symbolic link" msgstr "'%s' ä½äºŽç¬¦å·é“¾æŽ¥ä¸" #: remote.c:1781 #, 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:1787 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (使用 \"git push\" æ¥å‘布您的本地æ交)\n" #: remote.c:1790 #, 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:1798 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (使用 \"git pull\" æ¥æ›´æ–°æ‚¨çš„本地分支)\n" #: remote.c:1801 #, 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" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: remote.c:1811 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " (使用 \"git pull\" æ¥åˆå¹¶è¿œç¨‹åˆ†æ”¯ï¼‰\n" #: sequencer.c:206 builtin/merge.c:776 builtin/merge.c:889 builtin/merge.c:999 #: builtin/merge.c:1009 #, c-format msgid "Could not open '%s' for writing" msgstr "ä¸èƒ½ä¸ºå†™å…¥æ‰“å¼€ '%s'" #: sequencer.c:208 builtin/merge.c:335 builtin/merge.c:779 #: builtin/merge.c:1001 builtin/merge.c:1014 #, c-format msgid "Could not write to '%s'" msgstr "ä¸èƒ½å†™å…¥ '%s'" #: sequencer.c:229 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:232 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:245 sequencer.c:859 sequencer.c:942 #, c-format msgid "Could not write to %s" msgstr "ä¸èƒ½å†™å…¥ %s" #: sequencer.c:248 #, c-format msgid "Error wrapping up %s" msgstr "错误收尾 %s" #: sequencer.c:263 msgid "Your local changes would be overwritten by cherry-pick." msgstr "您的本地修改将被拣选æ“作覆盖。" #: sequencer.c:265 msgid "Your local changes would be overwritten by revert." msgstr "您的本地修改将被还原æ“作覆盖。" #: sequencer.c:268 msgid "Commit your changes or stash them to proceed." msgstr "æ交您的修改或ä¿å˜è¿›åº¦åŽå†ç»§ç»ã€‚" #. TRANSLATORS: %s will be "revert" or "cherry-pick" #: sequencer.c:319 #, c-format msgid "%s: Unable to write new index file" msgstr "%sï¼šæ— æ³•å†™å…¥æ–°ç´¢å¼•æ–‡ä»¶" #: sequencer.c:350 msgid "Could not resolve HEAD commit\n" msgstr "ä¸èƒ½è§£æž HEAD æ交\n" #: sequencer.c:371 msgid "Unable to update cache tree\n" msgstr "ä¸èƒ½æ›´æ–°ç¼“å˜\n" #: sequencer.c:416 #, c-format msgid "Could not parse commit %s\n" msgstr "ä¸èƒ½è§£æžæ交 %s\n" #: sequencer.c:421 #, c-format msgid "Could not parse parent commit %s\n" msgstr "ä¸èƒ½è§£æžçˆ¶æ交 %s\n" #: sequencer.c:487 msgid "Your index file is unmerged." msgstr "您的索引文件未完æˆåˆå¹¶ã€‚" #: sequencer.c:506 #, c-format msgid "Commit %s is a merge but no -m option was given." msgstr "æ交 %s 是一个åˆå¹¶æ交但未æä¾› -m 选项。" #: sequencer.c:514 #, c-format msgid "Commit %s does not have parent %d" msgstr "æ交 %s 没有父æ交 %d" #: sequencer.c:518 #, 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:531 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s:ä¸èƒ½è§£æžçˆ¶æ交 %s" #: sequencer.c:535 #, c-format msgid "Cannot get commit message for %s" msgstr "ä¸èƒ½å¾—到 %s çš„æ交说明" #: sequencer.c:621 #, c-format msgid "could not revert %s... %s" msgstr "ä¸èƒ½è¿˜åŽŸ %s... %s" #: sequencer.c:622 #, c-format msgid "could not apply %s... %s" msgstr "ä¸èƒ½åº”用 %s... %s" #: sequencer.c:654 msgid "empty commit set passed" msgstr "æ供了空的æ交集" #: sequencer.c:662 #, c-format msgid "git %s: failed to read the index" msgstr "git %sï¼šæ— æ³•è¯»å–索引" #: sequencer.c:667 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %sï¼šæ— æ³•åˆ·æ–°ç´¢å¼•" #: sequencer.c:725 #, c-format msgid "Cannot %s during a %s" msgstr "æ— æ³• %s 在一个 %s 过程ä¸" #: sequencer.c:747 #, c-format msgid "Could not parse line %d." msgstr "ä¸èƒ½è§£æžç¬¬ %d 行。" #: sequencer.c:752 msgid "No commits parsed." msgstr "没有æ交被解æžã€‚" #: sequencer.c:765 #, c-format msgid "Could not open %s" msgstr "ä¸èƒ½æ‰“å¼€ %s" #: sequencer.c:769 #, c-format msgid "Could not read %s." msgstr "ä¸èƒ½è¯»å– %s。" #: sequencer.c:776 #, c-format msgid "Unusable instruction sheet: %s" msgstr "æ— ç”¨çš„æŒ‡ä»¤è¡¨å•ï¼š%s" #: sequencer.c:804 #, c-format msgid "Invalid key: %s" msgstr "æ— æ•ˆé”®å:%s" #: sequencer.c:807 #, c-format msgid "Invalid value for %s: %s" msgstr "%s çš„å€¼æ— æ•ˆï¼š%s" #: sequencer.c:819 #, c-format msgid "Malformed options sheet: %s" msgstr "éžæ³•çš„选项表å•ï¼š%s" #: sequencer.c:840 msgid "a cherry-pick or revert is already in progress" msgstr "一个拣选或还原æ“作已在进行" #: sequencer.c:841 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "å°è¯• \"git cherry-pick (--continue | --quit | --abort)\"" #: sequencer.c:845 #, c-format msgid "Could not create sequencer directory %s" msgstr "ä¸èƒ½åˆ›å»ºåºåˆ—目录 %s" #: sequencer.c:861 sequencer.c:946 #, c-format msgid "Error wrapping up %s." msgstr "错误收尾 %s。" #: sequencer.c:880 sequencer.c:1014 msgid "no cherry-pick or revert in progress" msgstr "拣选或还原æ“作并未进行" #: sequencer.c:882 msgid "cannot resolve HEAD" msgstr "ä¸èƒ½è§£æž HEAD" #: sequencer.c:884 msgid "cannot abort from a branch yet to be born" msgstr "ä¸èƒ½ä»Žå°šæœªå»ºç«‹çš„分支终æ¢" #: sequencer.c:906 builtin/apply.c:4060 #, c-format msgid "cannot open %s: %s" msgstr "ä¸èƒ½æ‰“å¼€ %s:%s" #: sequencer.c:909 #, c-format msgid "cannot read %s: %s" msgstr "ä¸èƒ½è¯»å– %s:%s" #: sequencer.c:910 msgid "unexpected end of file" msgstr "æ„外的文件结æŸ" #: sequencer.c:916 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "ä¿å˜æ‹£é€‰æ交å‰çš„ HEAD 文件 '%s' æŸå" #: sequencer.c:939 #, c-format msgid "Could not format %s." msgstr "ä¸èƒ½æ ¼å¼åŒ– %s。" #: sequencer.c:1083 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s:ä¸èƒ½æ‹£é€‰ä¸€ä¸ª%s" #: sequencer.c:1085 #, c-format msgid "%s: bad revision" msgstr "%s:错误的版本" #: sequencer.c:1119 msgid "Can't revert as initial commit" msgstr "ä¸èƒ½ä½œä¸ºåˆå§‹æ交还原" #: sequencer.c:1120 msgid "Can't cherry-pick into empty head" msgstr "ä¸èƒ½æ‹£é€‰åˆ°ç©ºåˆ†æ”¯" #: sha1_name.c:1036 msgid "HEAD does not point to a branch" msgstr "HEAD 没有指å‘一个分支" #: sha1_name.c:1039 #, c-format msgid "No such branch: '%s'" msgstr "没有æ¤åˆ†æ”¯ï¼š'%s'" #: sha1_name.c:1041 #, c-format msgid "No upstream configured for branch '%s'" msgstr "尚未给分支 '%s' 设置上游" #: sha1_name.c:1044 #, c-format msgid "Upstream branch '%s' not stored as a remote-tracking branch" msgstr "上游分支 '%s' 没有å˜å‚¨ä¸ºä¸€ä¸ªè¿œç¨‹è·Ÿè¸ªåˆ†æ”¯" #: wrapper.c:408 #, c-format msgid "unable to access '%s': %s" msgstr "ä¸èƒ½è®¿é—® '%s':%s" #: wrapper.c:423 #, c-format msgid "unable to access '%s'" msgstr "ä¸èƒ½è®¿é—® '%s'" #: wrapper.c:434 #, c-format msgid "unable to look up current user in the passwd file: %s" msgstr "æ— æ³•åœ¨å£ä»¤æ–‡ä»¶ä¸æŸ¥è¯¢åˆ°å½“å‰ç”¨æˆ·ï¼š%s" #: wrapper.c:435 msgid "no such user" msgstr "æ— æ¤ç”¨æˆ·" #: wt-status.c:140 msgid "Unmerged paths:" msgstr "未åˆå¹¶çš„路径:" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:167 wt-status.c:194 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" msgstr " (使用 \"git reset %s <file>...\" 撤出暂å˜åŒºï¼‰" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:169 wt-status.c:196 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr " (使用 \"git rm --cached <file>...\" 撤出暂å˜åŒºï¼‰" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:173 msgid " (use \"git add <file>...\" to mark resolution)" msgstr " (使用 \"git add <file>...\" æ ‡è®°è§£å†³æ–¹æ¡ˆï¼‰" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:175 wt-status.c:179 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr " (酌情使用 \"git add/rm <file>...\" æ ‡è®°è§£å†³æ–¹æ¡ˆï¼‰" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:177 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (使用 \"git rm <file>...\" æ ‡è®°è§£å†³æ–¹æ¡ˆï¼‰" #: wt-status.c:188 msgid "Changes to be committed:" msgstr "è¦æ交的å˜æ›´ï¼š" #: wt-status.c:206 msgid "Changes not staged for commit:" msgstr "尚未暂å˜ä»¥å¤‡æ交的å˜æ›´ï¼š" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:210 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr " (使用 \"git add <file>...\" æ›´æ–°è¦æ交的内容)" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:212 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr " (使用 \"git add/rm <file>...\" æ›´æ–°è¦æ交的内容)" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:213 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr " (使用 \"git checkout -- <file>...\" 丢弃工作区的改动)" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:215 msgid " (commit or discard the untracked or modified content in submodules)" msgstr " (æ交或丢弃å模组ä¸æœªè·Ÿè¸ªæˆ–修改的内容)" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:227 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr " (使用 \"git %s <file>...\" 以包å«è¦æ交的内容)" #: wt-status.c:244 msgid "bug" msgstr "bug" #: wt-status.c:249 msgid "both deleted:" msgstr "åŒæ–¹åˆ 除:" #: wt-status.c:250 msgid "added by us:" msgstr "ç”±æˆ‘ä»¬æ·»åŠ ï¼š" #: wt-status.c:251 msgid "deleted by them:" msgstr "ç”±ä»–ä»¬åˆ é™¤ï¼š" #: wt-status.c:252 msgid "added by them:" msgstr "ç”±ä»–ä»¬æ·»åŠ ï¼š" #: wt-status.c:253 msgid "deleted by us:" msgstr "ç”±æˆ‘ä»¬åˆ é™¤ï¼š" #: wt-status.c:254 msgid "both added:" msgstr "åŒæ–¹æ·»åŠ :" #: wt-status.c:255 msgid "both modified:" msgstr "åŒæ–¹ä¿®æ”¹ï¼š" # 译者:末尾两个å—节å¯èƒ½è¢«åˆ å‡ï¼Œå¦‚果翻译为ä¸æ–‡æ ‡ç‚¹ä¼šå‡ºçŽ°åŠä¸ªæ±‰å— #: wt-status.c:285 msgid "new commits, " msgstr "æ–°æ交, " # 译者:末尾两个å—节å¯èƒ½è¢«åˆ å‡ï¼Œå¦‚果翻译为ä¸æ–‡æ ‡ç‚¹ä¼šå‡ºçŽ°åŠä¸ªæ±‰å— #: wt-status.c:287 msgid "modified content, " msgstr "修改的内容, " # 译者:末尾两个å—节å¯èƒ½è¢«åˆ å‡ï¼Œå¦‚果翻译为ä¸æ–‡æ ‡ç‚¹ä¼šå‡ºçŽ°åŠä¸ªæ±‰å— #: wt-status.c:289 msgid "untracked content, " msgstr "未跟踪的内容, " # 译者:为ä¿è¯åœ¨è¾“出ä¸å¯¹é½ï¼Œæ³¨æ„调整å¥ä¸ç©ºæ ¼ï¼ #: wt-status.c:306 #, c-format msgid "new file: %s" msgstr "新文件: %s" # 译者:为ä¿è¯åœ¨è¾“出ä¸å¯¹é½ï¼Œæ³¨æ„调整å¥ä¸ç©ºæ ¼ï¼ #: wt-status.c:309 #, c-format msgid "copied: %s -> %s" msgstr "æ‹·è´ï¼š %s -> %s" # 译者:为ä¿è¯åœ¨è¾“出ä¸å¯¹é½ï¼Œæ³¨æ„调整å¥ä¸ç©ºæ ¼ï¼ #: wt-status.c:312 #, c-format msgid "deleted: %s" msgstr "åˆ é™¤ï¼š %s" # 译者:为ä¿è¯åœ¨è¾“出ä¸å¯¹é½ï¼Œæ³¨æ„调整å¥ä¸ç©ºæ ¼ï¼ #: wt-status.c:315 #, c-format msgid "modified: %s" msgstr "修改: %s" # 译者:为ä¿è¯åœ¨è¾“出ä¸å¯¹é½ï¼Œæ³¨æ„调整å¥ä¸ç©ºæ ¼ï¼ #: wt-status.c:318 #, c-format msgid "renamed: %s -> %s" msgstr "é‡å‘½å: %s -> %s" # 译者:为ä¿è¯åœ¨è¾“出ä¸å¯¹é½ï¼Œæ³¨æ„调整å¥ä¸ç©ºæ ¼ï¼ #: wt-status.c:321 #, c-format msgid "typechange: %s" msgstr "类型å˜æ›´ï¼š %s" # 译者:为ä¿è¯åœ¨è¾“出ä¸å¯¹é½ï¼Œæ³¨æ„调整å¥ä¸ç©ºæ ¼ï¼ #: wt-status.c:324 #, c-format msgid "unknown: %s" msgstr "未知: %s" # 译者:为ä¿è¯åœ¨è¾“出ä¸å¯¹é½ï¼Œæ³¨æ„调整å¥ä¸ç©ºæ ¼ï¼ #: wt-status.c:327 #, c-format msgid "unmerged: %s" msgstr "未åˆå¹¶ï¼š %s" #: wt-status.c:330 #, c-format msgid "bug: unhandled diff status %c" msgstr "bug:未处ç†çš„å·®å¼‚çŠ¶æ€ %c" #: wt-status.c:803 msgid "You have unmerged paths." msgstr "您有尚未åˆå¹¶çš„路径。" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:806 wt-status.c:958 msgid " (fix conflicts and run \"git commit\")" msgstr " (解决冲çªå¹¶è¿è¡Œ \"git commit\")" #: wt-status.c:809 msgid "All conflicts fixed but you are still merging." msgstr "所有冲çªå·²è§£å†³ä½†æ‚¨ä»å¤„于åˆå¹¶ä¸ã€‚" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:812 msgid " (use \"git commit\" to conclude merge)" msgstr " (使用 \"git commit\" 结æŸåˆå¹¶ï¼‰" #: wt-status.c:822 msgid "You are in the middle of an am session." msgstr "您æ£å¤„于一个 am 过程ä¸ã€‚" #: wt-status.c:825 msgid "The current patch is empty." msgstr "当å‰çš„è¡¥ä¸ä¸ºç©ºã€‚" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:829 msgid " (fix conflicts and then run \"git am --resolved\")" msgstr " (解决冲çªï¼Œç„¶åŽè¿è¡Œ \"git am --resolved\")" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:831 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (使用 \"git am --skip\" 跳过æ¤è¡¥ä¸ï¼‰" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:833 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (使用 \"git am --abort\" æ¢å¤åŽŸæœ‰åˆ†æ”¯ï¼‰" #: wt-status.c:893 wt-status.c:910 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "您æ£åœ¨å°†åˆ†æ”¯ '%s' å˜åŸºåˆ° '%s'。" #: wt-status.c:898 wt-status.c:915 msgid "You are currently rebasing." msgstr "您æ£åœ¨å˜åŸºã€‚" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:901 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (解决冲çªï¼Œç„¶åŽè¿è¡Œ \"git rebase --continue\")" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:903 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (使用 \"git rebase --skip\" 跳过æ¤è¡¥ä¸ï¼‰" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:905 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " (使用 \"git rebase --abort\" 以检出原有分支)" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:918 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (所有冲çªå·²è§£å†³ï¼šè¿è¡Œ \"git rebase --continue\")" #: wt-status.c:922 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "您æ£åœ¨å°†åˆ†æ”¯ '%s' å˜åŸºåˆ° '%s' 过程ä¸æ‹†åˆ†ä¸€ä¸ªæ交。" #: wt-status.c:927 msgid "You are currently splitting a commit during a rebase." msgstr "您æ£åœ¨å˜åŸºè¿‡ç¨‹ä¸æ‹†åˆ†ä¸€ä¸ªæ交。" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:930 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr " (一旦您工作目录æ交干净åŽï¼Œè¿è¡Œ \"git rebase --continue\")" #: wt-status.c:934 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "您æ£åœ¨å°†åˆ†æ”¯ '%s' å˜åŸºåˆ° '%s' 过程ä¸ç¼–辑一个æ交。" #: wt-status.c:939 msgid "You are currently editing a commit during a rebase." msgstr "您æ£åœ¨å˜åŸºè¿‡ç¨‹ä¸ç¼–辑一个æ交。" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:942 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " (使用 \"git commit --amend\" 修补当å‰æ交)" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:944 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr " (当您对您的修改满æ„åŽæ‰§è¡Œ \"git rebase --continue\")" #: wt-status.c:954 msgid "You are currently cherry-picking." msgstr "您æ£åœ¨åšæ‹£é€‰æ“作。" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:961 msgid " (all conflicts fixed: run \"git commit\")" msgstr " (解决所有冲çªåŽï¼Œæ‰§è¡Œ \"git commit\")" #: wt-status.c:970 #, c-format msgid "You are currently reverting commit %s." msgstr "您æ£åœ¨å转æ交 %s 。" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:975 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (解决冲çªå¹¶è¿è¡Œ \"git revert --continue\")" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:978 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (所有冲çªå·²è§£å†³ï¼šè¿è¡Œ \"git revert --continue\")" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:980 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (使用 \"git revert --abort\" 以å–消å转æ交æ“作)" #: wt-status.c:991 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "您æ£åœ¨ä»Žåˆ†æ”¯ '%s' 开始åšäºŒåˆ†æŸ¥æ‰¾ã€‚" #: wt-status.c:995 msgid "You are currently bisecting." msgstr "您æ£åœ¨åšäºŒåˆ†æŸ¥æ‰¾ã€‚" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:998 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " (使用 \"git bisect reset\" 以回到原有分支)" #: wt-status.c:1173 msgid "On branch " msgstr "ä½äºŽåˆ†æ”¯ " #: wt-status.c:1184 msgid "HEAD detached at " msgstr "头指针分离于 " #: wt-status.c:1186 msgid "HEAD detached from " msgstr "头指针分离自 " #: wt-status.c:1189 msgid "Not currently on any branch." msgstr "当å‰ä¸åœ¨ä»»ä½•åˆ†æ”¯ä¸Šã€‚" #: wt-status.c:1206 msgid "Initial commit" msgstr "åˆå§‹æ交" #: wt-status.c:1220 msgid "Untracked files" msgstr "未跟踪的文件" #: wt-status.c:1222 msgid "Ignored files" msgstr "忽略的文件" #: wt-status.c:1226 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" "may speed it up, but you have to be careful not to forget to add\n" "new files yourself (see 'git help status')." msgstr "" "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能æ高速度,\n" "但您需è¦å°å¿ƒä¸è¦å¿˜äº†æ·»åŠ 新文件(å‚è§ 'git help status')。" #: wt-status.c:1232 #, c-format msgid "Untracked files not listed%s" msgstr "未跟踪的文件没有列出%s" # 译者:ä¸æ–‡å—符串拼接,å¯åˆ 除å‰å¯¼ç©ºæ ¼ #: wt-status.c:1234 msgid " (use -u option to show untracked files)" msgstr "(使用 -u å‚数显示未跟踪的文件)" #: wt-status.c:1240 msgid "No changes" msgstr "没有修改" #: wt-status.c:1245 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "ä¿®æ”¹å°šæœªåŠ å…¥æ交(使用 \"git add\" å’Œ/或 \"git commit -a\")\n" #: wt-status.c:1248 #, c-format msgid "no changes added to commit\n" msgstr "ä¿®æ”¹å°šæœªåŠ å…¥æ交\n" #: wt-status.c:1251 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "æ交为空,但是å˜åœ¨å°šæœªè·Ÿè¸ªçš„文件(使用 \"git add\" 建立跟踪)\n" #: wt-status.c:1254 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "æ交为空,但是å˜åœ¨å°šæœªè·Ÿè¸ªçš„文件\n" # 译者:ä¸æ–‡å—符串拼接,å¯åˆ 除å‰å¯¼ç©ºæ ¼ #: wt-status.c:1257 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "æ— æ–‡ä»¶è¦æ交(创建/æ‹·è´æ–‡ä»¶å¹¶ä½¿ç”¨ \"git add\" 建立跟踪)\n" #: wt-status.c:1260 wt-status.c:1265 #, c-format msgid "nothing to commit\n" msgstr "æ— æ–‡ä»¶è¦æ交\n" # 译者:ä¸æ–‡å—符串拼接,å¯åˆ 除å‰å¯¼ç©ºæ ¼ #: wt-status.c:1263 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "æ— æ–‡ä»¶è¦æ交(使用 -u 显示未跟踪的文件)\n" # 译者:ä¸æ–‡å—符串拼接,å¯åˆ 除å‰å¯¼ç©ºæ ¼ #: wt-status.c:1267 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "æ— æ–‡ä»¶è¦æ交,干净的工作区\n" #: wt-status.c:1375 msgid "HEAD (no branch)" msgstr "HEAD(éžåˆ†æ”¯ï¼‰" # 译者:注æ„ä¿æŒå¥å°¾ç©ºæ ¼ #: wt-status.c:1381 msgid "Initial commit on " msgstr "åˆå§‹æ交于 " # 译者:注æ„ä¿æŒå¥å°¾ç©ºæ ¼ #: wt-status.c:1396 msgid "behind " msgstr "è½åŽ " # 译者:注æ„ä¿æŒå¥å°¾ç©ºæ ¼ #: wt-status.c:1399 wt-status.c:1402 msgid "ahead " msgstr "领先 " # 译者:注æ„ä¿æŒå¥å°¾ç©ºæ ¼ #: wt-status.c:1404 msgid ", behind " msgstr ",è½åŽ " #: compat/precompose_utf8.c:58 builtin/clone.c:352 #, c-format msgid "failed to unlink '%s'" msgstr "æ— æ³•åˆ é™¤ '%s'" #: builtin/add.c:20 msgid "git add [options] [--] <pathspec>..." msgstr "git add [选项] [--] <路径匹é…>..." # 译者:å—符串首行行首è¦æ·»åŠ “warning: â€å—串,故æ¤é¦–è¡Œè¦è¾ƒå…¶ä½™è¡ŒçŸ #. #. * To be consistent with "git add -p" and most Git #. * commands, we should default to being tree-wide, but #. * this is not the original behavior and can't be #. * changed until users trained themselves not to type #. * "git add -u" or "git add -A". For now, we warn and #. * keep the old behavior. Later, the behavior can be changed #. * to tree-wide, keeping the warning for a while, and #. * eventually we can drop the warning. #. #: builtin/add.c:58 #, c-format msgid "" "The behavior of 'git add %s (or %s)' with no path argument from a\n" "subdirectory of the tree will change in Git 2.0 and should not be used " "anymore.\n" "To add content for the whole tree, run:\n" "\n" " git add %s :/\n" " (or git add %s :/)\n" "\n" "To restrict the command to the current directory, run:\n" "\n" " git add %s .\n" " (or git add %s .)\n" "\n" "With the current Git version, the command is restricted to the current " "directory.\n" msgstr "" "在 Git 2.0 版本,ä½äºŽä¸€ä¸ªå目录下ä¸å¸¦ä»»ä½•è·¯å¾„å‚数地执行命令\n" "'git add %s (或 %s)' 的行为将被改å˜ï¼Œä¸è¦å†ç»§ç»ä½¿ç”¨äº†ã€‚\n" "如果è¦æ·»åŠ æ•´ä¸ªç›®å½•æ ‘çš„å†…å®¹ï¼Œæ‰§è¡Œï¼š\n" "\n" " git add %s :/\n" " (或 git add %s :/)\n" "\n" "如果è¦é™åˆ¶è¯¥å‘½ä»¤åªä½œç”¨äºŽå½“å‰ç›®å½•ï¼Œæ‰§è¡Œï¼š\n" "\n" " git add %s .\n" " (或 git add %s .)\n" "\n" "对于当å‰ç‰ˆæœ¬çš„ Git,这æ¡å‘½ä»¤åªä½œç”¨äºŽå½“å‰ç›®å½•ã€‚\n" #: builtin/add.c:100 #, c-format msgid "" "You ran 'git add' with neither '-A (--all)' or '--ignore-removal',\n" "whose behaviour will change in Git 2.0 with respect to paths you removed.\n" "Paths like '%s' that are\n" "removed from your working tree are ignored with this version of Git.\n" "\n" "* 'git add --ignore-removal <pathspec>', which is the current default,\n" " ignores paths you removed from your working tree.\n" "\n" "* 'git add --all <pathspec>' will let you also record the removals.\n" "\n" "Run 'git status' to check the paths you removed from your working tree.\n" msgstr "" "您在è¿è¡Œ 'git add' 时没有指定 '-A (--all)' 或 '--ignore-removal',\n" "针对其ä¸æœ¬åœ°ç§»é™¤è·¯å¾„的行为将在 Git 2.0 版本库å‘生å˜åŒ–。\n" "åƒæœ¬åœ°å·¥ä½œåŒºç§»é™¤çš„路径 '%s'\n" "在æ¤ç‰ˆæœ¬çš„ Git ä¸è¢«å¿½ç•¥ã€‚\n" "\n" "* 'git add --ignore-removal <pathspec>',是当å‰ç‰ˆæœ¬çš„默认æ“作,\n" " 忽略您本地工作区ä¸ç§»é™¤çš„文件。\n" "\n" "* 'git add --all <pathspec>' 将让您åŒæ—¶å¯¹åˆ 除æ“作进行记录。\n" "\n" "è¿è¡Œ 'git status' æ¥æ£€æŸ¥æ‚¨æœ¬åœ°å·¥ä½œåŒºä¸ç§»é™¤çš„路径。\n" #: builtin/add.c:144 #, c-format msgid "unexpected diff status %c" msgstr "æ„å¤–çš„å·®å¼‚çŠ¶æ€ %c" #: builtin/add.c:149 builtin/commit.c:233 msgid "updating files failed" msgstr "更新文件失败" #: builtin/add.c:163 #, c-format msgid "remove '%s'\n" msgstr "åˆ é™¤ '%s'\n" #: builtin/add.c:253 msgid "Unstaged changes after refreshing the index:" msgstr "刷新索引之åŽå°šæœªè¢«æš‚å˜çš„å˜æ›´ï¼š" #: builtin/add.c:256 builtin/add.c:572 builtin/rm.c:275 #, c-format msgid "pathspec '%s' did not match any files" msgstr "路径 '%s' 未匹é…任何文件" #: builtin/add.c:339 msgid "Could not read the index" msgstr "ä¸èƒ½è¯»å–索引" #: builtin/add.c:349 #, c-format msgid "Could not open '%s' for writing." msgstr "ä¸èƒ½æ‰“å¼€ '%s' 以写入。" #: builtin/add.c:353 msgid "Could not write patch" msgstr "ä¸èƒ½ç”Ÿæˆè¡¥ä¸" #: builtin/add.c:358 #, c-format msgid "Could not stat '%s'" msgstr "ä¸èƒ½æŸ¥çœ‹æ–‡ä»¶çŠ¶æ€ '%s'" #: builtin/add.c:360 msgid "Empty patch. Aborted." msgstr "空补ä¸ã€‚异常终æ¢ã€‚" #: builtin/add.c:366 #, c-format msgid "Could not apply '%s'" msgstr "ä¸èƒ½åº”用 '%s'" #: builtin/add.c:376 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "ä¸‹åˆ—è·¯å¾„æ ¹æ®æ‚¨çš„一个 .gitignore 文件而被忽略:\n" #: builtin/add.c:393 builtin/clean.c:161 builtin/fetch.c:78 builtin/mv.c:63 #: builtin/prune-packed.c:76 builtin/push.c:425 builtin/remote.c:1253 #: builtin/rm.c:206 msgid "dry run" msgstr "æ¼”ä¹ " #: builtin/add.c:394 builtin/apply.c:4409 builtin/check-ignore.c:19 #: builtin/commit.c:1152 builtin/count-objects.c:95 builtin/fsck.c:613 #: builtin/log.c:1518 builtin/mv.c:62 builtin/read-tree.c:112 msgid "be verbose" msgstr "冗长输出" #: builtin/add.c:396 msgid "interactive picking" msgstr "交互å¼æ‹£é€‰" #: builtin/add.c:397 builtin/checkout.c:1063 builtin/reset.c:258 msgid "select hunks interactively" msgstr "交互å¼æŒ‘选数æ®å—" #: builtin/add.c:398 msgid "edit current diff and apply" msgstr "编辑当å‰å·®å¼‚并应用" #: builtin/add.c:399 msgid "allow adding otherwise ignored files" msgstr "å…è®¸æ·»åŠ å¿½ç•¥çš„æ–‡ä»¶" #: builtin/add.c:400 msgid "update tracked files" msgstr "更新已跟踪的文件" #: builtin/add.c:401 msgid "record only the fact that the path will be added later" msgstr "åªè®°å½•ï¼Œè¯¥è·¯å¾„ç¨åŽå†æ·»åŠ " #: builtin/add.c:402 msgid "add changes from all tracked and untracked files" msgstr "æ·»åŠ æ‰€æœ‰æ”¹å˜çš„已跟踪文件和未跟踪文件" #. takes no arguments #: builtin/add.c:405 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "忽略工作区ä¸ç§»é™¤çš„路径(和 --no-all 相åŒï¼‰" #: builtin/add.c:407 msgid "don't add, only refresh the index" msgstr "ä¸æ·»åŠ ,åªåˆ·æ–°ç´¢å¼•" #: builtin/add.c:408 msgid "just skip files which cannot be added because of errors" msgstr "è·³è¿‡å› å‡ºé”™ä¸èƒ½æ·»åŠ 的文件" #: builtin/add.c:409 msgid "check if - even missing - files are ignored in dry run" msgstr "æ£€æŸ¥åœ¨æ¼”ä¹ æ¨¡å¼ä¸‹æ–‡ä»¶ï¼ˆå³ä½¿ä¸å˜åœ¨ï¼‰æ˜¯å¦è¢«å¿½ç•¥" #: builtin/add.c:431 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "使用 -f å‚数如果您确实è¦æ·»åŠ 它们。\n" #: builtin/add.c:432 msgid "no files added" msgstr "æ²¡æœ‰æ–‡ä»¶è¢«æ·»åŠ " #: builtin/add.c:438 msgid "adding files failed" msgstr "æ·»åŠ æ–‡ä»¶å¤±è´¥" #: builtin/add.c:477 msgid "-A and -u are mutually incompatible" msgstr "-A å’Œ -u 选项互斥" #: builtin/add.c:495 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "选项 --ignore-missing åªèƒ½å’Œ --dry-run åŒæ—¶ä½¿ç”¨" #: builtin/add.c:525 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "æ²¡æœ‰æŒ‡å®šæ–‡ä»¶ï¼Œä¹Ÿæ²¡æœ‰æ–‡ä»¶è¢«æ·»åŠ ã€‚\n" #: builtin/add.c:526 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "也许您想è¦æ‰§è¡Œ 'git add .'?\n" #: builtin/add.c:532 builtin/check-ignore.c:66 builtin/clean.c:204 #: builtin/commit.c:293 builtin/mv.c:82 builtin/rm.c:235 msgid "index file corrupt" msgstr "索引文件æŸå" #: builtin/add.c:604 builtin/apply.c:4505 builtin/mv.c:229 builtin/rm.c:370 msgid "Unable to write new index file" msgstr "æ— æ³•å†™å…¥æ–°ç´¢å¼•æ–‡ä»¶" #: builtin/apply.c:57 msgid "git apply [options] [<patch>...]" msgstr "git apply [选项] [<è¡¥ä¸>...]" #: builtin/apply.c:110 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "未能识别的空白å—符选项 '%s'" #: builtin/apply.c:125 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "未能识别的空白å—符忽略选项 '%s'" #: builtin/apply.c:823 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "æ— æ³•å‡†å¤‡æ—¶é—´æˆ³æ£åˆ™è¡¨è¾¾å¼ %s" #: builtin/apply.c:832 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec 返回 %d,输入为:%s" #: builtin/apply.c:913 #, c-format msgid "unable to find filename in patch at line %d" msgstr "ä¸èƒ½åœ¨è¡¥ä¸çš„第 %d 行找到文件å" #: builtin/apply.c:945 #, 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:949 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "git apply:错误的 git-diff - 第 %d 行上新文件åä¸ä¸€è‡´" #: builtin/apply.c:950 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件åä¸ä¸€è‡´" #: builtin/apply.c:957 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null" #: builtin/apply.c:1422 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount:æ„外的行:%.*s" #: builtin/apply.c:1479 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "第 %d 行的补ä¸ç‰‡æ®µæ²¡æœ‰å¤´ä¿¡æ¯ï¼š%.*s" #: builtin/apply.c:1496 #, 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:1656 msgid "new file depends on old contents" msgstr "新文件ä¾èµ–旧内容" #: builtin/apply.c:1658 msgid "deleted file still has contents" msgstr "åˆ é™¤çš„æ–‡ä»¶ä»æœ‰å†…容" #: builtin/apply.c:1684 #, c-format msgid "corrupt patch at line %d" msgstr "è¡¥ä¸åœ¨ç¬¬ %d è¡ŒæŸå" #: builtin/apply.c:1720 #, c-format msgid "new file %s depends on old contents" msgstr "新文件 %s ä¾èµ–旧内容" #: builtin/apply.c:1722 #, c-format msgid "deleted file %s still has contents" msgstr "åˆ é™¤çš„æ–‡ä»¶ %s ä»æœ‰å†…容" #: builtin/apply.c:1725 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** è¦å‘Šï¼šæ–‡ä»¶ %s æˆä¸ºç©ºæ–‡ä»¶ä½†å¹¶æœªåˆ 除" #: builtin/apply.c:1871 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "二进制补ä¸åœ¨ç¬¬ %d è¡ŒæŸå:%.*s" #. there has to be one hunk (forward hunk) #: builtin/apply.c:1900 #, c-format msgid "unrecognized binary patch at line %d" msgstr "未能识别的二进制补ä¸ä½äºŽç¬¬ %d è¡Œ" #: builtin/apply.c:1986 #, c-format msgid "patch with only garbage at line %d" msgstr "è¡¥ä¸æ–‡ä»¶çš„第 %d è¡Œåªæœ‰åžƒåœ¾æ•°æ®" #: builtin/apply.c:2076 #, c-format msgid "unable to read symlink %s" msgstr "æ— æ³•è¯»å–符å·é“¾æŽ¥ %s" #: builtin/apply.c:2080 #, c-format msgid "unable to open or read %s" msgstr "ä¸èƒ½æ‰“å¼€æˆ–è¯»å– %s" #: builtin/apply.c:2688 #, c-format msgid "invalid start of line: '%c'" msgstr "æ— æ•ˆçš„è¡Œé¦–å—符:'%c'" #: builtin/apply.c:2806 #, 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:2818 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "上下文å‡å°‘到(%ld/%ld)以在第 %d 行应用补ä¸ç‰‡æ®µ" #: builtin/apply.c:2824 #, c-format msgid "" "while searching for:\n" "%.*s" msgstr "" "当查询:\n" "%.*s" #: builtin/apply.c:2843 #, c-format msgid "missing binary patch data for '%s'" msgstr "缺失 '%s' 的二进制补ä¸æ•°æ®" #: builtin/apply.c:2946 #, c-format msgid "binary patch does not apply to '%s'" msgstr "二进制补ä¸æœªåº”用到 '%s'" #: builtin/apply.c:2952 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "到 '%s' 的二进制补ä¸äº§ç”Ÿäº†ä¸æ£ç¡®çš„结果(应为 %s,å´ä¸º %s)" #: builtin/apply.c:2973 #, c-format msgid "patch failed: %s:%ld" msgstr "打补ä¸å¤±è´¥ï¼š%s:%ld" #: builtin/apply.c:3095 #, c-format msgid "cannot checkout %s" msgstr "ä¸èƒ½æ£€å‡º %s" #: builtin/apply.c:3140 builtin/apply.c:3149 builtin/apply.c:3193 #, c-format msgid "read of %s failed" msgstr "è¯»å– %s 失败" #: builtin/apply.c:3173 builtin/apply.c:3395 #, c-format msgid "path %s has been renamed/deleted" msgstr "路径 %s å·²ç»è¢«é‡å‘½å/åˆ é™¤" #: builtin/apply.c:3254 builtin/apply.c:3409 #, c-format msgid "%s: does not exist in index" msgstr "%s:ä¸å˜åœ¨äºŽç´¢å¼•ä¸" #: builtin/apply.c:3258 builtin/apply.c:3401 builtin/apply.c:3423 #, c-format msgid "%s: %s" msgstr "%s:%s" #: builtin/apply.c:3263 builtin/apply.c:3417 #, c-format msgid "%s: does not match index" msgstr "%s:和索引ä¸åŒ¹é…" #: builtin/apply.c:3365 msgid "removal patch leaves file contents" msgstr "移除补ä¸ä»ç•™ä¸‹äº†æ–‡ä»¶å†…容" #: builtin/apply.c:3434 #, c-format msgid "%s: wrong type" msgstr "%s:错误类型" #: builtin/apply.c:3436 #, c-format msgid "%s has type %o, expected %o" msgstr "%s 的类型是 %o,应为 %o" #: builtin/apply.c:3537 #, c-format msgid "%s: already exists in index" msgstr "%s:已ç»å˜åœ¨äºŽç´¢å¼•ä¸" #: builtin/apply.c:3540 #, c-format msgid "%s: already exists in working directory" msgstr "%s:已ç»å˜åœ¨äºŽå·¥ä½œåŒºä¸" #: builtin/apply.c:3560 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "%2$s 的新模å¼ï¼ˆ%1$o)和旧模å¼ï¼ˆ%3$o)ä¸åŒ¹é…" #: builtin/apply.c:3565 #, 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:3573 #, c-format msgid "%s: patch does not apply" msgstr "%s:补ä¸æœªåº”用" #: builtin/apply.c:3586 #, c-format msgid "Checking patch %s..." msgstr "æ£€æŸ¥è¡¥ä¸ %s..." #: builtin/apply.c:3679 builtin/checkout.c:216 builtin/reset.c:124 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "对路径 '%s' çš„ make_cache_entry æ“作失败" #: builtin/apply.c:3822 #, c-format msgid "unable to remove %s from index" msgstr "ä¸èƒ½ä»Žç´¢å¼•ä¸ç§»é™¤ %s" #: builtin/apply.c:3850 #, c-format msgid "corrupt patch for subproject %s" msgstr "å项目 %s æŸåçš„è¡¥ä¸" #: builtin/apply.c:3854 #, c-format msgid "unable to stat newly created file '%s'" msgstr "ä¸èƒ½æžšä¸¾æ–°å»ºæ–‡ä»¶ '%s' 的状æ€" #: builtin/apply.c:3859 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "ä¸èƒ½ä¸ºæ–°å»ºæ–‡ä»¶ %s 创建åŽç«¯å˜å‚¨" #: builtin/apply.c:3862 builtin/apply.c:3970 #, c-format msgid "unable to add cache entry for %s" msgstr "æ— æ³•ä¸º %s æ·»åŠ ç¼“å˜æ¡ç›®" #: builtin/apply.c:3895 #, c-format msgid "closing file '%s'" msgstr "å…³é—文件 '%s'" #: builtin/apply.c:3944 #, c-format msgid "unable to write file '%s' mode %o" msgstr "ä¸èƒ½å†™æ–‡ä»¶ '%s' æƒé™ %o" #: builtin/apply.c:4031 #, c-format msgid "Applied patch %s cleanly." msgstr "æˆåŠŸåº”ç”¨è¡¥ä¸ %s。" #: builtin/apply.c:4039 msgid "internal error" msgstr "内部错误" #. Say this even without --verbose #: builtin/apply.c:4042 #, 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:4052 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "æˆªçŸ .rej 文件å为 %.*s.rej" #: builtin/apply.c:4073 #, c-format msgid "Hunk #%d applied cleanly." msgstr "第 #%d 个片段æˆåŠŸåº”用。" #: builtin/apply.c:4076 #, c-format msgid "Rejected hunk #%d." msgstr "æ‹’ç»ç¬¬ #%d 个片段。" #: builtin/apply.c:4226 msgid "unrecognized input" msgstr "未能识别的输入" #: builtin/apply.c:4237 msgid "unable to read index file" msgstr "æ— æ³•è¯»å–索引文件" #: builtin/apply.c:4356 builtin/apply.c:4359 builtin/clone.c:92 #: builtin/fetch.c:63 msgid "path" msgstr "路径" #: builtin/apply.c:4357 msgid "don't apply changes matching the given path" msgstr "ä¸è¦åº”用与给出路径å‘匹é…çš„å˜æ›´" #: builtin/apply.c:4360 msgid "apply changes matching the given path" msgstr "应用与给出路径å‘匹é…çš„å˜æ›´" #: builtin/apply.c:4362 msgid "num" msgstr "æ•°å—" #: builtin/apply.c:4363 msgid "remove <num> leading slashes from traditional diff paths" msgstr "ä»Žä¼ ç»Ÿçš„ diff 路径ä¸ç§»é™¤æŒ‡å®šæ•°é‡çš„å‰å¯¼æ–œçº¿" #: builtin/apply.c:4366 msgid "ignore additions made by the patch" msgstr "忽略补ä¸ä¸çš„æ·»åŠ çš„æ–‡ä»¶" #: builtin/apply.c:4368 msgid "instead of applying the patch, output diffstat for the input" msgstr "ä¸åº”用补ä¸ï¼Œè€Œæ˜¯æ˜¾ç¤ºè¾“入的差异统计(diffstat)" #: builtin/apply.c:4372 msgid "show number of added and deleted lines in decimal notation" msgstr "以åè¿›åˆ¶æ•°æ˜¾ç¤ºæ·»åŠ å’Œåˆ é™¤çš„è¡Œæ•°" #: builtin/apply.c:4374 msgid "instead of applying the patch, output a summary for the input" msgstr "ä¸åº”用补ä¸ï¼Œè€Œæ˜¯æ˜¾ç¤ºè¾“入的概è¦" #: builtin/apply.c:4376 msgid "instead of applying the patch, see if the patch is applicable" msgstr "ä¸åº”用补ä¸ï¼Œè€Œæ˜¯æŸ¥çœ‹è¡¥ä¸æ˜¯å¦å¯åº”用" #: builtin/apply.c:4378 msgid "make sure the patch is applicable to the current index" msgstr "确认补ä¸å¯ä»¥åº”用到当å‰ç´¢å¼•" #: builtin/apply.c:4380 msgid "apply a patch without touching the working tree" msgstr "应用补ä¸è€Œä¸ä¿®æ”¹å·¥ä½œåŒº" #: builtin/apply.c:4382 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "还应用æ¤è¡¥ä¸ï¼ˆä¸Ž --stat/--summary/--check 选项åŒæ—¶ä½¿ç”¨ï¼‰" #: builtin/apply.c:4384 msgid "attempt three-way merge if a patch does not apply" msgstr "如果一个补ä¸ä¸èƒ½åº”用则å°è¯•ä¸‰è·¯åˆå¹¶" #: builtin/apply.c:4386 msgid "build a temporary index based on embedded index information" msgstr "创建一个临时索引基于嵌入的索引信æ¯" #: builtin/apply.c:4388 builtin/checkout-index.c:197 builtin/ls-files.c:456 msgid "paths are separated with NUL character" msgstr "路径以 NUL å—符分隔" #: builtin/apply.c:4391 msgid "ensure at least <n> lines of context match" msgstr "ç¡®ä¿è‡³å°‘åŒ¹é… <n> 行上下文" #: builtin/apply.c:4392 msgid "action" msgstr "动作" #: builtin/apply.c:4393 msgid "detect new or modified lines that have whitespace errors" msgstr "检查新增和修改的行ä¸é—´çš„空白å—符滥用" #: builtin/apply.c:4396 builtin/apply.c:4399 msgid "ignore changes in whitespace when finding context" msgstr "查找上下文时忽略空白å—符的å˜æ›´" #: builtin/apply.c:4402 msgid "apply the patch in reverse" msgstr "åå‘应用补ä¸" #: builtin/apply.c:4404 msgid "don't expect at least one line of context" msgstr "æ— éœ€è‡³å°‘ä¸€è¡Œä¸Šä¸‹æ–‡" #: builtin/apply.c:4406 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "将拒ç»çš„è¡¥ä¸ç‰‡æ®µä¿å˜åœ¨å¯¹åº”çš„ *.rej 文件ä¸" #: builtin/apply.c:4408 msgid "allow overlapping hunks" msgstr "å…许é‡å çš„è¡¥ä¸ç‰‡æ®µ" #: builtin/apply.c:4411 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "å…许ä¸æ£ç¡®çš„文件末尾æ¢è¡Œç¬¦" #: builtin/apply.c:4414 msgid "do not trust the line counts in the hunk headers" msgstr "ä¸ä¿¡ä»»è¡¥ä¸ç‰‡æ®µçš„头信æ¯ä¸çš„è¡Œå·" #: builtin/apply.c:4416 msgid "root" msgstr "æ ¹ç›®å½•" #: builtin/apply.c:4417 msgid "prepend <root> to all filenames" msgstr "为所有文件åå‰æ·»åŠ <æ ¹ç›®å½•>" #: builtin/apply.c:4439 msgid "--3way outside a repository" msgstr "--3way 在一个版本库之外" #: builtin/apply.c:4447 msgid "--index outside a repository" msgstr "--index 在一个版本库之外" #: builtin/apply.c:4450 msgid "--cached outside a repository" msgstr "--cached 在一个版本库之外" #: builtin/apply.c:4466 #, c-format msgid "can't open patch '%s'" msgstr "ä¸èƒ½æ‰“å¼€è¡¥ä¸ '%s'" #: builtin/apply.c:4480 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "抑制下ä»æœ‰ %d 个空白å—符误用" msgstr[1] "抑制下ä»æœ‰ %d 个空白å—符误用" #: builtin/apply.c:4486 builtin/apply.c:4496 #, 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:61 #, c-format msgid "git archive: NACK %s" msgstr "git archive:NACK %s" #: builtin/archive.c:63 #, c-format msgid "remote error: %s" msgstr "远程错误:%s" #: builtin/archive.c:64 msgid "git archive: protocol error" msgstr "git archive:å议错误" #: builtin/archive.c:68 msgid "git archive: expected a flush" msgstr "git archive:应为刷新" #: builtin/bisect--helper.c:7 msgid "git bisect--helper --next-all [--no-checkout]" msgstr "git bisect--helper --next-all [--no-checkout]" #: builtin/bisect--helper.c:17 msgid "perform 'git bisect next'" msgstr "执行 'git bisect next'" #: builtin/bisect--helper.c:19 msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "æ›´æ–° BISECT_HEAD 而éžæ£€å‡ºå½“å‰æ交" #: builtin/blame.c:25 msgid "git blame [options] [rev-opts] [rev] [--] file" msgstr "git blame [选项] [版本选项] [版本] [--] 文件" #: builtin/blame.c:30 msgid "[rev-opts] are documented in git-rev-list(1)" msgstr "[版本选项] 的文档记录在 git-rev-list(1) ä¸" #: builtin/blame.c:2355 msgid "Show blame entries as we find them, incrementally" msgstr "增é‡å¼åœ°æ˜¾ç¤ºå‘现的 blame æ¡ç›®" #: builtin/blame.c:2356 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "边界æ交显示空的 SHA-1(默认:关é—)" #: builtin/blame.c:2357 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "ä¸æŠŠæ ¹æ交作为边界(默认:关é—)" #: builtin/blame.c:2358 msgid "Show work cost statistics" msgstr "显示命令消耗统计" #: builtin/blame.c:2359 msgid "Show output score for blame entries" msgstr "æ˜¾ç¤ºåˆ¤æ– blame æ¡ç›®ä½ç§»çš„得分诊æ–ä¿¡æ¯" #: builtin/blame.c:2360 msgid "Show original filename (Default: auto)" msgstr "显示原始文件å(默认:自动)" #: builtin/blame.c:2361 msgid "Show original linenumber (Default: off)" msgstr "显示原始的行å·ï¼ˆé»˜è®¤ï¼šå…³é—)" #: builtin/blame.c:2362 msgid "Show in a format designed for machine consumption" msgstr "显示为一个适åˆæœºå™¨è¯»å–çš„æ ¼å¼" #: builtin/blame.c:2363 msgid "Show porcelain format with per-line commit information" msgstr "为æ¯ä¸€è¡Œæ˜¾ç¤ºæœºå™¨é€‚用的æ交信æ¯" #: builtin/blame.c:2364 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "使用和 git-annotate 相åŒçš„输出模å¼ï¼ˆé»˜è®¤ï¼šå…³é—)" #: builtin/blame.c:2365 msgid "Show raw timestamp (Default: off)" msgstr "显示原始时间戳(默认:关é—)" #: builtin/blame.c:2366 msgid "Show long commit SHA1 (Default: off)" msgstr "显示长的SHA1æ交å·ï¼ˆé»˜è®¤ï¼šå…³é—)" #: builtin/blame.c:2367 msgid "Suppress author name and timestamp (Default: off)" msgstr "éšè—作者åå—和时间戳(默认:关é—)" #: builtin/blame.c:2368 msgid "Show author email instead of name (Default: off)" msgstr "显示作者的邮箱而ä¸æ˜¯åå—(默认:关é—)" #: builtin/blame.c:2369 msgid "Ignore whitespace differences" msgstr "忽略空白差异" #: builtin/blame.c:2370 msgid "Spend extra cycles to find better match" msgstr "花费é¢å¤–的循环æ¥æ‰¾åˆ°æ›´å¥½çš„匹é…" #: builtin/blame.c:2371 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "使用æ¥è‡ª <file> 的修订集而ä¸æ˜¯è°ƒç”¨ git-rev-list" #: builtin/blame.c:2372 msgid "Use <file>'s contents as the final image" msgstr "使用 <file> 的内容作为最终的图片" #: builtin/blame.c:2373 builtin/blame.c:2374 msgid "score" msgstr "得分" #: builtin/blame.c:2373 msgid "Find line copies within and across files" msgstr "找到文件内åŠè·¨æ–‡ä»¶çš„行拷è´" #: builtin/blame.c:2374 msgid "Find line movements within and across files" msgstr "找到文件内åŠè·¨æ–‡ä»¶çš„行移动" #: builtin/blame.c:2375 msgid "n,m" msgstr "n,m" #: builtin/blame.c:2375 msgid "Process only line range n,m, counting from 1" msgstr "åªå¤„ç†è¡ŒèŒƒå›´åœ¨ n å’Œ m 之间的,从 1 开始" #: builtin/branch.c:24 msgid "git branch [options] [-r | -a] [--merged | --no-merged]" msgstr "git branch [选项] [-r | -a] [--merged | --no-merged]" #: builtin/branch.c:25 msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]" msgstr "git branch [选项] [-l] [-f] <分支å> [<起始点>]" #: builtin/branch.c:26 msgid "git branch [options] [-r] (-d | -D) <branchname>..." msgstr "git branch [选项] [-r] (-d | -D) <分支å>..." #: builtin/branch.c:27 msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>" msgstr "git branch [选项] (-m | -M) [<旧分支>] <新分支>" # 译者:ä¿æŒåŽŸæ¢è¡Œæ ¼å¼ï¼Œåœ¨è¾“出时 %s 的替代内容会让å—符串å˜é•¿ #: builtin/branch.c:150 #, 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:154 #, 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:168 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "æ— æ³•æŸ¥è¯¢ '%s' 指å‘çš„æ交对象" #: builtin/branch.c:172 #, 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:185 msgid "Update of config-file failed" msgstr "æ— æ³•æ›´æ–° config 文件" #: builtin/branch.c:213 msgid "cannot use -a with -d" msgstr "ä¸èƒ½å°† -a å’Œ -d åŒæ—¶ä½¿ç”¨" #: builtin/branch.c:219 msgid "Couldn't look up commit object for HEAD" msgstr "æ— æ³•æŸ¥è¯¢ HEAD 指å‘çš„æ交对象" #: builtin/branch.c:227 #, c-format msgid "Cannot delete the branch '%s' which you are currently on." msgstr "æ— æ³•åˆ é™¤æ‚¨å½“å‰æ‰€åœ¨çš„分支 '%s'。" #: builtin/branch.c:240 #, c-format msgid "remote branch '%s' not found." msgstr "远程分支 '%s' 未å‘现。" #: builtin/branch.c:241 #, c-format msgid "branch '%s' not found." msgstr "分支 '%s' 未å‘现。" #: builtin/branch.c:255 #, c-format msgid "Error deleting remote branch '%s'" msgstr "åˆ é™¤è¿œç¨‹åˆ†æ”¯ '%s' 时出错" #: builtin/branch.c:256 #, c-format msgid "Error deleting branch '%s'" msgstr "åˆ é™¤åˆ†æ”¯ '%s' 时出错" #: builtin/branch.c:263 #, c-format msgid "Deleted remote branch %s (was %s).\n" msgstr "å·²åˆ é™¤è¿œç¨‹åˆ†æ”¯ %s(曾为 %s)。\n" #: builtin/branch.c:264 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "å·²åˆ é™¤åˆ†æ”¯ %s(曾为 %s)。\n" #: builtin/branch.c:366 #, c-format msgid "branch '%s' does not point at a commit" msgstr "分支 '%s' 未指å‘一个æ交" #: builtin/branch.c:453 #, c-format msgid "[%s: behind %d]" msgstr "[%s:è½åŽ %d]" #: builtin/branch.c:455 #, c-format msgid "[behind %d]" msgstr "[è½åŽ %d]" #: builtin/branch.c:459 #, c-format msgid "[%s: ahead %d]" msgstr "[%s:领先 %d]" #: builtin/branch.c:461 #, c-format msgid "[ahead %d]" msgstr "[领先 %d]" #: builtin/branch.c:464 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "[%s:领先 %d,è½åŽ %d]" #: builtin/branch.c:467 #, c-format msgid "[ahead %d, behind %d]" msgstr "[领先 %d,è½åŽ %d]" #: builtin/branch.c:490 msgid " **** invalid ref ****" msgstr " **** æ— æ•ˆå¼•ç”¨ ****" #: builtin/branch.c:582 #, c-format msgid "(no branch, rebasing %s)" msgstr "(éžåˆ†æ”¯ï¼Œæ£å˜åŸº %s)" #: builtin/branch.c:585 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(éžåˆ†æ”¯ï¼ŒäºŒåˆ†æŸ¥æ‰¾å¼€å§‹äºŽ %s)" #: builtin/branch.c:588 #, c-format msgid "(detached from %s)" msgstr "(分离自 %s)" #: builtin/branch.c:591 msgid "(no branch)" msgstr "(éžåˆ†æ”¯ï¼‰" #: builtin/branch.c:637 #, c-format msgid "object '%s' does not point to a commit" msgstr "对象 '%s' 没有指å‘一个æ交" #: builtin/branch.c:669 msgid "some refs could not be read" msgstr "一些引用ä¸èƒ½è¯»å–" #: builtin/branch.c:682 msgid "cannot rename the current branch while not on any." msgstr "æ— æ³•é‡å‘½å当å‰åˆ†æ”¯å› 为ä¸å¤„于任何分支上。" #: builtin/branch.c:692 #, c-format msgid "Invalid branch name: '%s'" msgstr "æ— æ•ˆçš„åˆ†æ”¯å:'%s'" #: builtin/branch.c:707 msgid "Branch rename failed" msgstr "分支é‡å‘½å失败" #: builtin/branch.c:711 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "é‡å‘½å掉一个错误命å的旧分支 '%s'" #: builtin/branch.c:715 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "分支é‡å‘½å为 %s,但 HEAD 没有更新ï¼" #: builtin/branch.c:722 msgid "Branch is renamed, but update of config-file failed" msgstr "分支被é‡å‘½å,但更新 config 文件失败" #: builtin/branch.c:737 #, c-format msgid "malformed object name %s" msgstr "éžæ³•çš„对象å %s" #: builtin/branch.c:761 #, c-format msgid "could not write branch description template: %s" msgstr "ä¸èƒ½å†™åˆ†æ”¯æ述模版:%s" #: builtin/branch.c:791 msgid "Generic options" msgstr "通用选项" #: builtin/branch.c:793 msgid "show hash and subject, give twice for upstream branch" msgstr "显示哈希值和主题,若å‚数出现两次则显示上游分支" #: builtin/branch.c:794 msgid "suppress informational messages" msgstr "ä¸æ˜¾ç¤ºä¿¡æ¯" #: builtin/branch.c:795 msgid "set up tracking mode (see git-pull(1))" msgstr "设置跟踪模å¼ï¼ˆå‚è§ git-pull(1))" #: builtin/branch.c:797 msgid "change upstream info" msgstr "改å˜ä¸Šæ¸¸ä¿¡æ¯" #: builtin/branch.c:801 msgid "use colored output" msgstr "使用彩色输出" #: builtin/branch.c:802 msgid "act on remote-tracking branches" msgstr "作用于远程跟踪分支" #: builtin/branch.c:805 builtin/branch.c:811 builtin/branch.c:832 #: builtin/branch.c:838 builtin/commit.c:1368 builtin/commit.c:1369 #: builtin/commit.c:1370 builtin/commit.c:1371 builtin/tag.c:468 msgid "commit" msgstr "æ交" #: builtin/branch.c:806 builtin/branch.c:812 msgid "print only branches that contain the commit" msgstr "åªæ‰“å°åŒ…å«è¯¥æ交的分支" #: builtin/branch.c:818 msgid "Specific git-branch actions:" msgstr "具体的 git-branch 动作:" #: builtin/branch.c:819 msgid "list both remote-tracking and local branches" msgstr "列出远程跟踪åŠæœ¬åœ°åˆ†æ”¯" #: builtin/branch.c:821 msgid "delete fully merged branch" msgstr "åˆ é™¤å®Œå…¨åˆå¹¶çš„分支" #: builtin/branch.c:822 msgid "delete branch (even if not merged)" msgstr "åˆ é™¤åˆ†æ”¯ï¼ˆå³ä½¿æ²¡æœ‰åˆå¹¶ï¼‰" #: builtin/branch.c:823 msgid "move/rename a branch and its reflog" msgstr "移动/é‡å‘½å一个分支,以åŠå®ƒçš„引用日志" #: builtin/branch.c:824 msgid "move/rename a branch, even if target exists" msgstr "移动/é‡å‘½å一个分支,å³ä½¿ç›®æ ‡å·²å˜åœ¨" #: builtin/branch.c:825 msgid "list branch names" msgstr "列出分支å" #: builtin/branch.c:826 msgid "create the branch's reflog" msgstr "创建分支的引用日志" #: builtin/branch.c:828 msgid "edit the description for the branch" msgstr "æ ‡è®°åˆ†æ”¯çš„æè¿°" #: builtin/branch.c:829 msgid "force creation (when already exists)" msgstr "强制创建(当已ç»å˜åœ¨ï¼‰" #: builtin/branch.c:832 msgid "print only not merged branches" msgstr "åªæ‰“å°æ²¡æœ‰åˆå¹¶çš„分支" #: builtin/branch.c:838 msgid "print only merged branches" msgstr "åªæ‰“å°åˆå¹¶çš„分支" #: builtin/branch.c:842 msgid "list branches in columns" msgstr "以列的方å¼æ˜¾ç¤ºåˆ†æ”¯" #: builtin/branch.c:855 msgid "Failed to resolve HEAD as a valid ref." msgstr "æ— æ³•å°† HEAD 解æžä¸ºæœ‰æ•ˆå¼•ç”¨ã€‚" #: builtin/branch.c:860 builtin/clone.c:619 msgid "HEAD not found below refs/heads!" msgstr "HEAD 没有ä½äºŽ /refs/heads 之下ï¼" #: builtin/branch.c:883 msgid "--column and --verbose are incompatible" msgstr "--column å’Œ --verbose ä¸å…¼å®¹" #: builtin/branch.c:889 builtin/branch.c:928 msgid "branch name required" msgstr "å¿…é¡»æ供分支å" #: builtin/branch.c:904 msgid "Cannot give description to detached HEAD" msgstr "ä¸èƒ½å‘分离头指针æä¾›æè¿°" #: builtin/branch.c:909 msgid "cannot edit description of more than one branch" msgstr "ä¸èƒ½ä¸ºä¸€ä¸ªä»¥ä¸Šçš„分支编辑æè¿°" #: builtin/branch.c:916 #, c-format msgid "No commit on branch '%s' yet." msgstr "分支 '%s' å°šæ— æ交。" #: builtin/branch.c:919 #, c-format msgid "No branch named '%s'." msgstr "没有分支 '%s'。" #: builtin/branch.c:934 msgid "too many branches for a rename operation" msgstr "为é‡å‘½åæ“作æ供了太多的分支å" #: builtin/branch.c:939 msgid "too many branches to set new upstream" msgstr "为设置新上游æ供了太多的分支å" #: builtin/branch.c:943 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "æ— æ³•è®¾ç½® HEAD 的上游为 %sï¼Œå› ä¸º HEAD 没有指å‘任何分支。" #: builtin/branch.c:946 builtin/branch.c:968 builtin/branch.c:990 #, c-format msgid "no such branch '%s'" msgstr "没有æ¤åˆ†æ”¯ '%s'" #: builtin/branch.c:950 #, c-format msgid "branch '%s' does not exist" msgstr "分支 '%s' ä¸å˜åœ¨" #: builtin/branch.c:962 msgid "too many branches to unset upstream" msgstr "为å–消上游设置æ“作æ供了太多的分支å" #: builtin/branch.c:966 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "æ— æ³•å–消 HEAD çš„ä¸Šæ¸¸è®¾ç½®å› ä¸ºå®ƒæ²¡æœ‰æŒ‡å‘一个分支" #: builtin/branch.c:972 #, c-format msgid "Branch '%s' has no upstream information" msgstr "分支 '%s' 没有上游信æ¯" #: builtin/branch.c:987 msgid "it does not make sense to create 'HEAD' manually" msgstr "手工创建 'HEAD' 没有æ„义" #: builtin/branch.c:993 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "'git branch' çš„ -a å’Œ -r 选项带一个分支åå‚数没有æ„义" #: builtin/branch.c:996 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" "track or --set-upstream-to\n" msgstr "" "选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n" #: builtin/branch.c:1013 #, c-format msgid "" "\n" "If you wanted to make '%s' track '%s', do this:\n" "\n" msgstr "" "\n" "å¦‚æžœä½ æƒ³ç”¨ '%s' 跟踪 '%s', 这么åšï¼š\n" "\n" #: builtin/branch.c:1014 #, c-format msgid " git branch -d %s\n" msgstr " git branch -d %s\n" #: builtin/branch.c:1015 #, c-format msgid " git branch --set-upstream-to %s\n" msgstr " git branch --set-upstream-to %s\n" #: 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/cat-file.c:176 msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>" msgstr "git cat-file (-t|-s|-e|-p|<类型>|--textconv) <对象>" #: builtin/cat-file.c:177 msgid "git cat-file (--batch|--batch-check) < <list_of_objects>" msgstr "git cat-file (--batch|--batch-check) < <对象列表>" #: builtin/cat-file.c:195 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<类型> å¯ä»¥æ˜¯å…¶ä¸ä¹‹ä¸€ï¼šblobã€treeã€commitã€tag" #: builtin/cat-file.c:196 msgid "show object type" msgstr "显示对象类型" #: builtin/cat-file.c:197 msgid "show object size" msgstr "显示对象大å°" #: builtin/cat-file.c:199 msgid "exit with zero when there's no error" msgstr "当没有错误时退出并返回零" #: builtin/cat-file.c:200 msgid "pretty-print object's content" msgstr "美观地打å°å¯¹è±¡çš„内容" #: builtin/cat-file.c:202 msgid "for blob objects, run textconv on object's content" msgstr "对于数æ®ï¼ˆblob)对象,对其内容执行 textconv" #: builtin/cat-file.c:204 msgid "show info and content of objects fed from the standard input" msgstr "æ˜¾ç¤ºä»Žæ ‡å‡†è¾“å…¥æ供的对象的信æ¯å’Œå†…容" #: builtin/cat-file.c:207 msgid "show info about objects fed from the standard input" msgstr "æ˜¾ç¤ºä»Žæ ‡å‡†è¾“å…¥æ供的对象的信æ¯" #: builtin/check-attr.c:11 msgid "git check-attr [-a | --all | attr...] [--] pathname..." msgstr "git check-attr [-a | --all | attr...] [--] 路径å..." #: builtin/check-attr.c:12 msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>" msgstr "git check-attr --stdin [-z] [-a | --all | attr...] < <路径列表>" #: builtin/check-attr.c:19 msgid "report all attributes set on file" msgstr "报告设置在文件上的所有属性" #: builtin/check-attr.c:20 msgid "use .gitattributes only from the index" msgstr "åªä½¿ç”¨ç´¢å¼•ä¸çš„ .gitattributes" #: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:75 msgid "read file names from stdin" msgstr "ä»Žæ ‡å‡†è¾“å…¥è¯»å‡ºæ–‡ä»¶å" #: builtin/check-attr.c:23 builtin/check-ignore.c:24 msgid "input paths are terminated by a null character" msgstr "输入路径以nullå—符终æ¢" #: builtin/check-ignore.c:18 builtin/checkout.c:1044 builtin/gc.c:177 msgid "suppress progress reporting" msgstr "ä¸æ˜¾ç¤ºè¿›åº¦æŠ¥å‘Š" #: builtin/check-ignore.c:146 msgid "cannot specify pathnames with --stdin" msgstr "ä¸èƒ½åŒæ—¶æä¾›è·¯å¾„åŠ --stdin å‚æ•°" #: builtin/check-ignore.c:149 msgid "-z only makes sense with --stdin" msgstr "-z 需è¦å’Œ --stdin å‚数共用æ‰æœ‰æ„义" #: builtin/check-ignore.c:151 msgid "no path specified" msgstr "未指定路径" #: builtin/check-ignore.c:155 msgid "--quiet is only valid with a single pathname" msgstr "å‚æ•° --quiet åªåœ¨æ供一个路径å时有效" #: builtin/check-ignore.c:157 msgid "cannot have both --quiet and --verbose" msgstr "ä¸èƒ½åŒæ—¶æä¾› --quiet å’Œ --verbose å‚æ•°" #: builtin/checkout-index.c:126 msgid "git checkout-index [options] [--] [<file>...]" msgstr "git checkout-index [选项] [--] [<文件>...]" #: builtin/checkout-index.c:187 msgid "check out all files in the index" msgstr "检出索引区的所有文件" #: builtin/checkout-index.c:188 msgid "force overwrite of existing files" msgstr "强制覆盖现有的文件" #: builtin/checkout-index.c:190 msgid "no warning for existing files and files not in index" msgstr "å˜åœ¨æˆ–ä¸åœ¨ç´¢å¼•ä¸çš„文件都没有è¦å‘Š" #: builtin/checkout-index.c:192 msgid "don't checkout new files" msgstr "ä¸æ£€å‡ºæ–°æ–‡ä»¶" #: builtin/checkout-index.c:194 msgid "update stat information in the index file" msgstr "更新索引ä¸æ–‡ä»¶çš„状æ€ä¿¡æ¯" #: builtin/checkout-index.c:200 msgid "read list of paths from the standard input" msgstr "ä»Žæ ‡å‡†è¾“å…¥è¯»å–路径列表" #: builtin/checkout-index.c:202 msgid "write the content to temporary files" msgstr "将内容写入临时文件" #: builtin/checkout-index.c:203 builtin/column.c:30 msgid "string" msgstr "å—符串" #: builtin/checkout-index.c:204 msgid "when creating files, prepend <string>" msgstr "在创建文件时,在å‰é¢åŠ 上<å—符串>" #: builtin/checkout-index.c:207 msgid "copy out the files from named stage" msgstr "从指定暂å˜åŒºä¸æ‹·å‡ºæ–‡ä»¶" #: builtin/checkout.c:25 msgid "git checkout [options] <branch>" msgstr "git checkout [选项] <分支>" #: builtin/checkout.c:26 msgid "git checkout [options] [<branch>] -- <file>..." msgstr "git checkout [选项] [<分支>] -- <文件>..." #: builtin/checkout.c:117 builtin/checkout.c:150 #, c-format msgid "path '%s' does not have our version" msgstr "路径 '%s' 没有我们的版本" #: builtin/checkout.c:119 builtin/checkout.c:152 #, c-format msgid "path '%s' does not have their version" msgstr "路径 '%s' 没有他们的版本" #: builtin/checkout.c:135 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "路径 '%s' 没有全部必须的版本" #: builtin/checkout.c:179 #, c-format msgid "path '%s' does not have necessary versions" msgstr "路径 '%s' 没有必须的版本" #: builtin/checkout.c:196 #, c-format msgid "path '%s': cannot merge" msgstr "path '%s'ï¼šæ— æ³•åˆå¹¶" #: builtin/checkout.c:213 #, c-format msgid "Unable to add merge result for '%s'" msgstr "æ— æ³•ä¸º '%s' æ·»åŠ åˆå¹¶ç»“æžœ" #: builtin/checkout.c:237 builtin/checkout.c:240 builtin/checkout.c:243 #: builtin/checkout.c:246 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' ä¸èƒ½åœ¨æ›´æ–°è·¯å¾„时使用" #: builtin/checkout.c:249 builtin/checkout.c:252 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' ä¸èƒ½å’Œ %s åŒæ—¶ä½¿ç”¨" #: builtin/checkout.c:255 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "ä¸èƒ½åŒæ—¶æ›´æ–°è·¯å¾„并切æ¢åˆ°åˆ†æ”¯'%s'。" #: builtin/checkout.c:266 builtin/checkout.c:458 msgid "corrupt index file" msgstr "æŸå的索引文件" #: builtin/checkout.c:329 builtin/checkout.c:336 #, c-format msgid "path '%s' is unmerged" msgstr "路径 '%s' 未åˆå¹¶" #: builtin/checkout.c:480 msgid "you need to resolve your current index first" msgstr "您需è¦å…ˆè§£å†³å½“å‰ç´¢å¼•çš„冲çª" #: builtin/checkout.c:601 #, c-format msgid "Can not do reflog for '%s'\n" msgstr "ä¸èƒ½å¯¹ '%s' 执行 reflog æ“作\n" #: builtin/checkout.c:634 msgid "HEAD is now at" msgstr "HEAD ç›®å‰ä½äºŽ" #: builtin/checkout.c:641 #, c-format msgid "Reset branch '%s'\n" msgstr "é‡ç½®åˆ†æ”¯ '%s'\n" #: builtin/checkout.c:644 #, c-format msgid "Already on '%s'\n" msgstr "å·²ç»ä½äºŽ '%s'\n" #: builtin/checkout.c:648 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "切æ¢å¹¶é‡ç½®åˆ†æ”¯ '%s'\n" #: builtin/checkout.c:650 builtin/checkout.c:987 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "切æ¢åˆ°ä¸€ä¸ªæ–°åˆ†æ”¯ '%s'\n" #: builtin/checkout.c:652 #, c-format msgid "Switched to branch '%s'\n" msgstr "切æ¢åˆ°åˆ†æ”¯ '%s'\n" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: builtin/checkout.c:708 #, c-format msgid " ... and %d more.\n" msgstr " ... åŠå…¶å®ƒ %d 个。\n" #. The singular version #: builtin/checkout.c:714 #, 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:732 #, 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:762 msgid "internal error in revision walk" msgstr "在版本é历时é‡åˆ°å†…部错误" #: builtin/checkout.c:766 msgid "Previous HEAD position was" msgstr "之å‰çš„ HEAD ä½ç½®æ˜¯" #: builtin/checkout.c:793 builtin/checkout.c:982 msgid "You are on a branch yet to be born" msgstr "您ä½äºŽä¸€ä¸ªå°šæœªåˆå§‹åŒ–的分支" #. case (1) #: builtin/checkout.c:918 #, c-format msgid "invalid reference: %s" msgstr "æ— æ•ˆå¼•ç”¨ï¼š%s" #. case (1): want a tree #: builtin/checkout.c:957 #, c-format msgid "reference is not a tree: %s" msgstr "引用ä¸æ˜¯ä¸€ä¸ªæ ‘:%s" #: builtin/checkout.c:996 msgid "paths cannot be used with switching branches" msgstr "路径ä¸èƒ½å’Œåˆ‡æ¢åˆ†æ”¯åŒæ—¶ä½¿ç”¨" #: builtin/checkout.c:999 builtin/checkout.c:1003 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' ä¸èƒ½å’Œåˆ‡æ¢åˆ†æ”¯åŒæ—¶ä½¿ç”¨" #: builtin/checkout.c:1007 builtin/checkout.c:1010 builtin/checkout.c:1015 #: builtin/checkout.c:1018 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' ä¸èƒ½å’Œ '%s' åŒæ—¶ä½¿ç”¨" #: builtin/checkout.c:1023 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "ä¸èƒ½åˆ‡æ¢åˆ†æ”¯åˆ°ä¸€ä¸ªéžæ交 '%s'" #: builtin/checkout.c:1045 builtin/checkout.c:1047 builtin/clone.c:90 #: builtin/remote.c:169 builtin/remote.c:171 msgid "branch" msgstr "分支" #: builtin/checkout.c:1046 msgid "create and checkout a new branch" msgstr "创建并检出一个新的分支" #: builtin/checkout.c:1048 msgid "create/reset and checkout a branch" msgstr "创建/é‡ç½®å¹¶æ£€å‡ºä¸€ä¸ªåˆ†æ”¯" #: builtin/checkout.c:1049 msgid "create reflog for new branch" msgstr "为新的分支创建引用日志" #: builtin/checkout.c:1050 msgid "detach the HEAD at named commit" msgstr "æˆä¸ºæŒ‡å‘该æ交的分离头指针" #: builtin/checkout.c:1051 msgid "set upstream info for new branch" msgstr "为新的分支设置上游信æ¯" #: builtin/checkout.c:1053 msgid "new branch" msgstr "新分支" #: builtin/checkout.c:1053 msgid "new unparented branch" msgstr "新的没有父æ交的分支" #: builtin/checkout.c:1054 msgid "checkout our version for unmerged files" msgstr "对尚未åˆå¹¶çš„文件检出我们的版本" #: builtin/checkout.c:1056 msgid "checkout their version for unmerged files" msgstr "对尚未åˆå¹¶çš„文件检出他们的版本" #: builtin/checkout.c:1058 msgid "force checkout (throw away local modifications)" msgstr "强制检出(丢弃本地修改)" #: builtin/checkout.c:1059 msgid "perform a 3-way merge with the new branch" msgstr "和新的分支执行三路åˆå¹¶" #: builtin/checkout.c:1060 builtin/merge.c:217 msgid "update ignored files (default)" msgstr "更新忽略的文件(默认)" #: builtin/checkout.c:1061 builtin/log.c:1158 parse-options.h:245 msgid "style" msgstr "é£Žæ ¼" #: builtin/checkout.c:1062 msgid "conflict style (merge or diff3)" msgstr "冲çªè¾“å‡ºé£Žæ ¼ï¼ˆmerge 或 diff3)" #: builtin/checkout.c:1065 msgid "do not limit pathspecs to sparse entries only" msgstr "对路径ä¸åšç¨€ç–检出的é™åˆ¶" #: builtin/checkout.c:1067 msgid "second guess 'git checkout no-such-branch'" msgstr "å†è€…猜测'git checkout no-such-branch'" #: builtin/checkout.c:1091 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-bã€-B å’Œ --orphan 是互斥的" #: builtin/checkout.c:1108 msgid "--track needs a branch name" msgstr "--track 需è¦ä¸€ä¸ªåˆ†æ”¯å" #: builtin/checkout.c:1115 msgid "Missing branch name; try -b" msgstr "缺少分支åï¼›å°è¯• -b" #: builtin/checkout.c:1150 msgid "invalid path specification" msgstr "æ— æ•ˆçš„è·¯å¾„è§„æ ¼" #: builtin/checkout.c:1157 #, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" "Did you intend to checkout '%s' which can not be resolved as commit?" msgstr "" "ä¸èƒ½åŒæ—¶æ›´æ–°è·¯å¾„并切æ¢åˆ°åˆ†æ”¯'%s'。\n" "您是想è¦æ£€å‡º '%s' 但其未能解æžä¸ºæ交么?" #: builtin/checkout.c:1162 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout:--detach ä¸èƒ½æŽ¥æ”¶è·¯å¾„å‚æ•° '%s'" #: builtin/checkout.c:1166 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." msgstr "" "git checkout:在从索引检出时,--ours/--theirsã€--force å’Œ --merge ä¸å…¼å®¹ã€‚" #: builtin/clean.c:20 msgid "git clean [-d] [-f] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." msgstr "git clean [-d] [-f] [-n] [-q] [-e <模å¼>] [-x | -X] [--] <路径>..." #: builtin/clean.c:24 #, c-format msgid "Removing %s\n" msgstr "æ£åˆ 除 %s\n" #: builtin/clean.c:25 #, c-format msgid "Would remove %s\n" msgstr "å°†åˆ é™¤ %s\n" #: builtin/clean.c:26 #, c-format msgid "Skipping repository %s\n" msgstr "忽略版本库 %s\n" #: builtin/clean.c:27 #, c-format msgid "Would skip repository %s\n" msgstr "将忽略版本库 %s\n" #: builtin/clean.c:28 #, c-format msgid "failed to remove %s" msgstr "æ— æ³•åˆ é™¤ %s" #: builtin/clean.c:160 msgid "do not print names of files removed" msgstr "ä¸æ‰“å°åˆ 除文件的å称" #: builtin/clean.c:162 msgid "force" msgstr "强制" #: builtin/clean.c:164 msgid "remove whole directories" msgstr "åˆ é™¤æ•´ä¸ªç›®å½•" #: builtin/clean.c:165 builtin/describe.c:412 builtin/grep.c:717 #: builtin/ls-files.c:487 builtin/name-rev.c:231 builtin/show-ref.c:182 msgid "pattern" msgstr "模å¼" #: builtin/clean.c:166 msgid "add <pattern> to ignore rules" msgstr "æ·»åŠ <模å¼>到忽略规则" #: builtin/clean.c:167 msgid "remove ignored files, too" msgstr "ä¹Ÿåˆ é™¤å¿½ç•¥çš„æ–‡ä»¶" #: builtin/clean.c:169 msgid "remove only ignored files" msgstr "åªåˆ 除忽略的文件" #: builtin/clean.c:187 msgid "-x and -X cannot be used together" msgstr "-x å’Œ -X ä¸èƒ½åŒæ—¶ä½¿ç”¨" #: builtin/clean.c:191 msgid "" "clean.requireForce set to true and neither -n nor -f given; refusing to clean" msgstr "" "clean.requireForce 设置为 true 且未æä¾› -n 或 -f 选项,拒ç»æ‰§è¡Œæ¸…ç†åŠ¨ä½œ" #: builtin/clean.c:194 msgid "" "clean.requireForce defaults to true and neither -n nor -f given; refusing to " "clean" msgstr "" "clean.requireForce 默认为 true 且未æä¾› -n 或 -f 选项,拒ç»æ‰§è¡Œæ¸…ç†åŠ¨ä½œ" #: builtin/clone.c:37 msgid "git clone [options] [--] <repo> [<dir>]" msgstr "git clone [选项] [--] <版本库> [<路径>]" #: builtin/clone.c:65 builtin/fetch.c:82 builtin/merge.c:214 #: builtin/push.c:436 msgid "force progress reporting" msgstr "强制显示进度报告" #: builtin/clone.c:67 msgid "don't create a checkout" msgstr "ä¸åˆ›å»ºä¸€ä¸ªæ£€å‡º" #: builtin/clone.c:68 builtin/clone.c:70 builtin/init-db.c:488 msgid "create a bare repository" msgstr "创建一个裸版本库" #: builtin/clone.c:73 msgid "create a mirror repository (implies bare)" msgstr "创建一个镜åƒç‰ˆæœ¬åº“(也是裸版本库)" #: builtin/clone.c:75 msgid "to clone from a local repository" msgstr "从本地版本库克隆" #: builtin/clone.c:77 msgid "don't use local hardlinks, always copy" msgstr "ä¸ä½¿ç”¨æœ¬åœ°ç¡¬é“¾æŽ¥ï¼Œå§‹ç»ˆå¤åˆ¶" #: builtin/clone.c:79 msgid "setup as shared repository" msgstr "设置为共享版本库" #: builtin/clone.c:81 builtin/clone.c:83 msgid "initialize submodules in the clone" msgstr "在克隆时åˆå§‹åŒ–å模组" #: builtin/clone.c:84 builtin/init-db.c:485 msgid "template-directory" msgstr "模æ¿ç›®å½•" #: builtin/clone.c:85 builtin/init-db.c:486 msgid "directory from which templates will be used" msgstr "模æ¿ç›®å½•å°†è¢«ä½¿ç”¨" #: builtin/clone.c:87 msgid "reference repository" msgstr "引用版本库" #: builtin/clone.c:88 builtin/column.c:26 builtin/merge-file.c:44 msgid "name" msgstr "å称" #: builtin/clone.c:89 msgid "use <name> instead of 'origin' to track upstream" msgstr "使用<å称>而ä¸æ˜¯ 'origin' 去跟踪上游" #: builtin/clone.c:91 msgid "checkout <branch> instead of the remote's HEAD" msgstr "检出<分支>而ä¸æ˜¯è¿œç¨‹HEAD" #: builtin/clone.c:93 msgid "path to git-upload-pack on the remote" msgstr "远程 git-upload-pack 路径" #: builtin/clone.c:94 builtin/fetch.c:83 builtin/grep.c:662 msgid "depth" msgstr "深度" #: builtin/clone.c:95 msgid "create a shallow clone of that depth" msgstr "创建一个指定深度的浅克隆" #: builtin/clone.c:97 msgid "clone only one branch, HEAD or --branch" msgstr "åªå…‹éš†ä¸€ä¸ªåˆ†æ”¯ã€HEAD 或 --branch" #: builtin/clone.c:98 builtin/init-db.c:494 msgid "gitdir" msgstr "git目录" #: builtin/clone.c:99 builtin/init-db.c:495 msgid "separate git dir from working tree" msgstr "git目录和工作区分离" #: builtin/clone.c:100 msgid "key=value" msgstr "key=value" #: builtin/clone.c:101 msgid "set config inside the new repository" msgstr "在新版本库ä¸è®¾ç½®é…置信æ¯" #: builtin/clone.c:254 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "引用版本库 '%s' ä¸æ˜¯ä¸€ä¸ªæœ¬åœ°ç‰ˆæœ¬åº“。" #: builtin/clone.c:317 #, c-format msgid "failed to create directory '%s'" msgstr "æ— æ³•åˆ›å»ºç›®å½• '%s'" #: builtin/clone.c:319 builtin/diff.c:77 #, c-format msgid "failed to stat '%s'" msgstr "æ— æ³•æžšä¸¾ '%s' 状æ€" #: builtin/clone.c:321 #, c-format msgid "%s exists and is not a directory" msgstr "%s å˜åœ¨ä¸”ä¸æ˜¯ä¸€ä¸ªç›®å½•" #: builtin/clone.c:335 #, c-format msgid "failed to stat %s\n" msgstr "æ— æ³•æžšä¸¾ %s 状æ€\n" #: builtin/clone.c:357 #, c-format msgid "failed to create link '%s'" msgstr "æ— æ³•åˆ›å»ºé“¾æŽ¥ '%s'" #: builtin/clone.c:361 #, c-format msgid "failed to copy file to '%s'" msgstr "æ— æ³•æ‹·è´æ–‡ä»¶è‡³ '%s'" #: builtin/clone.c:384 #, c-format msgid "done.\n" msgstr "完æˆã€‚\n" #: builtin/clone.c:397 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" "and retry the checkout with 'git checkout -f HEAD'\n" msgstr "" "克隆æˆåŠŸï¼Œä½†æ˜¯æ£€å‡ºå¤±è´¥ã€‚\n" "您å¯ä»¥é€šè¿‡ 'git status' 检查哪些已被检出,然åŽä½¿ç”¨å‘½ä»¤\n" "'git checkout -f HEAD' é‡è¯•\n" #: builtin/clone.c:476 #, c-format msgid "Could not find remote branch %s to clone." msgstr "ä¸èƒ½å‘现è¦å…‹éš†çš„远程分支 %s。" #: builtin/clone.c:550 msgid "remote did not send all necessary objects" msgstr "远程没有å‘é€æ‰€æœ‰å¿…须的对象" #: builtin/clone.c:610 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "远程 HEAD 指å‘一个ä¸å˜åœ¨çš„å¼•ç”¨ï¼Œæ— æ³•æ£€å‡ºã€‚\n" #: builtin/clone.c:641 msgid "unable to checkout working tree" msgstr "ä¸èƒ½æ£€å‡ºå·¥ä½œåŒº" #: builtin/clone.c:749 msgid "Too many arguments." msgstr "太多å‚数。" #: builtin/clone.c:753 msgid "You must specify a repository to clone." msgstr "您必须指定一个版本库æ¥å…‹éš†ã€‚" #: builtin/clone.c:764 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "--bare å’Œ --origin %s 选项ä¸å…¼å®¹ã€‚" #: builtin/clone.c:767 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare å’Œ --separate-git-dir 选项ä¸å…¼å®¹ã€‚" #: builtin/clone.c:780 #, c-format msgid "repository '%s' does not exist" msgstr "版本库 '%s' ä¸å˜åœ¨" #: builtin/clone.c:785 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth 在本地克隆被忽略,改为 file:// å议试试。" #: builtin/clone.c:795 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "ç›®æ ‡è·¯å¾„ '%s' å·²ç»å˜åœ¨ï¼Œå¹¶ä¸”ä¸æ˜¯ä¸€ä¸ªç©ºç›®å½•ã€‚" #: builtin/clone.c:805 #, c-format msgid "working tree '%s' already exists." msgstr "工作区 '%s' å·²ç»å˜åœ¨ã€‚" #: builtin/clone.c:818 builtin/clone.c:830 #, c-format msgid "could not create leading directories of '%s'" msgstr "ä¸èƒ½ä¸º '%s' 创建先导目录" #: builtin/clone.c:821 #, c-format msgid "could not create work tree dir '%s'." msgstr "ä¸èƒ½ä¸º '%s' 创建工作区目录。" #: builtin/clone.c:840 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "克隆到裸版本库 '%s'...\n" #: builtin/clone.c:842 #, c-format msgid "Cloning into '%s'...\n" msgstr "æ£å…‹éš†åˆ° '%s'...\n" #: builtin/clone.c:877 #, c-format msgid "Don't know how to clone %s" msgstr "ä¸çŸ¥é“如何克隆 %s" #: builtin/clone.c:926 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "远程分支 %s 在上游 %s 未å‘现" #: builtin/clone.c:933 msgid "You appear to have cloned an empty repository." msgstr "您似乎克隆了一个空版本库。" #: builtin/column.c:9 msgid "git column [options]" msgstr "git column [选项]" #: builtin/column.c:26 msgid "lookup config vars" msgstr "查找é…ç½®å˜é‡" #: builtin/column.c:27 builtin/column.c:28 msgid "layout to use" msgstr "è¦ä½¿ç”¨çš„布局" #: builtin/column.c:29 msgid "Maximum width" msgstr "最大宽度" #: builtin/column.c:30 msgid "Padding space on left border" msgstr "左边框的填充空间" #: builtin/column.c:31 msgid "Padding space on right border" msgstr "å³è¾¹æ¡†çš„填充空间" #: builtin/column.c:32 msgid "Padding space between columns" msgstr "两列之间的填充空间" #: builtin/column.c:51 msgid "--command must be the first argument" msgstr "--command 必须是第一个å‚æ•°" #: builtin/commit.c:34 msgid "git commit [options] [--] <pathspec>..." msgstr "git commit [选项] [--] <路径匹é…>..." #: builtin/commit.c:39 msgid "git status [options] [--] <pathspec>..." msgstr "git status [选项] [--] <路径匹é…>..." #: builtin/commit.c:44 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" "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:56 msgid "" "You asked to amend the most recent commit, but doing so would make\n" "it empty. You can repeat your command with --allow-empty, or you can\n" "remove the commit entirely with \"git reset HEAD^\".\n" msgstr "" "您è¦ä¿®è¡¥æœ€è¿‘çš„æ交,但这么åšä¼šè®©å®ƒæˆä¸ºç©ºæ交。您å¯ä»¥é‡å¤æ‚¨çš„命令并带上\n" "--allow-empty 选项,或者您å¯ç”¨å‘½ä»¤ \"git reset HEAD^\" æ•´ä¸ªåˆ é™¤è¯¥æ交。\n" #: builtin/commit.c:61 msgid "" "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" "If you wish to commit it anyway, use:\n" "\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:260 msgid "failed to unpack HEAD tree object" msgstr "æ— æ³•è§£åŒ… HEAD æ ‘å¯¹è±¡" #: builtin/commit.c:302 msgid "unable to create temporary index" msgstr "ä¸èƒ½åˆ›å»ºä¸´æ—¶ç´¢å¼•" #: builtin/commit.c:308 msgid "interactive add failed" msgstr "交互å¼æ·»åŠ 失败" #: builtin/commit.c:341 builtin/commit.c:362 builtin/commit.c:412 msgid "unable to write new_index file" msgstr "æ— æ³•å†™ new_index 文件" #: builtin/commit.c:393 msgid "cannot do a partial commit during a merge." msgstr "在åˆå¹¶è¿‡ç¨‹ä¸ä¸èƒ½åšéƒ¨åˆ†æ交。" #: builtin/commit.c:395 msgid "cannot do a partial commit during a cherry-pick." msgstr "在拣选过程ä¸ä¸èƒ½åšéƒ¨åˆ†æ交。" #: builtin/commit.c:405 msgid "cannot read the index" msgstr "æ— æ³•è¯»å–索引" #: builtin/commit.c:425 msgid "unable to write temporary index file" msgstr "æ— æ³•å†™ä¸´æ—¶ç´¢å¼•æ–‡ä»¶" #: builtin/commit.c:513 builtin/commit.c:519 #, c-format msgid "invalid commit: %s" msgstr "æ— æ•ˆçš„æ交:%s" #: builtin/commit.c:542 msgid "malformed --author parameter" msgstr "éžæ³•çš„ --author å‚æ•°" #: builtin/commit.c:562 #, c-format msgid "Malformed ident string: '%s'" msgstr "éžæ³•çš„身份å—符串:'%s'" #: builtin/commit.c:600 builtin/commit.c:633 builtin/commit.c:956 #, c-format msgid "could not lookup commit %s" msgstr "ä¸èƒ½æŸ¥è¯¢æ交 %s" #: builtin/commit.c:612 builtin/shortlog.c:270 #, c-format msgid "(reading log message from standard input)\n" msgstr "(æ£ä»Žæ ‡å‡†è¾“å…¥ä¸è¯»å–日志信æ¯ï¼‰\n" #: builtin/commit.c:614 msgid "could not read log from standard input" msgstr "ä¸èƒ½ä»Žæ ‡å‡†è¾“å…¥ä¸è¯»å–日志信æ¯" #: builtin/commit.c:618 #, c-format msgid "could not read log file '%s'" msgstr "ä¸èƒ½è¯»å–日志文件 '%s'" #: builtin/commit.c:624 msgid "commit has empty message" msgstr "æ交说明为空" #: builtin/commit.c:640 msgid "could not read MERGE_MSG" msgstr "ä¸èƒ½è¯»å– MERGE_MSG" #: builtin/commit.c:644 msgid "could not read SQUASH_MSG" msgstr "ä¸èƒ½è¯»å– SQUASH_MSG" #: builtin/commit.c:648 #, c-format msgid "could not read '%s'" msgstr "ä¸èƒ½è¯»å– '%s'" #: builtin/commit.c:709 msgid "could not write commit template" msgstr "ä¸èƒ½å†™æ交模版" #: builtin/commit.c:720 #, 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:725 #, 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:737 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '%c' will be ignored, and an empty message aborts the commit.\n" msgstr "" "请为您的å˜æ›´è¾“å…¥æ交说明。以 '%c' 开始的行将被忽略,而一个空的æ交\n" "说明将会终æ¢æ交。\n" #: builtin/commit.c:742 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '%c' will be kept; you may remove them yourself if you want to.\n" "An empty message aborts the commit.\n" msgstr "" "请为您的å˜æ›´è¾“å…¥æ交说明。以 '%c' 开始的行将被ä¿ç•™ï¼Œå¦‚果您原æ„\n" "也å¯ä»¥åˆ 除它们。一个空的æ交说明将会终æ¢æ交。\n" # 译者:为ä¿è¯åœ¨è¾“出ä¸å¯¹é½ï¼Œæ³¨æ„调整å¥ä¸ç©ºæ ¼ï¼ #: builtin/commit.c:755 #, c-format msgid "%sAuthor: %s" msgstr "%s作者: %s" # 译者:为ä¿è¯åœ¨è¾“出ä¸å¯¹é½ï¼Œæ³¨æ„调整å¥ä¸ç©ºæ ¼ï¼ #: builtin/commit.c:762 #, c-format msgid "%sCommitter: %s" msgstr "%sæ交者: %s" #: builtin/commit.c:782 msgid "Cannot read index" msgstr "æ— æ³•è¯»å–索引" #: builtin/commit.c:819 msgid "Error building trees" msgstr "æ— æ³•åˆ›å»ºæ ‘å¯¹è±¡" #: builtin/commit.c:834 builtin/tag.c:359 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "请使用 -m 或 -F 选项æä¾›æ交说明。\n" #: builtin/commit.c:931 #, c-format msgid "No existing author found with '%s'" msgstr "æ²¡æœ‰æ‰¾åˆ°åŒ¹é… '%s' 的作者" #: builtin/commit.c:946 builtin/commit.c:1140 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "æ— æ•ˆçš„æœªè¿½è¸ªæ–‡ä»¶å‚æ•° '%s'" #: builtin/commit.c:976 msgid "Using both --reset-author and --author does not make sense" msgstr "åŒæ—¶ä½¿ç”¨ --reset-author å’Œ --author 没有æ„义" #: builtin/commit.c:987 msgid "You have nothing to amend." msgstr "您没有å¯ä¿®è¡¥çš„æ交。" #: builtin/commit.c:990 msgid "You are in the middle of a merge -- cannot amend." msgstr "您æ£å¤„于一个åˆå¹¶è¿‡ç¨‹ä¸ -- æ— æ³•ä¿®è¡¥æ交。" #: builtin/commit.c:992 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "您æ£å¤„äºŽä¸€ä¸ªæ‹£é€‰è¿‡ç¨‹ä¸ -- æ— æ³•ä¿®è¡¥æ交。" #: builtin/commit.c:995 msgid "Options --squash and --fixup cannot be used together" msgstr "选项 --squash å’Œ --fixup ä¸èƒ½åŒæ—¶ä½¿ç”¨" #: builtin/commit.c:1005 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "åªèƒ½ç”¨ä¸€ä¸ª -c/-C/-F/--fixup 选项。" #: builtin/commit.c:1007 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "选项 -m ä¸èƒ½å’Œ -c/-C/-F/--fixup åŒæ—¶ä½¿ç”¨ã€‚" #: builtin/commit.c:1015 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author åªèƒ½å’Œ -Cã€-c 或 --amend åŒæ—¶ä½¿ç”¨ã€‚" #: builtin/commit.c:1032 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "åªèƒ½ç”¨ä¸€ä¸ª --include/--only/--all/--interactive/--patch 选项。" #: builtin/commit.c:1034 msgid "No paths with --include/--only does not make sense." msgstr "å‚æ•° --include/--only ä¸è·Ÿè·¯å¾„没有æ„义。" #: builtin/commit.c:1036 msgid "Clever... amending the last one with dirty index." msgstr "èªæ˜Ž... 在索引ä¸å¹²å‡€ä¸‹ä¿®è¡¥æœ€åŽçš„æ交。" #: builtin/commit.c:1038 msgid "Explicit paths specified without -i nor -o; assuming --only paths..." msgstr "指定了明确的路径而没有使用 -i 或 -o 选项;认为是 --only paths..." #: builtin/commit.c:1048 builtin/tag.c:575 #, c-format msgid "Invalid cleanup mode %s" msgstr "æ— æ•ˆçš„æ¸…ç†æ¨¡å¼ %s" #: builtin/commit.c:1053 msgid "Paths with -a does not make sense." msgstr "路径和 -a 选项åŒæ—¶ä½¿ç”¨æ²¡æœ‰æ„义。" #: builtin/commit.c:1059 builtin/commit.c:1194 msgid "--long and -z are incompatible" msgstr "--long å’Œ -z 选项ä¸å…¼å®¹" #: builtin/commit.c:1154 builtin/commit.c:1390 msgid "show status concisely" msgstr "以简æ´çš„æ ¼å¼æ˜¾ç¤ºçŠ¶æ€" #: builtin/commit.c:1156 builtin/commit.c:1392 msgid "show branch information" msgstr "显示分支信æ¯" #: builtin/commit.c:1158 builtin/commit.c:1394 builtin/push.c:426 msgid "machine-readable output" msgstr "机器å¯è¯»çš„输出" #: builtin/commit.c:1161 builtin/commit.c:1396 msgid "show status in long format (default)" msgstr "ä»¥é•¿æ ¼å¼æ˜¾ç¤ºçŠ¶æ€ï¼ˆé»˜è®¤ï¼‰" #: builtin/commit.c:1164 builtin/commit.c:1399 msgid "terminate entries with NUL" msgstr "æ¡ç›®ä»¥NULå—符结尾" #: builtin/commit.c:1166 builtin/commit.c:1402 builtin/fast-export.c:659 #: builtin/fast-export.c:662 builtin/tag.c:459 msgid "mode" msgstr "模å¼" #: builtin/commit.c:1167 builtin/commit.c:1402 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "显示未跟踪的文件,“模å¼â€çš„å¯é€‰å‚数:allã€normalã€no。(默认:all)" #: builtin/commit.c:1170 msgid "show ignored files" msgstr "显示忽略的文件" #: builtin/commit.c:1171 parse-options.h:151 msgid "when" msgstr "何时" #: builtin/commit.c:1172 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" "忽略å模组的更改,“何时â€çš„å¯é€‰å‚数:allã€dirtyã€untracked。(默认:all)" #: builtin/commit.c:1174 msgid "list untracked files in columns" msgstr "以列的方å¼æ˜¾ç¤ºæœªè·Ÿè¸ªçš„文件" #: builtin/commit.c:1248 msgid "couldn't look up newly created commit" msgstr "æ— æ³•æ‰¾åˆ°æ–°åˆ›å»ºçš„æ交" #: builtin/commit.c:1250 msgid "could not parse newly created commit" msgstr "ä¸èƒ½è§£æžæ–°åˆ›å»ºçš„æ交" #: builtin/commit.c:1291 msgid "detached HEAD" msgstr "分离头指针" # 译者:ä¸æ–‡å—符串拼接,å¯åˆ 除å‰å¯¼ç©ºæ ¼ #: builtin/commit.c:1293 msgid " (root-commit)" msgstr "ï¼ˆæ ¹æ交)" #: builtin/commit.c:1360 msgid "suppress summary after successful commit" msgstr "æ交æˆåŠŸåŽä¸æ˜¾ç¤ºæ¦‚è¿°ä¿¡æ¯" #: builtin/commit.c:1361 msgid "show diff in commit message template" msgstr "在æ交说明模æ¿é‡Œæ˜¾ç¤ºå·®å¼‚" #: builtin/commit.c:1363 msgid "Commit message options" msgstr "æ交说明选项" #: builtin/commit.c:1364 builtin/tag.c:457 msgid "read message from file" msgstr "从文件ä¸è¯»å–æ交说明" #: builtin/commit.c:1365 msgid "author" msgstr "作者" #: builtin/commit.c:1365 msgid "override author for commit" msgstr "æ交时覆盖作者" #: builtin/commit.c:1366 builtin/gc.c:178 msgid "date" msgstr "日期" #: builtin/commit.c:1366 msgid "override date for commit" msgstr "æ交时覆盖日期" #: builtin/commit.c:1367 builtin/merge.c:208 builtin/notes.c:533 #: builtin/notes.c:690 builtin/tag.c:455 msgid "message" msgstr "说明" #: builtin/commit.c:1367 msgid "commit message" msgstr "æ交说明" #: builtin/commit.c:1368 msgid "reuse and edit message from specified commit" msgstr "é‡ç”¨å¹¶ç¼–辑指定æ交的æ交说明" #: builtin/commit.c:1369 msgid "reuse message from specified commit" msgstr "é‡ç”¨æŒ‡å®šæ交的æ交说明" #: builtin/commit.c:1370 msgid "use autosquash formatted message to fixup specified commit" msgstr "使用 autosquash æ ¼å¼çš„æ交说明用以修æ£æŒ‡å®šçš„æ交" #: builtin/commit.c:1371 msgid "use autosquash formatted message to squash specified commit" msgstr "使用 autosquash æ ¼å¼çš„æ交说明用以压缩至指定的æ交" #: builtin/commit.c:1372 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "现在将该æ交的作者改为我(和 -C/-c/--amend å‚数共用)" #: builtin/commit.c:1373 builtin/log.c:1113 builtin/revert.c:109 msgid "add Signed-off-by:" msgstr "æ·»åŠ Signed-off-by: ç¾å" #: builtin/commit.c:1374 msgid "use specified template file" msgstr "使用指定的模æ¿æ–‡ä»¶" #: builtin/commit.c:1375 msgid "force edit of commit" msgstr "强制编辑æ交" # 译者:å¯é€‰å€¼ï¼Œä¸èƒ½ç¿»è¯‘(或是原文ä¸ç¬”误,应为 mode) #: builtin/commit.c:1376 msgid "default" msgstr "default" #: builtin/commit.c:1376 builtin/tag.c:460 msgid "how to strip spaces and #comments from message" msgstr "è®¾ç½®å¦‚ä½•åˆ é™¤æäº¤è¯´æ˜Žé‡Œçš„ç©ºæ ¼å’Œ#注释" #: builtin/commit.c:1377 msgid "include status in commit message template" msgstr "在æ交说明模æ¿é‡ŒåŒ…å«çŠ¶æ€ä¿¡æ¯" #: builtin/commit.c:1378 builtin/merge.c:215 builtin/tag.c:461 msgid "key id" msgstr "key id" #: builtin/commit.c:1379 builtin/merge.c:216 msgid "GPG sign commit" msgstr "GPG æ交ç¾å" #. end commit message options #: builtin/commit.c:1382 msgid "Commit contents options" msgstr "æ交内容选项" #: builtin/commit.c:1383 msgid "commit all changed files" msgstr "æ交所有改动的文件" #: builtin/commit.c:1384 msgid "add specified files to index for commit" msgstr "æ·»åŠ æŒ‡å®šçš„æ–‡ä»¶åˆ°ç´¢å¼•åŒºç‰å¾…æ交" #: builtin/commit.c:1385 msgid "interactively add files" msgstr "交互å¼æ·»åŠ 文件" #: builtin/commit.c:1386 msgid "interactively add changes" msgstr "交互å¼æ·»åŠ å˜æ›´" #: builtin/commit.c:1387 msgid "commit only specified files" msgstr "åªæ交指定的文件" #: builtin/commit.c:1388 msgid "bypass pre-commit hook" msgstr "绕过 pre-commit é’©å" #: builtin/commit.c:1389 msgid "show what would be committed" msgstr "显示将è¦æ交的内容" #: builtin/commit.c:1400 msgid "amend previous commit" msgstr "修改先å‰çš„æ交" #: builtin/commit.c:1401 msgid "bypass post-rewrite hook" msgstr "绕过 post-rewrite é’©å" #: builtin/commit.c:1406 msgid "ok to record an empty change" msgstr "å…许一个空æ交" #: builtin/commit.c:1409 msgid "ok to record a change with an empty message" msgstr "å…许空的æ交说明" #: builtin/commit.c:1441 msgid "could not parse HEAD commit" msgstr "ä¸èƒ½è§£æž HEAD æ交" #: builtin/commit.c:1479 builtin/merge.c:510 #, c-format msgid "could not open '%s' for reading" msgstr "ä¸èƒ½ä¸ºè¯»å…¥æ‰“å¼€ '%s'" #: builtin/commit.c:1486 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "æŸåçš„ MERGE_HEAD 文件(%s)" #: builtin/commit.c:1493 msgid "could not read MERGE_MODE" msgstr "ä¸èƒ½è¯»å– MERGE_MODE" #: builtin/commit.c:1512 #, c-format msgid "could not read commit message: %s" msgstr "ä¸èƒ½è¯»å–æ交说明:%s" #: builtin/commit.c:1526 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "终æ¢æ交;您未更改æ¥è‡ªæ¨¡ç‰ˆçš„æ交说明。\n" #: builtin/commit.c:1531 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "终æ¢æäº¤å› ä¸ºæ交说明为空。\n" #: builtin/commit.c:1546 builtin/merge.c:847 builtin/merge.c:872 msgid "failed to write commit object" msgstr "æ— æ³•å†™æ交对象" #: builtin/commit.c:1567 msgid "cannot lock HEAD ref" msgstr "æ— æ³•é”定 HEAD 引用" #: builtin/commit.c:1571 msgid "cannot update HEAD ref" msgstr "æ— æ³•æ›´æ–° HEAD 引用" #: builtin/commit.c:1582 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/config.c:7 msgid "git config [options]" msgstr "git config [选项]" #: builtin/config.c:51 msgid "Config file location" msgstr "é…置文件ä½ç½®" #: builtin/config.c:52 msgid "use global config file" msgstr "使用全局é…置文件" #: builtin/config.c:53 msgid "use system config file" msgstr "使用系统级é…置文件" #: builtin/config.c:54 msgid "use repository config file" msgstr "使用版本库级é…置文件" #: builtin/config.c:55 msgid "use given config file" msgstr "使用指定的é…置文件" #: builtin/config.c:56 msgid "Action" msgstr "æ“作" #: builtin/config.c:57 msgid "get value: name [value-regex]" msgstr "获å–值:name [value-regex]" #: builtin/config.c:58 msgid "get all values: key [value-regex]" msgstr "获得所有的值:key [value-regex]" #: builtin/config.c:59 msgid "get values for regexp: name-regex [value-regex]" msgstr "æ ¹æ®æ£åˆ™è¡¨è¾¾å¼èŽ·å¾—值:name-regex [value-regex]" #: builtin/config.c:60 msgid "replace all matching variables: name value [value_regex]" msgstr "替æ¢æ‰€æœ‰åŒ¹é…çš„å˜é‡ï¼šname value [value_regex]" #: builtin/config.c:61 msgid "add a new variable: name value" msgstr "æ·»åŠ ä¸€ä¸ªæ–°çš„å˜é‡ï¼šname value" #: builtin/config.c:62 msgid "remove a variable: name [value-regex]" msgstr "åˆ é™¤ä¸€ä¸ªå˜é‡ï¼šname [value-regex]" #: builtin/config.c:63 msgid "remove all matches: name [value-regex]" msgstr "åˆ é™¤æ‰€æœ‰åŒ¹é…项:name [value-regex]" #: builtin/config.c:64 msgid "rename section: old-name new-name" msgstr "é‡å‘½åå°èŠ‚:old-name new-name" #: builtin/config.c:65 msgid "remove a section: name" msgstr "åˆ é™¤ä¸€ä¸ªå°èŠ‚:name" #: builtin/config.c:66 msgid "list all" msgstr "列出所有" #: builtin/config.c:67 msgid "open an editor" msgstr "打开一个编辑器" #: builtin/config.c:68 builtin/config.c:69 msgid "slot" msgstr "slot" #: builtin/config.c:68 msgid "find the color configured: [default]" msgstr "找到é…置的颜色:[默认]" #: builtin/config.c:69 msgid "find the color setting: [stdout-is-tty]" msgstr "找到颜色设置:[stdout-is-tty]" #: builtin/config.c:70 msgid "Type" msgstr "类型" #: builtin/config.c:71 msgid "value is \"true\" or \"false\"" msgstr "值是 \"true\" 或 \"false\"" #: builtin/config.c:72 msgid "value is decimal number" msgstr "值是å进制数" #: builtin/config.c:73 msgid "value is --bool or --int" msgstr "值是 --bool or --int" #: builtin/config.c:74 msgid "value is a path (file or directory name)" msgstr "值是一个路径(文件或目录å)" #: builtin/config.c:75 msgid "Other" msgstr "其它" #: builtin/config.c:76 msgid "terminate values with NUL byte" msgstr "终æ¢å€¼æ˜¯NULå—节" #: builtin/config.c:77 msgid "respect include directives on lookup" msgstr "查询时å‚ç…§ include 指令递归查找" #: builtin/count-objects.c:82 msgid "git count-objects [-v] [-H | --human-readable]" msgstr "git count-objects [-v] [-H | --human-readable]" #: builtin/count-objects.c:97 msgid "print sizes in human readable format" msgstr "以用户å¯è¯»çš„æ ¼å¼æ˜¾ç¤ºå¤§å°" #: builtin/describe.c:15 msgid "git describe [options] <committish>*" msgstr "git describe [选项] <æ交å·>*" #: builtin/describe.c:16 msgid "git describe [options] --dirty" msgstr "git describe [选项] --dirty" #: builtin/describe.c:233 #, c-format msgid "annotated tag %s not available" msgstr "注释 tag %s æ— æ•ˆ" #: builtin/describe.c:237 #, c-format msgid "annotated tag %s has no embedded name" msgstr "注释 tag %s 没有嵌入å称" #: builtin/describe.c:239 #, c-format msgid "tag '%s' is really '%s' here" msgstr "tag '%s' 的确是在 '%s'" #: builtin/describe.c:266 #, c-format msgid "Not a valid object name %s" msgstr "ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„对象å %s" #: builtin/describe.c:269 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„ '%s' 对象" #: builtin/describe.c:286 #, c-format msgid "no tag exactly matches '%s'" msgstr "没有 tag å‡†ç¡®åŒ¹é… '%s'" #: builtin/describe.c:288 #, c-format msgid "searching to describe %s\n" msgstr "æœç´¢æè¿° %s\n" #: builtin/describe.c:328 #, c-format msgid "finished search at %s\n" msgstr "完æˆæœç´¢ %s\n" #: builtin/describe.c:352 #, 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:356 #, c-format msgid "" "No tags can describe '%s'.\n" "Try --always, or create some tags." msgstr "" "没有注释 tag 能æè¿° '%s'。\n" "å°è¯• --always,或者创建一些 tag。" #: builtin/describe.c:377 #, c-format msgid "traversed %lu commits\n" msgstr "å·²é历 %lu 个æ交\n" #: builtin/describe.c:380 #, 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:402 msgid "find the tag that comes after the commit" msgstr "寻找æ交之åŽçš„ tag(用于æè¿°æ交)" #: builtin/describe.c:403 msgid "debug search strategy on stderr" msgstr "åœ¨æ ‡å‡†é”™è¯¯ä¸Šè°ƒè¯•æœç´¢ç–ç•¥" #: builtin/describe.c:404 msgid "use any ref" msgstr "使用任æ„引用" #: builtin/describe.c:405 msgid "use any tag, even unannotated" msgstr "ä½¿ç”¨ä»»æ„ tag,å³ä½¿æœªå¸¦æ³¨è§£" #: builtin/describe.c:406 msgid "always use long format" msgstr "始终使用长æ交å·æ ¼å¼" #: builtin/describe.c:409 msgid "only output exact matches" msgstr "åªè¾“出精确匹é…" #: builtin/describe.c:411 msgid "consider <n> most recent tags (default: 10)" msgstr "考虑最近 <n> 个 tags(默认:10)" #: builtin/describe.c:413 msgid "only consider tags matching <pattern>" msgstr "åªè€ƒè™‘åŒ¹é… <模å¼> çš„ tags" #: builtin/describe.c:415 builtin/name-rev.c:238 msgid "show abbreviated commit object as fallback" msgstr "显示简写的æ交å·ä½œä¸ºåŽå¤‡" #: builtin/describe.c:416 msgid "mark" msgstr "æ ‡è®°" #: builtin/describe.c:417 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "若工作区è„(有å˜æ›´ï¼‰åœ¨ç»“å°¾æ·»åŠ <æ ‡è®°>(默认:\"-dirty\")" #: builtin/describe.c:435 msgid "--long is incompatible with --abbrev=0" msgstr "--long 与 --abbrev=0 ä¸å…¼å®¹" #: builtin/describe.c:461 msgid "No names found, cannot describe anything." msgstr "没有å‘现åç§°ï¼Œæ— æ³•æ述任何东西。" #: builtin/describe.c:481 msgid "--dirty is incompatible with committishes" msgstr "--dirty ä¸èƒ½ä¸Žæ交åŒæ—¶ä½¿ç”¨" #: builtin/diff.c:79 #, c-format msgid "'%s': not a regular file or symlink" msgstr "'%s':ä¸æ˜¯ä¸€ä¸ªæ£è§„文件或符å·é“¾æŽ¥" #: builtin/diff.c:228 #, c-format msgid "invalid option: %s" msgstr "æ— æ•ˆé€‰é¡¹ï¼š%s" #: builtin/diff.c:305 msgid "Not a git repository" msgstr "ä¸æ˜¯ä¸€ä¸ª git 版本库" #: builtin/diff.c:348 #, c-format msgid "invalid object '%s' given." msgstr "æä¾›äº†æ— æ•ˆå¯¹è±¡ '%s'。" #: builtin/diff.c:353 #, c-format msgid "more than %d trees given: '%s'" msgstr "æ供了超过 %d ä¸ªæ ‘å¯¹è±¡ï¼š'%s'" #: builtin/diff.c:363 #, c-format msgid "more than two blobs given: '%s'" msgstr "æ供了超过两个数æ®ï¼ˆblob)对象:'%s'" #: builtin/diff.c:371 #, c-format msgid "unhandled object '%s' given." msgstr "æä¾›äº†æ— æ³•å¤„ç†çš„对象 '%s'。" #: builtin/fast-export.c:22 msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [rev-list-opts]" #: builtin/fast-export.c:658 msgid "show progress after <n> objects" msgstr "在 <n> 个对象之åŽæ˜¾ç¤ºè¿›åº¦" #: builtin/fast-export.c:660 msgid "select handling of signed tags" msgstr "选择如何处ç†ç¾å tags" #: builtin/fast-export.c:663 msgid "select handling of tags that tag filtered objects" msgstr "选择当 tag 指å‘被过滤时 tags 的处ç†æ–¹å¼" #: builtin/fast-export.c:666 msgid "Dump marks to this file" msgstr "æŠŠæ ‡è®°å˜å‚¨åˆ°è¿™ä¸ªæ–‡ä»¶" #: builtin/fast-export.c:668 msgid "Import marks from this file" msgstr "ä»Žè¿™ä¸ªæ–‡ä»¶å¯¼å…¥æ ‡è®°" #: builtin/fast-export.c:670 msgid "Fake a tagger when tags lack one" msgstr "当 tags ç¼ºå°‘æ ‡è®°è€…å—段时,å‡è£…æ供一个" #: builtin/fast-export.c:672 msgid "Output full tree for each commit" msgstr "æ¯æ¬¡æäº¤éƒ½è¾“å‡ºæ•´ä¸ªæ ‘" #: builtin/fast-export.c:674 msgid "Use the done feature to terminate the stream" msgstr "使用 done 功能æ¥ç»ˆæ¢æµ" #: builtin/fast-export.c:675 msgid "Skip output of blob data" msgstr "跳过数æ®å¯¹è±¡çš„输出" #: builtin/fetch.c:20 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<选项>] [<版本库> [<引用表达å¼>...]]" #: builtin/fetch.c:21 msgid "git fetch [<options>] <group>" msgstr "git fetch [<选项>] <组>" #: builtin/fetch.c:22 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<选项>] [(<版本库> | <组>)...]" #: builtin/fetch.c:23 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<选项>]" #: builtin/fetch.c:60 msgid "fetch from all remotes" msgstr "从所有的远程抓å–" #: builtin/fetch.c:62 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "è¿½åŠ åˆ° .git/FETCH_HEAD 而ä¸æ˜¯è¦†ç›–它" #: builtin/fetch.c:64 msgid "path to upload pack on remote end" msgstr "ä¸Šä¼ åŒ…åˆ°è¿œç¨‹çš„è·¯å¾„" #: builtin/fetch.c:65 msgid "force overwrite of local branch" msgstr "强制覆盖本地分支" #: builtin/fetch.c:67 msgid "fetch from multiple remotes" msgstr "从多个远程抓å–" #: builtin/fetch.c:69 msgid "fetch all tags and associated objects" msgstr "抓å–所有的 tags 和关è”对象" #: builtin/fetch.c:71 msgid "do not fetch all tags (--no-tags)" msgstr "ä¸æŠ“å–任何 tags (--no-tags)" #: builtin/fetch.c:73 msgid "prune remote-tracking branches no longer on remote" msgstr "清除远程已ç»ä¸å˜åœ¨çš„分支的跟踪分支" # 译者:å¯é€‰å€¼ï¼Œä¸èƒ½ç¿»è¯‘ #: builtin/fetch.c:74 msgid "on-demand" msgstr "on-demand" #: builtin/fetch.c:75 msgid "control recursive fetching of submodules" msgstr "控制å模组的递归抓å–" #: builtin/fetch.c:79 msgid "keep downloaded pack" msgstr "ä¿æŒä¸‹è½½åŒ…" #: builtin/fetch.c:81 msgid "allow updating of HEAD ref" msgstr "å…许更新 HEAD 引用" #: builtin/fetch.c:84 msgid "deepen history of shallow clone" msgstr "深化浅克隆的历å²" #: builtin/fetch.c:86 msgid "convert to a complete repository" msgstr "转æ¢ä¸ºä¸€ä¸ªå®Œæ•´çš„版本库" #: builtin/fetch.c:88 builtin/log.c:1130 msgid "dir" msgstr "目录" #: builtin/fetch.c:89 msgid "prepend this to submodule path output" msgstr "在å模组路径输出的å‰é¢åŠ 上æ¤ç›®å½•" #: builtin/fetch.c:92 msgid "default mode for recursion" msgstr "递归的默认模å¼" #: builtin/fetch.c:204 msgid "Couldn't find remote ref HEAD" msgstr "æ— æ³•å‘现远程 HEAD 引用" #: builtin/fetch.c:257 #, c-format msgid "object %s not found" msgstr "对象 %s 未å‘现" #: builtin/fetch.c:262 msgid "[up to date]" msgstr "[最新]" #: builtin/fetch.c:276 #, c-format msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgstr "! %-*s %-*s -> %s (在当å‰åˆ†æ”¯ä¸‹ä¸èƒ½èŽ·å–)" #: builtin/fetch.c:277 builtin/fetch.c:363 msgid "[rejected]" msgstr "[已拒ç»]" #: builtin/fetch.c:288 msgid "[tag update]" msgstr "[tagæ›´æ–°]" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: builtin/fetch.c:290 builtin/fetch.c:325 builtin/fetch.c:343 msgid " (unable to update local ref)" msgstr " (ä¸èƒ½æ›´æ–°æœ¬åœ°å¼•ç”¨ï¼‰" #: builtin/fetch.c:308 msgid "[new tag]" msgstr "[æ–°tag]" #: builtin/fetch.c:311 msgid "[new branch]" msgstr "[新分支]" #: builtin/fetch.c:314 msgid "[new ref]" msgstr "[新引用]" #: builtin/fetch.c:359 msgid "unable to update local ref" msgstr "ä¸èƒ½æ›´æ–°æœ¬åœ°å¼•ç”¨" #: builtin/fetch.c:359 msgid "forced update" msgstr "强制更新" #: builtin/fetch.c:365 msgid "(non-fast-forward)" msgstr "(éžå¿«è¿›å¼ï¼‰" #: builtin/fetch.c:396 builtin/fetch.c:688 #, c-format msgid "cannot open %s: %s\n" msgstr "æ— æ³•æ‰“å¼€ %s:%s\n" #: builtin/fetch.c:405 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s 未å‘é€æ‰€æœ‰å¿…须的对象\n" #: builtin/fetch.c:491 #, c-format msgid "From %.*s\n" msgstr "æ¥è‡ª %.*s\n" #: builtin/fetch.c:502 #, 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:552 #, c-format msgid " (%s will become dangling)" msgstr " (%s å°†æˆä¸ºæ‘‡æ‘†çŠ¶æ€ï¼‰" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: builtin/fetch.c:553 #, c-format msgid " (%s has become dangling)" msgstr " (%s å·²æˆä¸ºæ‘‡æ‘†çŠ¶æ€ï¼‰" #: builtin/fetch.c:560 msgid "[deleted]" msgstr "[å·²åˆ é™¤]" #: builtin/fetch.c:561 builtin/remote.c:1055 msgid "(none)" msgstr "ï¼ˆæ— ï¼‰" #: builtin/fetch.c:678 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "æ‹’ç»èŽ·å–到éžè£¸ç‰ˆæœ¬åº“的当å‰åˆ†æ”¯ %s" #: builtin/fetch.c:712 #, c-format msgid "Don't know how to fetch from %s" msgstr "ä¸çŸ¥é“如何从 %s 获å–" #: builtin/fetch.c:789 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s æ˜¯æ— æ•ˆçš„" #: builtin/fetch.c:792 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "选项 \"%s\" 为 %s 所忽略\n" #: builtin/fetch.c:894 #, c-format msgid "Fetching %s\n" msgstr "æ£åœ¨èŽ·å– %s\n" #: builtin/fetch.c:896 builtin/remote.c:100 #, c-format msgid "Could not fetch %s" msgstr "ä¸èƒ½èŽ·å– %s" #: builtin/fetch.c:915 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:935 msgid "You need to specify a tag name." msgstr "您需è¦æŒ‡å®šä¸€ä¸ª tag å称。" #: builtin/fetch.c:981 msgid "--depth and --unshallow cannot be used together" msgstr "--depth å’Œ --unshallow ä¸èƒ½åŒæ—¶ä½¿ç”¨" #: builtin/fetch.c:983 msgid "--unshallow on a complete repository does not make sense" msgstr "对于一个完整的版本库,å‚æ•° --unshallow 没有æ„义" #: builtin/fetch.c:1002 msgid "fetch --all does not take a repository argument" msgstr "fetch --all ä¸èƒ½å¸¦ä¸€ä¸ªç‰ˆæœ¬åº“å‚æ•°" #: builtin/fetch.c:1004 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all 带引用表达å¼æ²¡æœ‰ä»»ä½•æ„义" #: builtin/fetch.c:1015 #, c-format msgid "No such remote or remote group: %s" msgstr "æ²¡æœ‰è¿™æ ·çš„è¿œç¨‹æˆ–è¿œç¨‹ç»„ï¼š%s" #: builtin/fetch.c:1023 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "获å–组并指定引用表达å¼æ²¡æœ‰æ„义" #: builtin/fmt-merge-msg.c:13 msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]" msgstr "" "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]" #: builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666 builtin/grep.c:701 #: builtin/merge.c:188 builtin/show-branch.c:655 builtin/show-ref.c:175 #: builtin/tag.c:446 parse-options.h:133 parse-options.h:239 msgid "n" msgstr "n" #: builtin/fmt-merge-msg.c:664 msgid "populate log with at most <n> entries from shortlog" msgstr "å‘æ交说明ä¸æœ€å¤šå¤åˆ¶æŒ‡å®šæ¡ç›®ï¼ˆåˆå¹¶è€Œæ¥çš„æ交)的简çŸè¯´æ˜Ž" #: builtin/fmt-merge-msg.c:667 msgid "alias for --log (deprecated)" msgstr "å‚æ•° --log 的别å(已弃用)" #: builtin/fmt-merge-msg.c:670 msgid "text" msgstr "文本" #: builtin/fmt-merge-msg.c:671 msgid "use <text> as start of message" msgstr "使用 <文本> 作为æ交说明的开始" #: builtin/fmt-merge-msg.c:672 msgid "file to read from" msgstr "从文件ä¸è¯»å–" #: builtin/for-each-ref.c:979 msgid "git for-each-ref [options] [<pattern>]" msgstr "git for-each-ref [选项] [<模å¼>]" #: builtin/for-each-ref.c:994 msgid "quote placeholders suitably for shells" msgstr "引用å ä½ç¬¦é€‚用于 shells" #: builtin/for-each-ref.c:996 msgid "quote placeholders suitably for perl" msgstr "引用å ä½ç¬¦é€‚用于 perl" #: builtin/for-each-ref.c:998 msgid "quote placeholders suitably for python" msgstr "引用å ä½ç¬¦é€‚用于 python" #: builtin/for-each-ref.c:1000 msgid "quote placeholders suitably for tcl" msgstr "引用å ä½ç¬¦é€‚用于 tcl" #: builtin/for-each-ref.c:1003 msgid "show only <n> matched refs" msgstr "åªæ˜¾ç¤º <n> 个匹é…的引用" #: builtin/for-each-ref.c:1004 msgid "format" msgstr "æ ¼å¼" #: builtin/for-each-ref.c:1004 msgid "format to use for the output" msgstr "è¾“å‡ºæ ¼å¼" #: builtin/for-each-ref.c:1005 msgid "key" msgstr "key" #: builtin/for-each-ref.c:1006 msgid "field name to sort on" msgstr "排åºçš„å—段å" #: builtin/fsck.c:608 msgid "git fsck [options] [<object>...]" msgstr "git fsck [选项] [<对象>...]" #: builtin/fsck.c:614 msgid "show unreachable objects" msgstr "显示ä¸å¯è¾¾çš„对象" #: builtin/fsck.c:615 msgid "show dangling objects" msgstr "显示摇摆的对象" #: builtin/fsck.c:616 msgid "report tags" msgstr "报告 tags" #: builtin/fsck.c:617 msgid "report root nodes" msgstr "æŠ¥å‘Šæ ¹èŠ‚ç‚¹" #: builtin/fsck.c:618 msgid "make index objects head nodes" msgstr "将索引亦作为检查的头节点" #: builtin/fsck.c:619 msgid "make reflogs head nodes (default)" msgstr "将引用日志作为检查的头节点(默认)" #: builtin/fsck.c:620 msgid "also consider packs and alternate objects" msgstr "也考虑包和备用对象" #: builtin/fsck.c:621 msgid "enable more strict checking" msgstr "å¯ç”¨æ›´ä¸¥æ ¼çš„检查" #: builtin/fsck.c:623 msgid "write dangling objects in .git/lost-found" msgstr "将摇摆对象写入 .git/lost-found ä¸" #: builtin/fsck.c:624 builtin/prune.c:134 msgid "show progress" msgstr "显示进度" #: builtin/gc.c:22 msgid "git gc [options]" msgstr "git gc [选项]" #: 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:179 msgid "prune unreferenced objects" msgstr "清除未引用的对象" #: builtin/gc.c:181 msgid "be more thorough (increased runtime)" msgstr "æ›´å½»åº•ï¼ˆå¢žåŠ è¿è¡Œæ—¶é—´ï¼‰" #: builtin/gc.c:182 msgid "enable auto-gc mode" msgstr "å¯ç”¨è‡ªåŠ¨åžƒåœ¾å›žæ”¶æ¨¡å¼" #: builtin/gc.c:222 #, 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:249 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "有太多ä¸å¯è¾¾çš„æ¾æ•£å¯¹è±¡ï¼Œè¿è¡Œ 'git prune' åˆ é™¤å®ƒä»¬ã€‚" #: builtin/grep.c:22 msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [选项] [-e] <模å¼> [<修订>...] [[--] <路径>...]" #: builtin/grep.c:217 #, c-format msgid "grep: failed to create thread: %s" msgstr "grepï¼šæ— æ³•åˆ›å»ºçº¿ç¨‹ï¼š%s" #: builtin/grep.c:365 #, c-format msgid "Failed to chdir: %s" msgstr "æ— æ³•åˆ‡æ¢ç›®å½•ï¼š%s" #: builtin/grep.c:443 builtin/grep.c:478 #, c-format msgid "unable to read tree (%s)" msgstr "æ— æ³•è¯»å–æ ‘ï¼ˆ%s)" #: builtin/grep.c:493 #, c-format msgid "unable to grep from object of type %s" msgstr "æ— æ³•æŠ“å–æ¥è‡ªäºŽ %s 类型的对象" #: builtin/grep.c:551 #, c-format msgid "switch `%c' expects a numerical value" msgstr "开关 `%c' 期望一个数å—值" #: builtin/grep.c:568 #, c-format msgid "cannot open '%s'" msgstr "ä¸èƒ½æ‰“å¼€ '%s'" #: builtin/grep.c:643 msgid "search in index instead of in the work tree" msgstr "在索引区æœç´¢è€Œä¸æ˜¯åœ¨å·¥ä½œåŒº" #: builtin/grep.c:645 msgid "find in contents not managed by git" msgstr "在未被 git 管ç†çš„内容ä¸æŸ¥æ‰¾" # 译者:ä¸æ–‡å—符串拼接,å¯åˆ 除å‰å¯¼ç©ºæ ¼ #: builtin/grep.c:647 msgid "search in both tracked and untracked files" msgstr "在跟踪和未跟踪的文件ä¸æœç´¢" #: builtin/grep.c:649 msgid "search also in ignored files" msgstr "也在忽略的文件ä¸æœç´¢" #: builtin/grep.c:652 msgid "show non-matching lines" msgstr "显示未匹é…çš„è¡Œ" #: builtin/grep.c:654 msgid "case insensitive matching" msgstr "ä¸åŒºåˆ†å¤§å°å†™åŒ¹é…" #: builtin/grep.c:656 msgid "match patterns only at word boundaries" msgstr "åªåœ¨å•è¯è¾¹ç•ŒåŒ¹é…模å¼" #: builtin/grep.c:658 msgid "process binary files as text" msgstr "把二进制文件当åšæ–‡æœ¬å¤„ç†" #: builtin/grep.c:660 msgid "don't match patterns in binary files" msgstr "ä¸åœ¨äºŒè¿›åˆ¶æ–‡ä»¶ä¸åŒ¹é…模å¼" #: builtin/grep.c:663 msgid "descend at most <depth> levels" msgstr "最多以指定的深度å‘下寻找" #: builtin/grep.c:667 msgid "use extended POSIX regular expressions" msgstr "使用扩展的 POSIX æ£åˆ™è¡¨è¾¾å¼" #: builtin/grep.c:670 msgid "use basic POSIX regular expressions (default)" msgstr "使用基本的 POSIX æ£åˆ™è¡¨è¾¾å¼ï¼ˆé»˜è®¤ï¼‰" #: builtin/grep.c:673 msgid "interpret patterns as fixed strings" msgstr "把模å¼è§£æžä¸ºå›ºå®šçš„å—符串" #: builtin/grep.c:676 msgid "use Perl-compatible regular expressions" msgstr "使用 Perl 兼容的æ£åˆ™è¡¨è¾¾å¼" #: builtin/grep.c:679 msgid "show line numbers" msgstr "显示行å·" #: builtin/grep.c:680 msgid "don't show filenames" msgstr "ä¸æ˜¾ç¤ºæ–‡ä»¶å" #: builtin/grep.c:681 msgid "show filenames" msgstr "显示文件å" #: builtin/grep.c:683 msgid "show filenames relative to top directory" msgstr "显示相对于顶级目录的文件å" #: builtin/grep.c:685 msgid "show only filenames instead of matching lines" msgstr "åªæ˜¾ç¤ºæ–‡ä»¶å而ä¸æ˜¾ç¤ºåŒ¹é…çš„è¡Œ" #: builtin/grep.c:687 msgid "synonym for --files-with-matches" msgstr "å’Œ --files-with-matches åŒä¹‰" #: builtin/grep.c:690 msgid "show only the names of files without match" msgstr "åªæ˜¾ç¤ºæœªåŒ¹é…的文件å" #: builtin/grep.c:692 msgid "print NUL after filenames" msgstr "在文件ååŽè¾“出 NUL å—符" #: builtin/grep.c:694 msgid "show the number of matches instead of matching lines" msgstr "显示总匹é…行数,而ä¸æ˜¾ç¤ºåŒ¹é…çš„è¡Œ" #: builtin/grep.c:695 msgid "highlight matches" msgstr "高亮显示匹é…项" #: builtin/grep.c:697 msgid "print empty line between matches from different files" msgstr "在ä¸åŒæ–‡ä»¶çš„匹é…项之间打å°ç©ºè¡Œ" #: builtin/grep.c:699 msgid "show filename only once above matches from same file" msgstr "åªåœ¨åŒä¸€æ–‡ä»¶çš„匹é…项的上é¢æ˜¾ç¤ºä¸€æ¬¡æ–‡ä»¶å" #: builtin/grep.c:702 msgid "show <n> context lines before and after matches" msgstr "显示匹é…项å‰åŽçš„ <n> 行上下文" #: builtin/grep.c:705 msgid "show <n> context lines before matches" msgstr "显示匹é…é¡¹å‰ <n> 行上下文" #: builtin/grep.c:707 msgid "show <n> context lines after matches" msgstr "显示匹é…é¡¹åŽ <n> 行上下文" #: builtin/grep.c:708 msgid "shortcut for -C NUM" msgstr "å¿«æ·é”® -C æ•°å—" #: builtin/grep.c:711 msgid "show a line with the function name before matches" msgstr "在匹é…çš„å‰é¢æ˜¾ç¤ºä¸€è¡Œå‡½æ•°å" #: builtin/grep.c:713 msgid "show the surrounding function" msgstr "显示所在函数的å‰åŽå†…容" #: builtin/grep.c:716 msgid "read patterns from file" msgstr "从文件读å–模å¼" #: builtin/grep.c:718 msgid "match <pattern>" msgstr "åŒ¹é… <模å¼>" #: builtin/grep.c:720 msgid "combine patterns specified with -e" msgstr "组åˆç”¨ -e å‚数设定的模å¼" #: builtin/grep.c:732 msgid "indicate hit with exit status without output" msgstr "ä¸è¾“出,而用退出ç æ ‡è¯†å‘½ä¸çŠ¶æ€" #: builtin/grep.c:734 msgid "show only matches from files that match all patterns" msgstr "åªæ˜¾ç¤ºåŒ¹é…所有模å¼çš„文件ä¸çš„匹é…" #: builtin/grep.c:736 msgid "show parse tree for grep expression" msgstr "显示 grep 表达å¼çš„解æžæ ‘" #: builtin/grep.c:740 msgid "pager" msgstr "分页" #: builtin/grep.c:740 msgid "show matching files in the pager" msgstr "分页显示匹é…的文件" #: builtin/grep.c:743 msgid "allow calling of grep(1) (ignored by this build)" msgstr "å…许调用 grep(1)(本次构建忽略)" #: builtin/grep.c:744 builtin/show-ref.c:184 msgid "show usage" msgstr "显示用法" #: builtin/grep.c:811 msgid "no pattern given." msgstr "未æ供模å¼åŒ¹é…。" #: builtin/grep.c:866 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager 仅用于工作区" #: builtin/grep.c:889 msgid "--cached or --untracked cannot be used with --no-index." msgstr "--cached 或 --untracked ä¸èƒ½ä¸Ž --no-index åŒæ—¶ä½¿ç”¨ã€‚" #: builtin/grep.c:894 msgid "--no-index or --untracked cannot be used with revs." msgstr "--no-index 或 --untracked ä¸èƒ½å’Œç‰ˆæœ¬åŒæ—¶ä½¿ç”¨ã€‚" #: builtin/grep.c:897 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "--[no-]exclude-standard ä¸èƒ½ç”¨äºŽå·²è·Ÿè¸ªå†…容。" #: builtin/grep.c:905 msgid "both --cached and trees are given." msgstr "åŒæ—¶ç»™å‡ºäº† --cached å’Œæ ‘å¯¹è±¡ã€‚" #: builtin/hash-object.c:60 msgid "" "git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] " "<file>..." msgstr "" "git hash-object [-t <类型>] [-w] [--path=<文件>|--no-filters] [--stdin] [--] " "<文件>..." #: builtin/hash-object.c:61 msgid "git hash-object --stdin-paths < <list-of-paths>" msgstr "git hash-object --stdin-paths < <路径列表>" #: builtin/hash-object.c:72 msgid "type" msgstr "类型" #: builtin/hash-object.c:72 msgid "object type" msgstr "对象类型" #: builtin/hash-object.c:73 msgid "write the object into the object database" msgstr "将对象写入对象数æ®åº“" #: builtin/hash-object.c:74 msgid "read the object from stdin" msgstr "ä»Žæ ‡å‡†è¾“å…¥è¯»å–对象" #: builtin/hash-object.c:76 msgid "store file as is without filters" msgstr "åŽŸæ ·å˜å‚¨æ–‡ä»¶ä¸ä½¿ç”¨è¿‡æ»¤å™¨" #: builtin/hash-object.c:77 msgid "process file as it were from this path" msgstr "处ç†æ–‡ä»¶å¹¶å‡è®¾å…¶æ¥è‡ªäºŽæ¤è·¯å¾„" #: builtin/help.c:43 msgid "print all available commands" msgstr "打å°æ‰€æœ‰å¯ç”¨çš„命令" #: builtin/help.c:44 msgid "print list of useful guides" msgstr "显示有用的指å—列表" #: builtin/help.c:45 msgid "show man page" msgstr "显示 man 手册" #: builtin/help.c:46 msgid "show manual in web browser" msgstr "在 web æµè§ˆå™¨ä¸æ˜¾ç¤ºæ‰‹å†Œ" #: builtin/help.c:48 msgid "show info page" msgstr "显示 info 手册" #: builtin/help.c:54 msgid "git help [--all] [--guides] [--man|--web|--info] [command]" msgstr "git help [--all] [--guides] [--man|--web|--info] [命令]" #: builtin/help.c:66 #, c-format msgid "unrecognized help format '%s'" msgstr "æœªèƒ½è¯†åˆ«çš„å¸®åŠ©æ ¼å¼ '%s'" #: builtin/help.c:94 msgid "Failed to start emacsclient." msgstr "æ— æ³•å¯åŠ¨ emacsclient。" #: builtin/help.c:107 msgid "Failed to parse emacsclient version." msgstr "æ— æ³•è§£æž emacsclient 版本。" #: builtin/help.c:115 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "emacsclient 版本 '%d' 太è€ï¼ˆ< 22)。" #: builtin/help.c:133 builtin/help.c:161 builtin/help.c:170 builtin/help.c:178 #, c-format msgid "failed to exec '%s': %s" msgstr "æ— æ³•æ‰§è¡Œ '%s':%s" #: builtin/help.c:218 #, 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:230 #, 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:351 #, c-format msgid "'%s': unknown man viewer." msgstr "'%s':未知的 man 查看器。" #: builtin/help.c:368 msgid "no man viewer handled the request" msgstr "没有 man 查看器处ç†æ¤è¯·æ±‚" #: builtin/help.c:376 msgid "no info viewer handled the request" msgstr "没有 info 查看器处ç†æ¤è¯·æ±‚" #: builtin/help.c:422 msgid "Defining attributes per path" msgstr "定义路径的属性" #: builtin/help.c:423 msgid "A Git glossary" msgstr "Git è¯æ±‡è¡¨" #: builtin/help.c:424 msgid "Specifies intentionally untracked files to ignore" msgstr "忽略指定的未跟踪文件" #: builtin/help.c:425 msgid "Defining submodule properties" msgstr "定义å模组属性" #: builtin/help.c:426 msgid "Specifying revisions and ranges for Git" msgstr "指定 Git 的版本和版本范围" #: builtin/help.c:427 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" msgstr "一个 Git 教程(针对 1.5.1 或更新版本)" #: builtin/help.c:428 msgid "An overview of recommended workflows with Git" msgstr "Git 推è的工作æµæ¦‚览" #: builtin/help.c:440 msgid "The common Git guides are:\n" msgstr "最常用的 Git å‘导有:\n" #: builtin/help.c:462 builtin/help.c:478 #, c-format msgid "usage: %s%s" msgstr "用法:%s%s" #: builtin/help.c:494 #, c-format msgid "`git %s' is aliased to `%s'" msgstr "`git %s' 是 `%s' 的别å" #: builtin/index-pack.c:182 #, c-format msgid "object type mismatch at %s" msgstr "%s 的对象类型ä¸åŒ¹é…" #: builtin/index-pack.c:202 msgid "object of unexpected type" msgstr "æ„外的类型的对象" #: builtin/index-pack.c:239 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "æ— æ³•å¡«å…… %d å—节" msgstr[1] "æ— æ³•å¡«å…… %d å—节" #: builtin/index-pack.c:249 msgid "early EOF" msgstr "过早的文件结æŸç¬¦ï¼ˆEOF)" #: builtin/index-pack.c:250 msgid "read error on input" msgstr "输入上的读错误" #: builtin/index-pack.c:262 msgid "used more bytes than were available" msgstr "用掉了超过å¯ç”¨çš„å—节" #: builtin/index-pack.c:269 msgid "pack too large for current definition of off_t" msgstr "åŒ…å¤ªå¤§è¶…è¿‡äº†å½“å‰ off_t 的定义" #: builtin/index-pack.c:285 #, c-format msgid "unable to create '%s'" msgstr "ä¸èƒ½åˆ›å»º '%s'" #: builtin/index-pack.c:290 #, c-format msgid "cannot open packfile '%s'" msgstr "æ— æ³•æ‰“å¼€åŒ…æ–‡ä»¶ '%s'" #: builtin/index-pack.c:304 msgid "pack signature mismatch" msgstr "包ç¾åä¸åŒ¹é…" #: builtin/index-pack.c:306 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "ä¸æ”¯æŒåŒ…版本 %<PRIu32>" #: builtin/index-pack.c:324 #, c-format msgid "pack has bad object at offset %lu: %s" msgstr "包ä¸æœ‰é”™è¯¯çš„对象ä½äºŽ %lu:%s" #: builtin/index-pack.c:446 #, c-format msgid "inflate returned %d" msgstr "解压缩返回 %d" #: builtin/index-pack.c:495 msgid "offset value overflow for delta base object" msgstr "å移值覆盖了 delta 基准对象" #: builtin/index-pack.c:503 msgid "delta base offset is out of bound" msgstr "delta 基准å移越界" #: builtin/index-pack.c:511 #, c-format msgid "unknown object type %d" msgstr "未知对象类型 %d" #: builtin/index-pack.c:542 msgid "cannot pread pack file" msgstr "æ— æ³•è¯»å–包文件" #: builtin/index-pack.c:544 #, 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:570 msgid "serious inflate inconsistency" msgstr "解压缩严é‡çš„ä¸ä¸€è‡´" #: builtin/index-pack.c:661 builtin/index-pack.c:667 builtin/index-pack.c:690 #: builtin/index-pack.c:724 builtin/index-pack.c:733 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "å‘现 %s 出现 SHA1 冲çªï¼" #: builtin/index-pack.c:664 builtin/pack-objects.c:170 #: builtin/pack-objects.c:262 #, c-format msgid "unable to read %s" msgstr "ä¸èƒ½è¯» %s" #: builtin/index-pack.c:730 #, c-format msgid "cannot read existing object %s" msgstr "ä¸èƒ½è¯»å–现å˜å¯¹è±¡ %s" #: builtin/index-pack.c:744 #, c-format msgid "invalid blob object %s" msgstr "æ— æ•ˆçš„æ•°æ®ï¼ˆblob)对象 %s" #: builtin/index-pack.c:759 #, c-format msgid "invalid %s" msgstr "æ— æ•ˆçš„ %s" #: builtin/index-pack.c:761 msgid "Error in object" msgstr "对象ä¸å‡ºé”™" #: builtin/index-pack.c:763 #, c-format msgid "Not all child objects of %s are reachable" msgstr "%s 的所有å对象并éžéƒ½å¯è¾¾" #: builtin/index-pack.c:833 builtin/index-pack.c:863 msgid "failed to apply delta" msgstr "æ— æ³•åº”ç”¨ delta" #: builtin/index-pack.c:1004 msgid "Receiving objects" msgstr "接收对象ä¸" #: builtin/index-pack.c:1004 msgid "Indexing objects" msgstr "索引对象ä¸" #: builtin/index-pack.c:1030 msgid "pack is corrupted (SHA1 mismatch)" msgstr "包冲çªï¼ˆSHA1 ä¸åŒ¹é…)" #: builtin/index-pack.c:1035 msgid "cannot fstat packfile" msgstr "ä¸èƒ½æžšä¸¾åŒ…文件状æ€" #: builtin/index-pack.c:1038 msgid "pack has junk at the end" msgstr "包的结尾有垃圾数æ®" #: builtin/index-pack.c:1049 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "parse_pack_objects() ä¸é‡åˆ°ä¸å¯ç†å–»çš„问题" #: builtin/index-pack.c:1072 msgid "Resolving deltas" msgstr "å¤„ç† delta ä¸" #: builtin/index-pack.c:1082 #, c-format msgid "unable to create thread: %s" msgstr "ä¸èƒ½åˆ›å»ºçº¿ç¨‹ï¼š%s" #: builtin/index-pack.c:1124 msgid "confusion beyond insanity" msgstr "ä¸å¯ç†å–»" #: builtin/index-pack.c:1132 #, c-format msgid "completed with %d local objects" msgstr "å®Œæˆ %d 个本地对象" #: builtin/index-pack.c:1142 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "对 %s çš„å°¾éƒ¨æ ¡éªŒå‡ºçŽ°æ„外(ç£ç›˜æŸå?)" #: builtin/index-pack.c:1146 #, 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:1171 #, c-format msgid "unable to deflate appended object (%d)" msgstr "ä¸èƒ½åŽ‹ç¼©é™„åŠ å¯¹è±¡ï¼ˆ%d)" #: builtin/index-pack.c:1250 #, c-format msgid "local object %s is corrupt" msgstr "本地对象 %s å·²æŸå" #: builtin/index-pack.c:1274 msgid "error while closing pack file" msgstr "å…³é—包文件时出错" #: builtin/index-pack.c:1287 #, c-format msgid "cannot write keep file '%s'" msgstr "æ— æ³•å†™ä¿ç•™æ–‡ä»¶ '%s'" #: builtin/index-pack.c:1295 #, c-format msgid "cannot close written keep file '%s'" msgstr "æ— æ³•å…³é—ä¿ç•™æ–‡ä»¶ '%s'" #: builtin/index-pack.c:1308 msgid "cannot store pack file" msgstr "æ— æ³•å˜å‚¨åŒ…文件" #: builtin/index-pack.c:1319 msgid "cannot store index file" msgstr "æ— æ³•å˜å‚¨ç´¢å¼•æ–‡ä»¶" #: builtin/index-pack.c:1352 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "åçš„ pack.indexversion=%<PRIu32>" #: builtin/index-pack.c:1358 #, c-format msgid "invalid number of threads specified (%d)" msgstr "æŒ‡å®šçš„çº¿ç¨‹æ•°æ— æ•ˆï¼ˆ%d)" #: builtin/index-pack.c:1362 builtin/index-pack.c:1535 #, c-format msgid "no threads support, ignoring %s" msgstr "没有线程支æŒï¼Œå¿½ç•¥ %s" #: builtin/index-pack.c:1420 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "æ— æ³•æ‰“å¼€çŽ°å˜åŒ…文件 '%s'" #: builtin/index-pack.c:1422 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "æ— æ³•ä¸º %s 打开包索引文件" #: builtin/index-pack.c:1469 #, 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:1476 #, 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:1503 msgid "Cannot come back to cwd" msgstr "æ— æ³•è¿”å›žå½“å‰å·¥ä½œç›®å½•" #: builtin/index-pack.c:1547 builtin/index-pack.c:1550 #: builtin/index-pack.c:1562 builtin/index-pack.c:1566 #, c-format msgid "bad %s" msgstr "错误选项 %s" #: builtin/index-pack.c:1580 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin ä¸èƒ½å’Œ --stdin åŒæ—¶ä½¿ç”¨" #: builtin/index-pack.c:1584 builtin/index-pack.c:1594 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "包å '%s' 没有以 '.pack' 结尾" #: builtin/index-pack.c:1603 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:323 builtin/init-db.c:326 #, c-format msgid "%s already exists" msgstr "%s å·²ç»å˜åœ¨" #: builtin/init-db.c:355 #, c-format msgid "unable to handle file type %d" msgstr "ä¸èƒ½å¤„ç† %d 类型的文件" #: builtin/init-db.c:358 #, c-format msgid "unable to move %s to %s" msgstr "ä¸èƒ½ç§»åŠ¨ %s 至 %s" #: builtin/init-db.c:363 #, 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:420 #, c-format msgid "%s%s Git repository in %s%s\n" msgstr "%s%s Git 版本库于 %s%s\n" #: builtin/init-db.c:421 msgid "Reinitialized existing" msgstr "é‡æ–°åˆå§‹åŒ–现å˜çš„" #: builtin/init-db.c:421 msgid "Initialized empty" msgstr "åˆå§‹åŒ–空的" # 译者:ä¸æ–‡å—符串拼接,å¯åˆ 除å‰å¯¼ç©ºæ ¼ #: builtin/init-db.c:422 msgid " shared" msgstr "共享" #: builtin/init-db.c:441 msgid "cannot tell cwd" msgstr "æ— æ³•èŽ·çŸ¥å½“å‰è·¯å¾„" #: builtin/init-db.c:467 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [directory]" msgstr "" "git init [-q | --quiet] [--bare] [--template=<模æ¿ç›®å½•>] [--shared[=<æƒé™>]] " "[目录]" #: builtin/init-db.c:490 msgid "permissions" msgstr "æƒé™" #: builtin/init-db.c:491 msgid "specify that the git repository is to be shared amongst several users" msgstr "指定 git 版本库是多个用户之间共享的" #: builtin/init-db.c:493 builtin/prune-packed.c:77 msgid "be quiet" msgstr "ä¿æŒå®‰é™" #: builtin/init-db.c:522 builtin/init-db.c:529 #, c-format msgid "cannot mkdir %s" msgstr "ä¸èƒ½åˆ›å»ºç›®å½• %s" #: builtin/init-db.c:533 #, c-format msgid "cannot chdir to %s" msgstr "ä¸èƒ½åˆ‡æ¢ç›®å½•åˆ° %s" #: builtin/init-db.c:555 #, 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:579 msgid "Cannot access current working directory" msgstr "ä¸èƒ½è®¿é—®å½“å‰å·¥ä½œç›®å½•" #: builtin/init-db.c:586 #, c-format msgid "Cannot access work tree '%s'" msgstr "ä¸èƒ½è®¿é—®å·¥ä½œåŒº '%s'" #: builtin/log.c:40 msgid "git log [<options>] [<revision range>] [[--] <path>...]\n" msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]\n" #: builtin/log.c:41 msgid " or: git show [options] <object>..." msgstr " 或者:git show [选项] <对象>..." #: builtin/log.c:103 msgid "suppress diff output" msgstr "ä¸æ˜¾ç¤ºå·®å¼‚输出" #: builtin/log.c:104 msgid "show source" msgstr "显示æº" #: builtin/log.c:105 msgid "Use mail map file" msgstr "ä½¿ç”¨é‚®ä»¶æ˜ å°„æ–‡ä»¶" #: builtin/log.c:106 msgid "decorate options" msgstr "修饰选项" #: builtin/log.c:199 #, c-format msgid "Final output: %d %s\n" msgstr "最终输出:%d %s\n" #: builtin/log.c:422 builtin/log.c:514 #, c-format msgid "Could not read object %s" msgstr "ä¸èƒ½è¯»å–对象 %s" #: builtin/log.c:538 #, c-format msgid "Unknown type: %d" msgstr "未知类型:%d" #: builtin/log.c:638 msgid "format.headers without value" msgstr "format.headers 没有值" #: builtin/log.c:720 msgid "name of output directory is too long" msgstr "输出目录å太长" #: builtin/log.c:736 #, c-format msgid "Cannot open patch file %s" msgstr "æ— æ³•æ‰“å¼€è¡¥ä¸æ–‡ä»¶ %s" #: builtin/log.c:750 msgid "Need exactly one range." msgstr "åªéœ€è¦ä¸€ä¸ªèŒƒå›´ã€‚" #: builtin/log.c:758 msgid "Not a range." msgstr "ä¸æ˜¯ä¸€ä¸ªèŒƒå›´ã€‚" #: builtin/log.c:860 msgid "Cover letter needs email format" msgstr "ä¿¡å°éœ€è¦é‚®ä»¶åœ°å€æ ¼å¼" #: builtin/log.c:936 #, c-format msgid "insane in-reply-to: %s" msgstr "ä¸æ£å¸¸çš„ in-reply-to:%s" #: builtin/log.c:964 msgid "git format-patch [options] [<since> | <revision range>]" msgstr "git format-patch [选项] [<从> | <修订集范围>]" #: builtin/log.c:1009 msgid "Two output directories?" msgstr "两个输出目录?" #: builtin/log.c:1108 msgid "use [PATCH n/m] even with a single patch" msgstr "使用 [PATCH n/m],å³ä½¿åªæœ‰ä¸€ä¸ªè¡¥ä¸" #: builtin/log.c:1111 msgid "use [PATCH] even with multiple patches" msgstr "使用 [PATCH],å³ä½¿æœ‰å¤šä¸ªè¡¥ä¸" #: builtin/log.c:1115 msgid "print patches to standard out" msgstr "打å°è¡¥ä¸åˆ°æ ‡å‡†è¾“出" #: builtin/log.c:1117 msgid "generate a cover letter" msgstr "生æˆä¸€å°é™„ä¿¡" #: builtin/log.c:1119 msgid "use simple number sequence for output file names" msgstr "使用简å•çš„æ•°å—åºåˆ—作为输出文件å" #: builtin/log.c:1120 msgid "sfx" msgstr "åŽç¼€" #: builtin/log.c:1121 msgid "use <sfx> instead of '.patch'" msgstr "使用 <åŽç¼€> 代替 '.patch'" #: builtin/log.c:1123 msgid "start numbering patches at <n> instead of 1" msgstr "è¡¥ä¸ä»¥ <n> 开始编å·ï¼Œè€Œä¸æ˜¯1" #: builtin/log.c:1125 msgid "mark the series as Nth re-roll" msgstr "æ ‡è®°è¡¥ä¸ç³»åˆ—æ˜¯ç¬¬å‡ æ¬¡é‡åˆ¶" #: builtin/log.c:1127 msgid "Use [<prefix>] instead of [PATCH]" msgstr "使用 [<å‰ç¼€>] 代替 [PATCH]" #: builtin/log.c:1130 msgid "store resulting files in <dir>" msgstr "把结果文件å˜å‚¨åœ¨ <dir>" #: builtin/log.c:1133 msgid "don't strip/add [PATCH]" msgstr "ä¸åˆ 除/æ·»åŠ [PATCH]" #: builtin/log.c:1136 msgid "don't output binary diffs" msgstr "ä¸è¾“出二进制差异" #: builtin/log.c:1138 msgid "don't include a patch matching a commit upstream" msgstr "ä¸åŒ…å«å·²åœ¨ä¸Šæ¸¸æ交ä¸çš„è¡¥ä¸" #: builtin/log.c:1140 msgid "show patch format instead of default (patch + stat)" msgstr "显示纯补ä¸æ ¼å¼è€Œéžé»˜è®¤çš„(补ä¸+状æ€ï¼‰" #: builtin/log.c:1142 msgid "Messaging" msgstr "邮件å‘é€" #: builtin/log.c:1143 msgid "header" msgstr "header" #: builtin/log.c:1144 msgid "add email header" msgstr "æ·»åŠ é‚®ä»¶å¤´" #: builtin/log.c:1145 builtin/log.c:1147 msgid "email" msgstr "邮件地å€" #: builtin/log.c:1145 msgid "add To: header" msgstr "æ·»åŠ æ”¶ä»¶äºº" #: builtin/log.c:1147 msgid "add Cc: header" msgstr "æ·»åŠ æŠ„é€" #: builtin/log.c:1149 msgid "message-id" msgstr "message-id" #: builtin/log.c:1150 msgid "make first mail a reply to <message-id>" msgstr "使第一å°é‚®ä»¶ä½œä¸ºå¯¹ <message-id> 的回å¤" #: builtin/log.c:1151 builtin/log.c:1154 msgid "boundary" msgstr "边界" #: builtin/log.c:1152 msgid "attach the patch" msgstr "附件方å¼æ·»åŠ è¡¥ä¸" #: builtin/log.c:1155 msgid "inline the patch" msgstr "内è”显示补ä¸" #: builtin/log.c:1159 msgid "enable message threading, styles: shallow, deep" msgstr "å¯ç”¨é‚®ä»¶çº¿ç´¢ï¼Œé£Žæ ¼ï¼šæµ…,深" #: builtin/log.c:1161 msgid "signature" msgstr "ç¾å" #: builtin/log.c:1162 msgid "add a signature" msgstr "æ·»åŠ ä¸€ä¸ªç¾å" #: builtin/log.c:1164 msgid "don't print the patch filenames" msgstr "ä¸è¦æ‰“å°è¡¥ä¸æ–‡ä»¶å" #: builtin/log.c:1248 msgid "-n and -k are mutually exclusive." msgstr "-n å’Œ -k 互斥。" #: builtin/log.c:1250 msgid "--subject-prefix and -k are mutually exclusive." msgstr "--subject-prefix å’Œ -k 互斥。" #: builtin/log.c:1258 msgid "--name-only does not make sense" msgstr "--name-only æ— æ„义" #: builtin/log.c:1260 msgid "--name-status does not make sense" msgstr "--name-status æ— æ„义" #: builtin/log.c:1262 msgid "--check does not make sense" msgstr "--check æ— æ„义" #: builtin/log.c:1285 msgid "standard output, or directory, which one?" msgstr "æ ‡å‡†è¾“å‡ºæˆ–ç›®å½•ï¼Œå“ªä¸€ä¸ªï¼Ÿ" #: builtin/log.c:1287 #, c-format msgid "Could not create directory '%s'" msgstr "ä¸èƒ½åˆ›å»ºç›®å½• '%s'" #: builtin/log.c:1435 msgid "Failed to create output files" msgstr "æ— æ³•åˆ›å»ºè¾“å‡ºæ–‡ä»¶" #: builtin/log.c:1484 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<上游> [<头> [<é™åˆ¶>]]]" #: builtin/log.c:1539 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "ä¸èƒ½æ‰¾åˆ°è·Ÿè¸ªçš„远程分支,请手工指定 <upstream>。\n" #: builtin/log.c:1552 builtin/log.c:1554 builtin/log.c:1566 #, c-format msgid "Unknown commit %s" msgstr "未知æ交 %s" #: builtin/ls-files.c:402 msgid "git ls-files [options] [<file>...]" msgstr "git ls-files [选项] [<文件>...]" #: builtin/ls-files.c:459 msgid "identify the file status with tags" msgstr "ç”¨æ ‡ç¾æ ‡è¯†æ–‡ä»¶çš„状æ€" #: builtin/ls-files.c:461 msgid "use lowercase letters for 'assume unchanged' files" msgstr "使用å°å†™å—æ¯è¡¨ç¤º 'å‡è®¾æœªæ”¹å˜çš„' 文件" #: builtin/ls-files.c:463 msgid "show cached files in the output (default)" msgstr "显示缓å˜çš„文件(默认)" #: builtin/ls-files.c:465 msgid "show deleted files in the output" msgstr "æ˜¾ç¤ºå·²åˆ é™¤çš„æ–‡ä»¶" #: builtin/ls-files.c:467 msgid "show modified files in the output" msgstr "显示已修改的文件" #: builtin/ls-files.c:469 msgid "show other files in the output" msgstr "显示其它文件" #: builtin/ls-files.c:471 msgid "show ignored files in the output" msgstr "显示忽略的文件" #: builtin/ls-files.c:474 msgid "show staged contents' object name in the output" msgstr "显示暂å˜åŒºå†…容的对象å称" #: builtin/ls-files.c:476 msgid "show files on the filesystem that need to be removed" msgstr "显示文件系统需è¦åˆ 除的文件" #: builtin/ls-files.c:478 msgid "show 'other' directories' name only" msgstr "åªæ˜¾ç¤ºâ€œå…¶ä»–â€ç›®å½•çš„å称" #: builtin/ls-files.c:481 msgid "don't show empty directories" msgstr "ä¸æ˜¾ç¤ºç©ºç›®å½•" #: builtin/ls-files.c:484 msgid "show unmerged files in the output" msgstr "显示未åˆå¹¶çš„文件" #: builtin/ls-files.c:486 msgid "show resolve-undo information" msgstr "显示 resolve-undo ä¿¡æ¯" #: builtin/ls-files.c:488 msgid "skip files matching pattern" msgstr "匹é…排除文件的模å¼" #: builtin/ls-files.c:491 msgid "exclude patterns are read from <file>" msgstr "从 <文件> ä¸è¯»å–排除模å¼" #: builtin/ls-files.c:494 msgid "read additional per-directory exclude patterns in <file>" msgstr "从 <文件> 读å–é¢å¤–çš„æ¯ä¸ªç›®å½•çš„排除模å¼" #: builtin/ls-files.c:496 msgid "add the standard git exclusions" msgstr "æ·»åŠ æ ‡å‡†çš„ git 排除" #: builtin/ls-files.c:499 msgid "make the output relative to the project top directory" msgstr "显示相对于顶级目录的文件å" #: builtin/ls-files.c:502 msgid "if any <file> is not in the index, treat this as an error" msgstr "如果任何 <文件> 都ä¸åœ¨ç´¢å¼•åŒºï¼Œè§†ä¸ºé”™è¯¯" #: builtin/ls-files.c:503 msgid "tree-ish" msgstr "æ ‘æˆ–æ交" #: builtin/ls-files.c:504 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "å‡è£…自从 <æ ‘æˆ–æ交> 之åŽåˆ 除的路径ä»ç„¶å˜åœ¨" #: builtin/ls-files.c:506 msgid "show debugging data" msgstr "显示调试数æ®" #: builtin/ls-tree.c:27 msgid "git ls-tree [<options>] <tree-ish> [<path>...]" msgstr "git ls-tree [<选项>] <æ ‘æˆ–æ交> [<路径>...]" #: builtin/ls-tree.c:125 msgid "only show trees" msgstr "åªæ˜¾ç¤ºæ ‘" #: builtin/ls-tree.c:127 msgid "recurse into subtrees" msgstr "递归到åæ ‘" #: builtin/ls-tree.c:129 msgid "show trees when recursing" msgstr "å½“é€’å½’æ—¶æ˜¾ç¤ºæ ‘" #: builtin/ls-tree.c:132 msgid "terminate entries with NUL byte" msgstr "æ¡ç›®ä»¥NULå—符终æ¢" #: builtin/ls-tree.c:133 msgid "include object size" msgstr "包括对象大å°" #: builtin/ls-tree.c:135 builtin/ls-tree.c:137 msgid "list only filenames" msgstr "åªåˆ—出文件å" #: builtin/ls-tree.c:140 msgid "use full path names" msgstr "使用文件的全路径" #: builtin/ls-tree.c:142 msgid "list entire tree; not just current directory (implies --full-name)" msgstr "åˆ—å‡ºæ•´ä¸ªæ ‘ï¼›ä¸ä»…仅当å‰ç›®å½•ï¼ˆéšå« --full-name)" #: builtin/merge.c:43 msgid "git merge [options] [<commit>...]" msgstr "git merge [选项] [<æ交>...]" #: builtin/merge.c:44 msgid "git merge [options] <msg> HEAD <commit>" msgstr "git merge [选项] <说明> HEAD <æ交>" #: builtin/merge.c:45 msgid "git merge --abort" msgstr "git merge --abort" #: 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:183 msgid "do not show a diffstat at the end of the merge" msgstr "在åˆå¹¶çš„最åŽä¸æ˜¾ç¤ºå·®å¼‚统计" #: builtin/merge.c:186 msgid "show a diffstat at the end of the merge" msgstr "在åˆå¹¶çš„最åŽæ˜¾ç¤ºå·®å¼‚统计" #: builtin/merge.c:187 msgid "(synonym to --stat)" msgstr "(和 --stat åŒä¹‰ï¼‰" #: builtin/merge.c:189 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "在åˆå¹¶æ交信æ¯ä¸æ·»åŠ (最多 <n> æ¡ï¼‰ç²¾ç®€æ交记录" #: builtin/merge.c:192 msgid "create a single commit instead of doing a merge" msgstr "创建一个å•ç‹¬çš„æ交而ä¸æ˜¯åšä¸€æ¬¡åˆå¹¶" #: builtin/merge.c:194 msgid "perform a commit if the merge succeeds (default)" msgstr "如果åˆå¹¶æˆåŠŸï¼Œæ‰§è¡Œä¸€æ¬¡æ交(默认)" #: builtin/merge.c:196 msgid "edit message before committing" msgstr "在æ交å‰ç¼–辑æ交说明" #: builtin/merge.c:198 msgid "allow fast-forward (default)" msgstr "å…许快进(默认)" #: builtin/merge.c:200 msgid "abort if fast-forward is not possible" msgstr "如果ä¸èƒ½å¿«è¿›å°±æ”¾å¼ƒåˆå¹¶" #: builtin/merge.c:203 msgid "Verify that the named commit has a valid GPG signature" msgstr "验è¯æŒ‡å®šçš„æ交是å¦åŒ…å«ä¸€ä¸ªæœ‰æ•ˆçš„ GPG ç¾å" #: builtin/merge.c:204 builtin/notes.c:866 builtin/revert.c:112 msgid "strategy" msgstr "ç–ç•¥" #: builtin/merge.c:205 msgid "merge strategy to use" msgstr "è¦ä½¿ç”¨çš„åˆå¹¶ç–ç•¥" #: builtin/merge.c:206 msgid "option=value" msgstr "option=value" #: builtin/merge.c:207 msgid "option for selected merge strategy" msgstr "所选的åˆå¹¶ç–略的选项" #: builtin/merge.c:209 msgid "merge commit message (for a non-fast-forward merge)" msgstr "åˆå¹¶çš„æ交说明(针对éžå¿«è¿›å¼åˆå¹¶ï¼‰" #: builtin/merge.c:213 msgid "abort the current in-progress merge" msgstr "放弃当å‰æ£åœ¨è¿›è¡Œçš„åˆå¹¶" #: builtin/merge.c:242 msgid "could not run stash." msgstr "ä¸èƒ½è¿›è¡Œè¿›åº¦ä¿å˜ã€‚" #: builtin/merge.c:247 msgid "stash failed" msgstr "进度ä¿å˜å¤±è´¥" #: builtin/merge.c:252 #, c-format msgid "not a valid object: %s" msgstr "ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆå¯¹è±¡ï¼š%s" #: builtin/merge.c:271 builtin/merge.c:288 msgid "read-tree failed" msgstr "读å–æ ‘å¤±è´¥" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: builtin/merge.c:318 msgid " (nothing to squash)" msgstr " ï¼ˆæ— å¯åŽ‹ç¼©ï¼‰" #: builtin/merge.c:331 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "压缩æ交 -- 未更新 HEAD\n" #: builtin/merge.c:363 msgid "Writing SQUASH_MSG" msgstr "写入 SQUASH_MSG" #: builtin/merge.c:365 msgid "Finishing SQUASH_MSG" msgstr "å®Œæˆ SQUASH_MSG" #: builtin/merge.c:388 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "æ— åˆå¹¶ä¿¡æ¯ -- 未更新 HEAD\n" #: builtin/merge.c:438 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' 没有指å‘一个æ交" #: builtin/merge.c:550 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "åçš„ branch.%s.mergeoptions å—符串:%s" #: builtin/merge.c:643 msgid "git write-tree failed to write a tree" msgstr "git write-tree æ— æ³•å†™å…¥ä¸€æ ‘å¯¹è±¡" #: builtin/merge.c:671 msgid "Not handling anything other than two heads merge." msgstr "ä¸èƒ½å¤„ç†ä¸¤ä¸ªå¤´åˆå¹¶ä¹‹å¤–的任何æ“作。" #: builtin/merge.c:685 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "merge-recursive 的未知选项:-X%s" #: builtin/merge.c:699 #, c-format msgid "unable to write %s" msgstr "ä¸èƒ½å†™ %s" #: builtin/merge.c:788 #, c-format msgid "Could not read from '%s'" msgstr "ä¸èƒ½ä»Ž '%s' 读å–" #: builtin/merge.c:797 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "未æ交åˆå¹¶ï¼Œä½¿ç”¨ 'git commit' 完æˆæ¤æ¬¡åˆå¹¶ã€‚\n" #: builtin/merge.c:803 #, c-format 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 '%c' will be ignored, and an empty message aborts\n" "the commit.\n" msgstr "" "请输入一个æ交信æ¯ä»¥è§£é‡Šæ¤åˆå¹¶çš„å¿…è¦æ€§ï¼Œå°¤å…¶æ˜¯å°†ä¸€ä¸ªæ›´æ–°åŽçš„上游分支\n" "åˆå¹¶åˆ°ä¸»é¢˜åˆ†æ”¯ã€‚\n" "\n" "以 '%c' 开头的行将被忽略,而且空æ交说明将会终æ¢æ交。\n" #: builtin/merge.c:827 msgid "Empty commit message." msgstr "空æ交信æ¯ã€‚" #: builtin/merge.c:839 #, c-format msgid "Wonderful.\n" msgstr "太棒了。\n" #: builtin/merge.c:904 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "自动åˆå¹¶å¤±è´¥ï¼Œä¿®æ£å†²çªç„¶åŽæ交修æ£çš„结果。\n" #: builtin/merge.c:920 #, c-format msgid "'%s' is not a commit" msgstr "'%s' ä¸æ˜¯ä¸€ä¸ªæ交" #: builtin/merge.c:961 msgid "No current branch." msgstr "没有当å‰åˆ†æ”¯ã€‚" #: builtin/merge.c:963 msgid "No remote for the current branch." msgstr "当å‰åˆ†æ”¯æ²¡æœ‰å¯¹åº”的远程版本库。" #: builtin/merge.c:965 msgid "No default upstream defined for the current branch." msgstr "当å‰åˆ†æ”¯æ²¡æœ‰å®šä¹‰é»˜è®¤çš„上游分支。" #: builtin/merge.c:970 #, c-format msgid "No remote tracking branch for %s from %s" msgstr "%s 没有æ¥è‡ª %s 的远程跟踪分支" #: builtin/merge.c:1057 builtin/merge.c:1214 #, c-format msgid "%s - not something we can merge" msgstr "%s - ä¸èƒ½è¢«åˆå¹¶" #: builtin/merge.c:1125 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "没有è¦ç»ˆæ¢çš„åˆå¹¶ï¼ˆMERGE_HEAD 丢失)。" #: builtin/merge.c:1141 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:1144 git-pull.sh:34 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "您尚未结æŸæ‚¨çš„åˆå¹¶ï¼ˆå˜åœ¨ MERGE_HEAD)。" #: builtin/merge.c:1148 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:1151 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "您尚未结æŸæ‚¨çš„拣选(å˜åœ¨ CHERRY_PICK_HEAD)。" #: builtin/merge.c:1160 msgid "You cannot combine --squash with --no-ff." msgstr "您ä¸èƒ½å°† --squash 与 --no-ff åŒæ—¶ä½¿ç”¨ã€‚" #: builtin/merge.c:1165 msgid "You cannot combine --no-ff with --ff-only." msgstr "您ä¸èƒ½å°† --no-ff 与 --ff-only åŒæ—¶ä½¿ç”¨ã€‚" #: builtin/merge.c:1172 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "未指定æ交并且 merge.defaultToUpstream 未设置。" #: builtin/merge.c:1204 msgid "Can merge only exactly one commit into empty head" msgstr "åªèƒ½å°†ä¸€ä¸ªæ交åˆå¹¶åˆ°ç©ºåˆ†æ”¯ä¸Š" #: builtin/merge.c:1207 msgid "Squash commit into empty head not supported yet" msgstr "å°šä¸æ”¯æŒåˆ°ç©ºåˆ†æ”¯çš„压缩æ交" #: builtin/merge.c:1209 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "到空分支的éžå¿«è¿›å¼æ交没有æ„义" #: builtin/merge.c:1265 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "æ交 %s 有一个éžå¯ä¿¡çš„声称æ¥è‡ª %s çš„ GPG ç¾å。" #: builtin/merge.c:1268 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "æ交 %s 有一个错误的声称æ¥è‡ª %s çš„ GPG ç¾å。" #. 'N' #: builtin/merge.c:1271 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "æ交 %s 没有一个 GPG ç¾å。" #: builtin/merge.c:1274 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "æ交 %s 有一个æ¥è‡ª %s 的好的 GPG ç¾å。\n" #: builtin/merge.c:1358 #, c-format msgid "Updating %s..%s\n" msgstr "æ›´æ–° %s..%s\n" #: builtin/merge.c:1397 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "å°è¯•éžå¸¸å°çš„索引内åˆå¹¶...\n" #: builtin/merge.c:1404 #, c-format msgid "Nope.\n" msgstr "æ— ã€‚\n" #: builtin/merge.c:1436 msgid "Not possible to fast-forward, aborting." msgstr "æ— æ³•å¿«è¿›ï¼Œç»ˆæ¢ã€‚" #: builtin/merge.c:1459 builtin/merge.c:1538 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "å°†æ ‘å›žæ»šè‡³åŽŸå§‹çŠ¶æ€...\n" #: builtin/merge.c:1463 #, c-format msgid "Trying merge strategy %s...\n" msgstr "å°è¯•åˆå¹¶ç–ç•¥ %s...\n" #: builtin/merge.c:1529 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "没有åˆå¹¶ç–略处ç†æ¤åˆå¹¶ã€‚\n" #: builtin/merge.c:1531 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "使用ç–ç•¥ %s åˆå¹¶å¤±è´¥ã€‚\n" #: builtin/merge.c:1540 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "使用 %s 以准备手工解决。\n" #: builtin/merge.c:1552 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "自动åˆå¹¶è¿›å±•é¡ºåˆ©ï¼ŒæŒ‰è¦æ±‚在æ交å‰åœæ¢\n" #: builtin/merge-base.c:26 msgid "git merge-base [-a|--all] <commit> <commit>..." msgstr "git merge-base [-a|--all] <æ交> <æ交>..." #: builtin/merge-base.c:27 msgid "git merge-base [-a|--all] --octopus <commit>..." msgstr "git merge-base [-a|--all] --octopus <æ交>..." #: builtin/merge-base.c:28 msgid "git merge-base --independent <commit>..." msgstr "git merge-base --independent <æ交>..." #: builtin/merge-base.c:29 msgid "git merge-base --is-ancestor <commit> <commit>" msgstr "git merge-base --is-ancestor <æ交> <æ交>" #: builtin/merge-base.c:98 msgid "output all common ancestors" msgstr "输出所有共åŒçš„祖先" #: builtin/merge-base.c:99 msgid "find ancestors for a single n-way merge" msgstr "查找一个多路åˆå¹¶çš„祖先æ交" #: builtin/merge-base.c:100 msgid "list revs not reachable from others" msgstr "显示ä¸èƒ½è¢«å…¶ä»–访问到的版本" #: builtin/merge-base.c:102 msgid "is the first one ancestor of the other?" msgstr "第一个是其他的祖先æ交么?" #: builtin/merge-file.c:8 msgid "" "git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file " "file2" msgstr "" "git merge-file [选项] [-L name1 [-L orig [-L name2]]] file1 orig_file file2" #: builtin/merge-file.c:33 msgid "send results to standard output" msgstr "将结果å‘é€åˆ°æ ‡å‡†è¾“出" #: builtin/merge-file.c:34 msgid "use a diff3 based merge" msgstr "使用基于 diff3 çš„åˆå¹¶" #: builtin/merge-file.c:35 msgid "for conflicts, use our version" msgstr "如果冲çªï¼Œä½¿ç”¨æˆ‘们的版本" #: builtin/merge-file.c:37 msgid "for conflicts, use their version" msgstr "如果冲çªï¼Œä½¿ç”¨ä»–们的版本" #: builtin/merge-file.c:39 msgid "for conflicts, use a union version" msgstr "如果冲çªï¼Œä½¿ç”¨è”åˆç‰ˆæœ¬" #: builtin/merge-file.c:42 msgid "for conflicts, use this marker size" msgstr "如果冲çªï¼Œä½¿ç”¨æŒ‡å®šé•¿åº¦çš„æ ‡è®°" #: builtin/merge-file.c:43 msgid "do not warn about conflicts" msgstr "ä¸è¦è¦å‘Šå†²çª" #: builtin/merge-file.c:45 msgid "set labels for file1/orig_file/file2" msgstr "为 file1/orig_file/file2 è®¾ç½®æ ‡ç¾" #: builtin/mktree.c:67 msgid "git mktree [-z] [--missing] [--batch]" msgstr "git mktree [-z] [--missing] [--batch]" #: builtin/mktree.c:153 msgid "input is NUL terminated" msgstr "输入以 NUL å—符终æ¢" #: builtin/mktree.c:154 builtin/write-tree.c:24 msgid "allow missing objects" msgstr "å…许丢失的对象" #: builtin/mktree.c:155 msgid "allow creation of more than one tree" msgstr "å…è®¸åˆ›å»ºä¸€ä¸ªä»¥ä¸Šçš„æ ‘" #: builtin/mv.c:14 msgid "git mv [options] <source>... <destination>" msgstr "git mv [选项] <æº>... <ç›®æ ‡>" #: builtin/mv.c:64 msgid "force move/rename even if target exists" msgstr "强制移动/é‡å‘½ä»¤ï¼Œå³ä½¿ç›®æ ‡å˜åœ¨" #: builtin/mv.c:65 msgid "skip move/rename errors" msgstr "跳过移动/é‡å‘½å错误" #: 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/name-rev.c:175 msgid "git name-rev [options] <commit>..." msgstr "git name-rev [选项] <æ交>..." #: builtin/name-rev.c:176 msgid "git name-rev [options] --all" msgstr "git name-rev [选项] --all" #: builtin/name-rev.c:177 msgid "git name-rev [options] --stdin" msgstr "git name-rev [选项] --stdin" #: builtin/name-rev.c:229 msgid "print only names (no SHA-1)" msgstr "åªæ‰“å°åç§°ï¼ˆæ— SHA-1)" #: builtin/name-rev.c:230 msgid "only use tags to name the commits" msgstr "åªä½¿ç”¨ tags æ¥å‘½åæ交" #: builtin/name-rev.c:232 msgid "only use refs matching <pattern>" msgstr "åªä½¿ç”¨å’Œ <模å¼> 相匹é…的引用" #: builtin/name-rev.c:234 msgid "list all commits reachable from all refs" msgstr "列出å¯ä»¥ä»Žæ‰€æœ‰å¼•ç”¨è®¿é—®çš„æ交" #: builtin/name-rev.c:235 msgid "read from stdin" msgstr "ä»Žæ ‡å‡†è¾“å…¥è¯»å–" #: builtin/name-rev.c:236 msgid "allow to print `undefined` names" msgstr "å…è®¸æ‰“å° `未定义` çš„å称" #: builtin/notes.c:26 msgid "git notes [--ref <notes_ref>] [list [<object>]]" msgstr "git notes [--ref <注解引用>] [list [<对象>]]" #: builtin/notes.c:27 msgid "" "git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) " "<object>] [<object>]" msgstr "" "git notes [--ref <注解引用>] add [-f] [-m <说明> | -F <文件> | (-c | -C) <对" "象>] [<对象>]" #: builtin/notes.c:28 msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>" msgstr "git notes [--ref <注解引用>] copy [-f] <æºå¯¹è±¡> <ç›®æ ‡å¯¹è±¡>" #: builtin/notes.c:29 msgid "" "git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) " "<object>] [<object>]" msgstr "" "git notes [--ref <注解引用>] append [-m <说明> | -F <文件> | (-c | -C) <对象" ">] [<对象>]" #: builtin/notes.c:30 msgid "git notes [--ref <notes_ref>] edit [<object>]" msgstr "git notes [--ref <注解引用>] edit [<对象>]" #: builtin/notes.c:31 msgid "git notes [--ref <notes_ref>] show [<object>]" msgstr "git notes [--ref <注解引用>] show [<对象>]" #: builtin/notes.c:32 msgid "" "git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>" msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <ç–ç•¥> ] <注解引用>" #: builtin/notes.c:33 msgid "git notes merge --commit [-v | -q]" msgstr "git notes merge --commit [-v | -q]" #: builtin/notes.c:34 msgid "git notes merge --abort [-v | -q]" msgstr "git notes merge --abort [-v | -q]" #: builtin/notes.c:35 msgid "git notes [--ref <notes_ref>] remove [<object>...]" msgstr "git notes [--ref <注解引用>] remove [<对象>...]" #: builtin/notes.c:36 msgid "git notes [--ref <notes_ref>] prune [-n | -v]" msgstr "git notes [--ref <注解引用>] prune [-n | -v]" #: builtin/notes.c:37 msgid "git notes [--ref <notes_ref>] get-ref" msgstr "git notes [--ref <注解引用>] get-ref" #: builtin/notes.c:42 msgid "git notes [list [<object>]]" msgstr "git notes [list [<对象>]]" #: builtin/notes.c:47 msgid "git notes add [<options>] [<object>]" msgstr "git notes add [<选项>] [<对象>]" #: builtin/notes.c:52 msgid "git notes copy [<options>] <from-object> <to-object>" msgstr "git notes copy [<选项>] <æºå¯¹è±¡> <ç›®æ ‡å¯¹è±¡>" #: builtin/notes.c:53 msgid "git notes copy --stdin [<from-object> <to-object>]..." msgstr "git notes copy --stdin [<æºå¯¹è±¡> <ç›®æ ‡å¯¹è±¡>]..." #: builtin/notes.c:58 msgid "git notes append [<options>] [<object>]" msgstr "git notes append [<选项>] [<对象>]" #: builtin/notes.c:63 msgid "git notes edit [<object>]" msgstr "git notes edit [<对象>]" #: builtin/notes.c:68 msgid "git notes show [<object>]" msgstr "git notes show [<对象>]" #: builtin/notes.c:73 msgid "git notes merge [<options>] <notes_ref>" msgstr "git notes merge [<选项>] <注解引用>" #: builtin/notes.c:74 msgid "git notes merge --commit [<options>]" msgstr "git notes merge --commit [<选项>]" #: builtin/notes.c:75 msgid "git notes merge --abort [<options>]" msgstr "git notes merge --abort [<选项>]" #: builtin/notes.c:80 msgid "git notes remove [<object>]" msgstr "git notes remove [<对象>]" #: builtin/notes.c:85 msgid "git notes prune [<options>]" msgstr "git notes prune [<选项>]" #: builtin/notes.c:90 msgid "git notes get-ref" msgstr "git notes get-ref" #: builtin/notes.c:139 #, c-format msgid "unable to start 'show' for object '%s'" msgstr "ä¸èƒ½ä¸ºå¯¹è±¡ '%s' 开始 'show'" #: builtin/notes.c:143 msgid "could not read 'show' output" msgstr "ä¸èƒ½è¯»å– 'show' 的输出" #: builtin/notes.c:151 #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "æ— æ³•ä¸ºå¯¹è±¡ '%s' å®Œæˆ 'show'" #: builtin/notes.c:169 builtin/tag.c:341 #, c-format msgid "could not create file '%s'" msgstr "ä¸èƒ½åˆ›å»ºæ–‡ä»¶ '%s'" #: builtin/notes.c:188 msgid "Please supply the note contents using either -m or -F option" msgstr "请通过 -m 或 -F 选项为注解æ供内容" #: builtin/notes.c:209 builtin/notes.c:972 #, c-format msgid "Removing note for object %s\n" msgstr "åˆ é™¤å¯¹è±¡ %s 的注解\n" #: builtin/notes.c:214 msgid "unable to write note object" msgstr "ä¸èƒ½å†™æ³¨è§£å¯¹è±¡" #: builtin/notes.c:216 #, c-format msgid "The note contents has been left in %s" msgstr "注解内容被留在文件 %s ä¸" #: builtin/notes.c:250 builtin/tag.c:540 #, c-format msgid "cannot read '%s'" msgstr "ä¸èƒ½è¯»å– '%s'" #: builtin/notes.c:252 builtin/tag.c:543 #, c-format msgid "could not open or read '%s'" msgstr "ä¸èƒ½æ‰“å¼€æˆ–è¯»å– '%s'" #: builtin/notes.c:271 builtin/notes.c:444 builtin/notes.c:446 #: builtin/notes.c:506 builtin/notes.c:560 builtin/notes.c:643 #: builtin/notes.c:648 builtin/notes.c:723 builtin/notes.c:765 #: builtin/notes.c:967 builtin/tag.c:556 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "æ— æ³•è§£æž '%s' 为一个有效引用。" #: builtin/notes.c:274 #, c-format msgid "Failed to read object '%s'." msgstr "æ— æ³•è¯»å–对象 '%s'。" #: builtin/notes.c:298 msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "ä¸èƒ½æ交未åˆå§‹åŒ–/æœªå¼•ç”¨çš„æ³¨è§£æ ‘" #: builtin/notes.c:339 #, c-format msgid "Bad notes.rewriteMode value: '%s'" msgstr "åçš„ notes.rewriteMode 值:'%s'" #: builtin/notes.c:349 #, 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:376 #, c-format msgid "Bad %s value: '%s'" msgstr "åçš„ %s 值:'%s'" #: builtin/notes.c:440 #, c-format msgid "Malformed input line: '%s'." msgstr "éžæ³•çš„输入行:'%s'。" #: builtin/notes.c:455 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "æ— æ³•ä»Ž '%s' 到 '%s' æ‹·è´æ³¨è§£" #: builtin/notes.c:499 builtin/notes.c:553 builtin/notes.c:626 #: builtin/notes.c:638 builtin/notes.c:711 builtin/notes.c:758 #: builtin/notes.c:1032 msgid "too many parameters" msgstr "å‚数太多" #: builtin/notes.c:512 builtin/notes.c:771 #, c-format msgid "No note found for object %s." msgstr "未å‘现对象 %s 的注解。" #: builtin/notes.c:534 builtin/notes.c:691 msgid "note contents as a string" msgstr "注解内容作为一个å—符串" #: builtin/notes.c:537 builtin/notes.c:694 msgid "note contents in a file" msgstr "注解内容到一个文件ä¸" #: builtin/notes.c:539 builtin/notes.c:542 builtin/notes.c:696 #: builtin/notes.c:699 builtin/tag.c:474 msgid "object" msgstr "对象" #: builtin/notes.c:540 builtin/notes.c:697 msgid "reuse and edit specified note object" msgstr "é‡ç”¨å’Œç¼–辑指定的注解对象" #: builtin/notes.c:543 builtin/notes.c:700 msgid "reuse specified note object" msgstr "é‡ç”¨æŒ‡å®šçš„注解对象" #: builtin/notes.c:545 builtin/notes.c:613 msgid "replace existing notes" msgstr "替æ¢å·²å˜åœ¨çš„注解" #: builtin/notes.c:579 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "ä¸èƒ½æ·»åŠ 注解。å‘现对象 %s å·²å˜åœ¨æ³¨è§£ã€‚使用 '-f' 覆盖现å˜æ³¨è§£" #: builtin/notes.c:584 builtin/notes.c:661 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "覆盖对象 %s 现å˜æ³¨è§£\n" #: builtin/notes.c:614 msgid "read objects from stdin" msgstr "ä»Žæ ‡å‡†è¾“å…¥è¯»å–对象" #: builtin/notes.c:616 msgid "load rewriting config for <command> (implies --stdin)" msgstr "é‡æ–°åŠ è½½ <命令> çš„é…置(éšå« --stdin)" #: builtin/notes.c:634 msgid "too few parameters" msgstr "å‚数太少" #: builtin/notes.c:655 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "ä¸èƒ½æ‹·è´æ³¨è§£ã€‚å‘现对象 %s å·²å˜åœ¨æ³¨è§£ã€‚使用 '-f' 覆盖现å˜æ³¨è§£" #: builtin/notes.c:667 #, c-format msgid "Missing notes on source object %s. Cannot copy." msgstr "æºå¯¹è±¡ %s 缺少注解。ä¸èƒ½æ‹·è´ã€‚" #: builtin/notes.c:716 #, 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:863 msgid "General options" msgstr "通用选项" #: builtin/notes.c:865 msgid "Merge options" msgstr "åˆå¹¶é€‰é¡¹" #: builtin/notes.c:867 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" msgstr "使用指定的ç–ç•¥è§£å†³æ³¨è§£å†²çª (manual/ours/theirs/union/cat_sort_uniq)" #: builtin/notes.c:869 msgid "Committing unmerged notes" msgstr "æ交未åˆå¹¶çš„注解" #: builtin/notes.c:871 msgid "finalize notes merge by committing unmerged notes" msgstr "通过æ交未åˆå¹¶çš„注解æ¥å®Œæˆæ³¨è§£åˆå¹¶" #: builtin/notes.c:873 msgid "Aborting notes merge resolution" msgstr "ä¸æ¢æ³¨è§£åˆå¹¶çš„方案" #: builtin/notes.c:875 msgid "abort notes merge" msgstr "ä¸æ¢æ³¨è§£åˆå¹¶" #: builtin/notes.c:970 #, c-format msgid "Object %s has no note\n" msgstr "对象 %s 没有注解\n" #: builtin/notes.c:982 msgid "attempt to remove non-existent note is not an error" msgstr "å°è¯•åˆ 除ä¸å˜åœ¨çš„注解ä¸æ˜¯ä¸€ä¸ªé”™è¯¯" #: builtin/notes.c:985 msgid "read object names from the standard input" msgstr "ä»Žæ ‡å‡†è¾“å…¥è¯»å–对象å称" #: builtin/notes.c:1066 msgid "notes_ref" msgstr "注解引用" #: builtin/notes.c:1067 msgid "use notes from <notes_ref>" msgstr "从 <注解引用> 使用注解" #: builtin/notes.c:1102 builtin/remote.c:1598 #, c-format msgid "Unknown subcommand: %s" msgstr "未知å命令:%s" #: builtin/pack-objects.c:23 msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]" msgstr "git pack-objects --stdout [选项...] [< 引用列表 | < 对象列表]" #: builtin/pack-objects.c:24 msgid "git pack-objects [options...] base-name [< ref-list | < object-list]" msgstr "git pack-objects [选项...] base-name [< 引用列表 | < 对象列表]" #: builtin/pack-objects.c:183 builtin/pack-objects.c:186 #, c-format msgid "deflate error (%d)" msgstr "压缩错误 (%d)" #: builtin/pack-objects.c:2397 #, c-format msgid "unsupported index version %s" msgstr "ä¸æ”¯æŒçš„索引版本 %s" #: builtin/pack-objects.c:2401 #, c-format msgid "bad index version '%s'" msgstr "å的索引版本 '%s'" #: builtin/pack-objects.c:2424 #, c-format msgid "option %s does not accept negative form" msgstr "选项 %s ä¸æŽ¥å—å¦å®šæ ¼å¼" #: builtin/pack-objects.c:2428 #, c-format msgid "unable to parse value '%s' for option %s" msgstr "ä¸èƒ½è§£æžé€‰é¡¹ %1$s 的值 '%2$s'" #: builtin/pack-objects.c:2447 msgid "do not show progress meter" msgstr "ä¸æ˜¾ç¤ºè¿›åº¦è¡¨" #: builtin/pack-objects.c:2449 msgid "show progress meter" msgstr "显示进度表" #: builtin/pack-objects.c:2451 msgid "show progress meter during object writing phase" msgstr "在对象写入阶段显示进度表" #: builtin/pack-objects.c:2454 msgid "similar to --all-progress when progress meter is shown" msgstr "当进度表显示时类似于 --all-progress" #: builtin/pack-objects.c:2455 msgid "version[,offset]" msgstr "版本[,å移]" #: builtin/pack-objects.c:2456 msgid "write the pack index file in the specified idx format version" msgstr "用指定的 idx æ ¼å¼ç‰ˆæœ¬æ¥å†™åŒ…索引文件" #: builtin/pack-objects.c:2459 msgid "maximum size of each output pack file" msgstr "æ¯ä¸ªè¾“出包的最大尺寸" #: builtin/pack-objects.c:2461 msgid "ignore borrowed objects from alternate object store" msgstr "忽略从替代对象å˜å‚¨é‡Œå€Ÿç”¨å¯¹è±¡" #: builtin/pack-objects.c:2463 msgid "ignore packed objects" msgstr "忽略包对象" #: builtin/pack-objects.c:2465 msgid "limit pack window by objects" msgstr "é™åˆ¶æ‰“包窗å£çš„对象数" #: builtin/pack-objects.c:2467 msgid "limit pack window by memory in addition to object limit" msgstr "除对象数é‡é™åˆ¶å¤–设置打包窗å£çš„内å˜é™åˆ¶" #: builtin/pack-objects.c:2469 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "打包å…许的 delta 链的最大长度" #: builtin/pack-objects.c:2471 msgid "reuse existing deltas" msgstr "é‡ç”¨å·²å˜åœ¨çš„ deltas" #: builtin/pack-objects.c:2473 msgid "reuse existing objects" msgstr "é‡ç”¨å·²å˜åœ¨çš„对象" #: builtin/pack-objects.c:2475 msgid "use OFS_DELTA objects" msgstr "使用 OFS_DELTA 对象" #: builtin/pack-objects.c:2477 msgid "use threads when searching for best delta matches" msgstr "使用线程查询最佳 delta 匹é…" #: builtin/pack-objects.c:2479 msgid "do not create an empty pack output" msgstr "ä¸åˆ›å»ºç©ºçš„包输出" #: builtin/pack-objects.c:2481 msgid "read revision arguments from standard input" msgstr "ä»Žæ ‡å‡†è¾“å…¥è¯»å–修订å·å‚æ•°" #: builtin/pack-objects.c:2483 msgid "limit the objects to those that are not yet packed" msgstr "é™åˆ¶é‚£äº›å°šæœªæ‰“包的对象" #: builtin/pack-objects.c:2486 msgid "include objects reachable from any reference" msgstr "包括å¯ä»¥ä»Žä»»ä½•å¼•ç”¨è®¿é—®åˆ°çš„对象" #: builtin/pack-objects.c:2489 msgid "include objects referred by reflog entries" msgstr "包括被引用日志引用到的对象" #: builtin/pack-objects.c:2492 msgid "output pack to stdout" msgstr "è¾“å‡ºåŒ…åˆ°æ ‡å‡†è¾“å‡º" #: builtin/pack-objects.c:2494 msgid "include tag objects that refer to objects to be packed" msgstr "包括引用了打包对象的 tag" #: builtin/pack-objects.c:2496 msgid "keep unreachable objects" msgstr "ç»´æŒä¸å¯è¾¾çš„对象" #: builtin/pack-objects.c:2497 parse-options.h:141 msgid "time" msgstr "时间" #: builtin/pack-objects.c:2498 msgid "unpack unreachable objects newer than <time>" msgstr "将比给定 <时间> æ–°çš„æ— æ³•è®¿é—®çš„å¯¹è±¡è§£åŒ…" #: builtin/pack-objects.c:2501 msgid "create thin packs" msgstr "创建精简包" #: builtin/pack-objects.c:2503 msgid "ignore packs that have companion .keep file" msgstr "忽略é…有 .keep 文件的包" #: builtin/pack-objects.c:2505 msgid "pack compression level" msgstr "打包压缩级别" #: builtin/pack-objects.c:2507 msgid "do not hide commits by grafts" msgstr "ä¸éšè—移æ¤è¦†ç›–çš„æ交" #: builtin/pack-refs.c:6 msgid "git pack-refs [options]" msgstr "git pack-refs [选项]" #: builtin/pack-refs.c:14 msgid "pack everything" msgstr "打包一切" #: builtin/pack-refs.c:15 msgid "prune loose refs (default)" msgstr "清除æ¾æ•£çš„引用(默认)" #: builtin/prune-packed.c:7 msgid "git prune-packed [-n|--dry-run] [-q|--quiet]" msgstr "git prune-packed [-n|--dry-run] [-q|--quiet]" #: builtin/prune.c:12 msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]" #: builtin/prune.c:132 msgid "do not remove, show only" msgstr "ä¸åˆ 除,åªæ˜¾ç¤º" #: builtin/prune.c:133 msgid "report pruned objects" msgstr "报告清除的对象" #: builtin/prune.c:136 msgid "expire objects older than <time>" msgstr "使早于给定时间的对象过期" #: builtin/push.c:14 msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "git push [<选项>] [<版本库> [<引用表达å¼>...]]" #: 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" "而没有告诉我è¦æŽ¨é€ä»€ä¹ˆã€æ›´æ–°å“ªä¸ªè¿œç¨‹åˆ†æ”¯ã€‚" # 译者:å—符串首行行首è¦æ·»åŠ “warning: â€å—串,故æ¤é¦–è¡Œè¦è¾ƒå…¶ä½™è¡ŒçŸ #: builtin/push.c:151 msgid "" "push.default is unset; its implicit value is changing in\n" "Git 2.0 from 'matching' to 'simple'. To squelch this message\n" "and maintain the current behavior after the default changes, use:\n" "\n" " git config --global push.default matching\n" "\n" "To squelch this message and adopt the new behavior now, use:\n" "\n" " git config --global push.default simple\n" "\n" "See 'git help config' and search for 'push.default' for further " "information.\n" "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n" "'current' instead of 'simple' if you sometimes use older versions of Git)" msgstr "" "push.default 未设置,它的默认值将会在 Git 2.0 ç”± 'matching'\n" "修改为 'simple'。若è¦ä¸å†æ˜¾ç¤ºæœ¬ä¿¡æ¯å¹¶åœ¨å…¶é»˜è®¤å€¼æ”¹å˜åŽç»´æŒå½“å‰ä½¿ç”¨ä¹ 惯,\n" "进行如下设置:\n" "\n" " git config --global push.default matching\n" "\n" "è‹¥è¦ä¸å†æ˜¾ç¤ºæœ¬ä¿¡æ¯å¹¶ä»ŽçŽ°åœ¨å¼€å§‹é‡‡ç”¨æ–°çš„ä½¿ç”¨ä¹ æƒ¯ï¼Œè®¾ç½®ï¼š\n" "\n" " git config --global push.default simple\n" "\n" "å‚è§ 'git help config' 并查找 'push.default' 以获å–更多信æ¯ã€‚\n" "('simple' 模å¼ç”± Git 1.7.11 版本引入。如果您有时è¦ä½¿ç”¨è€ç‰ˆæœ¬çš„ Git,\n" "为ä¿æŒå…¼å®¹ï¼Œè¯·ç”¨ 'current' 代替 'simple' 模å¼ï¼‰" #: builtin/push.c:199 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "您没有为推é€æŒ‡å®šä»»ä½•å¼•ç”¨è¡¨è¾¾å¼ï¼Œå¹¶ä¸” push.default 为 \"nothing\"。" #: builtin/push.c:206 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:212 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 variable\n" "to 'simple', 'current' or 'upstream' to push only the current branch." msgstr "" "更新被拒ç»ï¼Œå› 为推é€çš„一个分支的最新æ交è½åŽäºŽå…¶å¯¹åº”的远程分支。\n" "如果您并éžæœ‰æ„推é€è¯¥åˆ†æ”¯ï¼Œæ‚¨å¯ä»¥åœ¨æŽ¨é€æ—¶æŒ‡å®šè¦æŽ¨é€çš„分支,或者将\n" "é…ç½®å˜é‡ 'push.default' 设置为 'simple'ã€'current' 或 'upstream'\n" "以便åªæŽ¨é€å½“å‰åˆ†æ”¯ã€‚" #: builtin/push.c:218 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:224 msgid "" "Updates were rejected because the remote contains work that you do\n" "not have locally. This is usually caused by another repository pushing\n" "to the same ref. You may want to first merge the remote changes (e.g.,\n" "'git pull') before pushing again.\n" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" "更新被拒ç»ï¼Œå› 为远程版本库包å«æ‚¨æœ¬åœ°å°šä¸å˜åœ¨çš„æäº¤ã€‚è¿™é€šå¸¸æ˜¯å› ä¸ºå¦å¤–\n" "一个版本库已推é€äº†ç›¸åŒçš„引用。å†æ¬¡æŽ¨é€å‰ï¼Œæ‚¨å¯èƒ½éœ€è¦å…ˆåˆå¹¶è¿œç¨‹å˜æ›´\n" "(如 'git pull')。\n" "è¯¦è§ 'git push --help' ä¸çš„ 'Note about fast-forwards' å°èŠ‚。" #: builtin/push.c:231 msgid "Updates were rejected because the tag already exists in the remote." msgstr "更新被拒ç»å› 为 tag 在远程已ç»å˜åœ¨ã€‚" #: builtin/push.c:234 msgid "" "You cannot update a remote ref that points at a non-commit object,\n" "or update a remote ref to make it point at a non-commit object,\n" "without using the '--force' option.\n" msgstr "" "如果ä¸ä½¿ç”¨ '--force' å‚数,您ä¸èƒ½æ›´æ–°ä¸€ä¸ªæŒ‡å‘éžæ交对象的远程引用,\n" "也ä¸èƒ½æ›´æ–°è¿œç¨‹å¼•ç”¨è®©å…¶æŒ‡å‘一个éžæ交对象。\n" #: builtin/push.c:294 #, c-format msgid "Pushing to %s\n" msgstr "推é€åˆ° %s\n" #: builtin/push.c:298 #, c-format msgid "failed to push some refs to '%s'" msgstr "æ— æ³•æŽ¨é€ä¸€äº›å¼•ç”¨åˆ° '%s'" #: builtin/push.c:331 #, c-format msgid "bad repository '%s'" msgstr "å的版本库 '%s'" #: builtin/push.c:332 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:347 msgid "--all and --tags are incompatible" msgstr "--all å’Œ --tags ä¸å…¼å®¹" #: builtin/push.c:348 msgid "--all can't be combined with refspecs" msgstr "--all ä¸èƒ½å’Œå¼•ç”¨è¡¨è¾¾å¼åŒæ—¶ä½¿ç”¨" #: builtin/push.c:353 msgid "--mirror and --tags are incompatible" msgstr "--mirror å’Œ --tags ä¸å…¼å®¹" #: builtin/push.c:354 msgid "--mirror can't be combined with refspecs" msgstr "--mirror ä¸èƒ½å’Œå¼•ç”¨è¡¨è¾¾å¼åŒæ—¶ä½¿ç”¨" #: builtin/push.c:359 msgid "--all and --mirror are incompatible" msgstr "--all å’Œ --mirror ä¸å…¼å®¹" #: builtin/push.c:419 msgid "repository" msgstr "版本库" #: builtin/push.c:420 msgid "push all refs" msgstr "推é€æ‰€æœ‰å¼•ç”¨" #: builtin/push.c:421 msgid "mirror all refs" msgstr "é•œåƒæ‰€æœ‰å¼•ç”¨" #: builtin/push.c:423 msgid "delete refs" msgstr "åˆ é™¤å¼•ç”¨" #: builtin/push.c:424 msgid "push tags (can't be used with --all or --mirror)" msgstr "æŽ¨é€ tags(ä¸èƒ½ä½¿ç”¨ --all or --mirror)" #: builtin/push.c:427 msgid "force updates" msgstr "强制更新" #: builtin/push.c:428 msgid "check" msgstr "检查" #: builtin/push.c:429 msgid "control recursive pushing of submodules" msgstr "控制å模组的递归推é€" #: builtin/push.c:431 msgid "use thin pack" msgstr "使用精简打包" #: builtin/push.c:432 builtin/push.c:433 msgid "receive pack program" msgstr "接收包程åº" #: builtin/push.c:434 msgid "set upstream for git pull/status" msgstr "设置 git pull/status 的上游" #: builtin/push.c:437 msgid "prune locally removed refs" msgstr "æ¸…é™¤æœ¬åœ°åˆ é™¤çš„å¼•ç”¨" #: builtin/push.c:439 msgid "bypass pre-push hook" msgstr "绕过 pre-push é’©å" #: builtin/push.c:440 msgid "push missing but relevant tags" msgstr "推é€ç¼ºå¤±çš„有关的 tags" #: builtin/push.c:450 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete 与 --allã€--mirror åŠ --tags ä¸å…¼å®¹" #: builtin/push.c:452 msgid "--delete doesn't make sense without any refs" msgstr "--delete 未接任何引用没有æ„义" #: builtin/read-tree.c:36 msgid "" "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] " "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" msgstr "" "git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<å‰ç¼€>] [-" "u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" "index-output=<文件>] (--empty | <æ ‘æˆ–æ交1> [<æ ‘æˆ–æ交2> [<æ ‘æˆ–æ交3>]])" #: builtin/read-tree.c:108 msgid "write resulting index to <file>" msgstr "将索引结果写入 <file>" #: builtin/read-tree.c:111 msgid "only empty the index" msgstr "åªæ˜¯æ¸…空索引" #: builtin/read-tree.c:113 msgid "Merging" msgstr "åˆå¹¶" #: builtin/read-tree.c:115 msgid "perform a merge in addition to a read" msgstr "读å–之余å†æ‰§è¡Œä¸€ä¸ªåˆå¹¶" #: builtin/read-tree.c:117 msgid "3-way merge if no file level merging required" msgstr "如果没有文件级åˆå¹¶éœ€è¦ï¼Œæ‰§è¡Œä¸‰è·¯åˆå¹¶" #: builtin/read-tree.c:119 msgid "3-way merge in presence of adds and removes" msgstr "å˜åœ¨æ·»åŠ å’Œåˆ é™¤æ—¶ï¼Œä¹Ÿæ‰§è¡Œä¸‰è·¯åˆå¹¶" #: builtin/read-tree.c:121 msgid "same as -m, but discard unmerged entries" msgstr "类似于 -m,但丢弃未åˆå¹¶çš„æ¡ç›®" #: builtin/read-tree.c:122 msgid "<subdirectory>/" msgstr "<å目录>/" #: builtin/read-tree.c:123 msgid "read the tree into the index under <subdirectory>/" msgstr "读å–æ ‘å¯¹è±¡åˆ°ç´¢å¼•çš„ <å目录>/ 下" #: builtin/read-tree.c:126 msgid "update working tree with merge result" msgstr "用åˆå¹¶çš„结果更新工作区" #: builtin/read-tree.c:128 msgid "gitignore" msgstr "gitignore" #: builtin/read-tree.c:129 msgid "allow explicitly ignored files to be overwritten" msgstr "å…许忽略文件ä¸è®¾å®šçš„文件å¯ä»¥è¢«è¦†ç›–" #: builtin/read-tree.c:132 msgid "don't check the working tree after merging" msgstr "åˆå¹¶åŽä¸æ£€æŸ¥å·¥ä½œåŒº" #: builtin/read-tree.c:133 msgid "don't update the index or the work tree" msgstr "ä¸æ›´æ–°ç´¢å¼•åŒºå’Œå·¥ä½œåŒº" #: builtin/read-tree.c:135 msgid "skip applying sparse checkout filter" msgstr "跳过应用稀ç–检出过滤器" #: builtin/read-tree.c:137 msgid "debug unpack-trees" msgstr "调试 unpack-trees" #: builtin/remote.c:11 msgid "git remote [-v | --verbose]" msgstr "git remote [-v | --verbose]" #: builtin/remote.c:12 msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--" "mirror=<fetch|push>] <name> <url>" msgstr "" "git remote add [-t <分支>] [-m <master>] [-f] [--tags|--no-tags] [--" "mirror=<fetch|push>] <å称> <url>" #: builtin/remote.c:13 builtin/remote.c:32 msgid "git remote rename <old> <new>" msgstr "git remote rename <æ—§å称> <æ–°å称>" #: builtin/remote.c:14 builtin/remote.c:37 msgid "git remote remove <name>" msgstr "git remote remove <å称>" #: builtin/remote.c:15 builtin/remote.c:42 msgid "git remote set-head <name> (-a | -d | <branch>)" msgstr "git remote set-head <å称> (-a | -d | <分支>)" #: builtin/remote.c:16 msgid "git remote [-v | --verbose] show [-n] <name>" msgstr "git remote [-v | --verbose] show [-n] <å称>" #: builtin/remote.c:17 msgid "git remote prune [-n | --dry-run] <name>" msgstr "git remote prune [-n | --dry-run] <å称>" #: builtin/remote.c:18 msgid "" "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]" #: builtin/remote.c:19 msgid "git remote set-branches [--add] <name> <branch>..." msgstr "git remote set-branches [--add] <å称> <分支>..." #: builtin/remote.c:20 builtin/remote.c:68 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" msgstr "git remote set-url [--push] <å称> <新的地å€> [<旧的地å€>]" #: builtin/remote.c:21 builtin/remote.c:69 msgid "git remote set-url --add <name> <newurl>" msgstr "git remote set-url --add <å称> <新的地å€>" #: builtin/remote.c:22 builtin/remote.c:70 msgid "git remote set-url --delete <name> <url>" msgstr "git remote set-url --delete <å称> <地å€>" #: builtin/remote.c:27 msgid "git remote add [<options>] <name> <url>" msgstr "git remote add [<选项>] <å称> <地å€>" #: builtin/remote.c:47 msgid "git remote set-branches <name> <branch>..." msgstr "git remote set-branches <å称> <分支>..." #: builtin/remote.c:48 msgid "git remote set-branches --add <name> <branch>..." msgstr "git remote set-branches --add <å称> <分支>..." #: builtin/remote.c:53 msgid "git remote show [<options>] <name>" msgstr "git remote show [<选项>] <å称>" #: builtin/remote.c:58 msgid "git remote prune [<options>] <name>" msgstr "git remote prune [<选项>] <å称>" #: builtin/remote.c:63 msgid "git remote update [<options>] [<group> | <remote>]..." msgstr "git remote update [<选项>] [<组> | <远程>]..." #: 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:163 msgid "fetch the remote branches" msgstr "抓å–远程的分支" #: builtin/remote.c:165 msgid "import all tags and associated objects when fetching" msgstr "抓å–时导入所有的 tags 和关è”对象" #: builtin/remote.c:168 msgid "or do not fetch any tag at all (--no-tags)" msgstr "或ä¸æŠ“å–任何 tag(--no-tags)" #: builtin/remote.c:170 msgid "branch(es) to track" msgstr "跟踪的分支" #: builtin/remote.c:171 msgid "master branch" msgstr "主线分支" #: builtin/remote.c:172 msgid "push|fetch" msgstr "push|fetch" #: builtin/remote.c:173 msgid "set up remote as a mirror to push to or fetch from" msgstr "把远程设置为用以推é€æˆ–抓å–çš„é•œåƒ" #: 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:1091 msgid "do not query remotes" msgstr "ä¸æŸ¥è¯¢è¿œç¨‹" #: 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:1199 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "æ ¹æ®è¿œç¨‹è®¾ç½® refs/remotes/<å称>/HEAD" #: builtin/remote.c:1201 msgid "delete refs/remotes/<name>/HEAD" msgstr "åˆ é™¤ refs/remotes/<å称>/HEAD" #: 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:1321 msgid "prune remotes after fetching" msgstr "抓å–åŽæ¸…除远程" #: builtin/remote.c:1387 builtin/remote.c:1461 #, c-format msgid "No such remote '%s'" msgstr "没有æ¤è¿œç¨‹ '%s'" #: builtin/remote.c:1407 msgid "add branch" msgstr "æ·»åŠ åˆ†æ”¯" #: builtin/remote.c:1414 msgid "no remote specified" msgstr "未指定远程" #: builtin/remote.c:1436 msgid "manipulate push URLs" msgstr "æ“ä½œæŽ¨é€ URLS" #: builtin/remote.c:1438 msgid "add URL" msgstr "æ·»åŠ URL" #: builtin/remote.c:1440 msgid "delete URLs" msgstr "åˆ é™¤ URLS" #: 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/remote.c:1569 msgid "be verbose; must be placed before a subcommand" msgstr "冗长输出;必须置于å命令之å‰" #: builtin/replace.c:17 msgid "git replace [-f] <object> <replacement>" msgstr "git replace [-f] <对象> <替æ¢ç‰©>" #: builtin/replace.c:18 msgid "git replace -d <object>..." msgstr "git replace -d <对象>..." #: builtin/replace.c:19 msgid "git replace -l [<pattern>]" msgstr "git replace -l [<模å¼>]" #: builtin/replace.c:121 msgid "list replace refs" msgstr "列出替æ¢çš„引用" #: builtin/replace.c:122 msgid "delete replace refs" msgstr "åˆ é™¤æ›¿æ¢çš„引用" #: builtin/replace.c:123 msgid "replace the ref if it exists" msgstr "如果å˜åœ¨åˆ™æ›¿æ¢å¼•ç”¨" #: builtin/rerere.c:11 msgid "git rerere [clear | forget path... | status | remaining | diff | gc]" msgstr "git rerere [clear | forget path... | status | remaining | diff | gc]" #: builtin/rerere.c:56 msgid "register clean resolutions in index" msgstr "在索引ä¸æ³¨å†Œå¹²å‡€çš„解决方案" #: builtin/reset.c:25 msgid "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<æ交>]" #: builtin/reset.c:26 msgid "git reset [-q] <tree-ish> [--] <paths>..." msgstr "git reset [-q] <æ ‘æˆ–æ交> [--] <路径>..." #: builtin/reset.c:27 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" msgstr "git reset --patch [<æ ‘æˆ–æ交>] [--] [<路径>...]" #: 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:73 msgid "You do not have a valid HEAD." msgstr "您没有一个有效的 HEAD。" #: builtin/reset.c:75 msgid "Failed to find tree of HEAD." msgstr "æ— æ³•æ‰¾åˆ° HEAD 指å‘çš„æ ‘ã€‚" #: builtin/reset.c:81 #, c-format msgid "Failed to find tree of %s." msgstr "æ— æ³•æ‰¾åˆ° %s 指å‘çš„æ ‘ã€‚" #: builtin/reset.c:98 #, c-format msgid "HEAD is now at %s" msgstr "HEAD 现在ä½äºŽ %s" # 译者:汉å—ä¹‹é—´æ— ç©ºæ ¼ï¼Œæ•…åˆ é™¤%så‰åŽç©ºæ ¼ #: builtin/reset.c:169 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "在åˆå¹¶è¿‡ç¨‹ä¸ä¸èƒ½åš%sé‡ç½®æ“作。" #: builtin/reset.c:248 msgid "be quiet, only report errors" msgstr "安é™æ¨¡å¼ï¼ŒåªæŠ¥å‘Šé”™è¯¯" #: builtin/reset.c:250 msgid "reset HEAD and index" msgstr "é‡ç½® HEAD 和索引" #: builtin/reset.c:251 msgid "reset only HEAD" msgstr "åªé‡ç½® HEAD" #: builtin/reset.c:253 builtin/reset.c:255 msgid "reset HEAD, index and working tree" msgstr "é‡ç½® HEADã€ç´¢å¼•å’Œå·¥ä½œåŒº" #: builtin/reset.c:257 msgid "reset HEAD but keep local changes" msgstr "é‡ç½® HEAD 但ä¿å˜æœ¬åœ°å˜æ›´" #: builtin/reset.c:275 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "æ— æ³•å°† '%s' 解æžä¸ºä¸€ä¸ªæœ‰æ•ˆçš„版本。" #: builtin/reset.c:278 builtin/reset.c:286 #, c-format msgid "Could not parse object '%s'." msgstr "ä¸èƒ½è§£æžå¯¹è±¡ '%s'。" #: builtin/reset.c:283 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "æ— æ³•å°† '%s' 解æžä¸ºä¸€ä¸ªæœ‰æ•ˆçš„æ ‘å¯¹è±¡ã€‚" #: builtin/reset.c:292 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch 与 --{hardã€mixedã€soft} 选项ä¸å…¼å®¹" #: builtin/reset.c:301 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "--mixed 带路径已弃用,而是用 'git reset -- <paths>'。" # 译者:汉å—ä¹‹é—´æ— ç©ºæ ¼ï¼Œæ•…åˆ é™¤%så‰åŽç©ºæ ¼ #: builtin/reset.c:303 #, c-format msgid "Cannot do %s reset with paths." msgstr "ä¸èƒ½å¸¦è·¯å¾„进行%sé‡ç½®ã€‚" # 译者:汉å—ä¹‹é—´æ— ç©ºæ ¼ï¼Œæ•…åˆ é™¤%så‰åŽç©ºæ ¼ #: builtin/reset.c:313 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "ä¸èƒ½å¯¹è£¸ç‰ˆæœ¬åº“进行%sé‡ç½®" #: builtin/reset.c:333 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "ä¸èƒ½é‡ç½®ç´¢å¼•æ–‡ä»¶è‡³ç‰ˆæœ¬ '%s'。" #: builtin/reset.c:339 msgid "Unstaged changes after reset:" msgstr "é‡ç½®åŽæ’¤å‡ºæš‚å˜åŒºçš„å˜æ›´ï¼š" #: builtin/reset.c:344 msgid "Could not write new index file." msgstr "ä¸èƒ½å†™å…¥æ–°çš„索引文件。" #: builtin/rev-parse.c:339 msgid "git rev-parse --parseopt [options] -- [<args>...]" msgstr "git rev-parse --parseopt [选项] -- [<å‚æ•°>...]" #: builtin/rev-parse.c:344 msgid "keep the `--` passed as an arg" msgstr "ä¿æŒ `--` 作为一个å‚æ•°ä¼ é€’" #: builtin/rev-parse.c:346 msgid "stop parsing after the first non-option argument" msgstr "é‡åˆ°ç¬¬ä¸€ä¸ªéžé€‰é¡¹å‚æ•°åŽåœæ¢è§£æž" #: builtin/rev-parse.c:464 msgid "" "git rev-parse --parseopt [options] -- [<args>...]\n" " or: git rev-parse --sq-quote [<arg>...]\n" " or: git rev-parse [options] [<arg>...]\n" "\n" "Run \"git rev-parse --parseopt -h\" for more information on the first usage." msgstr "" "git rev-parse --parseopt [选项] -- [<å‚æ•°>...]\n" " 或者:git rev-parse --sq-quote [<选项>...]\n" " 或者:git rev-parse [options] [<选项>...]\n" "\n" "åˆæ¬¡ä½¿ç”¨æ—¶æ‰§è¡Œ \"git rev-parse --parseopt -h\" æ¥èŽ·å¾—更多信æ¯ã€‚" #: builtin/revert.c:22 msgid "git revert [options] <commit-ish>..." msgstr "git revert [选项] <æ交å·>..." #: builtin/revert.c:23 msgid "git revert <subcommand>" msgstr "git revert <å命令>" #: builtin/revert.c:28 msgid "git cherry-pick [options] <commit-ish>..." msgstr "git cherry-pick [选项] <æ交å·>..." #: builtin/revert.c:29 msgid "git cherry-pick <subcommand>" msgstr "git cherry-pick <å命令>" #: 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:103 msgid "end revert or cherry-pick sequence" msgstr "终æ¢å转或拣选æ“作" #: builtin/revert.c:104 msgid "resume revert or cherry-pick sequence" msgstr "继ç»å转或拣选æ“作" #: builtin/revert.c:105 msgid "cancel revert or cherry-pick sequence" msgstr "å–消å转或拣选æ“作" #: builtin/revert.c:106 msgid "don't automatically commit" msgstr "ä¸è¦è‡ªåŠ¨æ交" #: builtin/revert.c:107 msgid "edit the commit message" msgstr "编辑æ交说明" #: builtin/revert.c:110 msgid "parent number" msgstr "父编å·" #: builtin/revert.c:112 msgid "merge strategy" msgstr "åˆå¹¶ç–ç•¥" #: builtin/revert.c:113 msgid "option" msgstr "选项" #: builtin/revert.c:114 msgid "option for merge strategy" msgstr "åˆå¹¶ç–略的选项" #: builtin/revert.c:125 msgid "append commit name" msgstr "è¿½åŠ æ交å称" #: builtin/revert.c:126 msgid "allow fast-forward" msgstr "å…许快进å¼" #: builtin/revert.c:127 msgid "preserve initially empty commits" msgstr "ä¿ç•™åˆå§‹åŒ–的空æ交" #: builtin/revert.c:128 msgid "allow commits with empty messages" msgstr "å…许æ交说明为空" #: builtin/revert.c:129 msgid "keep redundant, empty commits" msgstr "ä¿æŒå¤šä½™çš„ã€ç©ºçš„æ交" #: builtin/revert.c:133 msgid "program error" msgstr "程åºé”™è¯¯" #: builtin/revert.c:223 msgid "revert failed" msgstr "还原失败" #: builtin/revert.c:238 msgid "cherry-pick failed" msgstr "拣选失败" #: builtin/rm.c:15 msgid "git rm [options] [--] <file>..." msgstr "git rm [选项] [--] <文件>..." #: builtin/rm.c:64 builtin/rm.c:186 #, c-format msgid "" "submodule '%s' (or one of its nested submodules) uses a .git directory\n" "(use 'rm -rf' if you really want to remove it including all of its history)" msgstr "" "å模组 '%s'(或者它的一个嵌套å模组)使用一个 .git 目录\n" "(使用 'rm -rf' å‘½ä»¤å¦‚æžœæ‚¨çœŸçš„æƒ³åˆ é™¤å®ƒåŠå…¶å…¨éƒ¨åŽ†å²ï¼‰" #: builtin/rm.c:174 #, 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:180 #, 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:191 #, 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:207 msgid "do not list removed files" msgstr "ä¸åˆ—å‡ºåˆ é™¤çš„æ–‡ä»¶" #: builtin/rm.c:208 msgid "only remove from the index" msgstr "åªä»Žç´¢å¼•åŒºåˆ 除" #: builtin/rm.c:209 msgid "override the up-to-date check" msgstr "忽略文件更新状æ€æ£€æŸ¥" #: builtin/rm.c:210 msgid "allow recursive removal" msgstr "å…è®¸é€’å½’åˆ é™¤" #: builtin/rm.c:212 msgid "exit with a zero status even if nothing matched" msgstr "å³ä½¿æ²¡æœ‰åŒ¹é…,也以零状æ€é€€å‡º" #: builtin/rm.c:283 #, c-format msgid "not removing '%s' recursively without -r" msgstr "未æä¾› -r 选项ä¸ä¼šé€’å½’åˆ é™¤ '%s'" #: builtin/rm.c:322 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm:ä¸èƒ½åˆ 除 %s" #: builtin/shortlog.c:13 msgid "git shortlog [<options>] [<revision range>] [[--] [<path>...]]" msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]" #: builtin/shortlog.c:131 #, c-format msgid "Missing author: %s" msgstr "缺少作者:%s" #: builtin/shortlog.c:227 msgid "sort output according to the number of commits per author" msgstr "æ ¹æ®æ¯ä¸ªä½œè€…çš„æ交数é‡æŽ’åº" #: builtin/shortlog.c:229 msgid "Suppress commit descriptions, only provides commit count" msgstr "éšè—æ交说明,åªæä¾›æ交数é‡" #: builtin/shortlog.c:231 msgid "Show the email address of each author" msgstr "显示æ¯ä¸ªä½œè€…的电å邮件地å€" #: builtin/shortlog.c:232 msgid "w[,i1[,i2]]" msgstr "w[,i1[,i2]]" #: builtin/shortlog.c:233 msgid "Linewrap output" msgstr "折行输出" #: builtin/show-branch.c:9 msgid "" "git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--" "current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --" "independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | " "<glob>)...]" msgstr "" "git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--" "current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --" "independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | " "<glob>)...]" #: builtin/show-branch.c:10 msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]" msgstr "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]" #: builtin/show-branch.c:650 msgid "show remote-tracking and local branches" msgstr "显示远程跟踪的和本地的分支" #: builtin/show-branch.c:652 msgid "show remote-tracking branches" msgstr "显示远程跟踪的分支" #: builtin/show-branch.c:654 msgid "color '*!+-' corresponding to the branch" msgstr "ç€è‰² '*!+-' 到相应的分支" #: builtin/show-branch.c:656 msgid "show <n> more commits after the common ancestor" msgstr "显示共åŒç¥–å…ˆåŽçš„ <n> 个æ交" #: builtin/show-branch.c:658 msgid "synonym to more=-1" msgstr "å’Œ more=-1 åŒä¹‰" #: builtin/show-branch.c:659 msgid "suppress naming strings" msgstr "ä¸æ˜¾ç¤ºå—符串命å" #: builtin/show-branch.c:661 msgid "include the current branch" msgstr "包括当å‰åˆ†æ”¯" #: builtin/show-branch.c:663 msgid "name commits with their object names" msgstr "以对象åå—命åæ交" #: builtin/show-branch.c:665 msgid "show possible merge bases" msgstr "显示å¯èƒ½åˆå¹¶çš„基线" #: builtin/show-branch.c:667 msgid "show refs unreachable from any other ref" msgstr "显示没有任何引用的的引用" #: builtin/show-branch.c:669 msgid "show commits in topological order" msgstr "以拓扑顺åºæ˜¾ç¤ºæ交" #: builtin/show-branch.c:671 msgid "show only commits not on the first branch" msgstr "åªæ˜¾ç¤ºä¸åœ¨ç¬¬ä¸€ä¸ªåˆ†æ”¯ä¸Šçš„æ交" #: builtin/show-branch.c:673 msgid "show merges reachable from only one tip" msgstr "显示仅一个分支å¯è®¿é—®çš„åˆå¹¶æ交" #: builtin/show-branch.c:675 msgid "show commits where no parent comes before its children" msgstr "显示æ交时以时间为åºä¸”父æ交ä¸èƒ½é¢†å…ˆåæ交" #: builtin/show-branch.c:677 msgid "<n>[,<base>]" msgstr "<n>[,<base>]" #: builtin/show-branch.c:678 msgid "show <n> most recent ref-log entries starting at base" msgstr "显示从 base 开始的 <n> æ¡æœ€è¿‘的引用日志记录" #: builtin/show-ref.c:10 msgid "" "git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--" "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] " msgstr "" "git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--" "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] " #: builtin/show-ref.c:11 msgid "git show-ref --exclude-existing[=pattern] < ref-list" msgstr "git show-ref --exclude-existing[=模å¼] < 引用列表" #: builtin/show-ref.c:165 msgid "only show tags (can be combined with heads)" msgstr "åªæ˜¾ç¤º tags(å¯ä»¥å’Œå¤´å…±ç”¨ï¼‰" #: builtin/show-ref.c:166 msgid "only show heads (can be combined with tags)" msgstr "åªæ˜¾ç¤ºå¤´ï¼ˆå¯ä»¥å’Œ tags 共用)" #: builtin/show-ref.c:167 msgid "stricter reference checking, requires exact ref path" msgstr "æ›´ä¸¥æ ¼çš„å¼•ç”¨æ£€æµ‹ï¼Œéœ€è¦ç²¾ç¡®çš„引用路径" #: builtin/show-ref.c:170 builtin/show-ref.c:172 msgid "show the HEAD reference" msgstr "显示 HEAD 引用" #: builtin/show-ref.c:174 msgid "dereference tags into object IDs" msgstr "è½¬æ¢ tags 到对象ID" #: builtin/show-ref.c:176 msgid "only show SHA1 hash using <n> digits" msgstr "åªæ˜¾ç¤ºä½¿ç”¨ <n> 个数å—çš„ SHA1 哈希" #: builtin/show-ref.c:180 msgid "do not print results to stdout (useful with --verify)" msgstr "ä¸æ‰“å°ç»“æžœåˆ°æ ‡å‡†è¾“å‡ºï¼ˆä¾‹å¦‚ä¸Ž --verify å‚数共用)" #: builtin/show-ref.c:182 msgid "show refs from stdin that aren't in local repository" msgstr "æ˜¾ç¤ºä»Žæ ‡å‡†è¾“å…¥ä¸è¯»å…¥çš„ä¸åœ¨æœ¬åœ°ç‰ˆæœ¬åº“ä¸çš„引用" #: builtin/symbolic-ref.c:7 msgid "git symbolic-ref [options] name [ref]" msgstr "git symbolic-ref [选项] å称 [引用]" #: builtin/symbolic-ref.c:8 msgid "git symbolic-ref -d [-q] name" msgstr "git symbolic-ref -d [-q] å称" #: builtin/symbolic-ref.c:40 msgid "suppress error message for non-symbolic (detached) refs" msgstr "ä¸æ˜¾ç¤ºéžç¬¦å·ï¼ˆåˆ†ç¦»çš„)引用的错误信æ¯" #: builtin/symbolic-ref.c:41 msgid "delete symbolic ref" msgstr "åˆ é™¤ç¬¦å·å¼•ç”¨" #: builtin/symbolic-ref.c:42 msgid "shorten ref output" msgstr "简çŸçš„引用输出" #: builtin/symbolic-ref.c:43 builtin/update-ref.c:18 msgid "reason" msgstr "åŽŸå› " #: builtin/symbolic-ref.c:43 builtin/update-ref.c:18 msgid "reason of the update" msgstr "æ›´æ–°çš„åŽŸå› " #: builtin/tag.c:22 msgid "" "git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]" msgstr "git tag [-a|-s|-u <key-id>] [-f] [-m <说明>|-F <文件>] <æ ‡ç¾å> [<头>]" #: builtin/tag.c:23 msgid "git tag -d <tagname>..." msgstr "git tag -d <æ ‡ç¾å>..." #: builtin/tag.c:24 msgid "" "git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n" "\t\t[<pattern>...]" msgstr "" "git tag -l [-n[<num>]] [--contains <æ交>] [--points-at <对象>] \n" "\t\t[<模å¼>...]" #: builtin/tag.c:26 msgid "git tag -v <tagname>..." msgstr "git tag -v <æ ‡ç¾å>..." #: 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 #, c-format msgid "" "\n" "Write a tag message\n" "Lines starting with '%c' will be ignored.\n" msgstr "" "\n" "输入一个 tag 说明\n" "以 '%c' 开头的行将被忽略。\n" #: builtin/tag.c:253 #, c-format msgid "" "\n" "Write a tag message\n" "Lines starting with '%c' will be kept; you may remove them yourself if you " "want to.\n" msgstr "" "\n" "输入一个 tag 说明\n" "以 '%c' 开头的行将被ä¿ç•™ï¼Œå¦‚果您愿æ„也å¯ä»¥åˆ 除它们。\n" #: builtin/tag.c:292 msgid "unable to sign the tag" msgstr "æ— æ³•ç¾ç½² tag" #: builtin/tag.c:294 msgid "unable to write tag file" msgstr "æ— æ³•å†™ tag 文件" #: builtin/tag.c:319 msgid "bad object type." msgstr "å的对象类型。" #: builtin/tag.c:332 msgid "tag header too big." msgstr "tag 头信æ¯å¤ªå¤§ã€‚" #: builtin/tag.c:368 msgid "no tag message?" msgstr "æ— tag 说明?" #: builtin/tag.c:374 #, c-format msgid "The tag message has been left in %s\n" msgstr "tag 说明被ä¿ç•™åœ¨ %s\n" #: builtin/tag.c:423 msgid "switch 'points-at' requires an object" msgstr "开关 'points-at' 需è¦ä¸€ä¸ªå¯¹è±¡" #: builtin/tag.c:425 #, c-format msgid "malformed object name '%s'" msgstr "éžæ³•çš„对象å '%s'" #: builtin/tag.c:445 msgid "list tag names" msgstr "列出tagå称" #: builtin/tag.c:447 msgid "print <n> lines of each tag message" msgstr "æ¯ä¸ª tag ä¿¡æ¯æ‰“å° <n> è¡Œ" #: builtin/tag.c:449 msgid "delete tags" msgstr "åˆ é™¤ tags" #: builtin/tag.c:450 msgid "verify tags" msgstr "éªŒè¯ tags" #: builtin/tag.c:452 msgid "Tag creation options" msgstr "Tag 创建选项" #: builtin/tag.c:454 msgid "annotated tag, needs a message" msgstr "注解 tag,需è¦ä¸€ä¸ªè¯´æ˜Ž" #: builtin/tag.c:456 msgid "tag message" msgstr "tag 说明" #: builtin/tag.c:458 msgid "annotated and GPG-signed tag" msgstr "注解并 GPG ç¾åçš„ tag" #: builtin/tag.c:462 msgid "use another key to sign the tag" msgstr "使用å¦å¤–çš„ç§é’¥ç¾å tag" #: builtin/tag.c:463 msgid "replace the tag if exists" msgstr "如果å˜åœ¨ï¼Œæ›¿æ¢çŽ°æœ‰çš„ tag" #: builtin/tag.c:464 msgid "show tag list in columns" msgstr "以列的方å¼æ˜¾ç¤º tag" #: builtin/tag.c:466 msgid "Tag listing options" msgstr "Tag 列表选项" #: builtin/tag.c:469 msgid "print only tags that contain the commit" msgstr "åªæ‰“å°åŒ…å«æ交的tags" #: builtin/tag.c:475 msgid "print only tags of the object" msgstr "åªæ‰“å°tags对象" #: builtin/tag.c:504 msgid "--column and -n are incompatible" msgstr "--column å’Œ -n ä¸å…¼å®¹" #: builtin/tag.c:521 msgid "-n option is only allowed with -l." msgstr "-n 选项åªå…许和 -l åŒæ—¶ä½¿ç”¨ã€‚" #: builtin/tag.c:523 msgid "--contains option is only allowed with -l." msgstr "--contains 选项åªå…许和 -l åŒæ—¶ä½¿ç”¨ã€‚" #: builtin/tag.c:525 msgid "--points-at option is only allowed with -l." msgstr "--points-at 选项åªå…许和 -l åŒæ—¶ä½¿ç”¨ã€‚" #: builtin/tag.c:533 msgid "only one -F or -m option is allowed." msgstr "åªå…许一个 -F 或 -m 选项。" #: builtin/tag.c:553 msgid "too many params" msgstr "太多å‚æ•°" #: builtin/tag.c:559 #, c-format msgid "'%s' is not a valid tag name." msgstr "'%s' ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„tagå称。" #: builtin/tag.c:564 #, c-format msgid "tag '%s' already exists" msgstr "tag '%s' å·²å˜åœ¨" #: builtin/tag.c:582 #, c-format msgid "%s: cannot lock the ref" msgstr "%s:ä¸èƒ½é”定引用" #: builtin/tag.c:584 #, c-format msgid "%s: cannot update the ref" msgstr "%s:ä¸èƒ½æ›´æ–°å¼•ç”¨" #: builtin/tag.c:586 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "已更新tag '%s'(曾为 %s)\n" #: builtin/update-index.c:401 msgid "git update-index [options] [--] [<file>...]" msgstr "git update-index [选项] [--] [<文件>...]" #: builtin/update-index.c:718 msgid "continue refresh even when index needs update" msgstr "当索引需è¦æ›´æ–°æ—¶ç»§ç»åˆ·æ–°" #: builtin/update-index.c:721 msgid "refresh: ignore submodules" msgstr "刷新:忽略å模组" #: builtin/update-index.c:724 msgid "do not ignore new files" msgstr "ä¸å¿½ç•¥æ–°çš„文件" #: builtin/update-index.c:726 msgid "let files replace directories and vice-versa" msgstr "让文件替æ¢ç›®å½•ï¼ˆå之亦然)" #: builtin/update-index.c:728 msgid "notice files missing from worktree" msgstr "通知文件从工作区丢失" #: builtin/update-index.c:730 msgid "refresh even if index contains unmerged entries" msgstr "å³ä½¿ç´¢å¼•åŒºåŒ…å«æœªåˆå¹¶çš„æ¡ç›®ä¹Ÿæ‰§è¡Œåˆ·æ–°" #: builtin/update-index.c:733 msgid "refresh stat information" msgstr "刷新统计信æ¯" #: builtin/update-index.c:737 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置" #: builtin/update-index.c:741 msgid "<mode> <object> <path>" msgstr "<mode> <object> <path>" #: builtin/update-index.c:742 msgid "add the specified entry to the index" msgstr "æ·»åŠ æŒ‡å®šçš„æ¡ç›®åˆ°ç´¢å¼•åŒº" #: builtin/update-index.c:746 msgid "(+/-)x" msgstr "(+/-)x" #: builtin/update-index.c:747 msgid "override the executable bit of the listed files" msgstr "覆盖列表里文件的å¯æ‰§è¡Œä½" #: builtin/update-index.c:751 msgid "mark files as \"not changing\"" msgstr "æŠŠæ–‡ä»¶æ ‡è®°ä¸º \"没有å˜æ›´\"" #: builtin/update-index.c:754 msgid "clear assumed-unchanged bit" msgstr "清除 assumed-unchanged ä½" #: builtin/update-index.c:757 msgid "mark files as \"index-only\"" msgstr "æŠŠæ–‡ä»¶æ ‡è®°ä¸º \"仅索引\"" #: builtin/update-index.c:760 msgid "clear skip-worktree bit" msgstr "清除 skip-worktree ä½" #: builtin/update-index.c:763 msgid "add to index only; do not add content to object database" msgstr "åªæ·»åŠ 到索引区;ä¸æ·»åŠ 对象到对象库" #: builtin/update-index.c:765 msgid "remove named paths even if present in worktree" msgstr "å³ä½¿å˜åœ¨å·¥ä½œåŒºé‡Œï¼Œä¹Ÿåˆ 除路径" #: builtin/update-index.c:767 msgid "with --stdin: input lines are terminated by null bytes" msgstr "æºå¸¦ --stdin:输入的行以 null å—符终æ¢" #: builtin/update-index.c:769 msgid "read list of paths to be updated from standard input" msgstr "ä»Žæ ‡å‡†è¾“å…¥ä¸è¯»å–需è¦æ›´æ–°çš„路径列表" #: builtin/update-index.c:773 msgid "add entries from standard input to the index" msgstr "ä»Žæ ‡å‡†è¾“å…¥æ·»åŠ æ¡ç›®åˆ°ç´¢å¼•åŒº" #: builtin/update-index.c:777 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "为指定文件é‡æ–°ç”Ÿæˆç¬¬2和第3æš‚å˜åŒº" #: builtin/update-index.c:781 msgid "only update entries that differ from HEAD" msgstr "åªæ›´æ–°ä¸Ž HEAD ä¸åŒçš„æ¡ç›®" #: builtin/update-index.c:785 msgid "ignore files missing from worktree" msgstr "忽略工作区丢失的文件" #: builtin/update-index.c:788 msgid "report actions to standard output" msgstr "åœ¨æ ‡å‡†è¾“å‡ºæ˜¾ç¤ºæ“作" #: builtin/update-index.c:790 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(for porcelains) 忘记ä¿å˜çš„未解决的冲çª" #: builtin/update-index.c:794 msgid "write index in this format" msgstr "以这ç§æ ¼å¼å†™å…¥ç´¢å¼•åŒº" #: builtin/update-ref.c:7 msgid "git update-ref [options] -d <refname> [<oldval>]" msgstr "git update-ref [options] -d <引用å> [<旧值>]" #: builtin/update-ref.c:8 msgid "git update-ref [options] <refname> <newval> [<oldval>]" msgstr "git update-ref [options] <引用å> <新值> [<旧值>]" #: builtin/update-ref.c:19 msgid "delete the reference" msgstr "åˆ é™¤å¼•ç”¨" #: builtin/update-ref.c:21 msgid "update <refname> not the one it points to" msgstr "æ›´æ–° <引用å> 本身而ä¸æ˜¯å®ƒæŒ‡å‘的引用" #: builtin/update-server-info.c:6 msgid "git update-server-info [--force]" msgstr "git update-server-info [--force]" #: builtin/update-server-info.c:14 msgid "update the info files from scratch" msgstr "从头开始更新文件信æ¯" #: builtin/verify-pack.c:56 msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..." msgstr "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..." #: builtin/verify-pack.c:66 msgid "verbose" msgstr "冗长输出" #: builtin/verify-pack.c:68 msgid "show statistics only" msgstr "åªæ˜¾ç¤ºç»Ÿè®¡" #: builtin/verify-tag.c:17 msgid "git verify-tag [-v|--verbose] <tag>..." msgstr "git verify-tag [-v|--verbose] <tag>..." #: builtin/verify-tag.c:73 msgid "print tag contents" msgstr "æ‰“å° tag 内容" #: builtin/write-tree.c:13 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" msgstr "git write-tree [--missing-ok] [--prefix=<å‰ç¼€>/]" #: builtin/write-tree.c:26 msgid "<prefix>/" msgstr "<å‰ç¼€>/" #: builtin/write-tree.c:27 msgid "write tree object for a subdirectory <prefix>" msgstr "å°† <å‰ç¼€> åç›®å½•å†…å®¹å†™åˆ°ä¸€ä¸ªæ ‘å¯¹è±¡" #: builtin/write-tree.c:30 msgid "only useful for debugging" msgstr "åªå¯¹è°ƒè¯•æœ‰ç”¨" #: git.c:16 msgid "" "'git help -a' and 'git help -g' lists available subcommands and some\n" "concept guides. See 'git help <command>' or 'git help <concept>'\n" "to read about a specific subcommand or concept." msgstr "" "命令 'git help -a' å’Œ 'git help -g' 显示å¯ç”¨çš„å命令和一些指å—。å‚è§\n" "'git help <命令>' 或 'git help <指å—>' æ¥æŸ¥çœ‹ç»™å®šçš„å命令帮助或指å—。" #: parse-options.h:156 msgid "no-op (backward compatibility)" msgstr "空æ“作(å‘åŽå…¼å®¹ï¼‰" #: parse-options.h:232 msgid "be more verbose" msgstr "æ›´åŠ è¯¦ç»†" #: parse-options.h:234 msgid "be more quiet" msgstr "æ›´åŠ å®‰é™" #: parse-options.h:240 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 prefer to skip this patch, run \"$cmdline --skip\" instead.\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:139 msgid "Using index info to reconstruct a base tree..." msgstr "使用索引æ¥é‡å»ºä¸€ä¸ªï¼ˆä¸‰è·¯åˆå¹¶çš„ï¼‰åŸºç¡€ç›®å½•æ ‘..." #: git-am.sh:154 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." msgstr "" "您是å¦æ›¾æ‰‹åŠ¨ç¼–辑过您的补ä¸ï¼Ÿ\n" "æ— æ³•åº”ç”¨è¡¥ä¸åˆ°ç´¢å¼•ä¸çš„æ•°æ®ï¼ˆblob)对象上。" #: git-am.sh:163 msgid "Falling back to patching base and 3-way merge..." msgstr "转而在基础版本上打补ä¸åŠè¿›è¡Œä¸‰è·¯åˆå¹¶..." #: git-am.sh:179 msgid "Failed to merge in the changes." msgstr "æ— æ³•åˆå¹¶å˜æ›´ã€‚" #: git-am.sh:274 msgid "Only one StGIT patch series can be applied at once" msgstr "一次åªèƒ½æœ‰ä¸€ä¸ª StGIT è¡¥ä¸é˜Ÿåˆ—被应用" #: git-am.sh:361 #, sh-format msgid "Patch format $patch_format is not supported." msgstr "ä¸æ”¯æŒ $patch_format è¡¥ä¸æ ¼å¼ã€‚" #: git-am.sh:363 msgid "Patch format detection failed." msgstr "è¡¥ä¸æ ¼å¼æ£€æµ‹å¤±è´¥ã€‚" #: git-am.sh:389 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." msgstr "" "å‚æ•° -b/--binary å·²ç»å¾ˆé•¿æ—¶é—´ä¸åšä»»ä½•å®žè´¨æ“ä½œäº†ï¼Œå¹¶ä¸”å°†è¢«åˆ é™¤ã€‚\n" "请ä¸è¦å†ä½¿ç”¨å®ƒäº†ã€‚" #: git-am.sh:477 #, sh-format msgid "previous rebase directory $dotest still exists but mbox given." msgstr "之å‰çš„å˜åŸºç›®å½• $dotest ä»ç„¶å˜åœ¨ä½†ç»™å‡ºäº†mbox。" #: git-am.sh:482 msgid "Please make up your mind. --skip or --abort?" msgstr "请下决心。--skip 或是 --abort ?" #: git-am.sh:509 msgid "Resolve operation not in progress, we are not resuming." msgstr "解决æ“作未进行,我们ä¸ä¼šç»§ç»ã€‚" #: git-am.sh:575 #, sh-format msgid "Dirty index: cannot apply patches (dirty: $files)" msgstr "è„的索引:ä¸èƒ½åº”用补ä¸ï¼ˆè„文件:$files)" #: git-am.sh:679 #, 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:706 msgid "Patch does not have a valid e-mail address." msgstr "è¡¥ä¸ä¸æ²¡æœ‰ä¸€ä¸ªæœ‰æ•ˆçš„邮件地å€ã€‚" #: git-am.sh:753 msgid "cannot be interactive without stdin connected to a terminal." msgstr "æ ‡å‡†è¾“å…¥æ²¡æœ‰å’Œç»ˆç«¯å…³è”,ä¸èƒ½è¿›è¡Œäº¤äº’å¼æ“作。" #: git-am.sh:757 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:764 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:800 #, sh-format msgid "Applying: $FIRSTLINE" msgstr "æ£åº”用:$FIRSTLINE" #: git-am.sh:821 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:829 msgid "" "You still have unmerged paths in your index\n" "did you forget to use 'git add'?" msgstr "您的索引ä¸ä»æœ‰æœªåˆå¹¶çš„路径。您是å¦å¿˜äº†æ‰§è¡Œ 'git add'?" #: git-am.sh:845 msgid "No changes -- Patch already applied." msgstr "没有å˜æ›´ —— è¡¥ä¸å·²ç»åº”用过。" #: git-am.sh:855 #, sh-format msgid "Patch failed at $msgnum $FIRSTLINE" msgstr "è¡¥ä¸å¤±è´¥äºŽ $msgnum $FIRSTLINE" #: git-am.sh:858 #, sh-format msgid "" "The copy of the patch that failed is found in:\n" " $dotest/patch" msgstr "" "失败的补ä¸æ–‡ä»¶å‰¯æœ¬ä½äºŽï¼š\n" " $dotest/patch" #: git-am.sh:876 msgid "applying to an empty history" 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:363 git-bisect.sh:490 msgid "We are not bisecting." msgstr "我们没有在二分查找。" #: git-bisect.sh:370 #, sh-format msgid "'$invalid' is not a valid commit" msgstr "'$invalid' ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„æ交" #: git-bisect.sh:379 #, sh-format msgid "" "Could not check out original HEAD '$branch'.\n" "Try 'git bisect reset <commit>'." msgstr "" "ä¸èƒ½æ£€å‡ºåŽŸå§‹ HEAD '$branch'。\n" "å°è¯• 'git bisect reset <æ交>'。" #: git-bisect.sh:406 msgid "No logfile given" msgstr "未æ供日志文件" #: git-bisect.sh:407 #, sh-format msgid "cannot read $file for replaying" msgstr "ä¸èƒ½è¯»å– $file æ¥é‡æ”¾" #: git-bisect.sh:424 msgid "?? what are you talking about?" msgstr "?? 您在说什么?" #: git-bisect.sh:436 #, sh-format msgid "running $command" msgstr "è¿è¡Œ $command" #: git-bisect.sh:443 #, 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:469 msgid "bisect run cannot continue any more" msgstr "二分查找ä¸èƒ½ç»§ç»è¿è¡Œ" #: git-bisect.sh:475 #, sh-format msgid "" "bisect run failed:\n" "'bisect_state $state' exited with error code $res" msgstr "" "二分查找è¿è¡Œå¤±è´¥ï¼š\n" "'bisect_state $state' 退出ç 为 $res" #: git-bisect.sh:482 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:203 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:235 #, 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:260 msgid "Cannot merge multiple branches into empty head" msgstr "æ— æ³•å°†å¤šä¸ªåˆ†æ”¯åˆå¹¶åˆ°ç©ºåˆ†æ”¯" #: git-pull.sh:264 msgid "Cannot rebase onto multiple branches" msgstr "æ— æ³•å˜åŸºåˆ°å¤šä¸ªåˆ†æ”¯" #: git-rebase.sh:53 msgid "" "When you have resolved this problem, run \"git rebase --continue\".\n" "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n" "To check out the original branch and stop rebasing, run \"git rebase --abort" "\"." msgstr "" "当您解决了æ¤é—®é¢˜åŽï¼Œæ‰§è¡Œ \"git rebase --continue\"。\n" "如果您想跳过æ¤è¡¥ä¸ï¼Œåˆ™æ‰§è¡Œ \"git rebase --skip\"。\n" "è¦æ¢å¤åŽŸåˆ†æ”¯å¹¶åœæ¢å˜åŸºï¼Œæ‰§è¡Œ \"git rebase --abort\"。" #: git-rebase.sh:160 msgid "The pre-rebase hook refused to rebase." msgstr "é’©å pre-rebase æ‹’ç»å˜åŸºã€‚" #: git-rebase.sh:165 msgid "It looks like git-am is in progress. Cannot rebase." msgstr "似乎æ£å¤„于在 git-am 的执行过程ä¸ã€‚æ— æ³•å˜åŸºã€‚" #: git-rebase.sh:296 msgid "The --exec option must be used with the --interactive option" msgstr "选项 --exec 必须和选项 --interactive åŒæ—¶ä½¿ç”¨" #: git-rebase.sh:301 msgid "No rebase in progress?" msgstr "没有æ£åœ¨è¿›è¡Œçš„å˜åŸºï¼Ÿ" #: git-rebase.sh:312 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "动作 --edit-todo åªèƒ½ç”¨åœ¨äº¤äº’å¼å˜åŸºè¿‡ç¨‹ä¸ã€‚" #: git-rebase.sh:319 msgid "Cannot read HEAD" msgstr "ä¸èƒ½è¯»å– HEAD" #: git-rebase.sh:322 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" msgstr "" "您必须编辑所有的åˆå¹¶å†²çªï¼Œç„¶åŽé€šè¿‡ git add\n" "å‘½ä»¤å°†å®ƒä»¬æ ‡è®°ä¸ºå·²è§£å†³" #: git-rebase.sh:340 #, sh-format msgid "Could not move back to $head_name" msgstr "æ— æ³•ç§»å›ž $head_name" #: git-rebase.sh:359 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" "I wonder if you are in the middle of another rebase. If that is the\n" "case, please try\n" "\t$cmd_live_rebase\n" "If that is not the case, please\n" "\t$cmd_clear_stale_rebase\n" "and run me again. I am stopping in case you still have something\n" "valuable there." msgstr "" "好åƒå·²æœ‰ä¸€ä¸ª $state_dir_base 目录,我怀疑您æ£å¤„于å¦å¤–一个å˜åŸºè¿‡ç¨‹ä¸ã€‚\n" "å¦‚æžœæ˜¯è¿™æ ·ï¼Œè¯·å°è¯•æ‰§è¡Œ\n" "\t$cmd_live_rebase\n" "如果ä¸æ˜¯è¿™æ ·ï¼Œè¯·æ‰§è¡Œ\n" "\t$cmd_clear_stale_rebase\n" "然åŽå†é‡æ–°æ‰§è¡Œå˜åŸºã€‚为é¿å…您丢失é‡è¦æ•°æ®ï¼Œæˆ‘å·²ç»åœæ¢å½“å‰æ“作。" #: git-rebase.sh:404 #, sh-format msgid "invalid upstream $upstream_name" msgstr "æ— æ•ˆçš„ä¸Šæ¸¸ $upstream_name" #: git-rebase.sh:428 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "$onto_name: 有一个以上的åˆå¹¶åŸºå‡†" #: git-rebase.sh:431 git-rebase.sh:435 #, sh-format msgid "$onto_name: there is no merge base" msgstr "$onto_name: 没有åˆå¹¶åŸºå‡†" #: git-rebase.sh:440 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "没有指å‘一个有效的æ交:$onto_name" #: git-rebase.sh:463 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "严é‡é”™è¯¯ï¼šæ— æ¤åˆ†æ”¯ï¼š$branch_name" #: git-rebase.sh:483 msgid "Please commit or stash them." msgstr "请æ交或为它们ä¿å˜è¿›åº¦ã€‚" #: git-rebase.sh:501 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "当å‰åˆ†æ”¯ $branch_name 是最新的。" #: git-rebase.sh:504 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "当å‰åˆ†æ”¯ $branch_name 是最新的,强制å˜åŸºã€‚" #: git-rebase.sh:515 #, sh-format msgid "Changes from $mb to $onto:" msgstr "å˜æ›´ä»Ž $mb 到 $onto:" #. Detach HEAD and reset the tree #: git-rebase.sh:524 msgid "First, rewinding head to replay your work on top of it..." msgstr "首先,é‡ç½®å¤´æŒ‡é’ˆä»¥ä¾¿åœ¨ä¸Šé¢é‡æ”¾æ‚¨çš„工作..." #: git-rebase.sh:532 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "å¿«è¿› $branch_name 至 $onto_name。" #: 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:475 msgid "Index was not unstashed." msgstr "索引的进度没有被æ¢å¤ã€‚" #: git-stash.sh:492 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "丢弃了 ${REV} ($s)" #: git-stash.sh:493 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}:ä¸èƒ½ä¸¢å¼ƒè¿›åº¦æ¡ç›®" #: git-stash.sh:500 msgid "No branch name specified" msgstr "未指定分支å" #: git-stash.sh:571 msgid "(To restore them type \"git stash apply\")" msgstr "(为æ¢å¤æ•°æ®è¾“å…¥ \"git stash apply\")" #: git-submodule.sh:91 #, sh-format msgid "cannot strip one component off url '$remoteurl'" msgstr "æ— æ³•ä»Ž url '$remoteurl' 剥离一个组件" #: git-submodule.sh:196 #, sh-format msgid "No submodule mapping found in .gitmodules for path '$sm_path'" msgstr "未在 .gitmodules ä¸å‘现路径 '$sm_path' çš„åæ¨¡ç»„æ˜ å°„" #: git-submodule.sh:239 #, sh-format msgid "Clone of '$url' into submodule path '$sm_path' failed" msgstr "æ— æ³•å…‹éš† '$url' 到å模组路径 '$sm_path'" #: git-submodule.sh:251 #, sh-format msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa" msgstr "Gitdir '$a' 在å模组路径 '$b' 之下或相å" #: git-submodule.sh:349 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "版本库URL:'$repo' 必须是ç»å¯¹è·¯å¾„或以 ./|../ 起始" #: git-submodule.sh:366 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "'$sm_path' å·²ç»å˜åœ¨äºŽç´¢å¼•ä¸" #: git-submodule.sh:370 #, 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:388 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "æ·»åŠ ä½äºŽ '$sm_path' 的现å˜ç‰ˆæœ¬åº“到索引" #: git-submodule.sh:390 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "'$sm_path' å·²å˜åœ¨ä¸”ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„ git 版本库" #: git-submodule.sh:398 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "本地å‘现 '$sm_name' 的一个 git 目录,与其对应的远程版本库:" #: git-submodule.sh:400 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from" msgstr "如果您想é‡ç”¨æ¤æœ¬åœ° git 目录而ä¸æ˜¯é‡æ–°å…‹éš†è‡ª" #: git-submodule.sh:402 #, sh-format msgid "" "use the '--force' option. If the local git directory is not the correct repo" msgstr "使用 '--force' å‚数。如果本地 git 目录ä¸æ˜¯æ£ç¡®çš„版本库" #: git-submodule.sh:403 #, sh-format msgid "" "or you are unsure what this means choose another name with the '--name' " "option." msgstr "或者您ä¸ç¡®å®šå…¶ä¸å«ä¹‰ä½¿ç”¨ '--name' å‚数选择å¦å¤–一个å称。" #: git-submodule.sh:405 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "激活本地 git 目录到å模组 '$sm_name'。" #: git-submodule.sh:417 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "ä¸èƒ½æ£€å‡ºå模组 '$sm_path'" #: git-submodule.sh:422 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "æ— æ³•æ·»åŠ å模组 '$sm_path'" #: git-submodule.sh:431 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "æ— æ³•æ³¨å†Œå模组 '$sm_path'" #: git-submodule.sh:474 #, sh-format msgid "Entering '$prefix$sm_path'" msgstr "æ£åœ¨è¿›å…¥ '$prefix$sm_path'" #: git-submodule.sh:488 #, sh-format msgid "Stopping at '$sm_path'; script returned non-zero status." msgstr "åœæ¢äºŽ '$sm_path',脚本返回éžé›¶å€¼ã€‚" #: git-submodule.sh:532 #, sh-format msgid "No url found for submodule path '$sm_path' in .gitmodules" msgstr "在 .gitmodules ä¸æœªæ‰¾åˆ°å模组路径 '$sm_path' çš„ url" #: git-submodule.sh:541 #, sh-format msgid "Failed to register url for submodule path '$sm_path'" msgstr "æ— æ³•ä¸ºå模组路径 '$sm_path' 注册 url" #: git-submodule.sh:543 #, sh-format msgid "Submodule '$name' ($url) registered for path '$sm_path'" msgstr "å模组 '$name' ($url) 已为路径 '$sm_path' 注册" #: git-submodule.sh:551 #, sh-format msgid "Failed to register update mode for submodule path '$sm_path'" msgstr "æ— æ³•ä¸ºå模组路径 '$sm_path' 注册更新模å¼" #: git-submodule.sh:588 #, sh-format msgid "Use '.' if you really want to deinitialize all submodules" msgstr "使用 '.' 如果您真的想è¦å¯¹æ‰€æœ‰å模组å–消åˆå§‹åŒ–" #: git-submodule.sh:603 #, sh-format msgid "Submodule work tree '$sm_path' contains a .git directory" msgstr "å模组工作区 '$sm_path' 包å«ä¸€ä¸ª .git 目录" #: git-submodule.sh:604 #, sh-format msgid "" "(use 'rm -rf' if you really want to remove it including all of its history)" msgstr "(使用 'rm -rf' å‘½ä»¤å¦‚æžœæ‚¨çœŸçš„æƒ³åˆ é™¤å®ƒåŠå…¶å…¨éƒ¨åŽ†å²ï¼‰" #: git-submodule.sh:610 #, sh-format msgid "" "Submodule work tree '$sm_path' contains local modifications; use '-f' to " "discard them" msgstr "å模组工作区 '$sm_path' 包å«æœ¬åœ°ä¿®æ”¹ï¼›ä½¿ç”¨ '-f' 丢弃它们" #: git-submodule.sh:613 #, sh-format msgid "Cleared directory '$sm_path'" msgstr "已清除目录 '$sm_path'" #: git-submodule.sh:614 #, sh-format msgid "Could not remove submodule work tree '$sm_path'" msgstr "æ— æ³•ç§»é™¤å模组工作区 '$sm_path'" #: git-submodule.sh:617 #, sh-format msgid "Could not create empty submodule directory '$sm_path'" msgstr "ä¸èƒ½åˆ›å»ºç©ºçš„å模组目录 '$sm_path'" #: git-submodule.sh:626 #, sh-format msgid "Submodule '$name' ($url) unregistered for path '$sm_path'" msgstr "å模组 '$name' ($url) 未对路径 '$sm_path' 注册" #: git-submodule.sh:731 #, sh-format msgid "" "Submodule path '$prefix$sm_path' not initialized\n" "Maybe you want to use 'update --init'?" msgstr "" "å模组路径 '$prefix$sm_path' 没有åˆå§‹åŒ–\n" "也许您想用 'update --init'?" #: git-submodule.sh:744 #, sh-format msgid "Unable to find current revision in submodule path '$prefix$sm_path'" msgstr "æ— æ³•åœ¨å模组路径 '$prefix$sm_path' ä¸æ‰¾åˆ°å½“å‰ç‰ˆæœ¬" #: git-submodule.sh:753 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "æ— æ³•åœ¨å模组路径 '$sm_path' ä¸èŽ·å–" #: git-submodule.sh:777 #, sh-format msgid "Unable to fetch in submodule path '$prefix$sm_path'" msgstr "æ— æ³•åœ¨å模组路径 '$prefix$sm_path' ä¸èŽ·å–" #: git-submodule.sh:791 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$prefix$sm_path'" msgstr "æ— æ³•åœ¨å模组路径 '$prefix$sm_path' ä¸å˜åŸº '$sha1'" #: git-submodule.sh:792 #, sh-format msgid "Submodule path '$prefix$sm_path': rebased into '$sha1'" msgstr "å模组路径 '$prefix$sm_path':å˜åŸºè‡³ '$sha1'" #: git-submodule.sh:797 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$prefix$sm_path'" msgstr "æ— æ³•åˆå¹¶ '$sha1' 到å模组路径 '$prefix$sm_path' ä¸" #: git-submodule.sh:798 #, sh-format msgid "Submodule path '$prefix$sm_path': merged in '$sha1'" msgstr "å模组路径 '$prefix$sm_path':已åˆå¹¶å…¥ '$sha1'" #: git-submodule.sh:803 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$prefix$sm_path'" msgstr "æ— æ³•åœ¨å模组路径 '$prefix$sm_path' ä¸æ£€å‡º '$sha1'" #: git-submodule.sh:804 #, sh-format msgid "Submodule path '$prefix$sm_path': checked out '$sha1'" msgstr "å模组路径 '$prefix$sm_path':检出 '$sha1'" #: git-submodule.sh:831 #, sh-format msgid "Failed to recurse into submodule path '$prefix$sm_path'" msgstr "æ— æ³•é€’å½’è¿›å模组路径 '$prefix$sm_path'" #: git-submodule.sh:939 msgid "The --cached option cannot be used with the --files option" msgstr "选项 --cached ä¸èƒ½å’Œé€‰é¡¹ --files åŒæ—¶ä½¿ç”¨" #. unexpected type #: git-submodule.sh:979 #, sh-format msgid "unexpected mode $mod_dst" msgstr "æ„å¤–çš„æ¨¡å¼ $mod_dst" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: git-submodule.sh:997 #, sh-format msgid " Warn: $name doesn't contain commit $sha1_src" msgstr " è¦å‘Šï¼š$name 未包å«æ交 $sha1_src" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: git-submodule.sh:1000 #, sh-format msgid " Warn: $name doesn't contain commit $sha1_dst" msgstr " è¦å‘Šï¼š$name 未包å«æ交 $sha1_dst" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: git-submodule.sh:1003 #, sh-format msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst" msgstr " è¦å‘Šï¼š$name 未包å«æ交 $sha1_src å’Œ $sha1_dst" #: git-submodule.sh:1028 msgid "blob" msgstr "æ•°æ®å¯¹è±¡" #: git-submodule.sh:1066 msgid "Submodules changed but not updated:" msgstr "å模组已修改但尚未更新:" #: git-submodule.sh:1068 msgid "Submodule changes to be committed:" msgstr "è¦æ交的å模组å˜æ›´ï¼š" #: git-submodule.sh:1153 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "æ— æ³•é€’å½’è¿›å模组路径 '$sm_path'" #: git-submodule.sh:1216 #, sh-format msgid "Synchronizing submodule url for '$prefix$sm_path'" msgstr "为 '$prefix$sm_path' åŒæ¥å模组 url" #~ msgid "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]" #~ msgstr "git shortlog [-n] [-s] [-e] [-w] [版本选项] [--] [<æ交å·>... ]" #~ msgid "See 'git help <command>' for more information on a specific command." #~ msgstr "å‚è§ 'git help <command>' 以获得该特定命令的详细信æ¯ã€‚" #~ msgid "BUG: impossible combination of %d and %p" #~ msgstr "BUG: æ— æ³•ç»„åˆ %d å’Œ %p" # 译者:以下三æ¡å®žé™…ä¸ºä¸€ä¸ªæ®µè½ #~ msgid "It took %.2f seconds to enumerate untracked files. 'status -uno'" #~ msgstr "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno'" # 译者:为对é½ï¼Œä¸‹é¢ä¸¤å¥å†…容有调整 #~ msgid "may speed it up, but you have to be careful not to forget to add" #~ msgstr "也许能æ高速度,但您需è¦å°å¿ƒä¸è¦å¿˜äº†æ·»åŠ 新文件" #~ msgid "new files yourself (see 'git help status')." #~ msgstr "(å‚è§ 'git help status')。" #, fuzzy #~ msgid "aaaSynchronizing submodule url for '$prefix$sm_path'" #~ msgstr "为 '$prefix$sm_path' åŒæ¥å模组 url" #~ msgid "use any ref in .git/refs" #~ msgstr "使用 .git/refs 里的任æ„引用" #~ msgid "use any tag in .git/refs/tags" #~ msgstr "使用 .git/refs/tags é‡Œçš„ä»»æ„ tag" #~ msgid "bad object %s" #~ msgstr "å对象 %s" #~ msgid "bogus committer info %s" #~ msgstr "虚å‡çš„æäº¤è€…ä¿¡æ¯ %s" #~ msgid "can't fdopen 'show' output fd" #~ msgstr "ä¸èƒ½æ‰“å¼€ 'show' 输出文件å¥æŸ„" #~ msgid "failed to close pipe to 'show' for object '%s'" #~ msgstr "æ— æ³•ä¸ºå¯¹è±¡ '%s' çš„ 'show' å…³é—管é“" #~ msgid " 0 files changed" #~ msgstr " 0 个文件被修改" #~ msgid " %d file changed" #~ msgid_plural " %d files changed" #~ msgstr[0] " %d 个文件被修改" #~ msgstr[1] " %d 个文件被修改" #~ msgid ", %d insertion(+)" #~ msgid_plural ", %d insertions(+)" #~ msgstr[0] ",æ’å…¥ %d è¡Œ(+)" #~ msgstr[1] ",æ’å…¥ %d è¡Œ(+)" #~ msgid ", %d deletion(-)" #~ msgid_plural ", %d deletions(-)" #~ msgstr[0] "ï¼Œåˆ é™¤ %d è¡Œ(-)" #~ msgstr[1] "ï¼Œåˆ é™¤ %d è¡Œ(-)" #~ msgid "You do not have a valid HEAD" #~ msgstr "您没有一个有效的 HEAD" #~ msgid "oops" #~ msgstr "å“Žå“Ÿ" #~ msgid "Would not remove %s\n" #~ msgstr "ä¸ä¼šåˆ 除 %s\n" #~ msgid "Not removing %s\n" #~ msgstr "æœªåˆ é™¤ %s\n" #~ msgid "Auto packing the repository for optimum performance.\n" #~ msgstr "自动打包版本库以求最佳性能。\n" #~ msgid "git remote set-head <name> (-a | -d | <branch>])" #~ msgstr "git remote set-head <å称> (-a | -d | <分支>])" #~ msgid "Could not read index" #~ msgstr "ä¸èƒ½è¯»å–索引" # 译者:ä¸æ–‡å—符串拼接,å¯åˆ 除å‰å¯¼ç©ºæ ¼ #~ msgid " (use \"git add\" to track)" #~ msgstr "(使用 \"git add\" 建立跟踪)" #~ msgid "-B cannot be used with -b" #~ msgstr "-B ä¸èƒ½å’Œ -b åŒæ—¶ä½¿ç”¨" #~ msgid "--patch is incompatible with all other options" #~ msgstr "--patch 选项和其他选项ä¸å…¼å®¹" #~ msgid "--detach cannot be used with -b/-B/--orphan" #~ msgstr "--detach ä¸èƒ½å’Œ -b/-B/--orphan åŒæ—¶ä½¿ç”¨" #~ msgid "--detach cannot be used with -t" #~ msgstr "--detach ä¸èƒ½å’Œ -t åŒæ—¶ä½¿ç”¨" #~ msgid "--orphan and -b|-B are mutually exclusive" #~ msgstr "--orphan å’Œ -b|-B 互斥" #~ msgid "--orphan cannot be used with -t" #~ msgstr "--orphan ä¸èƒ½å’Œ -t åŒæ—¶ä½¿ç”¨" #~ msgid "git checkout: -f and -m are incompatible" #~ msgstr "git checkout:-f å’Œ -m ä¸å…¼å®¹" #~ msgid "" #~ "git checkout: updating paths is incompatible with switching branches." #~ msgstr "git checkout:更新路径和切æ¢åˆ†æ”¯ä¸å…¼å®¹ã€‚" #~ msgid "diff setup failed" #~ msgstr "diff 设置失败" #~ msgid "merge-recursive: disk full?" #~ msgstr "merge-recursive:ç£ç›˜å·²æ»¡ï¼Ÿ" #~ msgid "diff_setup_done failed" #~ msgstr "diff_setup_done 失败"