# 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. # Contributors: # - Fangyi Zhou <fangyi.zhou AT yuriko.moe> # - Jiang Xin <worldhello.net AT gmail.com> # - Lian Cheng <rhythm.mail AT gmail.com> # - Ray Chen <oldsharp AT gmail.com> # - Riku <lu.riku AT gmail.com> # - Thynson <lanxingcan AT gmail.com> # - ws3389 <willsmith3389 AT gmail.com> # - Wang Sheng <wangsheng2008love AT 163.com> # - ä¾äº‘ <lilydjwg AT gmail.com> # - Yichao Yu <yyc1992 AT gmail.com> # - Zhuang Ya <zhuangya AT me.com> # # Git glossary for Chinese translators # # English | Chinese # ---------------------------------+-------------------------------------- # 3-way merge | 三方åˆå¹¶ # abbreviate | 简写(的 SHA-1 值) # alternate object database | 备用对象库 # amend | 修补 # ancestor | 祖先,祖先æ交 # annotated tag | é™„æ³¨æ ‡ç¾ # bare repository | 纯仓库 # bisect | 二分查找 # blob object | æ•°æ®å¯¹è±¡ # branch | 分支 # bundle | 包 # bypass | 绕过 # cache | 索引(的别称) # chain | (æ交)链 # changeset | å˜æ›´é›† # checkout | 检出 # checksum | æ ¡éªŒï¼Œæ ¡éªŒå’Œ # cherry-picking | 拣选 # clean | 干净(的工作区) # clone | 克隆 # commit | æ交 # commit message | æ交说明 # commit object | æ交对象 # commit-ish (also committish) | æäº¤å· # conflict | å†²çª # core Git | æ ¸å¿ƒ Git 工具 # DAG | 有å‘æ— çŽ¯å›¾ # dangling object | 摇摆对象 # detached HEAD | 分离头指针 # directory | 目录 # dirty | è„(的工作区) # dumb HTTP protocol | å“‘ HTTP åè®® # evil merge | ååˆå¹¶ï¼ˆåˆå¹¶å¼•å…¥äº†çˆ¶æ交没有的修改) # fast-forward | å¿«è¿› # fetch | èŽ·å– # file system | 文件系统 # fork | 派生 # Git archive | 仓库(对于 arch 用户) # gitfile | gitfile(仓库链接文件) # grafts | (æäº¤ï¼‰ç§»æ¤ # hash | 哈希值 # HEAD | HEAD(头指针,亦å³å½“å‰åˆ†æ”¯ï¼‰ # head | 头ã€åˆ†æ”¯ # head ref | 分支 # header | å¤´ä¿¡æ¯ # hook | é’©å # hunk | è¡¥ä¸ç‰‡æ®µ # index | 索引 # index entry | 索引æ¡ç›® # loose object | æ¾æ•£å¯¹è±¡ # loose refs | æ¾æ•£å¼•ç”¨ # master | master(默认分支å) # merge | åˆå¹¶ # object | 对象 # object database | 对象库 # object identifier | å¯¹è±¡æ ‡è¯†ç¬¦ # object name | 对象å称 # object type | 对象类型 # octopus | ç« é±¼å¼åˆå¹¶ï¼ˆä¸¤åˆ†æ”¯ä»¥ä¸Šçš„åˆå¹¶ï¼‰ # origin | origin(默认的远程å称) # pack | 包 # pack index | 包索引 # packfile | 包文件 # parent | 父æ交 # patch | è¡¥ä¸ # pathspec | è·¯å¾„è§„æ ¼ # pattern | æ¨¡å¼ # pickaxe | 挖掘 # plumbing | 管件(Git åº•å±‚æ ¸å¿ƒå‘½ä»¤çš„åˆ«ç§°ï¼‰ # porcelain | 瓷件(Git 上层å°è£…命令的别称) # precious-objects repo | çå“仓库 # prune | 清除 # pull | æ‹‰ï¼Œæ‹‰å– # push | æŽ¨ï¼ŒæŽ¨é€ # reachable | å¯è¾¾ # rebase | å˜åŸº # ref | 引用 # reflog | 引用日志 # refspec | å¼•ç”¨è§„æ ¼ # remote | 远程,远程仓库 # remote-tracking branch | 远程跟踪分支 # replay | é‡æ”¾ # repo | 仓库 # repository | 仓库 # resolve | (冲çªï¼‰è§£å†³ # revert | 还原 # revision | 版本 # rewind | 回退 # SCM | æºä»£ç 管ç†ï¼ˆå·¥å…·ï¼‰ # SHA-1 | SHA-1(安全哈希算法1) # shallow repository | 浅(克隆)仓库 # signed tag | ç¾åæ ‡ç¾ # smart HTTP protocol | 智能 HTTP åè®® # squash | 压缩 # stage | n. æš‚å˜åŒºï¼ˆå³ç´¢å¼•ï¼‰; v. æš‚å˜ # stash | n. è´®è—区; v. è´®è— # submodule | å模组 # symref | 符å·å¼•ç”¨ # tag | n. æ ‡ç¾; v. æ‰“æ ‡ç¾ # tag object | æ ‡ç¾å¯¹è±¡ # tagger | æ‰“æ ‡ç¾è€… # topic branch | 主题分支 # track | 跟踪 # trailer | 尾部署å # tree | æ ‘ï¼ˆå·¥ä½œåŒºæˆ–æ ‘å¯¹è±¡ï¼‰ # tree object | æ ‘å¯¹è±¡ # tree-ish (also treeish) | æ ‘å¯¹è±¡ï¼ˆæˆ–å¯ä»¥è§£æžä¸ºä¸€æ ‘对象) # unmerged index | 未åˆå¹¶ç´¢å¼• # unpack | 解包 # unreachable object | ä¸å¯è¾¾å¯¹è±¡ # unstage | å–æ¶ˆæš‚å˜ # upstream | 上游 # upstream branch | 上游分支 # working tree | 工作区 # msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" "POT-Creation-Date: 2018-06-16 22:06+0800\n" "PO-Revision-Date: 2018-06-18 00:28+0800\n" "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n" "Language-Team: GitHub <https://github.com/jiangxin/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:92 #, c-format msgid "%shint: %.*s%s\n" msgstr "%sæ示:%.*s%s\n" #: advice.c:137 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "æ— æ³•æ‹£é€‰ï¼Œå› ä¸ºæ‚¨æœ‰æœªåˆå¹¶çš„文件。" #: advice.c:139 msgid "Committing is not possible because you have unmerged files." msgstr "æ— æ³•æäº¤ï¼Œå› ä¸ºæ‚¨æœ‰æœªåˆå¹¶çš„文件。" #: advice.c:141 msgid "Merging is not possible because you have unmerged files." msgstr "æ— æ³•åˆå¹¶ï¼Œå› 为您有未åˆå¹¶çš„文件。" #: advice.c:143 msgid "Pulling is not possible because you have unmerged files." msgstr "æ— æ³•æ‹‰å–ï¼Œå› ä¸ºæ‚¨æœ‰æœªåˆå¹¶çš„文件。" #: advice.c:145 msgid "Reverting is not possible because you have unmerged files." msgstr "æ— æ³•å›žé€€ï¼Œå› ä¸ºæ‚¨æœ‰æœªåˆå¹¶çš„文件。" #: advice.c:147 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "æ— æ³• %sï¼Œå› ä¸ºæ‚¨æœ‰æœªåˆå¹¶çš„文件。" #: advice.c:155 msgid "" "Fix them up in the work tree, and then use 'git add/rm <file>'\n" "as appropriate to mark resolution and make a commit." msgstr "" "请在工作区改æ£æ–‡ä»¶ï¼Œç„¶åŽé…Œæƒ…使用 'git add/rm <文件>' å‘½ä»¤æ ‡è®°\n" "解决方案并æ交。" #: advice.c:163 msgid "Exiting because of an unresolved conflict." msgstr "å› ä¸ºå˜åœ¨æœªè§£å†³çš„冲çªè€Œé€€å‡ºã€‚" #: advice.c:168 builtin/merge.c:1250 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "您尚未结æŸæ‚¨çš„åˆå¹¶ï¼ˆå˜åœ¨ MERGE_HEAD)。" #: advice.c:170 msgid "Please, commit your changes before merging." msgstr "请在åˆå¹¶å‰å…ˆæ交您的修改。" #: advice.c:171 msgid "Exiting because of unfinished merge." msgstr "å› ä¸ºå˜åœ¨æœªå®Œæˆçš„åˆå¹¶è€Œé€€å‡ºã€‚" #: advice.c:177 #, c-format msgid "" "Note: checking out '%s'.\n" "\n" "You are in 'detached HEAD' state. You can look around, make experimental\n" "changes and commit them, and you can discard any commits you make in this\n" "state without impacting any branches by performing another checkout.\n" "\n" "If you want to create a new branch to retain commits you create, you may\n" "do so (now or later) by using -b with the checkout command again. Example:\n" "\n" " git checkout -b <new-branch-name>\n" "\n" msgstr "" "注æ„:æ£åœ¨æ£€å‡º '%s'。\n" "\n" "您æ£å¤„于分离头指针状æ€ã€‚您å¯ä»¥æŸ¥çœ‹ã€åšè¯•éªŒæ€§çš„修改åŠæ交,并且您å¯ä»¥é€šè¿‡å¦" "外\n" "的检出分支æ“作丢弃在这个状æ€ä¸‹æ‰€åšçš„任何æ交。\n" "\n" "如果您想è¦é€šè¿‡åˆ›å»ºåˆ†æ”¯æ¥ä¿ç•™åœ¨æ¤çŠ¶æ€ä¸‹æ‰€åšçš„æ交,您å¯ä»¥é€šè¿‡åœ¨æ£€å‡ºå‘½ä»¤æ·»åŠ \n" "å‚æ•° -b æ¥å®žçŽ°ï¼ˆçŽ°åœ¨æˆ–ç¨åŽï¼‰ã€‚例如:\n" "\n" " git checkout -b <新分支å>\n" "\n" #: apply.c:58 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "未能识别的空白å—符选项 '%s'" #: apply.c:74 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "未能识别的空白å—符忽略选项 '%s'" #: apply.c:122 msgid "--reject and --3way cannot be used together." msgstr "--reject å’Œ --3way ä¸èƒ½åŒæ—¶ä½¿ç”¨ã€‚" #: apply.c:124 msgid "--cached and --3way cannot be used together." msgstr "--cached å’Œ --3way ä¸èƒ½åŒæ—¶ä½¿ç”¨ã€‚" #: apply.c:127 msgid "--3way outside a repository" msgstr "--3way 在一个仓库之外" #: apply.c:138 msgid "--index outside a repository" msgstr "--index 在一个仓库之外" #: apply.c:141 msgid "--cached outside a repository" msgstr "--cached 在一个仓库之外" #: apply.c:821 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "æ— æ³•å‡†å¤‡æ—¶é—´æˆ³æ£åˆ™è¡¨è¾¾å¼ %s" #: apply.c:830 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec 返回 %d,输入为:%s" #: apply.c:904 #, c-format msgid "unable to find filename in patch at line %d" msgstr "ä¸èƒ½åœ¨è¡¥ä¸çš„第 %d 行找到文件å" #: apply.c:942 #, 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" #: apply.c:948 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "git apply:错误的 git-diff - 第 %d 行上新文件åä¸ä¸€è‡´" #: apply.c:949 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件åä¸ä¸€è‡´" #: apply.c:954 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null" #: apply.c:983 #, c-format msgid "invalid mode on line %d: %s" msgstr "第 %d 行包å«æ— 效文件模å¼ï¼š%s" #: apply.c:1301 #, c-format msgid "inconsistent header lines %d and %d" msgstr "ä¸ä¸€è‡´çš„文件头,%d 行和 %d è¡Œ" #: apply.c:1473 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount:æ„外的行:%.*s" #: apply.c:1542 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "第 %d 行的补ä¸ç‰‡æ®µæ²¡æœ‰å¤´ä¿¡æ¯ï¼š%.*s" #: apply.c:1562 #, 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 行)" #: apply.c:1575 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "git diff 的头信æ¯ä¸ç¼ºä¹æ–‡ä»¶åä¿¡æ¯ï¼ˆç¬¬ %d 行)" #: apply.c:1763 msgid "new file depends on old contents" msgstr "新文件ä¾èµ–旧内容" #: apply.c:1765 msgid "deleted file still has contents" msgstr "åˆ é™¤çš„æ–‡ä»¶ä»æœ‰å†…容" #: apply.c:1799 #, c-format msgid "corrupt patch at line %d" msgstr "è¡¥ä¸åœ¨ç¬¬ %d è¡ŒæŸå" #: apply.c:1836 #, c-format msgid "new file %s depends on old contents" msgstr "新文件 %s ä¾èµ–旧内容" #: apply.c:1838 #, c-format msgid "deleted file %s still has contents" msgstr "åˆ é™¤çš„æ–‡ä»¶ %s ä»æœ‰å†…容" #: apply.c:1841 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** è¦å‘Šï¼šæ–‡ä»¶ %s æˆä¸ºç©ºæ–‡ä»¶ä½†å¹¶æœªåˆ 除" #: apply.c:1988 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "二进制补ä¸åœ¨ç¬¬ %d è¡ŒæŸå:%.*s" #: apply.c:2025 #, c-format msgid "unrecognized binary patch at line %d" msgstr "未能识别的二进制补ä¸ä½äºŽç¬¬ %d è¡Œ" #: apply.c:2185 #, c-format msgid "patch with only garbage at line %d" msgstr "è¡¥ä¸æ–‡ä»¶çš„第 %d è¡Œåªæœ‰åžƒåœ¾æ•°æ®" #: apply.c:2271 #, c-format msgid "unable to read symlink %s" msgstr "æ— æ³•è¯»å–符å·é“¾æŽ¥ %s" #: apply.c:2275 #, c-format msgid "unable to open or read %s" msgstr "ä¸èƒ½æ‰“å¼€æˆ–è¯»å– %s" #: apply.c:2934 #, c-format msgid "invalid start of line: '%c'" msgstr "æ— æ•ˆçš„è¡Œé¦–å—符:'%c'" #: apply.c:3055 #, 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 行)" #: apply.c:3067 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "上下文å‡å°‘到(%ld/%ld)以在第 %d 行应用补ä¸ç‰‡æ®µ" #: apply.c:3073 #, c-format msgid "" "while searching for:\n" "%.*s" msgstr "" "当查询:\n" "%.*s" #: apply.c:3095 #, c-format msgid "missing binary patch data for '%s'" msgstr "缺失 '%s' 的二进制补ä¸æ•°æ®" #: apply.c:3103 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "ä¸èƒ½åå‘应用一个缺少到 '%s' çš„åå‘æ•°æ®å—的二进制补ä¸" #: apply.c:3149 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "ä¸èƒ½åœ¨ '%s' 上应用没有完整索引行的二进制补ä¸" #: apply.c:3159 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." msgstr "è¡¥ä¸åº”用到 '%s'(%s),但是和当å‰å†…容ä¸åŒ¹é…。" #: apply.c:3167 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "è¡¥ä¸åº”用到空文件 '%s',但其并éžç©ºæ–‡ä»¶" #: apply.c:3185 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "æ— æ³•è¯»å– '%2$s' å¿…é¡»çš„ç›®æ ‡æ–‡ä»¶ %1$s" #: apply.c:3198 #, c-format msgid "binary patch does not apply to '%s'" msgstr "二进制补ä¸æœªåº”用到 '%s'" #: apply.c:3204 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "到 '%s' 的二进制补ä¸äº§ç”Ÿäº†ä¸æ£ç¡®çš„结果(应为 %s,å´ä¸º %s)" #: apply.c:3225 #, c-format msgid "patch failed: %s:%ld" msgstr "打补ä¸å¤±è´¥ï¼š%s:%ld" #: apply.c:3347 #, c-format msgid "cannot checkout %s" msgstr "ä¸èƒ½æ£€å‡º %s" #: apply.c:3396 apply.c:3407 apply.c:3453 setup.c:278 #, c-format msgid "failed to read %s" msgstr "æ— æ³•è¯»å– %s" #: apply.c:3404 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "读å–ä½äºŽç¬¦å·é“¾æŽ¥ä¸çš„ '%s'" #: apply.c:3433 apply.c:3673 #, c-format msgid "path %s has been renamed/deleted" msgstr "路径 %s å·²ç»è¢«é‡å‘½å/åˆ é™¤" #: apply.c:3516 apply.c:3687 #, c-format msgid "%s: does not exist in index" msgstr "%s:ä¸å˜åœ¨äºŽç´¢å¼•ä¸" #: apply.c:3525 apply.c:3695 #, c-format msgid "%s: does not match index" msgstr "%s:和索引ä¸åŒ¹é…" #: apply.c:3560 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "仓库缺ä¹å¿…è¦çš„æ•°æ®å¯¹è±¡ä»¥è¿›è¡Œä¸‰æ–¹åˆå¹¶ã€‚" #: apply.c:3563 #, c-format msgid "Falling back to three-way merge...\n" msgstr "回è½åˆ°ä¸‰æ–¹åˆå¹¶...\n" #: apply.c:3579 apply.c:3583 #, c-format msgid "cannot read the current contents of '%s'" msgstr "æ— æ³•è¯»å– '%s' 的当å‰å†…容" #: apply.c:3595 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "æ— æ³•å›žè½åˆ°ä¸‰æ–¹åˆå¹¶...\n" #: apply.c:3609 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "应用补ä¸åˆ° '%s' å˜åœ¨å†²çªã€‚\n" #: apply.c:3614 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "æˆåŠŸåº”用补ä¸åˆ° '%s'。\n" #: apply.c:3640 msgid "removal patch leaves file contents" msgstr "移除补ä¸ä»ç•™ä¸‹äº†æ–‡ä»¶å†…容" #: apply.c:3712 #, c-format msgid "%s: wrong type" msgstr "%s:错误类型" #: apply.c:3714 #, c-format msgid "%s has type %o, expected %o" msgstr "%s 的类型是 %o,应为 %o" #: apply.c:3864 apply.c:3866 #, c-format msgid "invalid path '%s'" msgstr "æ— æ•ˆè·¯å¾„ '%s'" #: apply.c:3922 #, c-format msgid "%s: already exists in index" msgstr "%s:已ç»å˜åœ¨äºŽç´¢å¼•ä¸" #: apply.c:3925 #, c-format msgid "%s: already exists in working directory" msgstr "%s:已ç»å˜åœ¨äºŽå·¥ä½œåŒºä¸" #: apply.c:3945 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "%2$s 的新模å¼ï¼ˆ%1$o)和旧模å¼ï¼ˆ%3$o)ä¸åŒ¹é…" #: apply.c:3950 #, 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)ä¸åŒ¹é…" #: apply.c:3970 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "å—å½±å“的文件 '%s' ä½äºŽç¬¦å·é“¾æŽ¥ä¸" #: apply.c:3974 #, c-format msgid "%s: patch does not apply" msgstr "%s:补ä¸æœªåº”用" #: apply.c:3989 #, c-format msgid "Checking patch %s..." msgstr "æ£€æŸ¥è¡¥ä¸ %s..." #: apply.c:4080 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "å模组 %s çš„ sha1 ä¿¡æ¯ç¼ºå¤±æˆ–æ— æ•ˆ" #: apply.c:4087 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "%s 的模å¼å˜æ›´ï¼Œä½†å®ƒä¸åœ¨å½“å‰ HEAD ä¸" #: apply.c:4090 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "sha1 ä¿¡æ¯ç¼ºå¤±æˆ–æ— æ•ˆï¼ˆ%s)。" #: apply.c:4095 builtin/checkout.c:235 builtin/reset.c:140 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "对路径 '%s' çš„ make_cache_entry æ“作失败" #: apply.c:4099 #, c-format msgid "could not add %s to temporary index" msgstr "ä¸èƒ½åœ¨ä¸´æ—¶ç´¢å¼•ä¸æ·»åŠ %s" #: apply.c:4109 #, c-format msgid "could not write temporary index to %s" msgstr "ä¸èƒ½æŠŠä¸´æ—¶ç´¢å¼•å†™å…¥åˆ° %s" #: apply.c:4247 #, c-format msgid "unable to remove %s from index" msgstr "ä¸èƒ½ä»Žç´¢å¼•ä¸ç§»é™¤ %s" #: apply.c:4282 #, c-format msgid "corrupt patch for submodule %s" msgstr "å模组 %s æŸåçš„è¡¥ä¸" #: apply.c:4288 #, c-format msgid "unable to stat newly created file '%s'" msgstr "ä¸èƒ½å¯¹æ–°å»ºæ–‡ä»¶ '%s' 调用 stat" #: apply.c:4296 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "ä¸èƒ½ä¸ºæ–°å»ºæ–‡ä»¶ %s 创建åŽç«¯å˜å‚¨" #: apply.c:4302 apply.c:4446 #, c-format msgid "unable to add cache entry for %s" msgstr "æ— æ³•ä¸º %s æ·»åŠ ç¼“å˜æ¡ç›®" #: apply.c:4343 #, c-format msgid "failed to write to '%s'" msgstr "æ— æ³•å†™å…¥ '%s'" #: apply.c:4347 #, c-format msgid "closing file '%s'" msgstr "å…³é—文件 '%s'" #: apply.c:4417 #, c-format msgid "unable to write file '%s' mode %o" msgstr "ä¸èƒ½å†™æ–‡ä»¶ '%s' æƒé™ %o" #: apply.c:4515 #, c-format msgid "Applied patch %s cleanly." msgstr "æˆåŠŸåº”ç”¨è¡¥ä¸ %s。" #: apply.c:4523 msgid "internal error" msgstr "内部错误" #: apply.c:4526 #, 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 个被拒ç»..." #: apply.c:4537 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "æˆªçŸ .rej 文件å为 %.*s.rej" #: apply.c:4545 builtin/fetch.c:786 builtin/fetch.c:1036 #, c-format msgid "cannot open %s" msgstr "ä¸èƒ½æ‰“å¼€ %s" #: apply.c:4559 #, c-format msgid "Hunk #%d applied cleanly." msgstr "第 #%d 个片段æˆåŠŸåº”用。" #: apply.c:4563 #, c-format msgid "Rejected hunk #%d." msgstr "æ‹’ç»ç¬¬ #%d 个片段。" #: apply.c:4673 #, c-format msgid "Skipped patch '%s'." msgstr "ç•¥è¿‡è¡¥ä¸ '%s'。" #: apply.c:4681 msgid "unrecognized input" msgstr "未能识别的输入" #: apply.c:4700 msgid "unable to read index file" msgstr "æ— æ³•è¯»å–索引文件" #: apply.c:4837 #, c-format msgid "can't open patch '%s': %s" msgstr "ä¸èƒ½æ‰“å¼€è¡¥ä¸ '%s':%s" #: apply.c:4864 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "抑制下ä»æœ‰ %d 个空白å—符误用" msgstr[1] "抑制下ä»æœ‰ %d 个空白å—符误用" #: apply.c:4870 apply.c:4885 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d 行新增了空白å—符误用。" msgstr[1] "%d 行新增了空白å—符误用。" #: apply.c:4878 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "ä¿®å¤ç©ºç™½é”™è¯¯åŽï¼Œåº”用了 %d 行。" msgstr[1] "ä¿®å¤ç©ºç™½é”™è¯¯åŽï¼Œåº”用了 %d 行。" #: apply.c:4894 builtin/add.c:538 builtin/mv.c:300 builtin/rm.c:389 msgid "Unable to write new index file" msgstr "æ— æ³•å†™å…¥æ–°ç´¢å¼•æ–‡ä»¶" #: apply.c:4921 apply.c:4924 builtin/am.c:2254 builtin/am.c:2257 #: builtin/clone.c:120 builtin/fetch.c:126 builtin/pull.c:198 #: builtin/submodule--helper.c:405 builtin/submodule--helper.c:1210 #: builtin/submodule--helper.c:1213 builtin/submodule--helper.c:1584 #: builtin/submodule--helper.c:1587 builtin/submodule--helper.c:1807 #: git-add--interactive.perl:197 msgid "path" msgstr "路径" #: apply.c:4922 msgid "don't apply changes matching the given path" msgstr "ä¸è¦åº”用与给出路径å‘匹é…çš„å˜æ›´" #: apply.c:4925 msgid "apply changes matching the given path" msgstr "应用与给出路径å‘匹é…çš„å˜æ›´" #: apply.c:4927 builtin/am.c:2263 msgid "num" msgstr "æ•°å—" #: apply.c:4928 msgid "remove <num> leading slashes from traditional diff paths" msgstr "ä»Žä¼ ç»Ÿçš„ diff 路径ä¸ç§»é™¤æŒ‡å®šæ•°é‡çš„å‰å¯¼æ–œçº¿" #: apply.c:4931 msgid "ignore additions made by the patch" msgstr "忽略补ä¸ä¸çš„æ·»åŠ çš„æ–‡ä»¶" #: apply.c:4933 msgid "instead of applying the patch, output diffstat for the input" msgstr "ä¸åº”用补ä¸ï¼Œè€Œæ˜¯æ˜¾ç¤ºè¾“入的差异统计(diffstat)" #: apply.c:4937 msgid "show number of added and deleted lines in decimal notation" msgstr "以åè¿›åˆ¶æ•°æ˜¾ç¤ºæ·»åŠ å’Œåˆ é™¤çš„è¡Œæ•°" #: apply.c:4939 msgid "instead of applying the patch, output a summary for the input" msgstr "ä¸åº”用补ä¸ï¼Œè€Œæ˜¯æ˜¾ç¤ºè¾“入的概è¦" #: apply.c:4941 msgid "instead of applying the patch, see if the patch is applicable" msgstr "ä¸åº”用补ä¸ï¼Œè€Œæ˜¯æŸ¥çœ‹è¡¥ä¸æ˜¯å¦å¯åº”用" #: apply.c:4943 msgid "make sure the patch is applicable to the current index" msgstr "确认补ä¸å¯ä»¥åº”用到当å‰ç´¢å¼•" #: apply.c:4945 msgid "apply a patch without touching the working tree" msgstr "应用补ä¸è€Œä¸ä¿®æ”¹å·¥ä½œåŒº" #: apply.c:4947 msgid "accept a patch that touches outside the working area" msgstr "接å—修改工作区之外文件的补ä¸" #: apply.c:4950 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "还应用æ¤è¡¥ä¸ï¼ˆä¸Ž --stat/--summary/--check 选项åŒæ—¶ä½¿ç”¨ï¼‰" #: apply.c:4952 msgid "attempt three-way merge if a patch does not apply" msgstr "如果一个补ä¸ä¸èƒ½åº”用则å°è¯•ä¸‰æ–¹åˆå¹¶" #: apply.c:4954 msgid "build a temporary index based on embedded index information" msgstr "创建一个临时索引基于嵌入的索引信æ¯" #: apply.c:4957 builtin/checkout-index.c:168 builtin/ls-files.c:515 msgid "paths are separated with NUL character" msgstr "路径以 NUL å—符分隔" #: apply.c:4959 msgid "ensure at least <n> lines of context match" msgstr "ç¡®ä¿è‡³å°‘åŒ¹é… <n> 行上下文" #: apply.c:4960 builtin/am.c:2242 builtin/interpret-trailers.c:95 #: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99 #: builtin/pack-objects.c:3177 msgid "action" msgstr "动作" #: apply.c:4961 msgid "detect new or modified lines that have whitespace errors" msgstr "检查新增和修改的行ä¸é—´çš„空白å—符滥用" #: apply.c:4964 apply.c:4967 msgid "ignore changes in whitespace when finding context" msgstr "查找上下文时忽略空白å—符的å˜æ›´" #: apply.c:4970 msgid "apply the patch in reverse" msgstr "åå‘应用补ä¸" #: apply.c:4972 msgid "don't expect at least one line of context" msgstr "æ— éœ€è‡³å°‘ä¸€è¡Œä¸Šä¸‹æ–‡" #: apply.c:4974 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "将拒ç»çš„è¡¥ä¸ç‰‡æ®µä¿å˜åœ¨å¯¹åº”çš„ *.rej 文件ä¸" #: apply.c:4976 msgid "allow overlapping hunks" msgstr "å…许é‡å çš„è¡¥ä¸ç‰‡æ®µ" #: apply.c:4977 builtin/add.c:290 builtin/check-ignore.c:21 #: builtin/commit.c:1301 builtin/count-objects.c:98 builtin/fsck.c:666 #: builtin/log.c:1901 builtin/mv.c:122 builtin/read-tree.c:124 msgid "be verbose" msgstr "冗长输出" #: apply.c:4979 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "å…许ä¸æ£ç¡®çš„文件末尾æ¢è¡Œç¬¦" #: apply.c:4982 msgid "do not trust the line counts in the hunk headers" msgstr "ä¸ä¿¡ä»»è¡¥ä¸ç‰‡æ®µçš„头信æ¯ä¸çš„è¡Œå·" #: apply.c:4984 builtin/am.c:2251 msgid "root" msgstr "æ ¹ç›®å½•" #: apply.c:4985 msgid "prepend <root> to all filenames" msgstr "为所有文件åå‰æ·»åŠ <æ ¹ç›®å½•>" #: archive.c:13 msgid "git archive [<options>] <tree-ish> [<path>...]" msgstr "git archive [<选项>] <æ ‘æˆ–æ交> [<路径>...]" #: archive.c:14 msgid "git archive --list" msgstr "git archive --list" #: archive.c:15 msgid "" "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" msgstr "" "git archive --remote <仓库> [--exec <命令>] [<选项>] <æ ‘æˆ–æ交> [<路径>...]" #: archive.c:16 msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <仓库> [--exec <命令>] --list" #: archive.c:351 builtin/add.c:176 builtin/add.c:514 builtin/rm.c:298 #, c-format msgid "pathspec '%s' did not match any files" msgstr "è·¯å¾„è§„æ ¼ '%s' 未匹é…任何文件" #: archive.c:434 msgid "fmt" msgstr "æ ¼å¼" #: archive.c:434 msgid "archive format" msgstr "å½’æ¡£æ ¼å¼" #: archive.c:435 builtin/log.c:1462 msgid "prefix" msgstr "å‰ç¼€" #: archive.c:436 msgid "prepend prefix to each pathname in the archive" msgstr "为归档ä¸æ¯ä¸ªè·¯å¾„ååŠ ä¸Šå‰ç¼€" #: archive.c:437 builtin/blame.c:813 builtin/blame.c:814 builtin/config.c:127 #: builtin/fast-export.c:1007 builtin/fast-export.c:1009 builtin/grep.c:869 #: builtin/hash-object.c:103 builtin/ls-files.c:551 builtin/ls-files.c:554 #: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:119 #: parse-options.h:165 msgid "file" msgstr "文件" #: archive.c:438 builtin/archive.c:89 msgid "write the archive to this file" msgstr "归档写入æ¤æ–‡ä»¶" #: archive.c:440 msgid "read .gitattributes in working directory" msgstr "读å–工作区ä¸çš„ .gitattributes" #: archive.c:441 msgid "report archived files on stderr" msgstr "åœ¨æ ‡å‡†é”™è¯¯ä¸ŠæŠ¥å‘Šå½’æ¡£æ–‡ä»¶" #: archive.c:442 msgid "store only" msgstr "åªå˜å‚¨" #: archive.c:443 msgid "compress faster" msgstr "压缩速度更快" #: archive.c:451 msgid "compress better" msgstr "压缩效果更好" #: archive.c:454 msgid "list supported archive formats" msgstr "列出支æŒçš„å½’æ¡£æ ¼å¼" #: archive.c:456 builtin/archive.c:90 builtin/clone.c:110 builtin/clone.c:113 #: builtin/submodule--helper.c:1222 builtin/submodule--helper.c:1593 msgid "repo" msgstr "仓库" #: archive.c:457 builtin/archive.c:91 msgid "retrieve the archive from remote repository <repo>" msgstr "从远程仓库(<仓库>)æå–归档文件" #: archive.c:458 builtin/archive.c:92 builtin/notes.c:489 msgid "command" msgstr "命令" #: archive.c:459 builtin/archive.c:93 msgid "path to the remote git-upload-archive command" msgstr "远程 git-upload-archive 命令的路径" #: archive.c:466 msgid "Unexpected option --remote" msgstr "未知å‚æ•° --remote" #: archive.c:468 msgid "Option --exec can only be used together with --remote" msgstr "选项 --exec åªèƒ½å’Œ --remote åŒæ—¶ä½¿ç”¨" #: archive.c:470 msgid "Unexpected option --output" msgstr "未知å‚æ•° --output" #: archive.c:492 #, c-format msgid "Unknown archive format '%s'" msgstr "æœªçŸ¥å½’æ¡£æ ¼å¼ '%s'" #: archive.c:499 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "å‚æ•°ä¸æ”¯æŒæ¤æ ¼å¼ '%s':-%d" #: attr.c:218 #, c-format msgid "%.*s is not a valid attribute name" msgstr "%.*s ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„属性å" #: attr.c:415 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." msgstr "" "负值模版在 git attributes ä¸è¢«å¿½ç•¥\n" "当å—符串确实è¦ä»¥æ„Ÿå¹å·å¼€å§‹æ—¶ï¼Œä½¿ç”¨ '\\!'。" #: bisect.c:461 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "文件 '%s' 包å«é”™è¯¯çš„å¼•ç”¨æ ¼å¼ï¼š%s" #: bisect.c:669 #, c-format msgid "We cannot bisect more!\n" msgstr "æˆ‘ä»¬æ— æ³•è¿›è¡Œæ›´å¤šçš„äºŒåˆ†æŸ¥æ‰¾ï¼\n" #: bisect.c:723 #, c-format msgid "Not a valid commit name %s" msgstr "ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„æ交å %s" #: bisect.c:747 #, c-format msgid "" "The merge base %s is bad.\n" "This means the bug has been fixed between %s and [%s].\n" msgstr "" "åˆå¹¶åŸºçº¿ %s 是å的。\n" "è¿™æ„味ç€ä»‹äºŽ %s å’Œ [%s] 之间的 bug å·²ç»è¢«ä¿®å¤ã€‚\n" #: bisect.c:752 #, c-format msgid "" "The merge base %s is new.\n" "The property has changed between %s and [%s].\n" msgstr "" "åˆå¹¶åŸºçº¿ %s 是新的。\n" "介于 %s å’Œ [%s] 之间的属性已ç»è¢«ä¿®æ”¹ã€‚\n" #: bisect.c:757 #, c-format msgid "" "The merge base %s is %s.\n" "This means the first '%s' commit is between %s and [%s].\n" msgstr "" "åˆå¹¶åŸºçº¿ %s 是 %s。\n" "è¿™æ„味ç€ç¬¬ä¸€ä¸ª '%s' æ交ä½äºŽ %s å’Œ [%s] 之间。\n" #: bisect.c:765 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" "git bisect cannot work properly in this case.\n" "Maybe you mistook %s and %s revs?\n" msgstr "" "一些 %s 版本ä¸æ˜¯ %s 版本的祖先。\n" "è¿™ç§æƒ…况下 git äºŒåˆ†æŸ¥æ‰¾æ— æ³•æ£å¸¸å·¥ä½œã€‚\n" "您å¯èƒ½å¼„错了 %s å’Œ %s 版本?\n" #: bisect.c:778 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" "So we cannot be sure the first %s commit is between %s and %s.\n" "We continue anyway." msgstr "" "介于 %s å’Œ [%s] çš„åˆå¹¶åŸºçº¿ä¸€å®šè¢«å¿½ç•¥äº†ã€‚\n" "æ‰€ä»¥æˆ‘ä»¬æ— æ³•ç¡®è®¤ç¬¬ä¸€ä¸ª %s æ交是å¦ä»‹äºŽ %s å’Œ %s 之间。\n" "我们ä»æ—§ç»§ç»ã€‚" #: bisect.c:811 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "二分查找ä¸ï¼šåˆå¹¶åŸºçº¿å¿…须是ç»è¿‡æµ‹è¯•çš„\n" #: bisect.c:851 #, c-format msgid "a %s revision is needed" msgstr "需è¦ä¸€ä¸ª %s 版本" #: bisect.c:870 builtin/notes.c:175 builtin/tag.c:236 #, c-format msgid "could not create file '%s'" msgstr "ä¸èƒ½åˆ›å»ºæ–‡ä»¶ '%s'" #: bisect.c:921 #, c-format msgid "could not read file '%s'" msgstr "ä¸èƒ½è¯»å–文件 '%s'" #: bisect.c:951 msgid "reading bisect refs failed" msgstr "读å–二分查找引用失败" #: bisect.c:970 #, c-format msgid "%s was both %s and %s\n" msgstr "%s åŒæ—¶ä¸º %s å’Œ %s\n" #: bisect.c:978 #, c-format msgid "" "No testable commit found.\n" "Maybe you started with bad path parameters?\n" msgstr "" "没有å‘现å¯æµ‹è¯•çš„æ交。\n" "å¯èƒ½æ‚¨åœ¨è¿è¡Œæ—¶ä½¿ç”¨äº†é”™è¯¯çš„路径å‚数?\n" #: bisect.c:997 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" msgstr[0] "(大概 %d æ¥ï¼‰" msgstr[1] "(大概 %d æ¥ï¼‰" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. #: bisect.c:1003 #, c-format msgid "Bisecting: %d revision left to test after this %s\n" msgid_plural "Bisecting: %d revisions left to test after this %s\n" msgstr[0] "二分查找ä¸ï¼šåœ¨æ¤ä¹‹åŽï¼Œè¿˜å‰© %d 个版本待测试 %s\n" msgstr[1] "二分查找ä¸ï¼šåœ¨æ¤ä¹‹åŽï¼Œè¿˜å‰© %d 个版本待测试 %s\n" #: blame.c:1756 msgid "--contents and --reverse do not blend well." msgstr "--contents å’Œ --reverse ä¸èƒ½æ··ç”¨ã€‚" #: blame.c:1767 msgid "cannot use --contents with final commit object name" msgstr "ä¸èƒ½å°† --contents 和最终的æ交对象å共用" #: blame.c:1787 msgid "--reverse and --first-parent together require specified latest commit" msgstr "--reverse å’Œ --first-parent 共用,需è¦æŒ‡å®šæœ€æ–°çš„æ交" #: blame.c:1796 bundle.c:160 ref-filter.c:2075 sequencer.c:1861 #: sequencer.c:3632 builtin/commit.c:981 builtin/log.c:366 builtin/log.c:920 #: builtin/log.c:1371 builtin/log.c:1702 builtin/log.c:1950 builtin/merge.c:372 #: builtin/shortlog.c:192 msgid "revision walk setup failed" msgstr "版本é历设置失败" #: blame.c:1814 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "--reverse å’Œ --first-parent 共用,需è¦ç¬¬ä¸€ç¥–先链上的æ交范围" #: blame.c:1825 #, c-format msgid "no such path %s in %s" msgstr "在 %2$s ä¸æ— æ¤è·¯å¾„ %1$s" #: blame.c:1836 #, c-format msgid "cannot read blob %s for path %s" msgstr "ä¸èƒ½ä¸ºè·¯å¾„ %2$s 读å–æ•°æ®å¯¹è±¡ %1$s" #: branch.c:54 #, c-format msgid "" "\n" "After fixing the error cause you may try to fix up\n" "the remote tracking information by invoking\n" "\"git branch --set-upstream-to=%s%s%s\"." msgstr "" "\n" "在修å¤é”™è¯¯åŽï¼Œæ‚¨å¯ä»¥å°è¯•ä¿®æ”¹è¿œç¨‹è·Ÿè¸ªåˆ†æ”¯ï¼Œé€šè¿‡æ‰§è¡Œå‘½ä»¤\n" "\"git branch --set-upstream-to=%s%s%s\" 。" #: branch.c:68 #, c-format msgid "Not setting branch %s as its own upstream." msgstr "未设置分支 %s 作为它自己的上游。" #: branch.c:94 #, 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:95 #, c-format msgid "Branch '%s' set up to track remote branch '%s' from '%s'." msgstr "分支 '%1$s' 设置为跟踪æ¥è‡ª '%3$s' 的远程分支 '%2$s'。" #: branch.c:99 #, c-format msgid "Branch '%s' set up to track local branch '%s' by rebasing." msgstr "分支 '%s' 设置为使用å˜åŸºæ¥è·Ÿè¸ªæœ¬åœ°åˆ†æ”¯ '%s'。" #: branch.c:100 #, c-format msgid "Branch '%s' set up to track local branch '%s'." msgstr "分支 '%s' 设置为跟踪本地分支 '%s'。" #: branch.c:105 #, c-format msgid "Branch '%s' set up to track remote ref '%s' by rebasing." msgstr "分支 '%s' 设置为使用å˜åŸºæ¥è·Ÿè¸ªè¿œç¨‹å¼•ç”¨ '%s'。" #: branch.c:106 #, c-format msgid "Branch '%s' set up to track remote ref '%s'." msgstr "分支 '%s' 设置为跟踪远程引用 '%s'。" #: branch.c:110 #, c-format msgid "Branch '%s' set up to track local ref '%s' by rebasing." msgstr "分支 '%s' 设置为使用å˜åŸºæ¥è·Ÿè¸ªæœ¬åœ°å¼•ç”¨ '%s'。" #: branch.c:111 #, c-format msgid "Branch '%s' set up to track local ref '%s'." msgstr "分支 '%s' 设置为跟踪本地引用 '%s'。" #: branch.c:120 msgid "Unable to write upstream branch configuration" msgstr "æ— æ³•å†™å…¥ä¸Šæ¸¸åˆ†æ”¯é…ç½®" #: branch.c:157 #, c-format msgid "Not tracking: ambiguous information for ref %s" msgstr "未跟踪:引用 %s 有æ§ä¹‰" #: branch.c:190 #, c-format msgid "'%s' is not a valid branch name." msgstr "'%s' ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„分支å称。" #: branch.c:209 #, c-format msgid "A branch named '%s' already exists." msgstr "一个分支å '%s' å·²ç»å˜åœ¨ã€‚" #: branch.c:214 msgid "Cannot force update the current branch." msgstr "æ— æ³•å¼ºåˆ¶æ›´æ–°å½“å‰åˆ†æ”¯ã€‚" #: branch.c:234 #, c-format msgid "Cannot setup tracking information; starting point '%s' is not a branch." msgstr "æ— æ³•è®¾ç½®è·Ÿè¸ªä¿¡æ¯ï¼›èµ·å§‹ç‚¹ '%s' ä¸æ˜¯ä¸€ä¸ªåˆ†æ”¯ã€‚" #: branch.c:236 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "请求的上游分支 '%s' ä¸å˜åœ¨" #: branch.c:238 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:281 #, c-format msgid "Not a valid object name: '%s'." msgstr "ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„对象å:'%s'。" #: branch.c:301 #, c-format msgid "Ambiguous object name: '%s'." msgstr "æ§ä¹‰çš„对象å:'%s'。" #: branch.c:306 #, c-format msgid "Not a valid branch point: '%s'." msgstr "æ— æ•ˆçš„åˆ†æ”¯ç‚¹ï¼š'%s'。" #: branch.c:360 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "'%s' å·²ç»æ£€å‡ºåˆ° '%s'" #: branch.c:383 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "工作区 %s çš„ HEAD 指å‘没有被更新" #: bundle.c:34 #, c-format msgid "'%s' does not look like a v2 bundle file" msgstr "'%s' ä¸åƒæ˜¯ä¸€ä¸ª v2 版本的包文件" #: bundle.c:62 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "未能识别的包头:%s%s (%d)" #: bundle.c:88 sequencer.c:2081 sequencer.c:2558 builtin/commit.c:755 #, c-format msgid "could not open '%s'" msgstr "ä¸èƒ½æ‰“å¼€ '%s'" #: bundle.c:139 msgid "Repository lacks these prerequisite commits:" msgstr "仓库ä¸ç¼ºå°‘这些必备的æ交:" #: bundle.c:190 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "这个包ä¸å«æœ‰è¿™ä¸ªå¼•ç”¨ï¼š" msgstr[1] "这个包ä¸å«æœ‰ %d 个引用:" #: bundle.c:197 msgid "The bundle records a complete history." msgstr "这个包记录一个完整历å²ã€‚" #: bundle.c:199 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "这个包需è¦è¿™ä¸ªå¼•ç”¨ï¼š" msgstr[1] "è¿™ä¸ªåŒ…éœ€è¦ %d 个引用:" #: bundle.c:258 msgid "Could not spawn pack-objects" msgstr "ä¸èƒ½ç”Ÿæˆ pack-objects 进程" #: bundle.c:269 msgid "pack-objects died" msgstr "pack-objects 终æ¢" #: bundle.c:311 msgid "rev-list died" msgstr "rev-list 终æ¢" #: bundle.c:360 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "引用 '%s' 被 rev-list 选项排除" #: bundle.c:450 builtin/log.c:183 builtin/log.c:1607 builtin/shortlog.c:303 #, c-format msgid "unrecognized argument: %s" msgstr "未能识别的å‚数:%s" #: bundle.c:458 msgid "Refusing to create empty bundle." msgstr "ä¸èƒ½åˆ›å»ºç©ºåŒ…。" #: bundle.c:470 #, c-format msgid "cannot create '%s'" msgstr "ä¸èƒ½åˆ›å»º '%s'" #: bundle.c:498 msgid "index-pack died" msgstr "index-pack 终æ¢" #: color.c:296 #, c-format msgid "invalid color value: %.*s" msgstr "æ— æ•ˆçš„é¢œè‰²å€¼ï¼š%.*s" #: commit.c:43 sequencer.c:2364 builtin/am.c:421 builtin/am.c:465 #: builtin/am.c:1436 builtin/am.c:2072 builtin/replace.c:376 #: builtin/replace.c:448 #, c-format msgid "could not parse %s" msgstr "ä¸èƒ½è§£æž %s" #: commit.c:45 #, c-format msgid "%s %s is not a commit!" msgstr "%s %s ä¸æ˜¯ä¸€ä¸ªæ交ï¼" #: commit.c:182 msgid "" "Support for <GIT_DIR>/info/grafts is deprecated\n" "and will be removed in a future Git version.\n" "\n" "Please use \"git replace --convert-graft-file\"\n" "to convert the grafts into replace refs.\n" "\n" "Turn this message off by running\n" "\"git config advice.graftFileDeprecated false\"" msgstr "" "对 <GIT_DIR>/info/grafts 的支æŒå·²è¢«å¼ƒç”¨ï¼Œå¹¶å°†åœ¨\n" "未æ¥çš„Git版本ä¸è¢«ç§»é™¤ã€‚\n" "\n" "请使用 \"git replace --convert-graft-file\" å°†\n" "grafts 转æ¢ä¸ºæ›¿æ¢å¼•ç”¨ã€‚\n" "\n" "设置 \"git config advice.graftFileDeprecated false\"\n" "å¯å…³é—本消æ¯" #: commit.c:1540 msgid "" "Warning: commit message did not conform to UTF-8.\n" "You may want to amend it after fixing the message, or set the config\n" "variable i18n.commitencoding to the encoding your project uses.\n" msgstr "" "è¦å‘Šï¼šæ交说明ä¸ç¬¦åˆ UTF-8 å—符编ç 。\n" "您å¯ä»¥é€šè¿‡ä¿®è¡¥æ交æ¥æ”¹æ£æ交说明,或者将é…ç½®å˜é‡ i18n.commitencoding\n" "设置为您项目所用的å—符编ç 。\n" #: commit-graph.c:669 #, c-format msgid "the commit graph format cannot write %d commits" msgstr "æäº¤å›¾å½¢æ ¼å¼ä¸èƒ½å†™å…¥ %d 个æ交" #: commit-graph.c:696 msgid "too many commits to write graph" msgstr "æ交太多ä¸èƒ½ç”»å›¾" #: commit-graph.c:707 builtin/init-db.c:516 builtin/init-db.c:521 #, c-format msgid "cannot mkdir %s" msgstr "ä¸èƒ½åˆ›å»ºç›®å½• %s" #: compat/obstack.c:405 compat/obstack.c:407 msgid "memory exhausted" msgstr "内å˜è€—å°½" #: config.c:187 msgid "relative config include conditionals must come from files" msgstr "包å«ç›¸å¯¹è·¯å¾„çš„æ¡ä»¶å¼•ç”¨å¿…é¡»æ¥è‡ªäºŽæ–‡ä»¶" #: config.c:788 #, c-format msgid "bad config line %d in blob %s" msgstr "æ•°æ®å¯¹è±¡ %2$s ä¸é”™è¯¯çš„é…置行 %1$d" #: config.c:792 #, c-format msgid "bad config line %d in file %s" msgstr "文件 %2$s ä¸é”™è¯¯çš„é…置行 %1$d" #: config.c:796 #, c-format msgid "bad config line %d in standard input" msgstr "æ ‡å‡†è¾“å…¥ä¸é”™è¯¯çš„é…置行 %d" #: config.c:800 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "å模组数æ®å¯¹è±¡ %2$s ä¸é”™è¯¯çš„é…置行 %1$d" #: config.c:804 #, c-format msgid "bad config line %d in command line %s" msgstr "命令行 %2$s ä¸é”™è¯¯çš„é…置行 %1$d" #: config.c:808 #, c-format msgid "bad config line %d in %s" msgstr "在 %2$s ä¸é”™è¯¯çš„é…置行 %1$d" #: config.c:936 msgid "out of range" msgstr "超出范围" #: config.c:936 msgid "invalid unit" msgstr "æ— æ•ˆçš„å•ä½" #: config.c:942 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "é…ç½®å˜é‡ '%2$s' çš„æ•°å—å–值 '%1$s' 设置错误:%3$s" #: config.c:947 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "æ•°æ®å¯¹è±¡ %3$s ä¸é…ç½®å˜é‡ '%2$s' 错误的å–值 '%1$s':%4$s" #: config.c:950 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "文件 %3$s ä¸é…ç½®å˜é‡ '%2$s' 错误的å–值 '%1$s':%4$s" #: config.c:953 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "æ ‡å‡†è¾“å…¥ä¸é…ç½®å˜é‡ '%2$s' 错误的å–值 '%1$s':%3$s" #: config.c:956 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "åæ¨¡ç»„æ•°æ® %3$s ä¸é…ç½®å˜é‡ '%2$s' 错误的å–值 '%1$s':%4$s" #: config.c:959 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "命令行 %3$s ä¸é…ç½®å˜é‡ '%2$s' 错误的å–值 '%1$s':%4$s" #: config.c:962 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "在 %3$s ä¸é…ç½®å˜é‡ '%2$s' 错误的å–值 '%1$s':%4$s" #: config.c:1057 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "æ— æ³•æ‰©å±• '%s' ä¸çš„用户目录" #: config.c:1066 #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "'%2$s' 的值 '%1$s' ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„时间戳" #: config.c:1171 config.c:1182 #, c-format msgid "bad zlib compression level %d" msgstr "错误的 zlib 压缩级别 %d" #: config.c:1307 #, c-format msgid "invalid mode for object creation: %s" msgstr "æ— æ•ˆçš„å¯¹è±¡åˆ›å»ºæ¨¡å¼ï¼š%s" #: config.c:1473 #, c-format msgid "bad pack compression level %d" msgstr "错误的打包压缩级别 %d" #: config.c:1681 msgid "unable to parse command-line config" msgstr "æ— æ³•è§£æžå‘½ä»¤è¡Œä¸çš„é…ç½®" #: config.c:2013 msgid "unknown error occurred while reading the configuration files" msgstr "在读å–é…置文件时é‡åˆ°æœªçŸ¥é”™è¯¯" #: config.c:2200 #, c-format msgid "Invalid %s: '%s'" msgstr "æ— æ•ˆ %s:'%s'" #: config.c:2243 #, c-format msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" msgstr "未知的 core.untrackedCache å–值 '%s',使用默认值 'keep'" #: config.c:2269 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "splitIndex.maxPercentChange çš„å–值 '%d' 应该介于 0 å’Œ 100 之间" #: config.c:2294 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "æ— æ³•è§£æžå‘½ä»¤è¡Œé…ç½®ä¸çš„ '%s'" #: config.c:2296 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "在文件 '%2$s' 的第 %3$d è¡Œå‘现错误的é…ç½®å˜é‡ '%1$s'" #: config.c:2402 #, c-format msgid "%s has multiple values" msgstr "%s 有多个å–值" #: config.c:2766 config.c:3019 #, c-format msgid "fstat on %s failed" msgstr "对 %s 调用 fstat 失败" #: config.c:2905 #, c-format msgid "could not set '%s' to '%s'" msgstr "ä¸èƒ½è®¾ç½® '%s' 为 '%s'" #: config.c:2907 builtin/remote.c:779 #, c-format msgid "could not unset '%s'" msgstr "ä¸èƒ½å–消设置 '%s'" #: connect.c:61 msgid "The remote end hung up upon initial contact" msgstr "远端在连接å‘èµ·æ—¶å³æŒ‚æ–" #: connect.c:63 msgid "" "Could not read from remote repository.\n" "\n" "Please make sure you have the correct access rights\n" "and the repository exists." msgstr "" "æ— æ³•è¯»å–远程仓库。\n" "\n" "请确认您有æ£ç¡®çš„访问æƒé™å¹¶ä¸”仓库å˜åœ¨ã€‚" #: connected.c:66 builtin/fsck.c:201 builtin/prune.c:145 msgid "Checking connectivity" msgstr "检查连接ä¸" #: connected.c:78 msgid "Could not run 'git rev-list'" msgstr "ä¸èƒ½æ‰§è¡Œ 'git rev-list'" #: connected.c:98 msgid "failed write to rev-list" msgstr "æ— æ³•å†™å…¥ rev-list" #: connected.c:105 msgid "failed to close rev-list's stdin" msgstr "æ— æ³•å…³é— rev-list çš„æ ‡å‡†è¾“å…¥" #: convert.c:206 #, c-format msgid "CRLF would be replaced by LF in %s." msgstr "文件 %s ä¸çš„ CRLF 将被 LF 替æ¢ã€‚" #: convert.c:208 #, c-format msgid "" "CRLF will be replaced by LF in %s.\n" "The file will have its original line endings in your working directory." msgstr "" "文件 %s ä¸çš„ CRLF 将被 LF 替æ¢ã€‚\n" "在工作区ä¸è¯¥æ–‡ä»¶ä»ä¿æŒåŽŸæœ‰çš„æ¢è¡Œç¬¦ã€‚" #: convert.c:216 #, c-format msgid "LF would be replaced by CRLF in %s" msgstr "文件 %s ä¸çš„ LF 将被 CRLF 替æ¢" #: convert.c:218 #, c-format msgid "" "LF will be replaced by CRLF in %s.\n" "The file will have its original line endings in your working directory." msgstr "" "文件 %s ä¸çš„ LF 将被 CRLF 替æ¢ã€‚\n" "在工作区ä¸è¯¥æ–‡ä»¶ä»ä¿æŒåŽŸæœ‰çš„æ¢è¡Œç¬¦ã€‚" #: convert.c:279 #, c-format msgid "BOM is prohibited in '%s' if encoded as %s" msgstr "如果使用 %2$s ç¼–ç ,ç¦æ¢åœ¨ '%1$s' ä¸ä½¿ç”¨ BOM" #: convert.c:286 #, c-format msgid "" "The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-" "tree-encoding." msgstr "文件 '%s' 包å«ä¸€ä¸ªå—节顺åºæ ‡è®°ï¼ˆBOM)。请使用 UTF-%s 作为工作区编ç 。" #: convert.c:304 #, c-format msgid "BOM is required in '%s' if encoded as %s" msgstr "如果编ç 为 %2$s,需è¦åœ¨ '%1$s' ä¸ä½¿ç”¨ BOM" #: convert.c:306 #, c-format msgid "" "The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-" "%sLE (depending on the byte order) as working-tree-encoding." msgstr "" "文件 '%s' 缺失一个å—节顺åºæ ‡è®°ï¼ˆBOM)。请使用 UTF-%sBE or UTF-%sLE(å–决于å—" "节åºï¼‰ä½œä¸ºå·¥ä½œåŒºç¼–ç 。" #: convert.c:424 #, c-format msgid "failed to encode '%s' from %s to %s" msgstr "æ— æ³•å¯¹ '%s' 进行从 %s 到 %s çš„ç¼–ç " #: convert.c:467 #, c-format msgid "encoding '%s' from %s to %s and back is not the same" msgstr "å°†'%s' çš„ç¼–ç 从 %s 到 %s æ¥å›žè½¬æ¢ä¸ä¸€è‡´" #: convert.c:1225 msgid "true/false are no valid working-tree-encodings" msgstr "true/false ä¸æ˜¯æœ‰æ•ˆçš„工作区编ç " #: date.c:116 msgid "in the future" msgstr "在将æ¥" #: date.c:122 #, c-format msgid "%<PRIuMAX> second ago" msgid_plural "%<PRIuMAX> seconds ago" msgstr[0] "%<PRIuMAX> 秒钟å‰" msgstr[1] "%<PRIuMAX> 秒钟å‰" #: date.c:129 #, c-format msgid "%<PRIuMAX> minute ago" msgid_plural "%<PRIuMAX> minutes ago" msgstr[0] "%<PRIuMAX> 分钟å‰" msgstr[1] "%<PRIuMAX> 分钟å‰" #: date.c:136 #, c-format msgid "%<PRIuMAX> hour ago" msgid_plural "%<PRIuMAX> hours ago" msgstr[0] "%<PRIuMAX> å°æ—¶å‰" msgstr[1] "%<PRIuMAX> å°æ—¶å‰" #: date.c:143 #, c-format msgid "%<PRIuMAX> day ago" msgid_plural "%<PRIuMAX> days ago" msgstr[0] "%<PRIuMAX> 天å‰" msgstr[1] "%<PRIuMAX> 天å‰" #: date.c:149 #, c-format msgid "%<PRIuMAX> week ago" msgid_plural "%<PRIuMAX> weeks ago" msgstr[0] "%<PRIuMAX> 周å‰" msgstr[1] "%<PRIuMAX> 周å‰" #: date.c:156 #, c-format msgid "%<PRIuMAX> month ago" msgid_plural "%<PRIuMAX> months ago" msgstr[0] "%<PRIuMAX> 个月å‰" msgstr[1] "%<PRIuMAX> 个月å‰" #: date.c:167 #, c-format msgid "%<PRIuMAX> year" msgid_plural "%<PRIuMAX> years" msgstr[0] "%<PRIuMAX> å¹´" msgstr[1] "%<PRIuMAX> å¹´" #. TRANSLATORS: "%s" is "<n> years" #: date.c:170 #, c-format msgid "%s, %<PRIuMAX> month ago" msgid_plural "%s, %<PRIuMAX> months ago" msgstr[0] "%s %<PRIuMAX> 个月å‰" msgstr[1] "%s %<PRIuMAX> 个月å‰" #: date.c:175 date.c:180 #, c-format msgid "%<PRIuMAX> year ago" msgid_plural "%<PRIuMAX> years ago" msgstr[0] "%<PRIuMAX> å¹´å‰" msgstr[1] "%<PRIuMAX> å¹´å‰" #: diffcore-order.c:24 #, c-format msgid "failed to read orderfile '%s'" msgstr "æ— æ³•è¯»å–排åºæ–‡ä»¶ '%s'" #: diffcore-rename.c:535 msgid "Performing inexact rename detection" msgstr "æ£åœ¨è¿›è¡Œéžç²¾ç¡®çš„é‡å‘½å探测" #: diff.c:74 #, c-format msgid "option '%s' requires a value" msgstr "选项 '%s' 需è¦ä¸€ä¸ªå€¼" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: diff.c:152 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr " æ— æ³•è§£æž dirstat 截æ¢ï¼ˆcut-off)百分比 '%s'\n" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: diff.c:157 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " 未知的 dirstat å‚æ•° '%s'\n" #: diff.c:281 msgid "" "color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', " "'plain'" msgstr "" "代ç 移动的颜色设置必须是 'no'ã€'default'ã€'zebra'ã€'dimmed_zebra' 或 'plain'" #: diff.c:341 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "é…ç½®å˜é‡ 'diff.submodule' 未知的å–值:'%s'" #: diff.c:401 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" "%s" msgstr "" "å‘现é…ç½®å˜é‡ 'diff.dirstat' ä¸çš„错误:\n" "%s" #: diff.c:3823 #, c-format msgid "external diff died, stopping at %s" msgstr "外部 diff 退出,åœæ¢åœ¨ %s" #: diff.c:4153 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-onlyã€--name-statusã€--check å’Œ -s 是互斥的" #: diff.c:4156 msgid "-G, -S and --find-object are mutually exclusive" msgstr "-Gã€-S å’Œ --find-object 是互斥的" #: diff.c:4244 msgid "--follow requires exactly one pathspec" msgstr "--follow 明确è¦æ±‚åªè·Ÿä¸€ä¸ªè·¯å¾„è§„æ ¼" #: diff.c:4410 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" "%s" msgstr "" "æ— æ³•è§£æž --dirstat/-X 选项的å‚数:\n" "%s" #: diff.c:4424 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "æ— æ³•è§£æž --submodule 选项的å‚数:'%s'" #: diff.c:5500 msgid "inexact rename detection was skipped due to too many files." msgstr "å› ä¸ºæ–‡ä»¶å¤ªå¤šï¼Œç•¥è¿‡ä¸ä¸¥æ ¼çš„é‡å‘½å检查。" #: diff.c:5503 msgid "only found copies from modified paths due to too many files." msgstr "å› ä¸ºæ–‡ä»¶å¤ªå¤šï¼Œåªåœ¨ä¿®æ”¹çš„路径ä¸æŸ¥æ‰¾æ‹·è´ã€‚" #: diff.c:5506 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." msgstr "您å¯èƒ½æƒ³è¦å°†å˜é‡ %s 设置为至少 %d 并å†æ¬¡æ‰§è¡Œæ¤å‘½ä»¤ã€‚" #: dir.c:1867 #, c-format msgid "could not open directory '%s'" msgstr "ä¸èƒ½æ‰“开目录 '%s'" #: dir.c:2109 msgid "failed to get kernel name and information" msgstr "æ— æ³•èŽ·å¾—å†…æ ¸å称和信æ¯" #: dir.c:2233 msgid "Untracked cache is disabled on this system or location." msgstr "缓å˜æœªè·Ÿè¸ªæ–‡ä»¶åœ¨æœ¬ç³»ç»Ÿæˆ–ä½ç½®ä¸è¢«ç¦ç”¨ã€‚" #: dir.c:3075 dir.c:3080 #, c-format msgid "could not create directories for %s" msgstr "ä¸èƒ½ä¸º %s 创建目录" #: dir.c:3109 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "ä¸èƒ½ä»Ž '%s' è¿ç§» git 目录到 '%s'" #: editor.c:61 #, c-format msgid "hint: Waiting for your editor to close the file...%c" msgstr "æ示:ç‰å¾…您的编辑器关é—文件...%c" #: entry.c:177 msgid "Filtering content" msgstr "过滤内容" #: entry.c:435 #, c-format msgid "could not stat file '%s'" msgstr "ä¸èƒ½å¯¹æ–‡ä»¶ '%s' 调用 stat" #: fetch-object.c:17 msgid "Remote with no URL" msgstr "远程未设置 URL" #: fetch-pack.c:254 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack:应为 shallow 列表" #: fetch-pack.c:266 msgid "git fetch-pack: expected ACK/NAK, got a flush packet" msgstr "git fetch-pack:期望 ACK/NAK,å´å¾—到 flush 包" #: fetch-pack.c:285 builtin/archive.c:63 #, c-format msgid "remote error: %s" msgstr "远程错误:%s" #: fetch-pack.c:286 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack:应为 ACK/NAK,å´å¾—到 '%s'" #: fetch-pack.c:338 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc éœ€è¦ multi_ack_detailed" #: fetch-pack.c:429 fetch-pack.c:1310 #, c-format msgid "invalid shallow line: %s" msgstr "æ— æ•ˆçš„ shallow ä¿¡æ¯ï¼š%s" #: fetch-pack.c:435 fetch-pack.c:1316 #, c-format msgid "invalid unshallow line: %s" msgstr "æ— æ•ˆçš„ unshallow ä¿¡æ¯ï¼š%s" #: fetch-pack.c:437 fetch-pack.c:1318 #, c-format msgid "object not found: %s" msgstr "对象未找到:%s" #: fetch-pack.c:440 fetch-pack.c:1321 #, c-format msgid "error in object: %s" msgstr "对象ä¸å‡ºé”™ï¼š%s" #: fetch-pack.c:442 fetch-pack.c:1323 #, c-format msgid "no shallow found: %s" msgstr "未å‘现 shallow:%s" #: fetch-pack.c:445 fetch-pack.c:1326 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "应为 shallow/unshallow,å´å¾—到 %s" #: fetch-pack.c:486 #, c-format msgid "got %s %d %s" msgstr "得到 %s %d %s" #: fetch-pack.c:500 #, c-format msgid "invalid commit %s" msgstr "æ— æ•ˆæ交 %s" #: fetch-pack.c:533 msgid "giving up" msgstr "放弃" #: fetch-pack.c:543 progress.c:229 msgid "done" msgstr "完æˆ" #: fetch-pack.c:555 #, c-format msgid "got %s (%d) %s" msgstr "得到 %s (%d) %s" #: fetch-pack.c:601 #, c-format msgid "Marking %s as complete" msgstr "æ ‡è®° %s 为完æˆ" #: fetch-pack.c:828 #, c-format msgid "already have %s (%s)" msgstr "å·²ç»æœ‰ %s(%s)" #: fetch-pack.c:869 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-packï¼šæ— æ³•æ´¾ç”Ÿ sideband 多路输出" #: fetch-pack.c:877 msgid "protocol error: bad pack header" msgstr "å议错误:å的包头" #: fetch-pack.c:944 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-packï¼šæ— æ³•æ´¾ç”Ÿè¿›ç¨‹ %s" #: fetch-pack.c:960 #, c-format msgid "%s failed" msgstr "%s 失败" #: fetch-pack.c:962 msgid "error in sideband demultiplexer" msgstr "sideband 多路输出出错" #: fetch-pack.c:989 msgid "Server does not support shallow clients" msgstr "æœåŠ¡å™¨ä¸æ”¯æŒ shalllow 客户端" #: fetch-pack.c:993 msgid "Server supports multi_ack_detailed" msgstr "æœåŠ¡å™¨æ”¯æŒ multi_ack_detailed" #: fetch-pack.c:996 msgid "Server supports no-done" msgstr "æœåŠ¡å™¨æ”¯æŒ no-done" #: fetch-pack.c:1002 msgid "Server supports multi_ack" msgstr "æœåŠ¡å™¨æ”¯æŒ multi_ack" #: fetch-pack.c:1006 msgid "Server supports side-band-64k" msgstr "æœåŠ¡å™¨æ”¯æŒ side-band-64k" #: fetch-pack.c:1010 msgid "Server supports side-band" msgstr "æœåŠ¡å™¨æ”¯æŒ side-band" #: fetch-pack.c:1014 msgid "Server supports allow-tip-sha1-in-want" msgstr "æœåŠ¡å™¨æ”¯æŒ allow-tip-sha1-in-want" #: fetch-pack.c:1018 msgid "Server supports allow-reachable-sha1-in-want" msgstr "æœåŠ¡å™¨æ”¯æŒ allow-reachable-sha1-in-want" #: fetch-pack.c:1028 msgid "Server supports ofs-delta" msgstr "æœåŠ¡å™¨æ”¯æŒ ofs-delta" #: fetch-pack.c:1034 fetch-pack.c:1204 msgid "Server supports filter" msgstr "æœåŠ¡å™¨æ”¯æŒ filter" #: fetch-pack.c:1042 #, c-format msgid "Server version is %.*s" msgstr "æœåŠ¡å™¨ç‰ˆæœ¬ %.*s" #: fetch-pack.c:1048 msgid "Server does not support --shallow-since" msgstr "æœåŠ¡å™¨ä¸æ”¯æŒ --shallow-since" #: fetch-pack.c:1052 msgid "Server does not support --shallow-exclude" msgstr "æœåŠ¡å™¨ä¸æ”¯æŒ --shallow-exclude" #: fetch-pack.c:1054 msgid "Server does not support --deepen" msgstr "æœåŠ¡å™¨ä¸æ”¯æŒ --deepen" #: fetch-pack.c:1065 msgid "no common commits" msgstr "没有共åŒçš„æ交" #: fetch-pack.c:1077 fetch-pack.c:1414 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack:获å–失败。" #: fetch-pack.c:1199 msgid "Server does not support shallow requests" msgstr "æœåŠ¡å™¨ä¸æ”¯æŒ shalllow 请求" #: fetch-pack.c:1584 msgid "no matching remote head" msgstr "没有匹é…的远程分支" #: fetch-pack.c:1610 #, c-format msgid "no such remote ref %s" msgstr "æ²¡æœ‰è¿™æ ·çš„è¿œç¨‹å¼•ç”¨ %s" #: fetch-pack.c:1613 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "æœåŠ¡å™¨ä¸å…许请求未公开的对象 %s" #: gpg-interface.c:185 msgid "gpg failed to sign the data" msgstr "gpg æ— æ³•ä¸ºæ•°æ®ç¾å" #: gpg-interface.c:210 msgid "could not create temporary file" msgstr "ä¸èƒ½åˆ›å»ºä¸´æ—¶æ–‡ä»¶" #: gpg-interface.c:213 #, c-format msgid "failed writing detached signature to '%s'" msgstr "æ— æ³•å°†åˆ†ç¦»å¼ç¾å写入 '%s'" #: graph.c:97 #, c-format msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "忽略 log.graphColors ä¸æ— 效的颜色 '%.*s'" #: grep.c:2020 #, c-format msgid "'%s': unable to read %s" msgstr "'%s'ï¼šæ— æ³•è¯»å– %s" #: grep.c:2037 setup.c:164 builtin/clone.c:409 builtin/diff.c:81 #: builtin/rm.c:134 #, c-format msgid "failed to stat '%s'" msgstr "对 '%s' 调用 stat 失败" #: grep.c:2048 #, c-format msgid "'%s': short read" msgstr "'%s':读å–ä¸å®Œæ•´" #: help.c:23 msgid "start a working area (see also: git help tutorial)" msgstr "开始一个工作区(å‚è§ï¼šgit help tutorial)" #: help.c:24 msgid "work on the current change (see also: git help everyday)" msgstr "在当å‰å˜æ›´ä¸Šå·¥ä½œï¼ˆå‚è§ï¼šgit help everyday)" #: help.c:25 msgid "examine the history and state (see also: git help revisions)" msgstr "检查历å²å’ŒçŠ¶æ€ï¼ˆå‚è§ï¼šgit help revisions)" #: help.c:26 msgid "grow, mark and tweak your common history" msgstr "扩展ã€æ ‡è®°å’Œè°ƒæ ¡æ‚¨çš„历å²è®°å½•" #: help.c:27 msgid "collaborate (see also: git help workflows)" msgstr "ååŒï¼ˆå‚è§ï¼šgit help workflows)" #: help.c:31 msgid "Main Porcelain Commands" msgstr "主è¦çš„上层命令" #: help.c:32 msgid "Ancillary Commands / Manipulators" msgstr "辅助命令/æ“作者" #: help.c:33 msgid "Ancillary Commands / Interrogators" msgstr "辅助命令/询问者" #: help.c:34 msgid "Interacting with Others" msgstr "与其它系统交互" #: help.c:35 msgid "Low-level Commands / Manipulators" msgstr "低级命令/æ“作者" #: help.c:36 msgid "Low-level Commands / Interrogators" msgstr "低级命令/询问者" #: help.c:37 msgid "Low-level Commands / Synching Repositories" msgstr "低级命令/åŒæ¥ä»“库" #: help.c:38 msgid "Low-level Commands / Internal Helpers" msgstr "低级命令/内部助手" #: help.c:293 #, c-format msgid "available git commands in '%s'" msgstr "在 '%s' 下å¯ç”¨çš„ git 命令" #: help.c:300 msgid "git commands available from elsewhere on your $PATH" msgstr "在 $PATH 路径ä¸çš„其他地方å¯ç”¨çš„ git 命令" #: help.c:309 msgid "These are common Git commands used in various situations:" msgstr "这些是å„ç§åœºåˆå¸¸è§çš„ Git 命令:" #: help.c:358 git.c:90 #, c-format msgid "unsupported command listing type '%s'" msgstr "ä¸æ”¯æŒçš„命令列表类型 '%s'" #: help.c:405 msgid "The common Git guides are:" msgstr "最常用的 Git å‘导有:" #: help.c:467 #, 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:526 msgid "Uh oh. Your system reports no Git commands at all." msgstr "唉呀,您的系统ä¸æœªå‘现 Git 命令。" #: help.c:548 #, c-format msgid "WARNING: You called a Git command named '%s', which does not exist." msgstr "è¦å‘Šï¼šæ‚¨è¿è¡Œäº†ä¸€ä¸ªå¹¶ä¸å˜åœ¨çš„ Git 命令 '%s'。" #: help.c:553 #, c-format msgid "Continuing under the assumption that you meant '%s'." msgstr "å‡å®šä½ 想è¦çš„是 '%s' 并继ç»ã€‚" #: help.c:558 #, c-format msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." msgstr "å‡å®šä½ 想è¦çš„是 '%2$s',在 %1$0.1f 秒钟åŽç»§ç»ã€‚" #: help.c:566 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git:'%s' ä¸æ˜¯ä¸€ä¸ª git 命令。å‚è§ 'git --help'。" #: help.c:570 msgid "" "\n" "The most similar command is" msgid_plural "" "\n" "The most similar commands are" msgstr[0] "" "\n" "最相似的命令是" msgstr[1] "" "\n" "最相似的命令是" #: help.c:585 msgid "git version [<options>]" msgstr "git version [<选项>]" #: help.c:652 #, c-format msgid "%s: %s - %s" msgstr "%s:%s - %s" #: help.c:656 msgid "" "\n" "Did you mean this?" msgid_plural "" "\n" "Did you mean one of these?" msgstr[0] "" "\n" "您指的是这个么?" msgstr[1] "" "\n" "您指的是这其ä¸çš„æŸä¸€ä¸ªä¹ˆï¼Ÿ" #: ident.c:342 msgid "" "\n" "*** Please tell me who you are.\n" "\n" "Run\n" "\n" " git config --global user.email \"you@example.com\"\n" " git config --global user.name \"Your Name\"\n" "\n" "to set your account's default identity.\n" "Omit --global to set the identity only in this repository.\n" "\n" msgstr "" "\n" "*** è¯·å‘Šè¯‰æˆ‘ä½ æ˜¯è°ã€‚\n" "\n" "è¿è¡Œ\n" "\n" " git config --global user.email \"you@example.com\"\n" " git config --global user.name \"Your Name\"\n" "\n" "æ¥è®¾ç½®æ‚¨è´¦å·çš„缺çœèº«ä»½æ ‡è¯†ã€‚\n" "å¦‚æžœä»…åœ¨æœ¬ä»“åº“è®¾ç½®èº«ä»½æ ‡è¯†ï¼Œåˆ™çœç•¥ --global å‚数。\n" #: ident.c:366 msgid "no email was given and auto-detection is disabled" msgstr "未æ供邮件地å€ä¸”自动探测被ç¦ç”¨" #: ident.c:371 #, c-format msgid "unable to auto-detect email address (got '%s')" msgstr "æ— æ³•è‡ªåŠ¨æŽ¢æµ‹é‚®ä»¶åœ°å€ï¼ˆå¾—到 '%s')" #: ident.c:381 msgid "no name was given and auto-detection is disabled" msgstr "未æ供姓å且自动探测被ç¦ç”¨" #: ident.c:387 #, c-format msgid "unable to auto-detect name (got '%s')" msgstr "æ— æ³•è‡ªåŠ¨æŽ¢æµ‹å§“å(得到 '%s')" #: ident.c:395 #, c-format msgid "empty ident name (for <%s>) not allowed" msgstr "ä¸å…许空的姓å(对于 <%s>)" #: ident.c:401 #, c-format msgid "name consists only of disallowed characters: %s" msgstr "姓åä¸ä»…包å«ç¦ç”¨å—符:%s" #: ident.c:416 builtin/commit.c:587 #, c-format msgid "invalid date format: %s" msgstr "æ— æ•ˆçš„æ—¥æœŸæ ¼å¼ï¼š%s" #: list-objects-filter-options.c:36 msgid "multiple filter-specs cannot be combined" msgstr "ä¸èƒ½æ··ç”¨å¤šç§è¿‡æ»¤è§„æ ¼" #: list-objects-filter-options.c:126 msgid "cannot change partial clone promisor remote" msgstr "æ— æ³•ä¿®æ”¹éƒ¨åˆ†å…‹éš†çš„ promisor 远程仓库" #: lockfile.c:151 #, c-format msgid "" "Unable to create '%s.lock': %s.\n" "\n" "Another git process seems to be running in this repository, e.g.\n" "an editor opened by 'git commit'. Please make sure all processes\n" "are terminated then try again. If it still fails, a git process\n" "may have crashed in this repository earlier:\n" "remove the file manually to continue." msgstr "" "æ— æ³•åˆ›å»º '%s.lock':%s。\n" "\n" "似乎å¦å¤–一个 git 进程在这个仓库ä¸è¿è¡Œï¼Œä¾‹å¦‚:'git commit' 命令打\n" "开了一个编辑器。请确认所有进程都已ç»å…³é—然åŽé‡è¯•ã€‚如果ä»ç„¶æŠ¥é”™ï¼Œ\n" "å¯èƒ½ä¹‹å‰æœ‰ä¸€ä¸ª git 进程在这个仓库ä¸å¼‚常退出:\n" "æ‰‹åŠ¨åˆ é™¤è¿™ä¸ªæ–‡ä»¶å†ç»§ç»ã€‚" #: lockfile.c:159 #, c-format msgid "Unable to create '%s.lock': %s" msgstr "ä¸èƒ½åˆ›å»º '%s.lock':%s" #: merge.c:71 msgid "failed to read the cache" msgstr "æ— æ³•è¯»å–缓å˜" #: merge.c:136 builtin/am.c:1946 builtin/am.c:1980 builtin/checkout.c:378 #: builtin/checkout.c:606 builtin/clone.c:761 msgid "unable to write new index file" msgstr "æ— æ³•å†™æ–°çš„ç´¢å¼•æ–‡ä»¶" #: merge-recursive.c:298 msgid "(bad commit)\n" msgstr "(åæ交)\n" #: merge-recursive.c:320 #, c-format msgid "add_cacheinfo failed for path '%s'; merge aborting." msgstr "addinfo_cache 对路径 '%s' 执行失败,åˆå¹¶ç»ˆæ¢ã€‚" #: merge-recursive.c:328 #, c-format msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." msgstr "addinfo_cache æ— æ³•åˆ·æ–°è·¯å¾„ '%s',åˆå¹¶ç»ˆæ¢ã€‚" #: merge-recursive.c:410 msgid "error building trees" msgstr "æ— æ³•åˆ›å»ºæ ‘" #: merge-recursive.c:881 #, c-format msgid "failed to create path '%s'%s" msgstr "æ— æ³•åˆ›å»ºè·¯å¾„ '%s'%s" #: merge-recursive.c:892 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "åˆ é™¤ %s 以便为å目录留出空间\n" #: merge-recursive.c:906 merge-recursive.c:925 msgid ": perhaps a D/F conflict?" msgstr ":å¯èƒ½æ˜¯ä¸€ä¸ªç›®å½•/文件冲çªï¼Ÿ" #: merge-recursive.c:915 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "æ‹’ç»ä¸¢å¼ƒ '%s' ä¸çš„未跟踪文件" #: merge-recursive.c:957 builtin/cat-file.c:37 #, c-format msgid "cannot read object %s '%s'" msgstr "ä¸èƒ½è¯»å–对象 %s '%s'" #: merge-recursive.c:959 #, c-format msgid "blob expected for %s '%s'" msgstr "%s '%s' 应为数æ®å¯¹è±¡" #: merge-recursive.c:983 #, c-format msgid "failed to open '%s': %s" msgstr "æ— æ³•æ‰“å¼€ '%s':%s" #: merge-recursive.c:994 #, c-format msgid "failed to symlink '%s': %s" msgstr "æ— æ³•åˆ›å»ºç¬¦å·é“¾æŽ¥ '%s':%s" #: merge-recursive.c:999 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "ä¸çŸ¥é“å¦‚ä½•å¤„ç† %06o %s '%s'" #: merge-recursive.c:1186 #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "æ— æ³•åˆå¹¶å模组 %s (没有检出)" #: merge-recursive.c:1193 #, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "æ— æ³•åˆå¹¶å模组 %s(æ交ä¸å˜åœ¨ï¼‰" #: merge-recursive.c:1200 #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" msgstr "æ— æ³•åˆå¹¶å模组 %s (æ交未跟éšåˆå¹¶åŸºçº¿ï¼‰" #: merge-recursive.c:1208 merge-recursive.c:1220 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "å模组 %s 快进到如下æ交:" #: merge-recursive.c:1211 merge-recursive.c:1223 #, c-format msgid "Fast-forwarding submodule %s" msgstr "å¿«è¿›å模组 %s" #: merge-recursive.c:1245 #, c-format msgid "Failed to merge submodule %s (merge following commits not found)" msgstr "æ— æ³•åˆå¹¶å模组 %s (没å‘现åˆå¹¶è·Ÿéšçš„æ交)" #: merge-recursive.c:1249 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "æ— æ³•åˆå¹¶å模组 %s(éžå¿«è¿›ï¼‰" #: merge-recursive.c:1250 msgid "Found a possible merge resolution for the submodule:\n" msgstr "找到å模组的一个å¯èƒ½çš„åˆå¹¶æ–¹æ¡ˆï¼š\n" #: merge-recursive.c:1253 #, c-format msgid "" "If this is correct simply add it to the index for example\n" "by using:\n" "\n" " git update-index --cacheinfo 160000 %s \"%s\"\n" "\n" "which will accept this suggestion.\n" msgstr "" "如果这个æ£ç¡®ï¼Œå°†å…¶æ·»åŠ 到索引,例如使用命令:\n" "\n" " git update-index --cacheinfo 160000 %s \"%s\"\n" "\n" "以接å—æ¤å»ºè®®ã€‚\n" #: merge-recursive.c:1262 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "æ— æ³•åˆå¹¶å模组 %s (å‘现多个åˆå¹¶ï¼‰" #: merge-recursive.c:1321 msgid "Failed to execute internal merge" msgstr "æ— æ³•æ‰§è¡Œå†…éƒ¨åˆå¹¶" #: merge-recursive.c:1326 #, c-format msgid "Unable to add %s to database" msgstr "ä¸èƒ½æ·»åŠ %s 至对象库" #: merge-recursive.c:1358 #, c-format msgid "Auto-merging %s" msgstr "自动åˆå¹¶ %s" #: merge-recursive.c:1423 #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." msgstr "错误:拒ç»ä¸¢å¤±æœªè·Ÿè¸ªæ–‡ä»¶ '%s',而是写入 %s。" #: merge-recursive.c:1475 #, 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:1480 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " "left in tree." msgstr "" "冲çªï¼ˆ%1$s/åˆ é™¤ï¼‰ï¼š%2$s 在 %3$s ä¸è¢«åˆ 除,在 %6$s ä¸çš„ %5$s 被 %4$s。%8$s çš„ " "%7$s 版本被ä¿ç•™ã€‚" #: merge-recursive.c:1487 #, 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:1492 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " "left in tree at %s." msgstr "" "冲çªï¼ˆ%1$s/åˆ é™¤ï¼‰ï¼š%2$s 在 %3$s ä¸è¢«åˆ 除,在 %6$s ä¸çš„ %5$s 被 %4$s。%8$s çš„ " "%7$s 版本ä¿ç•™åœ¨ %9$s ä¸ã€‚" #: merge-recursive.c:1526 msgid "rename" msgstr "é‡å‘½å" #: merge-recursive.c:1526 msgid "renamed" msgstr "é‡å‘½å" #: merge-recursive.c:1580 merge-recursive.c:1736 merge-recursive.c:2368 #: merge-recursive.c:3086 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "æ‹’ç»ä¸¢å¤±è„文件 '%s'" #: merge-recursive.c:1594 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s 是 %s ä¸çš„一个目录而以 %s 为åè¢«æ·»åŠ " #: merge-recursive.c:1599 #, c-format msgid "Refusing to lose untracked file at %s; adding as %s instead" msgstr "æ‹’ç»ä¸¢å¤±æœªè·Ÿè¸ªæ–‡ä»¶ '%s'ï¼Œè€Œæ˜¯æ·»åŠ ä¸º %s" #: merge-recursive.c:1625 #, 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:1630 msgid " (left unresolved)" msgstr "(留下未解决)" #: merge-recursive.c:1694 #, 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:1733 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "而是é‡å‘½å %s 至 %sï¼Œä»¥åŠ %s 至 %s" #: merge-recursive.c:1745 #, c-format msgid "Refusing to lose untracked file at %s, even though it's in the way." msgstr "æ‹’ç»ä¸¢å¤±æœªè·Ÿè¸ªæ–‡ä»¶ '%s',å³ä½¿å®ƒå¦¨ç¢äº†ã€‚" #: merge-recursive.c:1951 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " "directory %s was renamed to multiple other directories, with no destination " "getting a majority of the files." msgstr "" "冲çªï¼ˆåˆ†å‰²çš„目录é‡å‘½å):ä¸æ¸…楚 %s åº”è¯¥æ”¾åœ¨å“ªé‡Œï¼Œå› ä¸ºç›®å½• %s 被é‡å‘½å到多个" "其它目录,没有一个目录包å«ä¸»è¦çš„文件。" #: merge-recursive.c:1983 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " "implicit directory rename(s) putting the following path(s) there: %s." msgstr "" "冲çªï¼ˆéšå¼ç›®å½•é‡å‘½å):处于éšå¼ç›®å½•é‡å‘½å的现å˜æ–‡ä»¶/目录 %s,将以下路径放" "在:%s。" #: merge-recursive.c:1993 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " "implicit directory renames tried to put these paths there: %s" msgstr "" "冲çªï¼ˆéšå¼ç›®å½•é‡å‘½åï¼‰ï¼šæ— æ³•æ˜ å°„ä¸€ä¸ªä»¥ä¸Šè·¯å¾„åˆ° %s,éšå¼ç›®å½•é‡å‘½åå°è¯•å°†è¿™äº›è·¯" "径放置于æ¤ï¼š%s" #: merge-recursive.c:2085 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" ">%s in %s" msgstr "" "冲çªï¼ˆé‡å‘½å/é‡å‘½å):在 %3$s ä¸é‡å‘½å目录 %1$s->%2$s,在 %6$s ä¸é‡å‘½å目录 " "%4$s->%5$s" #: merge-recursive.c:2330 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " "renamed." msgstr "è¦å‘Šï¼šé¿å…应用 %s -> %s çš„é‡å‘½å到 %sï¼Œå› ä¸º %s 本身已被é‡å‘½å。" #: merge-recursive.c:2736 #, 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:2751 #, c-format msgid "Adding merged %s" msgstr "æ·»åŠ åˆå¹¶åŽçš„ %s" #: merge-recursive.c:2758 merge-recursive.c:3089 #, c-format msgid "Adding as %s instead" msgstr "而是以 %s 为åæ·»åŠ " #: merge-recursive.c:2914 #, c-format msgid "cannot read object %s" msgstr "ä¸èƒ½è¯»å–对象 %s" #: merge-recursive.c:2917 #, c-format msgid "object %s is not a blob" msgstr "对象 %s ä¸æ˜¯ä¸€ä¸ªæ•°æ®å¯¹è±¡" #: merge-recursive.c:2986 msgid "modify" msgstr "修改" #: merge-recursive.c:2986 msgid "modified" msgstr "修改" #: merge-recursive.c:2997 msgid "content" msgstr "内容" #: merge-recursive.c:3004 msgid "add/add" msgstr "æ·»åŠ /æ·»åŠ " #: merge-recursive.c:3046 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "略过 %s(已ç»åšè¿‡ç›¸åŒåˆå¹¶ï¼‰" #: merge-recursive.c:3055 git-submodule.sh:895 msgid "submodule" msgstr "å模组" #: merge-recursive.c:3056 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "冲çªï¼ˆ%s):åˆå¹¶å†²çªäºŽ %s" #: merge-recursive.c:3178 #, c-format msgid "Removing %s" msgstr "åˆ é™¤ %s" #: merge-recursive.c:3204 msgid "file/directory" msgstr "文件/目录" #: merge-recursive.c:3210 msgid "directory/file" msgstr "目录/文件" #: merge-recursive.c:3217 #, 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:3226 #, c-format msgid "Adding %s" msgstr "æ·»åŠ %s" #: merge-recursive.c:3267 #, c-format msgid "Dirty index: cannot merge (dirty: %s)" msgstr "è„索引:ä¸èƒ½åˆå¹¶ï¼ˆè„文件:%s)" #: merge-recursive.c:3271 msgid "Already up to date!" msgstr "å·²ç»æ˜¯æœ€æ–°çš„ï¼" #: merge-recursive.c:3280 #, c-format msgid "merging of trees %s and %s failed" msgstr "æ— æ³•åˆå¹¶æ ‘ %s å’Œ %s" #: merge-recursive.c:3379 msgid "Merging:" msgstr "åˆå¹¶ï¼š" #: merge-recursive.c:3392 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "å‘现 %u 个共åŒç¥–先:" msgstr[1] "å‘现 %u 个共åŒç¥–先:" #: merge-recursive.c:3431 msgid "merge returned no commit" msgstr "åˆå¹¶æœªè¿”回æ交" #: merge-recursive.c:3495 #, c-format msgid "Could not parse object '%s'" msgstr "ä¸èƒ½è§£æžå¯¹è±¡ '%s'" #: merge-recursive.c:3511 builtin/merge.c:659 builtin/merge.c:816 msgid "Unable to write index." msgstr "ä¸èƒ½å†™å…¥ç´¢å¼•ã€‚" #: notes-merge.c:272 #, c-format msgid "" "You have not concluded your previous notes merge (%s exists).\n" "Please, use 'git notes merge --commit' or 'git notes merge --abort' to " "commit/abort the previous merge before you start a new notes merge." msgstr "" "您的å‰ä¸€æ¬¡æ³¨é‡Šåˆå¹¶å°šæœªç»“æŸï¼ˆå˜åœ¨ %s)。\n" "在开始一个新的注释åˆå¹¶ä¹‹å‰ï¼Œè¯·ä½¿ç”¨ 'git notes merge --commit' 或者 'git " "notes merge --abort' æ¥æ交/终æ¢å‰ä¸€æ¬¡åˆå¹¶ã€‚" #: notes-merge.c:279 #, c-format msgid "You have not concluded your notes merge (%s exists)." msgstr "您尚未结æŸæ³¨é‡Šåˆå¹¶ï¼ˆå˜åœ¨ %s)。" #: notes-utils.c:43 msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "ä¸èƒ½æ交未åˆå§‹åŒ–/æœªå¼•ç”¨çš„æ³¨è§£æ ‘" #: notes-utils.c:102 #, c-format msgid "Bad notes.rewriteMode value: '%s'" msgstr "åçš„ notes.rewriteMode 值:'%s'" #: notes-utils.c:112 #, 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. #. #: notes-utils.c:142 #, c-format msgid "Bad %s value: '%s'" msgstr "åçš„ %s 值:'%s'" #: object.c:242 #, c-format msgid "unable to parse object: %s" msgstr "ä¸èƒ½è§£æžå¯¹è±¡ï¼š%s" #: packfile.c:563 msgid "offset before end of packfile (broken .idx?)" msgstr "å移é‡åœ¨åŒ…文件结æŸä¹‹å‰ï¼ˆæŸåçš„ .idx?)" #: packfile.c:1742 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "å移é‡åœ¨ %s 的包索引开始之å‰ï¼ˆæŸå的索引?)" #: packfile.c:1746 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "å移é‡è¶Šè¿‡äº† %s 的包索引的结尾(被截æ–的索引?)" #: parse-options.c:621 msgid "..." msgstr "..." #: parse-options.c:640 #, c-format msgid "usage: %s" msgstr "用法:%s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. #: parse-options.c:646 #, c-format msgid " or: %s" msgstr " 或:%s" # 译者:为ä¿è¯åœ¨è¾“出ä¸å¯¹é½ï¼Œæ³¨æ„调整å¥ä¸ç©ºæ ¼ï¼ #: parse-options.c:649 #, c-format msgid " %s" msgstr " %s" #: parse-options.c:688 msgid "-NUM" msgstr "-æ•°å—" #: parse-options-cb.c:44 #, c-format msgid "malformed expiration date '%s'" msgstr "æ ¼å¼é”™è¯¯çš„到期时间:'%s'" #: parse-options-cb.c:112 #, c-format msgid "malformed object name '%s'" msgstr "æ ¼å¼é”™è¯¯çš„对象å '%s'" #: path.c:892 #, c-format msgid "Could not make %s writable by group" msgstr "ä¸èƒ½è®¾ç½® %s 为组å¯å†™" #: pathspec.c:129 msgid "Escape character '\\' not allowed as last character in attr value" msgstr "转义å—符 '\\' ä¸èƒ½ä½œä¸ºå±žæ€§å€¼çš„最åŽä¸€ä¸ªå—符" #: pathspec.c:147 msgid "Only one 'attr:' specification is allowed." msgstr "åªå…许一个 'attr:' è§„æ ¼ã€‚" #: pathspec.c:150 msgid "attr spec must not be empty" msgstr "å±žæ€§è§„æ ¼ä¸èƒ½ä¸ºç©º" #: pathspec.c:193 #, c-format msgid "invalid attribute name %s" msgstr "æ— æ•ˆçš„å±žæ€§å %s" #: pathspec.c:258 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "全局的 'glob' å’Œ 'noglob' è·¯å¾„è§„æ ¼è®¾ç½®ä¸å…¼å®¹" #: pathspec.c:265 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" msgstr "全局的 'literal' è·¯å¾„è§„æ ¼è®¾ç½®å’Œå…¶å®ƒçš„å…¨å±€è·¯å¾„è§„æ ¼è®¾ç½®ä¸å…¼å®¹" #: pathspec.c:305 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "è·¯å¾„è§„æ ¼åŒ…å«æ— 效的神奇å‰ç¼€" #: pathspec.c:326 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "åœ¨è·¯å¾„è§„æ ¼ '%3$s' ä¸æ— 效的神奇å‰ç¼€ '%2$.*1$s'" #: pathspec.c:331 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "è·¯å¾„è§„æ ¼ '%s' 的神奇å‰ç¼€ç»“尾少了一个 ')'" #: pathspec.c:369 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "è·¯å¾„è§„æ ¼ '%2$s' ä¸åŒ…å«æœªå®žçŽ°çš„神奇å‰ç¼€ '%1$c'" #: pathspec.c:428 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "%s:'literal' å’Œ 'glob' ä¸å…¼å®¹" #: pathspec.c:441 #, c-format msgid "%s: '%s' is outside repository" msgstr "%s:'%s' 在仓库之外" #: pathspec.c:515 #, c-format msgid "'%s' (mnemonic: '%c')" msgstr "'%s'(助记符:'%c')" #: pathspec.c:525 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "%sï¼šè·¯å¾„è§„æ ¼ç¥žå¥‡å‰ç¼€ä¸è¢«æ¤å‘½ä»¤æ”¯æŒï¼š%s" #: pathspec.c:592 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "è·¯å¾„è§„æ ¼ '%s' ä½äºŽç¬¦å·é“¾æŽ¥ä¸" #: pretty.c:962 msgid "unable to parse --pretty format" msgstr "ä¸èƒ½è§£æž --pretty æ ¼å¼" #: read-cache.c:1500 #, c-format msgid "" "index.version set, but the value is invalid.\n" "Using version %i" msgstr "" "设置了 index.version,但是å–å€¼æ— æ•ˆã€‚\n" "使用版本 %i" #: read-cache.c:1510 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" "Using version %i" msgstr "" "设置了 GIT_INDEX_VERSION,但是å–å€¼æ— æ•ˆã€‚\n" "使用版本 %i" #: read-cache.c:2404 sequencer.c:4338 wrapper.c:658 builtin/merge.c:1048 #, c-format msgid "could not close '%s'" msgstr "ä¸èƒ½å…³é— '%s'" #: read-cache.c:2477 sequencer.c:2102 sequencer.c:3234 #, c-format msgid "could not stat '%s'" msgstr "ä¸èƒ½å¯¹ '%s' 调用 stat" #: read-cache.c:2490 #, c-format msgid "unable to open git dir: %s" msgstr "ä¸èƒ½æ‰“å¼€ git 目录:%s" #: read-cache.c:2502 #, c-format msgid "unable to unlink: %s" msgstr "æ— æ³•åˆ é™¤ï¼š%s" #: refs.c:732 sequencer.c:4334 sequencer.c:4393 wrapper.c:225 wrapper.c:395 #: builtin/am.c:779 #, c-format msgid "could not open '%s' for writing" msgstr "æ— æ³•æ‰“å¼€ '%s' 进行写入" #: refs.c:1880 msgid "ref updates forbidden inside quarantine environment" msgstr "在隔离环境ä¸ç¦æ¢æ›´æ–°å¼•ç”¨" #: refs/files-backend.c:1191 #, c-format msgid "could not remove reference %s" msgstr "æ— æ³•åˆ é™¤å¼•ç”¨ %s" #: refs/files-backend.c:1205 refs/packed-backend.c:1531 #: refs/packed-backend.c:1541 #, c-format msgid "could not delete reference %s: %s" msgstr "æ— æ³•åˆ é™¤å¼•ç”¨ %s:%s" #: refs/files-backend.c:1208 refs/packed-backend.c:1544 #, c-format msgid "could not delete references: %s" msgstr "æ— æ³•åˆ é™¤å¼•ç”¨ï¼š%s" #: ref-filter.c:35 wt-status.c:1850 msgid "gone" msgstr "丢失" #: ref-filter.c:36 #, c-format msgid "ahead %d" msgstr "领先 %d" #: ref-filter.c:37 #, c-format msgid "behind %d" msgstr "è½åŽ %d" #: ref-filter.c:38 #, c-format msgid "ahead %d, behind %d" msgstr "领先 %d,è½åŽ %d" #: ref-filter.c:121 #, c-format msgid "expected format: %%(color:<color>)" msgstr "æœŸæœ›çš„æ ¼å¼ï¼š%%(color:<颜色>)" #: ref-filter.c:123 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "未能识别的颜色:%%(color:%s)" #: ref-filter.c:145 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "期望整数值 refname:lstrip=%s" #: ref-filter.c:149 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "期望整数值 refname:rstrip=%s" #: ref-filter.c:151 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "未能识别的 %%(%s) å‚数:%s" #: ref-filter.c:206 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) ä¸å¸¦å‚æ•°" #: ref-filter.c:215 #, c-format msgid "%%(subject) does not take arguments" msgstr "%%(subject) ä¸å¸¦å‚æ•°" #: ref-filter.c:235 #, c-format msgid "unknown %%(trailers) argument: %s" msgstr "未知的 %%(trailers) å‚数:%s" #: ref-filter.c:264 #, c-format msgid "positive value expected contents:lines=%s" msgstr "期望一个æ£æ•° contents:lines=%s" #: ref-filter.c:266 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "未能识别的 %%(contents) å‚数:%s" #: ref-filter.c:281 #, c-format msgid "positive value expected objectname:short=%s" msgstr "期望一个æ£æ•° objectname:short=%s" #: ref-filter.c:285 #, c-format msgid "unrecognized %%(objectname) argument: %s" msgstr "未能识别的 %%(objectname) å‚数:%s" #: ref-filter.c:315 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "æœŸæœ›çš„æ ¼å¼ï¼š%%(align:<宽度>,<ä½ç½®>)" #: ref-filter.c:327 #, c-format msgid "unrecognized position:%s" msgstr "未能识别的ä½ç½®ï¼š%s" #: ref-filter.c:334 #, c-format msgid "unrecognized width:%s" msgstr "未能识别的宽度:%s" #: ref-filter.c:343 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "未能识别的 %%(align) å‚数:%s" #: ref-filter.c:351 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "å…ƒç´ %%(align) 需è¦ä¸€ä¸ªæ£æ•°çš„宽度" #: ref-filter.c:369 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "未能识别的 %%(if) å‚数:%s" #: ref-filter.c:464 #, c-format msgid "malformed field name: %.*s" msgstr "æ ¼å¼é”™è¯¯çš„å—段å:%.*s" #: ref-filter.c:491 #, c-format msgid "unknown field name: %.*s" msgstr "未知的å—段å:%.*s" #: ref-filter.c:608 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "æ ¼å¼ï¼šä½¿ç”¨äº† %%(if) å…ƒç´ è€Œæ²¡æœ‰ %%(then) å…ƒç´ " #: ref-filter.c:671 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "æ ¼å¼ï¼šä½¿ç”¨äº† %%(then) å…ƒç´ è€Œæ²¡æœ‰ %%(if) å…ƒç´ " #: ref-filter.c:673 #, c-format msgid "format: %%(then) atom used more than once" msgstr "æ ¼å¼ï¼š%%(then) å…ƒç´ ç”¨äº†å¤šæ¬¡" #: ref-filter.c:675 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "æ ¼å¼ï¼š%%(then) å…ƒç´ ç”¨åœ¨äº† %%(else) 之åŽ" #: ref-filter.c:703 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "æ ¼å¼ï¼šä½¿ç”¨äº† %%(else) å…ƒç´ è€Œæ²¡æœ‰ %%(if) å…ƒç´ " #: ref-filter.c:705 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "æ ¼å¼ï¼šä½¿ç”¨äº† %%(else) å…ƒç´ è€Œæ²¡æœ‰ %%(then) å…ƒç´ " #: ref-filter.c:707 #, c-format msgid "format: %%(else) atom used more than once" msgstr "æ ¼å¼ï¼š%%(else) å…ƒç´ ç”¨äº†å¤šæ¬¡" #: ref-filter.c:722 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "æ ¼å¼ï¼šä½¿ç”¨äº† %%(end) å…ƒç´ å´æ²¡æœ‰å®ƒçš„å¯¹åº”å…ƒç´ " #: ref-filter.c:779 #, c-format msgid "malformed format string %s" msgstr "é”™è¯¯çš„æ ¼å¼åŒ–å—符串 %s" #: ref-filter.c:1387 #, c-format msgid "(no branch, rebasing %s)" msgstr "(éžåˆ†æ”¯ï¼Œæ£å˜åŸº %s)" #: ref-filter.c:1390 #, c-format msgid "(no branch, rebasing detached HEAD %s)" msgstr "(éžåˆ†æ”¯ï¼Œæ£å˜åŸºåˆ†ç¦»å¤´æŒ‡é’ˆ %s)" #: ref-filter.c:1393 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(éžåˆ†æ”¯ï¼ŒäºŒåˆ†æŸ¥æ‰¾å¼€å§‹äºŽ %s)" #. TRANSLATORS: make sure this matches "HEAD #. detached at " in wt-status.c #. #: ref-filter.c:1401 #, c-format msgid "(HEAD detached at %s)" msgstr "(头指针分离于 %s)" #. TRANSLATORS: make sure this matches "HEAD #. detached from " in wt-status.c #. #: ref-filter.c:1408 #, c-format msgid "(HEAD detached from %s)" msgstr "(头指针分离自 %s)" #: ref-filter.c:1412 msgid "(no branch)" msgstr "(éžåˆ†æ”¯ï¼‰" #: ref-filter.c:1442 #, c-format msgid "missing object %s for %s" msgstr "缺失 %2$s 的对象 %1$s" #: ref-filter.c:1445 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "parse_object_buffer 失败于 %2$s çš„ %1$s" #: ref-filter.c:1902 #, c-format msgid "malformed object at '%s'" msgstr "æ ¼å¼é”™è¯¯çš„对象 '%s'" #: ref-filter.c:1984 #, c-format msgid "ignoring ref with broken name %s" msgstr "忽略带有错误å称 %s 的引用" #: ref-filter.c:1989 #, c-format msgid "ignoring broken ref %s" msgstr "忽略æŸå的引用 %s" #: ref-filter.c:2261 #, c-format msgid "format: %%(end) atom missing" msgstr "æ ¼å¼ï¼šç¼ºå°‘ %%(end) å…ƒç´ " #: ref-filter.c:2365 #, c-format msgid "malformed object name %s" msgstr "æ ¼å¼é”™è¯¯çš„对象å %s" #: remote.c:605 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "ä¸èƒ½åŒæ—¶èŽ·å– %s å’Œ %s 至 %s" #: remote.c:609 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s 通常跟踪 %sï¼Œè€Œéž %s" #: remote.c:613 #, c-format msgid "%s tracks both %s and %s" msgstr "%s åŒæ—¶è·Ÿè¸ª %s å’Œ %s" #: remote.c:621 msgid "Internal error" msgstr "内部错误" #: remote.c:1534 remote.c:1635 msgid "HEAD does not point to a branch" msgstr "HEAD 没有指å‘一个分支" #: remote.c:1543 #, c-format msgid "no such branch: '%s'" msgstr "没有æ¤åˆ†æ”¯ï¼š'%s'" #: remote.c:1546 #, c-format msgid "no upstream configured for branch '%s'" msgstr "尚未给分支 '%s' 设置上游" #: remote.c:1552 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "上游分支 '%s' 没有å˜å‚¨ä¸ºä¸€ä¸ªè¿œç¨‹è·Ÿè¸ªåˆ†æ”¯" #: remote.c:1567 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "推é€ç›®æ ‡ '%s' 至远程 '%s' 没有本地跟踪分支" #: remote.c:1579 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "分支 '%s' 没有设置è¦æŽ¨é€çš„远程æœåŠ¡å™¨" #: remote.c:1589 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "å‘ '%s' 推é€å¼•ç”¨è§„æ ¼æœªåŒ…å« '%s'" #: remote.c:1602 msgid "push has no destination (push.default is 'nothing')" msgstr "推é€æ— ç›®æ ‡ï¼ˆpush.default 是 'nothing')" #: remote.c:1624 msgid "cannot resolve 'simple' push to a single destination" msgstr "æ— æ³•è§£æž 'simple' 推é€è‡³ä¸€ä¸ªå•ç‹¬çš„ç›®æ ‡" #: remote.c:1939 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "您的分支基于 '%s',但æ¤ä¸Šæ¸¸åˆ†æ”¯å·²ç»ä¸å˜åœ¨ã€‚\n" #: remote.c:1943 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (使用 \"git branch --unset-upstream\" æ¥ä¿®å¤ï¼‰\n" #: remote.c:1946 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "您的分支与上游分支 '%s' 一致。\n" #: remote.c:1950 #, c-format msgid "Your branch and '%s' refer to different commits.\n" msgstr "您的分支和 '%s' 指å‘ä¸åŒçš„æ交。\n" #: remote.c:1953 #, c-format msgid " (use \"%s\" for details)\n" msgstr " (使用 \"%s\" 查看详情)\n" #: remote.c:1957 #, 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:1963 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (使用 \"git push\" æ¥å‘布您的本地æ交)\n" #: remote.c:1966 #, 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:1974 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (使用 \"git pull\" æ¥æ›´æ–°æ‚¨çš„本地分支)\n" #: remote.c:1977 #, 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:1987 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " (使用 \"git pull\" æ¥åˆå¹¶è¿œç¨‹åˆ†æ”¯ï¼‰\n" #: revision.c:2289 msgid "your current branch appears to be broken" msgstr "您的当å‰åˆ†æ”¯å¥½åƒè¢«æŸå" #: revision.c:2292 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "您的当å‰åˆ†æ”¯ '%s' å°šæ— ä»»ä½•æ交" #: revision.c:2489 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent 与 --bisect ä¸å…¼å®¹" #: run-command.c:728 msgid "open /dev/null failed" msgstr "ä¸èƒ½æ‰“å¼€ /dev/null" #: run-command.c:1271 #, c-format msgid "" "The '%s' hook was ignored because it's not set as executable.\n" "You can disable this warning with `git config advice.ignoredHook false`." msgstr "" "å› ä¸ºæ²¡æœ‰å°†é’©å '%s' 设置为å¯æ‰§è¡Œï¼Œé’©å被忽略。您å¯ä»¥é€šè¿‡\n" "é…ç½® `git config advice.ignoredHook false` æ¥å…³é—è¿™æ¡è¦å‘Šã€‚" #: send-pack.c:141 msgid "unexpected flush packet while reading remote unpack status" msgstr "读å–远程解包状æ€æ—¶æ”¶åˆ°æ„外的 flush 包" #: send-pack.c:143 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "ä¸èƒ½è§£æžè¿œç¨‹è§£åŒ…状æ€ï¼š%s" #: send-pack.c:145 #, c-format msgid "remote unpack failed: %s" msgstr "远程解包失败:%s" #: send-pack.c:308 msgid "failed to sign the push certificate" msgstr "æ— æ³•ä¸ºæŽ¨é€è¯ä¹¦ç¾å" #: send-pack.c:421 msgid "the receiving end does not support --signed push" msgstr "接收端ä¸æ”¯æŒç¾å推é€" #: send-pack.c:423 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" msgstr "未å‘é€æŽ¨é€è¯ä¹¦ï¼Œå› 为接收端ä¸æ”¯æŒç¾å推é€" #: send-pack.c:435 msgid "the receiving end does not support --atomic push" msgstr "接收端ä¸æ”¯æŒåŽŸå推é€" #: send-pack.c:440 msgid "the receiving end does not support push options" msgstr "接收端ä¸æ”¯æŒæŽ¨é€é€‰é¡¹" #: sequencer.c:175 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "æ— æ•ˆçš„æ交信æ¯æ¸…ç†æ¨¡å¼ '%s'" #: sequencer.c:275 #, c-format msgid "could not delete '%s'" msgstr "æ— æ³•åˆ é™¤ '%s'" #: sequencer.c:301 msgid "revert" msgstr "还原" #: sequencer.c:303 msgid "cherry-pick" msgstr "拣选" #: sequencer.c:305 msgid "rebase -i" msgstr "rebase -i" #: sequencer.c:307 #, c-format msgid "Unknown action: %d" msgstr "未知动作:%d" #: sequencer.c:364 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" msgstr "" "冲çªè§£å†³å®Œæ¯•åŽï¼Œç”¨ 'git add <路径>' 或 'git rm <路径>'\n" "å‘½ä»¤æ ‡è®°ä¿®æ£åŽçš„文件" #: sequencer.c:367 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 <路径>' 或 'git rm <路径>'\n" "对修æ£åŽçš„文件åšæ ‡è®°ï¼Œç„¶åŽç”¨ 'git commit' æ交" #: sequencer.c:380 sequencer.c:2468 #, c-format msgid "could not lock '%s'" msgstr "ä¸èƒ½é”定 '%s'" #: sequencer.c:382 sequencer.c:2346 sequencer.c:2472 sequencer.c:2486 #: sequencer.c:2694 sequencer.c:4336 sequencer.c:4399 wrapper.c:656 #, c-format msgid "could not write to '%s'" msgstr "ä¸èƒ½å†™å…¥ '%s'" #: sequencer.c:387 #, c-format msgid "could not write eol to '%s'" msgstr "ä¸èƒ½å°†æ¢è¡Œç¬¦å†™å…¥ '%s'" #: sequencer.c:392 sequencer.c:2351 sequencer.c:2474 sequencer.c:2488 #: sequencer.c:2702 #, c-format msgid "failed to finalize '%s'" msgstr "æ— æ³•å®Œæˆ '%s'" #: sequencer.c:415 sequencer.c:804 sequencer.c:1493 sequencer.c:2371 #: sequencer.c:2684 sequencer.c:2788 builtin/am.c:259 builtin/commit.c:727 #: builtin/merge.c:1046 #, c-format msgid "could not read '%s'" msgstr "ä¸èƒ½è¯»å– '%s'" #: sequencer.c:441 #, c-format msgid "your local changes would be overwritten by %s." msgstr "您的本地修改将被%s覆盖。" #: sequencer.c:445 msgid "commit your changes or stash them to proceed." msgstr "æ交您的修改或贮è—åŽå†ç»§ç»ã€‚" #: sequencer.c:474 #, c-format msgid "%s: fast-forward" msgstr "%s:快进" #. TRANSLATORS: %s will be "revert", "cherry-pick" or #. "rebase -i". #. #: sequencer.c:563 #, c-format msgid "%s: Unable to write new index file" msgstr "%sï¼šæ— æ³•å†™å…¥æ–°ç´¢å¼•æ–‡ä»¶" #: sequencer.c:579 msgid "unable to update cache tree" msgstr "ä¸èƒ½æ›´æ–°ç¼“å˜æ ‘" #: sequencer.c:592 msgid "could not resolve HEAD commit" msgstr "ä¸èƒ½è§£æž HEAD æ交" #: sequencer.c:749 #, c-format msgid "" "you have staged changes in your working tree\n" "If these changes are meant to be squashed into the previous commit, run:\n" "\n" " git commit --amend %s\n" "\n" "If they are meant to go into a new commit, run:\n" "\n" " git commit %s\n" "\n" "In both cases, once you're done, continue with:\n" "\n" " git rebase --continue\n" msgstr "" "您的工作区ä¸å˜åœ¨å·²æš‚å˜çš„修改\n" "如果这些修改需è¦è¢«å¹¶å…¥å‰ä¸€ä¸ªæ交,执行:\n" "\n" " git commit --amend %s\n" "\n" "如果这些修改è¦å½¢æˆä¸€ä¸ªæ–°æ交,执行:\n" "\n" " git commit %s\n" "\n" "æ— è®ºå“ªç§æƒ…况,当您完æˆæ交,继ç»æ‰§è¡Œï¼š\n" "\n" " git rebase --continue\n" #: sequencer.c:818 msgid "writing root commit" msgstr "å†™æ ¹æ交" #: sequencer.c:1043 msgid "'prepare-commit-msg' hook failed" msgstr "'prepare-commit-msg' é’©å失败" #: sequencer.c:1050 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. Run the\n" "following command and follow the instructions in your editor to edit\n" "your configuration file:\n" "\n" " git config --global --edit\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" "\n" " git config --global --edit\n" "\n" "设置完毕åŽï¼Œæ‚¨å¯ä»¥ç”¨ä¸‹é¢çš„命令æ¥ä¿®æ£æœ¬æ¬¡æ交所使用的用户身份:\n" "\n" " git commit --amend --reset-author\n" #: sequencer.c:1063 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" #: sequencer.c:1103 msgid "couldn't look up newly created commit" msgstr "æ— æ³•æ‰¾åˆ°æ–°åˆ›å»ºçš„æ交" #: sequencer.c:1105 msgid "could not parse newly created commit" msgstr "ä¸èƒ½è§£æžæ–°åˆ›å»ºçš„æ交" #: sequencer.c:1151 msgid "unable to resolve HEAD after creating commit" msgstr "创建æ交åŽï¼Œä¸èƒ½è§£æž HEAD" #: sequencer.c:1153 msgid "detached HEAD" msgstr "分离头指针" # 译者:ä¸æ–‡å—符串拼接,å¯åˆ 除å‰å¯¼ç©ºæ ¼ #: sequencer.c:1157 msgid " (root-commit)" msgstr "ï¼ˆæ ¹æ交)" #: sequencer.c:1178 msgid "could not parse HEAD" msgstr "ä¸èƒ½è§£æž HEAD" #: sequencer.c:1180 #, c-format msgid "HEAD %s is not a commit!" msgstr "HEAD %s ä¸æ˜¯ä¸€ä¸ªæ交ï¼" #: sequencer.c:1184 builtin/commit.c:1528 msgid "could not parse HEAD commit" msgstr "ä¸èƒ½è§£æž HEAD æ交" #: sequencer.c:1235 sequencer.c:1832 msgid "unable to parse commit author" msgstr "ä¸èƒ½è§£æžæ交作者" #: sequencer.c:1245 builtin/am.c:1630 builtin/merge.c:645 msgid "git write-tree failed to write a tree" msgstr "git write-tree æ— æ³•å†™å…¥æ ‘å¯¹è±¡" #: sequencer.c:1262 sequencer.c:1317 #, c-format msgid "unable to read commit message from '%s'" msgstr "ä¸èƒ½ä»Ž '%s' 读å–æ交说明" #: sequencer.c:1284 builtin/am.c:1650 builtin/commit.c:1631 builtin/merge.c:825 #: builtin/merge.c:850 msgid "failed to write commit object" msgstr "æ— æ³•å†™æ交对象" #: sequencer.c:1344 #, c-format msgid "could not parse commit %s" msgstr "ä¸èƒ½è§£æžæ交 %s" #: sequencer.c:1349 #, c-format msgid "could not parse parent commit %s" msgstr "ä¸èƒ½è§£æžçˆ¶æ交 %s" #: sequencer.c:1500 sequencer.c:1525 #, c-format msgid "This is a combination of %d commits." msgstr "这是一个 %d 个æ交的组åˆã€‚" #: sequencer.c:1510 sequencer.c:4355 msgid "need a HEAD to fixup" msgstr "需è¦ä¸€ä¸ª HEAD æ¥ä¿®å¤" #: sequencer.c:1512 sequencer.c:2729 msgid "could not read HEAD" msgstr "ä¸èƒ½è¯»å– HEAD" #: sequencer.c:1514 msgid "could not read HEAD's commit message" msgstr "ä¸èƒ½è¯»å– HEAD çš„æ交说明" #: sequencer.c:1520 #, c-format msgid "cannot write '%s'" msgstr "ä¸èƒ½å†™ '%s'" #: sequencer.c:1527 git-rebase--interactive.sh:457 msgid "This is the 1st commit message:" msgstr "这是第一个æ交说明:" #: sequencer.c:1535 #, c-format msgid "could not read commit message of %s" msgstr "ä¸èƒ½è¯»å– %s çš„æ交说明" #: sequencer.c:1542 #, c-format msgid "This is the commit message #%d:" msgstr "这是æ交说明 #%d:" #: sequencer.c:1548 #, c-format msgid "The commit message #%d will be skipped:" msgstr "æ交说明 #%d 将被跳过:" #: sequencer.c:1553 #, c-format msgid "unknown command: %d" msgstr "未知命令:%d" #: sequencer.c:1631 msgid "your index file is unmerged." msgstr "您的索引文件未完æˆåˆå¹¶ã€‚" #: sequencer.c:1638 msgid "cannot fixup root commit" msgstr "ä¸èƒ½ä¿®å¤æ ¹æ交" #: sequencer.c:1657 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "æ交 %s 是一个åˆå¹¶æ交但未æä¾› -m 选项。" #: sequencer.c:1665 #, c-format msgid "commit %s does not have parent %d" msgstr "æ交 %s 没有第 %d 个父æ交" #: sequencer.c:1669 #, c-format msgid "mainline was specified but commit %s is not a merge." msgstr "指定了主线,但是æ交 %s ä¸æ˜¯ä¸€ä¸ªåˆå¹¶æ交。" #: sequencer.c:1675 #, c-format msgid "cannot get commit message for %s" msgstr "ä¸èƒ½å¾—到 %s çš„æ交说明" #. TRANSLATORS: The first %s will be a "todo" command like #. "revert" or "pick", the second %s a SHA1. #: sequencer.c:1694 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s:ä¸èƒ½è§£æžçˆ¶æ交 %s" #: sequencer.c:1759 #, c-format msgid "could not rename '%s' to '%s'" msgstr "ä¸èƒ½å°† '%s' é‡å‘½å为 '%s'" #: sequencer.c:1813 #, c-format msgid "could not revert %s... %s" msgstr "ä¸èƒ½è¿˜åŽŸ %s... %s" #: sequencer.c:1814 #, c-format msgid "could not apply %s... %s" msgstr "ä¸èƒ½åº”用 %s... %s" #: sequencer.c:1864 msgid "empty commit set passed" msgstr "æ供了空的æ交集" #: sequencer.c:1874 #, c-format msgid "git %s: failed to read the index" msgstr "git %sï¼šæ— æ³•è¯»å–索引" #: sequencer.c:1881 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %sï¼šæ— æ³•åˆ·æ–°ç´¢å¼•" #: sequencer.c:1961 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s ä¸æŽ¥å—å‚数:'%s'" #: sequencer.c:1970 #, c-format msgid "missing arguments for %s" msgstr "缺少 %s çš„å‚æ•°" #: sequencer.c:2029 #, c-format msgid "invalid line %d: %.*s" msgstr "æ— æ•ˆè¡Œ %d:%.*s" #: sequencer.c:2037 #, c-format msgid "cannot '%s' without a previous commit" msgstr "没有父æ交的情况下ä¸èƒ½ '%s'" #: sequencer.c:2085 sequencer.c:4138 sequencer.c:4173 #, c-format msgid "could not read '%s'." msgstr "ä¸èƒ½è¯»å– '%s'。" #: sequencer.c:2108 msgid "please fix this using 'git rebase --edit-todo'." msgstr "请用 'git rebase --edit-todo' æ¥ä¿®æ”¹ã€‚" #: sequencer.c:2110 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "ä¸å¯ç”¨çš„指令清å•ï¼š'%s'" #: sequencer.c:2115 msgid "no commits parsed." msgstr "没有解æžæ交。" #: sequencer.c:2126 msgid "cannot cherry-pick during a revert." msgstr "ä¸èƒ½åœ¨å›žé€€ä¸æ‰§è¡Œæ‹£é€‰ã€‚" #: sequencer.c:2128 msgid "cannot revert during a cherry-pick." msgstr "ä¸èƒ½åœ¨æ‹£é€‰ä¸æ‰§è¡Œå›žé€€ã€‚" #: sequencer.c:2195 #, c-format msgid "invalid key: %s" msgstr "æ— æ•ˆé”®å:%s" #: sequencer.c:2198 #, c-format msgid "invalid value for %s: %s" msgstr "%s çš„å€¼æ— æ•ˆï¼š%s" #: sequencer.c:2269 msgid "unusable squash-onto" msgstr "ä¸å¯ç”¨çš„ squash-onto" #: sequencer.c:2285 #, c-format msgid "malformed options sheet: '%s'" msgstr "æ ¼å¼é”™è¯¯çš„选项清å•ï¼š'%s'" #: sequencer.c:2323 msgid "a cherry-pick or revert is already in progress" msgstr "一个拣选或还原æ“作已在进行" #: sequencer.c:2324 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "å°è¯• \"git cherry-pick (--continue | --quit | --abort)\"" #: sequencer.c:2327 #, c-format msgid "could not create sequencer directory '%s'" msgstr "ä¸èƒ½åˆ›å»ºåºåˆ—目录 '%s'" #: sequencer.c:2341 msgid "could not lock HEAD" msgstr "ä¸èƒ½é”定 HEAD" #: sequencer.c:2396 sequencer.c:3403 msgid "no cherry-pick or revert in progress" msgstr "拣选或还原æ“作并未进行" #: sequencer.c:2398 msgid "cannot resolve HEAD" msgstr "ä¸èƒ½è§£æž HEAD" #: sequencer.c:2400 sequencer.c:2435 msgid "cannot abort from a branch yet to be born" msgstr "ä¸èƒ½ä»Žå°šæœªå»ºç«‹çš„分支终æ¢" #: sequencer.c:2421 builtin/grep.c:720 #, c-format msgid "cannot open '%s'" msgstr "ä¸èƒ½æ‰“å¼€ '%s'" #: sequencer.c:2423 #, c-format msgid "cannot read '%s': %s" msgstr "ä¸èƒ½è¯»å– '%s':%s" #: sequencer.c:2424 msgid "unexpected end of file" msgstr "æ„外的文件结æŸ" #: sequencer.c:2430 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "ä¿å˜æ‹£é€‰æ交å‰çš„ HEAD 文件 '%s' æŸå" #: sequencer.c:2441 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "您好åƒç§»åŠ¨äº† HEAD。未能回退,检查您的 HEADï¼" #: sequencer.c:2545 sequencer.c:3321 #, c-format msgid "could not update %s" msgstr "ä¸èƒ½æ›´æ–° %s" #: sequencer.c:2583 sequencer.c:3301 msgid "cannot read HEAD" msgstr "ä¸èƒ½è¯»å– HEAD" #: sequencer.c:2618 sequencer.c:2622 builtin/difftool.c:639 #, c-format msgid "could not copy '%s' to '%s'" msgstr "ä¸èƒ½æ‹·è´ '%s' 至 '%s'" #: sequencer.c:2641 msgid "could not read index" msgstr "ä¸èƒ½è¯»å–索引" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: sequencer.c:2646 #, c-format msgid "" "execution failed: %s\n" "%sYou can fix the problem, and then run\n" "\n" " git rebase --continue\n" "\n" msgstr "" "执行失败:%s\n" "%s您å¯ä»¥æ”¹æ£è¯¥é—®é¢˜ï¼Œç„¶åŽè¿è¡Œ\n" "\n" " git rebase --continue\n" "\n" #: sequencer.c:2652 msgid "and made changes to the index and/or the working tree\n" msgstr "并且修改索引和/或工作区\n" #: sequencer.c:2658 #, c-format msgid "" "execution succeeded: %s\n" "but left changes to the index and/or the working tree\n" "Commit or stash your changes, and then run\n" "\n" " git rebase --continue\n" "\n" msgstr "" "执行æˆåŠŸï¼š%s\n" "但是在索引和/或工作区ä¸å˜åœ¨å˜æ›´\n" "æ交或贮è—修改,然åŽè¿è¡Œ\n" "\n" " git rebase --continue\n" "\n" #: sequencer.c:2771 msgid "writing fake root commit" msgstr "å†™ä¼ªæ ¹æ交" #: sequencer.c:2776 msgid "writing squash-onto" msgstr "写入 squash-onto" #: sequencer.c:2811 #, c-format msgid "failed to find tree of %s" msgstr "æ— æ³•æ‰¾åˆ° %s 指å‘çš„æ ‘ã€‚" #: sequencer.c:2829 msgid "could not write index" msgstr "ä¸èƒ½å†™å…¥ç´¢å¼•" #: sequencer.c:2861 msgid "cannot merge without a current revision" msgstr "没有当å‰ç‰ˆæœ¬ä¸èƒ½åˆå¹¶" #: sequencer.c:2884 #, c-format msgid "could not resolve '%s'" msgstr "æ— æ³•è§£æž '%s'" #: sequencer.c:2906 #, c-format msgid "could not get commit message of '%s'" msgstr "ä¸èƒ½èŽ·å– '%s' çš„æ交说明" #: sequencer.c:2916 sequencer.c:2941 #, c-format msgid "could not write '%s'" msgstr "ä¸èƒ½å†™å…¥ '%s'" #: sequencer.c:3005 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "甚至ä¸èƒ½å°è¯•åˆå¹¶ '%.*s'" #: sequencer.c:3021 msgid "merge: Unable to write new index file" msgstr "åˆå¹¶ï¼šæ— 法写入新索引文件" #: sequencer.c:3088 #, c-format msgid "Applied autostash.\n" msgstr "已应用 autostash。\n" #: sequencer.c:3100 #, c-format msgid "cannot store %s" msgstr "ä¸èƒ½å˜å‚¨ %s" #: sequencer.c:3103 git-rebase.sh:188 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" "Your changes are safe in the stash.\n" "You can run \"git stash pop\" or \"git stash drop\" at any time.\n" msgstr "" "应用 autostash 导致冲çªã€‚\n" "您的修改安全地ä¿å˜åœ¨è´®è—区ä¸ã€‚\n" "您å¯ä»¥åœ¨ä»»ä½•æ—¶å€™è¿è¡Œ \"git stash pop\" 或 \"git stash drop\"。\n" #: sequencer.c:3134 #, c-format msgid "" "Could not execute the todo command\n" "\n" " %.*s\n" "It has been rescheduled; To edit the command before continuing, please\n" "edit the todo list first:\n" "\n" " git rebase --edit-todo\n" " git rebase --continue\n" msgstr "" "æ— æ³•æ‰§è¡Œå¾…åŠžå‘½ä»¤\n" "\n" " %.*s\n" "已被é‡æ–°å®‰æŽ’,在继ç»ä¹‹å‰ç¼–辑命令,请先编辑待办列表:\n" "\n" " git rebase --edit-todo\n" " git rebase --continue\n" #: sequencer.c:3202 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "åœæ¢åœ¨ %s... %.*s\n" #: sequencer.c:3264 #, c-format msgid "unknown command %d" msgstr "未知命令 %d" #: sequencer.c:3309 msgid "could not read orig-head" msgstr "ä¸èƒ½è¯»å– orig-head" #: sequencer.c:3314 sequencer.c:4352 msgid "could not read 'onto'" msgstr "ä¸èƒ½è¯»å– 'onto'" #: sequencer.c:3328 #, c-format msgid "could not update HEAD to %s" msgstr "ä¸èƒ½æ›´æ–° HEAD 为 %s" #: sequencer.c:3414 msgid "cannot rebase: You have unstaged changes." msgstr "ä¸èƒ½å˜åŸºï¼šæ‚¨æœ‰æœªæš‚å˜çš„å˜æ›´ã€‚" #: sequencer.c:3423 msgid "cannot amend non-existing commit" msgstr "ä¸èƒ½ä¿®è¡¥ä¸å˜åœ¨çš„æ交" #: sequencer.c:3425 #, c-format msgid "invalid file: '%s'" msgstr "æ— æ•ˆæ–‡ä»¶ï¼š'%s'" #: sequencer.c:3427 #, c-format msgid "invalid contents: '%s'" msgstr "æ— æ•ˆå†…å®¹ï¼š'%s'" #: sequencer.c:3430 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" "first and then run 'git rebase --continue' again." msgstr "" "\n" "您的工作区ä¸æœ‰æœªæ交的å˜æ›´ã€‚请先æ交然åŽå†æ¬¡è¿è¡Œ 'git rebase --continue'。" #: sequencer.c:3455 sequencer.c:3493 #, c-format msgid "could not write file: '%s'" msgstr "ä¸èƒ½å†™å…¥æ–‡ä»¶ï¼š'%s'" #: sequencer.c:3508 msgid "could not remove CHERRY_PICK_HEAD" msgstr "ä¸èƒ½åˆ 除 CHERRY_PICK_HEAD" #: sequencer.c:3515 msgid "could not commit staged changes." msgstr "ä¸èƒ½æ交暂å˜çš„修改。" #: sequencer.c:3612 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s:ä¸èƒ½æ‹£é€‰ä¸€ä¸ª%s" #: sequencer.c:3616 #, c-format msgid "%s: bad revision" msgstr "%s:错误的版本" #: sequencer.c:3649 msgid "can't revert as initial commit" msgstr "ä¸èƒ½ä½œä¸ºåˆå§‹æ交回退" #: sequencer.c:4098 msgid "make_script: unhandled options" msgstr "make_script:有未能处ç†çš„选项" #: sequencer.c:4101 msgid "make_script: error preparing revisions" msgstr "make_script:准备版本时错误" #: sequencer.c:4142 sequencer.c:4177 #, c-format msgid "unusable todo list: '%s'" msgstr "ä¸å¯ç”¨çš„待办列表:'%s'" #: sequencer.c:4236 #, c-format msgid "" "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." msgstr "选项 rebase.missingCommitsCheck 的值 %s æ— æ³•è¯†åˆ«ã€‚å·²å¿½ç•¥ã€‚" #: sequencer.c:4302 #, c-format msgid "" "Warning: some commits may have been dropped accidentally.\n" "Dropped commits (newer to older):\n" msgstr "" "è¦å‘Šï¼šä¸€äº›æ交å¯èƒ½è¢«æ„外丢弃。\n" "丢弃的æ交(从新到旧):\n" #: sequencer.c:4309 #, c-format msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" "\n" "Use 'git config rebase.missingCommitsCheck' to change the level of " "warnings.\n" "The possible behaviours are: ignore, warn, error.\n" "\n" msgstr "" "为é¿å…è¿™æ¡ä¿¡æ¯ï¼Œä½¿ç”¨ \"drop\" 指令显å¼åœ°åˆ 除一个æ交。\n" "\n" "使用 'git config rebase.missingCommitsCheck' æ¥ä¿®æ”¹è¦å‘Šçº§åˆ«ã€‚\n" "å¯é€‰å€¼æœ‰ï¼šignoreã€warnã€error。\n" "\n" #: sequencer.c:4321 #, c-format msgid "" "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" "continue'.\n" "Or you can abort the rebase with 'git rebase --abort'.\n" msgstr "" "您å¯ä»¥ç”¨ 'git rebase --edit-todo' ä¿®æ£ï¼Œç„¶åŽæ‰§è¡Œ 'git rebase --continue'。\n" "或者您å¯ä»¥ç”¨ 'git rebase --abort' 终æ¢å˜åŸºã€‚\n" #: sequencer.c:4375 #, c-format msgid "could not parse commit '%s'" msgstr "ä¸èƒ½è§£æžæ交 '%s'" #: sequencer.c:4490 msgid "the script was already rearranged." msgstr "脚本已ç»é‡æ–°ç¼–排。" #: setup.c:123 #, c-format msgid "'%s' is outside repository" msgstr "'%s' 在仓库之外" #: setup.c:172 #, c-format msgid "" "%s: no such path in the working tree.\n" "Use 'git <command> -- <path>...' to specify paths that do not exist locally." msgstr "" "%s:工作区ä¸æ— æ¤è·¯å¾„。\n" "使用命令 'git <命令> -- <路径>...' æ¥æŒ‡å®šæœ¬åœ°ä¸å˜åœ¨çš„路径。" #: setup.c:185 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" "Use '--' to separate paths from revisions, like this:\n" "'git <command> [<revision>...] -- [<file>...]'" msgstr "" "有æ§ä¹‰çš„å‚æ•° '%s':未知的版本或路径ä¸å˜åœ¨äºŽå·¥ä½œåŒºä¸ã€‚\n" "使用 '--' æ¥åˆ†éš”版本和路径,例如:\n" "'git <命令> [<版本>...] -- [<文件>...]'" #: setup.c:234 #, c-format msgid "option '%s' must come before non-option arguments" msgstr "选项 '%s' 必须在其他éžé€‰é¡¹å‚数之å‰" #: setup.c:253 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" "Use '--' to separate paths from revisions, like this:\n" "'git <command> [<revision>...] -- [<file>...]'" msgstr "" "有æ§ä¹‰çš„å‚æ•° '%s':å¯åŒæ—¶æ˜¯ç‰ˆæœ¬å’Œæ–‡ä»¶\n" "使用 '--' æ¥åˆ†éš”版本和路径,例如:\n" "'git <命令> [<版本>...] -- [<文件>...]'" #: setup.c:389 msgid "unable to set up work tree using invalid config" msgstr "æ— æ³•ä½¿ç”¨æ— æ•ˆé…ç½®æ¥åˆ›å»ºå·¥ä½œåŒº" #: setup.c:393 msgid "this operation must be run in a work tree" msgstr "该æ“作必须在一个工作区ä¸è¿è¡Œ" #: setup.c:503 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "期望 git 仓库版本 <= %d,å´å¾—到 %d" #: setup.c:511 msgid "unknown repository extensions found:" msgstr "å‘现未知的仓库扩展:" #: setup.c:530 #, c-format msgid "error opening '%s'" msgstr "æ— æ³•æ‰“å¼€ '%s'" #: setup.c:532 #, c-format msgid "too large to be a .git file: '%s'" msgstr "æ–‡ä»¶å¤ªå¤§ï¼Œæ— æ³•ä½œä¸º .git 文件:'%s'" #: setup.c:534 #, c-format msgid "error reading %s" msgstr "æ— æ³•è¯»å– %s" #: setup.c:536 #, c-format msgid "invalid gitfile format: %s" msgstr "æ— æ•ˆçš„ gitfile æ ¼å¼ï¼š%s" #: setup.c:538 #, c-format msgid "no path in gitfile: %s" msgstr "在 gitfile ä¸æ²¡æœ‰è·¯å¾„:%s" #: setup.c:540 #, c-format msgid "not a git repository: %s" msgstr "ä¸æ˜¯ä¸€ä¸ª git 仓库:%s" #: setup.c:639 #, c-format msgid "'$%s' too big" msgstr "'$%s' 太大" #: setup.c:653 #, c-format msgid "not a git repository: '%s'" msgstr "ä¸æ˜¯ä¸€ä¸ª git 仓库:'%s'" #: setup.c:682 setup.c:684 setup.c:715 #, c-format msgid "cannot chdir to '%s'" msgstr "ä¸èƒ½åˆ‡æ¢ç›®å½•åˆ° '%s'" #: setup.c:687 setup.c:743 setup.c:753 setup.c:792 setup.c:800 setup.c:815 msgid "cannot come back to cwd" msgstr "æ— æ³•è¿”å›žå½“å‰å·¥ä½œç›®å½•" #: setup.c:813 #, c-format msgid "not a git repository (or any of the parent directories): %s" msgstr "ä¸æ˜¯ä¸€ä¸ª git 仓库(或者任何父目录):%s" #: setup.c:824 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "æ— æ³•èŽ·å– '%*s%s%s' 状æ€ï¼ˆstat)" #: setup.c:1054 msgid "Unable to read current working directory" msgstr "ä¸èƒ½è¯»å–当å‰å·¥ä½œç›®å½•" #: setup.c:1066 setup.c:1072 #, c-format msgid "cannot change to '%s'" msgstr "ä¸èƒ½åˆ‡æ¢åˆ° '%s'" #: setup.c:1085 #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)." msgstr "" "ä¸æ˜¯ä¸€ä¸ª git 仓库(或者直至挂载点 %s 的任何父目录)\n" "åœæ¢åœ¨æ–‡ä»¶ç³»ç»Ÿè¾¹ç•Œï¼ˆæœªè®¾ç½® GIT_DISCOVERY_ACROSS_FILESYSTEM)。" #: setup.c:1168 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" "The owner of files must always have read and write permissions." msgstr "" "å‚æ•° core.sharedRepository 的文件属性值有问题(0%.3o)。\n" "文件属主必须始终拥有读写æƒé™ã€‚" #: setup.c:1211 msgid "open /dev/null or dup failed" msgstr "ä¸èƒ½æ‰“开或者å¤åˆ¶ /dev/null" #: setup.c:1226 msgid "fork failed" msgstr "fork 失败" #: setup.c:1231 msgid "setsid failed" msgstr "setsid 失败" #: sha1-file.c:625 #, c-format msgid "path '%s' does not exist" msgstr "路径 '%s' ä¸å˜åœ¨" #: sha1-file.c:651 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "å°šä¸æ”¯æŒå°†å‚考仓库 '%s' 作为一个链接检出。" #: sha1-file.c:657 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "å‚考仓库 '%s' ä¸æ˜¯ä¸€ä¸ªæœ¬åœ°ä»“库。" #: sha1-file.c:663 #, c-format msgid "reference repository '%s' is shallow" msgstr "å‚考仓库 '%s' 是一个浅克隆" #: sha1-file.c:671 #, c-format msgid "reference repository '%s' is grafted" msgstr "å‚考仓库 '%s' 已被移æ¤" #: sha1-name.c:442 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "çŸ SHA1 %s å˜åœ¨æ§ä¹‰" #: sha1-name.c:453 msgid "The candidates are:" msgstr "候选者有:" #: sha1-name.c:695 msgid "" "Git normally never creates a ref that ends with 40 hex characters\n" "because it will be ignored when you just specify 40-hex. These refs\n" "may be created by mistake. For example,\n" "\n" " git checkout -b $br $(git rev-parse ...)\n" "\n" "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n" "examine these refs and maybe delete them. Turn this message off by\n" "running \"git config advice.objectNameWarning false\"" msgstr "" "Git 通常ä¸ä¼šåˆ›å»ºä¸€ä¸ªä»¥40ä½åå…进制å—符命åçš„å¼•ç”¨ï¼Œå› ä¸ºå½“ä½ æä¾›40ä½\n" "åå…进制å—符时将被忽略。ä¸è¿‡è¿™äº›å¼•ç”¨ä¹Ÿå¯èƒ½è¢«é”™è¯¯åœ°åˆ›å»ºã€‚例如:\n" "\n" " git checkout -b $br $(git rev-parse ...)\n" "\n" "当 \"$br\" 空白时一个40ä½åå…进制的引用将被创建。请检查这些引用,\n" "å¯èƒ½éœ€è¦åˆ 除它们。用 \"git config advice.objectNameWarning false\"\n" "命令关é—本消æ¯é€šçŸ¥ã€‚" #: submodule.c:97 submodule.c:131 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "æ— æ³•ä¿®æ”¹æœªåˆå¹¶çš„ .gitmodules,先解决åˆå¹¶å†²çª" #: submodule.c:101 submodule.c:135 #, c-format msgid "Could not find section in .gitmodules where path=%s" msgstr "æ— æ³•åœ¨ .gitmodules ä¸æ‰¾åˆ° path=%s çš„å°èŠ‚" #: submodule.c:109 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "ä¸èƒ½æ›´æ–° .gitmodules æ¡ç›® %s" #: submodule.c:142 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "æ— æ³•ç§»é™¤ %s çš„ .gitmodules æ¡ç›®" #: submodule.c:153 msgid "staging updated .gitmodules failed" msgstr "å°†æ›´æ–°åŽ .gitmodules æ·»åŠ æš‚å˜åŒºå¤±è´¥" #: submodule.c:315 #, c-format msgid "in unpopulated submodule '%s'" msgstr "ä½äºŽæœªæ£€å‡ºçš„å模组 '%s'" #: submodule.c:346 #, c-format msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "è·¯å¾„è§„æ ¼ '%s' 在å模组 '%.*s' ä¸" #: submodule.c:837 #, c-format msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "å模组æ¡ç›® '%s'(%s)是一个 %s,ä¸æ˜¯ä¸€ä¸ªæ交" #: submodule.c:1069 builtin/branch.c:651 builtin/submodule--helper.c:1743 msgid "Failed to resolve HEAD as a valid ref." msgstr "æ— æ³•å°† HEAD 解æžä¸ºæœ‰æ•ˆå¼•ç”¨ã€‚" #: submodule.c:1375 #, c-format msgid "'%s' not recognized as a git repository" msgstr "æ— æ³•å°† '%s' 识别为一个 git 仓库" #: submodule.c:1513 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "æ— æ³•åœ¨å模组 '%s' ä¸å¯åŠ¨ 'git status'" #: submodule.c:1526 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "æ— æ³•åœ¨å模组 '%s' ä¸æ‰§è¡Œ 'git status'" #: submodule.c:1619 #, c-format msgid "submodule '%s' has dirty index" msgstr "å模组 '%s' ä¸æœ‰è„索引" #: submodule.c:1718 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" msgstr "ä¸æ”¯æŒå¯¹æœ‰å¤šä¸ªå·¥ä½œåŒºçš„å模组 '%s' 执行 relocate_gitdir" #: submodule.c:1730 submodule.c:1786 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "ä¸èƒ½æŸ¥è¯¢å模组 '%s' çš„å称" #: submodule.c:1734 builtin/submodule--helper.c:1261 #: builtin/submodule--helper.c:1271 #, c-format msgid "could not create directory '%s'" msgstr "ä¸èƒ½åˆ›å»ºç›®å½• '%s'" #: submodule.c:1737 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" "'%s' to\n" "'%s'\n" msgstr "" "å°† '%s%s' çš„ git 目录从\n" "'%s' è¿ç§»è‡³\n" "'%s'\n" #: submodule.c:1821 #, c-format msgid "could not recurse into submodule '%s'" msgstr "æ— æ³•é€’å½’è¿›å模组路径 '%s'" #: submodule.c:1865 msgid "could not start ls-files in .." msgstr "æ— æ³•åœ¨ .. ä¸å¯åŠ¨ ls-files" #: submodule.c:1904 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree 返回未知返回值 %d" #: submodule-config.c:230 #, c-format msgid "ignoring suspicious submodule name: %s" msgstr "忽略å¯ç–‘çš„å模组å称:%s" #: submodule-config.c:294 msgid "negative values not allowed for submodule.fetchjobs" msgstr "submodule.fetchjobs ä¸å…许为负值" #: submodule-config.c:467 #, c-format msgid "invalid value for %s" msgstr "%s çš„å€¼æ— æ•ˆ" #: trailer.c:238 #, c-format msgid "running trailer command '%s' failed" msgstr "执行 trailer 命令 '%s' 失败" #: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553 #: trailer.c:557 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "é”® '%2$s' 的未知å–值 '%1$s'" #: trailer.c:539 trailer.c:544 builtin/remote.c:293 #, c-format msgid "more than one %s" msgstr "多于一个 %s" #: trailer.c:730 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "ç¾å '%.*s' 的键为空" #: trailer.c:750 #, c-format msgid "could not read input file '%s'" msgstr "ä¸èƒ½è¯»å–输入文件 '%s'" #: trailer.c:753 msgid "could not read from stdin" msgstr "ä¸èƒ½è‡ªæ ‡å‡†è¾“入读å–" #: trailer.c:1008 builtin/am.c:46 #, c-format msgid "could not stat %s" msgstr "ä¸èƒ½å¯¹ %s 调用 stat" #: trailer.c:1010 #, c-format msgid "file %s is not a regular file" msgstr "文件 %s ä¸æ˜¯ä¸€ä¸ªæ£è§„文件" #: trailer.c:1012 #, c-format msgid "file %s is not writable by user" msgstr "文件 %s 用户ä¸å¯å†™" #: trailer.c:1024 msgid "could not open temporary file" msgstr "ä¸èƒ½æ‰“开临时文件" #: trailer.c:1064 #, c-format msgid "could not rename temporary file to %s" msgstr "ä¸èƒ½é‡å‘½å临时文件为 %s" #: transport.c:116 #, c-format msgid "Would set upstream of '%s' to '%s' of '%s'\n" msgstr "å°†è¦è®¾ç½® '%1$s' 的上游为 '%3$s' çš„ '%2$s'\n" #: transport.c:208 #, c-format msgid "transport: invalid depth option '%s'" msgstr "ä¼ è¾“ï¼šæ— æ•ˆçš„æ·±åº¦é€‰é¡¹ '%s'" #: transport.c:584 msgid "could not parse transport.color.* config" msgstr "ä¸èƒ½è§£æž transport.color.* é…ç½®" #: transport.c:996 #, c-format msgid "" "The following submodule paths contain changes that can\n" "not be found on any remote:\n" msgstr "下列å模组路径所包å«çš„修改在任何远程æºä¸éƒ½æ‰¾ä¸åˆ°ï¼š\n" #: transport.c:1000 #, c-format msgid "" "\n" "Please try\n" "\n" "\tgit push --recurse-submodules=on-demand\n" "\n" "or cd to the path and use\n" "\n" "\tgit push\n" "\n" "to push them to a remote.\n" "\n" msgstr "" "\n" "请å°è¯•\n" "\n" "\tgit push --recurse-submodules=on-demand\n" "\n" "或者进入到å目录执行\n" "\n" "\tgit push\n" "\n" "以推é€è‡³è¿œç¨‹ã€‚\n" "\n" #: transport.c:1008 msgid "Aborting." msgstr "æ£åœ¨ç»ˆæ¢ã€‚" #: transport-helper.c:1087 #, c-format msgid "Could not read ref %s" msgstr "ä¸èƒ½è¯»å–引用 %s" #: tree-walk.c:31 msgid "too-short tree object" msgstr "太çŸçš„æ ‘å¯¹è±¡" #: tree-walk.c:37 msgid "malformed mode in tree entry" msgstr "æ ‘å¯¹è±¡ä¸çš„æ¡ç›®æ¨¡å¼é”™è¯¯" #: tree-walk.c:41 msgid "empty filename in tree entry" msgstr "æ ‘å¯¹è±¡æ¡ç›®ä¸ç©ºçš„文件å" #: tree-walk.c:113 msgid "too-short tree file" msgstr "太çŸçš„æ ‘æ–‡ä»¶" #: unpack-trees.c:111 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" "%%sPlease commit your changes or stash them before you switch branches." msgstr "" "您对下列文件的本地修改将被检出æ“作覆盖:\n" "%%s请在切æ¢åˆ†æ”¯å‰æ交或贮è—您的修改。" #: unpack-trees.c:113 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" "%%s" msgstr "" "您对下列文件的本地修改将被检出æ“作覆盖:\n" "%%s" #: unpack-trees.c:116 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" "%%sPlease commit your changes or stash them before you merge." msgstr "" "您对下列文件的本地修改将被åˆå¹¶æ“作覆盖:\n" "%%s请在åˆå¹¶å‰æ交或贮è—您的修改。" #: unpack-trees.c:118 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" "%%s" msgstr "" "您对下列文件的本地修改将被åˆå¹¶æ“作覆盖:\n" "%%s" #: unpack-trees.c:121 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" "%%sPlease commit your changes or stash them before you %s." msgstr "" "您对下列文件的本地修改将被 %s 覆盖:\n" "%%s请在 %s 之å‰æ交或贮è—您的修改。" #: unpack-trees.c:123 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" "%%s" msgstr "" "您对下列文件的本地修改将被 %s 覆盖:\n" "%%s" #: unpack-trees.c:128 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" "%s" msgstr "" "更新如下目录将会丢失其ä¸æœªè·Ÿè¸ªçš„文件:\n" "%s" #: unpack-trees.c:132 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" "%%sPlease move or remove them before you switch branches." msgstr "" "工作区ä¸ä¸‹åˆ—æœªè·Ÿè¸ªçš„æ–‡ä»¶å°†ä¼šå› ä¸ºæ£€å‡ºæ“ä½œè€Œè¢«åˆ é™¤ï¼š\n" "%%s请在切æ¢åˆ†æ”¯ä¹‹å‰ç§»åŠ¨æˆ–åˆ é™¤ã€‚" #: unpack-trees.c:134 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" "%%s" msgstr "" "工作区ä¸ä¸‹åˆ—æœªè·Ÿè¸ªçš„æ–‡ä»¶å°†ä¼šå› ä¸ºæ£€å‡ºæ“ä½œè€Œè¢«åˆ é™¤ï¼š\n" "%%s" #: unpack-trees.c:137 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" "%%sPlease move or remove them before you merge." msgstr "" "工作区ä¸ä¸‹åˆ—æœªè·Ÿè¸ªçš„æ–‡ä»¶å°†ä¼šå› ä¸ºåˆå¹¶æ“ä½œè€Œè¢«åˆ é™¤ï¼š\n" "%%s请在åˆå¹¶å‰ç§»åŠ¨æˆ–åˆ é™¤ã€‚" #: unpack-trees.c:139 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" "%%s" msgstr "" "工作区ä¸ä¸‹åˆ—æœªè·Ÿè¸ªçš„æ–‡ä»¶å°†ä¼šå› ä¸ºåˆå¹¶æ“ä½œè€Œè¢«åˆ é™¤ï¼š\n" "%%s" #: unpack-trees.c:142 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" "%%sPlease move or remove them before you %s." msgstr "" "工作区ä¸ä¸‹åˆ—æœªè·Ÿè¸ªçš„æ–‡ä»¶å°†ä¼šå› ä¸º %s æ“ä½œè€Œè¢«åˆ é™¤ï¼š\n" "%%s请在 %s å‰ç§»åŠ¨æˆ–åˆ é™¤ã€‚" #: unpack-trees.c:144 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" "%%s" msgstr "" "工作区ä¸ä¸‹åˆ—æœªè·Ÿè¸ªçš„æ–‡ä»¶å°†ä¼šå› ä¸º %s æ“ä½œè€Œè¢«åˆ é™¤ï¼š\n" "%%s" #: unpack-trees.c:150 #, c-format msgid "" "The following untracked working tree files would be overwritten by " "checkout:\n" "%%sPlease move or remove them before you switch branches." msgstr "" "工作区ä¸ä¸‹åˆ—æœªè·Ÿè¸ªçš„æ–‡ä»¶å°†ä¼šå› ä¸ºæ£€å‡ºæ“作而被覆盖:\n" "%%s请在切æ¢åˆ†æ”¯å‰ç§»åŠ¨æˆ–åˆ é™¤ã€‚" #: unpack-trees.c:152 #, c-format msgid "" "The following untracked working tree files would be overwritten by " "checkout:\n" "%%s" msgstr "" "工作区ä¸ä¸‹åˆ—æœªè·Ÿè¸ªçš„æ–‡ä»¶å°†ä¼šå› ä¸ºæ£€å‡ºæ“作而被覆盖:\n" "%%s" #: unpack-trees.c:155 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" "%%sPlease move or remove them before you merge." msgstr "" "工作区ä¸ä¸‹åˆ—æœªè·Ÿè¸ªçš„æ–‡ä»¶å°†ä¼šå› ä¸ºåˆå¹¶æ“作而被覆盖:\n" "%%s请在åˆå¹¶å‰ç§»åŠ¨æˆ–åˆ é™¤ã€‚" #: unpack-trees.c:157 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" "%%s" msgstr "" "工作区ä¸ä¸‹åˆ—æœªè·Ÿè¸ªçš„æ–‡ä»¶å°†ä¼šå› ä¸ºåˆå¹¶æ“作而被覆盖:\n" "%%s" #: unpack-trees.c:160 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" "%%sPlease move or remove them before you %s." msgstr "" "工作区ä¸ä¸‹åˆ—æœªè·Ÿè¸ªçš„æ–‡ä»¶å°†ä¼šå› ä¸º %s æ“作而被覆盖:\n" "%%s请在 %s å‰ç§»åŠ¨æˆ–åˆ é™¤ã€‚" #: unpack-trees.c:162 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" "%%s" msgstr "" "工作区ä¸ä¸‹åˆ—æœªè·Ÿè¸ªçš„æ–‡ä»¶å°†ä¼šå› ä¸º %s æ“作而被覆盖:\n" "%%s" #: unpack-trees.c:170 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "æ¡ç›® '%s' å’Œ '%s' é‡å ã€‚æ— æ³•åˆå¹¶ã€‚" #: unpack-trees.c:173 #, c-format msgid "" "Cannot update sparse checkout: the following entries are not up to date:\n" "%s" msgstr "" "æ— æ³•æ›´æ–°ç¨€ç–检出:如下æ¡ç›®ä¸æ˜¯æœ€æ–°ï¼š\n" "%s" #: unpack-trees.c:175 #, c-format msgid "" "The following working tree files would be overwritten by sparse checkout " "update:\n" "%s" msgstr "" "工作区ä¸ä¸‹åˆ—文件将被稀ç–检出更新所覆盖:\n" "%s" #: unpack-trees.c:177 #, c-format msgid "" "The following working tree files would be removed by sparse checkout " "update:\n" "%s" msgstr "" "工作区ä¸ä¸‹åˆ—文件将被稀ç–æ£€å‡ºæ›´æ–°æ‰€åˆ é™¤ï¼š\n" "%s" #: unpack-trees.c:179 #, c-format msgid "" "Cannot update submodule:\n" "%s" msgstr "" "æ— æ³•æ›´æ–°å模组:\n" "%s" #: unpack-trees.c:262 #, c-format msgid "Aborting\n" msgstr "终æ¢ä¸\n" #: unpack-trees.c:344 msgid "Checking out files" msgstr "æ£åœ¨æ£€å‡ºæ–‡ä»¶" #: urlmatch.c:163 msgid "invalid URL scheme name or missing '://' suffix" msgstr "æ— æ•ˆçš„ URL 方案å称或丢失 '://' åŽç¼€" #: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405 #, c-format msgid "invalid %XX escape sequence" msgstr "æ— æ•ˆçš„ %XX 转义åºåˆ—" #: urlmatch.c:215 msgid "missing host and scheme is not 'file:'" msgstr "缺失主机å且 URL 方案ä¸æ˜¯ 'file:'" #: urlmatch.c:232 msgid "a 'file:' URL may not have a port number" msgstr "一个 'file:' URL ä¸åº”该包å«ç«¯å£å·" #: urlmatch.c:247 msgid "invalid characters in host name" msgstr "主机åä¸åŒ…å«æ— 效的å—符" #: urlmatch.c:292 urlmatch.c:303 msgid "invalid port number" msgstr "æ— æ•ˆçš„ç«¯å£å·" #: urlmatch.c:371 msgid "invalid '..' path segment" msgstr "æ— æ•ˆçš„ '..' 路径片段" #: worktree.c:245 builtin/am.c:2147 #, c-format msgid "failed to read '%s'" msgstr "æ— æ³•è¯»å– '%s'" #: worktree.c:291 #, c-format msgid "'%s' at main working tree is not the repository directory" msgstr "在主工作区的 '%s' ä¸æ˜¯ä»“库目录" #: worktree.c:302 #, c-format msgid "'%s' file does not contain absolute path to the working tree location" msgstr "文件 '%s' ä¸åŒ…å«å·¥ä½œåŒºçš„ç»å¯¹è·¯å¾„" #: worktree.c:314 #, c-format msgid "'%s' does not exist" msgstr "'%s' ä¸å˜åœ¨" #: worktree.c:320 #, c-format msgid "'%s' is not a .git file, error code %d" msgstr "'%s' ä¸æ˜¯ä¸€ä¸ª .git 文件,错误ç %d" #: worktree.c:328 #, c-format msgid "'%s' does not point back to '%s'" msgstr "'%s' 没有指回到 '%s'" #: wrapper.c:223 wrapper.c:393 #, c-format msgid "could not open '%s' for reading and writing" msgstr "æ— æ³•æ‰“å¼€ '%s' 进行读写" #: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770 #: builtin/am.c:862 builtin/merge.c:1043 #, c-format msgid "could not open '%s' for reading" msgstr "æ— æ³•æ‰“å¼€ '%s' 进行读å–" #: wrapper.c:424 wrapper.c:624 #, c-format msgid "unable to access '%s'" msgstr "ä¸èƒ½è®¿é—® '%s'" #: wrapper.c:632 msgid "unable to get current working directory" msgstr "ä¸èƒ½èŽ·å–当å‰å·¥ä½œç›®å½•" #: wt-status.c:154 msgid "Unmerged paths:" msgstr "未åˆå¹¶çš„路径:" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:181 wt-status.c:208 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" msgstr " (使用 \"git reset %s <文件>...\" 以å–消暂å˜ï¼‰" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:183 wt-status.c:210 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr " (使用 \"git rm --cached <文件>...\" 以å–消暂å˜ï¼‰" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:187 msgid " (use \"git add <file>...\" to mark resolution)" msgstr " (使用 \"git add <文件>...\" æ ‡è®°è§£å†³æ–¹æ¡ˆï¼‰" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:189 wt-status.c:193 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr " (酌情使用 \"git add/rm <文件>...\" æ ‡è®°è§£å†³æ–¹æ¡ˆï¼‰" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:191 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (使用 \"git rm <文件>...\" æ ‡è®°è§£å†³æ–¹æ¡ˆï¼‰" #: wt-status.c:202 wt-status.c:1015 msgid "Changes to be committed:" msgstr "è¦æ交的å˜æ›´ï¼š" #: wt-status.c:220 wt-status.c:1024 msgid "Changes not staged for commit:" msgstr "尚未暂å˜ä»¥å¤‡æ交的å˜æ›´ï¼š" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:224 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr " (使用 \"git add <文件>...\" æ›´æ–°è¦æ交的内容)" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:226 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr " (使用 \"git add/rm <文件>...\" æ›´æ–°è¦æ交的内容)" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:227 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr " (使用 \"git checkout -- <文件>...\" 丢弃工作区的改动)" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:229 msgid " (commit or discard the untracked or modified content in submodules)" msgstr " (æ交或丢弃å模组ä¸æœªè·Ÿè¸ªæˆ–修改的内容)" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:241 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr " (使用 \"git %s <文件>...\" 以包å«è¦æ交的内容)" #: wt-status.c:256 msgid "both deleted:" msgstr "åŒæ–¹åˆ 除:" #: wt-status.c:258 msgid "added by us:" msgstr "ç”±æˆ‘ä»¬æ·»åŠ ï¼š" #: wt-status.c:260 msgid "deleted by them:" msgstr "ç”±ä»–ä»¬åˆ é™¤ï¼š" #: wt-status.c:262 msgid "added by them:" msgstr "ç”±ä»–ä»¬æ·»åŠ ï¼š" #: wt-status.c:264 msgid "deleted by us:" msgstr "ç”±æˆ‘ä»¬åˆ é™¤ï¼š" #: wt-status.c:266 msgid "both added:" msgstr "åŒæ–¹æ·»åŠ :" #: wt-status.c:268 msgid "both modified:" msgstr "åŒæ–¹ä¿®æ”¹ï¼š" #: wt-status.c:278 msgid "new file:" msgstr "新文件:" #: wt-status.c:280 msgid "copied:" msgstr "æ‹·è´ï¼š" #: wt-status.c:282 msgid "deleted:" msgstr "åˆ é™¤ï¼š" #: wt-status.c:284 msgid "modified:" msgstr "修改:" #: wt-status.c:286 msgid "renamed:" msgstr "é‡å‘½å:" #: wt-status.c:288 msgid "typechange:" msgstr "类型å˜æ›´ï¼š" #: wt-status.c:290 msgid "unknown:" msgstr "未知:" #: wt-status.c:292 msgid "unmerged:" msgstr "未åˆå¹¶ï¼š" # 译者:末尾两个å—节å¯èƒ½è¢«åˆ å‡ï¼Œå¦‚果翻译为ä¸æ–‡æ ‡ç‚¹ä¼šå‡ºçŽ°åŠä¸ªæ±‰å— #: wt-status.c:372 msgid "new commits, " msgstr "æ–°æ交, " # 译者:末尾两个å—节å¯èƒ½è¢«åˆ å‡ï¼Œå¦‚果翻译为ä¸æ–‡æ ‡ç‚¹ä¼šå‡ºçŽ°åŠä¸ªæ±‰å— #: wt-status.c:374 msgid "modified content, " msgstr "修改的内容, " # 译者:末尾两个å—节å¯èƒ½è¢«åˆ å‡ï¼Œå¦‚果翻译为ä¸æ–‡æ ‡ç‚¹ä¼šå‡ºçŽ°åŠä¸ªæ±‰å— #: wt-status.c:376 msgid "untracked content, " msgstr "未跟踪的内容, " #: wt-status.c:853 #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" msgstr[0] "您的贮è—区当å‰æœ‰ %d æ¡è®°å½•" msgstr[1] "您的贮è—区当å‰æœ‰ %d æ¡è®°å½•" #: wt-status.c:885 msgid "Submodules changed but not updated:" msgstr "å模组已修改但尚未更新:" #: wt-status.c:887 msgid "Submodule changes to be committed:" msgstr "è¦æ交的å模组å˜æ›´ï¼š" #: wt-status.c:969 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." msgstr "" "ä¸è¦æ”¹åŠ¨æˆ–åˆ é™¤ä¸Šé¢çš„一行。\n" "其下所有内容都将被忽略。" #: wt-status.c:1084 msgid "You have unmerged paths." msgstr "您有尚未åˆå¹¶çš„路径。" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:1087 msgid " (fix conflicts and run \"git commit\")" msgstr " (解决冲çªå¹¶è¿è¡Œ \"git commit\")" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:1089 msgid " (use \"git merge --abort\" to abort the merge)" msgstr " (使用 \"git merge --abort\" 终æ¢åˆå¹¶ï¼‰" #: wt-status.c:1094 msgid "All conflicts fixed but you are still merging." msgstr "所有冲çªå·²è§£å†³ä½†æ‚¨ä»å¤„于åˆå¹¶ä¸ã€‚" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:1097 msgid " (use \"git commit\" to conclude merge)" msgstr " (使用 \"git commit\" 结æŸåˆå¹¶ï¼‰" #: wt-status.c:1107 msgid "You are in the middle of an am session." msgstr "您æ£å¤„于 am æ“作过程ä¸ã€‚" #: wt-status.c:1110 msgid "The current patch is empty." msgstr "当å‰çš„è¡¥ä¸ä¸ºç©ºã€‚" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:1114 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (解决冲çªï¼Œç„¶åŽè¿è¡Œ \"git am --continue\")" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:1116 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (使用 \"git am --skip\" 跳过æ¤è¡¥ä¸ï¼‰" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:1118 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (使用 \"git am --abort\" æ¢å¤åŽŸæœ‰åˆ†æ”¯ï¼‰" #: wt-status.c:1250 msgid "git-rebase-todo is missing." msgstr "git-rebase-todo 丢失。" #: wt-status.c:1252 msgid "No commands done." msgstr "没有命令被执行。" #: wt-status.c:1255 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" msgstr[0] "最åŽä¸€æ¡å‘½ä»¤å·²å®Œæˆï¼ˆ%d æ¡å‘½ä»¤è¢«æ‰§è¡Œï¼‰ï¼š" msgstr[1] "最åŽçš„命令已完æˆï¼ˆ%d æ¡å‘½ä»¤è¢«æ‰§è¡Œï¼‰ï¼š" #: wt-status.c:1266 #, c-format msgid " (see more in file %s)" msgstr " (更多å‚è§æ–‡ä»¶ %s)" #: wt-status.c:1271 msgid "No commands remaining." msgstr "未剩下任何命令。" #: wt-status.c:1274 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" msgstr[0] "接下æ¥è¦æ‰§è¡Œçš„命令(剩余 %d æ¡å‘½ä»¤ï¼‰ï¼š" msgstr[1] "接下æ¥è¦æ‰§è¡Œçš„命令(剩余 %d æ¡å‘½ä»¤ï¼‰ï¼š" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:1282 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " (使用 \"git rebase --edit-todo\" æ¥æŸ¥çœ‹å’Œç¼–辑)" #: wt-status.c:1295 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "您在执行将分支 '%s' å˜åŸºåˆ° '%s' çš„æ“作。" #: wt-status.c:1300 msgid "You are currently rebasing." msgstr "您在执行å˜åŸºæ“作。" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:1314 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (解决冲çªï¼Œç„¶åŽè¿è¡Œ \"git rebase --continue\")" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:1316 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (使用 \"git rebase --skip\" 跳过æ¤è¡¥ä¸ï¼‰" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:1318 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " (使用 \"git rebase --abort\" 以检出原有分支)" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:1324 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (所有冲çªå·²è§£å†³ï¼šè¿è¡Œ \"git rebase --continue\")" #: wt-status.c:1328 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "您在执行将分支 '%s' å˜åŸºåˆ° '%s' çš„æ“作时拆分æ交。" #: wt-status.c:1333 msgid "You are currently splitting a commit during a rebase." msgstr "您在执行å˜åŸºæ“作时拆分æ交。" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:1336 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr " (一旦您工作目录æ交干净åŽï¼Œè¿è¡Œ \"git rebase --continue\")" #: wt-status.c:1340 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "您在执行将分支 '%s' å˜åŸºåˆ° '%s' çš„æ“作时编辑æ交。" #: wt-status.c:1345 msgid "You are currently editing a commit during a rebase." msgstr "您在执行å˜åŸºæ“作时编辑æ交。" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:1348 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " (使用 \"git commit --amend\" 修补当å‰æ交)" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:1350 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr " (当您对您的修改满æ„åŽæ‰§è¡Œ \"git rebase --continue\")" #: wt-status.c:1360 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "您在执行拣选æ交 %s çš„æ“作。" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:1365 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (解决冲çªå¹¶è¿è¡Œ \"git cherry-pick --continue\")" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:1368 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr " (所有冲çªå·²è§£å†³ï¼šè¿è¡Œ \"git cherry-pick --continue\")" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:1370 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr " (使用 \"git cherry-pick --abort\" 以å–消拣选æ“作)" #: wt-status.c:1379 #, c-format msgid "You are currently reverting commit %s." msgstr "您在执行å转æ交 %s çš„æ“作。" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:1384 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (解决冲çªå¹¶è¿è¡Œ \"git revert --continue\")" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:1387 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (所有冲çªå·²è§£å†³ï¼šè¿è¡Œ \"git revert --continue\")" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:1389 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (使用 \"git revert --abort\" 以å–消å转æ交æ“作)" #: wt-status.c:1400 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "您在执行从分支 '%s' 开始的二分查找æ“作。" #: wt-status.c:1404 msgid "You are currently bisecting." msgstr "您在执行二分查找æ“作。" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:1407 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " (使用 \"git bisect reset\" 以回到原有分支)" #: wt-status.c:1604 msgid "On branch " msgstr "ä½äºŽåˆ†æ”¯ " #: wt-status.c:1610 msgid "interactive rebase in progress; onto " msgstr "交互å¼å˜åŸºæ“作æ£åœ¨è¿›è¡Œä¸ï¼›è‡³ " #: wt-status.c:1612 msgid "rebase in progress; onto " msgstr "å˜åŸºæ“作æ£åœ¨è¿›è¡Œä¸ï¼›è‡³ " #: wt-status.c:1617 msgid "HEAD detached at " msgstr "头指针分离于 " #: wt-status.c:1619 msgid "HEAD detached from " msgstr "头指针分离自 " #: wt-status.c:1622 msgid "Not currently on any branch." msgstr "当å‰ä¸åœ¨ä»»ä½•åˆ†æ”¯ä¸Šã€‚" #: wt-status.c:1642 msgid "Initial commit" msgstr "åˆå§‹æ交" #: wt-status.c:1643 msgid "No commits yet" msgstr "å°šæ— æ交" #: wt-status.c:1657 msgid "Untracked files" msgstr "未跟踪的文件" #: wt-status.c:1659 msgid "Ignored files" msgstr "忽略的文件" #: wt-status.c:1663 #, 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:1669 #, c-format msgid "Untracked files not listed%s" msgstr "未跟踪的文件没有列出%s" # 译者:ä¸æ–‡å—符串拼接,å¯åˆ 除å‰å¯¼ç©ºæ ¼ #: wt-status.c:1671 msgid " (use -u option to show untracked files)" msgstr "(使用 -u å‚数显示未跟踪的文件)" #: wt-status.c:1677 msgid "No changes" msgstr "没有修改" #: wt-status.c:1682 #, 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:1685 #, c-format msgid "no changes added to commit\n" msgstr "ä¿®æ”¹å°šæœªåŠ å…¥æ交\n" #: wt-status.c:1688 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "æ交为空,但是å˜åœ¨å°šæœªè·Ÿè¸ªçš„文件(使用 \"git add\" 建立跟踪)\n" #: wt-status.c:1691 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "æ交为空,但是å˜åœ¨å°šæœªè·Ÿè¸ªçš„文件\n" # 译者:ä¸æ–‡å—符串拼接,å¯åˆ 除å‰å¯¼ç©ºæ ¼ #: wt-status.c:1694 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "æ— æ–‡ä»¶è¦æ交(创建/æ‹·è´æ–‡ä»¶å¹¶ä½¿ç”¨ \"git add\" 建立跟踪)\n" #: wt-status.c:1697 wt-status.c:1702 #, c-format msgid "nothing to commit\n" msgstr "æ— æ–‡ä»¶è¦æ交\n" # 译者:ä¸æ–‡å—符串拼接,å¯åˆ 除å‰å¯¼ç©ºæ ¼ #: wt-status.c:1700 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "æ— æ–‡ä»¶è¦æ交(使用 -u 显示未跟踪的文件)\n" # 译者:ä¸æ–‡å—符串拼接,å¯åˆ 除å‰å¯¼ç©ºæ ¼ #: wt-status.c:1704 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "æ— æ–‡ä»¶è¦æ交,干净的工作区\n" #: wt-status.c:1817 msgid "No commits yet on " msgstr "å°šæ— æ交在 " #: wt-status.c:1821 msgid "HEAD (no branch)" msgstr "HEAD(éžåˆ†æ”¯ï¼‰" #: wt-status.c:1852 msgid "different" msgstr "ä¸åŒ" # 译者:注æ„ä¿æŒå¥å°¾ç©ºæ ¼ #: wt-status.c:1854 wt-status.c:1862 msgid "behind " msgstr "è½åŽ " #: wt-status.c:1857 wt-status.c:1860 msgid "ahead " msgstr "领先 " #. TRANSLATORS: the action is e.g. "pull with rebase" #: wt-status.c:2366 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "ä¸èƒ½%s:您有未暂å˜çš„å˜æ›´ã€‚" #: wt-status.c:2372 msgid "additionally, your index contains uncommitted changes." msgstr "å¦å¤–,您的索引ä¸åŒ…å«æœªæ交的å˜æ›´ã€‚" #: wt-status.c:2374 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "ä¸èƒ½%s:您的索引ä¸åŒ…å«æœªæ交的å˜æ›´ã€‚" #: compat/precompose_utf8.c:58 builtin/clone.c:442 #, c-format msgid "failed to unlink '%s'" msgstr "æ— æ³•åˆ é™¤ '%s'" #: builtin/add.c:24 msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<选项>] [--] <è·¯å¾„è§„æ ¼>..." #: builtin/add.c:83 #, c-format msgid "unexpected diff status %c" msgstr "æ„å¤–çš„å·®å¼‚çŠ¶æ€ %c" #: builtin/add.c:88 builtin/commit.c:266 msgid "updating files failed" msgstr "更新文件失败" #: builtin/add.c:98 #, c-format msgid "remove '%s'\n" msgstr "åˆ é™¤ '%s'\n" #: builtin/add.c:173 msgid "Unstaged changes after refreshing the index:" msgstr "刷新索引之åŽå°šæœªè¢«æš‚å˜çš„å˜æ›´ï¼š" #: builtin/add.c:233 builtin/rev-parse.c:892 msgid "Could not read the index" msgstr "ä¸èƒ½è¯»å–索引" #: builtin/add.c:244 #, c-format msgid "Could not open '%s' for writing." msgstr "æ— æ³•æ‰“å¼€ '%s' 进行写入。" #: builtin/add.c:248 msgid "Could not write patch" msgstr "ä¸èƒ½ç”Ÿæˆè¡¥ä¸" #: builtin/add.c:251 msgid "editing patch failed" msgstr "编辑补ä¸å¤±è´¥" #: builtin/add.c:254 #, c-format msgid "Could not stat '%s'" msgstr "ä¸èƒ½å¯¹ '%s' 调用 stat" #: builtin/add.c:256 msgid "Empty patch. Aborted." msgstr "空补ä¸ã€‚异常终æ¢ã€‚" #: builtin/add.c:261 #, c-format msgid "Could not apply '%s'" msgstr "ä¸èƒ½åº”用 '%s'" #: builtin/add.c:269 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "ä¸‹åˆ—è·¯å¾„æ ¹æ®æ‚¨çš„一个 .gitignore 文件而被忽略:\n" #: builtin/add.c:289 builtin/clean.c:911 builtin/fetch.c:145 builtin/mv.c:123 #: builtin/prune-packed.c:55 builtin/pull.c:212 builtin/push.c:557 #: builtin/remote.c:1342 builtin/rm.c:240 builtin/send-pack.c:165 msgid "dry run" msgstr "æ¼”ä¹ " #: builtin/add.c:292 msgid "interactive picking" msgstr "交互å¼æ‹£é€‰" #: builtin/add.c:293 builtin/checkout.c:1135 builtin/reset.c:302 msgid "select hunks interactively" msgstr "交互å¼æŒ‘选数æ®å—" #: builtin/add.c:294 msgid "edit current diff and apply" msgstr "编辑当å‰å·®å¼‚并应用" #: builtin/add.c:295 msgid "allow adding otherwise ignored files" msgstr "å…è®¸æ·»åŠ å¿½ç•¥çš„æ–‡ä»¶" #: builtin/add.c:296 msgid "update tracked files" msgstr "更新已跟踪的文件" #: builtin/add.c:297 msgid "renormalize EOL of tracked files (implies -u)" msgstr "å¯¹å·²è·Ÿè¸ªæ–‡ä»¶ï¼ˆæš—å« -u)é‡æ–°å½’一æ¢è¡Œç¬¦" #: builtin/add.c:298 msgid "record only the fact that the path will be added later" msgstr "åªè®°å½•ï¼Œè¯¥è·¯å¾„ç¨åŽå†æ·»åŠ " #: builtin/add.c:299 msgid "add changes from all tracked and untracked files" msgstr "æ·»åŠ æ‰€æœ‰æ”¹å˜çš„已跟踪文件和未跟踪文件" #: builtin/add.c:302 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "忽略工作区ä¸ç§»é™¤çš„路径(和 --no-all 相åŒï¼‰" #: builtin/add.c:304 msgid "don't add, only refresh the index" msgstr "ä¸æ·»åŠ ,åªåˆ·æ–°ç´¢å¼•" #: builtin/add.c:305 msgid "just skip files which cannot be added because of errors" msgstr "è·³è¿‡å› å‡ºé”™ä¸èƒ½æ·»åŠ 的文件" #: builtin/add.c:306 msgid "check if - even missing - files are ignored in dry run" msgstr "æ£€æŸ¥åœ¨æ¼”ä¹ æ¨¡å¼ä¸‹æ–‡ä»¶ï¼ˆå³ä½¿ä¸å˜åœ¨ï¼‰æ˜¯å¦è¢«å¿½ç•¥" #: builtin/add.c:307 builtin/update-index.c:974 msgid "(+/-)x" msgstr "(+/-)x" #: builtin/add.c:307 builtin/update-index.c:975 msgid "override the executable bit of the listed files" msgstr "覆盖列表里文件的å¯æ‰§è¡Œä½" #: builtin/add.c:309 msgid "warn when adding an embedded repository" msgstr "创建一个嵌入å¼ä»“库时给予è¦å‘Š" #: builtin/add.c:324 #, c-format msgid "" "You've added another git repository inside your current repository.\n" "Clones of the outer repository will not contain the contents of\n" "the embedded repository and will not know how to obtain it.\n" "If you meant to add a submodule, use:\n" "\n" "\tgit submodule add <url> %s\n" "\n" "If you added this path by mistake, you can remove it from the\n" "index with:\n" "\n" "\tgit rm --cached %s\n" "\n" "See \"git help submodule\" for more information." msgstr "" "您在当å‰ä»“库ä¸æ·»åŠ 了å¦å¤–一个Git仓库。克隆外层的仓库将ä¸åŒ…å«åµŒå…¥ä»“库的内容,并" "且ä¸çŸ¥é“该如何获å–它。\n" "如果您è¦æ·»åŠ 一个å模组,使用:\n" "\n" "\tgit submodule add <url> %s\n" "\n" "如果您ä¸å°å¿ƒæ·»åŠ 了这个路径,å¯ä»¥ç”¨ä¸‹é¢çš„命令将其从索引ä¸åˆ 除:\n" "\n" "\tgit rm --cached %s\n" "\n" "å‚è§ \"git help submodule\" 获å–更多信æ¯ã€‚" #: builtin/add.c:352 #, c-format msgid "adding embedded git repository: %s" msgstr "æ£åœ¨æ·»åŠ åµŒå…¥å¼ git 仓库:%s" #: builtin/add.c:370 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "使用 -f å‚数如果您确实è¦æ·»åŠ 它们。\n" #: builtin/add.c:378 msgid "adding files failed" msgstr "æ·»åŠ æ–‡ä»¶å¤±è´¥" #: builtin/add.c:416 msgid "-A and -u are mutually incompatible" msgstr "-A å’Œ -u 选项互斥" #: builtin/add.c:423 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "选项 --ignore-missing åªèƒ½å’Œ --dry-run åŒæ—¶ä½¿ç”¨" #: builtin/add.c:427 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "å‚æ•° --chmod å–值 '%s' 必须是 -x 或 +x" #: builtin/add.c:442 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "æ²¡æœ‰æŒ‡å®šæ–‡ä»¶ï¼Œä¹Ÿæ²¡æœ‰æ–‡ä»¶è¢«æ·»åŠ ã€‚\n" #: builtin/add.c:443 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "也许您想è¦æ‰§è¡Œ 'git add .'?\n" #: builtin/add.c:448 builtin/check-ignore.c:177 builtin/checkout.c:280 #: builtin/checkout.c:483 builtin/clean.c:958 builtin/commit.c:325 #: builtin/diff-tree.c:114 builtin/mv.c:144 builtin/reset.c:241 #: builtin/rm.c:270 builtin/submodule--helper.c:328 msgid "index file corrupt" msgstr "索引文件æŸå" #: builtin/am.c:414 msgid "could not parse author script" msgstr "ä¸èƒ½è§£æžä½œè€…脚本" #: builtin/am.c:498 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "'%s' 被 applypatch-msg é’©ååˆ é™¤" #: builtin/am.c:539 #, c-format msgid "Malformed input line: '%s'." msgstr "éžæ³•çš„输入行:'%s'。" #: builtin/am.c:576 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "从 '%s' æ‹·è´æ³¨è§£åˆ° '%s' 时失败" #: builtin/am.c:602 msgid "fseek failed" msgstr "fseek 失败" #: builtin/am.c:790 #, c-format msgid "could not parse patch '%s'" msgstr "æ— æ³•è§£æžè¡¥ä¸ '%s'" #: builtin/am.c:855 msgid "Only one StGIT patch series can be applied at once" msgstr "一次åªèƒ½æœ‰ä¸€ä¸ª StGIT è¡¥ä¸é˜Ÿåˆ—被应用" #: builtin/am.c:903 msgid "invalid timestamp" msgstr "æ— æ•ˆçš„æ—¶é—´æˆ³" #: builtin/am.c:908 builtin/am.c:920 msgid "invalid Date line" msgstr "æ— æ•ˆçš„æ—¥æœŸè¡Œ" #: builtin/am.c:915 msgid "invalid timezone offset" msgstr "æ— æ•ˆçš„æ—¶åŒºå移值" #: builtin/am.c:1008 msgid "Patch format detection failed." msgstr "è¡¥ä¸æ ¼å¼æŽ¢æµ‹å¤±è´¥ã€‚" #: builtin/am.c:1013 builtin/clone.c:407 #, c-format msgid "failed to create directory '%s'" msgstr "æ— æ³•åˆ›å»ºç›®å½• '%s'" #: builtin/am.c:1018 msgid "Failed to split patches." msgstr "æ— æ³•æ‹†åˆ†è¡¥ä¸ã€‚" #: builtin/am.c:1148 builtin/commit.c:351 msgid "unable to write index file" msgstr "æ— æ³•å†™å…¥ç´¢å¼•æ–‡ä»¶" #: builtin/am.c:1162 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "当您解决这一问题,执行 \"%s --continue\"。" #: builtin/am.c:1163 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "如果您想è¦è·³è¿‡è¿™ä¸€è¡¥ä¸ï¼Œåˆ™æ‰§è¡Œ \"%s --skip\"。" #: builtin/am.c:1164 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "è‹¥è¦å¤åŽŸè‡³åŽŸå§‹åˆ†æ”¯å¹¶åœæ¢è¡¥ä¸æ“作,执行 \"%s --abort\"。" #: builtin/am.c:1271 msgid "Patch is empty." msgstr "è¡¥ä¸ä¸ºç©ºã€‚" #: builtin/am.c:1337 #, c-format msgid "invalid ident line: %.*s" msgstr "æ— æ•ˆçš„èº«ä»½æ ‡è¯†ï¼š%.*s" #: builtin/am.c:1359 #, c-format msgid "unable to parse commit %s" msgstr "ä¸èƒ½è§£æžæ交 %s" #: builtin/am.c:1554 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "仓库缺ä¹å¿…è¦çš„æ•°æ®å¯¹è±¡ä»¥è¿›è¡Œä¸‰æ–¹åˆå¹¶ã€‚" #: builtin/am.c:1556 msgid "Using index info to reconstruct a base tree..." msgstr "使用索引æ¥é‡å»ºä¸€ä¸ªï¼ˆä¸‰æ–¹åˆå¹¶çš„ï¼‰åŸºç¡€ç›®å½•æ ‘..." #: builtin/am.c:1575 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." msgstr "" "您是å¦æ›¾æ‰‹åŠ¨ç¼–辑过您的补ä¸ï¼Ÿ\n" "æ— æ³•åº”ç”¨è¡¥ä¸åˆ°ç´¢å¼•ä¸çš„æ•°æ®å¯¹è±¡ä¸Šã€‚" #: builtin/am.c:1581 msgid "Falling back to patching base and 3-way merge..." msgstr "回è½åˆ°åŸºç¡€ç‰ˆæœ¬ä¸Šæ‰“è¡¥ä¸åŠè¿›è¡Œä¸‰æ–¹åˆå¹¶..." #: builtin/am.c:1606 msgid "Failed to merge in the changes." msgstr "æ— æ³•åˆå¹¶å˜æ›´ã€‚" #: builtin/am.c:1637 msgid "applying to an empty history" msgstr "æ£åº”用到一个空历å²ä¸Š" #: builtin/am.c:1683 builtin/am.c:1687 #, c-format msgid "cannot resume: %s does not exist." msgstr "æ— æ³•ç»§ç»ï¼š%s ä¸å˜åœ¨ã€‚" #: builtin/am.c:1703 msgid "cannot be interactive without stdin connected to a terminal." msgstr "æ ‡å‡†è¾“å…¥æ²¡æœ‰å’Œç»ˆç«¯å…³è”,ä¸èƒ½è¿›è¡Œäº¤äº’å¼æ“作。" #: builtin/am.c:1708 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. #. #: builtin/am.c:1718 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "应用?是[y]/å¦[n]/编辑[e]/查看补ä¸[v]/应用所有[a]:" #: builtin/am.c:1768 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "è„索引:ä¸èƒ½åº”用补ä¸ï¼ˆè„文件:%s)" #: builtin/am.c:1808 builtin/am.c:1879 #, c-format msgid "Applying: %.*s" msgstr "应用:%.*s" #: builtin/am.c:1824 msgid "No changes -- Patch already applied." msgstr "没有å˜æ›´ —— è¡¥ä¸å·²ç»åº”用过。" #: builtin/am.c:1832 #, c-format msgid "Patch failed at %s %.*s" msgstr "打补ä¸å¤±è´¥äºŽ %s %.*s" #: builtin/am.c:1838 msgid "Use 'git am --show-current-patch' to see the failed patch" msgstr "用 'git am --show-current-patch' 命令查看失败的补ä¸" #: builtin/am.c:1882 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" "您也许想è¦è·³è¿‡è¿™ä¸ªè¡¥ä¸ã€‚" #: builtin/am.c:1889 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " "such.\n" "You might run `git rm` on a file to accept \"deleted by them\" for it." msgstr "" "在您的索引ä¸ä»å˜åœ¨æœªåˆå¹¶çš„路径。\n" "您应该对已ç»å†²çªè§£å†³çš„æ¯ä¸€ä¸ªæ–‡ä»¶æ‰§è¡Œ 'git add' æ¥æ ‡è®°å·²ç»å®Œæˆã€‚ \n" "ä½ å¯ä»¥å¯¹ \"ç”±ä»–ä»¬åˆ é™¤\" 的文件执行 `git rm` 命令。" #: builtin/am.c:1996 builtin/am.c:2000 builtin/am.c:2012 builtin/reset.c:324 #: builtin/reset.c:332 #, c-format msgid "Could not parse object '%s'." msgstr "ä¸èƒ½è§£æžå¯¹è±¡ '%s'。" #: builtin/am.c:2048 msgid "failed to clean index" msgstr "æ— æ³•æ¸…ç©ºç´¢å¼•" #: builtin/am.c:2083 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" msgstr "您好åƒåœ¨ä¸Šä¸€æ¬¡ 'am' 失败åŽç§»åŠ¨äº† HEAD。未回退至 ORIG_HEAD" #: builtin/am.c:2174 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "æ— æ•ˆçš„ --patch-format 值:%s" #: builtin/am.c:2210 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]" #: builtin/am.c:2211 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<选项>] (--continue | --skip | --abort)" #: builtin/am.c:2217 msgid "run interactively" msgstr "以交互å¼æ–¹å¼è¿è¡Œ" #: builtin/am.c:2219 msgid "historical option -- no-op" msgstr "è€çš„å‚æ•° —— æ— ä½œç”¨" #: builtin/am.c:2221 msgid "allow fall back on 3way merging if needed" msgstr "如果必è¦ï¼Œå…许使用三方åˆå¹¶ã€‚" #: builtin/am.c:2222 builtin/init-db.c:484 builtin/prune-packed.c:57 #: builtin/repack.c:192 msgid "be quiet" msgstr "é™é»˜æ¨¡å¼" #: builtin/am.c:2224 msgid "add a Signed-off-by line to the commit message" msgstr "在æ交说明ä¸æ·»åŠ 一个 Signed-off-by ç¾å" #: builtin/am.c:2227 msgid "recode into utf8 (default)" msgstr "使用 utf8 å—符集(默认)" #: builtin/am.c:2229 msgid "pass -k flag to git-mailinfo" msgstr "å‘ git-mailinfo ä¼ é€’ -k å‚æ•°" #: builtin/am.c:2231 msgid "pass -b flag to git-mailinfo" msgstr "å‘ git-mailinfo ä¼ é€’ -b å‚æ•°" #: builtin/am.c:2233 msgid "pass -m flag to git-mailinfo" msgstr "å‘ git-mailinfo ä¼ é€’ -m å‚æ•°" #: builtin/am.c:2235 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "针对 mbox æ ¼å¼ï¼Œå‘ git-mailsplit ä¼ é€’ --keep-cr å‚æ•°" #: builtin/am.c:2238 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "ä¸å‘ git-mailsplit ä¼ é€’ --keep-cr å‚数,覆盖 am.keepcr 的设置" #: builtin/am.c:2241 msgid "strip everything before a scissors line" msgstr "丢弃è£åˆ‡çº¿å‰çš„所有内容" #: builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 #: builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 #: builtin/am.c:2270 msgid "pass it through git-apply" msgstr "ä¼ é€’ç»™ git-apply" #: builtin/am.c:2260 builtin/commit.c:1332 builtin/fmt-merge-msg.c:665 #: builtin/fmt-merge-msg.c:668 builtin/grep.c:853 builtin/merge.c:208 #: builtin/pull.c:150 builtin/pull.c:208 builtin/repack.c:201 #: builtin/repack.c:205 builtin/repack.c:207 builtin/show-branch.c:631 #: builtin/show-ref.c:169 builtin/tag.c:383 parse-options.h:144 #: parse-options.h:146 parse-options.h:258 msgid "n" msgstr "n" #: builtin/am.c:2266 builtin/branch.c:632 builtin/for-each-ref.c:38 #: builtin/replace.c:543 builtin/tag.c:419 builtin/verify-tag.c:39 msgid "format" msgstr "æ ¼å¼" #: builtin/am.c:2267 msgid "format the patch(es) are in" msgstr "è¡¥ä¸çš„æ ¼å¼" #: builtin/am.c:2273 msgid "override error message when patch failure occurs" msgstr "打补ä¸å¤±è´¥æ—¶æ˜¾ç¤ºçš„错误信æ¯" #: builtin/am.c:2275 msgid "continue applying patches after resolving a conflict" msgstr "冲çªè§£å†³åŽç»§ç»åº”用补ä¸" #: builtin/am.c:2278 msgid "synonyms for --continue" msgstr "å’Œ --continue åŒä¹‰" #: builtin/am.c:2281 msgid "skip the current patch" msgstr "跳过当å‰è¡¥ä¸" #: builtin/am.c:2284 msgid "restore the original branch and abort the patching operation." msgstr "æ¢å¤åŽŸå§‹åˆ†æ”¯å¹¶ç»ˆæ¢æ‰“è¡¥ä¸æ“作。" #: builtin/am.c:2287 msgid "abort the patching operation but keep HEAD where it is." msgstr "终æ¢è¡¥ä¸æ“作但ä¿æŒ HEAD ä¸å˜ã€‚" #: builtin/am.c:2290 msgid "show the patch being applied." msgstr "显示æ£åœ¨åº”用的补ä¸ã€‚" #: builtin/am.c:2294 msgid "lie about committer date" msgstr "将作者日期作为æ交日期" #: builtin/am.c:2296 msgid "use current timestamp for author date" msgstr "用当å‰æ—¶é—´ä½œä¸ºä½œè€…日期" #: builtin/am.c:2298 builtin/commit.c:1468 builtin/merge.c:239 #: builtin/pull.c:183 builtin/revert.c:112 builtin/tag.c:399 msgid "key-id" msgstr "key-id" #: builtin/am.c:2299 msgid "GPG-sign commits" msgstr "使用 GPG ç¾åæ交" #: builtin/am.c:2302 msgid "(internal use for git-rebase)" msgstr "(内部使用,用于 git-rebase)" #: builtin/am.c:2320 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" "请ä¸è¦å†ä½¿ç”¨å®ƒäº†ã€‚" #: builtin/am.c:2327 msgid "failed to read the index" msgstr "æ— æ³•è¯»å–索引" #: builtin/am.c:2342 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "之å‰çš„å˜åŸºç›®å½• %s ä»ç„¶å˜åœ¨ï¼Œä½†å´æ供了 mbox。" #: builtin/am.c:2366 #, c-format msgid "" "Stray %s directory found.\n" "Use \"git am --abort\" to remove it." msgstr "" "å‘现了错误的 %s 目录。\n" "使用 \"git am --abort\" åˆ é™¤å®ƒã€‚" #: builtin/am.c:2372 msgid "Resolve operation not in progress, we are not resuming." msgstr "解决æ“作未进行,我们ä¸ä¼šç»§ç»ã€‚" #: builtin/apply.c:8 msgid "git apply [<options>] [<patch>...]" msgstr "git apply [<选项>] [<è¡¥ä¸>...]" #: 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 a flush packet" msgstr "git archive:期望是 ACK/NAK,å´å¾—到 flush 包" #: builtin/archive.c:61 #, c-format msgid "git archive: NACK %s" msgstr "git archive:NACK %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:应有一个 flush 包" #: builtin/bisect--helper.c:12 msgid "git bisect--helper --next-all [--no-checkout]" msgstr "git bisect--helper --next-all [--no-checkout]" #: builtin/bisect--helper.c:13 msgid "git bisect--helper --write-terms <bad_term> <good_term>" msgstr "git bisect--helper --write-terms <å-术è¯> <好-术è¯>" #: builtin/bisect--helper.c:14 msgid "git bisect--helper --bisect-clean-state" msgstr "git bisect--helper --bisect-clean-state" #: builtin/bisect--helper.c:46 #, c-format msgid "'%s' is not a valid term" msgstr "'%s' ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„术è¯" #: builtin/bisect--helper.c:50 #, c-format msgid "can't use the builtin command '%s' as a term" msgstr "ä¸èƒ½ä½¿ç”¨å†…置命令 '%s' 作为术è¯" #: builtin/bisect--helper.c:60 #, c-format msgid "can't change the meaning of the term '%s'" msgstr "ä¸èƒ½ä¿®æ”¹æœ¯è¯ '%s' çš„å«ä¹‰" #: builtin/bisect--helper.c:71 msgid "please use two different terms" msgstr "请使用两个ä¸åŒçš„术è¯" #: builtin/bisect--helper.c:78 msgid "could not open the file BISECT_TERMS" msgstr "ä¸èƒ½æ‰“开文件 BISECT_TERMS" #: builtin/bisect--helper.c:120 msgid "perform 'git bisect next'" msgstr "执行 'git bisect next'" #: builtin/bisect--helper.c:122 msgid "write the terms to .git/BISECT_TERMS" msgstr "将术è¯å†™å…¥ .git/BISECT_TERMS" #: builtin/bisect--helper.c:124 msgid "cleanup the bisection state" msgstr "清除二分查找状æ€" #: builtin/bisect--helper.c:126 msgid "check for expected revs" msgstr "检查预期的版本" #: builtin/bisect--helper.c:128 msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "æ›´æ–° BISECT_HEAD 而éžæ£€å‡ºå½“å‰æ交" #: builtin/bisect--helper.c:143 msgid "--write-terms requires two arguments" msgstr "--write-terms 需è¦ä¸¤ä¸ªå‚æ•°" #: builtin/bisect--helper.c:147 msgid "--bisect-clean-state requires no arguments" msgstr "--bisect-clean-state ä¸éœ€è¦å‚æ•°" #: builtin/blame.c:29 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>" #: builtin/blame.c:34 msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "<版本选项> 的文档记录在 git-rev-list(1) ä¸" #: builtin/blame.c:404 #, c-format msgid "expecting a color: %s" msgstr "期望一个颜色:%s" #: builtin/blame.c:411 msgid "must end with a color" msgstr "必须以一个颜色结尾" #: builtin/blame.c:697 #, c-format msgid "invalid color '%s' in color.blame.repeatedLines" msgstr "设置 color.blame.repeatedLines ä¸çš„æ— æ•ˆé¢œè‰² '%s'" #: builtin/blame.c:715 msgid "invalid value for blame.coloring" msgstr "设置 blame.coloring ä¸çš„æ— æ•ˆå–值" #: builtin/blame.c:786 msgid "Show blame entries as we find them, incrementally" msgstr "增é‡å¼åœ°æ˜¾ç¤ºå‘现的 blame æ¡ç›®" #: builtin/blame.c:787 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "边界æ交显示空的 SHA-1(默认:关é—)" #: builtin/blame.c:788 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "ä¸æŠŠæ ¹æ交作为边界(默认:关é—)" #: builtin/blame.c:789 msgid "Show work cost statistics" msgstr "显示命令消耗统计" #: builtin/blame.c:790 msgid "Force progress reporting" msgstr "强制进度显示" #: builtin/blame.c:791 msgid "Show output score for blame entries" msgstr "æ˜¾ç¤ºåˆ¤æ– blame æ¡ç›®ä½ç§»çš„得分诊æ–ä¿¡æ¯" #: builtin/blame.c:792 msgid "Show original filename (Default: auto)" msgstr "显示原始文件å(默认:自动)" #: builtin/blame.c:793 msgid "Show original linenumber (Default: off)" msgstr "显示原始的行å·ï¼ˆé»˜è®¤ï¼šå…³é—)" #: builtin/blame.c:794 msgid "Show in a format designed for machine consumption" msgstr "显示为一个适åˆæœºå™¨è¯»å–çš„æ ¼å¼" #: builtin/blame.c:795 msgid "Show porcelain format with per-line commit information" msgstr "为æ¯ä¸€è¡Œæ˜¾ç¤ºæœºå™¨é€‚用的æ交信æ¯" #: builtin/blame.c:796 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "使用和 git-annotate 相åŒçš„输出模å¼ï¼ˆé»˜è®¤ï¼šå…³é—)" #: builtin/blame.c:797 msgid "Show raw timestamp (Default: off)" msgstr "显示原始时间戳(默认:关é—)" #: builtin/blame.c:798 msgid "Show long commit SHA1 (Default: off)" msgstr "显示长的 SHA1 æ交å·ï¼ˆé»˜è®¤ï¼šå…³é—)" #: builtin/blame.c:799 msgid "Suppress author name and timestamp (Default: off)" msgstr "éšè—作者åå—和时间戳(默认:关é—)" #: builtin/blame.c:800 msgid "Show author email instead of name (Default: off)" msgstr "显示作者的邮箱而ä¸æ˜¯åå—(默认:关é—)" #: builtin/blame.c:801 msgid "Ignore whitespace differences" msgstr "忽略空白差异" #: builtin/blame.c:802 msgid "color redundant metadata from previous line differently" msgstr "使用颜色间隔输出与å‰ä¸€è¡Œä¸åŒçš„é‡å¤å…ƒä¿¡æ¯" #: builtin/blame.c:803 msgid "color lines by age" msgstr "ä¾æ®æ—¶é—´ç€è‰²" #: builtin/blame.c:810 msgid "Use an experimental heuristic to improve diffs" msgstr "使用一个试验性的å¯å‘å¼ç®—法改进差异显示" #: builtin/blame.c:812 msgid "Spend extra cycles to find better match" msgstr "花费é¢å¤–的循环æ¥æ‰¾åˆ°æ›´å¥½çš„匹é…" #: builtin/blame.c:813 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "使用æ¥è‡ª <文件> 的修订集而ä¸æ˜¯è°ƒç”¨ git-rev-list" #: builtin/blame.c:814 msgid "Use <file>'s contents as the final image" msgstr "使用 <文件> 的内容作为最终的图片" #: builtin/blame.c:815 builtin/blame.c:816 msgid "score" msgstr "得分" #: builtin/blame.c:815 msgid "Find line copies within and across files" msgstr "找到文件内åŠè·¨æ–‡ä»¶çš„行拷è´" #: builtin/blame.c:816 msgid "Find line movements within and across files" msgstr "找到文件内åŠè·¨æ–‡ä»¶çš„行移动" #: builtin/blame.c:817 msgid "n,m" msgstr "n,m" #: builtin/blame.c:817 msgid "Process only line range n,m, counting from 1" msgstr "åªå¤„ç†è¡ŒèŒƒå›´åœ¨ n å’Œ m 之间的,从 1 开始" #: builtin/blame.c:866 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "--progress ä¸èƒ½å’Œ --incremental 或 --porcelain åŒæ—¶ä½¿ç”¨" #. TRANSLATORS: This string is used to tell us the #. maximum display width for a relative timestamp in #. "git blame" output. For C locale, "4 years, 11 #. months ago", which takes 22 places, is the longest #. among various forms of relative timestamps, but #. your language may need more or fewer display #. columns. #. #: builtin/blame.c:917 msgid "4 years, 11 months ago" msgstr "4 å¹´ 11 个月å‰" #: builtin/blame.c:1003 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" msgstr[0] "文件 %s åªæœ‰ %lu è¡Œ" msgstr[1] "文件 %s åªæœ‰ %lu è¡Œ" #: builtin/blame.c:1049 msgid "Blaming lines" msgstr "追踪代ç è¡Œ" #: builtin/branch.c:27 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]" #: builtin/branch.c:28 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" msgstr "git branch [<选项>] [-l] [-f] <分支å> [<起始点>]" #: builtin/branch.c:29 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." msgstr "git branch [<选项>] [-r] (-d | -D) <分支å>..." #: builtin/branch.c:30 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>" #: builtin/branch.c:31 msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>" msgstr "git branch [<选项>] (-c | -C) [<è€åˆ†æ”¯>] <新分支>" #: builtin/branch.c:32 msgid "git branch [<options>] [-r | -a] [--points-at]" msgstr "git branch [<选项>] [-r | -a] [--points-at]" #: builtin/branch.c:33 msgid "git branch [<options>] [-r | -a] [--format]" msgstr "git branch [<选项>] [-r | -a] [--format]" # 译者:ä¿æŒåŽŸæ¢è¡Œæ ¼å¼ï¼Œåœ¨è¾“出时 %s 的替代内容会让å—符串å˜é•¿ #: builtin/branch.c:146 #, 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:150 #, 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:164 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "æ— æ³•æŸ¥è¯¢ '%s' 指å‘çš„æ交对象" #: builtin/branch.c:168 #, 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:181 msgid "Update of config-file failed" msgstr "æ›´æ–°é…置文件失败" #: builtin/branch.c:212 msgid "cannot use -a with -d" msgstr "ä¸èƒ½å°† -a å’Œ -d åŒæ—¶ä½¿ç”¨" #: builtin/branch.c:218 msgid "Couldn't look up commit object for HEAD" msgstr "æ— æ³•æŸ¥è¯¢ HEAD 指å‘çš„æ交对象" #: builtin/branch.c:232 #, c-format msgid "Cannot delete branch '%s' checked out at '%s'" msgstr "æ— æ³•åˆ é™¤æ£€å‡ºäºŽ '%2$s' 的分支 '%1$s'。" #: builtin/branch.c:247 #, c-format msgid "remote-tracking branch '%s' not found." msgstr "未能找到远程跟踪分支 '%s'。" #: builtin/branch.c:248 #, c-format msgid "branch '%s' not found." msgstr "分支 '%s' 未å‘现。" #: builtin/branch.c:263 #, c-format msgid "Error deleting remote-tracking branch '%s'" msgstr "æ— æ³•åˆ é™¤è¿œç¨‹è·Ÿè¸ªåˆ†æ”¯ '%s'" #: builtin/branch.c:264 #, c-format msgid "Error deleting branch '%s'" msgstr "æ— æ³•åˆ é™¤åˆ†æ”¯ '%s'" #: builtin/branch.c:271 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "å·²åˆ é™¤è¿œç¨‹è·Ÿè¸ªåˆ†æ”¯ %s(曾为 %s)。\n" #: builtin/branch.c:272 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "å·²åˆ é™¤åˆ†æ”¯ %s(曾为 %s)。\n" #: builtin/branch.c:416 builtin/tag.c:58 msgid "unable to parse format string" msgstr "ä¸èƒ½è§£æžæ ¼å¼åŒ–å—符串" #: builtin/branch.c:453 #, c-format msgid "Branch %s is being rebased at %s" msgstr "分支 %s æ£è¢«å˜åŸºåˆ° %s" #: builtin/branch.c:457 #, c-format msgid "Branch %s is being bisected at %s" msgstr "分支 %s æ£è¢«äºŒåˆ†æŸ¥æ‰¾äºŽ %s" #: builtin/branch.c:474 msgid "cannot copy the current branch while not on any." msgstr "æ— æ³•æ‹·è´å½“å‰åˆ†æ”¯å› 为ä¸å¤„于任何分支上。" #: builtin/branch.c:476 msgid "cannot rename the current branch while not on any." msgstr "æ— æ³•é‡å‘½å当å‰åˆ†æ”¯å› 为ä¸å¤„于任何分支上。" #: builtin/branch.c:487 #, c-format msgid "Invalid branch name: '%s'" msgstr "æ— æ•ˆçš„åˆ†æ”¯å:'%s'" #: builtin/branch.c:514 msgid "Branch rename failed" msgstr "分支é‡å‘½å失败" #: builtin/branch.c:516 msgid "Branch copy failed" msgstr "分支拷è´å¤±è´¥" #: builtin/branch.c:520 #, c-format msgid "Created a copy of a misnamed branch '%s'" msgstr "已为错误命å的分支 '%s' 创建了一个副本" #: builtin/branch.c:523 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "已将错误命å的分支 '%s' é‡å‘½å" #: builtin/branch.c:529 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "分支é‡å‘½å为 %s,但 HEAD 没有更新ï¼" #: builtin/branch.c:538 msgid "Branch is renamed, but update of config-file failed" msgstr "分支被é‡å‘½å,但更新é…置文件失败" #: builtin/branch.c:540 msgid "Branch is copied, but update of config-file failed" msgstr "分支已拷è´ï¼Œä½†æ›´æ–°é…置文件失败" #: builtin/branch.c:556 #, c-format msgid "" "Please edit the description for the branch\n" " %s\n" "Lines starting with '%c' will be stripped.\n" msgstr "" "请编辑分支的æè¿°\n" " %s\n" "以 '%c' 开头的行将被过滤。\n" #: builtin/branch.c:589 msgid "Generic options" msgstr "通用选项" #: builtin/branch.c:591 msgid "show hash and subject, give twice for upstream branch" msgstr "显示哈希值和主题,若å‚数出现两次则显示上游分支" #: builtin/branch.c:592 msgid "suppress informational messages" msgstr "ä¸æ˜¾ç¤ºä¿¡æ¯" #: builtin/branch.c:593 msgid "set up tracking mode (see git-pull(1))" msgstr "设置跟踪模å¼ï¼ˆå‚è§ git-pull(1))" #: builtin/branch.c:595 msgid "do not use" msgstr "ä¸è¦ä½¿ç”¨" #: builtin/branch.c:597 msgid "upstream" msgstr "上游" #: builtin/branch.c:597 msgid "change the upstream info" msgstr "改å˜ä¸Šæ¸¸ä¿¡æ¯" #: builtin/branch.c:598 msgid "Unset the upstream info" msgstr "å–消上游信æ¯çš„设置" #: builtin/branch.c:599 msgid "use colored output" msgstr "使用彩色输出" #: builtin/branch.c:600 msgid "act on remote-tracking branches" msgstr "作用于远程跟踪分支" #: builtin/branch.c:602 builtin/branch.c:604 msgid "print only branches that contain the commit" msgstr "åªæ‰“å°åŒ…å«è¯¥æ交的分支" #: builtin/branch.c:603 builtin/branch.c:605 msgid "print only branches that don't contain the commit" msgstr "åªæ‰“å°ä¸åŒ…å«è¯¥æ交的分支" #: builtin/branch.c:608 msgid "Specific git-branch actions:" msgstr "具体的 git-branch 动作:" #: builtin/branch.c:609 msgid "list both remote-tracking and local branches" msgstr "列出远程跟踪åŠæœ¬åœ°åˆ†æ”¯" #: builtin/branch.c:611 msgid "delete fully merged branch" msgstr "åˆ é™¤å®Œå…¨åˆå¹¶çš„分支" #: builtin/branch.c:612 msgid "delete branch (even if not merged)" msgstr "åˆ é™¤åˆ†æ”¯ï¼ˆå³ä½¿æ²¡æœ‰åˆå¹¶ï¼‰" #: builtin/branch.c:613 msgid "move/rename a branch and its reflog" msgstr "移动/é‡å‘½å一个分支,以åŠå®ƒçš„引用日志" #: builtin/branch.c:614 msgid "move/rename a branch, even if target exists" msgstr "移动/é‡å‘½å一个分支,å³ä½¿ç›®æ ‡å·²å˜åœ¨" #: builtin/branch.c:615 msgid "copy a branch and its reflog" msgstr "æ‹·è´ä¸€ä¸ªåˆ†æ”¯å’Œå®ƒçš„引用日志" #: builtin/branch.c:616 msgid "copy a branch, even if target exists" msgstr "æ‹·è´ä¸€ä¸ªåˆ†æ”¯ï¼Œå³ä½¿ç›®æ ‡å·²å˜åœ¨" #: builtin/branch.c:617 msgid "list branch names" msgstr "列出分支å" #: builtin/branch.c:618 msgid "create the branch's reflog" msgstr "创建分支的引用日志" #: builtin/branch.c:620 msgid "edit the description for the branch" msgstr "æ ‡è®°åˆ†æ”¯çš„æè¿°" #: builtin/branch.c:621 msgid "force creation, move/rename, deletion" msgstr "强制创建ã€ç§»åŠ¨/é‡å‘½åã€åˆ 除" #: builtin/branch.c:622 msgid "print only branches that are merged" msgstr "åªæ‰“å°å·²ç»åˆå¹¶çš„分支" #: builtin/branch.c:623 msgid "print only branches that are not merged" msgstr "åªæ‰“å°å°šæœªåˆå¹¶çš„分支" #: builtin/branch.c:624 msgid "list branches in columns" msgstr "以列的方å¼æ˜¾ç¤ºåˆ†æ”¯" #: builtin/branch.c:625 builtin/for-each-ref.c:40 builtin/ls-remote.c:70 #: builtin/tag.c:412 msgid "key" msgstr "key" #: builtin/branch.c:626 builtin/for-each-ref.c:41 builtin/ls-remote.c:71 #: builtin/tag.c:413 msgid "field name to sort on" msgstr "排åºçš„å—段å" #: builtin/branch.c:628 builtin/for-each-ref.c:43 builtin/notes.c:408 #: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574 #: builtin/tag.c:415 msgid "object" msgstr "对象" #: builtin/branch.c:629 msgid "print only branches of the object" msgstr "åªæ‰“å°æŒ‡å‘该对象的分支" #: builtin/branch.c:631 builtin/for-each-ref.c:49 builtin/tag.c:422 msgid "sorting and filtering are case insensitive" msgstr "排åºå’Œè¿‡æ»¤å±žäºŽå¤§å°å†™ä¸æ•æ„Ÿ" #: builtin/branch.c:632 builtin/for-each-ref.c:38 builtin/tag.c:420 #: builtin/verify-tag.c:39 msgid "format to use for the output" msgstr "è¾“å‡ºæ ¼å¼" #: builtin/branch.c:655 builtin/clone.c:737 msgid "HEAD not found below refs/heads!" msgstr "HEAD 没有ä½äºŽ /refs/heads 之下ï¼" #: builtin/branch.c:678 msgid "--column and --verbose are incompatible" msgstr "--column å’Œ --verbose ä¸å…¼å®¹" #: builtin/branch.c:693 builtin/branch.c:745 builtin/branch.c:754 msgid "branch name required" msgstr "å¿…é¡»æ供分支å" #: builtin/branch.c:721 msgid "Cannot give description to detached HEAD" msgstr "ä¸èƒ½å‘分离头指针æä¾›æè¿°" #: builtin/branch.c:726 msgid "cannot edit description of more than one branch" msgstr "ä¸èƒ½ä¸ºä¸€ä¸ªä»¥ä¸Šçš„分支编辑æè¿°" #: builtin/branch.c:733 #, c-format msgid "No commit on branch '%s' yet." msgstr "分支 '%s' å°šæ— æ交。" #: builtin/branch.c:736 #, c-format msgid "No branch named '%s'." msgstr "没有分支 '%s'。" #: builtin/branch.c:751 msgid "too many branches for a copy operation" msgstr "为拷è´æ“作æ供了太多的分支å" #: builtin/branch.c:760 msgid "too many arguments for a rename operation" msgstr "为é‡å‘½åæ“作æ供了太多的å‚æ•°" #: builtin/branch.c:765 msgid "too many arguments to set new upstream" msgstr "为设置新上游æ供了太多的å‚æ•°" #: builtin/branch.c:769 #, 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:772 builtin/branch.c:794 builtin/branch.c:810 #, c-format msgid "no such branch '%s'" msgstr "没有æ¤åˆ†æ”¯ '%s'" #: builtin/branch.c:776 #, c-format msgid "branch '%s' does not exist" msgstr "分支 '%s' ä¸å˜åœ¨" #: builtin/branch.c:788 msgid "too many arguments to unset upstream" msgstr "为å–消上游设置æ“作æ供了太多的å‚æ•°" #: builtin/branch.c:792 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "æ— æ³•å–消 HEAD çš„ä¸Šæ¸¸è®¾ç½®å› ä¸ºå®ƒæ²¡æœ‰æŒ‡å‘一个分支" #: builtin/branch.c:798 #, c-format msgid "Branch '%s' has no upstream information" msgstr "分支 '%s' 没有上游信æ¯" #: builtin/branch.c:813 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "'git branch' çš„ -a å’Œ -r 选项带一个分支åå‚数没有æ„义" #: builtin/branch.c:816 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." msgstr "" "ä¸å†æ”¯æŒé€‰é¡¹ '--set-upstream'。请使用 '--track' 或 '--set-upstream-to'。" #: builtin/bundle.c:45 #, c-format msgid "%s is okay\n" msgstr "%s å¯ä»¥\n" #: builtin/bundle.c:58 msgid "Need a repository to create a bundle." msgstr "需è¦ä¸€ä¸ªä»“库æ¥åˆ›å»ºåŒ…。" #: builtin/bundle.c:62 msgid "Need a repository to unbundle." msgstr "需è¦ä¸€ä¸ªä»“库æ¥è§£åŒ…。" #: builtin/cat-file.c:525 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <type> | --textconv | --filters) [--path=<path>] <object>" msgstr "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <类型> | --textconv | --filters) [--path=<路径>] <对象>" #: builtin/cat-file.c:526 msgid "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" msgstr "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" #: builtin/cat-file.c:563 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<类型> å¯ä»¥æ˜¯å…¶ä¸ä¹‹ä¸€ï¼šblobã€treeã€commitã€tag" #: builtin/cat-file.c:564 msgid "show object type" msgstr "显示对象类型" #: builtin/cat-file.c:565 msgid "show object size" msgstr "显示对象大å°" #: builtin/cat-file.c:567 msgid "exit with zero when there's no error" msgstr "当没有错误时退出并返回零" #: builtin/cat-file.c:568 msgid "pretty-print object's content" msgstr "美观地打å°å¯¹è±¡çš„内容" #: builtin/cat-file.c:570 msgid "for blob objects, run textconv on object's content" msgstr "对于数æ®å¯¹è±¡ï¼Œå¯¹å…¶å†…容åšæ–‡æœ¬è½¬æ¢" #: builtin/cat-file.c:572 msgid "for blob objects, run filters on object's content" msgstr "对于数æ®å¯¹è±¡ï¼Œå¯¹å…¶å†…容åšè¿‡æ»¤" #: builtin/cat-file.c:573 git-submodule.sh:894 msgid "blob" msgstr "æ•°æ®å¯¹è±¡" #: builtin/cat-file.c:574 msgid "use a specific path for --textconv/--filters" msgstr "对于 --textconv/--filters 使用一个特定的路径" #: builtin/cat-file.c:576 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "å…许 -s å’Œ -t 对æŸå的对象生效" #: builtin/cat-file.c:577 msgid "buffer --batch output" msgstr "缓冲 --batch 的输出" #: builtin/cat-file.c:579 msgid "show info and content of objects fed from the standard input" msgstr "æ˜¾ç¤ºä»Žæ ‡å‡†è¾“å…¥æ供的对象的信æ¯å’Œå†…容" #: builtin/cat-file.c:582 msgid "show info about objects fed from the standard input" msgstr "æ˜¾ç¤ºä»Žæ ‡å‡†è¾“å…¥æ供的对象的信æ¯" #: builtin/cat-file.c:585 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "è·Ÿéšæ ‘内符å·é“¾æŽ¥ï¼ˆå’Œ --batch 或 --batch-check 共用)" #: builtin/cat-file.c:587 msgid "show all objects with --batch or --batch-check" msgstr "使用 --batch 或 --batch-check å‚数显示所有对象" #: builtin/check-attr.c:12 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." msgstr "git check-attr [-a | --all | <属性>...] [--] <路径å>..." #: builtin/check-attr.c:13 msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]" msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...]" #: builtin/check-attr.c:20 msgid "report all attributes set on file" msgstr "报告设置在文件上的所有属性" #: builtin/check-attr.c:21 msgid "use .gitattributes only from the index" msgstr "åªä½¿ç”¨ç´¢å¼•ä¸çš„ .gitattributes" #: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:100 msgid "read file names from stdin" msgstr "ä»Žæ ‡å‡†è¾“å…¥è¯»å‡ºæ–‡ä»¶å" #: builtin/check-attr.c:24 builtin/check-ignore.c:26 msgid "terminate input and output records by a NUL character" msgstr "输入和输出的记录使用 NUL å—符终结" #: builtin/check-ignore.c:20 builtin/checkout.c:1113 builtin/gc.c:500 msgid "suppress progress reporting" msgstr "ä¸æ˜¾ç¤ºè¿›åº¦æŠ¥å‘Š" #: builtin/check-ignore.c:28 msgid "show non-matching input paths" msgstr "显示未匹é…的输入路径" #: builtin/check-ignore.c:30 msgid "ignore index when checking" msgstr "检查时忽略索引" #: builtin/check-ignore.c:159 msgid "cannot specify pathnames with --stdin" msgstr "ä¸èƒ½åŒæ—¶æŒ‡å®šè·¯å¾„åŠ --stdin å‚æ•°" #: builtin/check-ignore.c:162 msgid "-z only makes sense with --stdin" msgstr "-z 需è¦å’Œ --stdin å‚数共用æ‰æœ‰æ„义" #: builtin/check-ignore.c:164 msgid "no path specified" msgstr "未指定路径" #: builtin/check-ignore.c:168 msgid "--quiet is only valid with a single pathname" msgstr "å‚æ•° --quiet åªåœ¨æ供一个路径å时有效" #: builtin/check-ignore.c:170 msgid "cannot have both --quiet and --verbose" msgstr "ä¸èƒ½åŒæ—¶æä¾› --quiet å’Œ --verbose å‚æ•°" #: builtin/check-ignore.c:173 msgid "--non-matching is only valid with --verbose" msgstr "--non-matching 选项åªåœ¨ä½¿ç”¨ --verbose 时有效" #: builtin/check-mailmap.c:9 msgid "git check-mailmap [<options>] <contact>..." msgstr "git check-mailmap [<选项>] <è”系地å€>..." #: builtin/check-mailmap.c:14 msgid "also read contacts from stdin" msgstr "è¿˜ä»Žæ ‡å‡†è¾“å…¥è¯»å–è”系地å€" #: builtin/check-mailmap.c:25 #, c-format msgid "unable to parse contact: %s" msgstr "ä¸èƒ½è§£æžè”系地å€ï¼š%s" #: builtin/check-mailmap.c:48 msgid "no contacts specified" msgstr "未指定è”系地å€" #: builtin/checkout-index.c:128 msgid "git checkout-index [<options>] [--] [<file>...]" msgstr "git checkout-index [<选项>] [--] [<文件>...]" #: builtin/checkout-index.c:143 msgid "stage should be between 1 and 3 or all" msgstr "索引值应该å–值 1 到 3 或者 all" #: builtin/checkout-index.c:159 msgid "check out all files in the index" msgstr "检出索引区的所有文件" #: builtin/checkout-index.c:160 msgid "force overwrite of existing files" msgstr "强制覆盖现有的文件" #: builtin/checkout-index.c:162 msgid "no warning for existing files and files not in index" msgstr "å˜åœ¨æˆ–ä¸åœ¨ç´¢å¼•ä¸çš„文件都没有è¦å‘Š" #: builtin/checkout-index.c:164 msgid "don't checkout new files" msgstr "ä¸æ£€å‡ºæ–°æ–‡ä»¶" #: builtin/checkout-index.c:166 msgid "update stat information in the index file" msgstr "更新索引ä¸æ–‡ä»¶çš„状æ€ä¿¡æ¯" #: builtin/checkout-index.c:170 msgid "read list of paths from the standard input" msgstr "ä»Žæ ‡å‡†è¾“å…¥è¯»å–路径列表" #: builtin/checkout-index.c:172 msgid "write the content to temporary files" msgstr "将内容写入临时文件" #: builtin/checkout-index.c:173 builtin/column.c:31 #: builtin/submodule--helper.c:1216 builtin/submodule--helper.c:1219 #: builtin/submodule--helper.c:1227 builtin/submodule--helper.c:1591 #: builtin/worktree.c:610 msgid "string" msgstr "å—符串" #: builtin/checkout-index.c:174 msgid "when creating files, prepend <string>" msgstr "在创建文件时,在å‰é¢åŠ 上 <å—符串>" #: builtin/checkout-index.c:176 msgid "copy out the files from named stage" msgstr "从指定暂å˜åŒºä¸æ‹·å‡ºæ–‡ä»¶" #: builtin/checkout.c:27 msgid "git checkout [<options>] <branch>" msgstr "git checkout [<选项>] <分支>" #: builtin/checkout.c:28 msgid "git checkout [<options>] [<branch>] -- <file>..." msgstr "git checkout [<选项>] [<分支>] -- <文件>..." #: builtin/checkout.c:136 builtin/checkout.c:169 #, c-format msgid "path '%s' does not have our version" msgstr "路径 '%s' 没有我们的版本" #: builtin/checkout.c:138 builtin/checkout.c:171 #, c-format msgid "path '%s' does not have their version" msgstr "路径 '%s' 没有他们的版本" #: builtin/checkout.c:154 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "路径 '%s' 没有全部必须的版本" #: builtin/checkout.c:198 #, c-format msgid "path '%s' does not have necessary versions" msgstr "路径 '%s' 没有必须的版本" #: builtin/checkout.c:215 #, c-format msgid "path '%s': cannot merge" msgstr "path '%s'ï¼šæ— æ³•åˆå¹¶" #: builtin/checkout.c:231 #, c-format msgid "Unable to add merge result for '%s'" msgstr "æ— æ³•ä¸º '%s' æ·»åŠ åˆå¹¶ç»“æžœ" #: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259 #: builtin/checkout.c:262 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' ä¸èƒ½åœ¨æ›´æ–°è·¯å¾„时使用" #: builtin/checkout.c:265 builtin/checkout.c:268 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' ä¸èƒ½å’Œ %s åŒæ—¶ä½¿ç”¨" #: builtin/checkout.c:271 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "ä¸èƒ½åŒæ—¶æ›´æ–°è·¯å¾„并切æ¢åˆ°åˆ†æ”¯'%s'。" #: builtin/checkout.c:340 builtin/checkout.c:347 #, c-format msgid "path '%s' is unmerged" msgstr "路径 '%s' 未åˆå¹¶" #: builtin/checkout.c:506 msgid "you need to resolve your current index first" msgstr "您需è¦å…ˆè§£å†³å½“å‰ç´¢å¼•çš„冲çª" #: builtin/checkout.c:643 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "ä¸èƒ½å¯¹ '%s' 执行 reflog æ“作:%s\n" #: builtin/checkout.c:684 msgid "HEAD is now at" msgstr "HEAD ç›®å‰ä½äºŽ" #: builtin/checkout.c:688 builtin/clone.c:691 msgid "unable to update HEAD" msgstr "ä¸èƒ½æ›´æ–° HEAD" #: builtin/checkout.c:692 #, c-format msgid "Reset branch '%s'\n" msgstr "é‡ç½®åˆ†æ”¯ '%s'\n" #: builtin/checkout.c:695 #, c-format msgid "Already on '%s'\n" msgstr "å·²ç»ä½äºŽ '%s'\n" #: builtin/checkout.c:699 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "切æ¢å¹¶é‡ç½®åˆ†æ”¯ '%s'\n" #: builtin/checkout.c:701 builtin/checkout.c:1046 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "切æ¢åˆ°ä¸€ä¸ªæ–°åˆ†æ”¯ '%s'\n" #: builtin/checkout.c:703 #, c-format msgid "Switched to branch '%s'\n" msgstr "切æ¢åˆ°åˆ†æ”¯ '%s'\n" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: builtin/checkout.c:754 #, c-format msgid " ... and %d more.\n" msgstr " ... åŠå…¶å®ƒ %d 个。\n" #: builtin/checkout.c:760 #, 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:779 #, c-format msgid "" "If you want to keep it 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" msgid_plural "" "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[0] "" "如果您想è¦é€šè¿‡åˆ›å»ºæ–°åˆ†æ”¯ä¿å˜å®ƒï¼Œè¿™å¯èƒ½æ˜¯ä¸€ä¸ªå¥½æ—¶å€™ã€‚\n" "如下æ“作:\n" "\n" " git branch <新分支å> %s\n" "\n" msgstr[1] "" "如果您想è¦é€šè¿‡åˆ›å»ºæ–°åˆ†æ”¯ä¿å˜å®ƒä»¬ï¼Œè¿™å¯èƒ½æ˜¯ä¸€ä¸ªå¥½æ—¶å€™ã€‚\n" "如下æ“作:\n" "\n" " git branch <新分支å> %s\n" "\n" #: builtin/checkout.c:811 msgid "internal error in revision walk" msgstr "在版本é历时é‡åˆ°å†…部错误" #: builtin/checkout.c:815 msgid "Previous HEAD position was" msgstr "之å‰çš„ HEAD ä½ç½®æ˜¯" #: builtin/checkout.c:843 builtin/checkout.c:1041 msgid "You are on a branch yet to be born" msgstr "您ä½äºŽä¸€ä¸ªå°šæœªåˆå§‹åŒ–的分支" #: builtin/checkout.c:947 #, c-format msgid "only one reference expected, %d given." msgstr "应åªæœ‰ä¸€ä¸ªå¼•ç”¨ï¼Œå´ç»™å‡ºäº† %d 个" #: builtin/checkout.c:987 builtin/worktree.c:240 builtin/worktree.c:389 #, c-format msgid "invalid reference: %s" msgstr "æ— æ•ˆå¼•ç”¨ï¼š%s" #: builtin/checkout.c:1016 #, c-format msgid "reference is not a tree: %s" msgstr "引用ä¸æ˜¯ä¸€ä¸ªæ ‘:%s" #: builtin/checkout.c:1055 msgid "paths cannot be used with switching branches" msgstr "路径ä¸èƒ½å’Œåˆ‡æ¢åˆ†æ”¯åŒæ—¶ä½¿ç”¨" #: builtin/checkout.c:1058 builtin/checkout.c:1062 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' ä¸èƒ½å’Œåˆ‡æ¢åˆ†æ”¯åŒæ—¶ä½¿ç”¨" #: builtin/checkout.c:1066 builtin/checkout.c:1069 builtin/checkout.c:1074 #: builtin/checkout.c:1077 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' ä¸èƒ½å’Œ '%s' åŒæ—¶ä½¿ç”¨" #: builtin/checkout.c:1082 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "ä¸èƒ½åˆ‡æ¢åˆ†æ”¯åˆ°ä¸€ä¸ªéžæ交 '%s'" #: builtin/checkout.c:1114 builtin/checkout.c:1116 builtin/clone.c:118 #: builtin/remote.c:167 builtin/remote.c:169 builtin/worktree.c:433 #: builtin/worktree.c:435 msgid "branch" msgstr "分支" #: builtin/checkout.c:1115 msgid "create and checkout a new branch" msgstr "创建并检出一个新的分支" #: builtin/checkout.c:1117 msgid "create/reset and checkout a branch" msgstr "创建/é‡ç½®å¹¶æ£€å‡ºä¸€ä¸ªåˆ†æ”¯" #: builtin/checkout.c:1118 msgid "create reflog for new branch" msgstr "为新的分支创建引用日志" #: builtin/checkout.c:1119 builtin/worktree.c:437 msgid "detach HEAD at named commit" msgstr "HEAD 从指定的æ交分离" #: builtin/checkout.c:1120 msgid "set upstream info for new branch" msgstr "为新的分支设置上游信æ¯" #: builtin/checkout.c:1122 msgid "new-branch" msgstr "新分支" #: builtin/checkout.c:1122 msgid "new unparented branch" msgstr "新的没有父æ交的分支" #: builtin/checkout.c:1123 msgid "checkout our version for unmerged files" msgstr "对尚未åˆå¹¶çš„文件检出我们的版本" #: builtin/checkout.c:1125 msgid "checkout their version for unmerged files" msgstr "对尚未åˆå¹¶çš„文件检出他们的版本" #: builtin/checkout.c:1127 msgid "force checkout (throw away local modifications)" msgstr "强制检出(丢弃本地修改)" #: builtin/checkout.c:1129 msgid "perform a 3-way merge with the new branch" msgstr "和新的分支执行三方åˆå¹¶" #: builtin/checkout.c:1131 builtin/merge.c:241 msgid "update ignored files (default)" msgstr "更新忽略的文件(默认)" #: builtin/checkout.c:1133 builtin/log.c:1499 parse-options.h:264 msgid "style" msgstr "é£Žæ ¼" #: builtin/checkout.c:1134 msgid "conflict style (merge or diff3)" msgstr "冲çªè¾“å‡ºé£Žæ ¼ï¼ˆmerge 或 diff3)" #: builtin/checkout.c:1137 msgid "do not limit pathspecs to sparse entries only" msgstr "对路径ä¸åšç¨€ç–检出的é™åˆ¶" #: builtin/checkout.c:1139 msgid "second guess 'git checkout <no-such-branch>'" msgstr "二次猜测'git checkout <æ— æ¤åˆ†æ”¯>'" #: builtin/checkout.c:1141 msgid "do not check if another worktree is holding the given ref" msgstr "ä¸æ£€æŸ¥æŒ‡å®šçš„引用是å¦è¢«å…¶ä»–工作区所å 用" #: builtin/checkout.c:1145 builtin/clone.c:85 builtin/fetch.c:149 #: builtin/merge.c:238 builtin/pull.c:128 builtin/push.c:572 #: builtin/send-pack.c:174 msgid "force progress reporting" msgstr "强制显示进度报告" #: builtin/checkout.c:1175 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-bã€-B å’Œ --orphan 是互斥的" #: builtin/checkout.c:1192 msgid "--track needs a branch name" msgstr "--track 需è¦ä¸€ä¸ªåˆ†æ”¯å" #: builtin/checkout.c:1197 msgid "Missing branch name; try -b" msgstr "缺少分支åï¼›å°è¯• -b" #: builtin/checkout.c:1233 msgid "invalid path specification" msgstr "æ— æ•ˆçš„è·¯å¾„è§„æ ¼" #: builtin/checkout.c:1240 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "'%s' ä¸æ˜¯ä¸€ä¸ªæ交,ä¸èƒ½åŸºäºŽå®ƒåˆ›å»ºåˆ†æ”¯ '%s'" #: builtin/checkout.c:1244 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout:--detach ä¸èƒ½æŽ¥æ”¶è·¯å¾„å‚æ•° '%s'" #: builtin/checkout.c:1248 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:26 msgid "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." msgstr "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <模å¼>] [-x | -X] [--] <路径>..." #: builtin/clean.c:30 #, c-format msgid "Removing %s\n" msgstr "æ£åˆ 除 %s\n" #: builtin/clean.c:31 #, c-format msgid "Would remove %s\n" msgstr "å°†åˆ é™¤ %s\n" #: builtin/clean.c:32 #, c-format msgid "Skipping repository %s\n" msgstr "忽略仓库 %s\n" #: builtin/clean.c:33 #, c-format msgid "Would skip repository %s\n" msgstr "将忽略仓库 %s\n" #: builtin/clean.c:34 #, c-format msgid "failed to remove %s" msgstr "æ— æ³•åˆ é™¤ %s" #: builtin/clean.c:302 git-add--interactive.perl:579 #, c-format msgid "" "Prompt help:\n" "1 - select a numbered item\n" "foo - select item based on unique prefix\n" " - (empty) select nothing\n" msgstr "" "帮助:\n" "1 - 通过编å·é€‰æ‹©ä¸€ä¸ªé€‰é¡¹\n" "foo - 通过唯一å‰ç¼€é€‰æ‹©ä¸€ä¸ªé€‰é¡¹\n" " - (空)什么也ä¸é€‰æ‹©\n" #: builtin/clean.c:306 git-add--interactive.perl:588 #, c-format msgid "" "Prompt help:\n" "1 - select a single item\n" "3-5 - select a range of items\n" "2-3,6-9 - select multiple ranges\n" "foo - select item based on unique prefix\n" "-... - unselect specified items\n" "* - choose all items\n" " - (empty) finish selecting\n" msgstr "" "帮助:\n" "1 - 选择一个选项\n" "3-5 - 选择一个范围内的所有选项\n" "2-3,6-9 - 选择多个范围内的所有选项\n" "foo - 通过唯一å‰ç¼€é€‰æ‹©ä¸€ä¸ªé€‰é¡¹\n" "-... - å选特定的选项\n" "* - 选择所有选项\n" " - (空)结æŸé€‰æ‹©\n" #: builtin/clean.c:522 git-add--interactive.perl:554 #: git-add--interactive.perl:559 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "嗯(%s)?\n" #: builtin/clean.c:664 #, c-format msgid "Input ignore patterns>> " msgstr "输入模版以排除æ¡ç›®>> " #: builtin/clean.c:701 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "è¦å‘Šï¼šæ— 法找到和 %s 匹é…çš„æ¡ç›®" #: builtin/clean.c:722 msgid "Select items to delete" msgstr "选择è¦åˆ 除的æ¡ç›®" #. TRANSLATORS: Make sure to keep [y/N] as is #: builtin/clean.c:763 #, c-format msgid "Remove %s [y/N]? " msgstr "åˆ é™¤ %s [y/N]?" #: builtin/clean.c:788 git-add--interactive.perl:1717 #, c-format msgid "Bye.\n" msgstr "å†è§ã€‚\n" #: builtin/clean.c:796 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" "select by numbers - select items to be deleted by numbers\n" "ask each - confirm each deletion (like \"rm -i\")\n" "quit - stop cleaning\n" "help - this screen\n" "? - help for prompt selection" msgstr "" "clean - 开始清ç†\n" "filter by pattern - 通过模版排除è¦åˆ 除的æ¡ç›®\n" "select by numbers - 通过数å—选择è¦åˆ 除的æ¡ç›®\n" "ask each - é’ˆå¯¹åˆ é™¤é€ä¸€è¯¢é—®ï¼ˆå°±åƒ \"rm -i\")\n" "quit - åœæ¢åˆ 除并退出\n" "help - 显示本帮助\n" "? - 显示如何在æ示符下选择的帮助" #: builtin/clean.c:823 git-add--interactive.perl:1793 msgid "*** Commands ***" msgstr "*** 命令 ***" #: builtin/clean.c:824 git-add--interactive.perl:1790 msgid "What now" msgstr "请选择" #: builtin/clean.c:832 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "å°†åˆ é™¤å¦‚ä¸‹æ¡ç›®ï¼š" msgstr[1] "å°†åˆ é™¤å¦‚ä¸‹æ¡ç›®ï¼š" #: builtin/clean.c:848 msgid "No more files to clean, exiting." msgstr "没有è¦æ¸…ç†çš„文件,退出。" #: builtin/clean.c:910 msgid "do not print names of files removed" msgstr "ä¸æ‰“å°åˆ 除文件的å称" #: builtin/clean.c:912 msgid "force" msgstr "强制" #: builtin/clean.c:913 msgid "interactive cleaning" msgstr "交互å¼æ¸…除" #: builtin/clean.c:915 msgid "remove whole directories" msgstr "åˆ é™¤æ•´ä¸ªç›®å½•" #: builtin/clean.c:916 builtin/describe.c:533 builtin/describe.c:535 #: builtin/grep.c:871 builtin/log.c:157 builtin/log.c:159 #: builtin/ls-files.c:548 builtin/name-rev.c:397 builtin/name-rev.c:399 #: builtin/show-ref.c:176 msgid "pattern" msgstr "模å¼" #: builtin/clean.c:917 msgid "add <pattern> to ignore rules" msgstr "æ·»åŠ <模å¼> 到忽略规则" #: builtin/clean.c:918 msgid "remove ignored files, too" msgstr "ä¹Ÿåˆ é™¤å¿½ç•¥çš„æ–‡ä»¶" #: builtin/clean.c:920 msgid "remove only ignored files" msgstr "åªåˆ 除忽略的文件" #: builtin/clean.c:938 msgid "-x and -X cannot be used together" msgstr "-x å’Œ -X ä¸èƒ½åŒæ—¶ä½¿ç”¨" #: builtin/clean.c:942 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" msgstr "" "clean.requireForce 设置为 true 且未æä¾› -iã€-n 或 -f 选项,拒ç»æ‰§è¡Œæ¸…ç†åŠ¨ä½œ" #: builtin/clean.c:945 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" msgstr "" "clean.requireForce 默认为 true 且未æä¾› -iã€-n 或 -f 选项,拒ç»æ‰§è¡Œæ¸…ç†åŠ¨ä½œ" #: builtin/clone.c:42 msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<选项>] [--] <仓库> [<路径>]" #: builtin/clone.c:87 msgid "don't create a checkout" msgstr "ä¸åˆ›å»ºä¸€ä¸ªæ£€å‡º" #: builtin/clone.c:88 builtin/clone.c:90 builtin/init-db.c:479 msgid "create a bare repository" msgstr "创建一个纯仓库" #: builtin/clone.c:92 msgid "create a mirror repository (implies bare)" msgstr "创建一个镜åƒä»“库(也是纯仓库)" #: builtin/clone.c:94 msgid "to clone from a local repository" msgstr "从本地仓库克隆" #: builtin/clone.c:96 msgid "don't use local hardlinks, always copy" msgstr "ä¸ä½¿ç”¨æœ¬åœ°ç¡¬é“¾æŽ¥ï¼Œå§‹ç»ˆå¤åˆ¶" #: builtin/clone.c:98 msgid "setup as shared repository" msgstr "设置为共享仓库" #: builtin/clone.c:100 builtin/clone.c:104 msgid "pathspec" msgstr "è·¯å¾„è§„æ ¼" #: builtin/clone.c:100 builtin/clone.c:104 msgid "initialize submodules in the clone" msgstr "在克隆时åˆå§‹åŒ–å模组" #: builtin/clone.c:107 msgid "number of submodules cloned in parallel" msgstr "并å‘克隆的å模组的数é‡" #: builtin/clone.c:108 builtin/init-db.c:476 msgid "template-directory" msgstr "模æ¿ç›®å½•" #: builtin/clone.c:109 builtin/init-db.c:477 msgid "directory from which templates will be used" msgstr "模æ¿ç›®å½•å°†è¢«ä½¿ç”¨" #: builtin/clone.c:111 builtin/clone.c:113 builtin/submodule--helper.c:1223 #: builtin/submodule--helper.c:1594 msgid "reference repository" msgstr "å‚考仓库" #: builtin/clone.c:115 builtin/submodule--helper.c:1225 #: builtin/submodule--helper.c:1596 msgid "use --reference only while cloning" msgstr "仅在克隆时å‚考 --reference 指å‘的本地仓库" #: builtin/clone.c:116 builtin/column.c:27 builtin/merge-file.c:44 #: builtin/pack-objects.c:3166 builtin/repack.c:213 msgid "name" msgstr "å称" #: builtin/clone.c:117 msgid "use <name> instead of 'origin' to track upstream" msgstr "使用 <å称> 而ä¸æ˜¯ 'origin' 去跟踪上游" #: builtin/clone.c:119 msgid "checkout <branch> instead of the remote's HEAD" msgstr "检出 <分支> 而ä¸æ˜¯è¿œç¨‹ HEAD" #: builtin/clone.c:121 msgid "path to git-upload-pack on the remote" msgstr "远程 git-upload-pack 路径" #: builtin/clone.c:122 builtin/fetch.c:150 builtin/grep.c:813 #: builtin/pull.c:216 msgid "depth" msgstr "深度" #: builtin/clone.c:123 msgid "create a shallow clone of that depth" msgstr "创建一个指定深度的浅克隆" #: builtin/clone.c:124 builtin/fetch.c:152 builtin/pack-objects.c:3157 #: parse-options.h:154 msgid "time" msgstr "时间" #: builtin/clone.c:125 msgid "create a shallow clone since a specific time" msgstr "从一个特定时间创建一个浅克隆" #: builtin/clone.c:126 builtin/fetch.c:154 msgid "revision" msgstr "版本" #: builtin/clone.c:127 builtin/fetch.c:155 msgid "deepen history of shallow clone, excluding rev" msgstr "深化浅克隆的历å²ï¼Œé™¤äº†ç‰¹å®šç‰ˆæœ¬" #: builtin/clone.c:129 msgid "clone only one branch, HEAD or --branch" msgstr "åªå…‹éš†ä¸€ä¸ªåˆ†æ”¯ã€HEAD 或 --branch" #: builtin/clone.c:131 msgid "don't clone any tags, and make later fetches not to follow them" msgstr "ä¸è¦å…‹éš†ä»»ä½•æ ‡ç¾ï¼Œå¹¶ä¸”åŽç»èŽ·å–æ“作也ä¸ä¸‹è½½å®ƒä»¬" #: builtin/clone.c:133 msgid "any cloned submodules will be shallow" msgstr "å模组将以浅下载模å¼å…‹éš†" #: builtin/clone.c:134 builtin/init-db.c:485 msgid "gitdir" msgstr "git目录" #: builtin/clone.c:135 builtin/init-db.c:486 msgid "separate git dir from working tree" msgstr "git目录和工作区分离" #: builtin/clone.c:136 msgid "key=value" msgstr "key=value" #: builtin/clone.c:137 msgid "set config inside the new repository" msgstr "在新仓库ä¸è®¾ç½®é…置信æ¯" #: builtin/clone.c:138 builtin/fetch.c:173 builtin/pull.c:229 #: builtin/push.c:583 msgid "use IPv4 addresses only" msgstr "åªä½¿ç”¨ IPv4 地å€" #: builtin/clone.c:140 builtin/fetch.c:175 builtin/pull.c:232 #: builtin/push.c:585 msgid "use IPv6 addresses only" msgstr "åªä½¿ç”¨ IPv6 地å€" #: builtin/clone.c:278 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" msgstr "" "æ— æ³•çŒœåˆ°ç›®å½•å。\n" "请在命令行指定一个目录" #: builtin/clone.c:331 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "info: ä¸èƒ½ä¸º '%s' æ·»åŠ ä¸€ä¸ªå¤‡ç”¨ï¼š%s\n" #: builtin/clone.c:403 #, c-format msgid "failed to open '%s'" msgstr "æ— æ³•æ‰“å¼€ '%s'" #: builtin/clone.c:411 #, c-format msgid "%s exists and is not a directory" msgstr "%s å˜åœ¨ä¸”ä¸æ˜¯ä¸€ä¸ªç›®å½•" #: builtin/clone.c:425 #, c-format msgid "failed to stat %s\n" msgstr "对 %s 调用 stat 失败\n" #: builtin/clone.c:447 #, c-format msgid "failed to create link '%s'" msgstr "æ— æ³•åˆ›å»ºé“¾æŽ¥ '%s'" #: builtin/clone.c:451 #, c-format msgid "failed to copy file to '%s'" msgstr "æ— æ³•æ‹·è´æ–‡ä»¶è‡³ '%s'" #: builtin/clone.c:477 #, c-format msgid "done.\n" msgstr "完æˆã€‚\n" #: builtin/clone.c:491 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:568 #, c-format msgid "Could not find remote branch %s to clone." msgstr "ä¸èƒ½å‘现è¦å…‹éš†çš„远程分支 %s。" #: builtin/clone.c:663 msgid "remote did not send all necessary objects" msgstr "远程没有å‘é€æ‰€æœ‰å¿…须的对象" #: builtin/clone.c:679 #, c-format msgid "unable to update %s" msgstr "ä¸èƒ½æ›´æ–° %s" #: builtin/clone.c:728 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "远程 HEAD 指å‘一个ä¸å˜åœ¨çš„å¼•ç”¨ï¼Œæ— æ³•æ£€å‡ºã€‚\n" #: builtin/clone.c:758 msgid "unable to checkout working tree" msgstr "ä¸èƒ½æ£€å‡ºå·¥ä½œåŒº" #: builtin/clone.c:803 msgid "unable to write parameters to config file" msgstr "æ— æ³•å°†å‚数写入é…置文件" #: builtin/clone.c:866 msgid "cannot repack to clean up" msgstr "æ— æ³•æ‰§è¡Œ repack æ¥æ¸…ç†" #: builtin/clone.c:868 msgid "cannot unlink temporary alternates file" msgstr "æ— æ³•åˆ é™¤ä¸´æ—¶çš„ alternates 文件" #: builtin/clone.c:907 builtin/receive-pack.c:1947 msgid "Too many arguments." msgstr "太多å‚数。" #: builtin/clone.c:911 msgid "You must specify a repository to clone." msgstr "您必须指定一个仓库æ¥å…‹éš†ã€‚" #: builtin/clone.c:924 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "--bare å’Œ --origin %s 选项ä¸å…¼å®¹ã€‚" #: builtin/clone.c:927 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare å’Œ --separate-git-dir 选项ä¸å…¼å®¹ã€‚" #: builtin/clone.c:940 #, c-format msgid "repository '%s' does not exist" msgstr "仓库 '%s' ä¸å˜åœ¨" #: builtin/clone.c:946 builtin/fetch.c:1460 #, c-format msgid "depth %s is not a positive number" msgstr "深度 %s ä¸æ˜¯ä¸€ä¸ªæ£æ•°" #: builtin/clone.c:956 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "ç›®æ ‡è·¯å¾„ '%s' å·²ç»å˜åœ¨ï¼Œå¹¶ä¸”ä¸æ˜¯ä¸€ä¸ªç©ºç›®å½•ã€‚" #: builtin/clone.c:966 #, c-format msgid "working tree '%s' already exists." msgstr "工作区 '%s' å·²ç»å˜åœ¨ã€‚" #: builtin/clone.c:981 builtin/clone.c:1002 builtin/difftool.c:270 #: builtin/worktree.c:246 builtin/worktree.c:276 #, c-format msgid "could not create leading directories of '%s'" msgstr "ä¸èƒ½ä¸º '%s' 创建先导目录" #: builtin/clone.c:986 #, c-format msgid "could not create work tree dir '%s'" msgstr "ä¸èƒ½åˆ›å»ºå·¥ä½œåŒºç›®å½• '%s'" #: builtin/clone.c:1006 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "克隆到纯仓库 '%s'...\n" #: builtin/clone.c:1008 #, c-format msgid "Cloning into '%s'...\n" msgstr "æ£å…‹éš†åˆ° '%s'...\n" #: builtin/clone.c:1032 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" msgstr "clone --recursive å’Œ --reference ä»¥åŠ --reference-if-able ä¸å…¼å®¹" #: builtin/clone.c:1093 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth 在本地克隆时被忽略,请改用 file:// å议。" #: builtin/clone.c:1095 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "--shallow-since 在本地克隆时被忽略,请改用 file:// å议。" #: builtin/clone.c:1097 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "--shallow-exclude 在本地克隆时被忽略,请改用 file:// å议。" #: builtin/clone.c:1099 msgid "--filter is ignored in local clones; use file:// instead." msgstr "--filter 在本地克隆时被忽略,请改用 file:// å议。" #: builtin/clone.c:1102 msgid "source repository is shallow, ignoring --local" msgstr "æºä»“库是浅克隆,忽略 --local" #: builtin/clone.c:1107 msgid "--local is ignored" msgstr "--local 被忽略" #: builtin/clone.c:1169 builtin/clone.c:1177 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "远程分支 %s 在上游 %s 未å‘现" #: builtin/clone.c:1180 msgid "You appear to have cloned an empty repository." msgstr "您似乎克隆了一个空仓库。" #: builtin/column.c:10 msgid "git column [<options>]" msgstr "git column [<选项>]" #: builtin/column.c:27 msgid "lookup config vars" msgstr "查找é…ç½®å˜é‡" #: builtin/column.c:28 builtin/column.c:29 msgid "layout to use" msgstr "è¦ä½¿ç”¨çš„布局" #: builtin/column.c:30 msgid "Maximum width" msgstr "最大宽度" #: builtin/column.c:31 msgid "Padding space on left border" msgstr "左边框的填充空间" #: builtin/column.c:32 msgid "Padding space on right border" msgstr "å³è¾¹æ¡†çš„填充空间" #: builtin/column.c:33 msgid "Padding space between columns" msgstr "两列之间的填充空间" #: builtin/column.c:51 msgid "--command must be the first argument" msgstr "--command 必须是第一个å‚æ•°" #: builtin/commit.c:37 msgid "git commit [<options>] [--] <pathspec>..." msgstr "git commit [<选项>] [--] <è·¯å¾„è§„æ ¼>..." #: builtin/commit.c:42 msgid "git status [<options>] [--] <pathspec>..." msgstr "git status [<选项>] [--] <è·¯å¾„è§„æ ¼>..." #: builtin/commit.c:47 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:52 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" msgstr "" "之å‰çš„拣选æ“作现在是一个空æ交,å¯èƒ½æ˜¯ç”±å†²çªè§£å†³å¯¼è‡´çš„ã€‚å¦‚æžœæ‚¨æ— è®ºå¦‚ä½•\n" "也è¦æ交,使用命令:\n" "\n" " git commit --allow-empty\n" "\n" #: builtin/commit.c:59 msgid "Otherwise, please use 'git reset'\n" msgstr "å¦åˆ™ï¼Œè¯·ä½¿ç”¨å‘½ä»¤ 'git reset'\n" #: builtin/commit.c:62 msgid "" "If you wish to skip this commit, use:\n" "\n" " git reset\n" "\n" "Then \"git cherry-pick --continue\" will resume cherry-picking\n" "the remaining commits.\n" msgstr "" "如果您想跳过这个æ交,使用命令:\n" "\n" " git reset\n" "\n" "然åŽæ‰§è¡Œ \"git cherry-pick --continue\" 继ç»å¯¹å…¶ä½™æ交执行拣选\n" "æ“作。\n" #: builtin/commit.c:293 msgid "failed to unpack HEAD tree object" msgstr "æ— æ³•è§£åŒ… HEAD æ ‘å¯¹è±¡" #: builtin/commit.c:334 msgid "unable to create temporary index" msgstr "ä¸èƒ½åˆ›å»ºä¸´æ—¶ç´¢å¼•" #: builtin/commit.c:340 msgid "interactive add failed" msgstr "交互å¼æ·»åŠ 失败" #: builtin/commit.c:353 msgid "unable to update temporary index" msgstr "æ— æ³•æ›´æ–°ä¸´æ—¶ç´¢å¼•" #: builtin/commit.c:355 msgid "Failed to update main cache tree" msgstr "ä¸èƒ½æ›´æ–°æ ‘的主缓å˜" #: builtin/commit.c:380 builtin/commit.c:403 builtin/commit.c:449 msgid "unable to write new_index file" msgstr "æ— æ³•å†™ new_index 文件" #: builtin/commit.c:432 msgid "cannot do a partial commit during a merge." msgstr "在åˆå¹¶è¿‡ç¨‹ä¸ä¸èƒ½åšéƒ¨åˆ†æ交。" #: builtin/commit.c:434 msgid "cannot do a partial commit during a cherry-pick." msgstr "在拣选过程ä¸ä¸èƒ½åšéƒ¨åˆ†æ交。" #: builtin/commit.c:442 msgid "cannot read the index" msgstr "æ— æ³•è¯»å–索引" #: builtin/commit.c:461 msgid "unable to write temporary index file" msgstr "æ— æ³•å†™ä¸´æ—¶ç´¢å¼•æ–‡ä»¶" #: builtin/commit.c:558 #, c-format msgid "commit '%s' lacks author header" msgstr "æ交 '%s' 缺少作者信æ¯" #: builtin/commit.c:560 #, c-format msgid "commit '%s' has malformed author line" msgstr "æ交 '%s' æœ‰æ ¼å¼é”™è¯¯çš„作者信æ¯" #: builtin/commit.c:579 msgid "malformed --author parameter" msgstr "æ ¼å¼é”™è¯¯çš„ --author å‚æ•°" #: builtin/commit.c:631 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" msgstr "æ— æ³•é€‰æ‹©ä¸€ä¸ªæœªè¢«å½“å‰æ交说明使用的注释å—符" #: builtin/commit.c:668 builtin/commit.c:701 builtin/commit.c:1029 #, c-format msgid "could not lookup commit %s" msgstr "ä¸èƒ½æŸ¥è¯¢æ交 %s" #: builtin/commit.c:680 builtin/shortlog.c:316 #, c-format msgid "(reading log message from standard input)\n" msgstr "(æ£ä»Žæ ‡å‡†è¾“å…¥ä¸è¯»å–日志信æ¯ï¼‰\n" #: builtin/commit.c:682 msgid "could not read log from standard input" msgstr "ä¸èƒ½ä»Žæ ‡å‡†è¾“å…¥ä¸è¯»å–日志信æ¯" #: builtin/commit.c:686 #, c-format msgid "could not read log file '%s'" msgstr "ä¸èƒ½è¯»å–日志文件 '%s'" #: builtin/commit.c:715 builtin/commit.c:723 msgid "could not read SQUASH_MSG" msgstr "ä¸èƒ½è¯»å– SQUASH_MSG" #: builtin/commit.c:720 msgid "could not read MERGE_MSG" msgstr "ä¸èƒ½è¯»å– MERGE_MSG" #: builtin/commit.c:774 msgid "could not write commit template" msgstr "ä¸èƒ½å†™æ交模版" #: builtin/commit.c:792 #, 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:797 #, 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:810 #, 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:818 #, 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:835 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%s作者: %.*s <%.*s>" # 译者:为ä¿è¯åœ¨è¾“出ä¸å¯¹é½ï¼Œæ³¨æ„调整å¥ä¸ç©ºæ ¼ï¼ #: builtin/commit.c:843 #, c-format msgid "%sDate: %s" msgstr "%s日期: %s" # 译者:为ä¿è¯åœ¨è¾“出ä¸å¯¹é½ï¼Œæ³¨æ„调整å¥ä¸ç©ºæ ¼ï¼ #: builtin/commit.c:850 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sæ交者:%.*s <%.*s>" #: builtin/commit.c:867 msgid "Cannot read index" msgstr "æ— æ³•è¯»å–索引" #: builtin/commit.c:933 msgid "Error building trees" msgstr "æ— æ³•åˆ›å»ºæ ‘å¯¹è±¡" #: builtin/commit.c:947 builtin/tag.c:257 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "请使用 -m 或 -F 选项æä¾›æ交说明。\n" #: builtin/commit.c:991 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "--author '%s' ä¸æ˜¯ '姓å <邮箱>' æ ¼å¼ï¼Œä¸”未能在现有作者ä¸æ‰¾åˆ°åŒ¹é…" #: builtin/commit.c:1005 #, c-format msgid "Invalid ignored mode '%s'" msgstr "æ— æ•ˆçš„å¿½ç•¥æ¨¡å¼ '%s'" #: builtin/commit.c:1019 builtin/commit.c:1269 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "æ— æ•ˆçš„æœªè¿½è¸ªæ–‡ä»¶å‚æ•° '%s'" #: builtin/commit.c:1057 msgid "--long and -z are incompatible" msgstr "--long å’Œ -z 选项ä¸å…¼å®¹" #: builtin/commit.c:1090 msgid "Using both --reset-author and --author does not make sense" msgstr "åŒæ—¶ä½¿ç”¨ --reset-author å’Œ --author 没有æ„义" #: builtin/commit.c:1099 msgid "You have nothing to amend." msgstr "您没有å¯ä¿®è¡¥çš„æ交。" #: builtin/commit.c:1102 msgid "You are in the middle of a merge -- cannot amend." msgstr "您æ£å¤„于一个åˆå¹¶è¿‡ç¨‹ä¸ -- æ— æ³•ä¿®è¡¥æ交。" #: builtin/commit.c:1104 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "您æ£å¤„äºŽä¸€ä¸ªæ‹£é€‰è¿‡ç¨‹ä¸ -- æ— æ³•ä¿®è¡¥æ交。" #: builtin/commit.c:1107 msgid "Options --squash and --fixup cannot be used together" msgstr "选项 --squash å’Œ --fixup ä¸èƒ½åŒæ—¶ä½¿ç”¨" #: builtin/commit.c:1117 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "åªèƒ½ç”¨ä¸€ä¸ª -c/-C/-F/--fixup 选项。" #: builtin/commit.c:1119 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "选项 -m ä¸èƒ½å’Œ -c/-C/-F åŒæ—¶ä½¿ç”¨ã€‚" #: builtin/commit.c:1127 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author åªèƒ½å’Œ -Cã€-c 或 --amend åŒæ—¶ä½¿ç”¨ã€‚" #: builtin/commit.c:1144 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "åªèƒ½ç”¨ä¸€ä¸ª --include/--only/--all/--interactive/--patch 选项。" #: builtin/commit.c:1146 msgid "No paths with --include/--only does not make sense." msgstr "å‚æ•° --include/--only ä¸è·Ÿè·¯å¾„没有æ„义。" #: builtin/commit.c:1160 builtin/tag.c:543 #, c-format msgid "Invalid cleanup mode %s" msgstr "æ— æ•ˆçš„æ¸…ç†æ¨¡å¼ %s" #: builtin/commit.c:1165 msgid "Paths with -a does not make sense." msgstr "路径和 -a 选项åŒæ—¶ä½¿ç”¨æ²¡æœ‰æ„义。" #: builtin/commit.c:1303 builtin/commit.c:1480 msgid "show status concisely" msgstr "以简æ´çš„æ ¼å¼æ˜¾ç¤ºçŠ¶æ€" #: builtin/commit.c:1305 builtin/commit.c:1482 msgid "show branch information" msgstr "显示分支信æ¯" #: builtin/commit.c:1307 msgid "show stash information" msgstr "显示贮è—区信æ¯" #: builtin/commit.c:1309 builtin/commit.c:1484 msgid "compute full ahead/behind values" msgstr "计算完整的领先/è½åŽå€¼" #: builtin/commit.c:1311 msgid "version" msgstr "版本" #: builtin/commit.c:1311 builtin/commit.c:1486 builtin/push.c:558 #: builtin/worktree.c:581 msgid "machine-readable output" msgstr "机器å¯è¯»çš„输出" #: builtin/commit.c:1314 builtin/commit.c:1488 msgid "show status in long format (default)" msgstr "ä»¥é•¿æ ¼å¼æ˜¾ç¤ºçŠ¶æ€ï¼ˆé»˜è®¤ï¼‰" #: builtin/commit.c:1317 builtin/commit.c:1491 msgid "terminate entries with NUL" msgstr "æ¡ç›®ä»¥ NUL å—符结尾" #: builtin/commit.c:1319 builtin/commit.c:1323 builtin/commit.c:1494 #: builtin/fast-export.c:1001 builtin/fast-export.c:1004 builtin/tag.c:397 msgid "mode" msgstr "模å¼" #: builtin/commit.c:1320 builtin/commit.c:1494 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "显示未跟踪的文件,“模å¼â€çš„å¯é€‰å‚数:allã€normalã€no。(默认:all)" #: builtin/commit.c:1324 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" msgstr "" "显示已忽略的文件,å¯é€‰æ¨¡å¼ï¼štraditionalã€matchingã€no。(默认:traditional)" #: builtin/commit.c:1326 parse-options.h:167 msgid "when" msgstr "何时" #: builtin/commit.c:1327 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" "忽略å模组的更改,“何时â€çš„å¯é€‰å‚数:allã€dirtyã€untracked。(默认:all)" #: builtin/commit.c:1329 msgid "list untracked files in columns" msgstr "以列的方å¼æ˜¾ç¤ºæœªè·Ÿè¸ªçš„文件" #: builtin/commit.c:1330 msgid "do not detect renames" msgstr "ä¸æ£€æµ‹é‡å‘½å" #: builtin/commit.c:1332 msgid "detect renames, optionally set similarity index" msgstr "检测é‡å‘½å,å¯ä»¥è®¾ç½®ç´¢å¼•ç›¸ä¼¼åº¦" #: builtin/commit.c:1352 msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "ä¸æ”¯æŒå·²å¿½ç•¥å’Œæœªè·Ÿè¸ªæ–‡ä»¶å‚数的组åˆ" #: builtin/commit.c:1450 msgid "suppress summary after successful commit" msgstr "æ交æˆåŠŸåŽä¸æ˜¾ç¤ºæ¦‚è¿°ä¿¡æ¯" #: builtin/commit.c:1451 msgid "show diff in commit message template" msgstr "在æ交说明模æ¿é‡Œæ˜¾ç¤ºå·®å¼‚" #: builtin/commit.c:1453 msgid "Commit message options" msgstr "æ交说明选项" #: builtin/commit.c:1454 builtin/tag.c:394 msgid "read message from file" msgstr "从文件ä¸è¯»å–æ交说明" #: builtin/commit.c:1455 msgid "author" msgstr "作者" #: builtin/commit.c:1455 msgid "override author for commit" msgstr "æ交时覆盖作者" #: builtin/commit.c:1456 builtin/gc.c:501 msgid "date" msgstr "日期" #: builtin/commit.c:1456 msgid "override date for commit" msgstr "æ交时覆盖日期" #: builtin/commit.c:1457 builtin/merge.c:228 builtin/notes.c:402 #: builtin/notes.c:565 builtin/tag.c:392 msgid "message" msgstr "说明" #: builtin/commit.c:1457 msgid "commit message" msgstr "æ交说明" #: builtin/commit.c:1458 builtin/commit.c:1459 builtin/commit.c:1460 #: builtin/commit.c:1461 parse-options.h:270 ref-filter.h:92 msgid "commit" msgstr "æ交" #: builtin/commit.c:1458 msgid "reuse and edit message from specified commit" msgstr "é‡ç”¨å¹¶ç¼–辑指定æ交的æ交说明" #: builtin/commit.c:1459 msgid "reuse message from specified commit" msgstr "é‡ç”¨æŒ‡å®šæ交的æ交说明" #: builtin/commit.c:1460 msgid "use autosquash formatted message to fixup specified commit" msgstr "使用 autosquash æ ¼å¼çš„æ交说明用以修æ£æŒ‡å®šçš„æ交" #: builtin/commit.c:1461 msgid "use autosquash formatted message to squash specified commit" msgstr "使用 autosquash æ ¼å¼çš„æ交说明用以压缩至指定的æ交" #: builtin/commit.c:1462 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "现在将该æ交的作者改为我(和 -C/-c/--amend å‚数共用)" #: builtin/commit.c:1463 builtin/log.c:1446 builtin/merge.c:242 #: builtin/pull.c:154 builtin/revert.c:105 msgid "add Signed-off-by:" msgstr "æ·»åŠ Signed-off-by: ç¾å" #: builtin/commit.c:1464 msgid "use specified template file" msgstr "使用指定的模æ¿æ–‡ä»¶" #: builtin/commit.c:1465 msgid "force edit of commit" msgstr "强制编辑æ交" # 译者:å¯é€‰å€¼ï¼Œä¸èƒ½ç¿»è¯‘(或是原文ä¸ç¬”误,应为 mode) #: builtin/commit.c:1466 msgid "default" msgstr "default" #: builtin/commit.c:1466 builtin/tag.c:398 msgid "how to strip spaces and #comments from message" msgstr "è®¾ç½®å¦‚ä½•åˆ é™¤æäº¤è¯´æ˜Žé‡Œçš„ç©ºæ ¼å’Œ#注释" #: builtin/commit.c:1467 msgid "include status in commit message template" msgstr "在æ交说明模æ¿é‡ŒåŒ…å«çŠ¶æ€ä¿¡æ¯" #: builtin/commit.c:1469 builtin/merge.c:240 builtin/pull.c:184 #: builtin/revert.c:113 msgid "GPG sign commit" msgstr "GPG æ交ç¾å" #: builtin/commit.c:1472 msgid "Commit contents options" msgstr "æ交内容选项" #: builtin/commit.c:1473 msgid "commit all changed files" msgstr "æ交所有改动的文件" #: builtin/commit.c:1474 msgid "add specified files to index for commit" msgstr "æ·»åŠ æŒ‡å®šçš„æ–‡ä»¶åˆ°ç´¢å¼•åŒºç‰å¾…æ交" #: builtin/commit.c:1475 msgid "interactively add files" msgstr "交互å¼æ·»åŠ 文件" #: builtin/commit.c:1476 msgid "interactively add changes" msgstr "交互å¼æ·»åŠ å˜æ›´" #: builtin/commit.c:1477 msgid "commit only specified files" msgstr "åªæ交指定的文件" #: builtin/commit.c:1478 msgid "bypass pre-commit and commit-msg hooks" msgstr "绕过 pre-commit å’Œ commit-msg é’©å" #: builtin/commit.c:1479 msgid "show what would be committed" msgstr "显示将è¦æ交的内容" #: builtin/commit.c:1492 msgid "amend previous commit" msgstr "修改先å‰çš„æ交" #: builtin/commit.c:1493 msgid "bypass post-rewrite hook" msgstr "绕过 post-rewrite é’©å" #: builtin/commit.c:1498 msgid "ok to record an empty change" msgstr "å…许一个空æ交" #: builtin/commit.c:1500 msgid "ok to record a change with an empty message" msgstr "å…许空的æ交说明" #: builtin/commit.c:1573 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "æŸåçš„ MERGE_HEAD 文件(%s)" #: builtin/commit.c:1580 msgid "could not read MERGE_MODE" msgstr "ä¸èƒ½è¯»å– MERGE_MODE" #: builtin/commit.c:1599 #, c-format msgid "could not read commit message: %s" msgstr "ä¸èƒ½è¯»å–æ交说明:%s" #: builtin/commit.c:1610 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "终æ¢æäº¤å› ä¸ºæ交说明为空。\n" #: builtin/commit.c:1615 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "终æ¢æ交;您未更改æ¥è‡ªæ¨¡ç‰ˆçš„æ交说明。\n" #: builtin/commit.c:1650 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" "not exceeded, and then \"git reset HEAD\" to recover." msgstr "" "ä»“åº“å·²æ›´æ–°ï¼Œä½†æ— æ³•å†™ new_index 文件。检查是å¦ç£ç›˜å·²æ»¡\n" "或ç£ç›˜é…é¢å·²è€—尽,然åŽæ‰§è¡Œ \"git reset HEAD\" æ¢å¤ã€‚" #: builtin/commit-graph.c:9 msgid "git commit-graph [--object-dir <objdir>]" msgstr "git commit-graph [--object-dir <对象目录>]" #: builtin/commit-graph.c:10 builtin/commit-graph.c:16 msgid "git commit-graph read [--object-dir <objdir>]" msgstr "git commit-graph read [--object-dir <对象目录>]" #: builtin/commit-graph.c:11 builtin/commit-graph.c:21 msgid "" "git commit-graph write [--object-dir <objdir>] [--append] [--stdin-packs|--" "stdin-commits]" msgstr "" "git commit-graph write [--object-dir <对象目录>] [--append] [--stdin-packs|--" "stdin-commits]" #: builtin/commit-graph.c:39 builtin/commit-graph.c:92 #: builtin/commit-graph.c:147 builtin/fetch.c:161 builtin/log.c:1466 msgid "dir" msgstr "目录" #: builtin/commit-graph.c:40 builtin/commit-graph.c:93 #: builtin/commit-graph.c:148 msgid "The object directory to store the graph" msgstr "ä¿å˜å›¾å½¢çš„对象目录" #: builtin/commit-graph.c:95 msgid "scan pack-indexes listed by stdin for commits" msgstr "ä»Žæ ‡å‡†è¾“å…¥ä¸çš„包索引文件列表ä¸æ‰«ææ交" #: builtin/commit-graph.c:97 msgid "start walk at commits listed by stdin" msgstr "ä»Žæ ‡å‡†è¾“å…¥ä¸çš„æ交开始扫æ" #: builtin/commit-graph.c:99 msgid "include all commits already in the commit-graph file" msgstr "åŒ…å« commit-graph 文件ä¸å·²æœ‰æ‰€æœ‰æ交" #: builtin/commit-graph.c:108 msgid "cannot use both --stdin-commits and --stdin-packs" msgstr "ä¸èƒ½åŒæ—¶ä½¿ç”¨ --stdin-commits å’Œ --stdin-packs 选项" #: builtin/config.c:10 msgid "git config [<options>]" msgstr "git config [<选项>]" #: builtin/config.c:101 #, c-format msgid "unrecognized --type argument, %s" msgstr "未能识别的 --type å‚数,%s" #: builtin/config.c:123 msgid "Config file location" msgstr "é…置文件ä½ç½®" #: builtin/config.c:124 msgid "use global config file" msgstr "使用全局é…置文件" #: builtin/config.c:125 msgid "use system config file" msgstr "使用系统级é…置文件" #: builtin/config.c:126 msgid "use repository config file" msgstr "使用仓库级é…置文件" #: builtin/config.c:127 msgid "use given config file" msgstr "使用指定的é…置文件" #: builtin/config.c:128 msgid "blob-id" msgstr "æ•°æ®å¯¹è±¡ ID" #: builtin/config.c:128 msgid "read config from given blob object" msgstr "从给定的数æ®å¯¹è±¡è¯»å–é…ç½®" #: builtin/config.c:129 msgid "Action" msgstr "æ“作" #: builtin/config.c:130 msgid "get value: name [value-regex]" msgstr "获å–值:name [value-regex]" #: builtin/config.c:131 msgid "get all values: key [value-regex]" msgstr "获得所有的值:key [value-regex]" #: builtin/config.c:132 msgid "get values for regexp: name-regex [value-regex]" msgstr "æ ¹æ®æ£åˆ™è¡¨è¾¾å¼èŽ·å¾—值:name-regex [value-regex]" #: builtin/config.c:133 msgid "get value specific for the URL: section[.var] URL" msgstr "获得 URL å–值:section[.var] URL" #: builtin/config.c:134 msgid "replace all matching variables: name value [value_regex]" msgstr "替æ¢æ‰€æœ‰åŒ¹é…çš„å˜é‡ï¼šname value [value_regex]" #: builtin/config.c:135 msgid "add a new variable: name value" msgstr "æ·»åŠ ä¸€ä¸ªæ–°çš„å˜é‡ï¼šname value" #: builtin/config.c:136 msgid "remove a variable: name [value-regex]" msgstr "åˆ é™¤ä¸€ä¸ªå˜é‡ï¼šname [value-regex]" #: builtin/config.c:137 msgid "remove all matches: name [value-regex]" msgstr "åˆ é™¤æ‰€æœ‰åŒ¹é…项:name [value-regex]" #: builtin/config.c:138 msgid "rename section: old-name new-name" msgstr "é‡å‘½åå°èŠ‚:old-name new-name" #: builtin/config.c:139 msgid "remove a section: name" msgstr "åˆ é™¤ä¸€ä¸ªå°èŠ‚:name" #: builtin/config.c:140 msgid "list all" msgstr "列出所有" #: builtin/config.c:141 msgid "open an editor" msgstr "打开一个编辑器" #: builtin/config.c:142 msgid "find the color configured: slot [default]" msgstr "获得é…置的颜色:é…ç½® [默认]" #: builtin/config.c:143 msgid "find the color setting: slot [stdout-is-tty]" msgstr "获得颜色设置:é…ç½® [stdout-is-tty]" #: builtin/config.c:144 msgid "Type" msgstr "类型" #: builtin/config.c:145 msgid "value is given this type" msgstr "å–值为该类型" #: builtin/config.c:146 msgid "value is \"true\" or \"false\"" msgstr "值是 \"true\" 或 \"false\"" #: builtin/config.c:147 msgid "value is decimal number" msgstr "值是å进制数" #: builtin/config.c:148 msgid "value is --bool or --int" msgstr "值是 --bool or --int" #: builtin/config.c:149 msgid "value is a path (file or directory name)" msgstr "值是一个路径(文件或目录å)" #: builtin/config.c:150 msgid "value is an expiry date" msgstr "值是一个到期日期" #: builtin/config.c:151 msgid "Other" msgstr "其它" #: builtin/config.c:152 msgid "terminate values with NUL byte" msgstr "终æ¢å€¼æ˜¯ NUL å—节" #: builtin/config.c:153 msgid "show variable names only" msgstr "åªæ˜¾ç¤ºå˜é‡å" #: builtin/config.c:154 msgid "respect include directives on lookup" msgstr "查询时å‚ç…§ include 指令递归查找" #: builtin/config.c:155 msgid "show origin of config (file, standard input, blob, command line)" msgstr "显示é…置的æ¥æºï¼ˆæ–‡ä»¶ã€æ ‡å‡†è¾“å…¥ã€æ•°æ®å¯¹è±¡ï¼Œæˆ–命令行)" #: builtin/config.c:156 msgid "value" msgstr "å–值" #: builtin/config.c:156 msgid "with --get, use default value when missing entry" msgstr "使用 --get å‚数,当缺少设置时使用默认值" #: builtin/config.c:332 #, c-format msgid "failed to format default config value: %s" msgstr "æ— æ³•æ ¼å¼åŒ–默认é…ç½®å–值:%s" #: builtin/config.c:431 msgid "unable to parse default color value" msgstr "ä¸èƒ½è§£æžé»˜è®¤é¢œè‰²å€¼" #: builtin/config.c:575 #, c-format msgid "" "# This is Git's per-user configuration file.\n" "[user]\n" "# Please adapt and uncomment the following lines:\n" "#\tname = %s\n" "#\temail = %s\n" msgstr "" "# This is Git's per-user configuration file.\n" "[user]\n" "# Please adapt and uncomment the following lines:\n" "#\tname = %s\n" "#\temail = %s\n" #: builtin/config.c:603 msgid "--local can only be used inside a git repository" msgstr "--local åªèƒ½åœ¨ä¸€ä¸ªä»“库内使用" #: builtin/config.c:606 msgid "--blob can only be used inside a git repository" msgstr "--blob åªèƒ½åœ¨ä¸€ä¸ªä»“库内使用" #: builtin/config.c:735 #, c-format msgid "cannot create configuration file %s" msgstr "ä¸èƒ½åˆ›å»ºé…置文件 %s" #: builtin/config.c:748 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" " Use a regexp, --add or --replace-all to change %s." msgstr "" "æ— æ³•ç”¨ä¸€ä¸ªå€¼è¦†ç›–å¤šä¸ªå€¼\n" " 使用一个æ£åˆ™è¡¨è¾¾å¼ã€--add 或 --replace-all æ¥ä¿®æ”¹ %s。" #: builtin/count-objects.c:90 msgid "git count-objects [-v] [-H | --human-readable]" msgstr "git count-objects [-v] [-H | --human-readable]" #: builtin/count-objects.c:100 msgid "print sizes in human readable format" msgstr "以用户å¯è¯»çš„æ ¼å¼æ˜¾ç¤ºå¤§å°" #: builtin/describe.c:22 msgid "git describe [<options>] [<commit-ish>...]" msgstr "git describe [<选项>] [<æ交å·>...]" #: builtin/describe.c:23 msgid "git describe [<options>] --dirty" msgstr "git describe [<选项>] --dirty" #: builtin/describe.c:57 msgid "head" msgstr "头" #: builtin/describe.c:57 msgid "lightweight" msgstr "è½»é‡çº§çš„" #: builtin/describe.c:57 msgid "annotated" msgstr "附注的" #: builtin/describe.c:267 #, c-format msgid "annotated tag %s not available" msgstr "é™„æ³¨æ ‡ç¾ %s æ— æ•ˆ" #: builtin/describe.c:271 #, c-format msgid "annotated tag %s has no embedded name" msgstr "é™„æ³¨æ ‡ç¾ %s 没有嵌入å称" #: builtin/describe.c:273 #, c-format msgid "tag '%s' is really '%s' here" msgstr "æ ‡ç¾ '%s' 的确是在 '%s'" #: builtin/describe.c:317 #, c-format msgid "no tag exactly matches '%s'" msgstr "æ²¡æœ‰æ ‡ç¾å‡†ç¡®åŒ¹é… '%s'" #: builtin/describe.c:319 #, c-format msgid "No exact match on refs or tags, searching to describe\n" msgstr "没有精确匹é…åˆ°å¼•ç”¨æˆ–æ ‡ç¾ï¼Œç»§ç»æœç´¢è¿›è¡Œæè¿°\n" #: builtin/describe.c:366 #, c-format msgid "finished search at %s\n" msgstr "完æˆæœç´¢ %s\n" #: builtin/describe.c:392 #, c-format msgid "" "No annotated tags can describe '%s'.\n" "However, there were unannotated tags: try --tags." msgstr "" "æ²¡æœ‰é™„æ³¨æ ‡ç¾èƒ½æè¿° '%s'。\n" "然而,å˜åœ¨æœªé™„æ³¨æ ‡ç¾ï¼šå°è¯• --tags。" #: builtin/describe.c:396 #, c-format msgid "" "No tags can describe '%s'.\n" "Try --always, or create some tags." msgstr "" "æ²¡æœ‰æ ‡ç¾èƒ½æè¿° '%s'。\n" "å°è¯• --alwaysï¼Œæˆ–è€…åˆ›å»ºä¸€äº›æ ‡ç¾ã€‚" #: builtin/describe.c:426 #, c-format msgid "traversed %lu commits\n" msgstr "å·²é历 %lu 个æ交\n" #: builtin/describe.c:429 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" "gave up search at %s\n" msgstr "" "å‘现多于 %i ä¸ªæ ‡ç¾ï¼Œåˆ—出最近的 %i 个\n" "在 %s 放弃æœç´¢\n" #: builtin/describe.c:497 #, c-format msgid "describe %s\n" msgstr "æè¿° %s\n" #: builtin/describe.c:500 builtin/log.c:502 #, c-format msgid "Not a valid object name %s" msgstr "ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„对象å %s" #: builtin/describe.c:508 #, c-format msgid "%s is neither a commit nor blob" msgstr "%s æ—¢ä¸æ˜¯æ交也ä¸æ˜¯æ•°æ®å¯¹è±¡" #: builtin/describe.c:522 msgid "find the tag that comes after the commit" msgstr "寻找该æ交之åŽçš„æ ‡ç¾" #: builtin/describe.c:523 msgid "debug search strategy on stderr" msgstr "åœ¨æ ‡å‡†é”™è¯¯ä¸Šè°ƒè¯•æœç´¢ç–ç•¥" #: builtin/describe.c:524 msgid "use any ref" msgstr "使用任æ„引用" #: builtin/describe.c:525 msgid "use any tag, even unannotated" msgstr "使用任æ„æ ‡ç¾ï¼Œå³ä½¿æœªé™„带注释" #: builtin/describe.c:526 msgid "always use long format" msgstr "始终使用长æ交å·æ ¼å¼" #: builtin/describe.c:527 msgid "only follow first parent" msgstr "åªè·Ÿéšç¬¬ä¸€ä¸ªçˆ¶æ交" #: builtin/describe.c:530 msgid "only output exact matches" msgstr "åªè¾“出精确匹é…" #: builtin/describe.c:532 msgid "consider <n> most recent tags (default: 10)" msgstr "考虑最近 <n> ä¸ªæ ‡ç¾ï¼ˆé»˜è®¤ï¼š10)" #: builtin/describe.c:534 msgid "only consider tags matching <pattern>" msgstr "åªè€ƒè™‘åŒ¹é… <模å¼> çš„æ ‡ç¾" #: builtin/describe.c:536 msgid "do not consider tags matching <pattern>" msgstr "ä¸è€ƒè™‘åŒ¹é… <模å¼> çš„æ ‡ç¾" #: builtin/describe.c:538 builtin/name-rev.c:406 msgid "show abbreviated commit object as fallback" msgstr "显示简写的æ交å·ä½œä¸ºåŽå¤‡" #: builtin/describe.c:539 builtin/describe.c:542 msgid "mark" msgstr "æ ‡è®°" #: builtin/describe.c:540 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "对于è„å·¥ä½œåŒºï¼Œè¿½åŠ <æ ‡è®°>(默认:\"-dirty\")" #: builtin/describe.c:543 msgid "append <mark> on broken working tree (default: \"-broken\")" msgstr "对于æŸåçš„å·¥ä½œåŒºï¼Œè¿½åŠ <æ ‡è®°>(默认:\"-broken\")" #: builtin/describe.c:561 msgid "--long is incompatible with --abbrev=0" msgstr "--long 与 --abbrev=0 ä¸å…¼å®¹" #: builtin/describe.c:590 msgid "No names found, cannot describe anything." msgstr "没有å‘现åç§°ï¼Œæ— æ³•æ述任何东西。" #: builtin/describe.c:640 msgid "--dirty is incompatible with commit-ishes" msgstr "--dirty 与æ交å·ä¸å…¼å®¹" #: builtin/describe.c:642 msgid "--broken is incompatible with commit-ishes" msgstr "--broken 与æ交å·ä¸å…¼å®¹" #: builtin/diff.c:83 #, c-format msgid "'%s': not a regular file or symlink" msgstr "'%s':ä¸æ˜¯ä¸€ä¸ªæ£è§„文件或符å·é“¾æŽ¥" #: builtin/diff.c:234 #, c-format msgid "invalid option: %s" msgstr "æ— æ•ˆé€‰é¡¹ï¼š%s" #: builtin/diff.c:356 msgid "Not a git repository" msgstr "ä¸æ˜¯ä¸€ä¸ª git 仓库" #: builtin/diff.c:399 #, c-format msgid "invalid object '%s' given." msgstr "æä¾›äº†æ— æ•ˆå¯¹è±¡ '%s'。" #: builtin/diff.c:408 #, c-format msgid "more than two blobs given: '%s'" msgstr "æ供了超过两个数æ®å¯¹è±¡ï¼š'%s'" #: builtin/diff.c:413 #, c-format msgid "unhandled object '%s' given." msgstr "æ— æ³•å¤„ç†çš„对象 '%s'。" #: builtin/difftool.c:29 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" msgstr "git difftool [<选项>] [<æ交> [<æ交>]] [--] [<路径>...]" #: builtin/difftool.c:259 #, c-format msgid "failed: %d" msgstr "失败:%d" #: builtin/difftool.c:301 #, c-format msgid "could not read symlink %s" msgstr "æ— æ³•è¯»å–符å·é“¾æŽ¥ %s" #: builtin/difftool.c:303 #, c-format msgid "could not read symlink file %s" msgstr "æ— æ³•è¯»å–符å·é“¾æŽ¥æ–‡ä»¶ %s" #: builtin/difftool.c:311 #, c-format msgid "could not read object %s for symlink %s" msgstr "æ— æ³•è¯»å–符å·é“¾æŽ¥ %2$s 指å‘的对象 %1$s" #: builtin/difftool.c:412 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." msgstr "" "ä¸æ”¯æŒåœ¨ç›®å½•æ¯”较模å¼ï¼ˆ'-d' å’Œ '--dir-diff')ä¸é‡‡ç”¨ç»„åˆå·®å¼‚æ ¼å¼ï¼ˆ'-c' å’Œ '--" "cc')。" #: builtin/difftool.c:632 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "两个文件都被修改:'%s' å’Œ '%s'。" #: builtin/difftool.c:634 msgid "working tree file has been left." msgstr "工作区文件被留了下æ¥ã€‚" #: builtin/difftool.c:645 #, c-format msgid "temporary files exist in '%s'." msgstr "临时文件å˜åœ¨äºŽ '%s'。" #: builtin/difftool.c:646 msgid "you may want to cleanup or recover these." msgstr "您å¯èƒ½æƒ³è¦æ¸…ç†æˆ–者æ¢å¤å®ƒä»¬ã€‚" #: builtin/difftool.c:695 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "使用 `diff.guitool` 代替 `diff.tool`" #: builtin/difftool.c:697 msgid "perform a full-directory diff" msgstr "执行一个全目录差异比较" #: builtin/difftool.c:699 msgid "do not prompt before launching a diff tool" msgstr "å¯åŠ¨å·®å¼‚比较工具之å‰ä¸æ示" #: builtin/difftool.c:704 msgid "use symlinks in dir-diff mode" msgstr "在 dir-diff 模å¼ä¸ä½¿ç”¨ç¬¦å·é“¾æŽ¥" #: builtin/difftool.c:705 msgid "<tool>" msgstr "<工具>" #: builtin/difftool.c:706 msgid "use the specified diff tool" msgstr "使用指定的差异比较工具" #: builtin/difftool.c:708 msgid "print a list of diff tools that may be used with `--tool`" msgstr "显示å¯ä»¥ç”¨åœ¨ `--tool` å‚æ•°åŽçš„差异工具列表" #: builtin/difftool.c:711 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" msgstr "当执行 diff 工具返回éžé›¶é€€å‡ºç 时,使 'git-difftool' 退出" #: builtin/difftool.c:713 msgid "<command>" msgstr "<命令>" #: builtin/difftool.c:714 msgid "specify a custom command for viewing diffs" msgstr "指定一个用于查看差异的自定义命令" #: builtin/difftool.c:738 msgid "no <tool> given for --tool=<tool>" msgstr "没有为 --tool=<工具> å‚æ•°æä¾› <工具>" #: builtin/difftool.c:745 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "没有为 --extcmd=<命令> å‚æ•°æä¾› <命令>" #: builtin/fast-export.c:27 msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [rev-list-opts]" #: builtin/fast-export.c:1000 msgid "show progress after <n> objects" msgstr "在 <n> 个对象之åŽæ˜¾ç¤ºè¿›åº¦" #: builtin/fast-export.c:1002 msgid "select handling of signed tags" msgstr "选择如何处ç†ç¾åæ ‡ç¾" #: builtin/fast-export.c:1005 msgid "select handling of tags that tag filtered objects" msgstr "é€‰æ‹©å½“æ ‡ç¾æŒ‡å‘è¢«è¿‡æ»¤å¯¹è±¡æ—¶è¯¥æ ‡ç¾çš„处ç†æ–¹å¼" #: builtin/fast-export.c:1008 msgid "Dump marks to this file" msgstr "æŠŠæ ‡è®°å˜å‚¨åˆ°è¿™ä¸ªæ–‡ä»¶" #: builtin/fast-export.c:1010 msgid "Import marks from this file" msgstr "ä»Žè¿™ä¸ªæ–‡ä»¶å¯¼å…¥æ ‡è®°" #: builtin/fast-export.c:1012 msgid "Fake a tagger when tags lack one" msgstr "å½“æ ‡ç¾ç¼ºå°‘æ ‡è®°è€…å—段时,å‡è£…æ供一个" #: builtin/fast-export.c:1014 msgid "Output full tree for each commit" msgstr "æ¯æ¬¡æäº¤éƒ½è¾“å‡ºæ•´ä¸ªæ ‘" #: builtin/fast-export.c:1016 msgid "Use the done feature to terminate the stream" msgstr "使用 done 功能æ¥ç»ˆæ¢æµ" #: builtin/fast-export.c:1017 msgid "Skip output of blob data" msgstr "跳过数æ®å¯¹è±¡çš„输出" #: builtin/fast-export.c:1018 msgid "refspec" msgstr "å¼•ç”¨è§„æ ¼" #: builtin/fast-export.c:1019 msgid "Apply refspec to exported refs" msgstr "å¯¹å¯¼å‡ºçš„å¼•ç”¨åº”ç”¨å¼•ç”¨è§„æ ¼" #: builtin/fast-export.c:1020 msgid "anonymize output" msgstr "匿å输出" #: builtin/fetch.c:26 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<选项>] [<仓库> [<å¼•ç”¨è§„æ ¼>...]]" #: builtin/fetch.c:27 msgid "git fetch [<options>] <group>" msgstr "git fetch [<选项>] <组>" #: builtin/fetch.c:28 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]" #: builtin/fetch.c:29 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<选项>]" #: builtin/fetch.c:123 builtin/pull.c:193 msgid "fetch from all remotes" msgstr "从所有的远程抓å–" #: builtin/fetch.c:125 builtin/pull.c:196 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "è¿½åŠ åˆ° .git/FETCH_HEAD 而ä¸æ˜¯è¦†ç›–它" #: builtin/fetch.c:127 builtin/pull.c:199 msgid "path to upload pack on remote end" msgstr "ä¸Šä¼ åŒ…åˆ°è¿œç¨‹çš„è·¯å¾„" #: builtin/fetch.c:128 builtin/pull.c:201 msgid "force overwrite of local branch" msgstr "强制覆盖本地分支" #: builtin/fetch.c:130 msgid "fetch from multiple remotes" msgstr "从多个远程抓å–" #: builtin/fetch.c:132 builtin/pull.c:203 msgid "fetch all tags and associated objects" msgstr "抓å–æ‰€æœ‰çš„æ ‡ç¾å’Œå…³è”对象" #: builtin/fetch.c:134 msgid "do not fetch all tags (--no-tags)" msgstr "ä¸æŠ“å–ä»»ä½•æ ‡ç¾(--no-tags)" #: builtin/fetch.c:136 msgid "number of submodules fetched in parallel" msgstr "å模组获å–的并å‘æ•°" #: builtin/fetch.c:138 builtin/pull.c:206 msgid "prune remote-tracking branches no longer on remote" msgstr "清除远程已ç»ä¸å˜åœ¨çš„分支的跟踪分支" #: builtin/fetch.c:140 msgid "prune local tags no longer on remote and clobber changed tags" msgstr "清除远程ä¸å˜åœ¨çš„æœ¬åœ°æ ‡ç¾ï¼Œå¹¶ä¸”替æ¢å˜æ›´æ ‡ç¾" # 译者:å¯é€‰å€¼ï¼Œä¸èƒ½ç¿»è¯‘ #: builtin/fetch.c:141 builtin/fetch.c:164 builtin/pull.c:131 msgid "on-demand" msgstr "on-demand" #: builtin/fetch.c:142 msgid "control recursive fetching of submodules" msgstr "控制å模组的递归抓å–" #: builtin/fetch.c:146 builtin/pull.c:214 msgid "keep downloaded pack" msgstr "ä¿æŒä¸‹è½½åŒ…" #: builtin/fetch.c:148 msgid "allow updating of HEAD ref" msgstr "å…许更新 HEAD 引用" #: builtin/fetch.c:151 builtin/fetch.c:157 builtin/pull.c:217 msgid "deepen history of shallow clone" msgstr "深化浅克隆的历å²" #: builtin/fetch.c:153 msgid "deepen history of shallow repository based on time" msgstr "基于时间æ¥æ·±åŒ–浅克隆的历å²" #: builtin/fetch.c:159 builtin/pull.c:220 msgid "convert to a complete repository" msgstr "转æ¢ä¸ºä¸€ä¸ªå®Œæ•´çš„仓库" #: builtin/fetch.c:162 msgid "prepend this to submodule path output" msgstr "在å模组路径输出的å‰é¢åŠ 上æ¤ç›®å½•" #: builtin/fetch.c:165 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" msgstr "递归获å–å模组的缺çœå€¼ï¼ˆæ¯”é…置文件优先级低)" #: builtin/fetch.c:169 builtin/pull.c:223 msgid "accept refs that update .git/shallow" msgstr "接å—æ›´æ–° .git/shallow 的引用" #: builtin/fetch.c:170 builtin/pull.c:225 msgid "refmap" msgstr "å¼•ç”¨æ˜ å°„" #: builtin/fetch.c:171 builtin/pull.c:226 msgid "specify fetch refmap" msgstr "指定获å–æ“ä½œçš„å¼•ç”¨æ˜ å°„" #: builtin/fetch.c:172 builtin/ls-remote.c:77 builtin/push.c:582 #: builtin/send-pack.c:172 msgid "server-specific" msgstr "server-specific" #: builtin/fetch.c:172 builtin/ls-remote.c:77 builtin/push.c:582 #: builtin/send-pack.c:173 msgid "option to transmit" msgstr "ä¼ è¾“é€‰é¡¹" #: builtin/fetch.c:442 msgid "Couldn't find remote ref HEAD" msgstr "æ— æ³•å‘现远程 HEAD 引用" #: builtin/fetch.c:560 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "é…ç½®å˜é‡ fetch.output 包å«æ— 效值 %s" #: builtin/fetch.c:653 #, c-format msgid "object %s not found" msgstr "对象 %s 未å‘现" #: builtin/fetch.c:657 msgid "[up to date]" msgstr "[最新]" #: builtin/fetch.c:670 builtin/fetch.c:750 msgid "[rejected]" msgstr "[已拒ç»]" #: builtin/fetch.c:671 msgid "can't fetch in current branch" msgstr "当å‰åˆ†æ”¯ä¸‹ä¸èƒ½æ‰§è¡ŒèŽ·å–æ“作" #: builtin/fetch.c:680 msgid "[tag update]" msgstr "[æ ‡ç¾æ›´æ–°]" #: builtin/fetch.c:681 builtin/fetch.c:714 builtin/fetch.c:730 #: builtin/fetch.c:745 msgid "unable to update local ref" msgstr "ä¸èƒ½æ›´æ–°æœ¬åœ°å¼•ç”¨" #: builtin/fetch.c:700 msgid "[new tag]" msgstr "[æ–°æ ‡ç¾]" #: builtin/fetch.c:703 msgid "[new branch]" msgstr "[新分支]" #: builtin/fetch.c:706 msgid "[new ref]" msgstr "[新引用]" #: builtin/fetch.c:745 msgid "forced update" msgstr "强制更新" #: builtin/fetch.c:750 msgid "non-fast-forward" msgstr "éžå¿«è¿›" #: builtin/fetch.c:795 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s 未å‘é€æ‰€æœ‰å¿…须的对象\n" #: builtin/fetch.c:815 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "æ‹’ç» %s å› ä¸ºæµ…å…‹éš†ä¸å…许被更新" #: builtin/fetch.c:903 builtin/fetch.c:999 #, c-format msgid "From %.*s\n" msgstr "æ¥è‡ª %.*s\n" #: builtin/fetch.c:914 #, 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:969 #, c-format msgid " (%s will become dangling)" msgstr " (%s å°†æˆä¸ºæ‘‡æ‘†çŠ¶æ€ï¼‰" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: builtin/fetch.c:970 #, c-format msgid " (%s has become dangling)" msgstr " (%s å·²æˆä¸ºæ‘‡æ‘†çŠ¶æ€ï¼‰" #: builtin/fetch.c:1002 msgid "[deleted]" msgstr "[å·²åˆ é™¤]" #: builtin/fetch.c:1003 builtin/remote.c:1033 msgid "(none)" msgstr "ï¼ˆæ— ï¼‰" #: builtin/fetch.c:1026 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "æ‹’ç»èŽ·å–到éžçº¯ä»“库的当å‰åˆ†æ”¯ %s" #: builtin/fetch.c:1045 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s æ˜¯æ— æ•ˆçš„" #: builtin/fetch.c:1048 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "选项 \"%s\" 为 %s 所忽略\n" #: builtin/fetch.c:1287 #, c-format msgid "Fetching %s\n" msgstr "æ£åœ¨èŽ·å– %s\n" #: builtin/fetch.c:1289 builtin/remote.c:98 #, c-format msgid "Could not fetch %s" msgstr "ä¸èƒ½èŽ·å– %s" #: builtin/fetch.c:1335 builtin/fetch.c:1503 msgid "" "--filter can only be used with the remote configured in core.partialClone" msgstr "åªå¯ä»¥å°† --filter 用于在 core.partialClone ä¸é…置的远程仓库" #: builtin/fetch.c:1358 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:1395 msgid "You need to specify a tag name." msgstr "您需è¦æŒ‡å®šä¸€ä¸ªæ ‡ç¾å称。" #: builtin/fetch.c:1444 msgid "Negative depth in --deepen is not supported" msgstr "--deepen ä¸æ”¯æŒè´Ÿæ•°æ·±åº¦" #: builtin/fetch.c:1446 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen å’Œ --depth 是互斥的" #: builtin/fetch.c:1451 msgid "--depth and --unshallow cannot be used together" msgstr "--depth å’Œ --unshallow ä¸èƒ½åŒæ—¶ä½¿ç”¨" #: builtin/fetch.c:1453 msgid "--unshallow on a complete repository does not make sense" msgstr "对于一个完整的仓库,å‚æ•° --unshallow 没有æ„义" #: builtin/fetch.c:1469 msgid "fetch --all does not take a repository argument" msgstr "fetch --all ä¸èƒ½å¸¦ä¸€ä¸ªä»“库å‚æ•°" #: builtin/fetch.c:1471 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all å¸¦å¼•ç”¨è§„æ ¼æ²¡æœ‰ä»»ä½•æ„义" #: builtin/fetch.c:1480 #, c-format msgid "No such remote or remote group: %s" msgstr "æ²¡æœ‰è¿™æ ·çš„è¿œç¨‹æˆ–è¿œç¨‹ç»„ï¼š%s" #: builtin/fetch.c:1487 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "获å–ç»„å¹¶æŒ‡å®šå¼•ç”¨è§„æ ¼æ²¡æœ‰æ„义" #: builtin/fmt-merge-msg.c:15 msgid "" "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]" msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]" #: builtin/fmt-merge-msg.c:666 msgid "populate log with at most <n> entries from shortlog" msgstr "å‘æ交说明ä¸æœ€å¤šå¤åˆ¶æŒ‡å®šæ¡ç›®ï¼ˆåˆå¹¶è€Œæ¥çš„æ交)的简çŸè¯´æ˜Ž" #: builtin/fmt-merge-msg.c:669 msgid "alias for --log (deprecated)" msgstr "å‚æ•° --log 的别å(已弃用)" #: builtin/fmt-merge-msg.c:672 msgid "text" msgstr "文本" #: builtin/fmt-merge-msg.c:673 msgid "use <text> as start of message" msgstr "使用 <文本> 作为æ交说明的开始" #: builtin/fmt-merge-msg.c:674 msgid "file to read from" msgstr "从文件ä¸è¯»å–" #: builtin/for-each-ref.c:10 msgid "git for-each-ref [<options>] [<pattern>]" msgstr "git for-each-ref [<选项>] [<模å¼>]" #: builtin/for-each-ref.c:11 msgid "git for-each-ref [--points-at <object>]" msgstr "git for-each-ref [--points-at <对象>]" #: builtin/for-each-ref.c:12 msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]" msgstr "git for-each-ref [(--merged | --no-merged) [<æ交>]]" #: builtin/for-each-ref.c:13 msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]" msgstr "git for-each-ref [--contains [<æ交>]] [--no-contains [<æ交>]]" #: builtin/for-each-ref.c:28 msgid "quote placeholders suitably for shells" msgstr "引用å ä½ç¬¦é€‚用于 shells" #: builtin/for-each-ref.c:30 msgid "quote placeholders suitably for perl" msgstr "引用å ä½ç¬¦é€‚用于 perl" #: builtin/for-each-ref.c:32 msgid "quote placeholders suitably for python" msgstr "引用å ä½ç¬¦é€‚用于 python" #: builtin/for-each-ref.c:34 msgid "quote placeholders suitably for Tcl" msgstr "引用å ä½ç¬¦é€‚用于 Tcl" #: builtin/for-each-ref.c:37 msgid "show only <n> matched refs" msgstr "åªæ˜¾ç¤º <n> 个匹é…的引用" #: builtin/for-each-ref.c:39 builtin/tag.c:421 msgid "respect format colors" msgstr "éµç…§æ ¼å¼ä¸çš„颜色输出" #: builtin/for-each-ref.c:43 msgid "print only refs which points at the given object" msgstr "åªæ‰“å°æŒ‡å‘给定对象的引用" #: builtin/for-each-ref.c:45 msgid "print only refs that are merged" msgstr "åªæ‰“å°å·²ç»åˆå¹¶çš„引用" #: builtin/for-each-ref.c:46 msgid "print only refs that are not merged" msgstr "åªæ‰“å°æ²¡æœ‰åˆå¹¶çš„引用" #: builtin/for-each-ref.c:47 msgid "print only refs which contain the commit" msgstr "åªæ‰“å°åŒ…å«è¯¥æ交的引用" #: builtin/for-each-ref.c:48 msgid "print only refs which don't contain the commit" msgstr "åªæ‰“å°ä¸åŒ…å«è¯¥æ交的引用" #: builtin/fsck.c:569 msgid "Checking object directories" msgstr "检查对象目录ä¸" #: builtin/fsck.c:661 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<选项>] [<对象>...]" #: builtin/fsck.c:667 msgid "show unreachable objects" msgstr "显示ä¸å¯è¾¾çš„对象" #: builtin/fsck.c:668 msgid "show dangling objects" msgstr "显示摇摆的对象" #: builtin/fsck.c:669 msgid "report tags" msgstr "æŠ¥å‘Šæ ‡ç¾" #: builtin/fsck.c:670 msgid "report root nodes" msgstr "æŠ¥å‘Šæ ¹èŠ‚ç‚¹" #: builtin/fsck.c:671 msgid "make index objects head nodes" msgstr "将索引亦作为检查的头节点" #: builtin/fsck.c:672 msgid "make reflogs head nodes (default)" msgstr "将引用日志作为检查的头节点(默认)" #: builtin/fsck.c:673 msgid "also consider packs and alternate objects" msgstr "也考虑包和备用对象" #: builtin/fsck.c:674 msgid "check only connectivity" msgstr "仅检查连通性" #: builtin/fsck.c:675 msgid "enable more strict checking" msgstr "å¯ç”¨æ›´ä¸¥æ ¼çš„检查" #: builtin/fsck.c:677 msgid "write dangling objects in .git/lost-found" msgstr "将摇摆对象写入 .git/lost-found ä¸" #: builtin/fsck.c:678 builtin/prune.c:109 msgid "show progress" msgstr "显示进度" #: builtin/fsck.c:679 msgid "show verbose names for reachable objects" msgstr "显示å¯è¾¾å¯¹è±¡çš„详细å称" #: builtin/fsck.c:745 msgid "Checking objects" msgstr "检查对象ä¸" #: builtin/gc.c:33 msgid "git gc [<options>]" msgstr "git gc [<选项>]" #: builtin/gc.c:88 #, c-format msgid "Failed to fstat %s: %s" msgstr "对 %s 调用 fstat 失败:%s" #: builtin/gc.c:452 #, c-format msgid "Can't stat %s" msgstr "ä¸èƒ½å¯¹ %s 调用 stat" #: builtin/gc.c:461 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" "and remove %s.\n" "Automatic cleanup will not be performed until the file is removed.\n" "\n" "%s" msgstr "" "最åŽä¸€æ¬¡ gc æ“作报告如下信æ¯ã€‚è¯·æ£€æŸ¥åŽŸå› å¹¶åˆ é™¤ %s。\n" "åœ¨è¯¥æ–‡ä»¶è¢«åˆ é™¤ä¹‹å‰ï¼Œè‡ªåŠ¨æ¸…ç†å°†ä¸ä¼šæ‰§è¡Œã€‚\n" "\n" "%s" #: builtin/gc.c:502 msgid "prune unreferenced objects" msgstr "清除未引用的对象" #: builtin/gc.c:504 msgid "be more thorough (increased runtime)" msgstr "æ›´å½»åº•ï¼ˆå¢žåŠ è¿è¡Œæ—¶é—´ï¼‰" #: builtin/gc.c:505 msgid "enable auto-gc mode" msgstr "å¯ç”¨è‡ªåŠ¨åžƒåœ¾å›žæ”¶æ¨¡å¼" #: builtin/gc.c:508 msgid "force running gc even if there may be another gc running" msgstr "强制执行 gc å³ä½¿å¦å¤–一个 gc æ£åœ¨æ‰§è¡Œ" #: builtin/gc.c:511 msgid "repack all other packs except the largest pack" msgstr "除了最大的包之外,对所有其它包文件é‡æ–°æ‰“包" #: builtin/gc.c:528 #, c-format msgid "failed to parse gc.logexpiry value %s" msgstr "æ— æ³•è§£æž gc.logexpiry 的值 %s" #: builtin/gc.c:539 #, c-format msgid "failed to parse prune expiry value %s" msgstr "æ— æ³•è§£æž gc.logexpiry 的值 %s" #: builtin/gc.c:559 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "自动在åŽå°æ‰§è¡Œä»“库打包以求最佳性能。\n" #: builtin/gc.c:561 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "自动打包仓库以求最佳性能。\n" #: builtin/gc.c:562 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "手工维护å‚è§ \"git help gc\"。\n" #: builtin/gc.c:598 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" msgstr "" "å·²ç»æœ‰ä¸€ä¸ª gc æ£è¿è¡Œåœ¨æœºå™¨ '%s' pid %<PRIuMAX>(如果ä¸æ˜¯ï¼Œä½¿ç”¨ --force)" #: builtin/gc.c:645 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "有太多ä¸å¯è¾¾çš„æ¾æ•£å¯¹è±¡ï¼Œè¿è¡Œ 'git prune' åˆ é™¤å®ƒä»¬ã€‚" #: builtin/grep.c:28 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [<选项>] [-e] <模å¼> [<版本>...] [[--] <路径>...]" #: builtin/grep.c:226 #, c-format msgid "grep: failed to create thread: %s" msgstr "grepï¼šæ— æ³•åˆ›å»ºçº¿ç¨‹ï¼š%s" #: builtin/grep.c:284 #, c-format msgid "invalid number of threads specified (%d) for %s" msgstr "为 %2$s 设定的线程数 (%1$d) æ— æ•ˆ" #. TRANSLATORS: %s is the configuration #. variable for tweaking threads, currently #. grep.threads #. #: builtin/grep.c:293 builtin/index-pack.c:1535 builtin/index-pack.c:1727 #, c-format msgid "no threads support, ignoring %s" msgstr "没有线程支æŒï¼Œå¿½ç•¥ %s" #: builtin/grep.c:461 builtin/grep.c:582 builtin/grep.c:623 #, c-format msgid "unable to read tree (%s)" msgstr "æ— æ³•è¯»å–æ ‘ï¼ˆ%s)" #: builtin/grep.c:638 #, c-format msgid "unable to grep from object of type %s" msgstr "æ— æ³•æŠ“å–æ¥è‡ªäºŽ %s 类型的对象" #: builtin/grep.c:703 #, c-format msgid "switch `%c' expects a numerical value" msgstr "开关 `%c' 期望一个数å—值" #: builtin/grep.c:790 msgid "search in index instead of in the work tree" msgstr "在索引区æœç´¢è€Œä¸æ˜¯åœ¨å·¥ä½œåŒº" #: builtin/grep.c:792 msgid "find in contents not managed by git" msgstr "在未被 git 管ç†çš„内容ä¸æŸ¥æ‰¾" # 译者:ä¸æ–‡å—符串拼接,å¯åˆ 除å‰å¯¼ç©ºæ ¼ #: builtin/grep.c:794 msgid "search in both tracked and untracked files" msgstr "在跟踪和未跟踪的文件ä¸æœç´¢" #: builtin/grep.c:796 msgid "ignore files specified via '.gitignore'" msgstr "忽略 '.gitignore' 包å«çš„文件" #: builtin/grep.c:798 msgid "recursively search in each submodule" msgstr "在æ¯ä¸€ä¸ªå模组ä¸é€’å½’æœç´¢" #: builtin/grep.c:801 msgid "show non-matching lines" msgstr "显示未匹é…çš„è¡Œ" #: builtin/grep.c:803 msgid "case insensitive matching" msgstr "ä¸åŒºåˆ†å¤§å°å†™åŒ¹é…" #: builtin/grep.c:805 msgid "match patterns only at word boundaries" msgstr "åªåœ¨å•è¯è¾¹ç•ŒåŒ¹é…模å¼" #: builtin/grep.c:807 msgid "process binary files as text" msgstr "把二进制文件当åšæ–‡æœ¬å¤„ç†" #: builtin/grep.c:809 msgid "don't match patterns in binary files" msgstr "ä¸åœ¨äºŒè¿›åˆ¶æ–‡ä»¶ä¸åŒ¹é…模å¼" #: builtin/grep.c:812 msgid "process binary files with textconv filters" msgstr "用 textconv 过滤器处ç†äºŒè¿›åˆ¶æ–‡ä»¶" #: builtin/grep.c:814 msgid "descend at most <depth> levels" msgstr "最多以指定的深度å‘下寻找" #: builtin/grep.c:818 msgid "use extended POSIX regular expressions" msgstr "使用扩展的 POSIX æ£åˆ™è¡¨è¾¾å¼" #: builtin/grep.c:821 msgid "use basic POSIX regular expressions (default)" msgstr "使用基本的 POSIX æ£åˆ™è¡¨è¾¾å¼ï¼ˆé»˜è®¤ï¼‰" #: builtin/grep.c:824 msgid "interpret patterns as fixed strings" msgstr "把模å¼è§£æžä¸ºå›ºå®šçš„å—符串" #: builtin/grep.c:827 msgid "use Perl-compatible regular expressions" msgstr "使用 Perl 兼容的æ£åˆ™è¡¨è¾¾å¼" #: builtin/grep.c:830 msgid "show line numbers" msgstr "显示行å·" #: builtin/grep.c:831 msgid "don't show filenames" msgstr "ä¸æ˜¾ç¤ºæ–‡ä»¶å" #: builtin/grep.c:832 msgid "show filenames" msgstr "显示文件å" #: builtin/grep.c:834 msgid "show filenames relative to top directory" msgstr "显示相对于顶级目录的文件å" #: builtin/grep.c:836 msgid "show only filenames instead of matching lines" msgstr "åªæ˜¾ç¤ºæ–‡ä»¶å而ä¸æ˜¾ç¤ºåŒ¹é…çš„è¡Œ" #: builtin/grep.c:838 msgid "synonym for --files-with-matches" msgstr "å’Œ --files-with-matches åŒä¹‰" #: builtin/grep.c:841 msgid "show only the names of files without match" msgstr "åªæ˜¾ç¤ºæœªåŒ¹é…的文件å" #: builtin/grep.c:843 msgid "print NUL after filenames" msgstr "在文件ååŽè¾“出 NUL å—符" #: builtin/grep.c:846 msgid "show the number of matches instead of matching lines" msgstr "显示总匹é…行数,而ä¸æ˜¾ç¤ºåŒ¹é…çš„è¡Œ" #: builtin/grep.c:847 msgid "highlight matches" msgstr "高亮显示匹é…项" #: builtin/grep.c:849 msgid "print empty line between matches from different files" msgstr "在ä¸åŒæ–‡ä»¶çš„匹é…项之间打å°ç©ºè¡Œ" #: builtin/grep.c:851 msgid "show filename only once above matches from same file" msgstr "åªåœ¨åŒä¸€æ–‡ä»¶çš„匹é…项的上é¢æ˜¾ç¤ºä¸€æ¬¡æ–‡ä»¶å" #: builtin/grep.c:854 msgid "show <n> context lines before and after matches" msgstr "显示匹é…项å‰åŽçš„ <n> 行上下文" #: builtin/grep.c:857 msgid "show <n> context lines before matches" msgstr "显示匹é…é¡¹å‰ <n> 行上下文" #: builtin/grep.c:859 msgid "show <n> context lines after matches" msgstr "显示匹é…é¡¹åŽ <n> 行上下文" #: builtin/grep.c:861 msgid "use <n> worker threads" msgstr "使用 <n> 个工作线程" #: builtin/grep.c:862 msgid "shortcut for -C NUM" msgstr "å¿«æ·é”® -C æ•°å—" #: builtin/grep.c:865 msgid "show a line with the function name before matches" msgstr "在匹é…çš„å‰é¢æ˜¾ç¤ºä¸€è¡Œå‡½æ•°å" #: builtin/grep.c:867 msgid "show the surrounding function" msgstr "显示所在函数的å‰åŽå†…容" #: builtin/grep.c:870 msgid "read patterns from file" msgstr "从文件读å–模å¼" #: builtin/grep.c:872 msgid "match <pattern>" msgstr "åŒ¹é… <模å¼>" #: builtin/grep.c:874 msgid "combine patterns specified with -e" msgstr "组åˆç”¨ -e å‚数设定的模å¼" #: builtin/grep.c:886 msgid "indicate hit with exit status without output" msgstr "ä¸è¾“出,而用退出ç æ ‡è¯†å‘½ä¸çŠ¶æ€" #: builtin/grep.c:888 msgid "show only matches from files that match all patterns" msgstr "åªæ˜¾ç¤ºåŒ¹é…所有模å¼çš„文件ä¸çš„匹é…" #: builtin/grep.c:890 msgid "show parse tree for grep expression" msgstr "显示 grep 表达å¼çš„解æžæ ‘" #: builtin/grep.c:894 msgid "pager" msgstr "分页" #: builtin/grep.c:894 msgid "show matching files in the pager" msgstr "分页显示匹é…的文件" #: builtin/grep.c:898 msgid "allow calling of grep(1) (ignored by this build)" msgstr "å…许调用 grep(1)(本次构建忽略)" #: builtin/grep.c:962 msgid "no pattern given." msgstr "未æ供模å¼åŒ¹é…。" #: builtin/grep.c:994 msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index 或 --untracked ä¸èƒ½å’Œç‰ˆæœ¬åŒæ—¶ä½¿ç”¨" #: builtin/grep.c:1001 #, c-format msgid "unable to resolve revision: %s" msgstr "ä¸èƒ½è§£æžç‰ˆæœ¬ï¼š%s" #: builtin/grep.c:1036 builtin/index-pack.c:1531 #, c-format msgid "invalid number of threads specified (%d)" msgstr "æŒ‡å®šçš„çº¿ç¨‹æ•°æ— æ•ˆï¼ˆ%d)" #: builtin/grep.c:1041 msgid "no threads support, ignoring --threads" msgstr "没有线程支æŒï¼Œå¿½ç•¥ --threads" #: builtin/grep.c:1065 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager 仅用于工作区" #: builtin/grep.c:1088 msgid "option not supported with --recurse-submodules." msgstr "选项ä¸æ”¯æŒå’Œ --recurse-submodules 共用。" #: builtin/grep.c:1094 msgid "--cached or --untracked cannot be used with --no-index." msgstr "--cached 或 --untracked ä¸èƒ½ä¸Ž --no-index åŒæ—¶ä½¿ç”¨ã€‚" #: builtin/grep.c:1100 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "--[no-]exclude-standard ä¸èƒ½ç”¨äºŽå·²è·Ÿè¸ªå†…容。" #: builtin/grep.c:1108 msgid "both --cached and trees are given." msgstr "åŒæ—¶ç»™å‡ºäº† --cached å’Œæ ‘å¯¹è±¡ã€‚" #: builtin/hash-object.c:83 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:84 msgid "git hash-object --stdin-paths" msgstr "git hash-object --stdin-paths" #: builtin/hash-object.c:96 msgid "type" msgstr "类型" #: builtin/hash-object.c:96 msgid "object type" msgstr "对象类型" #: builtin/hash-object.c:97 msgid "write the object into the object database" msgstr "将对象写入对象数æ®åº“" #: builtin/hash-object.c:99 msgid "read the object from stdin" msgstr "ä»Žæ ‡å‡†è¾“å…¥è¯»å–对象" #: builtin/hash-object.c:101 msgid "store file as is without filters" msgstr "åŽŸæ ·å˜å‚¨æ–‡ä»¶ä¸ä½¿ç”¨è¿‡æ»¤å™¨" #: builtin/hash-object.c:102 msgid "" "just hash any random garbage to create corrupt objects for debugging Git" msgstr "å…许对任æ„éšæœºåžƒåœ¾æ•°æ®åšæ•£åˆ—æ¥åˆ›å»ºæŸå的对象以便调试 Git" #: builtin/hash-object.c:103 msgid "process file as it were from this path" msgstr "处ç†æ–‡ä»¶å¹¶å‡è®¾å…¶æ¥è‡ªäºŽæ¤è·¯å¾„" #: builtin/help.c:45 msgid "print all available commands" msgstr "打å°æ‰€æœ‰å¯ç”¨çš„命令" #: builtin/help.c:46 msgid "exclude guides" msgstr "排除å‘导" #: builtin/help.c:47 msgid "print list of useful guides" msgstr "显示有用的指å—列表" #: builtin/help.c:48 msgid "show man page" msgstr "显示 man 手册" #: builtin/help.c:49 msgid "show manual in web browser" msgstr "在 web æµè§ˆå™¨ä¸æ˜¾ç¤ºæ‰‹å†Œ" #: builtin/help.c:51 msgid "show info page" msgstr "显示 info 手册" #: builtin/help.c:53 msgid "print command description" msgstr "打å°å‘½ä»¤æè¿°" #: builtin/help.c:58 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]" #: builtin/help.c:70 #, c-format msgid "unrecognized help format '%s'" msgstr "æœªèƒ½è¯†åˆ«çš„å¸®åŠ©æ ¼å¼ '%s'" #: builtin/help.c:97 msgid "Failed to start emacsclient." msgstr "æ— æ³•å¯åŠ¨ emacsclient。" #: builtin/help.c:110 msgid "Failed to parse emacsclient version." msgstr "æ— æ³•è§£æž emacsclient 版本。" #: builtin/help.c:118 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "emacsclient 版本 '%d' 太è€ï¼ˆ< 22)。" #: builtin/help.c:136 builtin/help.c:158 builtin/help.c:168 builtin/help.c:176 #, c-format msgid "failed to exec '%s'" msgstr "æ— æ³•æ‰§è¡Œ '%s'" #: builtin/help.c:214 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" "Please consider using 'man.<tool>.cmd' instead." msgstr "" "'%s':ä¸æ”¯æŒçš„ man 手册查看器的路径。\n" "请使用 'man.<工具>.cmd'。" #: builtin/help.c:226 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" "Please consider using 'man.<tool>.path' instead." msgstr "" "'%s': 支æŒçš„ man 手册查看器命令。\n" "请使用 'man.<工具>.path'。" #: builtin/help.c:343 #, c-format msgid "'%s': unknown man viewer." msgstr "'%s':未知的 man 查看器。" #: builtin/help.c:360 msgid "no man viewer handled the request" msgstr "没有 man 查看器处ç†æ¤è¯·æ±‚" #: builtin/help.c:368 msgid "no info viewer handled the request" msgstr "没有 info 查看器处ç†æ¤è¯·æ±‚" #: builtin/help.c:415 #, c-format msgid "'%s' is aliased to '%s'" msgstr "'%s' 是 '%s' 的别å" #: builtin/help.c:442 builtin/help.c:459 #, c-format msgid "usage: %s%s" msgstr "用法:%s%s" #: builtin/index-pack.c:158 #, c-format msgid "unable to open %s" msgstr "ä¸èƒ½æ‰“å¼€ %s" #: builtin/index-pack.c:208 #, c-format msgid "object type mismatch at %s" msgstr "%s 的对象类型ä¸åŒ¹é…" #: builtin/index-pack.c:228 #, c-format msgid "did not receive expected object %s" msgstr "未能获å–预期的对象 %s" #: builtin/index-pack.c:231 #, c-format msgid "object %s: expected type %s, found %s" msgstr "对象 %s:应为类型 %s,å´æ˜¯ %s" #: builtin/index-pack.c:273 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "æ— æ³•å¡«å…… %d å—节" msgstr[1] "æ— æ³•å¡«å…… %d å—节" #: builtin/index-pack.c:283 msgid "early EOF" msgstr "过早的文件结æŸç¬¦ï¼ˆEOF)" #: builtin/index-pack.c:284 msgid "read error on input" msgstr "输入上的读错误" #: builtin/index-pack.c:296 msgid "used more bytes than were available" msgstr "用掉了超过å¯ç”¨çš„å—节" #: builtin/index-pack.c:303 msgid "pack too large for current definition of off_t" msgstr "åŒ…å¤ªå¤§è¶…è¿‡äº†å½“å‰ off_t 的定义" #: builtin/index-pack.c:306 builtin/unpack-objects.c:93 msgid "pack exceeds maximum allowed size" msgstr "包超过了最大å…许值" #: builtin/index-pack.c:321 #, c-format msgid "unable to create '%s'" msgstr "ä¸èƒ½åˆ›å»º '%s'" #: builtin/index-pack.c:327 #, c-format msgid "cannot open packfile '%s'" msgstr "æ— æ³•æ‰“å¼€åŒ…æ–‡ä»¶ '%s'" #: builtin/index-pack.c:341 msgid "pack signature mismatch" msgstr "包ç¾åä¸åŒ¹é…" #: builtin/index-pack.c:343 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "ä¸æ”¯æŒåŒ…版本 %<PRIu32>" #: builtin/index-pack.c:361 #, c-format msgid "pack has bad object at offset %<PRIuMAX>: %s" msgstr "包ä¸æœ‰é”™è¯¯çš„对象ä½äºŽåç§»é‡ %<PRIuMAX>:%s" #: builtin/index-pack.c:482 #, c-format msgid "inflate returned %d" msgstr "解压缩返回 %d" #: builtin/index-pack.c:531 msgid "offset value overflow for delta base object" msgstr "å移值覆盖了 delta 基准对象" #: builtin/index-pack.c:539 msgid "delta base offset is out of bound" msgstr "delta 基准å移越界" #: builtin/index-pack.c:547 #, c-format msgid "unknown object type %d" msgstr "未知对象类型 %d" #: builtin/index-pack.c:578 msgid "cannot pread pack file" msgstr "æ— æ³•è¯»å–包文件" #: builtin/index-pack.c:580 #, c-format msgid "premature end of pack file, %<PRIuMAX> byte missing" msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing" msgstr[0] "包文件过早结æŸï¼Œç¼ºå°‘ %<PRIuMAX> å—节" msgstr[1] "包文件过早结æŸï¼Œç¼ºå°‘ %<PRIuMAX> å—节" #: builtin/index-pack.c:606 msgid "serious inflate inconsistency" msgstr "解压缩严é‡çš„ä¸ä¸€è‡´" #: builtin/index-pack.c:751 builtin/index-pack.c:757 builtin/index-pack.c:780 #: builtin/index-pack.c:819 builtin/index-pack.c:828 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "å‘现 %s 出现 SHA1 冲çªï¼" #: builtin/index-pack.c:754 builtin/pack-objects.c:198 #: builtin/pack-objects.c:292 #, c-format msgid "unable to read %s" msgstr "ä¸èƒ½è¯» %s" #: builtin/index-pack.c:817 #, c-format msgid "cannot read existing object info %s" msgstr "ä¸èƒ½è¯»å–现å˜å¯¹è±¡ä¿¡æ¯ %s" #: builtin/index-pack.c:825 #, c-format msgid "cannot read existing object %s" msgstr "ä¸èƒ½è¯»å–现å˜å¯¹è±¡ %s" #: builtin/index-pack.c:839 #, c-format msgid "invalid blob object %s" msgstr "æ— æ•ˆçš„æ•°æ®å¯¹è±¡ %s" #: builtin/index-pack.c:842 builtin/index-pack.c:860 msgid "fsck error in packed object" msgstr "对打包对象 fsck 检查出错" #: builtin/index-pack.c:857 #, c-format msgid "invalid %s" msgstr "æ— æ•ˆçš„ %s" #: builtin/index-pack.c:862 #, c-format msgid "Not all child objects of %s are reachable" msgstr "%s 的所有å对象并éžéƒ½å¯è¾¾" #: builtin/index-pack.c:934 builtin/index-pack.c:965 msgid "failed to apply delta" msgstr "æ— æ³•åº”ç”¨ delta" #: builtin/index-pack.c:1135 msgid "Receiving objects" msgstr "接收对象ä¸" #: builtin/index-pack.c:1135 msgid "Indexing objects" msgstr "索引对象ä¸" #: builtin/index-pack.c:1169 msgid "pack is corrupted (SHA1 mismatch)" msgstr "包冲çªï¼ˆSHA1 ä¸åŒ¹é…)" #: builtin/index-pack.c:1174 msgid "cannot fstat packfile" msgstr "ä¸èƒ½å¯¹åŒ…文件调用 fstat" #: builtin/index-pack.c:1177 msgid "pack has junk at the end" msgstr "包的结尾有垃圾数æ®" #: builtin/index-pack.c:1189 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "parse_pack_objects() ä¸é‡åˆ°ä¸å¯ç†å–»çš„问题" #: builtin/index-pack.c:1212 msgid "Resolving deltas" msgstr "å¤„ç† delta ä¸" #: builtin/index-pack.c:1223 #, c-format msgid "unable to create thread: %s" msgstr "ä¸èƒ½åˆ›å»ºçº¿ç¨‹ï¼š%s" #: builtin/index-pack.c:1265 msgid "confusion beyond insanity" msgstr "ä¸å¯ç†å–»" #: builtin/index-pack.c:1271 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "å®Œæˆ %d 个本地对象" msgstr[1] "å®Œæˆ %d 个本地对象" #: builtin/index-pack.c:1283 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "对 %s çš„å°¾éƒ¨æ ¡éªŒå‡ºçŽ°æ„外(ç£ç›˜æŸå?)" #: builtin/index-pack.c:1287 #, 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:1311 #, c-format msgid "unable to deflate appended object (%d)" msgstr "ä¸èƒ½åŽ‹ç¼©é™„åŠ å¯¹è±¡ï¼ˆ%d)" #: builtin/index-pack.c:1388 #, c-format msgid "local object %s is corrupt" msgstr "本地对象 %s å·²æŸå" #: builtin/index-pack.c:1402 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "包文件å '%s' 没有以 '.pack' 结尾" #: builtin/index-pack.c:1427 #, c-format msgid "cannot write %s file '%s'" msgstr "æ— æ³•å†™å…¥ %s 文件 '%s'" #: builtin/index-pack.c:1435 #, c-format msgid "cannot close written %s file '%s'" msgstr "æ— æ³•å…³é—已写入的 %s 文件 '%s'" #: builtin/index-pack.c:1459 msgid "error while closing pack file" msgstr "å…³é—包文件时出错" #: builtin/index-pack.c:1473 msgid "cannot store pack file" msgstr "æ— æ³•å˜å‚¨åŒ…文件" #: builtin/index-pack.c:1481 msgid "cannot store index file" msgstr "æ— æ³•å˜å‚¨ç´¢å¼•æ–‡ä»¶" #: builtin/index-pack.c:1525 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "åçš„ pack.indexversion=%<PRIu32>" #: builtin/index-pack.c:1594 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "æ— æ³•æ‰“å¼€çŽ°å˜åŒ…文件 '%s'" #: builtin/index-pack.c:1596 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "æ— æ³•ä¸º %s 打开包索引文件" #: builtin/index-pack.c:1644 #, 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:1651 #, 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:1688 msgid "Cannot come back to cwd" msgstr "æ— æ³•è¿”å›žå½“å‰å·¥ä½œç›®å½•" #: builtin/index-pack.c:1739 builtin/index-pack.c:1742 #: builtin/index-pack.c:1758 builtin/index-pack.c:1762 #, c-format msgid "bad %s" msgstr "错误选项 %s" #: builtin/index-pack.c:1778 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin ä¸èƒ½å’Œ --stdin åŒæ—¶ä½¿ç”¨" #: builtin/index-pack.c:1780 msgid "--stdin requires a git repository" msgstr "--stdin 需è¦ä¸€ä¸ª git 仓库" #: builtin/index-pack.c:1786 msgid "--verify with no packfile name given" msgstr "--verify 没有æ供包文件åå‚æ•°" #: builtin/index-pack.c:1836 builtin/unpack-objects.c:578 msgid "fsck error in pack objects" msgstr "åœ¨æ‰“åŒ…å¯¹è±¡ä¸ fsck 检查出错" #: builtin/init-db.c:55 #, c-format msgid "cannot stat '%s'" msgstr "ä¸èƒ½å¯¹ '%s' 调用 stat" #: builtin/init-db.c:61 #, c-format msgid "cannot stat template '%s'" msgstr "ä¸èƒ½å¯¹æ¨¡ç‰ˆ '%s' 调用 stat" #: builtin/init-db.c:66 #, c-format msgid "cannot opendir '%s'" msgstr "ä¸èƒ½æ‰“开目录 '%s'" #: builtin/init-db.c:77 #, c-format msgid "cannot readlink '%s'" msgstr "ä¸èƒ½è¯»å–链接 '%s'" #: builtin/init-db.c:79 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "ä¸èƒ½è‡ª '%s' 到 '%s' 创建符å·é“¾æŽ¥" #: builtin/init-db.c:85 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "ä¸èƒ½æ‹·è´ '%s' 至 '%s'" #: builtin/init-db.c:89 #, c-format msgid "ignoring template %s" msgstr "忽略模版 %s" #: builtin/init-db.c:120 #, c-format msgid "templates not found in %s" msgstr "没有在 %s ä¸æ‰¾åˆ°æ¨¡ç‰ˆ" #: builtin/init-db.c:135 #, c-format msgid "not copying templates from '%s': %s" msgstr "没有从 '%s' å¤åˆ¶æ¨¡ç‰ˆï¼š%s" #: builtin/init-db.c:328 #, c-format msgid "unable to handle file type %d" msgstr "ä¸èƒ½å¤„ç† %d 类型的文件" #: builtin/init-db.c:331 #, c-format msgid "unable to move %s to %s" msgstr "ä¸èƒ½ç§»åŠ¨ %s 至 %s" #: builtin/init-db.c:348 builtin/init-db.c:351 #, c-format msgid "%s already exists" msgstr "%s å·²ç»å˜åœ¨" #: builtin/init-db.c:404 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "é‡æ–°åˆå§‹åŒ–å·²å˜åœ¨çš„共享 Git 仓库于 %s%s\n" #: builtin/init-db.c:405 #, c-format msgid "Reinitialized existing Git repository in %s%s\n" msgstr "é‡æ–°åˆå§‹åŒ–å·²å˜åœ¨çš„ Git 仓库于 %s%s\n" #: builtin/init-db.c:409 #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "å·²åˆå§‹åŒ–空的共享 Git 仓库于 %s%s\n" #: builtin/init-db.c:410 #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "å·²åˆå§‹åŒ–空的 Git 仓库于 %s%s\n" #: builtin/init-db.c:458 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" msgstr "" "git init [-q | --quiet] [--bare] [--template=<模æ¿ç›®å½•>] [--shared[=<æƒé™>]] " "[<目录>]" #: builtin/init-db.c:481 msgid "permissions" msgstr "æƒé™" #: builtin/init-db.c:482 msgid "specify that the git repository is to be shared amongst several users" msgstr "指定 git 仓库是多个用户之间共享的" #: builtin/init-db.c:525 #, c-format msgid "cannot chdir to %s" msgstr "ä¸èƒ½åˆ‡æ¢ç›®å½•åˆ° %s" #: builtin/init-db.c:546 #, c-format msgid "" "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" "dir=<directory>)" msgstr "ä¸å…许 %s(或 --work-tree=<目录>)而没有指定 %s(或 --git-dir=<目录>)" #: builtin/init-db.c:574 #, c-format msgid "Cannot access work tree '%s'" msgstr "ä¸èƒ½è®¿é—®å·¥ä½œåŒº '%s'" #: builtin/interpret-trailers.c:15 msgid "" "git interpret-trailers [--in-place] [--trim-empty] [(--trailer " "<token>[(=|:)<value>])...] [<file>...]" msgstr "" "git interpret-trailers [--in-place] [--trim-empty] [(--trailer <é”®>[(=|:)<值" ">])...] [<文件>...]" #: builtin/interpret-trailers.c:92 msgid "edit files in place" msgstr "在原ä½ç¼–辑文件" #: builtin/interpret-trailers.c:93 msgid "trim empty trailers" msgstr "åˆ é™¤ç©ºçš„å°¾éƒ¨ç½²å" #: builtin/interpret-trailers.c:96 msgid "where to place the new trailer" msgstr "在哪里放置新的尾部署å" #: builtin/interpret-trailers.c:98 msgid "action if trailer already exists" msgstr "当尾部署åå·²ç»å˜åœ¨æ—¶æ‰€é‡‡å–的动作" #: builtin/interpret-trailers.c:100 msgid "action if trailer is missing" msgstr "当尾部署å缺失时所采å–的动作" #: builtin/interpret-trailers.c:102 msgid "output only the trailers" msgstr "åªè¾“出尾部署å" #: builtin/interpret-trailers.c:103 msgid "do not apply config rules" msgstr "ä¸è¦åº”用é…置规则" #: builtin/interpret-trailers.c:104 msgid "join whitespace-continued values" msgstr "连接空白折行的值" #: builtin/interpret-trailers.c:105 msgid "set parsing options" msgstr "设置解æžé€‰é¡¹" #: builtin/interpret-trailers.c:107 msgid "trailer" msgstr "尾部署å" #: builtin/interpret-trailers.c:108 msgid "trailer(s) to add" msgstr "è¦æ·»åŠ 的尾部署å" #: builtin/interpret-trailers.c:117 msgid "--trailer with --only-input does not make sense" msgstr "--trailer å’Œ --only-input åŒæ—¶ä½¿ç”¨æ²¡æœ‰æ„义" #: builtin/interpret-trailers.c:127 msgid "no input file given for in-place editing" msgstr "没有给出è¦åŽŸä½ç¼–辑的文件" #: builtin/log.c:48 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]" #: builtin/log.c:49 msgid "git show [<options>] <object>..." msgstr "git show [<选项>] <对象>..." #: builtin/log.c:93 #, c-format msgid "invalid --decorate option: %s" msgstr "æ— æ•ˆçš„ --decorate 选项:%s" #: builtin/log.c:153 msgid "suppress diff output" msgstr "ä¸æ˜¾ç¤ºå·®å¼‚输出" #: builtin/log.c:154 msgid "show source" msgstr "显示æº" #: builtin/log.c:155 msgid "Use mail map file" msgstr "ä½¿ç”¨é‚®ä»¶æ˜ å°„æ–‡ä»¶" #: builtin/log.c:157 msgid "only decorate refs that match <pattern>" msgstr "åªä¿®é¥°ä¸Ž <模å¼> 匹é…的引用" #: builtin/log.c:159 msgid "do not decorate refs that match <pattern>" msgstr "ä¸ä¿®é¥°å’Œ <模å¼> 匹é…的引用" #: builtin/log.c:160 msgid "decorate options" msgstr "修饰选项" #: builtin/log.c:163 msgid "Process line range n,m in file, counting from 1" msgstr "处ç†æ–‡ä»¶ä¸ç¬¬ n 到 m 之间的行,从 1 开始" #: builtin/log.c:259 #, c-format msgid "Final output: %d %s\n" msgstr "最终输出:%d %s\n" #: builtin/log.c:510 #, c-format msgid "git show %s: bad file" msgstr "git show %s: æŸå的文件" #: builtin/log.c:525 builtin/log.c:619 #, c-format msgid "Could not read object %s" msgstr "ä¸èƒ½è¯»å–对象 %s" #: builtin/log.c:643 #, c-format msgid "Unknown type: %d" msgstr "未知类型:%d" #: builtin/log.c:764 msgid "format.headers without value" msgstr "format.headers 没有值" #: builtin/log.c:865 msgid "name of output directory is too long" msgstr "输出目录å太长" #: builtin/log.c:881 #, c-format msgid "Cannot open patch file %s" msgstr "æ— æ³•æ‰“å¼€è¡¥ä¸æ–‡ä»¶ %s" #: builtin/log.c:898 msgid "Need exactly one range." msgstr "åªéœ€è¦ä¸€ä¸ªèŒƒå›´ã€‚" #: builtin/log.c:908 msgid "Not a range." msgstr "ä¸æ˜¯ä¸€ä¸ªèŒƒå›´ã€‚" #: builtin/log.c:1014 msgid "Cover letter needs email format" msgstr "ä¿¡å°éœ€è¦é‚®ä»¶åœ°å€æ ¼å¼" #: builtin/log.c:1095 #, c-format msgid "insane in-reply-to: %s" msgstr "ä¸æ£å¸¸çš„ in-reply-to:%s" #: builtin/log.c:1122 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<选项>] [<从> | <版本范围>]" #: builtin/log.c:1172 msgid "Two output directories?" msgstr "两个输出目录?" #: builtin/log.c:1279 builtin/log.c:1932 builtin/log.c:1934 builtin/log.c:1946 #, c-format msgid "Unknown commit %s" msgstr "未知æ交 %s" #: builtin/log.c:1289 builtin/notes.c:887 builtin/tag.c:523 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "æ— æ³•è§£æž '%s' 为一个有效引用。" #: builtin/log.c:1294 msgid "Could not find exact merge base." msgstr "ä¸èƒ½æ‰¾åˆ°å‡†ç¡®çš„åˆå¹¶åŸºçº¿ã€‚" #: builtin/log.c:1298 msgid "" "Failed to get upstream, if you want to record base commit automatically,\n" "please use git branch --set-upstream-to to track a remote branch.\n" "Or you could specify base commit by --base=<base-commit-id> manually." msgstr "" "æ— æ³•å¾—åˆ°ä¸Šæ¸¸åœ°å€ï¼Œå¦‚æžœä½ æƒ³è‡ªåŠ¨è®°å½•åŸºçº¿æ交,请使用命令\n" "git branch --set-upstream-to æ¥è·Ÿè¸ªä¸€ä¸ªè¿œç¨‹åˆ†æ”¯ã€‚æˆ–è€…ä½ å¯ä»¥é€šè¿‡\n" "å‚æ•° --base=<基线æ交> 手动指定一个基线æ交。" #: builtin/log.c:1318 msgid "Failed to find exact merge base" msgstr "æ— æ³•æ‰¾åˆ°å‡†ç¡®çš„åˆå¹¶åŸºçº¿" #: builtin/log.c:1329 msgid "base commit should be the ancestor of revision list" msgstr "基线æ交应该是版本列表的祖先" #: builtin/log.c:1333 msgid "base commit shouldn't be in revision list" msgstr "基线æ交ä¸åº”该出现在版本列表ä¸" #: builtin/log.c:1382 msgid "cannot get patch id" msgstr "æ— æ³•å¾—åˆ°è¡¥ä¸ id" #: builtin/log.c:1441 msgid "use [PATCH n/m] even with a single patch" msgstr "使用 [PATCH n/m],å³ä½¿åªæœ‰ä¸€ä¸ªè¡¥ä¸" #: builtin/log.c:1444 msgid "use [PATCH] even with multiple patches" msgstr "使用 [PATCH],å³ä½¿æœ‰å¤šä¸ªè¡¥ä¸" #: builtin/log.c:1448 msgid "print patches to standard out" msgstr "打å°è¡¥ä¸åˆ°æ ‡å‡†è¾“出" #: builtin/log.c:1450 msgid "generate a cover letter" msgstr "生æˆä¸€å°é™„ä¿¡" #: builtin/log.c:1452 msgid "use simple number sequence for output file names" msgstr "使用简å•çš„æ•°å—åºåˆ—作为输出文件å" #: builtin/log.c:1453 msgid "sfx" msgstr "åŽç¼€" #: builtin/log.c:1454 msgid "use <sfx> instead of '.patch'" msgstr "使用 <åŽç¼€> 代替 '.patch'" #: builtin/log.c:1456 msgid "start numbering patches at <n> instead of 1" msgstr "è¡¥ä¸ä»¥ <n> 开始编å·ï¼Œè€Œä¸æ˜¯1" #: builtin/log.c:1458 msgid "mark the series as Nth re-roll" msgstr "æ ‡è®°è¡¥ä¸ç³»åˆ—æ˜¯ç¬¬å‡ æ¬¡é‡åˆ¶" #: builtin/log.c:1460 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "使用 [RFC PATCH] 代替 [PATCH]" #: builtin/log.c:1463 msgid "Use [<prefix>] instead of [PATCH]" msgstr "使用 [<å‰ç¼€>] 代替 [PATCH]" #: builtin/log.c:1466 msgid "store resulting files in <dir>" msgstr "把结果文件å˜å‚¨åœ¨ <目录>" #: builtin/log.c:1469 msgid "don't strip/add [PATCH]" msgstr "ä¸åˆ 除/æ·»åŠ [PATCH]" #: builtin/log.c:1472 msgid "don't output binary diffs" msgstr "ä¸è¾“出二进制差异" #: builtin/log.c:1474 msgid "output all-zero hash in From header" msgstr "在 From 头信æ¯ä¸è¾“出全为零的哈希值" #: builtin/log.c:1476 msgid "don't include a patch matching a commit upstream" msgstr "ä¸åŒ…å«å·²åœ¨ä¸Šæ¸¸æ交ä¸çš„è¡¥ä¸" #: builtin/log.c:1478 msgid "show patch format instead of default (patch + stat)" msgstr "显示纯补ä¸æ ¼å¼è€Œéžé»˜è®¤çš„(补ä¸+状æ€ï¼‰" #: builtin/log.c:1480 msgid "Messaging" msgstr "邮件å‘é€" #: builtin/log.c:1481 msgid "header" msgstr "header" #: builtin/log.c:1482 msgid "add email header" msgstr "æ·»åŠ é‚®ä»¶å¤´" #: builtin/log.c:1483 builtin/log.c:1485 msgid "email" msgstr "邮件地å€" #: builtin/log.c:1483 msgid "add To: header" msgstr "æ·»åŠ æ”¶ä»¶äºº" #: builtin/log.c:1485 msgid "add Cc: header" msgstr "æ·»åŠ æŠ„é€" #: builtin/log.c:1487 msgid "ident" msgstr "æ ‡è¯†" #: builtin/log.c:1488 msgid "set From address to <ident> (or committer ident if absent)" msgstr "å°† From 地å€è®¾ç½®ä¸º <æ ‡è¯†>(如若ä¸æ供,则用æ交者 ID åšä¸ºåœ°å€ï¼‰" #: builtin/log.c:1490 msgid "message-id" msgstr "é‚®ä»¶æ ‡è¯†" #: builtin/log.c:1491 msgid "make first mail a reply to <message-id>" msgstr "使第一å°é‚®ä»¶ä½œä¸ºå¯¹ <é‚®ä»¶æ ‡è¯†> 的回å¤" #: builtin/log.c:1492 builtin/log.c:1495 msgid "boundary" msgstr "边界" #: builtin/log.c:1493 msgid "attach the patch" msgstr "附件方å¼æ·»åŠ è¡¥ä¸" #: builtin/log.c:1496 msgid "inline the patch" msgstr "内è”显示补ä¸" #: builtin/log.c:1500 msgid "enable message threading, styles: shallow, deep" msgstr "å¯ç”¨é‚®ä»¶çº¿ç´¢ï¼Œé£Žæ ¼ï¼šæµ…,深" #: builtin/log.c:1502 msgid "signature" msgstr "ç¾å" #: builtin/log.c:1503 msgid "add a signature" msgstr "æ·»åŠ ä¸€ä¸ªç¾å" #: builtin/log.c:1504 msgid "base-commit" msgstr "基线æ交" #: builtin/log.c:1505 msgid "add prerequisite tree info to the patch series" msgstr "为补ä¸åˆ—è¡¨æ·»åŠ å‰ç½®æ ‘ä¿¡æ¯" #: builtin/log.c:1507 msgid "add a signature from a file" msgstr "ä»Žæ–‡ä»¶æ·»åŠ ä¸€ä¸ªç¾å" #: builtin/log.c:1508 msgid "don't print the patch filenames" msgstr "ä¸è¦æ‰“å°è¡¥ä¸æ–‡ä»¶å" #: builtin/log.c:1510 msgid "show progress while generating patches" msgstr "在生æˆè¡¥ä¸æ—¶æ˜¾ç¤ºè¿›åº¦" #: builtin/log.c:1585 #, c-format msgid "invalid ident line: %s" msgstr "包å«æ— æ•ˆçš„èº«ä»½æ ‡è¯†ï¼š%s" #: builtin/log.c:1600 msgid "-n and -k are mutually exclusive." msgstr "-n å’Œ -k 互斥。" #: builtin/log.c:1602 msgid "--subject-prefix/--rfc and -k are mutually exclusive." msgstr "--subject-prefix/--rfc å’Œ -k 互斥。" #: builtin/log.c:1610 msgid "--name-only does not make sense" msgstr "--name-only æ— æ„义" #: builtin/log.c:1612 msgid "--name-status does not make sense" msgstr "--name-status æ— æ„义" #: builtin/log.c:1614 msgid "--check does not make sense" msgstr "--check æ— æ„义" #: builtin/log.c:1646 msgid "standard output, or directory, which one?" msgstr "æ ‡å‡†è¾“å‡ºæˆ–ç›®å½•ï¼Œå“ªä¸€ä¸ªï¼Ÿ" #: builtin/log.c:1648 #, c-format msgid "Could not create directory '%s'" msgstr "ä¸èƒ½åˆ›å»ºç›®å½• '%s'" #: builtin/log.c:1741 #, c-format msgid "unable to read signature file '%s'" msgstr "æ— æ³•è¯»å–ç¾å文件 '%s'" #: builtin/log.c:1773 msgid "Generating patches" msgstr "生æˆè¡¥ä¸" #: builtin/log.c:1817 msgid "Failed to create output files" msgstr "æ— æ³•åˆ›å»ºè¾“å‡ºæ–‡ä»¶" #: builtin/log.c:1867 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<上游> [<头> [<é™åˆ¶>]]]" #: builtin/log.c:1921 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "ä¸èƒ½æ‰¾åˆ°è·Ÿè¸ªçš„远程分支,请手工指定 <上游>。\n" #: builtin/ls-files.c:468 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<选项>] [<文件>...]" #: builtin/ls-files.c:517 msgid "identify the file status with tags" msgstr "ç”¨æ ‡ç¾æ ‡è¯†æ–‡ä»¶çš„状æ€" #: builtin/ls-files.c:519 msgid "use lowercase letters for 'assume unchanged' files" msgstr "使用å°å†™å—æ¯è¡¨ç¤º 'å‡è®¾æœªæ”¹å˜çš„' 文件" #: builtin/ls-files.c:521 msgid "use lowercase letters for 'fsmonitor clean' files" msgstr "使用å°å†™å—æ¯è¡¨ç¤º 'fsmonitor clean' 文件" #: builtin/ls-files.c:523 msgid "show cached files in the output (default)" msgstr "显示缓å˜çš„文件(默认)" #: builtin/ls-files.c:525 msgid "show deleted files in the output" msgstr "æ˜¾ç¤ºå·²åˆ é™¤çš„æ–‡ä»¶" #: builtin/ls-files.c:527 msgid "show modified files in the output" msgstr "显示已修改的文件" #: builtin/ls-files.c:529 msgid "show other files in the output" msgstr "显示其它文件" #: builtin/ls-files.c:531 msgid "show ignored files in the output" msgstr "显示忽略的文件" #: builtin/ls-files.c:534 msgid "show staged contents' object name in the output" msgstr "显示暂å˜åŒºå†…容的对象å称" #: builtin/ls-files.c:536 msgid "show files on the filesystem that need to be removed" msgstr "显示文件系统需è¦åˆ 除的文件" #: builtin/ls-files.c:538 msgid "show 'other' directories' names only" msgstr "åªæ˜¾ç¤ºâ€œå…¶ä»–â€ç›®å½•çš„å称" #: builtin/ls-files.c:540 msgid "show line endings of files" msgstr "显示文件æ¢è¡Œç¬¦æ ¼å¼" #: builtin/ls-files.c:542 msgid "don't show empty directories" msgstr "ä¸æ˜¾ç¤ºç©ºç›®å½•" #: builtin/ls-files.c:545 msgid "show unmerged files in the output" msgstr "显示未åˆå¹¶çš„文件" #: builtin/ls-files.c:547 msgid "show resolve-undo information" msgstr "显示 resolve-undo ä¿¡æ¯" #: builtin/ls-files.c:549 msgid "skip files matching pattern" msgstr "匹é…排除文件的模å¼" #: builtin/ls-files.c:552 msgid "exclude patterns are read from <file>" msgstr "从 <文件> ä¸è¯»å–排除模å¼" #: builtin/ls-files.c:555 msgid "read additional per-directory exclude patterns in <file>" msgstr "从 <文件> 读å–é¢å¤–çš„æ¯ä¸ªç›®å½•çš„排除模å¼" #: builtin/ls-files.c:557 msgid "add the standard git exclusions" msgstr "æ·»åŠ æ ‡å‡†çš„ git 排除" #: builtin/ls-files.c:560 msgid "make the output relative to the project top directory" msgstr "显示相对于顶级目录的文件å" #: builtin/ls-files.c:563 msgid "recurse through submodules" msgstr "在å模组ä¸é€’å½’" #: builtin/ls-files.c:565 msgid "if any <file> is not in the index, treat this as an error" msgstr "如果任何 <文件> 都ä¸åœ¨ç´¢å¼•åŒºï¼Œè§†ä¸ºé”™è¯¯" #: builtin/ls-files.c:566 msgid "tree-ish" msgstr "æ ‘æˆ–æ交" #: builtin/ls-files.c:567 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "å‡è£…自从 <æ ‘æˆ–æ交> 之åŽåˆ 除的路径ä»ç„¶å˜åœ¨" #: builtin/ls-files.c:569 msgid "show debugging data" msgstr "显示调试数æ®" #: builtin/ls-remote.c:9 msgid "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" " [-q | --quiet] [--exit-code] [--get-url]\n" " [--symref] [<repository> [<refs>...]]" msgstr "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" " [-q | --quiet] [--exit-code] [--get-url]\n" " [--symref] [<仓库> [<引用>...]]" #: builtin/ls-remote.c:59 msgid "do not print remote URL" msgstr "ä¸æ‰“å°è¿œç¨‹ URL" #: builtin/ls-remote.c:60 builtin/ls-remote.c:62 msgid "exec" msgstr "exec" #: builtin/ls-remote.c:61 builtin/ls-remote.c:63 msgid "path of git-upload-pack on the remote host" msgstr "远程主机上的 git-upload-pack 路径" #: builtin/ls-remote.c:65 msgid "limit to tags" msgstr "ä»…é™äºŽæ ‡ç¾" #: builtin/ls-remote.c:66 msgid "limit to heads" msgstr "ä»…é™äºŽåˆ†æ”¯" #: builtin/ls-remote.c:67 msgid "do not show peeled tags" msgstr "ä¸æ˜¾ç¤ºå·²è§£æžçš„æ ‡ç¾" #: builtin/ls-remote.c:69 msgid "take url.<base>.insteadOf into account" msgstr "å‚考 url.<base>.insteadOf 设置" #: builtin/ls-remote.c:73 msgid "exit with exit code 2 if no matching refs are found" msgstr "若未找到匹é…的引用则以退出ç 2退出" #: builtin/ls-remote.c:76 msgid "show underlying ref in addition to the object pointed by it" msgstr "除了显示指å‘的对象外,显示指å‘的引用å" #: builtin/ls-tree.c:29 msgid "git ls-tree [<options>] <tree-ish> [<path>...]" msgstr "git ls-tree [<选项>] <æ ‘æˆ–æ交> [<路径>...]" #: builtin/ls-tree.c:127 msgid "only show trees" msgstr "åªæ˜¾ç¤ºæ ‘" #: builtin/ls-tree.c:129 msgid "recurse into subtrees" msgstr "递归到åæ ‘" #: builtin/ls-tree.c:131 msgid "show trees when recursing" msgstr "å½“é€’å½’æ—¶æ˜¾ç¤ºæ ‘" #: builtin/ls-tree.c:134 msgid "terminate entries with NUL byte" msgstr "æ¡ç›®ä»¥ NUL å—符终æ¢" #: builtin/ls-tree.c:135 msgid "include object size" msgstr "包括对象大å°" #: builtin/ls-tree.c:137 builtin/ls-tree.c:139 msgid "list only filenames" msgstr "åªåˆ—出文件å" #: builtin/ls-tree.c:142 msgid "use full path names" msgstr "使用文件的全路径" #: builtin/ls-tree.c:144 msgid "list entire tree; not just current directory (implies --full-name)" msgstr "åˆ—å‡ºæ•´ä¸ªæ ‘ï¼›ä¸ä»…仅当å‰ç›®å½•ï¼ˆéšå« --full-name)" #: builtin/mailsplit.c:241 #, c-format msgid "empty mbox: '%s'" msgstr "空的 mbox:'%s'" #: builtin/merge.c:51 msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<选项>] [<æ交>...]" #: builtin/merge.c:52 msgid "git merge --abort" msgstr "git merge --abort" #: builtin/merge.c:53 msgid "git merge --continue" msgstr "git merge --continue" #: builtin/merge.c:110 msgid "switch `m' requires a value" msgstr "开关 `m' 需è¦ä¸€ä¸ªå€¼" #: builtin/merge.c:147 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "ä¸èƒ½æ‰¾åˆ°åˆå¹¶ç–ç•¥ '%s'。\n" #: builtin/merge.c:148 #, c-format msgid "Available strategies are:" msgstr "å¯ç”¨çš„ç–略有:" #: builtin/merge.c:153 #, c-format msgid "Available custom strategies are:" msgstr "å¯ç”¨çš„自定义ç–略有:" #: builtin/merge.c:203 builtin/pull.c:142 msgid "do not show a diffstat at the end of the merge" msgstr "在åˆå¹¶çš„最åŽä¸æ˜¾ç¤ºå·®å¼‚统计" #: builtin/merge.c:206 builtin/pull.c:145 msgid "show a diffstat at the end of the merge" msgstr "在åˆå¹¶çš„最åŽæ˜¾ç¤ºå·®å¼‚统计" #: builtin/merge.c:207 builtin/pull.c:148 msgid "(synonym to --stat)" msgstr "(和 --stat åŒä¹‰ï¼‰" #: builtin/merge.c:209 builtin/pull.c:151 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "在åˆå¹¶æ交信æ¯ä¸æ·»åŠ (最多 <n> æ¡ï¼‰ç²¾ç®€æ交记录" #: builtin/merge.c:212 builtin/pull.c:157 msgid "create a single commit instead of doing a merge" msgstr "创建一个å•ç‹¬çš„æ交而ä¸æ˜¯åšä¸€æ¬¡åˆå¹¶" #: builtin/merge.c:214 builtin/pull.c:160 msgid "perform a commit if the merge succeeds (default)" msgstr "如果åˆå¹¶æˆåŠŸï¼Œæ‰§è¡Œä¸€æ¬¡æ交(默认)" #: builtin/merge.c:216 builtin/pull.c:163 msgid "edit message before committing" msgstr "在æ交å‰ç¼–辑æ交说明" #: builtin/merge.c:217 msgid "allow fast-forward (default)" msgstr "å…许快进(默认)" #: builtin/merge.c:219 builtin/pull.c:169 msgid "abort if fast-forward is not possible" msgstr "如果ä¸èƒ½å¿«è¿›å°±æ”¾å¼ƒåˆå¹¶" #: builtin/merge.c:223 builtin/pull.c:172 msgid "verify that the named commit has a valid GPG signature" msgstr "验è¯æŒ‡å®šçš„æ交是å¦åŒ…å«ä¸€ä¸ªæœ‰æ•ˆçš„ GPG ç¾å" #: builtin/merge.c:224 builtin/notes.c:777 builtin/pull.c:176 #: builtin/revert.c:109 msgid "strategy" msgstr "ç–ç•¥" #: builtin/merge.c:225 builtin/pull.c:177 msgid "merge strategy to use" msgstr "è¦ä½¿ç”¨çš„åˆå¹¶ç–ç•¥" #: builtin/merge.c:226 builtin/pull.c:180 msgid "option=value" msgstr "option=value" #: builtin/merge.c:227 builtin/pull.c:181 msgid "option for selected merge strategy" msgstr "所选的åˆå¹¶ç–略的选项" #: builtin/merge.c:229 msgid "merge commit message (for a non-fast-forward merge)" msgstr "åˆå¹¶çš„æ交说明(针对éžå¿«è¿›å¼åˆå¹¶ï¼‰" #: builtin/merge.c:233 msgid "abort the current in-progress merge" msgstr "放弃当å‰æ£åœ¨è¿›è¡Œçš„åˆå¹¶" #: builtin/merge.c:235 msgid "continue the current in-progress merge" msgstr "继ç»å½“å‰æ£åœ¨è¿›è¡Œçš„åˆå¹¶" #: builtin/merge.c:237 builtin/pull.c:188 msgid "allow merging unrelated histories" msgstr "å…许åˆå¹¶ä¸ç›¸å…³çš„历å²" #: builtin/merge.c:243 msgid "verify commit-msg hook" msgstr "æ ¡éªŒ commit-msg é’©å" #: builtin/merge.c:268 msgid "could not run stash." msgstr "ä¸èƒ½è¿è¡Œè´®è—。" #: builtin/merge.c:273 msgid "stash failed" msgstr "è´®è—失败" #: builtin/merge.c:278 #, c-format msgid "not a valid object: %s" msgstr "ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆå¯¹è±¡ï¼š%s" #: builtin/merge.c:300 builtin/merge.c:317 msgid "read-tree failed" msgstr "读å–æ ‘å¤±è´¥" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: builtin/merge.c:347 msgid " (nothing to squash)" msgstr " ï¼ˆæ— å¯åŽ‹ç¼©ï¼‰" #: builtin/merge.c:358 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "压缩æ交 -- 未更新 HEAD\n" #: builtin/merge.c:408 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "æ— åˆå¹¶ä¿¡æ¯ -- 未更新 HEAD\n" #: builtin/merge.c:458 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' 没有指å‘一个æ交" #: builtin/merge.c:548 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "åçš„ branch.%s.mergeoptions å—符串:%s" #: builtin/merge.c:669 msgid "Not handling anything other than two heads merge." msgstr "未处ç†ä¸¤ä¸ªå¤´åˆå¹¶ä¹‹å¤–的任何æ“作。" #: builtin/merge.c:683 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "merge-recursive 的未知选项:-X%s" #: builtin/merge.c:698 #, c-format msgid "unable to write %s" msgstr "ä¸èƒ½å†™ %s" #: builtin/merge.c:749 #, c-format msgid "Could not read from '%s'" msgstr "ä¸èƒ½ä»Ž '%s' 读å–" #: builtin/merge.c:758 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "未æ交åˆå¹¶ï¼Œä½¿ç”¨ 'git commit' 完æˆæ¤æ¬¡åˆå¹¶ã€‚\n" #: builtin/merge.c:764 #, 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:800 msgid "Empty commit message." msgstr "空æ交信æ¯ã€‚" #: builtin/merge.c:819 #, c-format msgid "Wonderful.\n" msgstr "太棒了。\n" #: builtin/merge.c:872 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "自动åˆå¹¶å¤±è´¥ï¼Œä¿®æ£å†²çªç„¶åŽæ交修æ£çš„结果。\n" #: builtin/merge.c:911 msgid "No current branch." msgstr "没有当å‰åˆ†æ”¯ã€‚" #: builtin/merge.c:913 msgid "No remote for the current branch." msgstr "当å‰åˆ†æ”¯æ²¡æœ‰å¯¹åº”的远程仓库。" #: builtin/merge.c:915 msgid "No default upstream defined for the current branch." msgstr "当å‰åˆ†æ”¯æ²¡æœ‰å®šä¹‰é»˜è®¤çš„上游分支。" #: builtin/merge.c:920 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "对于 %s 没有æ¥è‡ª %s 的远程跟踪分支" #: builtin/merge.c:973 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "环境 '%2$s' ä¸å˜åœ¨åçš„å–值 '%1$s'" #: builtin/merge.c:1075 #, c-format msgid "not something we can merge in %s: %s" msgstr "ä¸èƒ½åœ¨ %s ä¸åˆå¹¶ï¼š%s" #: builtin/merge.c:1109 msgid "not something we can merge" msgstr "ä¸èƒ½åˆå¹¶" #: builtin/merge.c:1211 msgid "--abort expects no arguments" msgstr "--abort ä¸å¸¦å‚æ•°" #: builtin/merge.c:1215 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "没有è¦ç»ˆæ¢çš„åˆå¹¶ï¼ˆMERGE_HEAD 丢失)。" #: builtin/merge.c:1227 msgid "--continue expects no arguments" msgstr "--continue ä¸å¸¦å‚æ•°" #: builtin/merge.c:1231 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "没有进行ä¸çš„åˆå¹¶ï¼ˆMERGE_HEAD 丢失)。" #: builtin/merge.c:1247 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" "您尚未结æŸæ‚¨çš„åˆå¹¶ï¼ˆå˜åœ¨ MERGE_HEAD)。\n" "请在åˆå¹¶å‰å…ˆæ交您的修改。" #: builtin/merge.c:1254 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" "您尚未结æŸæ‚¨çš„拣选(å˜åœ¨ CHERRY_PICK_HEAD)。\n" "请在åˆå¹¶å‰å…ˆæ交您的修改。" #: builtin/merge.c:1257 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "您尚未结æŸæ‚¨çš„拣选(å˜åœ¨ CHERRY_PICK_HEAD)。" #: builtin/merge.c:1266 msgid "You cannot combine --squash with --no-ff." msgstr "您ä¸èƒ½å°† --squash 与 --no-ff åŒæ—¶ä½¿ç”¨ã€‚" #: builtin/merge.c:1274 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "未指定æ交并且 merge.defaultToUpstream 未设置。" #: builtin/merge.c:1291 msgid "Squash commit into empty head not supported yet" msgstr "å°šä¸æ”¯æŒåˆ°ç©ºåˆ†æ”¯çš„压缩æ交" #: builtin/merge.c:1293 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "到空分支的éžå¿«è¿›å¼æ交没有æ„义" #: builtin/merge.c:1298 #, c-format msgid "%s - not something we can merge" msgstr "%s - ä¸èƒ½è¢«åˆå¹¶" #: builtin/merge.c:1300 msgid "Can merge only exactly one commit into empty head" msgstr "åªèƒ½å°†ä¸€ä¸ªæ交åˆå¹¶åˆ°ç©ºåˆ†æ”¯ä¸Š" #: builtin/merge.c:1334 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "æ交 %s 有一个éžå¯ä¿¡çš„声称æ¥è‡ª %s çš„ GPG ç¾å。" #: builtin/merge.c:1337 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "æ交 %s 有一个错误的声称æ¥è‡ª %s çš„ GPG ç¾å。" #: builtin/merge.c:1340 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "æ交 %s 没有一个 GPG ç¾å。" #: builtin/merge.c:1343 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "æ交 %s 有一个æ¥è‡ª %s 的好的 GPG ç¾å。\n" #: builtin/merge.c:1402 msgid "refusing to merge unrelated histories" msgstr "æ‹’ç»åˆå¹¶æ— 关的历å²" #: builtin/merge.c:1411 msgid "Already up to date." msgstr "å·²ç»æ˜¯æœ€æ–°çš„。" #: builtin/merge.c:1421 #, c-format msgid "Updating %s..%s\n" msgstr "æ›´æ–° %s..%s\n" #: builtin/merge.c:1462 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "å°è¯•éžå¸¸å°çš„索引内åˆå¹¶...\n" #: builtin/merge.c:1469 #, c-format msgid "Nope.\n" msgstr "æ— ã€‚\n" #: builtin/merge.c:1494 msgid "Already up to date. Yeeah!" msgstr "å·²ç»æ˜¯æœ€æ–°çš„。耶ï¼" #: builtin/merge.c:1500 msgid "Not possible to fast-forward, aborting." msgstr "æ— æ³•å¿«è¿›ï¼Œç»ˆæ¢ã€‚" #: builtin/merge.c:1523 builtin/merge.c:1602 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "å°†æ ‘å›žæ»šè‡³åŽŸå§‹çŠ¶æ€...\n" #: builtin/merge.c:1527 #, c-format msgid "Trying merge strategy %s...\n" msgstr "å°è¯•åˆå¹¶ç–ç•¥ %s...\n" #: builtin/merge.c:1593 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "没有åˆå¹¶ç–略处ç†æ¤åˆå¹¶ã€‚\n" #: builtin/merge.c:1595 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "使用ç–ç•¥ %s åˆå¹¶å¤±è´¥ã€‚\n" #: builtin/merge.c:1604 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "使用 %s 以准备手工解决。\n" #: builtin/merge.c:1616 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "自动åˆå¹¶è¿›å±•é¡ºåˆ©ï¼ŒæŒ‰è¦æ±‚在æ交å‰åœæ¢\n" #: builtin/merge-base.c:30 msgid "git merge-base [-a | --all] <commit> <commit>..." msgstr "git merge-base [-a | --all] <æ交> <æ交>..." #: builtin/merge-base.c:31 msgid "git merge-base [-a | --all] --octopus <commit>..." msgstr "git merge-base [-a | --all] --octopus <æ交>..." #: builtin/merge-base.c:32 msgid "git merge-base --independent <commit>..." msgstr "git merge-base --independent <æ交>..." #: builtin/merge-base.c:33 msgid "git merge-base --is-ancestor <commit> <commit>" msgstr "git merge-base --is-ancestor <æ交> <æ交>" #: builtin/merge-base.c:34 msgid "git merge-base --fork-point <ref> [<commit>]" msgstr "git merge-base --fork-point <引用> [<æ交>]" #: builtin/merge-base.c:220 msgid "output all common ancestors" msgstr "输出所有共åŒçš„祖先" #: builtin/merge-base.c:222 msgid "find ancestors for a single n-way merge" msgstr "查找一个多路åˆå¹¶çš„祖先æ交" #: builtin/merge-base.c:224 msgid "list revs not reachable from others" msgstr "显示ä¸èƒ½è¢«å…¶ä»–访问到的版本" #: builtin/merge-base.c:226 msgid "is the first one ancestor of the other?" msgstr "第一个是其他的祖先æ交么?" #: builtin/merge-base.c:228 msgid "find where <commit> forked from reflog of <ref>" msgstr "æ ¹æ® <引用> 的引用日志查找 <æ交> 的派生处" #: builtin/merge-file.c:9 msgid "" "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " "<orig-file> <file2>" msgstr "" "git merge-file [<选项>] [-L <文件1> [-L <åˆå§‹> [-L <åå—2>]]] <文件1> <åˆå§‹æ–‡" "件> <文件2>" #: 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 "为 文件1/åˆå§‹æ–‡ä»¶/文件2 è®¾ç½®æ ‡ç¾" #: builtin/merge-recursive.c:45 #, c-format msgid "unknown option %s" msgstr "未知选项 %s" #: builtin/merge-recursive.c:51 #, c-format msgid "could not parse object '%s'" msgstr "ä¸èƒ½è§£æžå¯¹è±¡ '%s'" #: builtin/merge-recursive.c:55 #, c-format msgid "cannot handle more than %d base. Ignoring %s." msgid_plural "cannot handle more than %d bases. Ignoring %s." msgstr[0] "æ— æ³•å¤„ç† %d æ¡ä»¥ä¸Šçš„基线。忽略 %s。" msgstr[1] "æ— æ³•å¤„ç† %d æ¡ä»¥ä¸Šçš„基线。忽略 %s。" #: builtin/merge-recursive.c:63 msgid "not handling anything other than two heads merge." msgstr "ä¸èƒ½å¤„ç†ä¸¤ä¸ªå¤´åˆå¹¶ä¹‹å¤–的任何æ“作。" #: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71 #, c-format msgid "could not resolve ref '%s'" msgstr "æ— æ³•è§£æžå¼•ç”¨ '%s'" #: builtin/merge-recursive.c:77 #, c-format msgid "Merging %s with %s\n" msgstr "åˆå¹¶ %s å’Œ %s\n" #: builtin/mktree.c:65 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:25 msgid "allow missing objects" msgstr "å…许丢失的对象" #: builtin/mktree.c:155 msgid "allow creation of more than one tree" msgstr "å…è®¸åˆ›å»ºä¸€ä¸ªä»¥ä¸Šçš„æ ‘" #: builtin/mv.c:17 msgid "git mv [<options>] <source>... <destination>" msgstr "git mv [<选项>] <æº>... <ç›®æ ‡>" #: builtin/mv.c:82 #, c-format msgid "Directory %s is in index and no submodule?" msgstr "目录 %s 在索引ä¸å¹¶ä¸”ä¸æ˜¯å模组?" #: builtin/mv.c:84 builtin/rm.c:288 msgid "Please stage your changes to .gitmodules or stash them to proceed" msgstr "请将您的修改暂å˜åˆ° .gitmodules ä¸æˆ–è´®è—åŽå†ç»§ç»" #: builtin/mv.c:102 #, c-format msgid "%.*s is in index" msgstr "%.*s 在索引ä¸" #: builtin/mv.c:124 msgid "force move/rename even if target exists" msgstr "强制移动/é‡å‘½ä»¤ï¼Œå³ä½¿ç›®æ ‡å˜åœ¨" #: builtin/mv.c:126 msgid "skip move/rename errors" msgstr "跳过移动/é‡å‘½å错误" #: builtin/mv.c:168 #, c-format msgid "destination '%s' is not a directory" msgstr "ç›®æ ‡ '%s' ä¸æ˜¯ä¸€ä¸ªç›®å½•" #: builtin/mv.c:179 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "检查 '%s' 到 '%s' çš„é‡å‘½å\n" #: builtin/mv.c:183 msgid "bad source" msgstr "åçš„æº" #: builtin/mv.c:186 msgid "can not move directory into itself" msgstr "ä¸èƒ½å°†ç›®å½•ç§»åŠ¨åˆ°è‡ªèº«" #: builtin/mv.c:189 msgid "cannot move directory over file" msgstr "ä¸èƒ½å°†ç›®å½•ç§»åŠ¨åˆ°æ–‡ä»¶" #: builtin/mv.c:198 msgid "source directory is empty" msgstr "æºç›®å½•ä¸ºç©º" #: builtin/mv.c:223 msgid "not under version control" msgstr "ä¸åœ¨ç‰ˆæœ¬æŽ§åˆ¶ä¹‹ä¸‹" #: builtin/mv.c:226 msgid "destination exists" msgstr "ç›®æ ‡å·²å˜åœ¨" #: builtin/mv.c:234 #, c-format msgid "overwriting '%s'" msgstr "覆盖 '%s'" #: builtin/mv.c:237 msgid "Cannot overwrite" msgstr "ä¸èƒ½è¦†ç›–" #: builtin/mv.c:240 msgid "multiple sources for the same target" msgstr "åŒä¸€ç›®æ ‡å…·æœ‰å¤šä¸ªæº" #: builtin/mv.c:242 msgid "destination directory does not exist" msgstr "ç›®æ ‡ç›®å½•ä¸å˜åœ¨" #: builtin/mv.c:249 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s,æº=%sï¼Œç›®æ ‡=%s" #: builtin/mv.c:270 #, c-format msgid "Renaming %s to %s\n" msgstr "é‡å‘½å %s 至 %s\n" #: builtin/mv.c:276 builtin/remote.c:715 builtin/repack.c:409 #, c-format msgid "renaming '%s' failed" msgstr "é‡å‘½å '%s' 失败" #: builtin/name-rev.c:338 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<选项>] <æ交>..." #: builtin/name-rev.c:339 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<选项>] --all" #: builtin/name-rev.c:340 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<选项>] --stdin" #: builtin/name-rev.c:395 msgid "print only names (no SHA-1)" msgstr "åªæ‰“å°åç§°ï¼ˆæ— SHA-1)" #: builtin/name-rev.c:396 msgid "only use tags to name the commits" msgstr "åªä½¿ç”¨æ ‡ç¾æ¥å‘½åæ交" #: builtin/name-rev.c:398 msgid "only use refs matching <pattern>" msgstr "åªä½¿ç”¨å’Œ <模å¼> 相匹é…的引用" #: builtin/name-rev.c:400 msgid "ignore refs matching <pattern>" msgstr "忽略和 <模å¼> 相匹é…的引用" #: builtin/name-rev.c:402 msgid "list all commits reachable from all refs" msgstr "列出å¯ä»¥ä»Žæ‰€æœ‰å¼•ç”¨è®¿é—®çš„æ交" #: builtin/name-rev.c:403 msgid "read from stdin" msgstr "ä»Žæ ‡å‡†è¾“å…¥è¯»å–" #: builtin/name-rev.c:404 msgid "allow to print `undefined` names (default)" msgstr "å…è®¸æ‰“å° `未定义` çš„å称(默认)" #: builtin/name-rev.c:410 msgid "dereference tags in the input (internal use)" 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] [--allow-empty] [-m <msg> | -F <file> " "| (-c | -C) <object>] [<object>]" msgstr "" "git notes [--ref <注解引用>] add [-f] [--allow-empty] [-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 [--allow-empty] [-m <msg> | -F <file> | " "(-c | -C) <object>] [<object>]" msgstr "" "git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | " "(-c | -C) <对象>] [<对象>]" #: builtin/notes.c:30 msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]" msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]" #: 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:95 msgid "Write/edit the notes for the following object:" msgstr "为下é¢çš„对象写/编辑说明:" #: builtin/notes.c:148 #, c-format msgid "unable to start 'show' for object '%s'" msgstr "ä¸èƒ½ä¸ºå¯¹è±¡ '%s' 开始 'show'" #: builtin/notes.c:152 msgid "could not read 'show' output" msgstr "ä¸èƒ½è¯»å– 'show' 的输出" #: builtin/notes.c:160 #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "æ— æ³•ä¸ºå¯¹è±¡ '%s' å®Œæˆ 'show'" #: builtin/notes.c:195 msgid "please supply the note contents using either -m or -F option" msgstr "请通过 -m 或 -F 选项为注解æ供内容" #: builtin/notes.c:204 msgid "unable to write note object" msgstr "ä¸èƒ½å†™æ³¨è§£å¯¹è±¡" #: builtin/notes.c:206 #, c-format msgid "the note contents have been left in %s" msgstr "注解内容被留在 %s ä¸" #: builtin/notes.c:234 builtin/tag.c:507 #, c-format msgid "cannot read '%s'" msgstr "ä¸èƒ½è¯»å– '%s'" #: builtin/notes.c:236 builtin/tag.c:510 #, c-format msgid "could not open or read '%s'" msgstr "ä¸èƒ½æ‰“å¼€æˆ–è¯»å– '%s'" #: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308 #: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:517 #: builtin/notes.c:522 builtin/notes.c:600 builtin/notes.c:662 #, c-format msgid "failed to resolve '%s' as a valid ref." msgstr "æ— æ³•è§£æž '%s' 为一个有效引用。" #: builtin/notes.c:258 #, c-format msgid "failed to read object '%s'." msgstr "æ— æ³•è¯»å–对象 '%s'。" #: builtin/notes.c:262 #, c-format msgid "cannot read note data from non-blob object '%s'." msgstr "ä¸èƒ½ä»Žéžæ•°æ®å¯¹è±¡ '%s' ä¸è¯»å–注解数æ®ã€‚" #: builtin/notes.c:302 #, c-format msgid "malformed input line: '%s'." msgstr "æ ¼å¼é”™è¯¯çš„输入行:'%s'。" #: builtin/notes.c:317 #, c-format msgid "failed to copy notes from '%s' to '%s'" msgstr "从 '%s' æ‹·è´æ³¨è§£åˆ° '%s' 时失败" #. TRANSLATORS: the first %s will be replaced by a git #. notes command: 'add', 'merge', 'remove', etc. #. #: builtin/notes.c:349 #, c-format msgid "refusing to %s notes in %s (outside of refs/notes/)" msgstr "æ‹’ç»å‘ %2$s(在 refs/notes/ 之外)%1$s注解" #: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:500 #: builtin/notes.c:512 builtin/notes.c:588 builtin/notes.c:655 #: builtin/notes.c:805 builtin/notes.c:952 builtin/notes.c:973 msgid "too many parameters" msgstr "å‚数太多" #: builtin/notes.c:382 builtin/notes.c:668 #, c-format msgid "no note found for object %s." msgstr "未å‘现对象 %s 的注解。" #: builtin/notes.c:403 builtin/notes.c:566 msgid "note contents as a string" msgstr "注解内容作为一个å—符串" #: builtin/notes.c:406 builtin/notes.c:569 msgid "note contents in a file" msgstr "注解内容到一个文件ä¸" #: builtin/notes.c:409 builtin/notes.c:572 msgid "reuse and edit specified note object" msgstr "é‡ç”¨å’Œç¼–辑指定的注解对象" #: builtin/notes.c:412 builtin/notes.c:575 msgid "reuse specified note object" msgstr "é‡ç”¨æŒ‡å®šçš„注解对象" #: builtin/notes.c:415 builtin/notes.c:578 msgid "allow storing empty note" msgstr "å…许ä¿å˜ç©ºç™½æ³¨é‡Š" #: builtin/notes.c:416 builtin/notes.c:487 msgid "replace existing notes" msgstr "替æ¢å·²å˜åœ¨çš„注解" #: builtin/notes.c:441 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "ä¸èƒ½æ·»åŠ 注解。å‘现对象 %s å·²å˜åœ¨æ³¨è§£ã€‚使用 '-f' 覆盖现å˜æ³¨è§£" #: builtin/notes.c:456 builtin/notes.c:535 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "覆盖对象 %s 现å˜æ³¨è§£\n" #: builtin/notes.c:467 builtin/notes.c:627 builtin/notes.c:892 #, c-format msgid "Removing note for object %s\n" msgstr "åˆ é™¤å¯¹è±¡ %s 的注解\n" #: builtin/notes.c:488 msgid "read objects from stdin" msgstr "ä»Žæ ‡å‡†è¾“å…¥è¯»å–对象" #: builtin/notes.c:490 msgid "load rewriting config for <command> (implies --stdin)" msgstr "é‡æ–°åŠ è½½ <命令> çš„é…置(éšå« --stdin)" #: builtin/notes.c:508 msgid "too few parameters" msgstr "å‚数太少" #: builtin/notes.c:529 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "ä¸èƒ½æ‹·è´æ³¨è§£ã€‚å‘现对象 %s å·²å˜åœ¨æ³¨è§£ã€‚使用 '-f' 覆盖现å˜æ³¨è§£" #: builtin/notes.c:541 #, c-format msgid "missing notes on source object %s. Cannot copy." msgstr "æºå¯¹è±¡ %s 缺少注解。ä¸èƒ½æ‹·è´ã€‚" #: builtin/notes.c:593 #, 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:688 msgid "failed to delete ref NOTES_MERGE_PARTIAL" msgstr "æ— æ³•åˆ é™¤å¼•ç”¨ NOTES_MERGE_PARTIAL" #: builtin/notes.c:690 msgid "failed to delete ref NOTES_MERGE_REF" msgstr "æ— æ³•åˆ é™¤å¼•ç”¨ NOTES_MERGE_REF" #: builtin/notes.c:692 msgid "failed to remove 'git notes merge' worktree" msgstr "æ— æ³•åˆ é™¤ 'git notes merge' 工作区" #: builtin/notes.c:712 msgid "failed to read ref NOTES_MERGE_PARTIAL" msgstr "æ— æ³•è¯»å–引用 NOTES_MERGE_PARTIAL" #: builtin/notes.c:714 msgid "could not find commit from NOTES_MERGE_PARTIAL." msgstr "æ— æ³•ä»Ž NOTES_MERGE_PARTIAL ä¸æ‰¾åˆ°æ交。" #: builtin/notes.c:716 msgid "could not parse commit from NOTES_MERGE_PARTIAL." msgstr "æ— æ³•ä»Ž NOTES_MERGE_PARTIAL ä¸è§£æžæ交。" #: builtin/notes.c:729 msgid "failed to resolve NOTES_MERGE_REF" msgstr "æ— æ³•è§£æž NOTES_MERGE_REF" #: builtin/notes.c:732 msgid "failed to finalize notes merge" msgstr "æ— æ³•å®Œæˆæ³¨è§£åˆå¹¶" #: builtin/notes.c:758 #, c-format msgid "unknown notes merge strategy %s" msgstr "未知的注解åˆå¹¶ç–ç•¥ %s" #: builtin/notes.c:774 msgid "General options" msgstr "通用选项" #: builtin/notes.c:776 msgid "Merge options" msgstr "åˆå¹¶é€‰é¡¹" #: builtin/notes.c:778 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:780 msgid "Committing unmerged notes" msgstr "æ交未åˆå¹¶çš„注解" #: builtin/notes.c:782 msgid "finalize notes merge by committing unmerged notes" msgstr "通过æ交未åˆå¹¶çš„注解æ¥å®Œæˆæ³¨è§£åˆå¹¶" #: builtin/notes.c:784 msgid "Aborting notes merge resolution" msgstr "ä¸æ¢æ³¨è§£åˆå¹¶çš„方案" #: builtin/notes.c:786 msgid "abort notes merge" msgstr "ä¸æ¢æ³¨è§£åˆå¹¶" #: builtin/notes.c:797 msgid "cannot mix --commit, --abort or -s/--strategy" msgstr "ä¸èƒ½æ··ç”¨ --commitã€--abort 或 -s/--strategy" #: builtin/notes.c:802 msgid "must specify a notes ref to merge" msgstr "必须指定一个注解引用æ¥åˆå¹¶" #: builtin/notes.c:826 #, c-format msgid "unknown -s/--strategy: %s" msgstr "未知的 -s/--strategy:%s" #: builtin/notes.c:863 #, c-format msgid "a notes merge into %s is already in-progress at %s" msgstr "ä½äºŽ %2$s 的一个到 %1$s ä¸çš„注解åˆå¹¶æ£åœ¨æ‰§è¡Œä¸" #: builtin/notes.c:866 #, c-format msgid "failed to store link to current notes ref (%s)" msgstr "æ— æ³•å˜å‚¨é“¾æŽ¥åˆ°å½“å‰çš„注解引用(%s)" #: builtin/notes.c:868 #, c-format msgid "" "Automatic notes merge failed. Fix conflicts in %s and commit the result with " "'git notes merge --commit', or abort the merge with 'git notes merge --" "abort'.\n" msgstr "" "自动åˆå¹¶è¯´æ˜Žå¤±è´¥ã€‚修改 %s ä¸çš„冲çªå¹¶ä¸”使用命令 'git notes merge --commit' æ" "交结果,或者使用命令 'git notes merge --abort' 终æ¢åˆå¹¶ã€‚\n" #: builtin/notes.c:890 #, c-format msgid "Object %s has no note\n" msgstr "对象 %s 没有注解\n" #: builtin/notes.c:902 msgid "attempt to remove non-existent note is not an error" msgstr "å°è¯•åˆ 除ä¸å˜åœ¨çš„注解ä¸æ˜¯ä¸€ä¸ªé”™è¯¯" #: builtin/notes.c:905 msgid "read object names from the standard input" msgstr "ä»Žæ ‡å‡†è¾“å…¥è¯»å–对象å称" #: builtin/notes.c:943 builtin/prune.c:107 builtin/worktree.c:151 msgid "do not remove, show only" msgstr "ä¸åˆ 除,åªæ˜¾ç¤º" #: builtin/notes.c:944 msgid "report pruned notes" msgstr "报告清除的注解" #: builtin/notes.c:986 msgid "notes-ref" msgstr "注解引用" #: builtin/notes.c:987 msgid "use notes from <notes-ref>" msgstr "从 <注解引用> 使用注解" #: builtin/notes.c:1022 #, c-format msgid "unknown subcommand: %s" msgstr "未知å命令:%s" #: builtin/pack-objects.c:48 msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]" #: builtin/pack-objects.c:49 msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "git pack-objects [<选项>...] <å‰ç¼€å称> [< <引用列表> | < <对象列表>]" #: builtin/pack-objects.c:211 builtin/pack-objects.c:214 #, c-format msgid "deflate error (%d)" msgstr "压缩错误 (%d)" #: builtin/pack-objects.c:810 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "ç¦ç”¨ bitmap å†™å…¥ï¼Œå› ä¸º pack.packSizeLimit 设置使得包被切分为多个" #: builtin/pack-objects.c:823 msgid "Writing objects" msgstr "写入对象ä¸" #: builtin/pack-objects.c:1106 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "ç¦ç”¨ bitmap å†™å…¥ï¼Œå› ä¸ºä¸€äº›å¯¹è±¡å°†ä¸ä¼šè¢«æ‰“包" #: builtin/pack-objects.c:1765 msgid "Counting objects" msgstr "对象计数ä¸" #: builtin/pack-objects.c:1895 #, c-format msgid "unable to get size of %s" msgstr "ä¸èƒ½å¾—到 %s 的大å°" #: builtin/pack-objects.c:1910 #, c-format msgid "unable to parse object header of %s" msgstr "æ— æ³•è§£æžå¯¹è±¡ %s 头信æ¯" #: builtin/pack-objects.c:2564 msgid "Compressing objects" msgstr "压缩对象ä¸" #: builtin/pack-objects.c:2735 msgid "invalid value for --missing" msgstr "选项 --missing çš„å€¼æ— æ•ˆ" #: builtin/pack-objects.c:3067 #, c-format msgid "unsupported index version %s" msgstr "ä¸æ”¯æŒçš„索引版本 %s" #: builtin/pack-objects.c:3071 #, c-format msgid "bad index version '%s'" msgstr "å的索引版本 '%s'" #: builtin/pack-objects.c:3102 msgid "do not show progress meter" msgstr "ä¸æ˜¾ç¤ºè¿›åº¦è¡¨" #: builtin/pack-objects.c:3104 msgid "show progress meter" msgstr "显示进度表" #: builtin/pack-objects.c:3106 msgid "show progress meter during object writing phase" msgstr "在对象写入阶段显示进度表" #: builtin/pack-objects.c:3109 msgid "similar to --all-progress when progress meter is shown" msgstr "当进度表显示时类似于 --all-progress" #: builtin/pack-objects.c:3110 msgid "version[,offset]" msgstr "版本[,å移]" #: builtin/pack-objects.c:3111 msgid "write the pack index file in the specified idx format version" msgstr "用指定的 idx æ ¼å¼ç‰ˆæœ¬æ¥å†™åŒ…索引文件" #: builtin/pack-objects.c:3114 msgid "maximum size of each output pack file" msgstr "æ¯ä¸ªè¾“出包的最大尺寸" #: builtin/pack-objects.c:3116 msgid "ignore borrowed objects from alternate object store" msgstr "忽略从备用对象å˜å‚¨é‡Œå€Ÿç”¨å¯¹è±¡" #: builtin/pack-objects.c:3118 msgid "ignore packed objects" msgstr "忽略包对象" #: builtin/pack-objects.c:3120 msgid "limit pack window by objects" msgstr "é™åˆ¶æ‰“包窗å£çš„对象数" #: builtin/pack-objects.c:3122 msgid "limit pack window by memory in addition to object limit" msgstr "除对象数é‡é™åˆ¶å¤–设置打包窗å£çš„内å˜é™åˆ¶" #: builtin/pack-objects.c:3124 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "打包å…许的 delta 链的最大长度" #: builtin/pack-objects.c:3126 msgid "reuse existing deltas" msgstr "é‡ç”¨å·²å˜åœ¨çš„ deltas" #: builtin/pack-objects.c:3128 msgid "reuse existing objects" msgstr "é‡ç”¨å·²å˜åœ¨çš„对象" #: builtin/pack-objects.c:3130 msgid "use OFS_DELTA objects" msgstr "使用 OFS_DELTA 对象" #: builtin/pack-objects.c:3132 msgid "use threads when searching for best delta matches" msgstr "使用线程查询最佳 delta 匹é…" #: builtin/pack-objects.c:3134 msgid "do not create an empty pack output" msgstr "ä¸åˆ›å»ºç©ºçš„包输出" #: builtin/pack-objects.c:3136 msgid "read revision arguments from standard input" msgstr "ä»Žæ ‡å‡†è¾“å…¥è¯»å–版本å·å‚æ•°" #: builtin/pack-objects.c:3138 msgid "limit the objects to those that are not yet packed" msgstr "é™åˆ¶é‚£äº›å°šæœªæ‰“包的对象" #: builtin/pack-objects.c:3141 msgid "include objects reachable from any reference" msgstr "包括å¯ä»¥ä»Žä»»ä½•å¼•ç”¨è®¿é—®åˆ°çš„对象" #: builtin/pack-objects.c:3144 msgid "include objects referred by reflog entries" msgstr "包括被引用日志引用到的对象" #: builtin/pack-objects.c:3147 msgid "include objects referred to by the index" msgstr "包括被索引引用到的对象" #: builtin/pack-objects.c:3150 msgid "output pack to stdout" msgstr "è¾“å‡ºåŒ…åˆ°æ ‡å‡†è¾“å‡º" #: builtin/pack-objects.c:3152 msgid "include tag objects that refer to objects to be packed" msgstr "åŒ…æ‹¬é‚£äº›å¼•ç”¨äº†å¾…æ‰“åŒ…å¯¹è±¡çš„æ ‡ç¾å¯¹è±¡" #: builtin/pack-objects.c:3154 msgid "keep unreachable objects" msgstr "ç»´æŒä¸å¯è¾¾çš„对象" #: builtin/pack-objects.c:3156 msgid "pack loose unreachable objects" msgstr "打包æ¾æ•£çš„ä¸å¯è¾¾å¯¹è±¡" #: builtin/pack-objects.c:3158 msgid "unpack unreachable objects newer than <time>" msgstr "将比给定 <时间> æ–°çš„æ— æ³•è®¿é—®çš„å¯¹è±¡è§£åŒ…" #: builtin/pack-objects.c:3161 msgid "create thin packs" msgstr "创建精简包" #: builtin/pack-objects.c:3163 msgid "create packs suitable for shallow fetches" msgstr "创建适åˆæµ…克隆仓库获å–的包" #: builtin/pack-objects.c:3165 msgid "ignore packs that have companion .keep file" msgstr "忽略é…有 .keep 文件的包" #: builtin/pack-objects.c:3167 msgid "ignore this pack" msgstr "忽略该 pack" #: builtin/pack-objects.c:3169 msgid "pack compression level" msgstr "打包压缩级别" #: builtin/pack-objects.c:3171 msgid "do not hide commits by grafts" msgstr "显示被移æ¤éšè—çš„æ交" #: builtin/pack-objects.c:3173 msgid "use a bitmap index if available to speed up counting objects" msgstr "使用 bitmap 索引(如果有的è¯ï¼‰ä»¥æ高对象计数时的速度" #: builtin/pack-objects.c:3175 msgid "write a bitmap index together with the pack index" msgstr "在建立包索引的åŒæ—¶åˆ›å»º bitmap 索引" #: builtin/pack-objects.c:3178 msgid "handling for missing objects" msgstr "处ç†ä¸¢å¤±çš„对象" #: builtin/pack-objects.c:3181 msgid "do not pack objects in promisor packfiles" msgstr "ä¸è¦æ‰“包 promisor 包文件ä¸çš„对象" #: builtin/pack-objects.c:3205 #, c-format msgid "delta chain depth %d is too deep, forcing %d" msgstr "增é‡é“¾æ·±åº¦ %d 太深了,强制为 %d" #: builtin/pack-objects.c:3210 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "é…ç½® pack.deltaCacheLimit 太高了,强制为 %d" #: builtin/pack-objects.c:3338 msgid "Enumerating objects" msgstr "枚举对象" #: builtin/pack-refs.c:7 msgid "git pack-refs [<options>]" msgstr "git pack-refs [<选项>]" #: builtin/pack-refs.c:15 msgid "pack everything" msgstr "打包一切" #: builtin/pack-refs.c:16 msgid "prune loose refs (default)" msgstr "清除æ¾æ•£çš„引用(默认)" #: builtin/prune-packed.c:8 msgid "git prune-packed [-n | --dry-run] [-q | --quiet]" msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]" #: builtin/prune-packed.c:41 msgid "Removing duplicate objects" msgstr "æ£åœ¨åˆ 除é‡å¤å¯¹è±¡" #: builtin/prune.c:11 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--progress] [--expire <时间>] [--] [<head>...]" #: builtin/prune.c:108 msgid "report pruned objects" msgstr "报告清除的对象" #: builtin/prune.c:111 msgid "expire objects older than <time>" msgstr "使早于给定时间的对象过期" #: builtin/prune.c:113 msgid "limit traversal to objects outside promisor packfiles" msgstr "é™åˆ¶é历 promisor 包以外的对象" #: builtin/prune.c:127 msgid "cannot prune in a precious-objects repo" msgstr "ä¸èƒ½åœ¨çå“仓库ä¸æ‰§è¡Œæ¸…ç†æ“作" #: builtin/pull.c:59 builtin/pull.c:61 #, c-format msgid "Invalid value for %s: %s" msgstr "%s çš„å€¼æ— æ•ˆï¼š%s" #: builtin/pull.c:81 msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<选项>] [<仓库> [<å¼•ç”¨è§„æ ¼>...]]" #: builtin/pull.c:132 msgid "control for recursive fetching of submodules" msgstr "控制å模组的递归获å–" #: builtin/pull.c:136 msgid "Options related to merging" msgstr "å’Œåˆå¹¶ç›¸å…³çš„选项" #: builtin/pull.c:139 msgid "incorporate changes by rebasing rather than merging" msgstr "使用å˜åŸºæ“作å–代åˆå¹¶æ“作以åˆå…¥ä¿®æ”¹" #: builtin/pull.c:166 builtin/rebase--helper.c:23 builtin/revert.c:121 msgid "allow fast-forward" msgstr "å…许快进å¼" #: builtin/pull.c:175 msgid "automatically stash/stash pop before and after rebase" msgstr "å˜åŸºæ“作å‰åŽæ‰§è¡Œè‡ªåŠ¨è´®è—和弹出贮è—" #: builtin/pull.c:191 msgid "Options related to fetching" msgstr "和获å–相关的å‚æ•°" #: builtin/pull.c:209 msgid "number of submodules pulled in parallel" msgstr "并å‘拉å–çš„å模组的数é‡" #: builtin/pull.c:304 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "pull.ff çš„å–å€¼æ— æ•ˆï¼š%s" #: builtin/pull.c:420 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." msgstr "在您刚刚获å–到的引用ä¸æ²¡æœ‰å˜åŸºæ“作的候选。" #: builtin/pull.c:422 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "在您刚刚获å–到的引用ä¸æ²¡æœ‰åˆå¹¶æ“作的候选。" #: builtin/pull.c:423 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." msgstr "通常这æ„味ç€æ‚¨æ供了一个通é…ç¬¦å¼•ç”¨è§„æ ¼ä½†æœªèƒ½å’Œè¿œç«¯åŒ¹é…。" #: builtin/pull.c:426 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" "a branch. Because this is not the default configured remote\n" "for your current branch, you must specify a branch on the command line." msgstr "" "您è¦æ±‚从远程 '%s' 拉å–ï¼Œä½†æ˜¯æœªæŒ‡å®šä¸€ä¸ªåˆ†æ”¯ã€‚å› ä¸ºè¿™ä¸æ˜¯å½“å‰\n" "分支默认的远程仓库,您必须在命令行ä¸æŒ‡å®šä¸€ä¸ªåˆ†æ”¯å。" #: builtin/pull.c:431 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "您当å‰ä¸åœ¨ä¸€ä¸ªåˆ†æ”¯ä¸Šã€‚" #: builtin/pull.c:433 builtin/pull.c:448 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "请指定您è¦å˜åŸºåˆ°å“ªä¸€ä¸ªåˆ†æ”¯ã€‚" #: builtin/pull.c:435 builtin/pull.c:450 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "请指定您è¦åˆå¹¶å“ªä¸€ä¸ªåˆ†æ”¯ã€‚" #: builtin/pull.c:436 builtin/pull.c:451 msgid "See git-pull(1) for details." msgstr "è¯¦è§ git-pull(1)。" #: builtin/pull.c:438 builtin/pull.c:444 builtin/pull.c:453 #: git-parse-remote.sh:64 msgid "<remote>" msgstr "<远程>" #: builtin/pull.c:438 builtin/pull.c:453 builtin/pull.c:458 git-rebase.sh:523 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<分支>" #: builtin/pull.c:446 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "当å‰åˆ†æ”¯æ²¡æœ‰è·Ÿè¸ªä¿¡æ¯ã€‚" #: builtin/pull.c:455 git-parse-remote.sh:95 msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "如果您想è¦ä¸ºæ¤åˆ†æ”¯åˆ›å»ºè·Ÿè¸ªä¿¡æ¯ï¼Œæ‚¨å¯ä»¥æ‰§è¡Œï¼š" #: builtin/pull.c:460 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" "from the remote, but no such ref was fetched." msgstr "" "您的é…ç½®ä¸æŒ‡å®šè¦åˆå¹¶è¿œç¨‹çš„引用 '%s',\n" "但是没有获å–到这个引用。" #: builtin/pull.c:826 msgid "ignoring --verify-signatures for rebase" msgstr "为å˜åŸºæ“作忽略 --verify-signatures" #: builtin/pull.c:874 msgid "--[no-]autostash option is only valid with --rebase." msgstr "--[no-]autostash 选项åªåœ¨ä½¿ç”¨ --rebase 时有效。" #: builtin/pull.c:882 msgid "Updating an unborn branch with changes added to the index." msgstr "更新尚未诞生的分支,å˜æ›´æ·»åŠ 至索引。" #: builtin/pull.c:885 msgid "pull with rebase" msgstr "å˜åŸºå¼æ‹‰å–" #: builtin/pull.c:886 msgid "please commit or stash them." msgstr "请æ交或贮è—它们。" #: builtin/pull.c:911 #, c-format msgid "" "fetch updated the current branch head.\n" "fast-forwarding your working tree from\n" "commit %s." msgstr "" "fetch 更新了当å‰çš„分支。快进您的工作区\n" "至æ交 %s。" #: builtin/pull.c:916 #, c-format msgid "" "Cannot fast-forward your working tree.\n" "After making sure that you saved anything precious from\n" "$ git diff %s\n" "output, run\n" "$ git reset --hard\n" "to recover." msgstr "" "您当å‰çš„å·¥ä½œåŒºæ— æ³•æ‰§è¡Œå¿«è¿›æ“作。\n" "首先执行如下命令:\n" "$ git diff %s\n" "以确认所有有用的数æ®å‡å·²ä¿å˜ã€‚然åŽæ‰§è¡Œä¸‹é¢çš„命令\n" "$ git reset --hard\n" "æ¢å¤ä¹‹å‰çš„状æ€ã€‚" #: builtin/pull.c:931 msgid "Cannot merge multiple branches into empty head." msgstr "æ— æ³•å°†å¤šä¸ªåˆ†æ”¯åˆå¹¶åˆ°ç©ºåˆ†æ”¯ã€‚" #: builtin/pull.c:935 msgid "Cannot rebase onto multiple branches." msgstr "æ— æ³•å˜åŸºåˆ°å¤šä¸ªåˆ†æ”¯ã€‚" #: builtin/pull.c:942 msgid "cannot rebase with locally recorded submodule modifications" msgstr "本地å模组ä¸æœ‰ä¿®æ”¹ï¼Œæ— 法å˜åŸº" #: builtin/push.c:19 msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "git push [<选项>] [<仓库> [<å¼•ç”¨è§„æ ¼>...]]" #: builtin/push.c:111 msgid "tag shorthand without <tag>" msgstr "æ ‡ç¾åŽé¢æœªæä¾› <æ ‡ç¾> å‚æ•°" #: builtin/push.c:121 msgid "--delete only accepts plain target ref names" msgstr "--delete åªæŽ¥å—简å•çš„ç›®æ ‡å¼•ç”¨å" #: builtin/push.c:165 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." msgstr "" "\n" "为了永久地选择任一选项,å‚è§ 'git help config' ä¸çš„ push.default。" #: builtin/push.c:168 #, 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:183 #, 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:<远程分支åå—>\n" #: builtin/push.c:197 #, 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:205 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "当å‰åˆ†æ”¯ %s 有多个上游分支,拒ç»æŽ¨é€ã€‚" #: builtin/push.c:208 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" "your current branch '%s', without telling me what to push\n" "to update which remote branch." msgstr "" "您æ£æŽ¨é€è‡³è¿œç¨‹ '%s'(其并éžå½“å‰åˆ†æ”¯ '%s' 的上游),\n" "而没有告诉我è¦æŽ¨é€ä»€ä¹ˆã€æ›´æ–°å“ªä¸ªè¿œç¨‹åˆ†æ”¯ã€‚" #: builtin/push.c:267 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "您没有为推é€æŒ‡å®šä»»ä½•å¼•ç”¨è§„æ ¼ï¼Œå¹¶ä¸” push.default 为 \"nothing\"。" #: builtin/push.c:274 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate 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" "å†æ¬¡æŽ¨é€å‰ï¼Œå…ˆä¸Žè¿œç¨‹å˜æ›´åˆå¹¶ï¼ˆå¦‚ 'git pull ...')。详è§\n" "'git push --help' ä¸çš„ 'Note about fast-forwards' å°èŠ‚。" #: builtin/push.c:280 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. Check out this branch and integrate 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:286 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 integrate 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" "一个仓库已å‘该引用进行了推é€ã€‚å†æ¬¡æŽ¨é€å‰ï¼Œæ‚¨å¯èƒ½éœ€è¦å…ˆæ•´åˆè¿œç¨‹å˜æ›´\n" "(如 'git pull ...')。\n" "è¯¦è§ 'git push --help' ä¸çš„ 'Note about fast-forwards' å°èŠ‚。" #: builtin/push.c:293 msgid "Updates were rejected because the tag already exists in the remote." msgstr "更新被拒ç»ï¼Œå› ä¸ºè¯¥æ ‡ç¾åœ¨è¿œç¨‹å·²ç»å˜åœ¨ã€‚" #: builtin/push.c:296 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:357 #, c-format msgid "Pushing to %s\n" msgstr "推é€åˆ° %s\n" #: builtin/push.c:361 #, c-format msgid "failed to push some refs to '%s'" msgstr "æ— æ³•æŽ¨é€ä¸€äº›å¼•ç”¨åˆ° '%s'" #: builtin/push.c:395 #, c-format msgid "bad repository '%s'" msgstr "å的仓库 '%s'" #: builtin/push.c:396 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 <å称> <地å€>\n" "\n" "然åŽä½¿ç”¨è¯¥è¿œç¨‹ä»“库å执行推é€\n" "\n" " git push <å称>\n" #: builtin/push.c:551 msgid "repository" msgstr "仓库" #: builtin/push.c:552 builtin/send-pack.c:164 msgid "push all refs" msgstr "推é€æ‰€æœ‰å¼•ç”¨" #: builtin/push.c:553 builtin/send-pack.c:166 msgid "mirror all refs" msgstr "é•œåƒæ‰€æœ‰å¼•ç”¨" #: builtin/push.c:555 msgid "delete refs" msgstr "åˆ é™¤å¼•ç”¨" #: builtin/push.c:556 msgid "push tags (can't be used with --all or --mirror)" msgstr "推é€æ ‡ç¾ï¼ˆä¸èƒ½ä½¿ç”¨ --all or --mirror)" #: builtin/push.c:559 builtin/send-pack.c:167 msgid "force updates" msgstr "强制更新" #: builtin/push.c:561 builtin/send-pack.c:181 msgid "refname>:<expect" msgstr "引用å>:<期望值" #: builtin/push.c:562 builtin/send-pack.c:182 msgid "require old value of ref to be at this value" msgstr "è¦æ±‚引用旧的å–值为设定值" #: builtin/push.c:565 msgid "control recursive pushing of submodules" msgstr "控制å模组的递归推é€" #: builtin/push.c:567 builtin/send-pack.c:175 msgid "use thin pack" msgstr "使用精简打包" #: builtin/push.c:568 builtin/push.c:569 builtin/send-pack.c:161 #: builtin/send-pack.c:162 msgid "receive pack program" msgstr "接收包程åº" #: builtin/push.c:570 msgid "set upstream for git pull/status" msgstr "设置 git pull/status 的上游" #: builtin/push.c:573 msgid "prune locally removed refs" msgstr "æ¸…é™¤æœ¬åœ°åˆ é™¤çš„å¼•ç”¨" #: builtin/push.c:575 msgid "bypass pre-push hook" msgstr "绕过 pre-push é’©å" #: builtin/push.c:576 msgid "push missing but relevant tags" msgstr "推é€ç¼ºå¤±ä½†æœ‰å…³çš„æ ‡ç¾" #: builtin/push.c:579 builtin/send-pack.c:169 msgid "GPG sign the push" msgstr "用 GPG 为推é€ç¾å" #: builtin/push.c:581 builtin/send-pack.c:176 msgid "request atomic transaction on remote side" msgstr "需è¦è¿œç«¯æ”¯æŒåŽŸå事务" #: builtin/push.c:599 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete 与 --allã€--mirror åŠ --tags ä¸å…¼å®¹" #: builtin/push.c:601 msgid "--delete doesn't make sense without any refs" msgstr "--delete 未接任何引用没有æ„义" #: builtin/push.c:604 msgid "--all and --tags are incompatible" msgstr "--all å’Œ --tags ä¸å…¼å®¹" #: builtin/push.c:606 msgid "--all can't be combined with refspecs" msgstr "--all ä¸èƒ½å’Œå¼•ç”¨è§„æ ¼åŒæ—¶ä½¿ç”¨" #: builtin/push.c:610 msgid "--mirror and --tags are incompatible" msgstr "--mirror å’Œ --tags ä¸å…¼å®¹" #: builtin/push.c:612 msgid "--mirror can't be combined with refspecs" msgstr "--mirror ä¸èƒ½å’Œå¼•ç”¨è§„æ ¼åŒæ—¶ä½¿ç”¨" #: builtin/push.c:615 msgid "--all and --mirror are incompatible" msgstr "--all å’Œ --mirror ä¸å…¼å®¹" #: builtin/push.c:634 msgid "push options must not have new line characters" msgstr "推é€é€‰é¡¹ä¸èƒ½æœ‰æ¢è¡Œç¬¦" #: builtin/read-tree.c:40 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:120 msgid "write resulting index to <file>" msgstr "将索引结果写入 <文件>" #: builtin/read-tree.c:123 msgid "only empty the index" msgstr "åªæ˜¯æ¸…空索引" #: builtin/read-tree.c:125 msgid "Merging" msgstr "åˆå¹¶" #: builtin/read-tree.c:127 msgid "perform a merge in addition to a read" msgstr "读å–之余å†æ‰§è¡Œä¸€ä¸ªåˆå¹¶" #: builtin/read-tree.c:129 msgid "3-way merge if no file level merging required" msgstr "如果没有文件级åˆå¹¶éœ€è¦ï¼Œæ‰§è¡Œä¸‰æ–¹åˆå¹¶" #: builtin/read-tree.c:131 msgid "3-way merge in presence of adds and removes" msgstr "å˜åœ¨æ·»åŠ å’Œåˆ é™¤æ—¶ï¼Œä¹Ÿæ‰§è¡Œä¸‰æ–¹åˆå¹¶" #: builtin/read-tree.c:133 msgid "same as -m, but discard unmerged entries" msgstr "类似于 -m,但丢弃未åˆå¹¶çš„æ¡ç›®" #: builtin/read-tree.c:134 msgid "<subdirectory>/" msgstr "<å目录>/" #: builtin/read-tree.c:135 msgid "read the tree into the index under <subdirectory>/" msgstr "读å–æ ‘å¯¹è±¡åˆ°ç´¢å¼•çš„ <å目录>/ 下" #: builtin/read-tree.c:138 msgid "update working tree with merge result" msgstr "用åˆå¹¶çš„结果更新工作区" #: builtin/read-tree.c:140 msgid "gitignore" msgstr "gitignore" #: builtin/read-tree.c:141 msgid "allow explicitly ignored files to be overwritten" msgstr "å…许忽略文件ä¸è®¾å®šçš„文件å¯ä»¥è¢«è¦†ç›–" #: builtin/read-tree.c:144 msgid "don't check the working tree after merging" msgstr "åˆå¹¶åŽä¸æ£€æŸ¥å·¥ä½œåŒº" #: builtin/read-tree.c:145 msgid "don't update the index or the work tree" msgstr "ä¸æ›´æ–°ç´¢å¼•åŒºå’Œå·¥ä½œåŒº" #: builtin/read-tree.c:147 msgid "skip applying sparse checkout filter" msgstr "跳过应用稀ç–检出过滤器" #: builtin/read-tree.c:149 msgid "debug unpack-trees" msgstr "调试 unpack-trees" #: builtin/rebase--helper.c:8 msgid "git rebase--helper [<options>]" msgstr "git rebase--helper [<选项>]" #: builtin/rebase--helper.c:24 msgid "keep empty commits" msgstr "ä¿æŒç©ºæ交" #: builtin/rebase--helper.c:26 builtin/revert.c:123 msgid "allow commits with empty messages" msgstr "å…许æ交说明为空" #: builtin/rebase--helper.c:27 msgid "rebase merge commits" msgstr "对åˆå¹¶æ交å˜åŸº" #: builtin/rebase--helper.c:29 msgid "keep original branch points of cousins" msgstr "ä¿æŒå…„弟æ交的原始分支点" #: builtin/rebase--helper.c:30 msgid "continue rebase" msgstr "继ç»å˜åŸº" #: builtin/rebase--helper.c:32 msgid "abort rebase" msgstr "ä¸æ¢å˜åŸº" #: builtin/rebase--helper.c:35 msgid "make rebase script" msgstr "制作å˜åŸºè„šæœ¬" #: builtin/rebase--helper.c:37 msgid "shorten commit ids in the todo list" msgstr "缩çŸå¾…办列表ä¸çš„æ交å·" #: builtin/rebase--helper.c:39 msgid "expand commit ids in the todo list" msgstr "扩展待办列表ä¸çš„æ交å·" #: builtin/rebase--helper.c:41 msgid "check the todo list" msgstr "检查待办列表" #: builtin/rebase--helper.c:43 msgid "skip unnecessary picks" msgstr "跳过ä¸å¿…è¦çš„拣选" #: builtin/rebase--helper.c:45 msgid "rearrange fixup/squash lines" msgstr "é‡æ–°æŽ’列 fixup/squash è¡Œ" #: builtin/rebase--helper.c:47 msgid "insert exec commands in todo list" msgstr "在待办列表ä¸æ’å…¥ exec 执行命令" #: builtin/rebase--helper.c:68 msgid "--[no-]rebase-cousins has no effect without --rebase-merges" msgstr "ä¸ä½¿ç”¨ --rebase-merges,则 --[no-]rebase-cousins 没有效果" #: builtin/receive-pack.c:31 msgid "git receive-pack <git-dir>" msgstr "git receive-pack <仓库目录>" #: builtin/receive-pack.c:842 msgid "" "By default, updating the current branch in a non-bare repository\n" "is denied, because it will make the index and work tree inconsistent\n" "with what you pushed, and will require 'git reset --hard' to match\n" "the work tree to HEAD.\n" "\n" "You can set the 'receive.denyCurrentBranch' configuration variable\n" "to 'ignore' or 'warn' in the remote repository to allow pushing into\n" "its current branch; however, this is not recommended unless you\n" "arranged to update its work tree to match what you pushed in some\n" "other way.\n" "\n" "To squelch this message and still keep the default behaviour, set\n" "'receive.denyCurrentBranch' configuration variable to 'refuse'." msgstr "" "默认ç¦æ¢æ›´æ–°éžçº¯ä»“库的当å‰åˆ†æ”¯ï¼Œå› 为您推é€çš„内容将导致索引和工作区\n" "ä¸ä¸€è‡´ï¼Œå¹¶ä¸”将需è¦æ‰§è¡Œ 'git reset --hard' 将工作区匹é…到 HEAD。\n" "\n" "您å¯ä»¥åœ¨è¿œç¨‹ä»“库ä¸è®¾ç½® 'receive.denyCurrentBranch' é…ç½®å˜é‡ä¸º\n" "'ignore' 或 'warn' 以å…许推é€åˆ°å½“å‰åˆ†æ”¯ã€‚然而ä¸æŽ¨è这么åšï¼Œé™¤éžæ‚¨\n" "用æŸç§æ–¹å¼å°†å…¶å·¥ä½œåŒºæ›´æ–°è‡³æ‚¨æŽ¨é€çš„状æ€ã€‚\n" "\n" "è‹¥è¦å±è”½æ¤ä¿¡æ¯ä¸”ä¿æŒé»˜è®¤è¡Œä¸ºï¼Œè®¾ç½® 'receive.denyCurrentBranch'\n" "é…ç½®å˜é‡ä¸º 'refuse'。" #: builtin/receive-pack.c:862 msgid "" "By default, deleting the current branch is denied, because the next\n" "'git clone' won't result in any file checked out, causing confusion.\n" "\n" "You can set 'receive.denyDeleteCurrent' configuration variable to\n" "'warn' or 'ignore' in the remote repository to allow deleting the\n" "current branch, with or without a warning message.\n" "\n" "To squelch this message, you can set it to 'refuse'." msgstr "" "默认ç¦æ¢åˆ 除当å‰åˆ†æ”¯ï¼Œå› 为下一次 'git clone' å°†ä¸ä¼šæ£€å‡ºä»»ä½•æ–‡ä»¶ï¼Œ\n" "导致困惑。\n" "\n" "您å¯ä»¥åœ¨è¿œç¨‹ä»“库ä¸è®¾ç½® 'receive.denyDeleteCurrent' é…ç½®å˜é‡ä¸º\n" "'warn'(显示è¦å‘Šä¿¡æ¯ï¼‰æˆ– 'ignore'(忽略è¦å‘Šä¿¡æ¯ï¼‰ä»¥å…è®¸åˆ é™¤å½“å‰åˆ†æ”¯ã€‚\n" "\n" "è‹¥è¦å±è”½æ¤ä¿¡æ¯ï¼Œæ‚¨å¯ä»¥è®¾ç½®å®ƒä¸º 'refuse'。" #: builtin/receive-pack.c:1935 msgid "quiet" msgstr "é™é»˜æ¨¡å¼" #: builtin/receive-pack.c:1949 msgid "You must specify a directory." msgstr "您必须指定一个目录。" #: builtin/reflog.c:532 builtin/reflog.c:537 #, c-format msgid "'%s' is not a valid timestamp" msgstr "'%s' ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„时间戳" #: builtin/remote.c:14 msgid "git remote [-v | --verbose]" msgstr "git remote [-v | --verbose]" #: builtin/remote.c:15 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>] <å称> <地å€>" #: builtin/remote.c:16 builtin/remote.c:36 msgid "git remote rename <old> <new>" msgstr "git remote rename <æ—§å称> <æ–°å称>" #: builtin/remote.c:17 builtin/remote.c:41 msgid "git remote remove <name>" msgstr "git remote remove <å称>" #: builtin/remote.c:18 builtin/remote.c:46 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" msgstr "git remote set-head <å称> (-a | --auto | -d | --delete | <分支>)" #: builtin/remote.c:19 msgid "git remote [-v | --verbose] show [-n] <name>" msgstr "git remote [-v | --verbose] show [-n] <å称>" #: builtin/remote.c:20 msgid "git remote prune [-n | --dry-run] <name>" msgstr "git remote prune [-n | --dry-run] <å称>" #: builtin/remote.c:21 msgid "" "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]" #: builtin/remote.c:22 msgid "git remote set-branches [--add] <name> <branch>..." msgstr "git remote set-branches [--add] <å称> <分支>..." #: builtin/remote.c:23 builtin/remote.c:72 msgid "git remote get-url [--push] [--all] <name>" msgstr "git remote get-url [--push] [--all] <å称>" #: builtin/remote.c:24 builtin/remote.c:77 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" msgstr "git remote set-url [--push] <å称> <新的地å€> [<旧的地å€>]" #: builtin/remote.c:25 builtin/remote.c:78 msgid "git remote set-url --add <name> <newurl>" msgstr "git remote set-url --add <å称> <新的地å€>" #: builtin/remote.c:26 builtin/remote.c:79 msgid "git remote set-url --delete <name> <url>" msgstr "git remote set-url --delete <å称> <地å€>" #: builtin/remote.c:31 msgid "git remote add [<options>] <name> <url>" msgstr "git remote add [<选项>] <å称> <地å€>" #: builtin/remote.c:51 msgid "git remote set-branches <name> <branch>..." msgstr "git remote set-branches <å称> <分支>..." #: builtin/remote.c:52 msgid "git remote set-branches --add <name> <branch>..." msgstr "git remote set-branches --add <å称> <分支>..." #: builtin/remote.c:57 msgid "git remote show [<options>] <name>" msgstr "git remote show [<选项>] <å称>" #: builtin/remote.c:62 msgid "git remote prune [<options>] <name>" msgstr "git remote prune [<选项>] <å称>" #: builtin/remote.c:67 msgid "git remote update [<options>] [<group> | <remote>]..." msgstr "git remote update [<选项>] [<组> | <远程>]..." #: builtin/remote.c:96 #, c-format msgid "Updating %s" msgstr "æ›´æ–° %s ä¸" #: builtin/remote.c:128 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:145 #, c-format msgid "unknown mirror argument: %s" msgstr "未知的镜åƒå‚数:%s" #: builtin/remote.c:161 msgid "fetch the remote branches" msgstr "抓å–远程的分支" #: builtin/remote.c:163 msgid "import all tags and associated objects when fetching" msgstr "抓å–æ—¶å¯¼å…¥æ‰€æœ‰çš„æ ‡ç¾å’Œå…³è”对象" #: builtin/remote.c:166 msgid "or do not fetch any tag at all (--no-tags)" msgstr "或ä¸æŠ“å–ä»»ä½•æ ‡ç¾ï¼ˆ--no-tags)" #: builtin/remote.c:168 msgid "branch(es) to track" msgstr "跟踪的分支" #: builtin/remote.c:169 msgid "master branch" msgstr "主线分支" #: builtin/remote.c:170 msgid "push|fetch" msgstr "push|fetch" #: builtin/remote.c:171 msgid "set up remote as a mirror to push to or fetch from" msgstr "把远程设置为用以推é€æˆ–抓å–çš„é•œåƒ" #: builtin/remote.c:183 msgid "specifying a master branch makes no sense with --mirror" msgstr "指定一个 master 分支并使用 --mirror 选项没有æ„义" #: builtin/remote.c:185 msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "指定è¦è·Ÿè¸ªçš„分支åªåœ¨ä¸ŽèŽ·å–é•œåƒåŒæ—¶ä½¿ç”¨æ‰æœ‰æ„义" #: builtin/remote.c:192 builtin/remote.c:634 #, c-format msgid "remote %s already exists." msgstr "远程 %s å·²ç»å˜åœ¨ã€‚" #: builtin/remote.c:196 builtin/remote.c:638 #, c-format msgid "'%s' is not a valid remote name" msgstr "'%s' ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„远程å称" #: builtin/remote.c:236 #, c-format msgid "Could not setup master '%s'" msgstr "æ— æ³•è®¾ç½® master '%s'" #: builtin/remote.c:342 #, c-format msgid "Could not get fetch map for refspec %s" msgstr "æ— æ³•å¾—åˆ°å¼•ç”¨è§„æ ¼ %s 的获å–列表" #: builtin/remote.c:441 builtin/remote.c:449 msgid "(matching)" msgstr "(匹é…)" #: builtin/remote.c:453 msgid "(delete)" msgstr "ï¼ˆåˆ é™¤ï¼‰" #: builtin/remote.c:627 builtin/remote.c:762 builtin/remote.c:861 #, c-format msgid "No such remote: %s" msgstr "æ²¡æœ‰è¿™æ ·çš„è¿œç¨‹ï¼š%s" #: builtin/remote.c:644 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "ä¸èƒ½é‡å‘½åé…ç½®å°èŠ‚ '%s' 到 '%s'" #: builtin/remote.c:664 #, 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:700 #, c-format msgid "deleting '%s' failed" msgstr "åˆ é™¤ '%s' 失败" #: builtin/remote.c:734 #, c-format msgid "creating '%s' failed" msgstr "创建 '%s' 失败" #: builtin/remote.c:799 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:813 #, c-format msgid "Could not remove config section '%s'" msgstr "ä¸èƒ½ç§»é™¤é…ç½®å°èŠ‚ '%s'" #: builtin/remote.c:914 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " 新的(下一次获å–å°†å˜å‚¨äºŽ remotes/%s)" #: builtin/remote.c:917 msgid " tracked" msgstr " 已跟踪" #: builtin/remote.c:919 msgid " stale (use 'git remote prune' to remove)" msgstr " 过时(使用 'git remote prune' æ¥ç§»é™¤ï¼‰" #: builtin/remote.c:921 msgid " ???" msgstr " ???" #: builtin/remote.c:962 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "æ— æ•ˆçš„ branch.%s.merge,ä¸èƒ½å˜åŸºåˆ°ä¸€ä¸ªä»¥ä¸Šçš„分支" #: builtin/remote.c:971 #, c-format msgid "rebases interactively onto remote %s" msgstr "交互å¼å˜åŸºåˆ°è¿œç¨‹ %s" #: builtin/remote.c:973 #, c-format msgid "rebases interactively (with merges) onto remote %s" msgstr "交互å¼å˜åŸºï¼ˆå«åˆå¹¶æ交)到远程 %s" #: builtin/remote.c:976 #, c-format msgid "rebases onto remote %s" msgstr "å˜åŸºåˆ°è¿œç¨‹ %s" #: builtin/remote.c:980 #, c-format msgid " merges with remote %s" msgstr " 与远程 %s åˆå¹¶" #: builtin/remote.c:983 #, c-format msgid "merges with remote %s" msgstr "与远程 %s åˆå¹¶" #: builtin/remote.c:986 #, c-format msgid "%-*s and with remote %s\n" msgstr "%-*s 以åŠå’Œè¿œç¨‹ %s\n" #: builtin/remote.c:1029 msgid "create" msgstr "创建" #: builtin/remote.c:1032 msgid "delete" msgstr "åˆ é™¤" #: builtin/remote.c:1036 msgid "up to date" msgstr "最新" #: builtin/remote.c:1039 msgid "fast-forwardable" msgstr "å¯å¿«è¿›" #: builtin/remote.c:1042 msgid "local out of date" msgstr "本地已过时" #: builtin/remote.c:1049 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s 强制推é€è‡³ %-*s (%s)" #: builtin/remote.c:1052 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s 推é€è‡³ %-*s (%s)" #: builtin/remote.c:1056 #, c-format msgid " %-*s forces to %s" msgstr " %-*s 强制推é€è‡³ %s" #: builtin/remote.c:1059 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s 推é€è‡³ %s" #: builtin/remote.c:1127 msgid "do not query remotes" msgstr "ä¸æŸ¥è¯¢è¿œç¨‹" #: builtin/remote.c:1154 #, c-format msgid "* remote %s" msgstr "* 远程 %s" #: builtin/remote.c:1155 #, c-format msgid " Fetch URL: %s" msgstr " 获å–地å€ï¼š%s" #: builtin/remote.c:1156 builtin/remote.c:1172 builtin/remote.c:1311 msgid "(no URL)" msgstr "(æ— URL)" #. TRANSLATORS: the colon ':' should align #. with the one in " Fetch URL: %s" #. translation. #. #: builtin/remote.c:1170 builtin/remote.c:1172 #, c-format msgid " Push URL: %s" msgstr " 推é€åœ°å€ï¼š%s" #: builtin/remote.c:1174 builtin/remote.c:1176 builtin/remote.c:1178 #, c-format msgid " HEAD branch: %s" msgstr " HEAD 分支:%s" # 译者:ä¸æ–‡å—符串拼接,å¯åˆ 除å‰å¯¼ç©ºæ ¼ #: builtin/remote.c:1174 msgid "(not queried)" msgstr "(未查询)" #: builtin/remote.c:1176 msgid "(unknown)" msgstr "(未知)" #: builtin/remote.c:1180 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr " HEAD 分支(远程 HEAD 模糊,å¯èƒ½æ˜¯ä¸‹åˆ—ä¸çš„一个):\n" #: builtin/remote.c:1192 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " 远程分支:%s" msgstr[1] " 远程分支:%s" # 译者:ä¸æ–‡å—符串拼接,å¯åˆ 除å‰å¯¼ç©ºæ ¼ #: builtin/remote.c:1195 builtin/remote.c:1221 msgid " (status not queried)" msgstr "(状æ€æœªæŸ¥è¯¢ï¼‰" #: builtin/remote.c:1204 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:1212 msgid " Local refs will be mirrored by 'git push'" msgstr " 本地引用将在 'git push' 时被镜åƒ" #: builtin/remote.c:1218 #, 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:1239 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "æ ¹æ®è¿œç¨‹è®¾ç½® refs/remotes/<å称>/HEAD" #: builtin/remote.c:1241 msgid "delete refs/remotes/<name>/HEAD" msgstr "åˆ é™¤ refs/remotes/<å称>/HEAD" #: builtin/remote.c:1256 msgid "Cannot determine remote HEAD" msgstr "æ— æ³•ç¡®å®šè¿œç¨‹ HEAD" #: builtin/remote.c:1258 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:" #: builtin/remote.c:1268 #, c-format msgid "Could not delete %s" msgstr "æ— æ³•åˆ é™¤ %s" #: builtin/remote.c:1276 #, c-format msgid "Not a valid ref: %s" msgstr "ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆå¼•ç”¨ï¼š%s" #: builtin/remote.c:1278 #, c-format msgid "Could not setup %s" msgstr "ä¸èƒ½è®¾ç½® %s" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: builtin/remote.c:1296 #, c-format msgid " %s will become dangling!" msgstr " %s å°†æˆä¸ºæ‘‡æ‘†çŠ¶æ€ï¼" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: builtin/remote.c:1297 #, c-format msgid " %s has become dangling!" msgstr " %s å·²æˆä¸ºæ‘‡æ‘†çŠ¶æ€ï¼" #: builtin/remote.c:1307 #, c-format msgid "Pruning %s" msgstr "修剪 %s" #: builtin/remote.c:1308 #, c-format msgid "URL: %s" msgstr "URL:%s" #: builtin/remote.c:1324 #, c-format msgid " * [would prune] %s" msgstr " * [å°†åˆ é™¤] %s" #: builtin/remote.c:1327 #, c-format msgid " * [pruned] %s" msgstr " * [å·²åˆ é™¤] %s" #: builtin/remote.c:1372 msgid "prune remotes after fetching" msgstr "抓å–åŽæ¸…除远程" #: builtin/remote.c:1435 builtin/remote.c:1489 builtin/remote.c:1557 #, c-format msgid "No such remote '%s'" msgstr "没有æ¤è¿œç¨‹ '%s'" #: builtin/remote.c:1451 msgid "add branch" msgstr "æ·»åŠ åˆ†æ”¯" #: builtin/remote.c:1458 msgid "no remote specified" msgstr "未指定远程" #: builtin/remote.c:1475 msgid "query push URLs rather than fetch URLs" msgstr "æŸ¥è¯¢æŽ¨é€ URL 地å€ï¼Œè€ŒéžèŽ·å– URL 地å€" #: builtin/remote.c:1477 msgid "return all URLs" msgstr "返回所有 URL 地å€" #: builtin/remote.c:1505 #, c-format msgid "no URLs configured for remote '%s'" msgstr "没有给远程仓库 '%s' 设定 URL" #: builtin/remote.c:1531 msgid "manipulate push URLs" msgstr "æ“ä½œæŽ¨é€ URLS" #: builtin/remote.c:1533 msgid "add URL" msgstr "æ·»åŠ URL" #: builtin/remote.c:1535 msgid "delete URLs" msgstr "åˆ é™¤ URLS" #: builtin/remote.c:1542 msgid "--add --delete doesn't make sense" msgstr "--add --delete æ— æ„义" #: builtin/remote.c:1581 #, c-format msgid "Invalid old URL pattern: %s" msgstr "æ— æ•ˆçš„æ—§ URL 匹é…模版:%s" #: builtin/remote.c:1589 #, c-format msgid "No such URL found: %s" msgstr "æœªæ‰¾åˆ°æ¤ URL:%s" #: builtin/remote.c:1591 msgid "Will not delete all non-push URLs" msgstr "å°†ä¸ä¼šåˆ 除所有éžæŽ¨é€ URL 地å€" #: builtin/remote.c:1607 msgid "be verbose; must be placed before a subcommand" msgstr "冗长输出;必须置于å命令之å‰" #: builtin/remote.c:1638 #, c-format msgid "Unknown subcommand: %s" msgstr "未知å命令:%s" #: builtin/repack.c:18 msgid "git repack [<options>]" msgstr "git repack [<选项>]" #: builtin/repack.c:23 msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" "--no-write-bitmap-index or disable the pack.writebitmaps configuration." msgstr "" "å¢žé‡ repack å’Œ bitmap 索引ä¸å…¼å®¹ã€‚ 使用 --no-write-bitmap-index\n" "或ç¦ç”¨ pack.writebitmaps é…置。" #: builtin/repack.c:180 msgid "pack everything in a single pack" msgstr "所有内容打包到一个包文件ä¸" #: builtin/repack.c:182 msgid "same as -a, and turn unreachable objects loose" msgstr "å’Œ -a 相åŒï¼Œå¹¶å°†ä¸å¯è¾¾çš„对象设为æ¾æ•£å¯¹è±¡" #: builtin/repack.c:185 msgid "remove redundant packs, and run git-prune-packed" msgstr "åˆ é™¤å¤šä½™çš„åŒ…ï¼Œè¿è¡Œ git-prune-packed" #: builtin/repack.c:187 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "å‘ git-pack-objects ä¼ é€’å‚æ•° --no-reuse-delta" #: builtin/repack.c:189 msgid "pass --no-reuse-object to git-pack-objects" msgstr "å‘ git-pack-objects ä¼ é€’å‚æ•° --no-reuse-object" #: builtin/repack.c:191 msgid "do not run git-update-server-info" msgstr "ä¸è¿è¡Œ git-update-server-info" #: builtin/repack.c:194 msgid "pass --local to git-pack-objects" msgstr "å‘ git-pack-objects ä¼ é€’å‚æ•° --local" #: builtin/repack.c:196 msgid "write bitmap index" msgstr "写 bitmap 索引" #: builtin/repack.c:197 msgid "approxidate" msgstr "近似日期" #: builtin/repack.c:198 msgid "with -A, do not loosen objects older than this" msgstr "使用 -A,ä¸è¦å°†æ—©äºŽç»™å®šæ—¶é—´çš„对象过期" #: builtin/repack.c:200 msgid "with -a, repack unreachable objects" msgstr "使用 -a ,é‡æ–°å¯¹ä¸å¯è¾¾å¯¹è±¡æ‰“包" #: builtin/repack.c:202 msgid "size of the window used for delta compression" msgstr "用于增é‡åŽ‹ç¼©çš„窗å£å€¼" #: builtin/repack.c:203 builtin/repack.c:209 msgid "bytes" msgstr "å—节" #: builtin/repack.c:204 msgid "same as the above, but limit memory size instead of entries count" msgstr "和上é¢çš„相似,但é™åˆ¶å†…å˜å¤§å°è€Œéžæ¡ç›®æ•°" #: builtin/repack.c:206 msgid "limits the maximum delta depth" msgstr "é™åˆ¶æœ€å¤§å¢žé‡æ·±åº¦" #: builtin/repack.c:208 msgid "limits the maximum number of threads" msgstr "é™åˆ¶æœ€å¤§çº¿ç¨‹æ•°" #: builtin/repack.c:210 msgid "maximum size of each packfile" msgstr "æ¯ä¸ªåŒ…文件的最大尺寸" #: builtin/repack.c:212 msgid "repack objects in packs marked with .keep" msgstr "å¯¹æ ‡è®°ä¸º .keep 的包ä¸çš„对象é‡æ–°æ‰“包" #: builtin/repack.c:214 msgid "do not repack this pack" msgstr "ä¸è¦å¯¹è¯¥åŒ…文件é‡æ–°æ‰“包" #: builtin/repack.c:224 msgid "cannot delete packs in a precious-objects repo" msgstr "ä¸èƒ½åˆ 除çå“仓库ä¸çš„打包文件" #: builtin/repack.c:228 msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable å’Œ -A ä¸å…¼å®¹" #: builtin/repack.c:425 builtin/worktree.c:139 #, c-format msgid "failed to remove '%s'" msgstr "æ— æ³•åˆ é™¤ '%s'" #: builtin/replace.c:22 msgid "git replace [-f] <object> <replacement>" msgstr "git replace [-f] <对象> <替æ¢ç‰©>" #: builtin/replace.c:23 msgid "git replace [-f] --edit <object>" msgstr "git replace [-f] --edit <对象>" #: builtin/replace.c:24 msgid "git replace [-f] --graft <commit> [<parent>...]" msgstr "git replace [-f] --graft <æ交> [<父æ交>...]" #: builtin/replace.c:25 msgid "git replace [-f] --convert-graft-file" msgstr "git replace [-f] --convert-graft-file" #: builtin/replace.c:26 msgid "git replace -d <object>..." msgstr "git replace -d <对象>..." #: builtin/replace.c:27 msgid "git replace [--format=<format>] [-l [<pattern>]]" msgstr "git replace [--format=<æ ¼å¼>] [-l [<模å¼>]]" #: builtin/replace.c:371 builtin/replace.c:415 builtin/replace.c:445 #, c-format msgid "Not a valid object name: '%s'" msgstr "ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„对象å:'%s'" #: builtin/replace.c:407 #, c-format msgid "bad mergetag in commit '%s'" msgstr "æ交 '%s' ä¸å«æœ‰æŸåçš„åˆå¹¶æ ‡ç¾" #: builtin/replace.c:409 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "æ交 '%s' ä¸å«æœ‰æ ¼å¼é”™è¯¯çš„åˆå¹¶æ ‡ç¾" #: builtin/replace.c:421 #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " "instead of --graft" msgstr "原始æ交 '%s' 包å«å·²ç»ä¸¢å¼ƒçš„åˆå¹¶æ ‡ç¾ '%s',使用 --edit 代替 --graft" #: builtin/replace.c:460 #, c-format msgid "the original commit '%s' has a gpg signature." msgstr "原始æ交 '%s' ä¸åŒ…å«ä¸€ä¸ª GPG ç¾å" #: builtin/replace.c:461 msgid "the signature will be removed in the replacement commit!" msgstr "在替æ¢çš„æ交ä¸ç¾å将被移除ï¼" #: builtin/replace.c:471 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "ä¸èƒ½ä¸º '%s' 写替æ¢æ交" #: builtin/replace.c:514 #, c-format msgid "" "could not convert the following graft(s):\n" "%s" msgstr "" "ä¸èƒ½è½¬æ¢ä¸‹åˆ—移æ¤ï¼š\n" "%s" #: builtin/replace.c:535 msgid "list replace refs" msgstr "列出替æ¢çš„引用" #: builtin/replace.c:536 msgid "delete replace refs" msgstr "åˆ é™¤æ›¿æ¢çš„引用" #: builtin/replace.c:537 msgid "edit existing object" msgstr "编辑现å˜çš„对象" #: builtin/replace.c:538 msgid "change a commit's parents" msgstr "修改一个æ交的父æ交" #: builtin/replace.c:539 msgid "convert existing graft file" msgstr "转æ¢çŽ°å˜çš„移æ¤æ–‡ä»¶" #: builtin/replace.c:540 msgid "replace the ref if it exists" msgstr "如果å˜åœ¨åˆ™æ›¿æ¢å¼•ç”¨" #: builtin/replace.c:542 msgid "do not pretty-print contents for --edit" msgstr "ä¸è¦ä¸º --edit æ“作美观显示内容" #: builtin/replace.c:543 msgid "use this format" msgstr "使用æ¤æ ¼å¼" #: builtin/rerere.c:13 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]" #: builtin/rerere.c:59 msgid "register clean resolutions in index" msgstr "在索引ä¸æ³¨å†Œå¹²å‡€çš„解决方案" #: builtin/reset.c:29 msgid "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<æ交>]" #: builtin/reset.c:30 msgid "git reset [-q] [<tree-ish>] [--] <paths>..." msgstr "git reset [-q] [<æ ‘æˆ–æ交>] [--] <路径>..." #: builtin/reset.c:31 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" msgstr "git reset --patch [<æ ‘æˆ–æ交>] [--] [<路径>...]" #: builtin/reset.c:37 msgid "mixed" msgstr "æ··æ‚" #: builtin/reset.c:37 msgid "soft" msgstr "软性" #: builtin/reset.c:37 msgid "hard" msgstr "硬性" #: builtin/reset.c:37 msgid "merge" msgstr "åˆå¹¶" #: builtin/reset.c:37 msgid "keep" msgstr "ä¿æŒ" #: builtin/reset.c:78 msgid "You do not have a valid HEAD." msgstr "您没有一个有效的 HEAD。" #: builtin/reset.c:80 msgid "Failed to find tree of HEAD." msgstr "æ— æ³•æ‰¾åˆ° HEAD 指å‘çš„æ ‘ã€‚" #: builtin/reset.c:86 #, c-format msgid "Failed to find tree of %s." msgstr "æ— æ³•æ‰¾åˆ° %s 指å‘çš„æ ‘ã€‚" #: builtin/reset.c:111 #, c-format msgid "HEAD is now at %s" msgstr "HEAD 现在ä½äºŽ %s" # 译者:汉å—ä¹‹é—´æ— ç©ºæ ¼ï¼Œæ•…åˆ é™¤%så‰åŽç©ºæ ¼ #: builtin/reset.c:189 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "在åˆå¹¶è¿‡ç¨‹ä¸ä¸èƒ½åš%sé‡ç½®æ“作。" #: builtin/reset.c:289 msgid "be quiet, only report errors" msgstr "安é™æ¨¡å¼ï¼ŒåªæŠ¥å‘Šé”™è¯¯" #: builtin/reset.c:291 msgid "reset HEAD and index" msgstr "é‡ç½® HEAD 和索引" #: builtin/reset.c:292 msgid "reset only HEAD" msgstr "åªé‡ç½® HEAD" #: builtin/reset.c:294 builtin/reset.c:296 msgid "reset HEAD, index and working tree" msgstr "é‡ç½® HEADã€ç´¢å¼•å’Œå·¥ä½œåŒº" #: builtin/reset.c:298 msgid "reset HEAD but keep local changes" msgstr "é‡ç½® HEAD 但ä¿å˜æœ¬åœ°å˜æ›´" #: builtin/reset.c:304 msgid "record only the fact that removed paths will be added later" msgstr "å°†åˆ é™¤çš„è·¯å¾„æ ‡è®°ä¸ºç¨åŽæ·»åŠ " #: builtin/reset.c:321 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "æ— æ³•å°† '%s' 解æžä¸ºä¸€ä¸ªæœ‰æ•ˆçš„版本。" #: builtin/reset.c:329 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "æ— æ³•å°† '%s' 解æžä¸ºä¸€ä¸ªæœ‰æ•ˆçš„æ ‘å¯¹è±¡ã€‚" #: builtin/reset.c:338 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch 与 --{hardã€mixedã€soft} 选项ä¸å…¼å®¹" #: builtin/reset.c:347 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "--mixed 带路径已弃用,而是用 'git reset -- <路径>'。" # 译者:汉å—ä¹‹é—´æ— ç©ºæ ¼ï¼Œæ•…åˆ é™¤%så‰åŽç©ºæ ¼ #: builtin/reset.c:349 #, c-format msgid "Cannot do %s reset with paths." msgstr "ä¸èƒ½å¸¦è·¯å¾„进行%sé‡ç½®ã€‚" # 译者:汉å—ä¹‹é—´æ— ç©ºæ ¼ï¼Œæ•…åˆ é™¤%så‰åŽç©ºæ ¼ #: builtin/reset.c:359 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "ä¸èƒ½å¯¹çº¯ä»“库进行%sé‡ç½®" #: builtin/reset.c:363 msgid "-N can only be used with --mixed" msgstr "-N åªèƒ½å’Œ --mixed åŒæ—¶ä½¿ç”¨" #: builtin/reset.c:380 msgid "Unstaged changes after reset:" msgstr "é‡ç½®åŽå–消暂å˜çš„å˜æ›´ï¼š" #: builtin/reset.c:386 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "ä¸èƒ½é‡ç½®ç´¢å¼•æ–‡ä»¶è‡³ç‰ˆæœ¬ '%s'。" #: builtin/reset.c:390 msgid "Could not write new index file." msgstr "ä¸èƒ½å†™å…¥æ–°çš„索引文件。" #: builtin/rev-list.c:397 msgid "cannot combine --exclude-promisor-objects and --missing" msgstr "ä¸èƒ½åŒæ—¶ä½¿ç”¨ --exclude-promisor-objects å’Œ --missing 选项" #: builtin/rev-list.c:455 msgid "object filtering requires --objects" msgstr "å¯¹è±¡è¿‡æ»¤éœ€è¦ --objects" #: builtin/rev-list.c:458 #, c-format msgid "invalid sparse value '%s'" msgstr "æ— æ•ˆçš„ç¨€ç–值 '%s'" #: builtin/rev-list.c:499 msgid "rev-list does not support display of notes" msgstr "rev-list ä¸æ”¯æŒæ˜¾ç¤ºæ³¨è§£" #: builtin/rev-list.c:502 msgid "cannot combine --use-bitmap-index with object filtering" msgstr "ä¸èƒ½å°† --use-bitmap-index 和对象过滤组åˆä½¿ç”¨" #: builtin/rev-parse.c:406 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "git rev-parse --parseopt [<选项>] -- [<å‚æ•°>...]" #: builtin/rev-parse.c:411 msgid "keep the `--` passed as an arg" msgstr "ä¿æŒ `--` 作为一个å‚æ•°ä¼ é€’" #: builtin/rev-parse.c:413 msgid "stop parsing after the first non-option argument" msgstr "é‡åˆ°ç¬¬ä¸€ä¸ªéžé€‰é¡¹å‚æ•°åŽåœæ¢è§£æž" #: builtin/rev-parse.c:416 msgid "output in stuck long form" msgstr "ä»¥å›ºå®šé•¿æ ¼å¼è¾“出" #: builtin/rev-parse.c:549 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 [<选项>] [<å‚æ•°>...]\n" "\n" "åˆæ¬¡ä½¿ç”¨æ—¶æ‰§è¡Œ \"git rev-parse --parseopt -h\" æ¥èŽ·å¾—更多信æ¯ã€‚" #: builtin/revert.c:23 msgid "git revert [<options>] <commit-ish>..." msgstr "git revert [<选项>] <æ交å·>..." #: builtin/revert.c:24 msgid "git revert <subcommand>" msgstr "git revert <å命令>" #: builtin/revert.c:29 msgid "git cherry-pick [<options>] <commit-ish>..." msgstr "git cherry-pick [<选项>] <æ交å·>..." #: builtin/revert.c:30 msgid "git cherry-pick <subcommand>" msgstr "git cherry-pick <å命令>" #: builtin/revert.c:90 #, c-format msgid "%s: %s cannot be used with %s" msgstr "%s:%s ä¸èƒ½å’Œ %s åŒæ—¶ä½¿ç”¨" #: builtin/revert.c:99 msgid "end revert or cherry-pick sequence" msgstr "终æ¢å转或拣选æ“作" #: builtin/revert.c:100 msgid "resume revert or cherry-pick sequence" msgstr "继ç»å转或拣选æ“作" #: builtin/revert.c:101 msgid "cancel revert or cherry-pick sequence" msgstr "å–消å转或拣选æ“作" #: builtin/revert.c:102 msgid "don't automatically commit" msgstr "ä¸è¦è‡ªåŠ¨æ交" #: builtin/revert.c:103 msgid "edit the commit message" msgstr "编辑æ交说明" #: builtin/revert.c:106 msgid "parent-number" msgstr "父编å·" #: builtin/revert.c:107 msgid "select mainline parent" msgstr "选择主干父æ交编å·" #: builtin/revert.c:109 msgid "merge strategy" msgstr "åˆå¹¶ç–ç•¥" #: builtin/revert.c:110 msgid "option" msgstr "选项" #: builtin/revert.c:111 msgid "option for merge strategy" msgstr "åˆå¹¶ç–略的选项" #: builtin/revert.c:120 msgid "append commit name" msgstr "è¿½åŠ æ交å称" #: builtin/revert.c:122 msgid "preserve initially empty commits" msgstr "ä¿ç•™åˆå§‹åŒ–的空æ交" #: builtin/revert.c:124 msgid "keep redundant, empty commits" msgstr "ä¿æŒå¤šä½™çš„ã€ç©ºçš„æ交" #: builtin/revert.c:214 msgid "revert failed" msgstr "还原失败" #: builtin/revert.c:227 msgid "cherry-pick failed" msgstr "拣选失败" #: builtin/rm.c:18 msgid "git rm [<options>] [--] <file>..." msgstr "git rm [<选项>] [--] <文件>..." #: builtin/rm.c:206 msgid "" "the following file has staged content different from both the\n" "file and the HEAD:" msgid_plural "" "the following files have staged content different from both the\n" "file and the HEAD:" msgstr[0] "如下文件其暂å˜çš„å†…å®¹å’Œå·¥ä½œåŒºåŠ HEAD ä¸çš„都ä¸ä¸€æ ·ï¼š" msgstr[1] "如下文件其暂å˜çš„å†…å®¹å’Œå·¥ä½œåŒºåŠ HEAD ä¸çš„都ä¸ä¸€æ ·ï¼š" #: builtin/rm.c:211 msgid "" "\n" "(use -f to force removal)" msgstr "" "\n" "(使用 -f å¼ºåˆ¶åˆ é™¤ï¼‰" #: builtin/rm.c:215 msgid "the following file has changes staged in the index:" msgid_plural "the following files have changes staged in the index:" msgstr[0] "下列文件索引ä¸æœ‰å˜æ›´" msgstr[1] "下列文件索引ä¸æœ‰å˜æ›´" #: builtin/rm.c:219 builtin/rm.c:228 msgid "" "\n" "(use --cached to keep the file, or -f to force removal)" msgstr "" "\n" "(使用 --cached ä¿ç•™æœ¬åœ°æ–‡ä»¶ï¼Œæˆ–用 -f å¼ºåˆ¶åˆ é™¤ï¼‰" #: builtin/rm.c:225 msgid "the following file has local modifications:" msgid_plural "the following files have local modifications:" msgstr[0] "如下文件有本地修改:" msgstr[1] "如下文件有本地修改:" #: builtin/rm.c:241 msgid "do not list removed files" msgstr "ä¸åˆ—å‡ºåˆ é™¤çš„æ–‡ä»¶" #: builtin/rm.c:242 msgid "only remove from the index" msgstr "åªä»Žç´¢å¼•åŒºåˆ 除" #: builtin/rm.c:243 msgid "override the up-to-date check" msgstr "忽略文件更新状æ€æ£€æŸ¥" #: builtin/rm.c:244 msgid "allow recursive removal" msgstr "å…è®¸é€’å½’åˆ é™¤" #: builtin/rm.c:246 msgid "exit with a zero status even if nothing matched" msgstr "å³ä½¿æ²¡æœ‰åŒ¹é…,也以零状æ€é€€å‡º" #: builtin/rm.c:306 #, c-format msgid "not removing '%s' recursively without -r" msgstr "未æä¾› -r 选项ä¸ä¼šé€’å½’åˆ é™¤ '%s'" #: builtin/rm.c:345 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm:ä¸èƒ½åˆ 除 %s" #: builtin/rm.c:368 #, c-format msgid "could not remove '%s'" msgstr "æ— æ³•åˆ é™¤ '%s'" #: builtin/send-pack.c:20 msgid "" "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" "receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> " "[<ref>...]\n" " --all and explicit <ref> specification are mutually exclusive." msgstr "" "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-" "receive-pack>] [--verbose] [--thin] [--atomic] [<主机>:]<目录> [<引用>...]\n" " --all 和明确的 <引用> 互斥。" #: builtin/send-pack.c:163 msgid "remote name" msgstr "远程å称" #: builtin/send-pack.c:177 msgid "use stateless RPC protocol" msgstr "ä½¿ç”¨æ— çŠ¶æ€çš„ RPC åè®®" #: builtin/send-pack.c:178 msgid "read refs from stdin" msgstr "ä»Žæ ‡å‡†è¾“å…¥è¯»å–引用" #: builtin/send-pack.c:179 msgid "print status from remote helper" msgstr "打å°æ¥è‡ªè¿œç¨‹ helper 的状æ€" #: builtin/serve.c:7 msgid "git serve [<options>]" msgstr "git serve [<选项>]" #: builtin/serve.c:17 builtin/upload-pack.c:23 msgid "quit after a single request/response exchange" msgstr "在一次å•ç‹¬çš„请求/å“应之åŽé€€å‡º" #: builtin/serve.c:19 msgid "exit immediately after advertising capabilities" msgstr "在广告功能åŽç«‹å³é€€å‡º" #: builtin/shortlog.c:14 msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]" msgstr "git shortlog [<选项>] [<版本范围>] [[--] <路径>...]" #: builtin/shortlog.c:15 msgid "git log --pretty=short | git shortlog [<options>]" msgstr "git log --pretty=short | git shortlog [<选项>]" #: builtin/shortlog.c:264 msgid "Group by committer rather than author" msgstr "按照æ交者分组而ä¸æ˜¯ä½œè€…" #: builtin/shortlog.c:266 msgid "sort output according to the number of commits per author" msgstr "æ ¹æ®æ¯ä¸ªä½œè€…çš„æ交数é‡æŽ’åº" #: builtin/shortlog.c:268 msgid "Suppress commit descriptions, only provides commit count" msgstr "éšè—æ交说明,åªæä¾›æ交数é‡" #: builtin/shortlog.c:270 msgid "Show the email address of each author" msgstr "显示æ¯ä¸ªä½œè€…的电å邮件地å€" #: builtin/shortlog.c:271 msgid "w[,i1[,i2]]" msgstr "w[,i1[,i2]]" #: builtin/shortlog.c:272 msgid "Linewrap output" msgstr "折行输出" #: builtin/shortlog.c:298 msgid "too many arguments given outside repository" msgstr "仓库外执行æ供了太多的å‚æ•°" #: builtin/show-branch.c:12 msgid "" "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n" "\t\t[--more=<n> | --list | --independent | --merge-base]\n" "\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" msgstr "" "git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" "\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n" "\t\t[--more=<n> | --list | --independent | --merge-base]\n" "\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通é…符>)...]" #: builtin/show-branch.c:16 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" msgstr "git show-branch (-g | --reflog)[=<n>[,<起始点>]] [--list] [<引用>]" #: builtin/show-branch.c:376 #, c-format msgid "ignoring %s; cannot handle more than %d ref" msgid_plural "ignoring %s; cannot handle more than %d refs" msgstr[0] "忽略 %sï¼Œæ— æ³•å¤„ç† %d 个以上的引用" msgstr[1] "忽略 %sï¼Œæ— æ³•å¤„ç† %d 个以上的引用" #: builtin/show-branch.c:530 #, c-format msgid "no matching refs with %s" msgstr "没有和 %s 匹é…的引用" #: builtin/show-branch.c:626 msgid "show remote-tracking and local branches" msgstr "显示远程跟踪的和本地的分支" #: builtin/show-branch.c:628 msgid "show remote-tracking branches" msgstr "显示远程跟踪的分支" #: builtin/show-branch.c:630 msgid "color '*!+-' corresponding to the branch" msgstr "ç€è‰² '*!+-' 到相应的分支" #: builtin/show-branch.c:632 msgid "show <n> more commits after the common ancestor" msgstr "显示共åŒç¥–å…ˆåŽçš„ <n> 个æ交" #: builtin/show-branch.c:634 msgid "synonym to more=-1" msgstr "å’Œ more=-1 åŒä¹‰" #: builtin/show-branch.c:635 msgid "suppress naming strings" msgstr "ä¸æ˜¾ç¤ºå—符串命å" #: builtin/show-branch.c:637 msgid "include the current branch" msgstr "包括当å‰åˆ†æ”¯" #: builtin/show-branch.c:639 msgid "name commits with their object names" msgstr "以对象åå—命åæ交" #: builtin/show-branch.c:641 msgid "show possible merge bases" msgstr "显示å¯èƒ½åˆå¹¶çš„基线" #: builtin/show-branch.c:643 msgid "show refs unreachable from any other ref" msgstr "显示没有任何引用的的引用" #: builtin/show-branch.c:645 msgid "show commits in topological order" msgstr "以拓扑顺åºæ˜¾ç¤ºæ交" #: builtin/show-branch.c:648 msgid "show only commits not on the first branch" msgstr "åªæ˜¾ç¤ºä¸åœ¨ç¬¬ä¸€ä¸ªåˆ†æ”¯ä¸Šçš„æ交" #: builtin/show-branch.c:650 msgid "show merges reachable from only one tip" msgstr "显示仅一个分支å¯è®¿é—®çš„åˆå¹¶æ交" #: builtin/show-branch.c:652 msgid "topologically sort, maintaining date order where possible" msgstr "拓扑方å¼æŽ’åºï¼Œå¹¶å°½å¯èƒ½åœ°ä¿æŒæ—¥æœŸé¡ºåº" #: builtin/show-branch.c:655 msgid "<n>[,<base>]" msgstr "<n>[,<base>]" #: builtin/show-branch.c:656 msgid "show <n> most recent ref-log entries starting at base" msgstr "显示从起始点开始的 <n> æ¡æœ€è¿‘的引用日志记录" #: builtin/show-branch.c:690 msgid "" "--reflog is incompatible with --all, --remotes, --independent or --merge-base" msgstr "--reflog å’Œ --allã€--remotesã€--independent 或 --merge-base ä¸å…¼å®¹" #: builtin/show-branch.c:714 msgid "no branches given, and HEAD is not valid" msgstr "未æ供分支,且 HEAD æ— æ•ˆ" #: builtin/show-branch.c:717 msgid "--reflog option needs one branch name" msgstr "选项 --reflog 需è¦ä¸€ä¸ªåˆ†æ”¯å" #: builtin/show-branch.c:720 #, c-format msgid "only %d entry can be shown at one time." msgid_plural "only %d entries can be shown at one time." msgstr[0] "一次åªèƒ½æ˜¾ç¤º %d 个æ¡ç›®ã€‚" msgstr[1] "一次åªèƒ½æ˜¾ç¤º %d 个æ¡ç›®ã€‚" #: builtin/show-branch.c:724 #, c-format msgid "no such ref %s" msgstr "æ— æ¤å¼•ç”¨ %s" #: builtin/show-branch.c:808 #, c-format msgid "cannot handle more than %d rev." msgid_plural "cannot handle more than %d revs." msgstr[0] "ä¸èƒ½å¤„ç† %d 个以上的版本。" msgstr[1] "ä¸èƒ½å¤„ç† %d 个以上的版本。" #: builtin/show-branch.c:812 #, c-format msgid "'%s' is not a valid ref." msgstr "'%s' ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„引用。" #: builtin/show-branch.c:815 #, c-format msgid "cannot find commit %s (%s)" msgstr "ä¸èƒ½æ‰¾åˆ°æ交 %s(%s)" #: 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] [--] [<模å¼>...]" #: builtin/show-ref.c:11 msgid "git show-ref --exclude-existing[=<pattern>]" msgstr "git show-ref --exclude-existing[=<模å¼>]" #: builtin/show-ref.c:159 msgid "only show tags (can be combined with heads)" msgstr "åªæ˜¾ç¤ºæ ‡ç¾ï¼ˆå¯ä»¥å’Œå¤´å…±ç”¨ï¼‰" #: builtin/show-ref.c:160 msgid "only show heads (can be combined with tags)" msgstr "åªæ˜¾ç¤ºå¤´ï¼ˆå¯ä»¥å’Œæ ‡ç¾å…±ç”¨ï¼‰" #: builtin/show-ref.c:161 msgid "stricter reference checking, requires exact ref path" msgstr "æ›´ä¸¥æ ¼çš„å¼•ç”¨æ£€æµ‹ï¼Œéœ€è¦ç²¾ç¡®çš„引用路径" #: builtin/show-ref.c:164 builtin/show-ref.c:166 msgid "show the HEAD reference, even if it would be filtered out" msgstr "显示 HEAD 引用,å³ä½¿è¢«è¿‡æ»¤æŽ‰" #: builtin/show-ref.c:168 msgid "dereference tags into object IDs" msgstr "转æ¢æ ‡ç¾åˆ°å¯¹è±¡ ID" #: builtin/show-ref.c:170 msgid "only show SHA1 hash using <n> digits" msgstr "åªæ˜¾ç¤ºä½¿ç”¨ <n> 个数å—çš„ SHA1 哈希" #: builtin/show-ref.c:174 msgid "do not print results to stdout (useful with --verify)" msgstr "ä¸æ‰“å°ç»“æžœåˆ°æ ‡å‡†è¾“å‡ºï¼ˆä¾‹å¦‚ä¸Ž --verify å‚数共用)" #: builtin/show-ref.c:176 msgid "show refs from stdin that aren't in local repository" msgstr "æ˜¾ç¤ºä»Žæ ‡å‡†è¾“å…¥ä¸è¯»å…¥çš„ä¸åœ¨æœ¬åœ°ä»“库ä¸çš„引用" #: builtin/stripspace.c:18 msgid "git stripspace [-s | --strip-comments]" msgstr "git stripspace [-s | --strip-comments]" #: builtin/stripspace.c:19 msgid "git stripspace [-c | --comment-lines]" msgstr "git stripspace [-c | --comment-lines]" #: builtin/stripspace.c:36 msgid "skip and remove all lines starting with comment character" msgstr "跳过和移除所有的注释行" #: builtin/stripspace.c:39 msgid "prepend comment character and space to each line" msgstr "为æ¯ä¸€è¡Œçš„è¡Œé¦–æ·»åŠ æ³¨é‡Šç¬¦å’Œç©ºæ ¼" #: builtin/submodule--helper.c:37 builtin/submodule--helper.c:1688 #, c-format msgid "No such ref: %s" msgstr "æ²¡æœ‰è¿™æ ·çš„å¼•ç”¨ï¼š%s" #: builtin/submodule--helper.c:44 builtin/submodule--helper.c:1697 #, c-format msgid "Expecting a full ref name, got %s" msgstr "期望一个完整的引用å称,å´å¾—到 %s" #: builtin/submodule--helper.c:61 msgid "submodule--helper print-default-remote takes no arguments" msgstr "submodule--helper print-default-remote ä¸å¸¦å‚æ•°" #: builtin/submodule--helper.c:98 #, c-format msgid "cannot strip one component off url '%s'" msgstr "æ— æ³•ä»Ž url '%s' 剥离一个组件" #: builtin/submodule--helper.c:406 builtin/submodule--helper.c:1211 msgid "alternative anchor for relative paths" msgstr "相对路径的替代锚记(anchor)" #: builtin/submodule--helper.c:411 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]" #: builtin/submodule--helper.c:462 builtin/submodule--helper.c:485 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "在 .gitmodules ä¸æœªæ‰¾åˆ°å模组 '%s' çš„ url" #: builtin/submodule--helper.c:500 #, c-format msgid "" "could not lookup configuration '%s'. Assuming this repository is its own " "authoritative upstream." msgstr "æ— æ³•æ‰¾åˆ°é…ç½® '%s'。å‡å®šè¿™ä¸ªä»“库是其自身的官方上游。" #: builtin/submodule--helper.c:511 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "æ— æ³•ä¸ºå模组 '%s' 注册 url" #: builtin/submodule--helper.c:515 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "å模组 '%s'(%s)未对路径 '%s' 注册\n" # #: builtin/submodule--helper.c:525 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "è¦å‘Šï¼šå»ºè®®å模组 '%s' 使用命令更新模å¼\n" #: builtin/submodule--helper.c:532 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "æ— æ³•ä¸ºå模组 '%s' 注册更新模å¼" #: builtin/submodule--helper.c:554 msgid "Suppress output for initializing a submodule" msgstr "阻æ¢å模组åˆå§‹åŒ–的输出" #: builtin/submodule--helper.c:559 msgid "git submodule--helper init [<path>]" msgstr "git submodule--helper init [<路径>]" #: builtin/submodule--helper.c:631 builtin/submodule--helper.c:757 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "在 .gitmodules ä¸æ²¡æœ‰å‘现路径 '%s' çš„åæ¨¡ç»„æ˜ å°„" #: builtin/submodule--helper.c:670 #, c-format msgid "could not resolve HEAD ref inside the submodule '%s'" msgstr "æ— æ³•è§£æžå模组 '%s' çš„ HEAD 引用" #: builtin/submodule--helper.c:697 builtin/submodule--helper.c:866 #, c-format msgid "failed to recurse into submodule '%s'" msgstr "æ— æ³•é€’å½’å模组 '%s'" #: builtin/submodule--helper.c:721 builtin/submodule--helper.c:1031 msgid "Suppress submodule status output" msgstr "阻æ¢å模组状æ€è¾“出" #: builtin/submodule--helper.c:722 msgid "" "Use commit stored in the index instead of the one stored in the submodule " "HEAD" msgstr "使用å˜å‚¨åœ¨ç´¢å¼•ä¸çš„æ交,而éžå˜å‚¨åœ¨å模组 HEAD ä¸çš„æ交" #: builtin/submodule--helper.c:723 msgid "recurse into nested submodules" msgstr "递归进入嵌套å模组ä¸" #: builtin/submodule--helper.c:728 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "git submodule status [--quiet] [--cached] [--recursive] [<路径>...]" #: builtin/submodule--helper.c:752 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <路径>" #: builtin/submodule--helper.c:816 #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "为 '%s' åŒæ¥å模组 url\n" #: builtin/submodule--helper.c:822 #, c-format msgid "failed to register url for submodule path '%s'" msgstr "æ— æ³•ä¸ºå模组路径 '%s' 注册 url" #: builtin/submodule--helper.c:836 #, c-format msgid "failed to get the default remote for submodule '%s'" msgstr "æ— æ³•å¾—åˆ°å模组 '%s' 的默认远程关è”" #: builtin/submodule--helper.c:847 #, c-format msgid "failed to update remote for submodule '%s'" msgstr "æ— æ³•ä¸ºå模组 '%s' 更新远程关è”" #: builtin/submodule--helper.c:895 msgid "Suppress output of synchronizing submodule url" msgstr "阻æ¢å模组 url åŒæ¥çš„输出" #: builtin/submodule--helper.c:897 msgid "Recurse into nested submodules" msgstr "递归进入嵌套å模组ä¸" #: builtin/submodule--helper.c:902 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "git submodule--helper sync [--quiet] [--recursive] [<路径>]" #: builtin/submodule--helper.c:956 #, c-format msgid "" "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " "really want to remove it including all of its history)" msgstr "" "å模组工作区 '%s' 包å«ä¸€ä¸ª .git ç›®å½•ï¼ˆå¦‚æžœæ‚¨ç¡®éœ€åˆ é™¤å®ƒåŠå…¶å…¨éƒ¨åŽ†å²ï¼Œä½¿ç”¨ 'rm " "-rf' 命令)" #: builtin/submodule--helper.c:968 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " "them" msgstr "å模组工作区 '%s' 包å«æœ¬åœ°ä¿®æ”¹ï¼›ä½¿ç”¨ '-f' 丢弃它们" #: builtin/submodule--helper.c:976 #, c-format msgid "Cleared directory '%s'\n" msgstr "已清除目录 '%s'\n" #: builtin/submodule--helper.c:978 #, c-format msgid "Could not remove submodule work tree '%s'\n" msgstr "æ— æ³•ç§»é™¤å模组工作区 '%s'\n" #: builtin/submodule--helper.c:987 #, c-format msgid "could not create empty submodule directory %s" msgstr "ä¸èƒ½åˆ›å»ºç©ºçš„å模组目录 %s" #: builtin/submodule--helper.c:1003 #, c-format msgid "Submodule '%s' (%s) unregistered for path '%s'\n" msgstr "å模组 '%s'(%s)未对路径 '%s' 注册\n" #: builtin/submodule--helper.c:1032 msgid "Remove submodule working trees even if they contain local changes" msgstr "åˆ é™¤å模组工作区,å³ä½¿åŒ…å«æœ¬åœ°ä¿®æ”¹" #: builtin/submodule--helper.c:1033 msgid "Unregister all submodules" msgstr "将所有å模组å–消注册" #: builtin/submodule--helper.c:1038 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" msgstr "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<路径>...]]" #: builtin/submodule--helper.c:1052 msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "如果您确实想è¦å¯¹æ‰€æœ‰å模组执行å–消åˆå§‹åŒ–,请使用 '--all'" #: builtin/submodule--helper.c:1145 builtin/submodule--helper.c:1148 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "å模组 '%s' ä¸èƒ½æ·»åŠ 仓库备选:%s" #: builtin/submodule--helper.c:1184 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "ä¸èƒ½è¯†åˆ« submodule.alternateErrorStrategy çš„å–值 '%s'" #: builtin/submodule--helper.c:1191 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "ä¸èƒ½è¯†åˆ« submodule.alternateLocaion çš„å–值 '%s'" #: builtin/submodule--helper.c:1214 msgid "where the new submodule will be cloned to" msgstr "æ–°çš„å模组将è¦å…‹éš†çš„路径" #: builtin/submodule--helper.c:1217 msgid "name of the new submodule" msgstr "æ–°å模组的å称" #: builtin/submodule--helper.c:1220 msgid "url where to clone the submodule from" msgstr "克隆å模组的 url 地å€" #: builtin/submodule--helper.c:1228 msgid "depth for shallow clones" msgstr "浅克隆的深度" #: builtin/submodule--helper.c:1231 builtin/submodule--helper.c:1606 msgid "force cloning progress" msgstr "强制显示克隆进度" #: builtin/submodule--helper.c:1236 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" msgstr "" "git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] " "[--name <åå—>] [--depth <深度>] --url <url> --path <路径>" #: builtin/submodule--helper.c:1267 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "æ— æ³•å…‹éš† '%s' 到å模组路径 '%s'" #: builtin/submodule--helper.c:1281 #, c-format msgid "could not get submodule directory for '%s'" msgstr "æ— æ³•å¾—åˆ° '%s' çš„å模组目录" #: builtin/submodule--helper.c:1347 #, c-format msgid "Submodule path '%s' not initialized" msgstr "å模组 '%s' 尚未åˆå§‹åŒ–" #: builtin/submodule--helper.c:1351 msgid "Maybe you want to use 'update --init'?" msgstr "也许您想è¦æ‰§è¡Œ 'update --init'?" #: builtin/submodule--helper.c:1380 #, c-format msgid "Skipping unmerged submodule %s" msgstr "略过未åˆå¹¶çš„å模组 %s" #: builtin/submodule--helper.c:1409 #, c-format msgid "Skipping submodule '%s'" msgstr "略过å模组 '%s'" #: builtin/submodule--helper.c:1544 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "克隆 '%s' 失败。按计划é‡è¯•" #: builtin/submodule--helper.c:1555 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "第二次å°è¯•å…‹éš† '%s' 失败,退出" #: builtin/submodule--helper.c:1585 builtin/submodule--helper.c:1808 msgid "path into the working tree" msgstr "到工作区的路径" #: builtin/submodule--helper.c:1588 msgid "path into the working tree, across nested submodule boundaries" msgstr "工作区ä¸çš„路径,递归嵌套å模组" #: builtin/submodule--helper.c:1592 msgid "rebase, merge, checkout or none" msgstr "rebaseã€mergeã€checkout 或 none" #: builtin/submodule--helper.c:1598 msgid "Create a shallow clone truncated to the specified number of revisions" msgstr "创建一个指定深度的浅克隆" #: builtin/submodule--helper.c:1601 msgid "parallel jobs" msgstr "并å‘任务" #: builtin/submodule--helper.c:1603 msgid "whether the initial clone should follow the shallow recommendation" msgstr "åˆå§‹å…‹éš†æ˜¯å¦åº”该éµå®ˆæŽ¨è的浅克隆选项" #: builtin/submodule--helper.c:1604 msgid "don't print cloning progress" msgstr "ä¸è¦è¾“出克隆进度" #: builtin/submodule--helper.c:1611 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" msgstr "git submodule--helper update_clone [--prefix=<路径>] [<路径>...]" #: builtin/submodule--helper.c:1624 msgid "bad value for update parameter" msgstr "update å‚æ•°å–值错误" #: builtin/submodule--helper.c:1692 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " "the superproject is not on any branch" msgstr "å模组(%s)的分支é…置为继承上级项目的分支,但是上级项目ä¸åœ¨ä»»ä½•åˆ†æ”¯ä¸Š" #: builtin/submodule--helper.c:1809 msgid "recurse into submodules" msgstr "在å模组ä¸é€’å½’" #: builtin/submodule--helper.c:1815 msgid "git submodule--helper embed-git-dir [<path>...]" msgstr "git submodule--helper embed-git-dir [<路径>...]" #: builtin/submodule--helper.c:1901 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s ä¸æ”¯æŒ --super-prefix" #: builtin/submodule--helper.c:1907 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "'%s' ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„ submodule--helper å命令" #: builtin/symbolic-ref.c:8 msgid "git symbolic-ref [<options>] <name> [<ref>]" msgstr "git symbolic-ref [<选项>] <å称> [<引用>]" #: builtin/symbolic-ref.c:9 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:362 msgid "reason" msgstr "åŽŸå› " #: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 msgid "reason of the update" msgstr "æ›´æ–°çš„åŽŸå› " #: builtin/tag.c:24 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:25 msgid "git tag -d <tagname>..." msgstr "git tag -d <æ ‡ç¾å>..." #: builtin/tag.c:26 msgid "" "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--" "points-at <object>]\n" "\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]" msgstr "" "git tag -l [-n[<æ•°å—>]] [--contains <æ交>] [--no-contains <æ交>] [--points-" "at <对象>]\n" "\t\t[--format=<æ ¼å¼>] [--[no-]merged [<æ交>]] [<模å¼>...]" #: builtin/tag.c:28 msgid "git tag -v [--format=<format>] <tagname>..." msgstr "git tag -v [--format=<æ ¼å¼>] <æ ‡ç¾å>..." #: builtin/tag.c:86 #, c-format msgid "tag '%s' not found." msgstr "未å‘çŽ°æ ‡ç¾ '%s'。" #: builtin/tag.c:102 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "å·²åˆ é™¤æ ‡ç¾ '%s'(曾为 %s)\n" #: builtin/tag.c:132 #, c-format msgid "" "\n" "Write a message for tag:\n" " %s\n" "Lines starting with '%c' will be ignored.\n" msgstr "" "\n" "è¾“å…¥ä¸€ä¸ªæ ‡ç¾è¯´æ˜Žï¼š\n" " %s\n" "以 '%c' 开头的行将被忽略。\n" #: builtin/tag.c:136 #, c-format msgid "" "\n" "Write a message for tag:\n" " %s\n" "Lines starting with '%c' will be kept; you may remove them yourself if you " "want to.\n" msgstr "" "\n" "è¾“å…¥ä¸€ä¸ªæ ‡ç¾è¯´æ˜Žï¼š\n" " %s\n" "以 '%c' 开头的行将被ä¿ç•™ï¼Œå¦‚果您愿æ„也å¯ä»¥åˆ 除它们。\n" #: builtin/tag.c:190 msgid "unable to sign the tag" msgstr "æ— æ³•ç¾ç½²æ ‡ç¾" #: builtin/tag.c:192 msgid "unable to write tag file" msgstr "æ— æ³•å†™æ ‡ç¾æ–‡ä»¶" #: builtin/tag.c:217 msgid "bad object type." msgstr "å的对象类型。" #: builtin/tag.c:266 msgid "no tag message?" msgstr "æ— æ ‡ç¾è¯´æ˜Žï¼Ÿ" #: builtin/tag.c:273 #, c-format msgid "The tag message has been left in %s\n" msgstr "æ ‡ç¾è¯´æ˜Žè¢«ä¿ç•™åœ¨ %s\n" #: builtin/tag.c:382 msgid "list tag names" msgstr "åˆ—å‡ºæ ‡ç¾å称" #: builtin/tag.c:384 msgid "print <n> lines of each tag message" msgstr "æ¯ä¸ªæ ‡ç¾ä¿¡æ¯æ‰“å° <n> è¡Œ" #: builtin/tag.c:386 msgid "delete tags" msgstr "åˆ é™¤æ ‡ç¾" #: builtin/tag.c:387 msgid "verify tags" msgstr "验è¯æ ‡ç¾" #: builtin/tag.c:389 msgid "Tag creation options" msgstr "æ ‡ç¾åˆ›å»ºé€‰é¡¹" #: builtin/tag.c:391 msgid "annotated tag, needs a message" msgstr "é™„æ³¨æ ‡ç¾ï¼Œéœ€è¦ä¸€ä¸ªè¯´æ˜Ž" #: builtin/tag.c:393 msgid "tag message" msgstr "æ ‡ç¾è¯´æ˜Ž" #: builtin/tag.c:395 msgid "force edit of tag message" msgstr "å¼ºåˆ¶ç¼–è¾‘æ ‡ç¾è¯´æ˜Ž" #: builtin/tag.c:396 msgid "annotated and GPG-signed tag" msgstr "é™„æ³¨å¹¶é™„åŠ GPG ç¾åçš„æ ‡ç¾" #: builtin/tag.c:400 msgid "use another key to sign the tag" msgstr "使用å¦å¤–çš„ç§é’¥ç¾åè¯¥æ ‡ç¾" #: builtin/tag.c:401 msgid "replace the tag if exists" msgstr "如果å˜åœ¨ï¼Œæ›¿æ¢çŽ°æœ‰çš„æ ‡ç¾" #: builtin/tag.c:402 builtin/update-ref.c:368 msgid "create a reflog" msgstr "创建引用日志" #: builtin/tag.c:404 msgid "Tag listing options" msgstr "æ ‡ç¾åˆ—表选项" #: builtin/tag.c:405 msgid "show tag list in columns" msgstr "以列的方å¼æ˜¾ç¤ºæ ‡ç¾åˆ—表" #: builtin/tag.c:406 builtin/tag.c:408 msgid "print only tags that contain the commit" msgstr "åªæ‰“å°åŒ…å«è¯¥æäº¤çš„æ ‡ç¾" #: builtin/tag.c:407 builtin/tag.c:409 msgid "print only tags that don't contain the commit" msgstr "åªæ‰“å°ä¸åŒ…å«è¯¥æäº¤çš„æ ‡ç¾" #: builtin/tag.c:410 msgid "print only tags that are merged" msgstr "åªæ‰“å°å·²ç»åˆå¹¶çš„æ ‡ç¾" #: builtin/tag.c:411 msgid "print only tags that are not merged" msgstr "åªæ‰“å°å°šæœªåˆå¹¶çš„æ ‡ç¾" #: builtin/tag.c:416 msgid "print only tags of the object" msgstr "åªæ‰“å°æŒ‡å‘è¯¥å¯¹è±¡çš„æ ‡ç¾" #: builtin/tag.c:460 msgid "--column and -n are incompatible" msgstr "--column å’Œ -n ä¸å…¼å®¹" #: builtin/tag.c:482 msgid "-n option is only allowed in list mode" msgstr "-n 选项åªå…许用在列表显示模å¼" #: builtin/tag.c:484 msgid "--contains option is only allowed in list mode" msgstr "--contains 选项åªå…许用在列表显示模å¼" #: builtin/tag.c:486 msgid "--no-contains option is only allowed in list mode" msgstr "--no-contains 选项åªå…许用在列表显示模å¼" #: builtin/tag.c:488 msgid "--points-at option is only allowed in list mode" msgstr "--points-at 选项åªå…许用在列表显示模å¼" #: builtin/tag.c:490 msgid "--merged and --no-merged options are only allowed in list mode" msgstr "--merged å’Œ --no-merged 选项åªå…许用在列表显示模å¼" #: builtin/tag.c:501 msgid "only one -F or -m option is allowed." msgstr "åªå…许一个 -F 或 -m 选项。" #: builtin/tag.c:520 msgid "too many params" msgstr "太多å‚æ•°" #: builtin/tag.c:526 #, c-format msgid "'%s' is not a valid tag name." msgstr "'%s' ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„æ ‡ç¾å称。" #: builtin/tag.c:531 #, c-format msgid "tag '%s' already exists" msgstr "æ ‡ç¾ '%s' å·²å˜åœ¨" #: builtin/tag.c:562 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "å·²æ›´æ–°æ ‡ç¾ '%s'(曾为 %s)\n" #: builtin/unpack-objects.c:498 msgid "Unpacking objects" msgstr "展开对象ä¸" #: builtin/update-index.c:82 #, c-format msgid "failed to create directory %s" msgstr "æ— æ³•åˆ›å»ºç›®å½• %s" #: builtin/update-index.c:88 #, c-format msgid "failed to stat %s" msgstr "对 %s 调用 stat 失败" #: builtin/update-index.c:98 #, c-format msgid "failed to create file %s" msgstr "æ— æ³•åˆ›å»ºæ–‡ä»¶ %s" #: builtin/update-index.c:106 #, c-format msgid "failed to delete file %s" msgstr "æ— æ³•åˆ é™¤æ–‡ä»¶ %s" #: builtin/update-index.c:113 builtin/update-index.c:219 #, c-format msgid "failed to delete directory %s" msgstr "æ— æ³•åˆ é™¤ç›®å½• %s" #: builtin/update-index.c:138 #, c-format msgid "Testing mtime in '%s' " msgstr "在 '%s' ä¸æµ‹è¯• mtime " #: builtin/update-index.c:152 msgid "directory stat info does not change after adding a new file" msgstr "æ·»åŠ ä¸€ä¸ªæ–°æ–‡ä»¶åŽï¼Œç›®å½•çš„状æ€ä¿¡æ¯æœªæ”¹å˜" #: builtin/update-index.c:165 msgid "directory stat info does not change after adding a new directory" msgstr "æ·»åŠ ä¸€ä¸ªæ–°ç›®å½•åŽï¼Œç›®å½•çš„状æ€ä¿¡æ¯æœªæ”¹å˜" #: builtin/update-index.c:178 msgid "directory stat info changes after updating a file" msgstr "更新一个文件åŽï¼Œç›®å½•çš„状æ€ä¿¡æ¯è¢«ä¿®æ”¹" #: builtin/update-index.c:189 msgid "directory stat info changes after adding a file inside subdirectory" msgstr "在å目录ä¸æ·»åŠ 文件åŽï¼Œç›®å½•çš„状æ€ä¿¡æ¯è¢«ä¿®æ”¹" #: builtin/update-index.c:200 msgid "directory stat info does not change after deleting a file" msgstr "åˆ é™¤ä¸€ä¸ªæ–‡ä»¶åŽï¼Œç›®å½•çš„状æ€ä¿¡æ¯æœªæ”¹å˜" #: builtin/update-index.c:213 msgid "directory stat info does not change after deleting a directory" msgstr "åˆ é™¤ä¸€ä¸ªç›®å½•åŽï¼Œç›®å½•çš„状æ€ä¿¡æ¯æœªæ”¹å˜" #: builtin/update-index.c:220 msgid " OK" msgstr " OK" #: builtin/update-index.c:589 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<选项>] [--] [<文件>...]" #: builtin/update-index.c:946 msgid "continue refresh even when index needs update" msgstr "当索引需è¦æ›´æ–°æ—¶ç»§ç»åˆ·æ–°" #: builtin/update-index.c:949 msgid "refresh: ignore submodules" msgstr "刷新:忽略å模组" #: builtin/update-index.c:952 msgid "do not ignore new files" msgstr "ä¸å¿½ç•¥æ–°çš„文件" #: builtin/update-index.c:954 msgid "let files replace directories and vice-versa" msgstr "让文件替æ¢ç›®å½•ï¼ˆå之亦然)" #: builtin/update-index.c:956 msgid "notice files missing from worktree" msgstr "通知文件从工作区丢失" #: builtin/update-index.c:958 msgid "refresh even if index contains unmerged entries" msgstr "å³ä½¿ç´¢å¼•åŒºåŒ…å«æœªåˆå¹¶çš„æ¡ç›®ä¹Ÿæ‰§è¡Œåˆ·æ–°" #: builtin/update-index.c:961 msgid "refresh stat information" msgstr "刷新统计信æ¯" #: builtin/update-index.c:965 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置" #: builtin/update-index.c:969 msgid "<mode>,<object>,<path>" msgstr "<å˜å–模å¼>,<对象>,<路径>" #: builtin/update-index.c:970 msgid "add the specified entry to the index" msgstr "æ·»åŠ æŒ‡å®šçš„æ¡ç›®åˆ°ç´¢å¼•åŒº" #: builtin/update-index.c:979 msgid "mark files as \"not changing\"" msgstr "æŠŠæ–‡ä»¶æ ‡è®°ä¸º \"没有å˜æ›´\"" #: builtin/update-index.c:982 msgid "clear assumed-unchanged bit" msgstr "清除 assumed-unchanged ä½" #: builtin/update-index.c:985 msgid "mark files as \"index-only\"" msgstr "æŠŠæ–‡ä»¶æ ‡è®°ä¸º \"仅索引\"" #: builtin/update-index.c:988 msgid "clear skip-worktree bit" msgstr "清除 skip-worktree ä½" #: builtin/update-index.c:991 msgid "add to index only; do not add content to object database" msgstr "åªæ·»åŠ 到索引区;ä¸æ·»åŠ 对象到对象库" #: builtin/update-index.c:993 msgid "remove named paths even if present in worktree" msgstr "å³ä½¿å˜åœ¨å·¥ä½œåŒºé‡Œï¼Œä¹Ÿåˆ 除路径" #: builtin/update-index.c:995 msgid "with --stdin: input lines are terminated by null bytes" msgstr "æºå¸¦ --stdin:输入的行以 null å—符终æ¢" #: builtin/update-index.c:997 msgid "read list of paths to be updated from standard input" msgstr "ä»Žæ ‡å‡†è¾“å…¥ä¸è¯»å–需è¦æ›´æ–°çš„路径列表" #: builtin/update-index.c:1001 msgid "add entries from standard input to the index" msgstr "ä»Žæ ‡å‡†è¾“å…¥æ·»åŠ æ¡ç›®åˆ°ç´¢å¼•åŒº" #: builtin/update-index.c:1005 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "为指定文件é‡æ–°ç”Ÿæˆç¬¬2和第3æš‚å˜åŒº" #: builtin/update-index.c:1009 msgid "only update entries that differ from HEAD" msgstr "åªæ›´æ–°ä¸Ž HEAD ä¸åŒçš„æ¡ç›®" #: builtin/update-index.c:1013 msgid "ignore files missing from worktree" msgstr "忽略工作区丢失的文件" #: builtin/update-index.c:1016 msgid "report actions to standard output" msgstr "åœ¨æ ‡å‡†è¾“å‡ºæ˜¾ç¤ºæ“作" #: builtin/update-index.c:1018 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(for porcelains) 忘记ä¿å˜çš„未解决的冲çª" #: builtin/update-index.c:1022 msgid "write index in this format" msgstr "以这ç§æ ¼å¼å†™å…¥ç´¢å¼•åŒº" #: builtin/update-index.c:1024 msgid "enable or disable split index" msgstr "å¯ç”¨æˆ–ç¦ç”¨ç´¢å¼•æ‹†åˆ†" #: builtin/update-index.c:1026 msgid "enable/disable untracked cache" msgstr "å¯ç”¨/ç¦ç”¨å¯¹æœªè·Ÿè¸ªæ–‡ä»¶çš„缓å˜" #: builtin/update-index.c:1028 msgid "test if the filesystem supports untracked cache" msgstr "测试文件系统是å¦æ”¯æŒæœªè·Ÿè¸ªæ–‡ä»¶ç¼“å˜" #: builtin/update-index.c:1030 msgid "enable untracked cache without testing the filesystem" msgstr "æ— éœ€æ£€æµ‹æ–‡ä»¶ç³»ç»Ÿï¼Œå¯ç”¨å¯¹æœªè·Ÿè¸ªæ–‡ä»¶çš„缓å˜" #: builtin/update-index.c:1032 msgid "write out the index even if is not flagged as changed" msgstr "å³ä½¿æ²¡æœ‰è¢«æ ‡è®°ä¸ºå·²æ›´æ”¹ï¼Œä¹Ÿè¦å†™å‡ºç´¢å¼•" #: builtin/update-index.c:1034 msgid "enable or disable file system monitor" msgstr "å¯ç”¨æˆ–ç¦ç”¨æ–‡ä»¶ç³»ç»Ÿç›‘控" #: builtin/update-index.c:1036 msgid "mark files as fsmonitor valid" msgstr "æ ‡è®°æ–‡ä»¶ä¸º fsmonitor 有效" #: builtin/update-index.c:1039 msgid "clear fsmonitor valid bit" msgstr "清除 fsmonitor 有效ä½" #: builtin/update-index.c:1138 msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" msgstr "" "core.splitIndex 被设置为 false。如果您确实è¦å¯ç”¨ç´¢å¼•æ‹†åˆ†ï¼Œè¯·åˆ 除或修改它。" #: builtin/update-index.c:1147 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" msgstr "" "core.splitIndex 被设置为 true。如果您确实è¦ç¦ç”¨ç´¢å¼•æ‹†åˆ†ï¼Œè¯·åˆ 除或修改它。" #: builtin/update-index.c:1158 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" msgstr "" "core.untrackedCache 被设置为 true。如果您确实è¦ç¦ç”¨æœªè·Ÿè¸ªæ–‡ä»¶ç¼“å˜ï¼Œè¯·åˆ 除或修" "改它。" #: builtin/update-index.c:1162 msgid "Untracked cache disabled" msgstr "缓å˜æœªè·Ÿè¸ªæ–‡ä»¶è¢«ç¦ç”¨" #: builtin/update-index.c:1170 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" msgstr "" "core.untrackedCache 被设置为 false。如果您确实è¦å¯ç”¨æœªè·Ÿè¸ªæ–‡ä»¶ç¼“å˜ï¼Œè¯·åˆ 除或" "修改它。" #: builtin/update-index.c:1174 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "缓å˜æœªè·Ÿè¸ªæ–‡ä»¶åœ¨ '%s' å¯ç”¨" #: builtin/update-index.c:1182 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor" msgstr "core.fsmonitor 未设置;如果想è¦å¯ç”¨ fsmonitor 请设置该选项" #: builtin/update-index.c:1186 msgid "fsmonitor enabled" msgstr "fsmonitor 被å¯ç”¨" #: builtin/update-index.c:1189 msgid "" "core.fsmonitor is set; remove it if you really want to disable fsmonitor" msgstr "core.fsmonitor 已设置;如果想è¦ç¦ç”¨ fsmonitor 请移除该选项" #: builtin/update-index.c:1193 msgid "fsmonitor disabled" msgstr "fsmonitor 被ç¦ç”¨" #: builtin/update-ref.c:10 msgid "git update-ref [<options>] -d <refname> [<old-val>]" msgstr "git update-ref [<选项>] -d <引用å> [<旧值>]" #: builtin/update-ref.c:11 msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]" msgstr "git update-ref [<选项>] <引用å> <新值> [<旧值>]" #: builtin/update-ref.c:12 msgid "git update-ref [<options>] --stdin [-z]" msgstr "git update-ref [<选项>] --stdin [-z]" #: builtin/update-ref.c:363 msgid "delete the reference" msgstr "åˆ é™¤å¼•ç”¨" #: builtin/update-ref.c:365 msgid "update <refname> not the one it points to" msgstr "æ›´æ–° <引用å> 本身而ä¸æ˜¯å®ƒæŒ‡å‘的引用" #: builtin/update-ref.c:366 msgid "stdin has NUL-terminated arguments" msgstr "æ ‡å‡†è¾“å…¥æœ‰ä»¥ NUL å—符终æ¢çš„å‚æ•°" #: builtin/update-ref.c:367 msgid "read updates from stdin" msgstr "ä»Žæ ‡å‡†è¾“å…¥è¯»å–æ›´æ–°" #: builtin/update-server-info.c:7 msgid "git update-server-info [--force]" msgstr "git update-server-info [--force]" #: builtin/update-server-info.c:15 msgid "update the info files from scratch" msgstr "从头开始更新文件信æ¯" #: builtin/upload-pack.c:11 msgid "git upload-pack [<options>] <dir>" msgstr "git upload-pack [<选项>] <目录>" #: builtin/upload-pack.c:25 msgid "exit immediately after initial ref advertisement" msgstr "在åˆå§‹çš„引用广告åŽç«‹å³é€€å‡º" #: builtin/upload-pack.c:27 msgid "do not try <directory>/.git/ if <directory> is no Git directory" msgstr "如果 <目录> ä¸æ˜¯ä¸€ä¸ª Git 目录,ä¸è¦å°è¯• <目录>/.git/" #: builtin/upload-pack.c:29 msgid "interrupt transfer after <n> seconds of inactivity" msgstr "ä¸æ´»åŠ¨ <n> 秒钟åŽç»ˆæ¢ä¼ 输" #: builtin/verify-commit.c:18 msgid "git verify-commit [-v | --verbose] <commit>..." msgstr "git verify-commit [-v | --verbose] <æ交>..." #: builtin/verify-commit.c:73 msgid "print commit contents" msgstr "打å°æ交内容" #: builtin/verify-commit.c:74 builtin/verify-tag.c:38 msgid "print raw gpg status output" msgstr "打å°åŽŸå§‹ gpg 状æ€è¾“出" #: builtin/verify-pack.c:55 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..." #: builtin/verify-pack.c:65 msgid "verbose" msgstr "冗长输出" #: builtin/verify-pack.c:67 msgid "show statistics only" msgstr "åªæ˜¾ç¤ºç»Ÿè®¡" #: builtin/verify-tag.c:19 msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..." msgstr "git verify-tag [-v | --verbose] [--format=<æ ¼å¼>] <æ ‡ç¾>..." #: builtin/verify-tag.c:37 msgid "print tag contents" msgstr "打å°æ ‡ç¾å†…容" #: builtin/worktree.c:17 msgid "git worktree add [<options>] <path> [<commit-ish>]" msgstr "git worktree add [<选项>] <路径> [<æ交>]" #: builtin/worktree.c:18 msgid "git worktree list [<options>]" msgstr "git worktree list [<选项>]" #: builtin/worktree.c:19 msgid "git worktree lock [<options>] <path>" msgstr "git worktree lock [<选项>] <路径>" #: builtin/worktree.c:20 msgid "git worktree move <worktree> <new-path>" msgstr "git worktree move <工作区> <新路径>" #: builtin/worktree.c:21 msgid "git worktree prune [<options>]" msgstr "git worktree prune [<选项>]" #: builtin/worktree.c:22 msgid "git worktree remove [<options>] <worktree>" msgstr "git worktree remove [<选项>] <工作区>" #: builtin/worktree.c:23 msgid "git worktree unlock <path>" msgstr "git worktree unlock <路径>" #: builtin/worktree.c:58 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "åˆ é™¤å·¥ä½œåŒº/%s:ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„目录" #: builtin/worktree.c:64 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "åˆ é™¤ worktrees/%s:gitdir 文件ä¸å˜åœ¨" #: builtin/worktree.c:69 builtin/worktree.c:78 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "åˆ é™¤ worktrees/%sï¼šæ— æ³•è¯»å– gitdir 文件 (%s)" #: builtin/worktree.c:88 #, c-format msgid "" "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read " "%<PRIuMAX>)" msgstr "åˆ é™¤å·¥ä½œæ ‘/%s:读å–过çŸï¼ˆæœŸæœ› %<PRIuMAX> å—èŠ‚ï¼Œè¯»å– %<PRIuMAX>)" #: builtin/worktree.c:96 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "åˆ é™¤ worktrees/%sï¼šæ— æ•ˆçš„ gitdir 文件" #: builtin/worktree.c:105 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "åˆ é™¤ worktrees/%s:gitdir 文件的指å‘ä¸å˜åœ¨" #: builtin/worktree.c:152 msgid "report pruned working trees" msgstr "报告清除的工作区" #: builtin/worktree.c:154 msgid "expire working trees older than <time>" msgstr "将早于 <时间> 的工作区过期" #: builtin/worktree.c:229 #, c-format msgid "'%s' already exists" msgstr "'%s' å·²ç»å˜åœ¨" #: builtin/worktree.c:260 #, c-format msgid "could not create directory of '%s'" msgstr "ä¸èƒ½åˆ›å»ºç›®å½• '%s'" #: builtin/worktree.c:373 builtin/worktree.c:379 #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "准备工作区(新分支 '%s')" #: builtin/worktree.c:375 #, c-format msgid "Preparing worktree (resetting branch '%s'; was at %s)" msgstr "准备工作区(é‡ç½®åˆ†æ”¯ '%s',之å‰ä¸º %s)" #: builtin/worktree.c:384 #, c-format msgid "Preparing worktree (checking out '%s')" msgstr "准备工作区(检出 '%s')" #: builtin/worktree.c:390 #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "准备工作区(分离头指针 %s)" #: builtin/worktree.c:431 msgid "checkout <branch> even if already checked out in other worktree" msgstr "检出 <分支>,å³ä½¿å·²ç»è¢«æ£€å‡ºåˆ°å…¶å®ƒå·¥ä½œåŒº" #: builtin/worktree.c:434 msgid "create a new branch" msgstr "创建一个新分支" #: builtin/worktree.c:436 msgid "create or reset a branch" msgstr "创建或é‡ç½®ä¸€ä¸ªåˆ†æ”¯" #: builtin/worktree.c:438 msgid "populate the new working tree" msgstr "生æˆæ–°çš„工作区" #: builtin/worktree.c:439 msgid "keep the new working tree locked" msgstr "é”定新工作区" #: builtin/worktree.c:441 msgid "set up tracking mode (see git-branch(1))" msgstr "设置跟踪模å¼ï¼ˆå‚è§ git-branch(1))" #: builtin/worktree.c:444 msgid "try to match the new branch name with a remote-tracking branch" msgstr "å°è¯•ä¸ºæ–°åˆ†æ”¯å匹é…一个远程跟踪分支" #: builtin/worktree.c:452 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-bã€-B å’Œ --detach 是互斥的" #: builtin/worktree.c:511 msgid "--[no-]track can only be used if a new branch is created" msgstr "åªèƒ½åœ¨åˆ›å»ºæ–°åˆ†æ”¯æ—¶ä½¿ç”¨é€‰é¡¹ --[no-]track " #: builtin/worktree.c:611 msgid "reason for locking" msgstr "é”å®šåŽŸå› " #: builtin/worktree.c:623 builtin/worktree.c:656 builtin/worktree.c:710 #: builtin/worktree.c:850 #, c-format msgid "'%s' is not a working tree" msgstr "'%s' ä¸æ˜¯ä¸€ä¸ªå·¥ä½œåŒº" #: builtin/worktree.c:625 builtin/worktree.c:658 msgid "The main working tree cannot be locked or unlocked" msgstr "ä¸»å·¥ä½œåŒºæ— æ³•è¢«åŠ é”或解é”" #: builtin/worktree.c:630 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "'%s' 已被é”å®šï¼ŒåŽŸå› ï¼š%s" #: builtin/worktree.c:632 #, c-format msgid "'%s' is already locked" msgstr "'%s' 已被é”定" #: builtin/worktree.c:660 #, c-format msgid "'%s' is not locked" msgstr "'%s' 未被é”定" #: builtin/worktree.c:685 msgid "working trees containing submodules cannot be moved or removed" msgstr "ä¸èƒ½ç§»åŠ¨æˆ–åˆ é™¤åŒ…å«å模组的工作区" #: builtin/worktree.c:712 builtin/worktree.c:852 #, c-format msgid "'%s' is a main working tree" msgstr "'%s' 是一个主工作区" #: builtin/worktree.c:717 #, c-format msgid "could not figure out destination name from '%s'" msgstr "æ— æ³•ä»Ž '%s' ç®—å‡ºç›®æ ‡å称" #: builtin/worktree.c:723 #, c-format msgid "target '%s' already exists" msgstr "ç›®æ ‡ '%s' å·²å˜åœ¨" #: builtin/worktree.c:730 #, c-format msgid "cannot move a locked working tree, lock reason: %s" msgstr "æ— æ³•ç§»åŠ¨ä¸€ä¸ªé”定的工作区,é”å®šåŽŸå› ï¼š%s" #: builtin/worktree.c:732 msgid "cannot move a locked working tree" msgstr "æ— æ³•ç§»åŠ¨ä¸€ä¸ªé”定的工作区" #: builtin/worktree.c:735 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "验è¯å¤±è´¥ï¼Œæ— 法移动工作区:%s" #: builtin/worktree.c:740 #, c-format msgid "failed to move '%s' to '%s'" msgstr "æ— æ³•ç§»åŠ¨ '%s' 到 '%s'" #: builtin/worktree.c:788 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "æ— æ³•åœ¨ '%s' ä¸æ‰§è¡Œ 'git status'" #: builtin/worktree.c:792 #, c-format msgid "'%s' is dirty, use --force to delete it" msgstr "'%s' 是è„的,使用 --force åˆ é™¤" #: builtin/worktree.c:797 #, c-format msgid "failed to run 'git status' on '%s', code %d" msgstr "æ— æ³•åœ¨ '%s' ä¸æ‰§è¡Œ 'git status',退出ç %d" #: builtin/worktree.c:808 builtin/worktree.c:822 #, c-format msgid "failed to delete '%s'" msgstr "æ— æ³•åˆ é™¤ '%s'" #: builtin/worktree.c:834 msgid "force removing even if the worktree is dirty" msgstr "å¼ºåˆ¶åˆ é™¤ï¼Œå³ä½¿å·¥ä½œåŒºæ˜¯è„çš„" #: builtin/worktree.c:856 #, c-format msgid "cannot remove a locked working tree, lock reason: %s" msgstr "æ— æ³•åˆ é™¤ä¸€ä¸ªé”定的工作区,é”å®šåŽŸå› ï¼š%s" #: builtin/worktree.c:858 msgid "cannot remove a locked working tree" msgstr "æ— æ³•åˆ é™¤ä¸€ä¸ªé”定的工作区" #: builtin/worktree.c:861 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "验è¯å¤±è´¥ï¼Œæ— æ³•åˆ é™¤å·¥ä½œåŒºï¼š%s" #: builtin/write-tree.c:14 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" msgstr "git write-tree [--missing-ok] [--prefix=<å‰ç¼€>/]" #: builtin/write-tree.c:27 msgid "<prefix>/" msgstr "<å‰ç¼€>/" #: builtin/write-tree.c:28 msgid "write tree object for a subdirectory <prefix>" msgstr "å°† <å‰ç¼€> åç›®å½•å†…å®¹å†™åˆ°ä¸€ä¸ªæ ‘å¯¹è±¡" #: builtin/write-tree.c:31 msgid "only useful for debugging" msgstr "åªå¯¹è°ƒè¯•æœ‰ç”¨" #: credential-cache--daemon.c:222 #, c-format msgid "" "The permissions on your socket directory are too loose; other\n" "users may be able to read your cached credentials. Consider running:\n" "\n" "\tchmod 0700 %s" msgstr "" "您的 socket 目录æƒé™è¿‡äºŽå®½æ¾ï¼Œå…¶ä»–用户å¯èƒ½ä¼šè¯»å–您缓å˜çš„认è¯ä¿¡æ¯ã€‚考虑执" "行:\n" "\n" "\tchmod 0700 %s" #: credential-cache--daemon.c:271 msgid "print debugging messages to stderr" msgstr "调试信æ¯è¾“å‡ºåˆ°æ ‡å‡†é”™è¯¯" #: git.c:27 msgid "" "git [--version] [--help] [-C <path>] [-c <name>=<value>]\n" " [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n" " [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" "bare]\n" " [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n" " <command> [<args>]" msgstr "" "git [--version] [--help] [-C <路径>] [-c <å称>=<å–值>]\n" " [--exec-path[=<路径>]] [--html-path] [--man-path] [--info-path]\n" " [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--" "bare]\n" " [--git-dir=<路径>] [--work-tree=<路径>] [--namespace=<å称>]\n" " <命令> [<å‚æ•°>]" #: git.c:34 msgid "" "'git help -a' and 'git help -g' list 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 <概念>' 以获å–给定å命令或概念的\n" "帮助。" #: git.c:173 #, c-format msgid "no directory given for --git-dir\n" msgstr "没有为 --git-dir æ供目录\n" #: git.c:187 #, c-format msgid "no namespace given for --namespace\n" msgstr "没有为 --namespace æ供命å空间\n" #: git.c:201 #, c-format msgid "no directory given for --work-tree\n" msgstr "没有为 --work-tree æ供目录\n" #: git.c:215 #, c-format msgid "no prefix given for --super-prefix\n" msgstr "没有为 --super-prefix æä¾›å‰ç¼€\n" #: git.c:237 #, c-format msgid "-c expects a configuration string\n" msgstr "应为 -c æ供一个é…ç½®å—符串\n" #: git.c:275 #, c-format msgid "no directory given for -C\n" msgstr "没有为 -C æ供目录\n" #: git.c:300 #, c-format msgid "unknown option: %s\n" msgstr "未知选项:%s\n" #: git.c:765 #, c-format msgid "expansion of alias '%s' failed; '%s' is not a git command\n" msgstr "展开别å命令 '%s' 失败,'%s' ä¸æ˜¯ä¸€ä¸ª git 命令\n" #: git.c:777 #, c-format msgid "failed to run command '%s': %s\n" msgstr "æ— æ³•è¿è¡Œå‘½ä»¤ '%s':%s\n" #: http.c:348 #, c-format msgid "negative value for http.postbuffer; defaulting to %d" msgstr "http.postbuffer 为负值,默认为 %d" #: http.c:369 msgid "Delegation control is not supported with cURL < 7.22.0" msgstr "当 cURL < 7.22.0 时,ä¸æ”¯æŒå§”托控制" #: http.c:378 msgid "Public key pinning not supported with cURL < 7.44.0" msgstr "ä¸æ”¯æŒå…¬é’¥æ–‡ä»¶é”å®šï¼Œå› ä¸º cURL < 7.44.0" #: http.c:1854 #, c-format msgid "" "unable to update url base from redirection:\n" " asked for: %s\n" " redirect: %s" msgstr "" "ä¸èƒ½æ›´æ–°é‡å®šå‘çš„ url base:\n" " 请求:%s\n" " é‡å®šå‘:%s" #: remote-curl.c:401 #, c-format msgid "redirecting to %s" msgstr "é‡å®šå‘到 %s" #: list-objects-filter-options.h:59 msgid "args" msgstr "å‚æ•°" #: list-objects-filter-options.h:60 msgid "object filtering" msgstr "对象过滤" #: parse-options.h:157 msgid "expiry-date" msgstr "到期时间" #: parse-options.h:172 msgid "no-op (backward compatibility)" msgstr "空æ“作(å‘åŽå…¼å®¹ï¼‰" #: parse-options.h:251 msgid "be more verbose" msgstr "æ›´åŠ è¯¦ç»†" #: parse-options.h:253 msgid "be more quiet" msgstr "æ›´åŠ å®‰é™" #: parse-options.h:259 msgid "use <n> digits to display SHA-1s" msgstr "用 <n> ä½æ•°å—显示 SHA-1 哈希值" #: command-list.h:50 msgid "Add file contents to the index" msgstr "æ·»åŠ æ–‡ä»¶å†…å®¹è‡³ç´¢å¼•" #: command-list.h:51 msgid "Apply a series of patches from a mailbox" msgstr "åº”ç”¨é‚®ç®±æ ¼å¼çš„系列补ä¸" #: command-list.h:52 msgid "Annotate file lines with commit information" msgstr "使用æ交信æ¯æ³¨é‡Šæ–‡ä»¶è¡Œ" #: command-list.h:53 msgid "Apply a patch to files and/or to the index" msgstr "应用一个补ä¸åˆ°æ–‡ä»¶å’Œ/或索引区" #: command-list.h:54 msgid "Import an Arch repository into Git" msgstr "将一个 Arch 仓库导入到 Git" #: command-list.h:55 msgid "Create an archive of files from a named tree" msgstr "åŸºäºŽä¸€ä¸ªæŒ‡å®šçš„æ ‘åˆ›å»ºæ–‡ä»¶å˜æ¡£" #: command-list.h:56 msgid "Use binary search to find the commit that introduced a bug" msgstr "通过二分查找定ä½å¼•å…¥ bug çš„æ交" #: command-list.h:57 msgid "Show what revision and author last modified each line of a file" msgstr "显示文件æ¯ä¸€è¡Œæœ€åŽä¿®æ”¹çš„版本和修改者" #: command-list.h:58 msgid "List, create, or delete branches" msgstr "列出ã€åˆ›å»ºæˆ–åˆ é™¤åˆ†æ”¯" #: command-list.h:59 msgid "Move objects and refs by archive" msgstr "通过归档移动对象和引用" #: command-list.h:60 msgid "Provide content or type and size information for repository objects" msgstr "æ供仓库对象的内容ã€ç±»åž‹æˆ–大å°" #: command-list.h:61 msgid "Display gitattributes information" msgstr "显示 gitattributes ä¿¡æ¯" #: command-list.h:62 msgid "Debug gitignore / exclude files" msgstr "调试 gitignore / exclude 文件" #: command-list.h:63 msgid "Show canonical names and email addresses of contacts" msgstr "显示è”系人的规范å称和电å邮件" #: command-list.h:64 msgid "Switch branches or restore working tree files" msgstr "切æ¢åˆ†æ”¯æˆ–æ¢å¤å·¥ä½œåŒºæ–‡ä»¶" #: command-list.h:65 msgid "Copy files from the index to the working tree" msgstr "从索引拷è´æ–‡ä»¶åˆ°å·¥ä½œåŒº" #: command-list.h:66 msgid "Ensures that a reference name is well formed" msgstr "ç¡®ä¿å¼•ç”¨åç§°æ ¼å¼æ£ç¡®" #: command-list.h:67 msgid "Find commits yet to be applied to upstream" msgstr "查找尚未应用到上游的æ交" #: command-list.h:68 msgid "Apply the changes introduced by some existing commits" msgstr "应用一些现å˜æ交引入的修改" #: command-list.h:69 msgid "Graphical alternative to git-commit" msgstr "git-commit 的图形替代界é¢" #: command-list.h:70 msgid "Remove untracked files from the working tree" msgstr "从工作区ä¸åˆ 除未跟踪文件" #: command-list.h:71 msgid "Clone a repository into a new directory" msgstr "克隆一个仓库到一个新目录" #: command-list.h:72 msgid "Display data in columns" msgstr "以列的方å¼æ˜¾ç¤ºæ•°æ®" #: command-list.h:73 msgid "Record changes to the repository" msgstr "记录å˜æ›´åˆ°ä»“库" #: command-list.h:74 msgid "Write and verify Git commit graph files" msgstr "å†™å…¥å’Œæ ¡éªŒ Git æ交图形文件" #: command-list.h:75 msgid "Create a new commit object" msgstr "创建一个新的æ交对象" #: command-list.h:76 msgid "Get and set repository or global options" msgstr "获å–和设置仓库或者全局选项" #: command-list.h:77 msgid "Count unpacked number of objects and their disk consumption" msgstr "计算未打包对象的数é‡å’Œç£ç›˜ç©ºé—´å 用" #: command-list.h:78 msgid "Retrieve and store user credentials" msgstr "检索和å˜å‚¨ç”¨æˆ·å¯†ç " #: command-list.h:79 msgid "Helper to temporarily store passwords in memory" msgstr "在内å˜ä¸ä¸´æ—¶å˜å‚¨å¯†ç 的助手" #: command-list.h:80 msgid "Helper to store credentials on disk" msgstr "在ç£ç›˜å˜å‚¨å¯†ç 的助手" #: command-list.h:81 msgid "Export a single commit to a CVS checkout" msgstr "将一个æ交导出到 CVS 检出ä¸" #: command-list.h:82 msgid "Salvage your data out of another SCM people love to hate" msgstr "从å¦å¤–一个人们爱æ¨çš„é…置管ç†ç³»ç»Ÿä¸æ‹¯æ•‘ä½ çš„æ•°æ®" #: command-list.h:83 msgid "A CVS server emulator for Git" msgstr "Git 的一个 CVS æœåŠ¡æ¨¡æ‹Ÿå™¨" #: command-list.h:84 msgid "A really simple server for Git repositories" msgstr "一个éžå¸¸ç®€å•çš„ Git 仓库æœåŠ¡å™¨" #: command-list.h:85 msgid "Give an object a human readable name based on an available ref" msgstr "基于一个现å˜çš„引用为一个对象起一个å¯è¯»çš„å称" #: command-list.h:86 msgid "Show changes between commits, commit and working tree, etc" msgstr "显示æ交之间ã€æ交和工作区之间ç‰çš„差异" #: command-list.h:87 msgid "Compares files in the working tree and the index" msgstr "比较工作区和索引区ä¸çš„文件" #: command-list.h:88 msgid "Compare a tree to the working tree or index" msgstr "å°†ä¸€ä¸ªæ ‘å’Œå·¥ä½œåŒºæˆ–ç´¢å¼•åšæ¯”较" #: command-list.h:89 msgid "Compares the content and mode of blobs found via two tree objects" msgstr "æ¯”è¾ƒä¸¤ä¸ªæ ‘å¯¹è±¡çš„æ–‡ä»¶å†…å®¹å’Œæ¨¡å¼" #: command-list.h:90 msgid "Show changes using common diff tools" msgstr "使用常è§çš„差异工具显示更改" #: command-list.h:91 msgid "Git data exporter" msgstr "Git æ•°æ®å¯¼å‡ºå™¨" #: command-list.h:92 msgid "Backend for fast Git data importers" msgstr "Git 快速数æ®å¯¼å…¥å™¨åŽç«¯" #: command-list.h:93 msgid "Download objects and refs from another repository" msgstr "从å¦å¤–一个仓库下载对象和引用" #: command-list.h:94 msgid "Receive missing objects from another repository" msgstr "从å¦ä¸€ä¸ªä»“库获å–缺失的对象" #: command-list.h:95 msgid "Rewrite branches" msgstr "é‡å†™åˆ†æ”¯" #: command-list.h:96 msgid "Produce a merge commit message" msgstr "生æˆä¸€ä¸ªåˆå¹¶æ交信æ¯" #: command-list.h:97 msgid "Output information on each ref" msgstr "对æ¯ä¸€ä¸ªå¼•ç”¨è¾“å‡ºä¿¡æ¯ " #: command-list.h:98 msgid "Prepare patches for e-mail submission" msgstr "准备电å邮件æ交的补ä¸" #: command-list.h:99 msgid "Verifies the connectivity and validity of the objects in the database" msgstr "验è¯ä»“库ä¸å¯¹è±¡çš„连通性和有效性" #: command-list.h:100 msgid "Cleanup unnecessary files and optimize the local repository" msgstr "清除ä¸å¿…è¦çš„文件和优化本地仓库" #: command-list.h:101 msgid "Extract commit ID from an archive created using git-archive" msgstr "从 git-archive 创建的归档文件ä¸æå–æ交ID" #: command-list.h:102 msgid "Print lines matching a pattern" msgstr "输出和模å¼åŒ¹é…çš„è¡Œ" #: command-list.h:103 msgid "A portable graphical interface to Git" msgstr "一个便æºçš„ Git 图形客户端" #: command-list.h:104 msgid "Compute object ID and optionally creates a blob from a file" msgstr "从一个文件计算对象ID,并å¯ä»¥åˆ›å»º blob æ•°æ®å¯¹è±¡" #: command-list.h:105 msgid "Display help information about Git" msgstr "显示 Git 的帮助信æ¯" #: command-list.h:106 msgid "Server side implementation of Git over HTTP" msgstr "Git HTTP å议的æœåŠ¡ç«¯å®žçŽ°" #: command-list.h:107 msgid "Download from a remote Git repository via HTTP" msgstr "通过 HTTP 从远程 Git 仓库下载" #: command-list.h:108 msgid "Push objects over HTTP/DAV to another repository" msgstr "通过 HTTP/DAV 推é€å¯¹è±¡å¦ä¸€ä¸ªä»“库" #: command-list.h:109 msgid "Send a collection of patches from stdin to an IMAP folder" msgstr "ä»Žæ ‡å‡†è¾“å…¥å°†ä¸€ç»„è¡¥ä¸å‘é€åˆ°IMAP文件夹" #: command-list.h:110 msgid "Build pack index file for an existing packed archive" msgstr "从一个现å˜çš„包å˜æ¡£æ–‡ä»¶åˆ›å»ºåŒ…索引" #: command-list.h:111 msgid "Create an empty Git repository or reinitialize an existing one" msgstr "创建一个空的 Git 仓库或é‡æ–°åˆå§‹åŒ–一个已å˜åœ¨çš„仓库" #: command-list.h:112 msgid "Instantly browse your working repository in gitweb" msgstr "在 gitweb ä¸å³æ—¶æµè§ˆæ‚¨çš„工作仓库" #: command-list.h:113 msgid "add or parse structured information in commit messages" msgstr "æ·»åŠ æˆ–è§£æžæ交说明ä¸çš„结构化信æ¯" #: command-list.h:114 msgid "The Git repository browser" msgstr "Git 仓库æµè§ˆå™¨" #: command-list.h:115 msgid "Show commit logs" msgstr "显示æ交日志" #: command-list.h:116 msgid "Show information about files in the index and the working tree" msgstr "显示索引和工作区ä¸æ–‡ä»¶çš„ä¿¡æ¯" #: command-list.h:117 msgid "List references in a remote repository" msgstr "显示一个远程仓库的引用" #: command-list.h:118 msgid "List the contents of a tree object" msgstr "æ˜¾ç¤ºä¸€ä¸ªæ ‘å¯¹è±¡çš„å†…å®¹" #: command-list.h:119 msgid "Extracts patch and authorship from a single e-mail message" msgstr "从å•ä¸ªç”µå邮件ä¸æå–è¡¥ä¸å’Œä½œè€…身份" #: command-list.h:120 msgid "Simple UNIX mbox splitter program" msgstr "简å•çš„ UNIX mbox 邮箱切分程åº" #: command-list.h:121 msgid "Join two or more development histories together" msgstr "åˆå¹¶ä¸¤ä¸ªæˆ–更多开å‘历å²" #: command-list.h:122 msgid "Find as good common ancestors as possible for a merge" msgstr "为了åˆå¹¶æŸ¥æ‰¾å°½å¯èƒ½å¥½çš„公共祖先æ交" #: command-list.h:123 msgid "Run a three-way file merge" msgstr "è¿è¡Œä¸€ä¸ªä¸‰è·¯æ–‡ä»¶åˆå¹¶" #: command-list.h:124 msgid "Run a merge for files needing merging" msgstr "对于需è¦åˆå¹¶çš„文件执行åˆå¹¶" #: command-list.h:125 msgid "The standard helper program to use with git-merge-index" msgstr "与 git-merge-index ä¸€èµ·ä½¿ç”¨çš„æ ‡å‡†å‘导程åº" #: command-list.h:126 msgid "Run merge conflict resolution tools to resolve merge conflicts" msgstr "è¿è¡Œåˆå¹¶å†²çªè§£å†³å·¥å…·ä»¥è§£å†³åˆå¹¶å†²çª" #: command-list.h:127 msgid "Show three-way merge without touching index" msgstr "显示三路åˆå¹¶è€Œä¸åŠ¨ç´¢å¼•" #: command-list.h:128 msgid "Creates a tag object" msgstr "åˆ›å»ºä¸€ä¸ªæ ‡ç¾å¯¹è±¡" #: command-list.h:129 msgid "Build a tree-object from ls-tree formatted text" msgstr "基于 ls-tree çš„æ ¼å¼åŒ–æ–‡æœ¬åˆ›å»ºä¸€ä¸ªæ ‘å¯¹è±¡" #: command-list.h:130 msgid "Move or rename a file, a directory, or a symlink" msgstr "移动或é‡å‘½å一个文件ã€ç›®å½•æˆ–符å·é“¾æŽ¥" # 查找给定版本的符å·å称 #: command-list.h:131 msgid "Find symbolic names for given revs" msgstr "查找给定版本的符å·å称" #: command-list.h:132 msgid "Add or inspect object notes" msgstr "æ·»åŠ æˆ–æ£€æŸ¥å¯¹è±¡æ³¨é‡Š" #: command-list.h:133 msgid "Import from and submit to Perforce repositories" msgstr "导入和æ交到 Perforce 仓库ä¸" #: command-list.h:134 msgid "Create a packed archive of objects" msgstr "创建对象的å˜æ¡£åŒ…" #: command-list.h:135 msgid "Find redundant pack files" msgstr "查找冗余的包文件" #: command-list.h:136 msgid "Pack heads and tags for efficient repository access" msgstr "æ‰“åŒ…å¤´å’Œæ ‡ç¾ä»¥å®žçŽ°é«˜æ•ˆçš„仓库访问" #: command-list.h:137 msgid "Routines to help parsing remote repository access parameters" msgstr "帮助解æžè¿œç¨‹ä»“库访问å‚数的例程" #: command-list.h:138 msgid "Compute unique ID for a patch" msgstr "计算一个补ä¸çš„唯一ID" #: command-list.h:139 msgid "Prune all unreachable objects from the object database" msgstr "åˆ é™¤å¯¹è±¡åº“ä¸æ‰€æœ‰ä¸å¯è¾¾å¯¹è±¡" #: command-list.h:140 msgid "Remove extra objects that are already in pack files" msgstr "åˆ é™¤å·²ç»åœ¨åŒ…文件ä¸çš„多余对象" #: command-list.h:141 msgid "Fetch from and integrate with another repository or a local branch" msgstr "获å–并整åˆå¦å¤–的仓库或一个本地分支" #: command-list.h:142 msgid "Update remote refs along with associated objects" msgstr "更新远程引用和相关的对象" #: command-list.h:143 msgid "Applies a quilt patchset onto the current branch" msgstr "将一个 quilt è¡¥ä¸é›†åº”用到当å‰åˆ†æ”¯ã€‚" #: command-list.h:144 msgid "Reads tree information into the index" msgstr "å°†æ ‘ä¿¡æ¯è¯»å–到索引" #: command-list.h:145 msgid "Reapply commits on top of another base tip" msgstr "在å¦ä¸€ä¸ªåˆ†æ”¯ä¸Šé‡æ–°åº”用æ交" #: command-list.h:146 msgid "Receive what is pushed into the repository" msgstr "接收推é€åˆ°ä»“库ä¸çš„对象" #: command-list.h:147 msgid "Manage reflog information" msgstr "ç®¡ç† reflog ä¿¡æ¯" #: command-list.h:148 msgid "Manage set of tracked repositories" msgstr "管ç†å·²è·Ÿè¸ªä»“库" #: command-list.h:149 msgid "Pack unpacked objects in a repository" msgstr "打包仓库ä¸æœªæ‰“包对象" #: command-list.h:150 msgid "Create, list, delete refs to replace objects" msgstr "创建ã€åˆ—出ã€åˆ 除对象替æ¢å¼•ç”¨" #: command-list.h:151 msgid "Generates a summary of pending changes" msgstr "生æˆå¾…定更改的摘è¦" #: command-list.h:152 msgid "Reuse recorded resolution of conflicted merges" msgstr "é‡ç”¨å†²çªåˆå¹¶çš„解决方案记录" #: command-list.h:153 msgid "Reset current HEAD to the specified state" msgstr "é‡ç½®å½“å‰ HEAD 到指定状æ€" #: command-list.h:154 msgid "Revert some existing commits" msgstr "回退一些现å˜æ交" #: command-list.h:155 msgid "Lists commit objects in reverse chronological order" msgstr "按时间顺åºåˆ—出æ交对象" #: command-list.h:156 msgid "Pick out and massage parameters" msgstr "选出并处ç†å‚æ•°" #: command-list.h:157 msgid "Remove files from the working tree and from the index" msgstr "从工作区和索引ä¸åˆ 除文件" #: command-list.h:158 msgid "Send a collection of patches as emails" msgstr "通过电å邮件å‘é€ä¸€ç»„è¡¥ä¸" #: command-list.h:159 msgid "Push objects over Git protocol to another repository" msgstr "使用 Git å议推é€å¯¹è±¡åˆ°å¦ä¸€ä¸ªä»“库" #: command-list.h:160 msgid "Restricted login shell for Git-only SSH access" msgstr "åªå…许 Git SSH 访问的å—é™ç™»å½•shell" #: command-list.h:161 msgid "Summarize 'git log' output" msgstr "'git log' 输出摘è¦" #: command-list.h:162 msgid "Show various types of objects" msgstr "显示å„ç§ç±»åž‹çš„对象" #: command-list.h:163 msgid "Show branches and their commits" msgstr "显示分支和æ交" #: command-list.h:164 msgid "Show packed archive index" msgstr "显示打包归档索引" #: command-list.h:165 msgid "List references in a local repository" msgstr "显示本地仓库ä¸çš„引用" #: command-list.h:166 msgid "Git's i18n setup code for shell scripts" msgstr "为 shell 脚本准备的 Git 国际化设置代ç " #: command-list.h:167 msgid "Common Git shell script setup code" msgstr "常用的 Git shell 脚本设置代ç " #: command-list.h:168 msgid "Stash the changes in a dirty working directory away" msgstr "è´®è—è„工作区ä¸çš„修改" #: command-list.h:169 msgid "Add file contents to the staging area" msgstr "å°†æ–‡ä»¶å†…å®¹æ·»åŠ åˆ°ç´¢å¼•" #: command-list.h:170 msgid "Show the working tree status" msgstr "显示工作区状æ€" #: command-list.h:171 msgid "Remove unnecessary whitespace" msgstr "åˆ é™¤ä¸å¿…è¦çš„空白å—符" #: command-list.h:172 msgid "Initialize, update or inspect submodules" msgstr "åˆå§‹åŒ–ã€æ›´æ–°æˆ–检查å模组" #: command-list.h:173 msgid "Bidirectional operation between a Subversion repository and Git" msgstr "Subersion 仓库和 Git 之间的åŒå‘æ“作" #: command-list.h:174 msgid "Read, modify and delete symbolic refs" msgstr "读å–ã€ä¿®æ”¹å’Œåˆ 除符å·å¼•ç”¨" #: command-list.h:175 msgid "Create, list, delete or verify a tag object signed with GPG" msgstr "创建ã€åˆ—出ã€åˆ é™¤æˆ–æ ¡éªŒä¸€ä¸ª GPG ç¾åçš„æ ‡ç¾å¯¹è±¡" #: command-list.h:176 msgid "Creates a temporary file with a blob's contents" msgstr "用 blob æ•°æ®å¯¹è±¡çš„内容创建一个临时文件" #: command-list.h:177 msgid "Unpack objects from a packed archive" msgstr "从打包文件ä¸è§£åŽ‹ç¼©å¯¹è±¡" #: command-list.h:178 msgid "Register file contents in the working tree to the index" msgstr "将工作区的文件内容注册到索引" #: command-list.h:179 msgid "Update the object name stored in a ref safely" msgstr "安全地更新å˜å‚¨äºŽå¼•ç”¨ä¸çš„对象å称" #: command-list.h:180 msgid "Update auxiliary info file to help dumb servers" msgstr "更新辅助信æ¯æ–‡ä»¶ä»¥å¸®åŠ©å“‘åè®®æœåŠ¡" #: command-list.h:181 msgid "Send archive back to git-archive" msgstr "å°†å˜æ¡£å‘é€å›ž git-archive" #: command-list.h:182 msgid "Send objects packed back to git-fetch-pack" msgstr "将对象压缩包å‘é€å›ž git-fetch-pack" #: command-list.h:183 msgid "Show a Git logical variable" msgstr "显示一个Git逻辑å˜é‡" #: command-list.h:184 msgid "Check the GPG signature of commits" msgstr "检查 GPG æ交ç¾å" #: command-list.h:185 msgid "Validate packed Git archive files" msgstr "æ ¡éªŒæ‰“åŒ…çš„Gitå˜ä»“文件" #: command-list.h:186 msgid "Check the GPG signature of tags" msgstr "æ£€æŸ¥æ ‡ç¾çš„ GPG ç¾å" #: command-list.h:187 msgid "Git web interface (web frontend to Git repositories)" msgstr "Git web ç•Œé¢ï¼ˆGit 仓库的 web å‰ç«¯ï¼‰" #: command-list.h:188 msgid "Show logs with difference each commit introduces" msgstr "显示æ¯ä¸€ä¸ªæ交引入的差异日志" #: command-list.h:189 msgid "Manage multiple working trees" msgstr "管ç†å¤šä¸ªå·¥ä½œåŒº" #: command-list.h:190 msgid "Create a tree object from the current index" msgstr "从当å‰ç´¢å¼•åˆ›å»ºä¸€ä¸ªæ ‘对象" #: command-list.h:191 msgid "Defining attributes per path" msgstr "定义路径的属性" #: command-list.h:192 msgid "Git command-line interface and conventions" msgstr "Git 命令行界é¢å’Œçº¦å®š" #: command-list.h:193 msgid "A Git core tutorial for developers" msgstr "é¢å‘å¼€å‘人员的 Git æ ¸å¿ƒæ•™ç¨‹" #: command-list.h:194 msgid "Git for CVS users" msgstr "é€‚åˆ CVS 用户的 Git 帮助" #: command-list.h:195 msgid "Tweaking diff output" msgstr "调整差异输出" #: command-list.h:196 msgid "A useful minimum set of commands for Everyday Git" msgstr "æ¯ä¸€å¤© Git 的一组有用的最å°å‘½ä»¤é›†åˆ" #: command-list.h:197 msgid "A Git Glossary" msgstr "Git è¯æ±‡è¡¨" #: command-list.h:198 msgid "Hooks used by Git" msgstr "Git 使用的钩å" #: command-list.h:199 msgid "Specifies intentionally untracked files to ignore" msgstr "忽略指定的未跟踪文件" #: command-list.h:200 msgid "Defining submodule properties" msgstr "定义å模组属性" #: command-list.h:201 msgid "Git namespaces" msgstr "Git åå—空间" #: command-list.h:202 msgid "Git Repository Layout" msgstr "Git 仓库布局" #: command-list.h:203 msgid "Specifying revisions and ranges for Git" msgstr "指定 Git 的版本和版本范围" #: command-list.h:204 msgid "A tutorial introduction to Git: part two" msgstr "一个 Git 教程:第二部分" #: command-list.h:205 msgid "A tutorial introduction to Git" msgstr "一个 Git 教程" #: command-list.h:206 msgid "An overview of recommended workflows with Git" msgstr "Git 推è的工作æµæ¦‚览" #: rerere.h:40 msgid "update the index with reused conflict resolution if possible" msgstr "如果å¯èƒ½ï¼Œé‡ç”¨å†²çªè§£å†³æ›´æ–°ç´¢å¼•" #: git-bisect.sh:54 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:60 msgid "Do you want me to do it for you [Y/n]? " msgstr "æ‚¨æƒ³è®©æˆ‘ä¸ºæ‚¨è¿™æ ·åšä¹ˆ[Y/n]? " #: git-bisect.sh:121 #, sh-format msgid "unrecognised option: '$arg'" msgstr "未能识别的选项:'$arg'" #: git-bisect.sh:125 #, sh-format msgid "'$arg' does not appear to be a valid revision" msgstr "'$arg' 看起æ¥ä¸åƒæ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„版本" #: git-bisect.sh:154 msgid "Bad HEAD - I need a HEAD" msgstr "åçš„ HEAD - 我需è¦ä¸€ä¸ª HEAD" #: git-bisect.sh:167 #, sh-format msgid "" "Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'." msgstr "检出 '$start_head' 失败。å°è¯• 'git bisect reset <有效分支>'。" #: git-bisect.sh:177 msgid "won't bisect on cg-seek'ed tree" msgstr "ä¸ä¼šåœ¨åšäº† cg-seek çš„æ ‘ä¸ŠåšäºŒåˆ†æŸ¥æ‰¾" #: git-bisect.sh:181 msgid "Bad HEAD - strange symbolic ref" msgstr "åçš„ HEAD - 奇怪的符å·å¼•ç”¨" #: git-bisect.sh:233 #, sh-format msgid "Bad bisect_write argument: $state" msgstr "åçš„ bisect_write å‚数:$state" #: git-bisect.sh:246 #, sh-format msgid "Bad rev input: $arg" msgstr "å的输入版本:$arg" #: git-bisect.sh:265 #, sh-format msgid "Bad rev input: $bisected_head" msgstr "å的输入版本:$bisected_head" #: git-bisect.sh:274 #, sh-format msgid "Bad rev input: $rev" msgstr "å的输入版本:$rev" #: git-bisect.sh:283 #, sh-format msgid "'git bisect $TERM_BAD' can take only one argument." msgstr "'git bisect $TERM_BAD' åªèƒ½å¸¦ä¸€ä¸ªå‚数。" #: git-bisect.sh:306 #, sh-format msgid "Warning: bisecting only with a $TERM_BAD commit." msgstr "è¦å‘Šï¼šåœ¨ä»…有一个å($TERM_BAD)æ交下进行二分查找。" # 译者:注æ„ä¿æŒå¥å°¾ç©ºæ ¼ #. TRANSLATORS: Make sure to include [Y] and [n] in your #. translation. The program will only accept English input #. at this point. #: git-bisect.sh:312 msgid "Are you sure [Y/n]? " msgstr "您确认么[Y/n]? " #: git-bisect.sh:324 #, sh-format msgid "" "You need to give me at least one $bad_syn and one $good_syn revision.\n" "(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)" msgstr "" "您需è¦ç»™æˆ‘至少一个好版本和一个å版本。\n" "(为æ¤æ‚¨å¯ä»¥ç”¨ \"git bisect $bad_syn\" å’Œ \"git bisect $good_syn\" 命令。)" #: git-bisect.sh:327 #, sh-format msgid "" "You need to start by \"git bisect start\".\n" "You then need to give me at least one $good_syn and one $bad_syn revision.\n" "(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)" msgstr "" "您需è¦æ‰§è¡Œ \"git bisect start\" æ¥å¼€å§‹ã€‚\n" "然åŽéœ€è¦æ供我至少一个好版本和一个å版本。\n" "(为æ¤æ‚¨å¯ä»¥ç”¨ \"git bisect $bad_syn\" å’Œ \"git bisect $good_syn\" 命令。)" #: git-bisect.sh:398 git-bisect.sh:512 msgid "We are not bisecting." msgstr "我们没有在二分查找。" #: git-bisect.sh:405 #, sh-format msgid "'$invalid' is not a valid commit" msgstr "'$invalid' ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„æ交" #: git-bisect.sh:414 #, 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:422 msgid "No logfile given" msgstr "未æ供日志文件" #: git-bisect.sh:423 #, sh-format msgid "cannot read $file for replaying" msgstr "ä¸èƒ½è¯»å– $file æ¥é‡æ”¾" #: git-bisect.sh:444 msgid "?? what are you talking about?" msgstr "?? 您在说什么?" #: git-bisect.sh:453 msgid "bisect run failed: no command provided." msgstr "二分查找è¿è¡Œå¤±è´¥ï¼šæ²¡æœ‰æ供命令。" #: git-bisect.sh:458 #, sh-format msgid "running $command" msgstr "è¿è¡Œ $command" #: git-bisect.sh:465 #, 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:491 msgid "bisect run cannot continue any more" msgstr "二分查找ä¸èƒ½ç»§ç»è¿è¡Œ" #: git-bisect.sh:497 #, sh-format msgid "" "bisect run failed:\n" "'bisect_state $state' exited with error code $res" msgstr "" "二分查找è¿è¡Œå¤±è´¥ï¼š\n" "'bisect_state $state' 退出ç 为 $res" #: git-bisect.sh:504 msgid "bisect run success" msgstr "二分查找è¿è¡ŒæˆåŠŸ" #: git-bisect.sh:533 #, sh-format msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect." msgstr "æ— æ•ˆçš„å‘½ä»¤ï¼šæ‚¨å½“å‰æ£å¤„于一个 $TERM_BAD/$TERM_GOOD 二分查找。" #: git-bisect.sh:567 msgid "no terms defined" msgstr "未定义术è¯" #: git-bisect.sh:584 #, sh-format msgid "" "invalid argument $arg for 'git bisect terms'.\n" "Supported options are: --term-good|--term-old and --term-bad|--term-new." msgstr "" "å‚æ•° $arg 对命令 'git bisect terms' æ— æ•ˆã€‚\n" "支æŒçš„选项有:--term-good|--term-old å’Œ --term-bad|--term-new。" #: git-merge-octopus.sh:46 msgid "" "Error: Your local changes to the following files would be overwritten by " "merge" msgstr "错误:您对下列文件的本地修改将被åˆå¹¶æ“作覆盖" #: git-merge-octopus.sh:61 msgid "Automated merge did not work." msgstr "自动åˆå¹¶æœªç”Ÿæ•ˆã€‚" #: git-merge-octopus.sh:62 msgid "Should not be doing an octopus." msgstr "ä¸åº”è¯¥æ‰§è¡Œç« é±¼å¼åˆå¹¶ã€‚" #: git-merge-octopus.sh:73 #, sh-format msgid "Unable to find common commit with $pretty_name" msgstr "æ— æ³•æ‰¾åˆ°å’Œ $pretty_name 的基线æ交" #: git-merge-octopus.sh:77 #, sh-format msgid "Already up to date with $pretty_name" msgstr "å·²ç»å’Œ $pretty_name ä¿æŒä¸€è‡´" #: git-merge-octopus.sh:89 #, sh-format msgid "Fast-forwarding to: $pretty_name" msgstr "快进至:$pretty_name" #: git-merge-octopus.sh:97 #, sh-format msgid "Trying simple merge with $pretty_name" msgstr "å°è¯•å’Œ $pretty_name 的简å•åˆå¹¶" #: git-merge-octopus.sh:102 msgid "Simple merge did not work, trying automatic merge." msgstr "简å•åˆå¹¶æœªç”Ÿæ•ˆï¼Œå°è¯•è‡ªåŠ¨åˆå¹¶ã€‚" #: git-rebase.sh:61 msgid "" "Resolve all conflicts manually, mark them as resolved with\n" "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" "You can instead skip this commit: run \"git rebase --skip\".\n" "To abort and get back to the state before \"git rebase\", run \"git rebase --" "abort\"." msgstr "" "手工解决所有冲çªï¼Œæ‰§è¡Œ \"git add/rm <冲çªçš„文件>\" æ ‡è®°\n" "冲çªå·²è§£å†³ï¼Œç„¶åŽæ‰§è¡Œ \"git rebase --continue\"。您也å¯ä»¥æ‰§è¡Œ\n" "\"git rebase --skip\" 命令跳过这个æ交。如果想è¦ç»ˆæ¢æ‰§è¡Œå¹¶å›žåˆ°\n" "\"git rebase\" 执行之å‰çš„状æ€ï¼Œæ‰§è¡Œ \"git rebase --abort\"。" #: git-rebase.sh:173 git-rebase.sh:442 #, sh-format msgid "Could not move back to $head_name" msgstr "æ— æ³•ç§»å›ž $head_name" #: git-rebase.sh:184 msgid "Applied autostash." msgstr "æˆåŠŸåº”用 autostash。" #: git-rebase.sh:187 #, sh-format msgid "Cannot store $stash_sha1" msgstr "æ— æ³•ä¿å˜ $stash_sha1" #: git-rebase.sh:229 msgid "The pre-rebase hook refused to rebase." msgstr "é’©å pre-rebase æ‹’ç»å˜åŸºæ“作。" #: git-rebase.sh:234 msgid "It looks like 'git am' is in progress. Cannot rebase." msgstr "çœ‹èµ·æ¥ 'git-am' æ£åœ¨æ‰§è¡Œä¸ã€‚æ— æ³•å˜åŸºã€‚" #: git-rebase.sh:403 msgid "No rebase in progress?" msgstr "没有æ£åœ¨è¿›è¡Œçš„å˜åŸºï¼Ÿ" #: git-rebase.sh:414 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "动作 --edit-todo åªèƒ½ç”¨åœ¨äº¤äº’å¼å˜åŸºè¿‡ç¨‹ä¸ã€‚" #: git-rebase.sh:421 msgid "Cannot read HEAD" msgstr "ä¸èƒ½è¯»å– HEAD" #: git-rebase.sh:424 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" msgstr "" "您必须编辑所有的åˆå¹¶å†²çªï¼Œç„¶åŽé€šè¿‡ git add\n" "å‘½ä»¤å°†å®ƒä»¬æ ‡è®°ä¸ºå·²è§£å†³" #: git-rebase.sh:468 #, 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:509 msgid "error: cannot combine '--signoff' with '--preserve-merges'" msgstr "错误:ä¸èƒ½ç»„åˆå‚æ•° '--signoff' å’Œ '--preserve-merges'" #: git-rebase.sh:537 #, sh-format msgid "invalid upstream '$upstream_name'" msgstr "æ— æ•ˆçš„ä¸Šæ¸¸ '$upstream_name'" #: git-rebase.sh:561 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "$onto_name: 有一个以上的åˆå¹¶åŸºå‡†" #: git-rebase.sh:564 git-rebase.sh:568 #, sh-format msgid "$onto_name: there is no merge base" msgstr "$onto_name: 没有åˆå¹¶åŸºå‡†" #: git-rebase.sh:573 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "没有指å‘一个有效的æ交:$onto_name" #: git-rebase.sh:599 #, sh-format msgid "fatal: no such branch/commit '$branch_name'" msgstr "严é‡é”™è¯¯ï¼šæ— æ¤åˆ†æ”¯/æ交 '$branch_name'" #: git-rebase.sh:632 msgid "Cannot autostash" msgstr "æ— æ³• autostash" #: git-rebase.sh:637 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "创建了 autostash: $stash_abbrev" #: git-rebase.sh:641 msgid "Please commit or stash them." msgstr "请æ交或贮è—修改。" #: git-rebase.sh:664 #, sh-format msgid "HEAD is up to date." msgstr "HEAD 是最新的。" #: git-rebase.sh:666 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "当å‰åˆ†æ”¯ $branch_name 是最新的。" #: git-rebase.sh:674 #, sh-format msgid "HEAD is up to date, rebase forced." msgstr "HEAD 是最新的,强制å˜åŸºã€‚" #: git-rebase.sh:676 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "当å‰åˆ†æ”¯ $branch_name 是最新的,强制å˜åŸºã€‚" #: git-rebase.sh:688 #, sh-format msgid "Changes from $mb to $onto:" msgstr "å˜æ›´ä»Ž $mb 到 $onto:" #: git-rebase.sh:697 msgid "First, rewinding head to replay your work on top of it..." msgstr "首先,回退分支以便在上é¢é‡æ”¾æ‚¨çš„工作..." #: git-rebase.sh:707 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "å¿«è¿› $branch_name 至 $onto_name。" #: git-stash.sh:61 msgid "git stash clear with parameters is unimplemented" msgstr "git stash clear ä¸æ”¯æŒå‚æ•°" #: git-stash.sh:108 msgid "You do not have the initial commit yet" msgstr "您尚未建立åˆå§‹æ交" #: git-stash.sh:123 msgid "Cannot save the current index state" msgstr "æ— æ³•ä¿å˜å½“å‰ç´¢å¼•çŠ¶æ€" #: git-stash.sh:138 msgid "Cannot save the untracked files" msgstr "æ— æ³•ä¿å˜æœªè·Ÿè¸ªæ–‡ä»¶" #: git-stash.sh:158 git-stash.sh:171 msgid "Cannot save the current worktree state" msgstr "æ— æ³•ä¿å˜å½“å‰å·¥ä½œåŒºçŠ¶æ€" #: git-stash.sh:175 msgid "No changes selected" msgstr "没有选择å˜æ›´" #: git-stash.sh:178 msgid "Cannot remove temporary index (can't happen)" msgstr "æ— æ³•åˆ é™¤ä¸´æ—¶ç´¢å¼•ï¼ˆä¸åº”å‘生)" #: git-stash.sh:191 msgid "Cannot record working tree state" msgstr "ä¸èƒ½è®°å½•å·¥ä½œåŒºçŠ¶æ€" #: git-stash.sh:229 #, sh-format msgid "Cannot update $ref_stash with $w_commit" msgstr "æ— æ³•ç”¨ $w_commit æ›´æ–° $ref_stash" #: git-stash.sh:281 #, sh-format msgid "error: unknown option for 'stash push': $option" msgstr "错误:'stash push' 的未知选项:$option" #: git-stash.sh:295 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "ä¸èƒ½åŒæ—¶ä½¿ç”¨å‚æ•° --patch å’Œ --include-untracked 或 --all" #: git-stash.sh:303 msgid "No local changes to save" msgstr "没有è¦ä¿å˜çš„本地修改" #: git-stash.sh:308 msgid "Cannot initialize stash" msgstr "æ— æ³•åˆå§‹åŒ–è´®è—" #: git-stash.sh:312 msgid "Cannot save the current status" msgstr "æ— æ³•ä¿å˜å½“å‰çŠ¶æ€" #: git-stash.sh:313 #, sh-format msgid "Saved working directory and index state $stash_msg" msgstr "ä¿å˜å·¥ä½œç›®å½•å’Œç´¢å¼•çŠ¶æ€ $stash_msg" #: git-stash.sh:342 msgid "Cannot remove worktree changes" msgstr "æ— æ³•åˆ é™¤å·¥ä½œåŒºå˜æ›´" #: git-stash.sh:490 #, sh-format msgid "unknown option: $opt" msgstr "未知选项: $opt" #: git-stash.sh:503 msgid "No stash entries found." msgstr "未å‘现贮è—æ¡ç›®ã€‚" #: git-stash.sh:510 #, sh-format msgid "Too many revisions specified: $REV" msgstr "指定了太多的版本:$REV" #: git-stash.sh:525 #, sh-format msgid "$reference is not a valid reference" msgstr "$reference ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„引用" #: git-stash.sh:553 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "'$args' ä¸æ˜¯è´®è—å¼æ交" #: git-stash.sh:564 #, sh-format msgid "'$args' is not a stash reference" msgstr "'$args' ä¸æ˜¯ä¸€ä¸ªè´®è—引用" #: git-stash.sh:572 msgid "unable to refresh index" msgstr "æ— æ³•åˆ·æ–°ç´¢å¼•" #: git-stash.sh:576 msgid "Cannot apply a stash in the middle of a merge" msgstr "æ— æ³•åœ¨åˆå¹¶è¿‡ç¨‹åº”用贮è—" #: git-stash.sh:584 msgid "Conflicts in index. Try without --index." msgstr "索引ä¸æœ‰å†²çªã€‚å°è¯•ä¸ä½¿ç”¨ --index。" #: git-stash.sh:586 msgid "Could not save index tree" msgstr "ä¸èƒ½ä¿å˜ç´¢å¼•æ ‘" #: git-stash.sh:595 msgid "Could not restore untracked files from stash entry" msgstr "æ— æ³•ä»Žè´®è—æ¡ç›®ä¸æ¢å¤æœªè·Ÿè¸ªæ–‡ä»¶" #: git-stash.sh:620 msgid "Cannot unstage modified files" msgstr "æ— æ³•å°†ä¿®æ”¹çš„æ–‡ä»¶å–消暂å˜" #: git-stash.sh:635 msgid "Index was not unstashed." msgstr "索引未从贮è—ä¸æ¢å¤ã€‚" #: git-stash.sh:649 msgid "The stash entry is kept in case you need it again." msgstr "è´®è—æ¡ç›®è¢«ä¿ç•™ä»¥å¤‡æ‚¨å†æ¬¡éœ€è¦ã€‚" #: git-stash.sh:658 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "丢弃了 ${REV} ($s)" #: git-stash.sh:659 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}ï¼šæ— æ³•ä¸¢å¼ƒè´®è—æ¡ç›®" #: git-stash.sh:667 msgid "No branch name specified" msgstr "未指定分支å" #: git-stash.sh:746 msgid "(To restore them type \"git stash apply\")" msgstr "(为æ¢å¤æ•°æ®è¾“å…¥ \"git stash apply\")" #: git-submodule.sh:188 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "åªèƒ½åœ¨å·¥ä½œåŒºçš„顶级目录ä¸ä½¿ç”¨ç›¸å¯¹è·¯å¾„" #: git-submodule.sh:198 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "仓库 URL:'$repo' 必须是ç»å¯¹è·¯å¾„或以 ./|../ 起始" #: git-submodule.sh:217 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "'$sm_path' å·²ç»å˜åœ¨äºŽç´¢å¼•ä¸" #: git-submodule.sh:220 #, sh-format msgid "'$sm_path' already exists in the index and is not a submodule" msgstr "'$sm_path' å·²ç»å˜åœ¨äºŽç´¢å¼•ä¸ä¸”ä¸æ˜¯ä¸€ä¸ªå模组" #: git-submodule.sh:226 #, 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:249 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "æ·»åŠ ä½äºŽ '$sm_path' 的现å˜ä»“库到索引" #: git-submodule.sh:251 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "'$sm_path' å·²å˜åœ¨ä¸”ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„ git 仓库" #: git-submodule.sh:259 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "本地å‘现 '$sm_name' 的一个 git 目录,与其对应的远程仓库:" #: git-submodule.sh:261 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" " $realrepo\n" "use the '--force' option. If the local git directory is not the correct " "repo\n" "or you are unsure what this means choose another name with the '--name' " "option." msgstr "" "如果您想è¦é‡ç”¨è¿™ä¸ªæœ¬åœ° git 目录而éžé‡æ–°å…‹éš†è‡ª\n" " $realrepo\n" "使用 '--force' 选项。如果本地 git 目录ä¸æ˜¯æ£ç¡®çš„仓库\n" "或者您ä¸ç¡®å®šè¿™é‡Œçš„å«ä¹‰ï¼Œä½¿ç”¨ '--name' 选项选择å¦å¤–çš„å称。" #: git-submodule.sh:267 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "激活本地 git 目录到å模组 '$sm_name'。" #: git-submodule.sh:279 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "ä¸èƒ½æ£€å‡ºå模组 '$sm_path'" #: git-submodule.sh:284 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "æ— æ³•æ·»åŠ å模组 '$sm_path'" #: git-submodule.sh:293 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "æ— æ³•æ³¨å†Œå模组 '$sm_path'" #: git-submodule.sh:354 #, sh-format msgid "Entering '$displaypath'" msgstr "æ£åœ¨è¿›å…¥ '$displaypath'" #: git-submodule.sh:374 #, sh-format msgid "Stopping at '$displaypath'; script returned non-zero status." msgstr "åœæ¢äºŽ '$displaypath';脚本返回éžé›¶å€¼ã€‚" #: git-submodule.sh:600 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "æ— æ³•åœ¨å模组路径 '$displaypath' ä¸æ‰¾åˆ°å½“å‰ç‰ˆæœ¬" #: git-submodule.sh:610 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "æ— æ³•åœ¨å模组路径 '$sm_path' ä¸èŽ·å–" #: git-submodule.sh:615 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " "'$sm_path'" msgstr "æ— æ³•åœ¨å模组路径 '$sm_path' ä¸æ‰¾åˆ°å½“å‰ç‰ˆæœ¬ ${remote_name}/${branch}" #: git-submodule.sh:633 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "æ— æ³•åœ¨å模组路径 '$displaypath' ä¸èŽ·å–" #: git-submodule.sh:639 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " "Direct fetching of that commit failed." msgstr "" "获å–了å模组路径 '$displaypath'ï¼Œä½†æ˜¯å®ƒæ²¡æœ‰åŒ…å« $sha1。直接获å–该æ交失败。" #: git-submodule.sh:646 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "æ— æ³•åœ¨å模组路径 '$displaypath' ä¸æ£€å‡º '$sha1'" #: git-submodule.sh:647 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "å模组路径 '$displaypath':检出 '$sha1'" #: git-submodule.sh:651 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "æ— æ³•åœ¨å模组路径 '$displaypath' ä¸å˜åŸº '$sha1'" #: git-submodule.sh:652 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "å模组路径 '$displaypath':å˜åŸºè‡³ '$sha1'" #: git-submodule.sh:657 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "æ— æ³•åˆå¹¶ '$sha1' 到å模组路径 '$displaypath' ä¸" #: git-submodule.sh:658 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "å模组路径 '$displaypath':已åˆå¹¶å…¥ '$sha1'" #: git-submodule.sh:663 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "在å模组 '$displaypath' ä¸æ‰§è¡Œ '$command $sha1' 失败" #: git-submodule.sh:664 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "å模组 '$displaypath':'$command $sha1'" #: git-submodule.sh:695 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "æ— æ³•é€’å½’è¿›å模组路径 '$displaypath'" #: git-submodule.sh:791 msgid "The --cached option cannot be used with the --files option" msgstr "选项 --cached ä¸èƒ½å’Œé€‰é¡¹ --files åŒæ—¶ä½¿ç”¨" #: git-submodule.sh:843 #, sh-format msgid "unexpected mode $mod_dst" msgstr "æ„å¤–çš„æ¨¡å¼ $mod_dst" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: git-submodule.sh:863 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " è¦å‘Šï¼š$display_name 未包å«æ交 $sha1_src" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: git-submodule.sh:866 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " è¦å‘Šï¼š$display_name 未包å«æ交 $sha1_dst" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: git-submodule.sh:869 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr " è¦å‘Šï¼š$display_name 未包å«æ交 $sha1_src å’Œ $sha1_dst" #: git-parse-remote.sh:89 #, sh-format msgid "See git-${cmd}(1) for details." msgstr "è¯¦è§ git-${cmd}(1)。" #: git-rebase--interactive.sh:142 #, sh-format msgid "Rebasing ($new_count/$total)" msgstr "å˜åŸºä¸ï¼ˆ$new_count/$total)" #: git-rebase--interactive.sh:158 msgid "" "\n" "Commands:\n" "p, pick <commit> = use commit\n" "r, reword <commit> = use commit, but edit the commit message\n" "e, edit <commit> = use commit, but stop for amending\n" "s, squash <commit> = use commit, but meld into previous commit\n" "f, fixup <commit> = like \"squash\", but discard this commit's log message\n" "x, exec <command> = run command (the rest of the line) using shell\n" "d, drop <commit> = remove commit\n" "l, label <label> = label current HEAD with a name\n" "t, reset <label> = reset HEAD to a label\n" "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" ". create a merge commit using the original merge commit's\n" ". message (or the oneline, if no original merge commit was\n" ". specified). Use -c <commit> to reword the commit message.\n" "\n" "These lines can be re-ordered; they are executed from top to bottom.\n" msgstr "" "\n" "命令:\n" "p, pick <æ交> = 使用æ交\n" "r, reword <æ交> = 使用æ交,但修改æ交说明\n" "e, edit <æ交> = 使用æ交,进入 shell 以便进行æ交修补\n" "s, squash <æ交> = 使用æ交,但èžåˆåˆ°å‰ä¸€ä¸ªæ交\n" "f, fixup <æ交> = 类似于 \"squash\",但丢弃æ交说明日志\n" "x, exec <命令> = 使用 shell è¿è¡Œå‘½ä»¤ï¼ˆæ¤è¡Œå‰©ä½™éƒ¨åˆ†ï¼‰\n" "d, drop <æ交> = åˆ é™¤æ交\n" "l, label <label> = ä¸ºå½“å‰ HEAD æ‰“ä¸Šæ ‡è®°\n" "t, reset <label> = é‡ç½® HEAD åˆ°è¯¥æ ‡è®°\n" "m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n" ". 创建一个åˆå¹¶æ交,并使用原始的åˆå¹¶æ交说明(如果没有指定\n" ". 原始æ交,使用注释部分的 oneline 作为æ交说明)。使用\n" ". -c <æ交> å¯ä»¥ç¼–辑æ交说明。\n" "\n" "å¯ä»¥å¯¹è¿™äº›è¡Œé‡æ–°æŽ’åºï¼Œå°†ä»Žä¸Šè‡³ä¸‹æ‰§è¡Œã€‚\n" #: git-rebase--interactive.sh:179 msgid "" "\n" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" msgstr "" "\n" "ä¸è¦åˆ 除任æ„一行。使用 'drop' 显å¼åœ°åˆ 除一个æ交。\n" #: git-rebase--interactive.sh:183 msgid "" "\n" "If you remove a line here THAT COMMIT WILL BE LOST.\n" msgstr "" "\n" "å¦‚æžœæ‚¨åœ¨è¿™é‡Œåˆ é™¤ä¸€è¡Œï¼Œå¯¹åº”çš„æ交将会丢失。\n" #: git-rebase--interactive.sh:221 #, sh-format msgid "" "You can amend the commit now, with\n" "\n" "\tgit commit --amend $gpg_sign_opt_quoted\n" "\n" "Once you are satisfied with your changes, run\n" "\n" "\tgit rebase --continue" msgstr "" "您现在å¯ä»¥ä¿®è¡¥è¿™ä¸ªæ交,使用\n" "\n" "\tgit commit --amend $gpg_sign_opt_quoted\n" "\n" "当您对å˜æ›´æ„Ÿåˆ°æ»¡æ„,执行\n" "\n" "\tgit rebase --continue" #: git-rebase--interactive.sh:246 #, sh-format msgid "$sha1: not a commit that can be picked" msgstr "$sha1:ä¸æ˜¯ä¸€ä¸ªå¯ä»¥è¢«æ‹£é€‰çš„æ交" #: git-rebase--interactive.sh:285 #, sh-format msgid "Invalid commit name: $sha1" msgstr "æ— æ•ˆçš„æ交å:$sha1" #: git-rebase--interactive.sh:325 msgid "Cannot write current commit's replacement sha1" msgstr "ä¸èƒ½å†™å…¥å½“å‰æ交的替代 sha1" #: git-rebase--interactive.sh:376 #, sh-format msgid "Fast-forward to $sha1" msgstr "快进到 $sha1" #: git-rebase--interactive.sh:378 #, sh-format msgid "Cannot fast-forward to $sha1" msgstr "ä¸èƒ½å¿«è¿›åˆ° $sha1" #: git-rebase--interactive.sh:387 #, sh-format msgid "Cannot move HEAD to $first_parent" msgstr "ä¸èƒ½ç§»åŠ¨ HEAD 到 $first_parent" #: git-rebase--interactive.sh:392 #, sh-format msgid "Refusing to squash a merge: $sha1" msgstr "æ‹’ç»åŽ‹ç¼©ä¸€ä¸ªåˆå¹¶ï¼š$sha1" #: git-rebase--interactive.sh:410 #, sh-format msgid "Error redoing merge $sha1" msgstr "æ— æ³•é‡åšåˆå¹¶ $sha1" #: git-rebase--interactive.sh:419 #, sh-format msgid "Could not pick $sha1" msgstr "ä¸èƒ½æ‹£é€‰ $sha1" #: git-rebase--interactive.sh:428 #, sh-format msgid "This is the commit message #${n}:" msgstr "这是æ交说明 #${n}:" #: git-rebase--interactive.sh:433 #, sh-format msgid "The commit message #${n} will be skipped:" msgstr "æ交说明 #${n} 将被跳过:" #: git-rebase--interactive.sh:444 #, sh-format msgid "This is a combination of $count commit." msgid_plural "This is a combination of $count commits." msgstr[0] "这是一个 $count 个æ交的组åˆã€‚" msgstr[1] "这是一个 $count 个æ交的组åˆã€‚" #: git-rebase--interactive.sh:453 #, sh-format msgid "Cannot write $fixup_msg" msgstr "ä¸èƒ½å†™å…¥ $fixup_msg" #: git-rebase--interactive.sh:456 msgid "This is a combination of 2 commits." msgstr "这是一个 2 个æ交的组åˆã€‚" #: git-rebase--interactive.sh:497 git-rebase--interactive.sh:540 #: git-rebase--interactive.sh:543 #, sh-format msgid "Could not apply $sha1... $rest" msgstr "ä¸èƒ½åº”用 $sha1... $rest" #: git-rebase--interactive.sh:572 #, sh-format msgid "" "Could not amend commit after successfully picking $sha1... $rest\n" "This is most likely due to an empty commit message, or the pre-commit hook\n" "failed. If the pre-commit hook failed, you may need to resolve the issue " "before\n" "you are able to reword the commit." msgstr "" "ä¸èƒ½åœ¨æˆåŠŸæ‹£é€‰ $sha1... $rest 之åŽä¿®è¡¥æ交\n" "è¿™é€šå¸¸æ˜¯å› ä¸ºç©ºçš„æ交说明,或者 pre-commit é’©å执行失败。如果是 pre-commit\n" "é’©åæ‰§è¡Œå¤±è´¥ï¼Œä½ å¯èƒ½éœ€è¦åœ¨é‡å†™æ交说明å‰è§£å†³è¿™ä¸ªé—®é¢˜ã€‚" #: git-rebase--interactive.sh:587 #, sh-format msgid "Stopped at $sha1_abbrev... $rest" msgstr "åœæ¢åœ¨ $sha1_abbrev... $rest" #: git-rebase--interactive.sh:602 #, sh-format msgid "Cannot '$squash_style' without a previous commit" msgstr "没有父æ交的情况下ä¸èƒ½ '$squash_style'" #: git-rebase--interactive.sh:644 #, sh-format msgid "Executing: $rest" msgstr "执行:$rest" #: git-rebase--interactive.sh:652 #, sh-format msgid "Execution failed: $rest" msgstr "执行失败:$rest" #: git-rebase--interactive.sh:654 msgid "and made changes to the index and/or the working tree" msgstr "并且修改索引和/或工作区" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: git-rebase--interactive.sh:656 msgid "" "You can fix the problem, and then run\n" "\n" "\tgit rebase --continue" msgstr "" "您å¯ä»¥è§£å†³è¿™ä¸ªé—®é¢˜ï¼Œç„¶åŽè¿è¡Œ\n" "\n" "\tgit rebase --continue" #. TRANSLATORS: after these lines is a command to be issued by the user #: git-rebase--interactive.sh:669 #, sh-format msgid "" "Execution succeeded: $rest\n" "but left changes to the index and/or the working tree\n" "Commit or stash your changes, and then run\n" "\n" "\tgit rebase --continue" msgstr "" "执行æˆåŠŸï¼š$rest\n" "但是在索引和/或工作区ä¸å˜åœ¨å˜æ›´ã€‚æ交或贮è—修改,然åŽè¿è¡Œ\n" "\n" "\tgit rebase --continue" #: git-rebase--interactive.sh:680 #, sh-format msgid "Unknown command: $command $sha1 $rest" msgstr "未知命令:$command $sha1 $rest" #: git-rebase--interactive.sh:681 msgid "Please fix this using 'git rebase --edit-todo'." msgstr "è¦ä¿®æ”¹è¯·ä½¿ç”¨å‘½ä»¤ 'git rebase --edit-todo'。" #: git-rebase--interactive.sh:716 #, sh-format msgid "Successfully rebased and updated $head_name." msgstr "æˆåŠŸå˜åŸºå¹¶æ›´æ–° $head_name。" #: git-rebase--interactive.sh:740 msgid "could not detach HEAD" msgstr "ä¸èƒ½æ£€å‡ºä¸ºåˆ†ç¦»å¤´æŒ‡é’ˆ" #: git-rebase--interactive.sh:778 msgid "Could not remove CHERRY_PICK_HEAD" msgstr "ä¸èƒ½åˆ 除 CHERRY_PICK_HEAD" #: git-rebase--interactive.sh:783 #, sh-format msgid "" "You have staged changes in your working tree.\n" "If these changes are meant to be\n" "squashed into the previous commit, run:\n" "\n" " git commit --amend $gpg_sign_opt_quoted\n" "\n" "If they are meant to go into a new commit, run:\n" "\n" " git commit $gpg_sign_opt_quoted\n" "\n" "In both cases, once you're done, continue with:\n" "\n" " git rebase --continue\n" msgstr "" "您已暂å˜äº†å·¥ä½œåŒºçš„修改。如果这些修改è¦åŽ‹ç¼©åˆ°å‰ä¸€ä¸ªæ交,执行:\n" "\n" " git commit --amend $gpg_sign_opt_quoted\n" "\n" "如果这些å˜æ›´è¦å½¢æˆä¸€ä¸ªæ–°æ交,执行:\n" "\n" " git commit $gpg_sign_opt_quoted\n" "\n" "æ— è®ºå“ªç§æƒ…况,当您完æˆæ交,继ç»æ‰§è¡Œï¼š\n" "\n" " git rebase --continue\n" #: git-rebase--interactive.sh:800 msgid "Error trying to find the author identity to amend commit" msgstr "在修补æ交ä¸æŸ¥æ‰¾ä½œè€…ä¿¡æ¯æ—¶é‡åˆ°é”™è¯¯" #: git-rebase--interactive.sh:805 msgid "" "You have uncommitted changes in your working tree. Please commit them\n" "first and then run 'git rebase --continue' again." msgstr "" "您的工作区ä¸æœ‰æœªæ交的å˜æ›´ã€‚请先æ交然åŽå†æ¬¡è¿è¡Œ 'git rebase --continue'。" #: git-rebase--interactive.sh:810 git-rebase--interactive.sh:814 msgid "Could not commit staged changes." msgstr "ä¸èƒ½æ交暂å˜çš„修改。" #: git-rebase--interactive.sh:843 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" "To continue rebase after editing, run:\n" " git rebase --continue\n" "\n" msgstr "" "\n" "您æ£åœ¨ä¿®æ”¹è¿è¡Œä¸çš„交互å¼å˜åŸºå¾…办列表。若è¦åœ¨ç¼–辑结æŸåŽç»§ç»å˜åŸºï¼Œ\n" "请执行:\n" " git rebase --continue\n" "\n" #: git-rebase--interactive.sh:851 git-rebase--interactive.sh:937 msgid "Could not execute editor" msgstr "æ— æ³•è¿è¡Œç¼–辑器" #: git-rebase--interactive.sh:872 #, sh-format msgid "Could not checkout $switch_to" msgstr "ä¸èƒ½æ£€å‡º $switch_to" #: git-rebase--interactive.sh:879 msgid "No HEAD?" msgstr "没有 HEAD?" #: git-rebase--interactive.sh:880 #, sh-format msgid "Could not create temporary $state_dir" msgstr "ä¸èƒ½åˆ›å»ºä¸´æ—¶ $state_dir" #: git-rebase--interactive.sh:883 msgid "Could not mark as interactive" msgstr "ä¸èƒ½æ ‡è®°ä¸ºäº¤äº’å¼" #: git-rebase--interactive.sh:915 #, sh-format msgid "Rebase $shortrevisions onto $shortonto ($todocount command)" msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" msgstr[0] "å˜åŸº $shortrevisions 到 $shortonto($todocount 个æ交)" msgstr[1] "å˜åŸº $shortrevisions 到 $shortonto($todocount 个æ交)" #: git-rebase--interactive.sh:920 msgid "" "\n" "\tHowever, if you remove everything, the rebase will be aborted.\n" "\n" "\t" msgstr "" "\n" "\tç„¶è€Œï¼Œå¦‚æžœæ‚¨åˆ é™¤å…¨éƒ¨å†…å®¹ï¼Œå˜åŸºæ“作将会终æ¢ã€‚\n" "\n" "\t" #: git-rebase--interactive.sh:927 msgid "Note that empty commits are commented out" msgstr "注æ„空æ交已被注释掉" #: git-rebase--interactive.sh:980 msgid "Could not generate todo list" msgstr "æ— æ³•ç”Ÿæˆå¾…办列表" #: git-rebase--interactive.sh:1001 git-rebase--interactive.sh:1006 msgid "Could not init rewritten commits" msgstr "ä¸èƒ½å¯¹é‡å†™æ交进行åˆå§‹åŒ–" #: git-sh-setup.sh:89 git-sh-setup.sh:94 #, sh-format msgid "usage: $dashless $USAGE" msgstr "用法:$dashless $USAGE" #: git-sh-setup.sh:190 #, sh-format msgid "Cannot chdir to $cdup, the toplevel of the working tree" msgstr "ä¸èƒ½åˆ‡æ¢ç›®å½•åˆ° $cdup,工作区的顶级目录" #: git-sh-setup.sh:199 git-sh-setup.sh:206 #, sh-format msgid "fatal: $program_name cannot be used without a working tree." msgstr "严é‡é”™è¯¯ï¼š$program_name ä¸èƒ½åœ¨æ²¡æœ‰å·¥ä½œåŒºçš„情况下使用" #: git-sh-setup.sh:220 msgid "Cannot rebase: You have unstaged changes." msgstr "ä¸èƒ½å˜åŸºï¼šæ‚¨æœ‰æœªæš‚å˜çš„å˜æ›´ã€‚" #: git-sh-setup.sh:223 msgid "Cannot rewrite branches: You have unstaged changes." msgstr "ä¸èƒ½é‡å†™åˆ†æ”¯ï¼šæ‚¨æœ‰æœªæš‚å˜çš„å˜æ›´ã€‚" #: git-sh-setup.sh:226 msgid "Cannot pull with rebase: You have unstaged changes." msgstr "æ— æ³•é€šè¿‡å˜åŸºæ–¹å¼æ‹‰å–:您有未暂å˜çš„å˜æ›´ã€‚" #: git-sh-setup.sh:229 #, sh-format msgid "Cannot $action: You have unstaged changes." msgstr "ä¸èƒ½ $action:您有未暂å˜çš„å˜æ›´ã€‚" #: git-sh-setup.sh:242 msgid "Cannot rebase: Your index contains uncommitted changes." msgstr "ä¸èƒ½å˜åŸºï¼šæ‚¨çš„索引ä¸åŒ…å«æœªæ交的å˜æ›´ã€‚" #: git-sh-setup.sh:245 msgid "Cannot pull with rebase: Your index contains uncommitted changes." msgstr "æ— æ³•é€šè¿‡å˜åŸºæ–¹å¼æ‹‰å–:您的索引ä¸åŒ…å«æœªæ交的å˜æ›´ã€‚" #: git-sh-setup.sh:248 #, sh-format msgid "Cannot $action: Your index contains uncommitted changes." msgstr "ä¸èƒ½ $action:您的索引ä¸åŒ…å«æœªæ交的å˜æ›´ã€‚" #: git-sh-setup.sh:252 msgid "Additionally, your index contains uncommitted changes." msgstr "而且您的索引ä¸åŒ…å«æœªæ交的å˜æ›´ã€‚" #: git-sh-setup.sh:372 msgid "You need to run this command from the toplevel of the working tree." msgstr "您需è¦åœ¨å·¥ä½œåŒºçš„顶级目录ä¸è¿è¡Œè¿™ä¸ªå‘½ä»¤ã€‚" #: git-sh-setup.sh:377 msgid "Unable to determine absolute path of git directory" msgstr "ä¸èƒ½ç¡®å®š git 目录的ç»å¯¹è·¯å¾„" #. TRANSLATORS: you can adjust this to align "git add -i" status menu #: git-add--interactive.perl:196 #, perl-format msgid "%12s %12s %s" msgstr "%12s %12s %s" #: git-add--interactive.perl:197 msgid "staged" msgstr "缓å˜" #: git-add--interactive.perl:197 msgid "unstaged" msgstr "未缓å˜" #: git-add--interactive.perl:253 git-add--interactive.perl:278 msgid "binary" msgstr "二进制" #: git-add--interactive.perl:262 git-add--interactive.perl:316 msgid "nothing" msgstr "æ— " #: git-add--interactive.perl:298 git-add--interactive.perl:313 msgid "unchanged" msgstr "没有修改" #: git-add--interactive.perl:609 #, perl-format msgid "added %d path\n" msgid_plural "added %d paths\n" msgstr[0] "å¢žåŠ äº† %d 个路径\n" msgstr[1] "å¢žåŠ äº† %d 个路径\n" #: git-add--interactive.perl:612 #, perl-format msgid "updated %d path\n" msgid_plural "updated %d paths\n" msgstr[0] "更新了 %d 个路径\n" msgstr[1] "更新了 %d 个路径\n" #: git-add--interactive.perl:615 #, perl-format msgid "reverted %d path\n" msgid_plural "reverted %d paths\n" msgstr[0] "还原了 %d 个路径\n" msgstr[1] "还原了 %d 个路径\n" #: git-add--interactive.perl:618 #, perl-format msgid "touched %d path\n" msgid_plural "touched %d paths\n" msgstr[0] "触碰了 %d 个路径\n" msgstr[1] "触碰了 %d 个路径\n" #: git-add--interactive.perl:627 msgid "Update" msgstr "æ›´æ–°" #: git-add--interactive.perl:639 msgid "Revert" msgstr "还原" #: git-add--interactive.perl:662 #, perl-format msgid "note: %s is untracked now.\n" msgstr "说明:%s 现已æˆä¸ºæœªè·Ÿè¸ªçš„。\n" #: git-add--interactive.perl:673 msgid "Add untracked" msgstr "æ·»åŠ æœªè·Ÿè¸ªçš„" #: git-add--interactive.perl:679 msgid "No untracked files.\n" msgstr "没有未跟踪的文件。\n" #: git-add--interactive.perl:1033 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for staging." msgstr "如果补ä¸èƒ½å¹²å‡€åœ°åº”用,编辑å—将立å³æ ‡è®°ä¸ºæš‚å˜ã€‚" #: git-add--interactive.perl:1036 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for stashing." msgstr "如果补ä¸èƒ½å¹²å‡€åœ°åº”用,编辑å—将立å³æ ‡è®°ä¸ºè´®è—。" #: git-add--interactive.perl:1039 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for unstaging." msgstr "如果补ä¸èƒ½å¹²å‡€åœ°åº”用,编辑å—将立å³æ ‡è®°ä¸ºæœªæš‚å˜ã€‚" #: git-add--interactive.perl:1042 git-add--interactive.perl:1051 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for applying." msgstr "如果补ä¸èƒ½å¹²å‡€åœ°åº”用,编辑å—将立å³æ ‡è®°ä¸ºåº”用。" #: git-add--interactive.perl:1045 git-add--interactive.perl:1048 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for discarding." msgstr "如果补ä¸èƒ½å¹²å‡€åœ°åº”用,编辑å—将立å³æ ‡è®°ä¸ºä¸¢å¼ƒã€‚" #: git-add--interactive.perl:1085 #, perl-format msgid "failed to open hunk edit file for writing: %s" msgstr "æ— æ³•å†™å…¥å—编辑文件:%s" #: git-add--interactive.perl:1086 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" msgstr "手动å—ç¼–è¾‘æ¨¡å¼ -- 查看底部的快速指å—。\n" #: git-add--interactive.perl:1092 #, perl-format msgid "" "---\n" "To remove '%s' lines, make them ' ' lines (context).\n" "To remove '%s' lines, delete them.\n" "Lines starting with %s will be removed.\n" msgstr "" "---\n" "è¦åˆ 除 '%s' 开始的行,使其æˆä¸º ' ' 开始的行(上下文)。\n" "è¦åˆ 除 '%s' å¼€å§‹çš„è¡Œï¼Œåˆ é™¤å®ƒä»¬ã€‚\n" "以 %s å¼€å§‹çš„è¡Œå°†è¢«åˆ é™¤ã€‚\n" #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. #: git-add--interactive.perl:1100 msgid "" "If it does not apply cleanly, you will be given an opportunity to\n" "edit again. If all lines of the hunk are removed, then the edit is\n" "aborted and the hunk is left unchanged.\n" msgstr "" "如果ä¸èƒ½å¹²å‡€åœ°åº”用,您将有机会é‡æ–°ç¼–辑。如果该å—çš„å…¨éƒ¨å†…å®¹åˆ é™¤ï¼Œåˆ™\n" "æ¤æ¬¡ç¼–辑被终æ¢ï¼Œè¯¥å—ä¸ä¼šè¢«ä¿®æ”¹ã€‚\n" #: git-add--interactive.perl:1114 #, perl-format msgid "failed to open hunk edit file for reading: %s" msgstr "æ— æ³•è¯»å–å—编辑文件:%s" #. TRANSLATORS: do not translate [y/n] #. The program will only accept that input #. at this point. #. Consider translating (saying "no" discards!) as #. (saying "n" for "no" discards!) if the translation #. of the word "no" does not start with n. #: git-add--interactive.perl:1213 msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "您的编辑å—ä¸èƒ½è¢«åº”用。é‡æ–°ç¼–辑(选择 \"no\" 丢弃ï¼ï¼‰ [y/n]? " #: git-add--interactive.perl:1222 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" "q - quit; do not stage this hunk or any of the remaining ones\n" "a - stage this hunk and all later hunks in the file\n" "d - do not stage this hunk or any of the later hunks in the file" msgstr "" "y - æš‚å˜è¯¥å—\n" "n - ä¸è¦æš‚å˜è¯¥å—\n" "q - 退出。ä¸æš‚å˜è¯¥å—åŠåŽé¢çš„全部å—\n" "a - æš‚å˜è¯¥å—和本文件ä¸åŽé¢çš„全部å—\n" "d - ä¸æš‚å˜è¯¥å—和本文件ä¸åŽé¢çš„全部å—" #: git-add--interactive.perl:1228 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" "q - quit; do not stash this hunk or any of the remaining ones\n" "a - stash this hunk and all later hunks in the file\n" "d - do not stash this hunk or any of the later hunks in the file" msgstr "" "y - è´®è—该å—\n" "n - ä¸è¦è´®è—该å—\n" "q - 退出。ä¸è´®è—该å—åŠåŽé¢çš„全部å—\n" "a - è´®è—该å—和本文件ä¸åŽé¢çš„全部å—\n" "d - ä¸è´®è—该å—和本文件ä¸åŽé¢çš„全部å—" #: git-add--interactive.perl:1234 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" "q - quit; do not unstage this hunk or any of the remaining ones\n" "a - unstage this hunk and all later hunks in the file\n" "d - do not unstage this hunk or any of the later hunks in the file" msgstr "" "y - ä¸æš‚å˜è¯¥å—\n" "n - ä¸è¦ä¸æš‚å˜è¯¥å—\n" "q - 退出。ä¸è¦ä¸æš‚å˜è¯¥å—åŠåŽé¢çš„全部å—\n" "a - ä¸æš‚å˜è¯¥å—和本文件ä¸åŽé¢çš„全部å—\n" "d - ä¸è¦ä¸æš‚å˜è¯¥å—和本文件ä¸åŽé¢çš„全部å—" #: git-add--interactive.perl:1240 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" "q - quit; do not apply this hunk or any of the remaining ones\n" "a - apply this hunk and all later hunks in the file\n" "d - do not apply this hunk or any of the later hunks in the file" msgstr "" "y - 在索引ä¸åº”用该å—\n" "n - ä¸è¦åœ¨ç´¢å¼•ä¸åº”用该å—\n" "q - 退出。ä¸è¦åº”用该å—åŠåŽé¢çš„全部å—\n" "a - 应用该å—和本文件ä¸åŽé¢çš„全部å—\n" "d - ä¸è¦åº”用该å—和本文件ä¸åŽé¢çš„全部å—" #: git-add--interactive.perl:1246 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" "q - quit; do not discard this hunk or any of the remaining ones\n" "a - discard this hunk and all later hunks in the file\n" "d - do not discard this hunk or any of the later hunks in the file" msgstr "" "y - 在工作区ä¸ä¸¢å¼ƒè¯¥å—\n" "n - ä¸è¦åœ¨å·¥ä½œåŒºä¸ä¸¢å¼ƒè¯¥å—\n" "q - 退出。ä¸è¦ä¸¢å¼ƒè¯¥å—åŠåŽé¢çš„全部å—\n" "a - 丢弃该å—和本文件ä¸åŽé¢çš„全部å—\n" "d - ä¸è¦ä¸¢å¼ƒè¯¥å—和本文件ä¸åŽé¢çš„全部å—" #: git-add--interactive.perl:1252 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" "q - quit; do not discard this hunk or any of the remaining ones\n" "a - discard this hunk and all later hunks in the file\n" "d - do not discard this hunk or any of the later hunks in the file" msgstr "" "y - 在索引和工作区ä¸ä¸¢å¼ƒè¯¥å—\n" "n - ä¸è¦åœ¨ç´¢å¼•å’Œå·¥ä½œåŒºä¸ä¸¢å¼ƒè¯¥å—\n" "q - 退出。ä¸è¦ä¸¢å¼ƒè¯¥å—åŠåŽé¢çš„全部å—\n" "a - 丢弃该å—和本文件ä¸åŽé¢çš„全部å—\n" "d - ä¸è¦ä¸¢å¼ƒè¯¥å—和本文件ä¸åŽé¢çš„全部å—" #: git-add--interactive.perl:1258 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" "q - quit; do not apply this hunk or any of the remaining ones\n" "a - apply this hunk and all later hunks in the file\n" "d - do not apply this hunk or any of the later hunks in the file" msgstr "" "y - 在索引和工作区ä¸åº”用该å—\n" "n - ä¸è¦åœ¨ç´¢å¼•å’Œå·¥ä½œåŒºä¸åº”用该å—\n" "q - 退出。ä¸è¦åº”用该å—åŠåŽé¢çš„全部å—\n" "a - 应用该å—和本文件ä¸åŽé¢çš„全部å—\n" "d - ä¸è¦åº”用该å—和本文件ä¸åŽé¢çš„全部å—" #: git-add--interactive.perl:1273 msgid "" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" "j - leave this hunk undecided, see next undecided hunk\n" "J - leave this hunk undecided, see next hunk\n" "k - leave this hunk undecided, see previous undecided hunk\n" "K - leave this hunk undecided, see previous hunk\n" "s - split the current hunk into smaller hunks\n" "e - manually edit the current hunk\n" "? - print help\n" msgstr "" "g - 选择跳转到一个å—\n" "/ - 查找和给定æ£åˆ™è¡¨è¾¾å¼åŒ¹é…çš„å—\n" "j - ç»´æŒè¯¥å—未决状æ€ï¼ŒæŸ¥çœ‹ä¸‹ä¸€ä¸ªæœªå†³å—\n" "J - ç»´æŒè¯¥å—未决状æ€ï¼ŒæŸ¥çœ‹ä¸‹ä¸€ä¸ªå—\n" "k - ç»´æŒè¯¥å—未决状æ€ï¼ŒæŸ¥çœ‹ä¸Šä¸€ä¸ªæœªå†³å—\n" "K - ç»´æŒè¯¥å—未决状æ€ï¼ŒæŸ¥çœ‹ä¸Šä¸€ä¸ªå—\n" "s - 拆分当å‰å—为更å°çš„å—\n" "e - 手动编辑当å‰å—\n" "? - 显示帮助\n" #: git-add--interactive.perl:1304 msgid "The selected hunks do not apply to the index!\n" msgstr "选ä¸çš„å—ä¸èƒ½åº”用到索引ï¼\n" #: git-add--interactive.perl:1305 msgid "Apply them to the worktree anyway? " msgstr "æ— è®ºå¦‚ä½•éƒ½è¦åº”用到工作区么?" #: git-add--interactive.perl:1308 msgid "Nothing was applied.\n" msgstr "未应用。\n" #: git-add--interactive.perl:1319 #, perl-format msgid "ignoring unmerged: %s\n" msgstr "忽略未åˆå…¥çš„:%s\n" #: git-add--interactive.perl:1328 msgid "Only binary files changed.\n" msgstr "åªæœ‰äºŒè¿›åˆ¶æ–‡ä»¶è¢«ä¿®æ”¹ã€‚\n" #: git-add--interactive.perl:1330 msgid "No changes.\n" msgstr "没有修改。\n" #: git-add--interactive.perl:1338 msgid "Patch update" msgstr "è¡¥ä¸æ›´æ–°" #: git-add--interactive.perl:1390 #, perl-format msgid "Stage mode change [y,n,q,a,d%s,?]? " msgstr "æš‚å˜æ¨¡å¼å˜æ›´ [y,n,q,a,d%s,?]? " #: git-add--interactive.perl:1391 #, perl-format msgid "Stage deletion [y,n,q,a,d%s,?]? " msgstr "æš‚å˜åˆ 除动作 [y,n,q,a,d%s,?]? " #: git-add--interactive.perl:1392 #, perl-format msgid "Stage this hunk [y,n,q,a,d%s,?]? " msgstr "æš‚å˜è¯¥å— [y,n,q,a,d%s,?]? " #: git-add--interactive.perl:1395 #, perl-format msgid "Stash mode change [y,n,q,a,d%s,?]? " msgstr "è´®è—模å¼å˜æ›´ [y,n,q,a,d%s,?]? " #: git-add--interactive.perl:1396 #, perl-format msgid "Stash deletion [y,n,q,a,d%s,?]? " msgstr "è´®è—åˆ é™¤åŠ¨ä½œ [y,n,q,a,d%s,?]? " #: git-add--interactive.perl:1397 #, perl-format msgid "Stash this hunk [y,n,q,a,d%s,?]? " msgstr "è´®è—è¯¥å— [y,n,q,a,d%s,?]? " #: git-add--interactive.perl:1400 #, perl-format msgid "Unstage mode change [y,n,q,a,d%s,?]? " msgstr "å–消暂å˜æ¨¡å¼å˜æ›´ [y,n,q,a,d%s,?]? " #: git-add--interactive.perl:1401 #, perl-format msgid "Unstage deletion [y,n,q,a,d%s,?]? " msgstr "å–消暂å˜åˆ 除动作 [y,n,q,a,d%s,?]? " #: git-add--interactive.perl:1402 #, perl-format msgid "Unstage this hunk [y,n,q,a,d%s,?]? " msgstr "å–消暂å˜è¯¥å— [y,n,q,a,d%s,?]? " #: git-add--interactive.perl:1405 #, perl-format msgid "Apply mode change to index [y,n,q,a,d%s,?]? " msgstr "将模å¼å˜æ›´åº”用到索引 [y,n,q,a,d%s,?]? " #: git-add--interactive.perl:1406 #, perl-format msgid "Apply deletion to index [y,n,q,a,d%s,?]? " msgstr "å°†åˆ é™¤åº”ç”¨åˆ°ç´¢å¼• [y,n,q,a,d%s,?]? " #: git-add--interactive.perl:1407 #, perl-format msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " msgstr "将该å—应用到索引 [y,n,q,a,d%s,?]? " #: git-add--interactive.perl:1410 #, perl-format msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " msgstr "从工作区ä¸ä¸¢å¼ƒæ¨¡å¼å˜æ›´ [y,n,q,a,d%s,?]? " #: git-add--interactive.perl:1411 #, perl-format msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " msgstr "从工作区ä¸ä¸¢å¼ƒåˆ 除动作 [y,n,q,a,d%s,?]? " #: git-add--interactive.perl:1412 #, perl-format msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " msgstr "从工作区ä¸ä¸¢å¼ƒè¯¥å— [y,n,q,a,d%s,?]? " #: git-add--interactive.perl:1415 #, perl-format msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " msgstr "从索引和工作区ä¸ä¸¢å¼ƒæ¨¡å¼å˜æ›´ [y,n,q,a,d%s,?]? " #: git-add--interactive.perl:1416 #, perl-format msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " msgstr "从索引和工作区ä¸ä¸¢å¼ƒåˆ 除 [y,n,q,a,d%s,?]? " #: git-add--interactive.perl:1417 #, perl-format msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " msgstr "从索引和工作区ä¸ä¸¢å¼ƒè¯¥å— [y,n,q,a,d%s,?]? " #: git-add--interactive.perl:1420 #, perl-format msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " msgstr "将模å¼å˜æ›´åº”用到索引和工作区 [y,n,q,a,d%s,?]? " #: git-add--interactive.perl:1421 #, perl-format msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " msgstr "å°†åˆ é™¤åº”ç”¨åˆ°ç´¢å¼•å’Œå·¥ä½œåŒº [y,n,q,a,d%s,?]? " #: git-add--interactive.perl:1422 #, perl-format msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " msgstr "将该å—应用到索引和工作区 [y,n,q,a,d%s,?]? " #: git-add--interactive.perl:1522 msgid "No other hunks to goto\n" msgstr "没有其它å¯ä¾›è·³è½¬çš„å—\n" #: git-add--interactive.perl:1529 msgid "go to which hunk (<ret> to see more)? " msgstr "跳转到哪个å—(<回车> 查看更多)? " #: git-add--interactive.perl:1531 msgid "go to which hunk? " msgstr "跳转到哪个å—?" #: git-add--interactive.perl:1540 #, perl-format msgid "Invalid number: '%s'\n" msgstr "æ— æ•ˆæ•°å—:'%s'\n" #: git-add--interactive.perl:1545 #, perl-format msgid "Sorry, only %d hunk available.\n" msgid_plural "Sorry, only %d hunks available.\n" msgstr[0] "对ä¸èµ·ï¼Œåªæœ‰ %d 个å¯ç”¨å—。\n" msgstr[1] "对ä¸èµ·ï¼Œåªæœ‰ %d 个å¯ç”¨å—。\n" #: git-add--interactive.perl:1571 msgid "No other hunks to search\n" msgstr "没有其它å¯ä¾›æŸ¥æ‰¾çš„å—\n" #: git-add--interactive.perl:1575 msgid "search for regex? " msgstr "使用æ£åˆ™è¡¨è¾¾å¼æœç´¢ï¼Ÿ" #: git-add--interactive.perl:1588 #, perl-format msgid "Malformed search regexp %s: %s\n" msgstr "错误的æ£åˆ™è¡¨è¾¾å¼ %s:%s\n" #: git-add--interactive.perl:1598 msgid "No hunk matches the given pattern\n" msgstr "没有和给定模å¼ç›¸åŒ¹é…çš„å¿«\n" #: git-add--interactive.perl:1610 git-add--interactive.perl:1632 msgid "No previous hunk\n" msgstr "没有å‰ä¸€ä¸ªå—\n" #: git-add--interactive.perl:1619 git-add--interactive.perl:1638 msgid "No next hunk\n" msgstr "没有下一个å—\n" #: git-add--interactive.perl:1644 msgid "Sorry, cannot split this hunk\n" msgstr "对ä¸èµ·ï¼Œä¸èƒ½æ‹†åˆ†è¿™ä¸ªå—\n" #: git-add--interactive.perl:1650 #, perl-format msgid "Split into %d hunk.\n" msgid_plural "Split into %d hunks.\n" msgstr[0] "拆分为 %d å—。\n" msgstr[1] "拆分为 %d å—。\n" #: git-add--interactive.perl:1660 msgid "Sorry, cannot edit this hunk\n" msgstr "对ä¸èµ·ï¼Œä¸èƒ½ç¼–辑这个å—\n" #: git-add--interactive.perl:1706 msgid "Review diff" msgstr "检视 diff" #. TRANSLATORS: please do not translate the command names #. 'status', 'update', 'revert', etc. #: git-add--interactive.perl:1725 msgid "" "status - show paths with changes\n" "update - add working tree state to the staged set of changes\n" "revert - revert staged set of changes back to the HEAD version\n" "patch - pick hunks and update selectively\n" "diff - view diff between HEAD and index\n" "add untracked - add contents of untracked files to the staged set of " "changes\n" msgstr "" "status - 显示å«å˜æ›´çš„路径\n" "update - æ·»åŠ å·¥ä½œåŒºçŠ¶æ€è‡³æš‚å˜åˆ—表\n" "revert - 还原修改的暂å˜é›†è‡³ HEAD 版本\n" "patch - 挑选å—并且有选择地更新\n" "diff - 显示 HEAD 和索引间差异\n" "add untracked - æ·»åŠ æœªè·Ÿè¸ªæ–‡ä»¶çš„å†…å®¹è‡³æš‚å˜åˆ—表\n" #: git-add--interactive.perl:1742 git-add--interactive.perl:1747 #: git-add--interactive.perl:1750 git-add--interactive.perl:1757 #: git-add--interactive.perl:1761 git-add--interactive.perl:1767 msgid "missing --" msgstr "缺失 --" #: git-add--interactive.perl:1763 #, perl-format msgid "unknown --patch mode: %s" msgstr "未知的 --patch 模å¼ï¼š%s" #: git-add--interactive.perl:1769 git-add--interactive.perl:1775 #, perl-format msgid "invalid argument %s, expecting --" msgstr "æ— æ•ˆçš„å‚æ•° %s,期望是 --" #: git-send-email.perl:130 msgid "local zone differs from GMT by a non-minute interval\n" msgstr "本地时间和 GMT 有ä¸åˆ°ä¸€åˆ†é’Ÿé—´éš”\n" #: git-send-email.perl:137 git-send-email.perl:143 msgid "local time offset greater than or equal to 24 hours\n" msgstr "本地时间å移é‡å¤§äºŽç‰äºŽ 24 å°æ—¶\n" #: git-send-email.perl:211 git-send-email.perl:217 msgid "the editor exited uncleanly, aborting everything" msgstr "编辑器éžæ£å¸¸é€€å‡ºï¼Œç»ˆæ¢æ‰€æœ‰æ“作" #: git-send-email.perl:294 #, perl-format msgid "" "'%s' contains an intermediate version of the email you were composing.\n" msgstr "'%s' 包å«æ‚¨æ£åœ¨ç¼–写的一个ä¸é—´ç‰ˆæœ¬çš„邮件。\n" #: git-send-email.perl:299 #, perl-format msgid "'%s.final' contains the composed email.\n" msgstr "'%s.final' 包å«ç¼–辑的邮件。\n" #: git-send-email.perl:317 msgid "--dump-aliases incompatible with other options\n" msgstr "--dump-aliases 和其它选项ä¸å…¼å®¹\n" #: git-send-email.perl:383 git-send-email.perl:638 msgid "Cannot run git format-patch from outside a repository\n" msgstr "ä¸èƒ½åœ¨ä»“库之外è¿è¡Œ git format-patch\n" #: git-send-email.perl:386 msgid "" "`batch-size` and `relogin` must be specified together (via command-line or " "configuration option)\n" msgstr "`batch-size` å’Œ `relogin` å¿…é¡»åŒæ—¶å®šä¹‰ï¼ˆé€šè¿‡å‘½ä»¤è¡Œæˆ–者é…置选项)\n" #: git-send-email.perl:456 #, perl-format msgid "Unknown --suppress-cc field: '%s'\n" msgstr "未知的 --suppress-cc å—段:'%s'\n" #: git-send-email.perl:485 #, perl-format msgid "Unknown --confirm setting: '%s'\n" msgstr "未知的 --confirm 设置:'%s'\n" #: git-send-email.perl:513 #, perl-format msgid "warning: sendmail alias with quotes is not supported: %s\n" msgstr "è¦å‘Šï¼šä¸æ”¯æŒå¸¦å¼•å·çš„ sendmail 别å:%s\n" #: git-send-email.perl:515 #, perl-format msgid "warning: `:include:` not supported: %s\n" msgstr "è¦å‘Šï¼šä¸æ”¯æŒ `:include:`:%s\n" #: git-send-email.perl:517 #, perl-format msgid "warning: `/file` or `|pipe` redirection not supported: %s\n" msgstr "è¦å‘Šï¼šä¸æ”¯æŒ `/file` 或 `|pipe` é‡å®šå‘:%s\n" #: git-send-email.perl:522 #, perl-format msgid "warning: sendmail line is not recognized: %s\n" msgstr "è¦å‘Šï¼šä¸èƒ½è¯†åˆ«çš„ sendmail 行:%s\n" #: git-send-email.perl:604 #, perl-format msgid "" "File '%s' exists but it could also be the range of commits\n" "to produce patches for. Please disambiguate by...\n" "\n" " * Saying \"./%s\" if you mean a file; or\n" " * Giving --format-patch option if you mean a range.\n" msgstr "" "å˜åœ¨æ–‡ä»¶ '%s' 但是它也å¯èƒ½æ˜¯ä¸€ä¸ªç”¨äºŽäº§ç”Ÿè¡¥ä¸åˆ—表的æ交范围。请用如下方法消除" "æ§ä¹‰ï¼š\n" "\n" " * 如果å«ä¹‰ä¸ºä¸€ä¸ªæ–‡ä»¶ï¼Œä½¿ç”¨ \"./%s\",或者\n" " * 如果å«ä¹‰ä¸ºä¸€ä¸ªèŒƒå›´ï¼Œä½¿ç”¨ --format-patch 选项。\n" #: git-send-email.perl:625 #, perl-format msgid "Failed to opendir %s: %s" msgstr "æ— æ³•æ‰“å¼€ç›®å½• %s: %s" #: git-send-email.perl:649 #, perl-format msgid "" "fatal: %s: %s\n" "warning: no patches were sent\n" msgstr "" "严é‡ï¼š%s:%s\n" "è¦å‘Šï¼šè¡¥ä¸æœªèƒ½å‘é€\n" #: git-send-email.perl:660 msgid "" "\n" "No patch files specified!\n" "\n" msgstr "" "\n" "未指定补ä¸æ–‡ä»¶ï¼\n" "\n" #: git-send-email.perl:673 #, perl-format msgid "No subject line in %s?" msgstr "在 %s ä¸æ²¡æœ‰æ ‡é¢˜è¡Œï¼Ÿ" #: git-send-email.perl:683 #, perl-format msgid "Failed to open for writing %s: %s" msgstr "æ— æ³•å†™å…¥ %s: %s" #: git-send-email.perl:694 msgid "" "Lines beginning in \"GIT:\" will be removed.\n" "Consider including an overall diffstat or table of contents\n" "for the patch you are writing.\n" "\n" "Clear the body content if you don't wish to send a summary.\n" msgstr "" "以 \"GIT:\" å¼€å¤´çš„è¡Œå°†è¢«åˆ é™¤ã€‚\n" "考虑包å«ä¸€ä¸ªæ•´ä½“çš„ diffstat 或者您æ£åœ¨å†™çš„è¡¥ä¸çš„目录。\n" "\n" "如果您ä¸æƒ³å‘é€æ‘˜è¦ï¼Œæ¸…除内容。\n" #: git-send-email.perl:718 #, perl-format msgid "Failed to open %s: %s" msgstr "æ— æ³•æ‰“å¼€ %s: %s" #: git-send-email.perl:735 #, perl-format msgid "Failed to open %s.final: %s" msgstr "æ— æ³•æ‰“å¼€ %s.final: %s" #: git-send-email.perl:778 msgid "Summary email is empty, skipping it\n" msgstr "摘è¦é‚®ä»¶ä¸ºç©ºï¼Œè·³è¿‡\n" #. TRANSLATORS: please keep [y/N] as is. #: git-send-email.perl:813 #, perl-format msgid "Are you sure you want to use <%s> [y/N]? " msgstr "您确认è¦ä½¿ç”¨ <%s> [y/N]?" #: git-send-email.perl:868 msgid "" "The following files are 8bit, but do not declare a Content-Transfer-" "Encoding.\n" msgstr "å¦‚ä¸‹æ–‡ä»¶å« 8bit 内容,但没有声明一个 Content-Transfer-Encoding。\n" #: git-send-email.perl:873 msgid "Which 8bit encoding should I declare [UTF-8]? " msgstr "è¦å£°æ˜Ž 8bit ä¸ºä»€ä¹ˆæ ·çš„ç¼–ç æ ¼å¼ [UTF-8]?" #: git-send-email.perl:881 #, perl-format msgid "" "Refusing to send because the patch\n" "\t%s\n" "has the template subject '*** SUBJECT HERE ***'. Pass --force if you really " "want to send.\n" msgstr "" "æ‹’ç»å‘é€ï¼Œå› 为补ä¸\n" "\t%s\n" "包å«æ¨¡ç‰ˆæ ‡é¢˜ '*** SUBJECT HERE ***'。如果确实想è¦å‘é€ï¼Œä½¿ç”¨å‚æ•° --force。\n" #: git-send-email.perl:900 msgid "To whom should the emails be sent (if anyone)?" msgstr "邮件将è¦å‘é€ç»™è°ï¼Ÿ" #: git-send-email.perl:918 #, perl-format msgid "fatal: alias '%s' expands to itself\n" msgstr "严é‡ï¼šåˆ«å '%s' 扩展为它自己\n" #: git-send-email.perl:930 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? " msgstr "Message-ID 被用作第一å°é‚®ä»¶çš„ In-Reply-To ?" #: git-send-email.perl:988 git-send-email.perl:996 #, perl-format msgid "error: unable to extract a valid address from: %s\n" msgstr "错误:ä¸èƒ½ä»Ž %s ä¸æå–一个有效的邮件地å€\n" #. TRANSLATORS: Make sure to include [q] [d] [e] in your #. translation. The program will only accept English input #. at this point. #: git-send-email.perl:1000 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): " msgstr "如何处ç†è¿™ä¸ªåœ°å€ï¼Ÿ([q]uit|[d]rop|[e]dit):" #: git-send-email.perl:1317 #, perl-format msgid "CA path \"%s\" does not exist" msgstr "CA 路径 \"%s\" ä¸å˜åœ¨" #: git-send-email.perl:1400 msgid "" " The Cc list above has been expanded by additional\n" " addresses found in the patch commit message. By default\n" " send-email prompts before sending whenever this occurs.\n" " This behavior is controlled by the sendemail.confirm\n" " configuration setting.\n" "\n" " For additional information, run 'git send-email --help'.\n" " To retain the current behavior, but squelch this message,\n" " run 'git config --global sendemail.confirm auto'.\n" "\n" msgstr "" " 以上的抄é€åˆ—表(Cc)已ç»ç”¨è¡¥ä¸æ交信æ¯ä¸å‘现的地å€è¿›è¡Œ\n" " äº†æ‰©å±•ã€‚ç¼ºçœ send-email 会给出æ示。这个行为å¯ä»¥é€šè¿‡\n" " sendemail.confirm é…置设置。\n" "\n" " 更多信æ¯ï¼Œæ‰§è¡Œ 'git send-email --help'。\n" " è¦ä¿æŒå½“å‰è¡Œä¸ºï¼Œä½†ä¸æ˜¾ç¤ºæ¤ä¿¡æ¯ï¼Œè¿è¡Œ 'git config --global\n" " sendemail.confirm auto'。\n" "\n" #. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your #. translation. The program will only accept English input #. at this point. #: git-send-email.perl:1415 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): " msgstr "å‘é€è¿™å°é‚®ä»¶ï¼Ÿ([y]es|[n]o|[e]dit|[q]uit|[a]ll): " #: git-send-email.perl:1418 msgid "Send this email reply required" msgstr "å‘é€è¦æ±‚的邮件回å¤" #: git-send-email.perl:1446 msgid "The required SMTP server is not properly defined." msgstr "è¦æ±‚çš„ SMTP æœåŠ¡å™¨æœªè¢«æ£ç¡®å®šä¹‰ã€‚" #: git-send-email.perl:1493 #, perl-format msgid "Server does not support STARTTLS! %s" msgstr "æœåŠ¡å™¨ä¸æ”¯æŒ STARTTLSï¼%s" #: git-send-email.perl:1498 git-send-email.perl:1502 #, perl-format msgid "STARTTLS failed! %s" msgstr "STARTTLS 失败ï¼%s" #: git-send-email.perl:1512 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug." msgstr "æ— æ³•æ£ç¡®åœ°åˆå§‹åŒ– SMTP。检查é…置并使用 --smtp-debug。" #: git-send-email.perl:1530 #, perl-format msgid "Failed to send %s\n" msgstr "æ— æ³•å‘é€ %s\n" #: git-send-email.perl:1533 #, perl-format msgid "Dry-Sent %s\n" msgstr "æ¼”ä¹ å‘é€ %s\n" #: git-send-email.perl:1533 #, perl-format msgid "Sent %s\n" msgstr "æ£å‘é€ %s\n" #: git-send-email.perl:1535 msgid "Dry-OK. Log says:\n" msgstr "æ¼”ä¹ æˆåŠŸã€‚日志说:\n" #: git-send-email.perl:1535 msgid "OK. Log says:\n" msgstr "OK。日志说:\n" #: git-send-email.perl:1547 msgid "Result: " msgstr "结果:" #: git-send-email.perl:1550 msgid "Result: OK\n" msgstr "结果:OK\n" #: git-send-email.perl:1568 #, perl-format msgid "can't open file %s" msgstr "æ— æ³•æ‰“å¼€æ–‡ä»¶ %s" #: git-send-email.perl:1615 git-send-email.perl:1635 #, perl-format msgid "(mbox) Adding cc: %s from line '%s'\n" msgstr "(mbox) æ·»åŠ cc:%s 自行 '%s'\n" #: git-send-email.perl:1621 #, perl-format msgid "(mbox) Adding to: %s from line '%s'\n" msgstr "(mbox) æ·»åŠ to:%s 自行 '%s'\n" #: git-send-email.perl:1674 #, perl-format msgid "(non-mbox) Adding cc: %s from line '%s'\n" msgstr "(non-mbox) æ·»åŠ cc:%s 自行 '%s'\n" #: git-send-email.perl:1699 #, perl-format msgid "(body) Adding cc: %s from line '%s'\n" msgstr "(body) æ·»åŠ cc: %s 自行 '%s'\n" #: git-send-email.perl:1817 #, perl-format msgid "(%s) Could not execute '%s'" msgstr "(%s) ä¸èƒ½æ‰§è¡Œ '%s'" #: git-send-email.perl:1824 #, perl-format msgid "(%s) Adding %s: %s from: '%s'\n" msgstr "(%s) æ·»åŠ %s: %s 自:'%s'\n" #: git-send-email.perl:1828 #, perl-format msgid "(%s) failed to close pipe to '%s'" msgstr "(%s) æ— æ³•å…³é—管é“至 '%s'" #: git-send-email.perl:1855 msgid "cannot send message as 7bit" msgstr "ä¸èƒ½ä»¥ 7bit å½¢å¼å‘é€ä¿¡æ¯" #: git-send-email.perl:1863 msgid "invalid transfer encoding" msgstr "æ— æ•ˆçš„ä¼ é€ç¼–ç " #: git-send-email.perl:1901 git-send-email.perl:1952 git-send-email.perl:1962 #, perl-format msgid "unable to open %s: %s\n" msgstr "ä¸èƒ½æ‰“å¼€ %s:%s\n" #: git-send-email.perl:1904 #, perl-format msgid "%s: patch contains a line longer than 998 characters" msgstr "%s:补ä¸åŒ…å«ä¸€ä¸ªè¶…过 998 å—符的行" #: git-send-email.perl:1920 #, perl-format msgid "Skipping %s with backup suffix '%s'.\n" msgstr "略过 %s å«å¤‡ä»½åŽç¼€ '%s'。\n" #. TRANSLATORS: please keep "[y|N]" as is. #: git-send-email.perl:1924 #, perl-format msgid "Do you really want to send %s? [y|N]: " msgstr "您真的è¦å‘é€ %s?[y|N]:" #~ msgid "Everyday Git With 20 Commands Or So" #~ msgstr "æ¯ä¸€å¤© Git 常用的约 20 æ¡å‘½ä»¤" #~ msgid "Could not open '%s' for writing" #~ msgstr "æ— æ³•æ‰“å¼€ '%s' 进行写入" #~ msgid "BUG: returned path string doesn't match cwd?" #~ msgstr "BUG:返回的路径和当å‰è·¯å¾„ä¸åŒ¹é…?" #~ msgid "Error in object" #~ msgstr "对象ä¸å‡ºé”™" #~ msgid "" #~ "unexpected 1st line of squash message:\n" #~ "\n" #~ "\t%.*s" #~ msgstr "" #~ "æ„外的压缩æ交首行æ交信æ¯ï¼š\n" #~ "\n" #~ "\t%.*s" #~ msgid "" #~ "invalid 1st line of squash message:\n" #~ "\n" #~ "\t%.*s" #~ msgstr "" #~ "压缩æ交的首行æ交信æ¯æ— 效:\n" #~ "\n" #~ "\t%.*s" #~ msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n" #~ msgstr "To/Cc/Bcc å—段ä¸è§£æžï¼Œå®ƒä»¬è¢«å¿½ç•¥\n" #~ msgid "git fetch-pack: expected ACK/NAK, got EOF" #~ msgstr "git fetch-pack:应为 ACK/NAK,å´å¾—到 EOF" #~ msgid "The copy of the patch that failed is found in: %s" #~ msgstr "失败的补ä¸æ–‡ä»¶å‰¯æœ¬ä½äºŽï¼š%s" #~ msgid "invalid filter-spec expression '%s'" #~ msgstr "æ— æ•ˆçš„ filter-spec è¡¨è¾¾å¼ '%s'" #~ msgid "pathspec and --all are incompatible" #~ msgstr "pathspec å’Œ --all ä¸å…¼å®¹" #~ msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" #~ msgstr "å模组 '$name' ($url) 未对路径 '$displaypath' 注册" #~ msgid "" #~ "empty strings as pathspecs will be made invalid in upcoming releases. " #~ "please use . instead if you meant to match all paths" #~ msgstr "" #~ "在下一个版本ä¸ï¼Œä½¿ç”¨ç©ºå—ç¬¦ä¸²ä½œä¸ºè·¯å¾„è§„æ ¼å°†è¢«è§†ä½œéžæ³•ã€‚如果è¦åŒ¹é…所有路" #~ "径,\n" #~ "请代之以 ." #~ msgid "unable to open '%s' for writing" #~ msgstr "æ— æ³•ä»¥å†™å…¥æ–¹å¼æ‰“å¼€ '%s'" #~ msgid "could not truncate '%s'" #~ msgstr "æ— æ³•æˆªæ– '%s'" #~ msgid "could not finish '%s'" #~ msgstr "æ— æ³•ç»“æŸ '%s'" #~ msgid "could not close %s" #~ msgstr "ä¸èƒ½å…³é— %s" #~ msgid "Copied a misnamed branch '%s' away" #~ msgstr "已将错误命å的分支 '%s' å¤åˆ¶" #~ msgid "it does not make sense to create 'HEAD' manually" #~ msgstr "手工创建 'HEAD' 没有æ„义" #~ msgid "Don't know how to clone %s" #~ msgstr "ä¸çŸ¥é“如何克隆 %s" #~ msgid "show ignored files" #~ msgstr "显示忽略的文件" #~ msgid "%s is not a valid '%s' object" #~ msgstr "%s ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„ '%s' 对象" #~ msgid "Don't know how to fetch from %s" #~ msgstr "ä¸çŸ¥é“如何从 %s 获å–" #~ msgid "'$term' is not a valid term" #~ msgstr "'$term' ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„å称" #~ 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'" #~ msgid "Failed to recurse into submodule path '$sm_path'" #~ msgstr "æ— æ³•é€’å½’è¿›å模组路径 '$sm_path'"