# 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: # - 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> # - 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 上层å°è£…命令的别称) # 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 | 跟踪 # 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: 2015-09-15 06:45+0800\n" "PO-Revision-Date: 2015-09-15 21:49+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:55 #, c-format msgid "hint: %.*s\n" msgstr "æ示:%.*s\n" #: advice.c:88 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:101 builtin/merge.c:1227 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "您尚未结æŸæ‚¨çš„åˆå¹¶ï¼ˆå˜åœ¨ MERGE_HEAD)。" #: advice.c:103 msgid "Please, commit your changes before you can merge." msgstr "请在åˆå¹¶å‰å…ˆæ交您的修改。" #: advice.c:104 msgid "Exiting because of unfinished merge." msgstr "å› ä¸ºå˜åœ¨æœªå®Œæˆçš„åˆå¹¶è€Œé€€å‡ºã€‚" #: archive.c:12 msgid "git archive [<options>] <tree-ish> [<path>...]" msgstr "git archive [<选项>] <æ ‘æˆ–æ交> [<路径>...]" #: archive.c:13 msgid "git archive --list" msgstr "git archive --list" #: archive.c:14 msgid "" "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]" msgstr "" "git archive --remote <仓库> [--exec <命令>] [<选项>] <æ ‘æˆ–æ交> [<路径>...]" #: archive.c:15 msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <仓库> [--exec <命令>] --list" #: archive.c:343 builtin/add.c:137 builtin/add.c:426 builtin/rm.c:327 #, c-format msgid "pathspec '%s' did not match any files" msgstr "è·¯å¾„è§„æ ¼ '%s' 未匹é…任何文件" #: archive.c:428 msgid "fmt" msgstr "æ ¼å¼" #: archive.c:428 msgid "archive format" msgstr "å½’æ¡£æ ¼å¼" #: archive.c:429 builtin/log.c:1229 msgid "prefix" msgstr "å‰ç¼€" #: archive.c:430 msgid "prepend prefix to each pathname in the archive" msgstr "为归档ä¸æ¯ä¸ªè·¯å¾„ååŠ ä¸Šå‰ç¼€" #: archive.c:431 builtin/archive.c:88 builtin/blame.c:2516 #: builtin/blame.c:2517 builtin/config.c:58 builtin/fast-export.c:987 #: builtin/fast-export.c:989 builtin/grep.c:712 builtin/hash-object.c:99 #: builtin/ls-files.c:446 builtin/ls-files.c:449 builtin/notes.c:395 #: builtin/notes.c:558 builtin/read-tree.c:109 parse-options.h:153 msgid "file" msgstr "文件" #: archive.c:432 builtin/archive.c:89 msgid "write the archive to this file" msgstr "归档写入æ¤æ–‡ä»¶" #: archive.c:434 msgid "read .gitattributes in working directory" msgstr "读å–工作区ä¸çš„ .gitattributes" #: archive.c:435 msgid "report archived files on stderr" msgstr "åœ¨æ ‡å‡†é”™è¯¯ä¸ŠæŠ¥å‘Šå½’æ¡£æ–‡ä»¶" #: archive.c:436 msgid "store only" msgstr "åªå˜å‚¨" #: archive.c:437 msgid "compress faster" msgstr "压缩速度更快" #: archive.c:445 msgid "compress better" msgstr "压缩效果更好" #: archive.c:448 msgid "list supported archive formats" msgstr "列出支æŒçš„å½’æ¡£æ ¼å¼" #: archive.c:450 builtin/archive.c:90 builtin/clone.c:77 msgid "repo" msgstr "仓库" #: archive.c:451 builtin/archive.c:91 msgid "retrieve the archive from remote repository <repo>" msgstr "从远程仓库(<仓库>)æå–归档文件" #: archive.c:452 builtin/archive.c:92 builtin/notes.c:479 msgid "command" msgstr "命令" #: archive.c:453 builtin/archive.c:93 msgid "path to the remote git-upload-archive command" msgstr "远程 git-upload-archive 命令的路径" #: attr.c:265 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." msgstr "" "负值模版在 git attributes ä¸è¢«å¿½ç•¥\n" "当å—符串确实è¦ä»¥æ„Ÿå¹å·å¼€å§‹æ—¶ï¼Œä½¿ç”¨ '\\!'。" #: branch.c:60 #, c-format msgid "Not setting branch %s as its own upstream." msgstr "未设置分支 %s 作为它自己的上游。" #: branch.c:83 #, 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:84 #, c-format msgid "Branch %s set up to track remote branch %s from %s." msgstr "分支 %1$s 设置为跟踪æ¥è‡ª %3$s 的远程分支 %2$s。" #: branch.c:88 #, c-format msgid "Branch %s set up to track local branch %s by rebasing." msgstr "分支 %s 设置为使用å˜åŸºæ¥è·Ÿè¸ªæœ¬åœ°åˆ†æ”¯ %s。" #: branch.c:89 #, c-format msgid "Branch %s set up to track local branch %s." msgstr "分支 %s 设置为跟踪本地分支 %s。" #: branch.c:94 #, c-format msgid "Branch %s set up to track remote ref %s by rebasing." msgstr "分支 %s 设置为使用å˜åŸºæ¥è·Ÿè¸ªè¿œç¨‹å¼•ç”¨ %s。" #: branch.c:95 #, c-format msgid "Branch %s set up to track remote ref %s." msgstr "分支 %s 设置为跟踪远程引用 %s。" #: branch.c:99 #, c-format msgid "Branch %s set up to track local ref %s by rebasing." msgstr "分支 %s 设置为使用å˜åŸºæ¥è·Ÿè¸ªæœ¬åœ°å¼•ç”¨ %s。" #: branch.c:100 #, c-format msgid "Branch %s set up to track local ref %s." msgstr "分支 %s 设置为跟踪本地引用 %s。" #: branch.c:133 #, c-format msgid "Not tracking: ambiguous information for ref %s" msgstr "未跟踪:引用 %s 有æ§ä¹‰" #: branch.c:162 #, c-format msgid "'%s' is not a valid branch name." msgstr "'%s' ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„分支å称。" #: branch.c:167 #, c-format msgid "A branch named '%s' already exists." msgstr "一个分支å '%s' å·²ç»å˜åœ¨ã€‚" #: branch.c:175 msgid "Cannot force update the current branch." msgstr "æ— æ³•å¼ºåˆ¶æ›´æ–°å½“å‰åˆ†æ”¯ã€‚" #: branch.c:195 #, c-format msgid "Cannot setup tracking information; starting point '%s' is not a branch." msgstr "æ— æ³•è®¾ç½®è·Ÿè¸ªä¿¡æ¯ï¼›èµ·å§‹ç‚¹ '%s' ä¸æ˜¯ä¸€ä¸ªåˆ†æ”¯ã€‚" #: branch.c:197 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "请求的上游分支 '%s' ä¸å˜åœ¨" #: branch.c:199 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:243 #, c-format msgid "Not a valid object name: '%s'." msgstr "ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„对象å:'%s'。" #: branch.c:263 #, c-format msgid "Ambiguous object name: '%s'." msgstr "æ§ä¹‰çš„对象å:'%s'。" #: branch.c:268 #, c-format msgid "Not a valid branch point: '%s'." msgstr "æ— æ•ˆçš„åˆ†æ”¯ç‚¹ï¼š'%s'。" #: branch.c:399 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "'%s' å·²ç»æ£€å‡ºåˆ° '%s'" #: bundle.c:34 #, c-format msgid "'%s' does not look like a v2 bundle file" msgstr "'%s' ä¸åƒæ˜¯ä¸€ä¸ª v2 版本的包文件" #: bundle.c:61 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "未能识别的包头:%s%s (%d)" #: bundle.c:87 builtin/commit.c:765 #, c-format msgid "could not open '%s'" msgstr "ä¸èƒ½æ‰“å¼€ '%s'" #: bundle.c:139 msgid "Repository lacks these prerequisite commits:" msgstr "仓库ä¸ç¼ºå°‘这些必备的æ交:" #: bundle.c:163 sequencer.c:636 sequencer.c:1083 builtin/blame.c:2708 #: builtin/branch.c:652 builtin/commit.c:1044 builtin/log.c:334 #: builtin/log.c:850 builtin/log.c:1457 builtin/log.c:1690 builtin/merge.c:358 #: builtin/shortlog.c:158 msgid "revision walk setup failed" msgstr "版本é历设置失败" #: bundle.c:185 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "这个包ä¸å«æœ‰è¿™ä¸ªå¼•ç”¨ï¼š" msgstr[1] "这个包ä¸å«æœ‰ %d 个引用:" #: bundle.c:192 msgid "The bundle records a complete history." msgstr "这个包记录一个完整历å²ã€‚" #: bundle.c:194 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "这个包需è¦è¿™ä¸ªå¼•ç”¨ï¼š" msgstr[1] "è¿™ä¸ªåŒ…éœ€è¦ %d 个引用:" #: bundle.c:253 msgid "Could not spawn pack-objects" msgstr "ä¸èƒ½ç”Ÿæˆ pack-objects 进程" #: bundle.c:264 msgid "pack-objects died" msgstr "pack-objects 终æ¢" #: bundle.c:304 msgid "rev-list died" msgstr "rev-list 终æ¢" #: bundle.c:353 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "引用 '%s' 被 rev-list 选项排除" #: bundle.c:443 builtin/log.c:157 builtin/log.c:1367 builtin/shortlog.c:261 #, c-format msgid "unrecognized argument: %s" msgstr "未能识别的å‚数:%s" #: bundle.c:449 msgid "Refusing to create empty bundle." msgstr "ä¸èƒ½åˆ›å»ºç©ºåŒ…。" #: bundle.c:459 #, c-format msgid "cannot create '%s'" msgstr "ä¸èƒ½åˆ›å»º '%s'" #: bundle.c:480 msgid "index-pack died" msgstr "index-pack 终æ¢" #: color.c:260 #, c-format msgid "invalid color value: %.*s" msgstr "æ— æ•ˆçš„é¢œè‰²å€¼ï¼š%.*s" #: commit.c:40 builtin/am.c:451 builtin/am.c:487 builtin/am.c:1516 #: builtin/am.c:2128 #, c-format msgid "could not parse %s" msgstr "ä¸èƒ½è§£æž %s" #: commit.c:42 #, c-format msgid "%s %s is not a commit!" msgstr "%s %s ä¸æ˜¯ä¸€ä¸ªæ交!" #: compat/obstack.c:406 compat/obstack.c:408 msgid "memory exhausted" msgstr "内å˜è€—å°½" #: config.c:474 config.c:476 #, c-format msgid "bad config file line %d in %s" msgstr "é…置文件 %2$s 出错于第 %1$d è¡Œ" #: config.c:592 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "文件 %3$s ä¸é…ç½®å˜é‡ '%2$s' çš„æ•°å—å–值 '%1$s' 设置错误: %4$s" #: config.c:594 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "é…ç½®å˜é‡ '%2$s' çš„æ•°å—å–值 '%1$s' 设置错误: %3$s" #: config.c:679 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "æ— æ³•æ‰©å±• '%s' ä¸çš„用户目录" #: config.c:757 config.c:768 #, c-format msgid "bad zlib compression level %d" msgstr "错误的 zlib 压缩级别 %d" #: config.c:890 #, c-format msgid "invalid mode for object creation: %s" msgstr "æ— æ•ˆçš„å¯¹è±¡åˆ›å»ºæ¨¡å¼ï¼š%s" #: config.c:1216 msgid "unable to parse command-line config" msgstr "æ— æ³•è§£æžå‘½ä»¤è¡Œä¸çš„é…ç½®" #: config.c:1277 msgid "unknown error occured while reading the configuration files" msgstr "在读å–é…置文件时é‡åˆ°æœªçŸ¥é”™è¯¯" #: config.c:1601 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "æ— æ³•è§£æžå‘½ä»¤è¡Œé…ç½®ä¸çš„ '%s'" #: config.c:1603 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "在文件 '%2$s' 的第 %3$d è¡Œå‘现错误的é…ç½®å˜é‡ '%1$s'" #: config.c:1662 #, c-format msgid "%s has multiple values" msgstr "%s 有多个å–值" #: connected.c:69 msgid "Could not run 'git rev-list'" msgstr "ä¸èƒ½æ‰§è¡Œ 'git rev-list'" #: connected.c:89 #, c-format msgid "failed write to rev-list: %s" msgstr "æ— æ³•å†™å…¥ rev-list:%s" #: connected.c:97 #, c-format msgid "failed to close rev-list's stdin: %s" msgstr "æ— æ³•å…³é— rev-list çš„æ ‡å‡†è¾“å…¥ï¼š%s" #: date.c:95 msgid "in the future" msgstr "在将æ¥" #: date.c:101 #, c-format msgid "%lu second ago" msgid_plural "%lu seconds ago" msgstr[0] "%lu 秒钟å‰" msgstr[1] "%lu 秒钟å‰" #: date.c:108 #, c-format msgid "%lu minute ago" msgid_plural "%lu minutes ago" msgstr[0] "%lu 分钟å‰" msgstr[1] "%lu 分钟å‰" #: date.c:115 #, c-format msgid "%lu hour ago" msgid_plural "%lu hours ago" msgstr[0] "%lu å°æ—¶å‰" msgstr[1] "%lu å°æ—¶å‰" #: date.c:122 #, c-format msgid "%lu day ago" msgid_plural "%lu days ago" msgstr[0] "%lu 天å‰" msgstr[1] "%lu 天å‰" #: date.c:128 #, c-format msgid "%lu week ago" msgid_plural "%lu weeks ago" msgstr[0] "%lu 周å‰" msgstr[1] "%lu 周å‰" #: date.c:135 #, c-format msgid "%lu month ago" msgid_plural "%lu months ago" msgstr[0] "%lu 个月å‰" msgstr[1] "%lu 个月å‰" #: date.c:146 #, c-format msgid "%lu year" msgid_plural "%lu years" msgstr[0] "%lu å¹´" msgstr[1] "%lu å¹´" #. TRANSLATORS: "%s" is "<n> years" #: date.c:149 #, c-format msgid "%s, %lu month ago" msgid_plural "%s, %lu months ago" msgstr[0] "%s %lu 个月å‰" msgstr[1] "%s %lu 个月å‰" #: date.c:154 date.c:159 #, c-format msgid "%lu year ago" msgid_plural "%lu years ago" msgstr[0] "%lu å¹´å‰" msgstr[1] "%lu å¹´å‰" #: diffcore-order.c:24 #, c-format msgid "failed to read orderfile '%s'" msgstr "æ— æ³•è¯»å–排åºæ–‡ä»¶ '%s'" #: diffcore-rename.c:536 msgid "Performing inexact rename detection" msgstr "æ£åœ¨è¿›è¡Œéžç²¾ç¡®çš„é‡å‘½å检测" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: diff.c:116 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr " æ— æ³•è§£æž dirstat 截æ¢ï¼ˆcut-off)百分比 '%s'\n" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: diff.c:121 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " 未知的 dirstat å‚æ•° '%s'\n" #: diff.c:216 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "é…ç½®å˜é‡ 'diff.submodule' 未知的å–值:'%s'" #: diff.c:268 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" "%s" msgstr "" "å‘现é…ç½®å˜é‡ 'diff.dirstat' ä¸çš„错误:\n" "%s" #: diff.c:2998 #, c-format msgid "external diff died, stopping at %s" msgstr "外部 diff 退出,åœæ¢åœ¨ %s" #: diff.c:3394 msgid "--follow requires exactly one pathspec" msgstr "--follow å‚æ•°åŽåªè·Ÿä¸€ä¸ª pathspec" #: diff.c:3557 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" "%s" msgstr "" "æ— æ³•è§£æž --dirstat/-X 选项的å‚数:\n" "%s" #: diff.c:3571 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "æ— æ³•è§£æž --submodule 选项的å‚数:'%s'" #: dir.c:1853 msgid "failed to get kernel name and information" msgstr "æ— æ³•èŽ·å¾—å†…æ ¸å称和信æ¯" #: dir.c:1936 msgid "Untracked cache is disabled on this system." msgstr "缓å˜æœªè·Ÿè¸ªæ–‡ä»¶åœ¨æœ¬ç³»ç»Ÿè¢«ç¦ç”¨" #: gpg-interface.c:166 gpg-interface.c:237 msgid "could not run gpg." msgstr "ä¸èƒ½æ‰§è¡Œ gpg。" #: gpg-interface.c:178 msgid "gpg did not accept the data" msgstr "gpg 没有接å—æ•°æ®" #: gpg-interface.c:189 msgid "gpg failed to sign the data" msgstr "gpg æ— æ³•ä¸ºæ•°æ®ç¾å" #: gpg-interface.c:222 #, c-format msgid "could not create temporary file '%s': %s" msgstr "ä¸èƒ½åˆ›å»ºä¸´æ—¶æ–‡ä»¶ '%s':%s" #: gpg-interface.c:225 #, c-format msgid "failed writing detached signature to '%s': %s" msgstr "æ— æ³•å°†åˆ†ç¦»å¼ç¾å写入 '%s':%s" #: grep.c:1718 #, c-format msgid "'%s': unable to read %s" msgstr "'%s'ï¼šæ— æ³•è¯»å– %s" #: grep.c:1735 #, c-format msgid "'%s': %s" msgstr "'%s':%s" #: grep.c:1746 #, c-format msgid "'%s': short read %s" msgstr "'%s':读å–ä¸å®Œæ•´ %s" #: help.c:207 #, c-format msgid "available git commands in '%s'" msgstr "在 '%s' 下å¯ç”¨çš„ git 命令" #: help.c:214 msgid "git commands available from elsewhere on your $PATH" msgstr "在 $PATH 路径ä¸çš„其他地方å¯ç”¨çš„ git 命令" #: help.c:246 msgid "These are common Git commands used in various situations:" msgstr "这些是å„ç§åœºåˆå¸¸è§çš„ Git 命令:" #: help.c:311 #, 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:368 msgid "Uh oh. Your system reports no Git commands at all." msgstr "唉呀,您的系统ä¸æœªå‘现 Git 命令。" #: help.c:390 #, c-format msgid "" "WARNING: You called a Git command named '%s', which does not exist.\n" "Continuing under the assumption that you meant '%s'" msgstr "" "è¦å‘Šï¼šæ‚¨è¿è¡Œä¸€ä¸ªä¸å˜åœ¨çš„ Git 命令 '%s'。继ç»æ‰§è¡Œå‡å®šæ‚¨è¦è¦è¿è¡Œçš„\n" "是 '%s'" #: help.c:395 #, c-format msgid "in %0.1f seconds automatically..." msgstr "在 %0.1f 秒钟åŽè‡ªåŠ¨è¿è¡Œ..." #: help.c:402 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git:'%s' ä¸æ˜¯ä¸€ä¸ª git 命令。å‚è§ 'git --help'。" #: help.c:406 help.c:466 msgid "" "\n" "Did you mean this?" msgid_plural "" "\n" "Did you mean one of these?" msgstr[0] "" "\n" "您指的是这个么?" msgstr[1] "" "\n" "您指的是这其ä¸çš„æŸä¸€ä¸ªä¹ˆï¼Ÿ" #: help.c:462 #, c-format msgid "%s: %s - %s" msgstr "%s:%s - %s" #: merge.c:41 msgid "failed to read the cache" msgstr "æ— æ³•è¯»å–缓å˜" #: merge.c:94 builtin/am.c:2001 builtin/am.c:2036 builtin/checkout.c:375 #: builtin/checkout.c:586 builtin/clone.c:715 msgid "unable to write new index file" msgstr "æ— æ³•å†™æ–°çš„ç´¢å¼•æ–‡ä»¶" #: merge-recursive.c:189 #, c-format msgid "(bad commit)\n" msgstr "(åæ交)\n" #: merge-recursive.c:209 #, c-format msgid "addinfo_cache failed for path '%s'" msgstr "为路径 '%s' addinfo_cache 失败" #: merge-recursive.c:270 msgid "error building trees" msgstr "æ— æ³•åˆ›å»ºæ ‘" #: merge-recursive.c:687 #, c-format msgid "failed to create path '%s'%s" msgstr "æ— æ³•åˆ›å»ºè·¯å¾„ '%s'%s" #: merge-recursive.c:698 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "åˆ é™¤ %s 以便为å目录留出空间\n" #: merge-recursive.c:712 merge-recursive.c:733 msgid ": perhaps a D/F conflict?" msgstr ":å¯èƒ½æ˜¯ä¸€ä¸ªç›®å½•/文件冲çªï¼Ÿ" #: merge-recursive.c:723 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "æ‹’ç»ä¸¢å¼ƒ '%s' ä¸çš„未跟踪文件" #: merge-recursive.c:763 #, c-format msgid "cannot read object %s '%s'" msgstr "ä¸èƒ½è¯»å–对象 %s '%s'" #: merge-recursive.c:765 #, c-format msgid "blob expected for %s '%s'" msgstr "%s '%s' 应为数æ®å¯¹è±¡" #: merge-recursive.c:788 builtin/clone.c:364 #, c-format msgid "failed to open '%s'" msgstr "æ— æ³•æ‰“å¼€ '%s'" #: merge-recursive.c:796 #, c-format msgid "failed to symlink '%s'" msgstr "æ— æ³•åˆ›å»ºç¬¦å·é“¾æŽ¥ '%s'" #: merge-recursive.c:799 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "ä¸çŸ¥é“å¦‚ä½•å¤„ç† %06o %s '%s'" #: merge-recursive.c:937 msgid "Failed to execute internal merge" msgstr "æ— æ³•æ‰§è¡Œå†…éƒ¨åˆå¹¶" #: merge-recursive.c:941 #, c-format msgid "Unable to add %s to database" msgstr "ä¸èƒ½æ·»åŠ %s 至对象库" #: merge-recursive.c:957 msgid "unsupported object type in the tree" msgstr "åœ¨æ ‘ä¸æœ‰ä¸æ”¯æŒçš„对象类型" #: merge-recursive.c:1032 merge-recursive.c:1046 #, 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:1038 merge-recursive.c:1051 #, 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:1092 msgid "rename" msgstr "é‡å‘½å" #: merge-recursive.c:1092 msgid "renamed" msgstr "é‡å‘½å" #: merge-recursive.c:1148 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s 是 %s ä¸çš„一个目录而以 %s 为åè¢«æ·»åŠ " #: merge-recursive.c:1170 #, 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:1175 msgid " (left unresolved)" msgstr "(留下未解决)" #: merge-recursive.c:1229 #, 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:1259 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "而是é‡å‘½å %s 至 %sï¼Œä»¥åŠ %s 至 %s" #: merge-recursive.c:1458 #, 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:1468 #, c-format msgid "Adding merged %s" msgstr "æ·»åŠ åˆå¹¶åŽçš„ %s" #: merge-recursive.c:1473 merge-recursive.c:1671 #, c-format msgid "Adding as %s instead" msgstr "而是以 %s 为åæ·»åŠ " #: merge-recursive.c:1524 #, c-format msgid "cannot read object %s" msgstr "ä¸èƒ½è¯»å–对象 %s" #: merge-recursive.c:1527 #, c-format msgid "object %s is not a blob" msgstr "对象 %s ä¸æ˜¯ä¸€ä¸ªæ•°æ®å¯¹è±¡" #: merge-recursive.c:1575 msgid "modify" msgstr "修改" #: merge-recursive.c:1575 msgid "modified" msgstr "修改" #: merge-recursive.c:1585 msgid "content" msgstr "内容" #: merge-recursive.c:1592 msgid "add/add" msgstr "æ·»åŠ /æ·»åŠ " #: merge-recursive.c:1626 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "略过 %s(已ç»åšè¿‡ç›¸åŒåˆå¹¶ï¼‰" #: merge-recursive.c:1640 #, c-format msgid "Auto-merging %s" msgstr "自动åˆå¹¶ %s" #: merge-recursive.c:1644 git-submodule.sh:1150 msgid "submodule" msgstr "å模组" #: merge-recursive.c:1645 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "冲çªï¼ˆ%s):åˆå¹¶å†²çªäºŽ %s" #: merge-recursive.c:1731 #, c-format msgid "Removing %s" msgstr "åˆ é™¤ %s" #: merge-recursive.c:1756 msgid "file/directory" msgstr "文件/目录" #: merge-recursive.c:1762 msgid "directory/file" msgstr "目录/文件" #: merge-recursive.c:1767 #, 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:1777 #, c-format msgid "Adding %s" msgstr "æ·»åŠ %s" #: merge-recursive.c:1794 msgid "Fatal merge failure, shouldn't happen." msgstr "严é‡çš„åˆå¹¶é”™è¯¯ï¼Œä¸åº”å‘生。" #: merge-recursive.c:1813 msgid "Already up-to-date!" msgstr "å·²ç»æ˜¯æœ€æ–°çš„ï¼" #: merge-recursive.c:1822 #, c-format msgid "merging of trees %s and %s failed" msgstr "æ— æ³•åˆå¹¶æ ‘ %s å’Œ %s" #: merge-recursive.c:1852 #, c-format msgid "Unprocessed path??? %s" msgstr "未处ç†çš„路径??? %s" #: merge-recursive.c:1900 msgid "Merging:" msgstr "åˆå¹¶ï¼š" #: merge-recursive.c:1913 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "å‘现 %u 个共åŒç¥–先:" msgstr[1] "å‘现 %u 个共åŒç¥–先:" #: merge-recursive.c:1950 msgid "merge returned no commit" msgstr "åˆå¹¶æœªè¿”回æ交" #: merge-recursive.c:2007 #, c-format msgid "Could not parse object '%s'" msgstr "ä¸èƒ½è§£æžå¯¹è±¡ '%s'" #: merge-recursive.c:2018 builtin/merge.c:645 msgid "Unable to write index." msgstr "ä¸èƒ½å†™å…¥ç´¢å¼•ã€‚" #: notes-utils.c:41 msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "ä¸èƒ½æ交未åˆå§‹åŒ–/æœªå¼•ç”¨çš„æ³¨è§£æ ‘" #: notes-utils.c:100 #, c-format msgid "Bad notes.rewriteMode value: '%s'" msgstr "åçš„ notes.rewriteMode 值:'%s'" #: notes-utils.c:110 #, 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:137 #, c-format msgid "Bad %s value: '%s'" msgstr "åçš„ %s 值:'%s'" #: object.c:242 #, c-format msgid "unable to parse object: %s" msgstr "ä¸èƒ½è§£æžå¯¹è±¡ï¼š%s" #: parse-options.c:563 msgid "..." msgstr "..." #: parse-options.c:581 #, c-format msgid "usage: %s" msgstr "用法:%s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation #: parse-options.c:585 #, c-format msgid " or: %s" msgstr " 或:%s" # 译者:为ä¿è¯åœ¨è¾“出ä¸å¯¹é½ï¼Œæ³¨æ„调整å¥ä¸ç©ºæ ¼ï¼ #: parse-options.c:588 #, c-format msgid " %s" msgstr " %s" #: parse-options.c:622 msgid "-NUM" msgstr "-æ•°å—" #: pathspec.c:133 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "全局的 'glob' å’Œ 'noglob' è·¯å¾„è§„æ ¼è®¾ç½®ä¸å…¼å®¹" #: pathspec.c:143 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" msgstr "全局的 'literal' è·¯å¾„è§„æ ¼è®¾ç½®å’Œå…¶å®ƒçš„å…¨å±€è·¯å¾„è§„æ ¼è®¾ç½®ä¸å…¼å®¹" #: pathspec.c:177 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "è·¯å¾„è§„æ ¼åŒ…å«æ— 效的神奇å‰ç¼€" #: pathspec.c:183 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "åœ¨è·¯å¾„è§„æ ¼ '%3$s' ä¸æ— 效的神奇å‰ç¼€ '%2$.*1$s'" #: pathspec.c:187 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "è·¯å¾„è§„æ ¼ '%s' 的神奇å‰ç¼€ç»“尾少了一个 ')'" #: pathspec.c:205 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "è·¯å¾„è§„æ ¼ '%2$s' ä¸åŒ…å«æœªå®žçŽ°çš„神奇å‰ç¼€ '%1$c'" #: pathspec.c:230 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "%s:'literal' å’Œ 'glob' ä¸å…¼å®¹" #: pathspec.c:241 #, c-format msgid "%s: '%s' is outside repository" msgstr "%s:'%s' 在仓库之外" #: pathspec.c:291 #, c-format msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "è·¯å¾„è§„æ ¼ '%s' 在å模组 '%.*s' ä¸" #: pathspec.c:353 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "%sï¼šè·¯å¾„è§„æ ¼ç¥žå¥‡å‰ç¼€ä¸è¢«æ¤å‘½ä»¤æ”¯æŒï¼š%s" #: pathspec.c:432 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "è·¯å¾„è§„æ ¼ '%s' ä½äºŽç¬¦å·é“¾æŽ¥ä¸" #: pathspec.c:441 msgid "" "There is nothing to exclude from by :(exclude) patterns.\n" "Perhaps you forgot to add either ':/' or '.' ?" msgstr "" "没有为 :(exclude) 模å¼æä¾›è¦å¿½ç•¥çš„内容。也许您忘记了\n" "æ·»åŠ ':/' 或 '.' ?" #: pretty.c:969 msgid "unable to parse --pretty format" msgstr "ä¸èƒ½è§£æž --pretty æ ¼å¼" #: progress.c:236 msgid "done" msgstr "完æˆ" #: read-cache.c:1296 #, c-format msgid "" "index.version set, but the value is invalid.\n" "Using version %i" msgstr "" "设置了 index.version,但是å–å€¼æ— æ•ˆã€‚\n" "使用版本 %i" #: read-cache.c:1306 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" "Using version %i" msgstr "" "设置了 GIT_INDEX_VERSION,但是å–å€¼æ— æ•ˆã€‚\n" "使用版本 %i" #: refs.c:2941 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973 #: builtin/merge.c:983 #, c-format msgid "Could not open '%s' for writing" msgstr "æ— æ³•æ‰“å¼€ '%s' 进行写入" #: refs.c:3001 #, c-format msgid "could not delete reference %s: %s" msgstr "æ— æ³•åˆ é™¤å¼•ç”¨ %s:%s" #: refs.c:3004 #, c-format msgid "could not delete references: %s" msgstr "æ— æ³•åˆ é™¤å¼•ç”¨ï¼š%s" #: refs.c:3013 #, c-format msgid "could not remove reference %s" msgstr "æ— æ³•åˆ é™¤å¼•ç”¨ %s" #: ref-filter.c:660 msgid "unable to parse format" msgstr "ä¸èƒ½è§£æžæ ¼å¼" #: remote.c:792 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "ä¸èƒ½åŒæ—¶èŽ·å– %s å’Œ %s 至 %s" #: remote.c:796 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s 通常跟踪 %sï¼Œè€Œéž %s" #: remote.c:800 #, c-format msgid "%s tracks both %s and %s" msgstr "%s åŒæ—¶è·Ÿè¸ª %s å’Œ %s" #: remote.c:808 msgid "Internal error" msgstr "内部错误" #: remote.c:1723 remote.c:1766 msgid "HEAD does not point to a branch" msgstr "HEAD 没有指å‘一个分支" #: remote.c:1732 #, c-format msgid "no such branch: '%s'" msgstr "没有æ¤åˆ†æ”¯ï¼š'%s'" #: remote.c:1735 #, c-format msgid "no upstream configured for branch '%s'" msgstr "尚未给分支 '%s' 设置上游" #: remote.c:1741 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "上游分支 '%s' 没有å˜å‚¨ä¸ºä¸€ä¸ªè¿œç¨‹è·Ÿè¸ªåˆ†æ”¯" #: remote.c:1756 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "推é€ç›®æ ‡ '%s' 至远程 '%s' 没有本地跟踪分支" #: remote.c:1771 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "分支 '%s' 没有设置è¦æŽ¨é€çš„远程æœåŠ¡å™¨" #: remote.c:1782 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "å‘ '%s' 推é€å¼•ç”¨è§„æ ¼æœªåŒ…å« '%s'" #: remote.c:1795 msgid "push has no destination (push.default is 'nothing')" msgstr "推é€æ— ç›®æ ‡ï¼ˆpush.default 是 'nothing')" #: remote.c:1817 msgid "cannot resolve 'simple' push to a single destination" msgstr "æ— æ³•è§£æž 'simple' 推é€è‡³ä¸€ä¸ªå•ç‹¬çš„ç›®æ ‡" #: remote.c:2124 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "您的分支基于 '%s',但æ¤ä¸Šæ¸¸åˆ†æ”¯å·²ç»ä¸å˜åœ¨ã€‚\n" #: remote.c:2128 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (使用 \"git branch --unset-upstream\" æ¥ä¿®å¤ï¼‰\n" #: remote.c:2131 #, c-format msgid "Your branch is up-to-date with '%s'.\n" msgstr "您的分支与上游分支 '%s' 一致。\n" #: remote.c:2135 #, 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:2141 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (使用 \"git push\" æ¥å‘布您的本地æ交)\n" #: remote.c:2144 #, 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:2152 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (使用 \"git pull\" æ¥æ›´æ–°æ‚¨çš„本地分支)\n" #: remote.c:2155 #, 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:2165 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " (使用 \"git pull\" æ¥åˆå¹¶è¿œç¨‹åˆ†æ”¯ï¼‰\n" #: revision.c:2198 msgid "your current branch appears to be broken" msgstr "您的当å‰åˆ†æ”¯å¥½åƒè¢«æŸå" #: revision.c:2201 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "您的当å‰åˆ†æ”¯ '%s' å°šæ— ä»»ä½•æ交" #: revision.c:2395 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent 与 --bisect ä¸å…¼å®¹" #: run-command.c:83 msgid "open /dev/null failed" msgstr "ä¸èƒ½æ‰“å¼€ /dev/null" #: run-command.c:85 #, c-format msgid "dup2(%d,%d) failed" msgstr "ä¸èƒ½è°ƒç”¨ dup2(%d,%d)" #: send-pack.c:295 msgid "failed to sign the push certificate" msgstr "æ— æ³•ä¸ºæŽ¨é€è¯ä¹¦ç¾å" #: send-pack.c:404 msgid "the receiving end does not support --signed push" msgstr "接收端ä¸æ”¯æŒç¾å推é€" #: send-pack.c:406 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" msgstr "未å‘é€æŽ¨é€è¯ä¹¦ï¼Œå› 为接收端ä¸æ”¯æŒç¾å推é€" #: send-pack.c:418 msgid "the receiving end does not support --atomic push" msgstr "接收端ä¸æ”¯æŒåŽŸå推é€" #: sequencer.c:183 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:186 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:199 sequencer.c:842 sequencer.c:922 #, c-format msgid "Could not write to %s" msgstr "ä¸èƒ½å†™å…¥ %s" #: sequencer.c:202 #, c-format msgid "Error wrapping up %s" msgstr "错误收尾 %s" #: sequencer.c:217 msgid "Your local changes would be overwritten by cherry-pick." msgstr "您的本地修改将被拣选æ“作覆盖。" #: sequencer.c:219 msgid "Your local changes would be overwritten by revert." msgstr "您的本地修改将被还原æ“作覆盖。" #: sequencer.c:222 msgid "Commit your changes or stash them to proceed." msgstr "æ交您的修改或ä¿å˜è¿›åº¦åŽå†ç»§ç»ã€‚" #. TRANSLATORS: %s will be "revert" or "cherry-pick" #: sequencer.c:309 #, c-format msgid "%s: Unable to write new index file" msgstr "%sï¼šæ— æ³•å†™å…¥æ–°ç´¢å¼•æ–‡ä»¶" #: sequencer.c:327 msgid "Could not resolve HEAD commit\n" msgstr "ä¸èƒ½è§£æž HEAD æ交\n" #: sequencer.c:347 msgid "Unable to update cache tree\n" msgstr "ä¸èƒ½æ›´æ–°ç¼“å˜\n" #: sequencer.c:399 #, c-format msgid "Could not parse commit %s\n" msgstr "ä¸èƒ½è§£æžæ交 %s\n" #: sequencer.c:404 #, c-format msgid "Could not parse parent commit %s\n" msgstr "ä¸èƒ½è§£æžçˆ¶æ交 %s\n" #: sequencer.c:469 msgid "Your index file is unmerged." msgstr "您的索引文件未完æˆåˆå¹¶ã€‚" #: sequencer.c:488 #, c-format msgid "Commit %s is a merge but no -m option was given." msgstr "æ交 %s 是一个åˆå¹¶æ交但未æä¾› -m 选项。" #: sequencer.c:496 #, c-format msgid "Commit %s does not have parent %d" msgstr "æ交 %s 没有父æ交 %d" #: sequencer.c:500 #, c-format msgid "Mainline was specified but commit %s is not a merge." msgstr "指定了主线但æ交 %s ä¸æ˜¯ä¸€ä¸ªåˆå¹¶ã€‚" #. TRANSLATORS: The first %s will be "revert" or #. "cherry-pick", the second %s a SHA1 #: sequencer.c:513 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s:ä¸èƒ½è§£æžçˆ¶æ交 %s" #: sequencer.c:517 #, c-format msgid "Cannot get commit message for %s" msgstr "ä¸èƒ½å¾—到 %s çš„æ交说明" #: sequencer.c:603 #, c-format msgid "could not revert %s... %s" msgstr "ä¸èƒ½è¿˜åŽŸ %s... %s" #: sequencer.c:604 #, c-format msgid "could not apply %s... %s" msgstr "ä¸èƒ½åº”用 %s... %s" #: sequencer.c:639 msgid "empty commit set passed" msgstr "æ供了空的æ交集" #: sequencer.c:647 #, c-format msgid "git %s: failed to read the index" msgstr "git %sï¼šæ— æ³•è¯»å–索引" #: sequencer.c:651 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %sï¼šæ— æ³•åˆ·æ–°ç´¢å¼•" #: sequencer.c:711 #, c-format msgid "Cannot %s during a %s" msgstr "æ— æ³• %s 在一个 %s 过程ä¸" #: sequencer.c:733 #, c-format msgid "Could not parse line %d." msgstr "ä¸èƒ½è§£æžç¬¬ %d 行。" #: sequencer.c:738 msgid "No commits parsed." msgstr "没有æ交被解æžã€‚" #: sequencer.c:750 #, c-format msgid "Could not open %s" msgstr "ä¸èƒ½æ‰“å¼€ %s" #: sequencer.c:754 #, c-format msgid "Could not read %s." msgstr "ä¸èƒ½è¯»å– %s。" #: sequencer.c:761 #, c-format msgid "Unusable instruction sheet: %s" msgstr "æ— ç”¨çš„æŒ‡ä»¤è¡¨å•ï¼š%s" #: sequencer.c:791 #, c-format msgid "Invalid key: %s" msgstr "æ— æ•ˆé”®å:%s" #: sequencer.c:794 builtin/pull.c:47 builtin/pull.c:49 #, c-format msgid "Invalid value for %s: %s" msgstr "%s çš„å€¼æ— æ•ˆï¼š%s" #: sequencer.c:804 #, c-format msgid "Malformed options sheet: %s" msgstr "éžæ³•çš„选项表å•ï¼š%s" #: sequencer.c:823 msgid "a cherry-pick or revert is already in progress" msgstr "一个拣选或还原æ“作已在进行" #: sequencer.c:824 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "å°è¯• \"git cherry-pick (--continue | --quit | --abort)\"" #: sequencer.c:828 #, c-format msgid "Could not create sequencer directory %s" msgstr "ä¸èƒ½åˆ›å»ºåºåˆ—目录 %s" #: sequencer.c:844 sequencer.c:926 #, c-format msgid "Error wrapping up %s." msgstr "错误收尾 %s。" #: sequencer.c:863 sequencer.c:996 msgid "no cherry-pick or revert in progress" msgstr "拣选或还原æ“作并未进行" #: sequencer.c:865 msgid "cannot resolve HEAD" msgstr "ä¸èƒ½è§£æž HEAD" #: sequencer.c:867 msgid "cannot abort from a branch yet to be born" msgstr "ä¸èƒ½ä»Žå°šæœªå»ºç«‹çš„分支终æ¢" #: sequencer.c:887 builtin/apply.c:4291 #, c-format msgid "cannot open %s: %s" msgstr "ä¸èƒ½æ‰“å¼€ %s:%s" #: sequencer.c:890 #, c-format msgid "cannot read %s: %s" msgstr "ä¸èƒ½è¯»å– %s:%s" #: sequencer.c:891 msgid "unexpected end of file" msgstr "æ„外的文件结æŸ" #: sequencer.c:897 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "ä¿å˜æ‹£é€‰æ交å‰çš„ HEAD 文件 '%s' æŸå" #: sequencer.c:919 #, c-format msgid "Could not format %s." msgstr "ä¸èƒ½æ ¼å¼åŒ– %s。" #: sequencer.c:1064 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s:ä¸èƒ½æ‹£é€‰ä¸€ä¸ª%s" #: sequencer.c:1067 #, c-format msgid "%s: bad revision" msgstr "%s:错误的版本" #: sequencer.c:1101 msgid "Can't revert as initial commit" msgstr "ä¸èƒ½ä½œä¸ºåˆå§‹æ交还原" #: sequencer.c:1102 msgid "Can't cherry-pick into empty head" msgstr "ä¸èƒ½æ‹£é€‰åˆ°ç©ºåˆ†æ”¯" #: setup.c:243 #, c-format msgid "failed to read %s" msgstr "æ— æ³•è¯»å– %s" #: sha1_name.c:453 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:61 submodule.c:95 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "æ— æ³•ä¿®æ”¹æœªåˆå¹¶çš„ .gitmodules,先解决åˆå¹¶å†²çª" #: submodule.c:65 submodule.c:99 #, c-format msgid "Could not find section in .gitmodules where path=%s" msgstr "æ— æ³•åœ¨ .gitmodules ä¸æ‰¾åˆ° path=%s çš„å°èŠ‚" #: submodule.c:73 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "ä¸èƒ½æ›´æ–° .gitmodules æ¡ç›® %s" #: submodule.c:106 #, c-format msgid "Could not remove .gitmodules entry for %s" msgstr "æ— æ³•ç§»é™¤ %s çš„ .gitmodules æ¡ç›®" #: submodule.c:117 msgid "staging updated .gitmodules failed" msgstr "å°†æ›´æ–°åŽ .gitmodules æ·»åŠ æš‚å˜åŒºå¤±è´¥" #: submodule.c:1045 #, c-format msgid "Could not set core.worktree in %s" msgstr "ä¸èƒ½åœ¨ %s ä¸è®¾ç½® core.worktree" #: trailer.c:491 trailer.c:495 trailer.c:499 trailer.c:553 trailer.c:557 #: trailer.c:561 #, c-format msgid "unknown value '%s' for key '%s'" msgstr "é”® '%2$s' 的未知å–值 '%1$s'" #: trailer.c:543 trailer.c:548 builtin/remote.c:290 #, c-format msgid "more than one %s" msgstr "多于一个 %s" #: trailer.c:581 #, c-format msgid "empty trailer token in trailer '%.*s'" msgstr "ç¾å '%.*s' 的键为空" #: trailer.c:701 #, c-format msgid "could not read input file '%s'" msgstr "ä¸èƒ½è¯»å–输入文件 '%s'" #: trailer.c:704 msgid "could not read from stdin" msgstr "ä¸èƒ½è‡ªæ ‡å‡†è¾“入读å–" #: transport-helper.c:1025 #, c-format msgid "Could not read ref %s" msgstr "ä¸èƒ½è¯»å–引用 %s" #: unpack-trees.c:203 msgid "Checking out files" msgstr "æ£åœ¨æ£€å‡ºæ–‡ä»¶" #: urlmatch.c:120 msgid "invalid URL scheme name or missing '://' suffix" msgstr "æ— æ•ˆçš„ URL 方案å称或丢失 '://' åŽç¼€" #: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356 #, c-format msgid "invalid %XX escape sequence" msgstr "æ— æ•ˆçš„ %XX 转义åºåˆ—" #: urlmatch.c:172 msgid "missing host and scheme is not 'file:'" msgstr "缺失主机å且 URL 方案ä¸æ˜¯ 'file:'" #: urlmatch.c:189 msgid "a 'file:' URL may not have a port number" msgstr "一个 'file:' URL ä¸åº”该包å«ç«¯å£å·" #: urlmatch.c:199 msgid "invalid characters in host name" msgstr "主机åä¸åŒ…å«æ— 效的å—符" #: urlmatch.c:244 urlmatch.c:255 msgid "invalid port number" msgstr "æ— æ•ˆçš„ç«¯å£å·" #: urlmatch.c:322 msgid "invalid '..' path segment" msgstr "æ— æ•ˆçš„ '..' 路径片段" #: wrapper.c:219 wrapper.c:362 #, c-format msgid "could not open '%s' for reading and writing" msgstr "æ— æ³•æ‰“å¼€ '%s' 进行读写" #: wrapper.c:221 wrapper.c:364 #, c-format msgid "could not open '%s' for writing" msgstr "æ— æ³•æ‰“å¼€ '%s' 进行写入" #: wrapper.c:223 wrapper.c:366 builtin/am.c:337 builtin/commit.c:1688 #: builtin/merge.c:1076 builtin/pull.c:380 #, c-format msgid "could not open '%s' for reading" msgstr "æ— æ³•æ‰“å¼€ '%s' 进行读å–" #: wrapper.c:579 #, c-format msgid "unable to access '%s': %s" msgstr "ä¸èƒ½è®¿é—® '%s':%s" #: wrapper.c:600 #, c-format msgid "unable to access '%s'" msgstr "ä¸èƒ½è®¿é—® '%s'" #: wrapper.c:611 #, c-format msgid "unable to look up current user in the passwd file: %s" msgstr "æ— æ³•åœ¨å£ä»¤æ–‡ä»¶ä¸æŸ¥è¯¢åˆ°å½“å‰ç”¨æˆ·ï¼š%s" #: wrapper.c:612 msgid "no such user" msgstr "æ— æ¤ç”¨æˆ·" #: wrapper.c:620 msgid "unable to get current working directory" msgstr "ä¸èƒ½èŽ·å–当å‰å·¥ä½œç›®å½•" #: wrapper.c:631 #, c-format msgid "could not open %s for writing" msgstr "ä¸èƒ½å†™å…¥ %s" #: wrapper.c:642 builtin/am.c:424 #, c-format msgid "could not write to %s" msgstr "ä¸èƒ½å†™å…¥ %s" #: wrapper.c:648 #, c-format msgid "could not close %s" msgstr "ä¸èƒ½å…³é— %s" #: wt-status.c:149 msgid "Unmerged paths:" msgstr "未åˆå¹¶çš„路径:" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:176 wt-status.c:203 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" msgstr " (使用 \"git reset %s <文件>...\" 以å–消暂å˜ï¼‰" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:178 wt-status.c:205 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr " (使用 \"git rm --cached <文件>...\" 以å–消暂å˜ï¼‰" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:182 msgid " (use \"git add <file>...\" to mark resolution)" msgstr " (使用 \"git add <文件>...\" æ ‡è®°è§£å†³æ–¹æ¡ˆï¼‰" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:184 wt-status.c:188 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr " (酌情使用 \"git add/rm <文件>...\" æ ‡è®°è§£å†³æ–¹æ¡ˆï¼‰" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:186 msgid " (use \"git rm <file>...\" to mark resolution)" msgstr " (使用 \"git rm <文件>...\" æ ‡è®°è§£å†³æ–¹æ¡ˆï¼‰" #: wt-status.c:197 wt-status.c:880 msgid "Changes to be committed:" msgstr "è¦æ交的å˜æ›´ï¼š" #: wt-status.c:215 wt-status.c:889 msgid "Changes not staged for commit:" msgstr "尚未暂å˜ä»¥å¤‡æ交的å˜æ›´ï¼š" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:219 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr " (使用 \"git add <文件>...\" æ›´æ–°è¦æ交的内容)" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:221 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr " (使用 \"git add/rm <文件>...\" æ›´æ–°è¦æ交的内容)" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:222 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr " (使用 \"git checkout -- <文件>...\" 丢弃工作区的改动)" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:224 msgid " (commit or discard the untracked or modified content in submodules)" msgstr " (æ交或丢弃å模组ä¸æœªè·Ÿè¸ªæˆ–修改的内容)" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:236 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr " (使用 \"git %s <文件>...\" 以包å«è¦æ交的内容)" #: wt-status.c:251 msgid "both deleted:" msgstr "åŒæ–¹åˆ 除:" #: wt-status.c:253 msgid "added by us:" msgstr "ç”±æˆ‘ä»¬æ·»åŠ ï¼š" #: wt-status.c:255 msgid "deleted by them:" msgstr "ç”±ä»–ä»¬åˆ é™¤ï¼š" #: wt-status.c:257 msgid "added by them:" msgstr "ç”±ä»–ä»¬æ·»åŠ ï¼š" #: wt-status.c:259 msgid "deleted by us:" msgstr "ç”±æˆ‘ä»¬åˆ é™¤ï¼š" #: wt-status.c:261 msgid "both added:" msgstr "åŒæ–¹æ·»åŠ :" #: wt-status.c:263 msgid "both modified:" msgstr "åŒæ–¹ä¿®æ”¹ï¼š" #: wt-status.c:265 #, c-format msgid "bug: unhandled unmerged status %x" msgstr "bugï¼šæ— æ³•å¤„ç†çš„未åˆå¹¶çŠ¶æ€ %x" #: wt-status.c:273 msgid "new file:" msgstr "新文件:" #: wt-status.c:275 msgid "copied:" msgstr "æ‹·è´ï¼š" #: wt-status.c:277 msgid "deleted:" msgstr "åˆ é™¤ï¼š" #: wt-status.c:279 msgid "modified:" msgstr "修改:" #: wt-status.c:281 msgid "renamed:" msgstr "é‡å‘½å:" #: wt-status.c:283 msgid "typechange:" msgstr "类型å˜æ›´ï¼š" #: wt-status.c:285 msgid "unknown:" msgstr "未知:" #: wt-status.c:287 msgid "unmerged:" msgstr "未åˆå¹¶ï¼š" # 译者:末尾两个å—节å¯èƒ½è¢«åˆ å‡ï¼Œå¦‚果翻译为ä¸æ–‡æ ‡ç‚¹ä¼šå‡ºçŽ°åŠä¸ªæ±‰å— #: wt-status.c:369 msgid "new commits, " msgstr "æ–°æ交, " # 译者:末尾两个å—节å¯èƒ½è¢«åˆ å‡ï¼Œå¦‚果翻译为ä¸æ–‡æ ‡ç‚¹ä¼šå‡ºçŽ°åŠä¸ªæ±‰å— #: wt-status.c:371 msgid "modified content, " msgstr "修改的内容, " # 译者:末尾两个å—节å¯èƒ½è¢«åˆ å‡ï¼Œå¦‚果翻译为ä¸æ–‡æ ‡ç‚¹ä¼šå‡ºçŽ°åŠä¸ªæ±‰å— #: wt-status.c:373 msgid "untracked content, " msgstr "未跟踪的内容, " #: wt-status.c:390 #, c-format msgid "bug: unhandled diff status %c" msgstr "bugï¼šæ— æ³•å¤„ç†çš„å·®å¼‚çŠ¶æ€ %c" #: wt-status.c:754 msgid "Submodules changed but not updated:" msgstr "å模组已修改但尚未更新:" #: wt-status.c:756 msgid "Submodule changes to be committed:" msgstr "è¦æ交的å模组å˜æ›´ï¼š" #: wt-status.c:837 msgid "" "Do not touch the line above.\n" "Everything below will be removed." msgstr "" "ä¸è¦æ”¹åŠ¨ä¸Šé¢çš„一行。\n" "下é¢çš„所有内容å‡å°†è¢«åˆ 除。" #: wt-status.c:948 msgid "You have unmerged paths." msgstr "您有尚未åˆå¹¶çš„路径。" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:951 msgid " (fix conflicts and run \"git commit\")" msgstr " (解决冲çªå¹¶è¿è¡Œ \"git commit\")" #: wt-status.c:954 msgid "All conflicts fixed but you are still merging." msgstr "所有冲çªå·²è§£å†³ä½†æ‚¨ä»å¤„于åˆå¹¶ä¸ã€‚" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:957 msgid " (use \"git commit\" to conclude merge)" msgstr " (使用 \"git commit\" 结æŸåˆå¹¶ï¼‰" #: wt-status.c:967 msgid "You are in the middle of an am session." msgstr "您æ£å¤„于 am æ“作过程ä¸ã€‚" #: wt-status.c:970 msgid "The current patch is empty." msgstr "当å‰çš„è¡¥ä¸ä¸ºç©ºã€‚" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:974 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (解决冲çªï¼Œç„¶åŽè¿è¡Œ \"git am --continue\")" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:976 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (使用 \"git am --skip\" 跳过æ¤è¡¥ä¸ï¼‰" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:978 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (使用 \"git am --abort\" æ¢å¤åŽŸæœ‰åˆ†æ”¯ï¼‰" #: wt-status.c:1105 msgid "No commands done." msgstr "没有命令被执行。" #: wt-status.c:1108 #, 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:1119 #, c-format msgid " (see more in file %s)" msgstr " (更多å‚è§æ–‡ä»¶ %s)" #: wt-status.c:1124 msgid "No commands remaining." msgstr "未剩下任何命令。" #: wt-status.c:1127 #, 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:1135 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr " (使用 \"git rebase --edit-todo\" æ¥æŸ¥çœ‹å’Œç¼–辑)" #: wt-status.c:1148 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "您在执行将分支 '%s' å˜åŸºåˆ° '%s' çš„æ“作。" #: wt-status.c:1153 msgid "You are currently rebasing." msgstr "您在执行å˜åŸºæ“作。" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:1167 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (解决冲çªï¼Œç„¶åŽè¿è¡Œ \"git rebase --continue\")" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:1169 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (使用 \"git rebase --skip\" 跳过æ¤è¡¥ä¸ï¼‰" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:1171 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " (使用 \"git rebase --abort\" 以检出原有分支)" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:1177 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (所有冲çªå·²è§£å†³ï¼šè¿è¡Œ \"git rebase --continue\")" #: wt-status.c:1181 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "您在执行将分支 '%s' å˜åŸºåˆ° '%s' çš„æ“作时拆分æ交。" #: wt-status.c:1186 msgid "You are currently splitting a commit during a rebase." msgstr "您在执行å˜åŸºæ“作时拆分æ交。" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:1189 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr " (一旦您工作目录æ交干净åŽï¼Œè¿è¡Œ \"git rebase --continue\")" #: wt-status.c:1193 #, c-format msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "您在执行将分支 '%s' å˜åŸºåˆ° '%s' çš„æ“作时编辑æ交。" #: wt-status.c:1198 msgid "You are currently editing a commit during a rebase." msgstr "您在执行å˜åŸºæ“作时编辑æ交。" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:1201 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " (使用 \"git commit --amend\" 修补当å‰æ交)" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:1203 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr " (当您对您的修改满æ„åŽæ‰§è¡Œ \"git rebase --continue\")" #: wt-status.c:1213 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "您在执行拣选æ交 %s çš„æ“作。" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:1218 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr " (解决冲çªå¹¶è¿è¡Œ \"git cherry-pick --continue\")" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:1221 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr " (所有冲çªå·²è§£å†³ï¼šè¿è¡Œ \"git cherry-pick --continue\")" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:1223 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr " (使用 \"git cherry-pick --abort\" 以å–消拣选æ“作)" #: wt-status.c:1232 #, c-format msgid "You are currently reverting commit %s." msgstr "您在执行å转æ交 %s çš„æ“作。" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:1237 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (解决冲çªå¹¶è¿è¡Œ \"git revert --continue\")" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:1240 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (所有冲çªå·²è§£å†³ï¼šè¿è¡Œ \"git revert --continue\")" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:1242 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (使用 \"git revert --abort\" 以å–消å转æ交æ“作)" #: wt-status.c:1253 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "您在执行从分支 '%s' 开始的二分查找æ“作。" #: wt-status.c:1257 msgid "You are currently bisecting." msgstr "您在执行二分查找æ“作。" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: wt-status.c:1260 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " (使用 \"git bisect reset\" 以回到原有分支)" #: wt-status.c:1437 msgid "On branch " msgstr "ä½äºŽåˆ†æ”¯ " #: wt-status.c:1445 msgid "interactive rebase in progress; onto " msgstr "交互å¼å˜åŸºæ“作æ£åœ¨è¿›è¡Œä¸ï¼›è‡³ " #: wt-status.c:1447 msgid "rebase in progress; onto " msgstr "å˜åŸºæ“作æ£åœ¨è¿›è¡Œä¸ï¼›è‡³ " #: wt-status.c:1452 msgid "HEAD detached at " msgstr "头指针分离于 " #: wt-status.c:1454 msgid "HEAD detached from " msgstr "头指针分离自 " #: wt-status.c:1457 msgid "Not currently on any branch." msgstr "当å‰ä¸åœ¨ä»»ä½•åˆ†æ”¯ä¸Šã€‚" #: wt-status.c:1474 msgid "Initial commit" msgstr "åˆå§‹æ交" #: wt-status.c:1488 msgid "Untracked files" msgstr "未跟踪的文件" #: wt-status.c:1490 msgid "Ignored files" msgstr "忽略的文件" #: wt-status.c:1494 #, 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:1500 #, c-format msgid "Untracked files not listed%s" msgstr "未跟踪的文件没有列出%s" # 译者:ä¸æ–‡å—符串拼接,å¯åˆ 除å‰å¯¼ç©ºæ ¼ #: wt-status.c:1502 msgid " (use -u option to show untracked files)" msgstr "(使用 -u å‚数显示未跟踪的文件)" #: wt-status.c:1508 msgid "No changes" msgstr "没有修改" #: wt-status.c:1513 #, 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:1516 #, c-format msgid "no changes added to commit\n" msgstr "ä¿®æ”¹å°šæœªåŠ å…¥æ交\n" #: wt-status.c:1519 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "æ交为空,但是å˜åœ¨å°šæœªè·Ÿè¸ªçš„文件(使用 \"git add\" 建立跟踪)\n" #: wt-status.c:1522 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "æ交为空,但是å˜åœ¨å°šæœªè·Ÿè¸ªçš„文件\n" # 译者:ä¸æ–‡å—符串拼接,å¯åˆ 除å‰å¯¼ç©ºæ ¼ #: wt-status.c:1525 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "æ— æ–‡ä»¶è¦æ交(创建/æ‹·è´æ–‡ä»¶å¹¶ä½¿ç”¨ \"git add\" 建立跟踪)\n" #: wt-status.c:1528 wt-status.c:1533 #, c-format msgid "nothing to commit\n" msgstr "æ— æ–‡ä»¶è¦æ交\n" # 译者:ä¸æ–‡å—符串拼接,å¯åˆ 除å‰å¯¼ç©ºæ ¼ #: wt-status.c:1531 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "æ— æ–‡ä»¶è¦æ交(使用 -u 显示未跟踪的文件)\n" # 译者:ä¸æ–‡å—符串拼接,å¯åˆ 除å‰å¯¼ç©ºæ ¼ #: wt-status.c:1535 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "æ— æ–‡ä»¶è¦æ交,干净的工作区\n" #: wt-status.c:1644 msgid "HEAD (no branch)" msgstr "HEAD(éžåˆ†æ”¯ï¼‰" # 译者:注æ„ä¿æŒå¥å°¾ç©ºæ ¼ #: wt-status.c:1650 msgid "Initial commit on " msgstr "åˆå§‹æ交于 " #: wt-status.c:1677 msgid "gone" msgstr "丢失" # 译者:注æ„ä¿æŒå¥å°¾ç©ºæ ¼ #: wt-status.c:1679 wt-status.c:1687 msgid "behind " msgstr "è½åŽ " #: compat/precompose_utf8.c:55 builtin/clone.c:403 #, c-format msgid "failed to unlink '%s'" msgstr "æ— æ³•åˆ é™¤ '%s'" #: builtin/add.c:22 msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<选项>] [--] <è·¯å¾„è§„æ ¼>..." #: builtin/add.c:65 #, c-format msgid "unexpected diff status %c" msgstr "æ„å¤–çš„å·®å¼‚çŠ¶æ€ %c" #: builtin/add.c:70 builtin/commit.c:277 msgid "updating files failed" msgstr "更新文件失败" #: builtin/add.c:80 #, c-format msgid "remove '%s'\n" msgstr "åˆ é™¤ '%s'\n" #: builtin/add.c:134 msgid "Unstaged changes after refreshing the index:" msgstr "刷新索引之åŽå°šæœªè¢«æš‚å˜çš„å˜æ›´ï¼š" #: builtin/add.c:194 builtin/rev-parse.c:799 msgid "Could not read the index" msgstr "ä¸èƒ½è¯»å–索引" #: builtin/add.c:205 #, c-format msgid "Could not open '%s' for writing." msgstr "æ— æ³•æ‰“å¼€ '%s' 进行写入。" #: builtin/add.c:209 msgid "Could not write patch" msgstr "ä¸èƒ½ç”Ÿæˆè¡¥ä¸" #: builtin/add.c:212 msgid "editing patch failed" msgstr "编辑补ä¸å¤±è´¥" #: builtin/add.c:215 #, c-format msgid "Could not stat '%s'" msgstr "ä¸èƒ½æŸ¥çœ‹æ–‡ä»¶çŠ¶æ€ '%s'" #: builtin/add.c:217 msgid "Empty patch. Aborted." msgstr "空补ä¸ã€‚异常终æ¢ã€‚" #: builtin/add.c:222 #, c-format msgid "Could not apply '%s'" msgstr "ä¸èƒ½åº”用 '%s'" #: builtin/add.c:232 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "ä¸‹åˆ—è·¯å¾„æ ¹æ®æ‚¨çš„一个 .gitignore 文件而被忽略:\n" #: builtin/add.c:249 builtin/clean.c:896 builtin/fetch.c:108 builtin/mv.c:110 #: builtin/prune-packed.c:55 builtin/pull.c:182 builtin/push.c:545 #: builtin/remote.c:1339 builtin/rm.c:268 builtin/send-pack.c:162 msgid "dry run" msgstr "æ¼”ä¹ " #: builtin/add.c:250 builtin/apply.c:4580 builtin/check-ignore.c:19 #: builtin/commit.c:1321 builtin/count-objects.c:63 builtin/fsck.c:636 #: builtin/log.c:1641 builtin/mv.c:109 builtin/read-tree.c:114 msgid "be verbose" msgstr "冗长输出" #: builtin/add.c:252 msgid "interactive picking" msgstr "交互å¼æ‹£é€‰" #: builtin/add.c:253 builtin/checkout.c:1152 builtin/reset.c:286 msgid "select hunks interactively" msgstr "交互å¼æŒ‘选数æ®å—" #: builtin/add.c:254 msgid "edit current diff and apply" msgstr "编辑当å‰å·®å¼‚并应用" #: builtin/add.c:255 msgid "allow adding otherwise ignored files" msgstr "å…è®¸æ·»åŠ å¿½ç•¥çš„æ–‡ä»¶" #: builtin/add.c:256 msgid "update tracked files" msgstr "更新已跟踪的文件" #: builtin/add.c:257 msgid "record only the fact that the path will be added later" msgstr "åªè®°å½•ï¼Œè¯¥è·¯å¾„ç¨åŽå†æ·»åŠ " #: builtin/add.c:258 msgid "add changes from all tracked and untracked files" msgstr "æ·»åŠ æ‰€æœ‰æ”¹å˜çš„已跟踪文件和未跟踪文件" #: builtin/add.c:261 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "忽略工作区ä¸ç§»é™¤çš„路径(和 --no-all 相åŒï¼‰" #: builtin/add.c:263 msgid "don't add, only refresh the index" msgstr "ä¸æ·»åŠ ,åªåˆ·æ–°ç´¢å¼•" #: builtin/add.c:264 msgid "just skip files which cannot be added because of errors" msgstr "è·³è¿‡å› å‡ºé”™ä¸èƒ½æ·»åŠ 的文件" #: builtin/add.c:265 msgid "check if - even missing - files are ignored in dry run" msgstr "æ£€æŸ¥åœ¨æ¼”ä¹ æ¨¡å¼ä¸‹æ–‡ä»¶ï¼ˆå³ä½¿ä¸å˜åœ¨ï¼‰æ˜¯å¦è¢«å¿½ç•¥" #: builtin/add.c:287 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "使用 -f å‚数如果您确实è¦æ·»åŠ 它们。\n" #: builtin/add.c:294 msgid "adding files failed" msgstr "æ·»åŠ æ–‡ä»¶å¤±è´¥" #: builtin/add.c:330 msgid "-A and -u are mutually incompatible" msgstr "-A å’Œ -u 选项互斥" #: builtin/add.c:337 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "选项 --ignore-missing åªèƒ½å’Œ --dry-run åŒæ—¶ä½¿ç”¨" #: builtin/add.c:358 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "æ²¡æœ‰æŒ‡å®šæ–‡ä»¶ï¼Œä¹Ÿæ²¡æœ‰æ–‡ä»¶è¢«æ·»åŠ ã€‚\n" #: builtin/add.c:359 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "也许您想è¦æ‰§è¡Œ 'git add .'?\n" #: builtin/add.c:364 builtin/check-ignore.c:172 builtin/clean.c:940 #: builtin/commit.c:336 builtin/mv.c:130 builtin/reset.c:235 builtin/rm.c:298 msgid "index file corrupt" msgstr "索引文件æŸå" #: builtin/add.c:445 builtin/apply.c:4678 builtin/mv.c:279 builtin/rm.c:430 msgid "Unable to write new index file" msgstr "æ— æ³•å†™å…¥æ–°ç´¢å¼•æ–‡ä»¶" #: builtin/am.c:41 #, c-format msgid "could not stat %s" msgstr "ä¸èƒ½èŽ·å– %s 的文件状æ€" #: builtin/am.c:270 builtin/am.c:1345 builtin/commit.c:737 #: builtin/merge.c:1079 #, c-format msgid "could not read '%s'" msgstr "ä¸èƒ½è¯»å– '%s'" #: builtin/am.c:444 msgid "could not parse author script" msgstr "ä¸èƒ½è§£æžä½œè€…脚本" #: builtin/am.c:521 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "'%s' 被 applypatch-msg é’©ååˆ é™¤" #: builtin/am.c:562 builtin/notes.c:300 #, c-format msgid "Malformed input line: '%s'." msgstr "éžæ³•çš„输入行:'%s'。" #: builtin/am.c:599 builtin/notes.c:315 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "从 '%s' æ‹·è´æ³¨è§£åˆ° '%s' 时失败" #: builtin/am.c:625 msgid "fseek failed" msgstr "fseek 失败" #: builtin/am.c:786 builtin/am.c:874 #, c-format msgid "could not open '%s' for reading: %s" msgstr "æ— æ³•æ‰“å¼€ '%s' 进行读å–:%s" #: builtin/am.c:793 #, c-format msgid "could not open '%s' for writing: %s" msgstr "æ— æ³•æ‰“å¼€ '%s' 进行写入:%s" #: builtin/am.c:802 #, c-format msgid "could not parse patch '%s'" msgstr "æ— æ³•è§£æžè¡¥ä¸ '%s'" #: builtin/am.c:867 msgid "Only one StGIT patch series can be applied at once" msgstr "一次åªèƒ½æœ‰ä¸€ä¸ª StGIT è¡¥ä¸é˜Ÿåˆ—被应用" #: builtin/am.c:915 msgid "invalid timestamp" msgstr "æ— æ•ˆçš„æ—¶é—´æˆ³" #: builtin/am.c:918 builtin/am.c:926 msgid "invalid Date line" msgstr "æ— æ•ˆçš„æ—¥æœŸè¡Œ" #: builtin/am.c:923 msgid "invalid timezone offset" msgstr "æ— æ•ˆçš„æ—¶åŒºå移值" #: builtin/am.c:1010 msgid "Patch format detection failed." msgstr "è¡¥ä¸æ ¼å¼æ£€æµ‹å¤±è´¥ã€‚" #: builtin/am.c:1015 builtin/clone.c:368 #, c-format msgid "failed to create directory '%s'" msgstr "æ— æ³•åˆ›å»ºç›®å½• '%s'" #: builtin/am.c:1019 msgid "Failed to split patches." msgstr "æ— æ³•æ‹†åˆ†è¡¥ä¸ã€‚" #: builtin/am.c:1151 builtin/commit.c:362 msgid "unable to write index file" msgstr "æ— æ³•å†™å…¥ç´¢å¼•æ–‡ä»¶" #: builtin/am.c:1202 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "当您解决这一问题,执行 \"%s --continue\"。" #: builtin/am.c:1203 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "如果您想è¦è·³è¿‡è¿™ä¸€è¡¥ä¸ï¼Œåˆ™æ‰§è¡Œ \"%s --skip\"。" #: builtin/am.c:1204 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "è‹¥è¦å¤åŽŸè‡³åŽŸå§‹åˆ†æ”¯å¹¶åœæ¢è¡¥ä¸æ“作,执行 \"%s --abort\"。" #: builtin/am.c:1339 msgid "Patch is empty. Was it split wrong?" msgstr "è¡¥ä¸ä¸ºç©ºã€‚是ä¸æ˜¯åˆ‡åˆ†é”™è¯¯ï¼Ÿ" #: builtin/am.c:1413 builtin/log.c:1345 #, c-format msgid "invalid ident line: %s" msgstr "包å«æ— æ•ˆçš„èº«ä»½æ ‡è¯†ï¼š%s" #: builtin/am.c:1440 #, c-format msgid "unable to parse commit %s" msgstr "ä¸èƒ½è§£æžæ交 %s" #: builtin/am.c:1614 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "仓库缺ä¹å¿…è¦çš„æ•°æ®å¯¹è±¡ä»¥è¿›è¡Œä¸‰æ–¹åˆå¹¶ã€‚" #: builtin/am.c:1616 msgid "Using index info to reconstruct a base tree..." msgstr "使用索引æ¥é‡å»ºä¸€ä¸ªï¼ˆä¸‰æ–¹åˆå¹¶çš„ï¼‰åŸºç¡€ç›®å½•æ ‘..." #: builtin/am.c:1635 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." msgstr "" "您是å¦æ›¾æ‰‹åŠ¨ç¼–辑过您的补ä¸ï¼Ÿ\n" "æ— æ³•åº”ç”¨è¡¥ä¸åˆ°ç´¢å¼•ä¸çš„æ•°æ®å¯¹è±¡ä¸Šã€‚" #: builtin/am.c:1641 msgid "Falling back to patching base and 3-way merge..." msgstr "回è½åˆ°åŸºç¡€ç‰ˆæœ¬ä¸Šæ‰“è¡¥ä¸åŠè¿›è¡Œä¸‰æ–¹åˆå¹¶..." #: builtin/am.c:1666 msgid "Failed to merge in the changes." msgstr "æ— æ³•åˆå¹¶å˜æ›´ã€‚" #: builtin/am.c:1691 builtin/merge.c:632 msgid "git write-tree failed to write a tree" msgstr "git write-tree æ— æ³•å†™å…¥ä¸€æ ‘å¯¹è±¡" #: builtin/am.c:1698 msgid "applying to an empty history" msgstr "æ£åº”用到一个空历å²ä¸Š" #: builtin/am.c:1711 builtin/commit.c:1752 builtin/merge.c:829 #: builtin/merge.c:854 msgid "failed to write commit object" msgstr "æ— æ³•å†™æ交对象" #: builtin/am.c:1743 builtin/am.c:1747 #, c-format msgid "cannot resume: %s does not exist." msgstr "æ— æ³•ç»§ç»ï¼š%s ä¸å˜åœ¨ã€‚" #: builtin/am.c:1763 msgid "cannot be interactive without stdin connected to a terminal." msgstr "æ ‡å‡†è¾“å…¥æ²¡æœ‰å’Œç»ˆç«¯å…³è”,ä¸èƒ½è¿›è¡Œäº¤äº’å¼æ“作。" #: builtin/am.c:1768 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:1778 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "应用?是[y]/å¦[n]/编辑[e]/查看补ä¸[v]/应用所有[a]:" #: builtin/am.c:1828 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "è„索引:ä¸èƒ½åº”用补ä¸ï¼ˆè„文件:%s)" #: builtin/am.c:1863 builtin/am.c:1934 #, c-format msgid "Applying: %.*s" msgstr "应用:%.*s" #: builtin/am.c:1879 msgid "No changes -- Patch already applied." msgstr "没有å˜æ›´ —— è¡¥ä¸å·²ç»åº”用过。" #: builtin/am.c:1887 #, c-format msgid "Patch failed at %s %.*s" msgstr "打补ä¸å¤±è´¥äºŽ %s %.*s" #: builtin/am.c:1893 #, c-format msgid "The copy of the patch that failed is found in: %s" msgstr "失败的补ä¸æ–‡ä»¶å‰¯æœ¬ä½äºŽï¼š%s" #: builtin/am.c:1937 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:1944 msgid "" "You still have unmerged paths in your index.\n" "Did you forget to use 'git add'?" msgstr "" "您的索引ä¸ä»æœ‰æœªåˆå¹¶çš„路径。\n" "您是å¦å¿˜äº†æ‰§è¡Œ 'git add'?" #: builtin/am.c:2052 builtin/am.c:2056 builtin/am.c:2068 builtin/reset.c:308 #: builtin/reset.c:316 #, c-format msgid "Could not parse object '%s'." msgstr "ä¸èƒ½è§£æžå¯¹è±¡ '%s'。" #: builtin/am.c:2104 msgid "failed to clean index" msgstr "æ— æ³•æ¸…ç©ºç´¢å¼•" #: builtin/am.c:2138 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:2199 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "æ— æ•ˆçš„ --patch-format 值:%s" #: builtin/am.c:2221 msgid "git am [options] [(<mbox>|<Maildir>)...]" msgstr "git am [选项] [(<mbox>|<Maildir>)...]" #: builtin/am.c:2222 msgid "git am [options] (--continue | --skip | --abort)" msgstr "git am [选项] (--continue | --skip | --abort)" #: builtin/am.c:2228 msgid "run interactively" msgstr "以交互å¼æ–¹å¼è¿è¡Œ" #: builtin/am.c:2230 msgid "historical option -- no-op" msgstr "è€çš„å‚æ•° —— æ— ä½œç”¨" #: builtin/am.c:2232 msgid "allow fall back on 3way merging if needed" msgstr "如果必è¦ï¼Œå…许使用三方åˆå¹¶ã€‚" #: builtin/am.c:2233 builtin/init-db.c:509 builtin/prune-packed.c:57 #: builtin/repack.c:171 msgid "be quiet" msgstr "é™é»˜æ¨¡å¼" #: builtin/am.c:2235 msgid "add a Signed-off-by line to the commit message" msgstr "在æ交说明ä¸æ·»åŠ 一个 Signed-off-by ç¾å" #: builtin/am.c:2238 msgid "recode into utf8 (default)" msgstr "使用 utf8 å—符集(默认)" #: builtin/am.c:2240 msgid "pass -k flag to git-mailinfo" msgstr "å‘ git-mailinfo ä¼ é€’ -k å‚æ•°" #: builtin/am.c:2242 msgid "pass -b flag to git-mailinfo" msgstr "å‘ git-mailinfo ä¼ é€’ -b å‚æ•°" #: builtin/am.c:2244 msgid "pass -m flag to git-mailinfo" msgstr "å‘ git-mailinfo ä¼ é€’ -m å‚æ•°" #: builtin/am.c:2246 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "针对 mbox æ ¼å¼ï¼Œå‘ git-mailsplit ä¼ é€’ --keep-cr å‚æ•°" #: builtin/am.c:2249 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "ä¸å‘ git-mailsplit ä¼ é€’ --keep-cr å‚数,覆盖 am.keepcr 的设置" #: builtin/am.c:2252 msgid "strip everything before a scissors line" msgstr "丢弃è£åˆ‡çº¿å‰çš„所有内容" #: builtin/am.c:2253 builtin/apply.c:4563 msgid "action" msgstr "动作" #: builtin/am.c:2254 builtin/am.c:2257 builtin/am.c:2260 builtin/am.c:2263 #: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275 #: builtin/am.c:2281 msgid "pass it through git-apply" msgstr "ä¼ é€’ç»™ git-apply" #: builtin/am.c:2262 builtin/apply.c:4587 msgid "root" msgstr "æ ¹ç›®å½•" #: builtin/am.c:2265 builtin/am.c:2268 builtin/apply.c:4525 #: builtin/apply.c:4528 builtin/clone.c:85 builtin/fetch.c:93 #: builtin/pull.c:167 msgid "path" msgstr "路径" #: builtin/am.c:2271 builtin/fmt-merge-msg.c:669 builtin/fmt-merge-msg.c:672 #: builtin/grep.c:698 builtin/merge.c:198 builtin/pull.c:127 #: builtin/repack.c:178 builtin/repack.c:182 builtin/show-branch.c:664 #: builtin/show-ref.c:180 builtin/tag.c:591 parse-options.h:132 #: parse-options.h:134 parse-options.h:243 msgid "n" msgstr "n" #: builtin/am.c:2274 builtin/apply.c:4531 msgid "num" msgstr "æ•°å—" #: builtin/am.c:2277 builtin/for-each-ref.c:34 builtin/replace.c:438 msgid "format" msgstr "æ ¼å¼" #: builtin/am.c:2278 msgid "format the patch(es) are in" msgstr "è¡¥ä¸çš„æ ¼å¼" #: builtin/am.c:2284 msgid "override error message when patch failure occurs" msgstr "打补ä¸å¤±è´¥æ—¶æ˜¾ç¤ºçš„错误信æ¯" #: builtin/am.c:2286 msgid "continue applying patches after resolving a conflict" msgstr "冲çªè§£å†³åŽç»§ç»åº”用补ä¸" #: builtin/am.c:2289 msgid "synonyms for --continue" msgstr "å’Œ --continue åŒä¹‰" #: builtin/am.c:2292 msgid "skip the current patch" msgstr "跳过当å‰è¡¥ä¸" #: builtin/am.c:2295 msgid "restore the original branch and abort the patching operation." msgstr "æ¢å¤åŽŸå§‹åˆ†æ”¯å¹¶ç»ˆæ¢æ‰“è¡¥ä¸æ“作。" #: builtin/am.c:2299 msgid "lie about committer date" msgstr "将作者日期作为æ交日期" #: builtin/am.c:2301 msgid "use current timestamp for author date" msgstr "用当å‰æ—¶é—´ä½œä¸ºä½œè€…日期" #: builtin/am.c:2303 builtin/commit.c:1590 builtin/merge.c:225 #: builtin/pull.c:155 builtin/revert.c:92 builtin/tag.c:606 msgid "key-id" msgstr "key-id" #: builtin/am.c:2304 msgid "GPG-sign commits" msgstr "使用 GPG ç¾åæ交" #: builtin/am.c:2307 msgid "(internal use for git-rebase)" msgstr "(内部使用,用于 git-rebase)" #: builtin/am.c:2322 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:2329 msgid "failed to read the index" msgstr "æ— æ³•è¯»å–索引" #: builtin/am.c:2344 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "之å‰çš„å˜åŸºç›®å½• %s ä»ç„¶å˜åœ¨ï¼Œä½†å´æ供了 mbox。" #: builtin/am.c:2368 #, c-format msgid "" "Stray %s directory found.\n" "Use \"git am --abort\" to remove it." msgstr "" "å‘现了错误的 %s 目录。\n" "使用 \"git am --abort\" åˆ é™¤å®ƒã€‚" #: builtin/am.c:2374 msgid "Resolve operation not in progress, we are not resuming." msgstr "解决æ“作未进行,我们ä¸ä¼šç»§ç»ã€‚" #: builtin/apply.c:59 msgid "git apply [<options>] [<patch>...]" msgstr "git apply [<选项>] [<è¡¥ä¸>...]" #: builtin/apply.c:112 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "未能识别的空白å—符选项 '%s'" #: builtin/apply.c:127 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "未能识别的空白å—符忽略选项 '%s'" #: builtin/apply.c:822 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "æ— æ³•å‡†å¤‡æ—¶é—´æˆ³æ£åˆ™è¡¨è¾¾å¼ %s" #: builtin/apply.c:831 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec 返回 %d,输入为:%s" #: builtin/apply.c:912 #, c-format msgid "unable to find filename in patch at line %d" msgstr "ä¸èƒ½åœ¨è¡¥ä¸çš„第 %d 行找到文件å" #: builtin/apply.c:944 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s" #: builtin/apply.c:948 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "git apply:错误的 git-diff - 第 %d 行上新文件åä¸ä¸€è‡´" #: builtin/apply.c:949 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件åä¸ä¸€è‡´" #: builtin/apply.c:956 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null" #: builtin/apply.c:1419 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount:æ„外的行:%.*s" #: builtin/apply.c:1476 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "第 %d 行的补ä¸ç‰‡æ®µæ²¡æœ‰å¤´ä¿¡æ¯ï¼š%.*s" #: builtin/apply.c:1493 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " "component (line %d)" msgid_plural "" "git diff header lacks filename information when removing %d leading pathname " "components (line %d)" msgstr[0] "当移除 %d 个å‰å¯¼è·¯å¾„åŽ git diff 头缺ä¹æ–‡ä»¶åä¿¡æ¯ï¼ˆç¬¬ %d 行)" msgstr[1] "当移除 %d 个å‰å¯¼è·¯å¾„åŽ git diff 头缺ä¹æ–‡ä»¶åä¿¡æ¯ï¼ˆç¬¬ %d 行)" #: builtin/apply.c:1659 msgid "new file depends on old contents" msgstr "新文件ä¾èµ–旧内容" #: builtin/apply.c:1661 msgid "deleted file still has contents" msgstr "åˆ é™¤çš„æ–‡ä»¶ä»æœ‰å†…容" #: builtin/apply.c:1687 #, c-format msgid "corrupt patch at line %d" msgstr "è¡¥ä¸åœ¨ç¬¬ %d è¡ŒæŸå" #: builtin/apply.c:1723 #, c-format msgid "new file %s depends on old contents" msgstr "新文件 %s ä¾èµ–旧内容" #: builtin/apply.c:1725 #, c-format msgid "deleted file %s still has contents" msgstr "åˆ é™¤çš„æ–‡ä»¶ %s ä»æœ‰å†…容" #: builtin/apply.c:1728 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** è¦å‘Šï¼šæ–‡ä»¶ %s æˆä¸ºç©ºæ–‡ä»¶ä½†å¹¶æœªåˆ 除" #: builtin/apply.c:1874 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "二进制补ä¸åœ¨ç¬¬ %d è¡ŒæŸå:%.*s" #: builtin/apply.c:1903 #, c-format msgid "unrecognized binary patch at line %d" msgstr "未能识别的二进制补ä¸ä½äºŽç¬¬ %d è¡Œ" #: builtin/apply.c:2054 #, c-format msgid "patch with only garbage at line %d" msgstr "è¡¥ä¸æ–‡ä»¶çš„第 %d è¡Œåªæœ‰åžƒåœ¾æ•°æ®" #: builtin/apply.c:2144 #, c-format msgid "unable to read symlink %s" msgstr "æ— æ³•è¯»å–符å·é“¾æŽ¥ %s" #: builtin/apply.c:2148 #, c-format msgid "unable to open or read %s" msgstr "ä¸èƒ½æ‰“å¼€æˆ–è¯»å– %s" #: builtin/apply.c:2781 #, c-format msgid "invalid start of line: '%c'" msgstr "æ— æ•ˆçš„è¡Œé¦–å—符:'%c'" #: builtin/apply.c:2900 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "å— #%d æˆåŠŸåº”用于 %d(å移 %d 行)" msgstr[1] "å— #%d æˆåŠŸåº”用于 %d(å移 %d 行)" #: builtin/apply.c:2912 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "上下文å‡å°‘到(%ld/%ld)以在第 %d 行应用补ä¸ç‰‡æ®µ" #: builtin/apply.c:2918 #, c-format msgid "" "while searching for:\n" "%.*s" msgstr "" "当查询:\n" "%.*s" #: builtin/apply.c:2938 #, c-format msgid "missing binary patch data for '%s'" msgstr "缺失 '%s' 的二进制补ä¸æ•°æ®" #: builtin/apply.c:3039 #, c-format msgid "binary patch does not apply to '%s'" msgstr "二进制补ä¸æœªåº”用到 '%s'" #: builtin/apply.c:3045 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "到 '%s' 的二进制补ä¸äº§ç”Ÿäº†ä¸æ£ç¡®çš„结果(应为 %s,å´ä¸º %s)" #: builtin/apply.c:3066 #, c-format msgid "patch failed: %s:%ld" msgstr "打补ä¸å¤±è´¥ï¼š%s:%ld" #: builtin/apply.c:3190 #, c-format msgid "cannot checkout %s" msgstr "ä¸èƒ½æ£€å‡º %s" #: builtin/apply.c:3235 builtin/apply.c:3246 builtin/apply.c:3291 #, c-format msgid "read of %s failed" msgstr "è¯»å– %s 失败" #: builtin/apply.c:3243 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "读å–ä½äºŽç¬¦å·é“¾æŽ¥ä¸çš„ '%s'" #: builtin/apply.c:3271 builtin/apply.c:3493 #, c-format msgid "path %s has been renamed/deleted" msgstr "路径 %s å·²ç»è¢«é‡å‘½å/åˆ é™¤" #: builtin/apply.c:3352 builtin/apply.c:3507 #, c-format msgid "%s: does not exist in index" msgstr "%s:ä¸å˜åœ¨äºŽç´¢å¼•ä¸" #: builtin/apply.c:3356 builtin/apply.c:3499 builtin/apply.c:3521 #, c-format msgid "%s: %s" msgstr "%s:%s" #: builtin/apply.c:3361 builtin/apply.c:3515 #, c-format msgid "%s: does not match index" msgstr "%s:和索引ä¸åŒ¹é…" #: builtin/apply.c:3463 msgid "removal patch leaves file contents" msgstr "移除补ä¸ä»ç•™ä¸‹äº†æ–‡ä»¶å†…容" #: builtin/apply.c:3532 #, c-format msgid "%s: wrong type" msgstr "%s:错误类型" #: builtin/apply.c:3534 #, c-format msgid "%s has type %o, expected %o" msgstr "%s 的类型是 %o,应为 %o" #: builtin/apply.c:3693 builtin/apply.c:3695 #, c-format msgid "invalid path '%s'" msgstr "æ— æ•ˆè·¯å¾„ '%s'" #: builtin/apply.c:3750 #, c-format msgid "%s: already exists in index" msgstr "%s:已ç»å˜åœ¨äºŽç´¢å¼•ä¸" #: builtin/apply.c:3753 #, c-format msgid "%s: already exists in working directory" msgstr "%s:已ç»å˜åœ¨äºŽå·¥ä½œåŒºä¸" #: builtin/apply.c:3773 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "%2$s 的新模å¼ï¼ˆ%1$o)和旧模å¼ï¼ˆ%3$o)ä¸åŒ¹é…" #: builtin/apply.c:3778 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "%2$s 的新模å¼ï¼ˆ%1$o)和 %4$s 的旧模å¼ï¼ˆ%3$o)ä¸åŒ¹é…" #: builtin/apply.c:3798 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "å—å½±å“的文件 '%s' ä½äºŽç¬¦å·é“¾æŽ¥ä¸" #: builtin/apply.c:3802 #, c-format msgid "%s: patch does not apply" msgstr "%s:补ä¸æœªåº”用" #: builtin/apply.c:3816 #, c-format msgid "Checking patch %s..." msgstr "æ£€æŸ¥è¡¥ä¸ %s..." #: builtin/apply.c:3909 builtin/checkout.c:232 builtin/reset.c:135 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "对路径 '%s' çš„ make_cache_entry æ“作失败" #: builtin/apply.c:4052 #, c-format msgid "unable to remove %s from index" msgstr "ä¸èƒ½ä»Žç´¢å¼•ä¸ç§»é™¤ %s" #: builtin/apply.c:4081 #, c-format msgid "corrupt patch for submodule %s" msgstr "å模组 %s æŸåçš„è¡¥ä¸" #: builtin/apply.c:4085 #, c-format msgid "unable to stat newly created file '%s'" msgstr "ä¸èƒ½æžšä¸¾æ–°å»ºæ–‡ä»¶ '%s' 的状æ€" #: builtin/apply.c:4090 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "ä¸èƒ½ä¸ºæ–°å»ºæ–‡ä»¶ %s 创建åŽç«¯å˜å‚¨" #: builtin/apply.c:4093 builtin/apply.c:4201 #, c-format msgid "unable to add cache entry for %s" msgstr "æ— æ³•ä¸º %s æ·»åŠ ç¼“å˜æ¡ç›®" #: builtin/apply.c:4126 #, c-format msgid "closing file '%s'" msgstr "å…³é—文件 '%s'" #: builtin/apply.c:4175 #, c-format msgid "unable to write file '%s' mode %o" msgstr "ä¸èƒ½å†™æ–‡ä»¶ '%s' æƒé™ %o" #: builtin/apply.c:4262 #, c-format msgid "Applied patch %s cleanly." msgstr "æˆåŠŸåº”ç”¨è¡¥ä¸ %s。" #: builtin/apply.c:4270 msgid "internal error" msgstr "内部错误" #: builtin/apply.c:4273 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "应用 %%s 个补ä¸ï¼Œå…¶ä¸ %d 个被拒ç»..." msgstr[1] "应用 %%s 个补ä¸ï¼Œå…¶ä¸ %d 个被拒ç»..." #: builtin/apply.c:4283 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "æˆªçŸ .rej 文件å为 %.*s.rej" #: builtin/apply.c:4304 #, c-format msgid "Hunk #%d applied cleanly." msgstr "第 #%d 个片段æˆåŠŸåº”用。" #: builtin/apply.c:4307 #, c-format msgid "Rejected hunk #%d." msgstr "æ‹’ç»ç¬¬ #%d 个片段。" #: builtin/apply.c:4397 msgid "unrecognized input" msgstr "未能识别的输入" #: builtin/apply.c:4408 msgid "unable to read index file" msgstr "æ— æ³•è¯»å–索引文件" #: builtin/apply.c:4526 msgid "don't apply changes matching the given path" msgstr "ä¸è¦åº”用与给出路径å‘匹é…çš„å˜æ›´" #: builtin/apply.c:4529 msgid "apply changes matching the given path" msgstr "应用与给出路径å‘匹é…çš„å˜æ›´" #: builtin/apply.c:4532 msgid "remove <num> leading slashes from traditional diff paths" msgstr "ä»Žä¼ ç»Ÿçš„ diff 路径ä¸ç§»é™¤æŒ‡å®šæ•°é‡çš„å‰å¯¼æ–œçº¿" #: builtin/apply.c:4535 msgid "ignore additions made by the patch" msgstr "忽略补ä¸ä¸çš„æ·»åŠ çš„æ–‡ä»¶" #: builtin/apply.c:4537 msgid "instead of applying the patch, output diffstat for the input" msgstr "ä¸åº”用补ä¸ï¼Œè€Œæ˜¯æ˜¾ç¤ºè¾“入的差异统计(diffstat)" #: builtin/apply.c:4541 msgid "show number of added and deleted lines in decimal notation" msgstr "以åè¿›åˆ¶æ•°æ˜¾ç¤ºæ·»åŠ å’Œåˆ é™¤çš„è¡Œæ•°" #: builtin/apply.c:4543 msgid "instead of applying the patch, output a summary for the input" msgstr "ä¸åº”用补ä¸ï¼Œè€Œæ˜¯æ˜¾ç¤ºè¾“入的概è¦" #: builtin/apply.c:4545 msgid "instead of applying the patch, see if the patch is applicable" msgstr "ä¸åº”用补ä¸ï¼Œè€Œæ˜¯æŸ¥çœ‹è¡¥ä¸æ˜¯å¦å¯åº”用" #: builtin/apply.c:4547 msgid "make sure the patch is applicable to the current index" msgstr "确认补ä¸å¯ä»¥åº”用到当å‰ç´¢å¼•" #: builtin/apply.c:4549 msgid "apply a patch without touching the working tree" msgstr "应用补ä¸è€Œä¸ä¿®æ”¹å·¥ä½œåŒº" #: builtin/apply.c:4551 msgid "accept a patch that touches outside the working area" msgstr "接å—修改工作区之外文件的补ä¸" #: builtin/apply.c:4553 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "还应用æ¤è¡¥ä¸ï¼ˆä¸Ž --stat/--summary/--check 选项åŒæ—¶ä½¿ç”¨ï¼‰" #: builtin/apply.c:4555 msgid "attempt three-way merge if a patch does not apply" msgstr "如果一个补ä¸ä¸èƒ½åº”用则å°è¯•ä¸‰æ–¹åˆå¹¶" #: builtin/apply.c:4557 msgid "build a temporary index based on embedded index information" msgstr "创建一个临时索引基于嵌入的索引信æ¯" #: builtin/apply.c:4559 builtin/checkout-index.c:198 builtin/ls-files.c:412 msgid "paths are separated with NUL character" msgstr "路径以 NUL å—符分隔" #: builtin/apply.c:4562 msgid "ensure at least <n> lines of context match" msgstr "ç¡®ä¿è‡³å°‘åŒ¹é… <n> 行上下文" #: builtin/apply.c:4564 msgid "detect new or modified lines that have whitespace errors" msgstr "检查新增和修改的行ä¸é—´çš„空白å—符滥用" #: builtin/apply.c:4567 builtin/apply.c:4570 msgid "ignore changes in whitespace when finding context" msgstr "查找上下文时忽略空白å—符的å˜æ›´" #: builtin/apply.c:4573 msgid "apply the patch in reverse" msgstr "åå‘应用补ä¸" #: builtin/apply.c:4575 msgid "don't expect at least one line of context" msgstr "æ— éœ€è‡³å°‘ä¸€è¡Œä¸Šä¸‹æ–‡" #: builtin/apply.c:4577 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "将拒ç»çš„è¡¥ä¸ç‰‡æ®µä¿å˜åœ¨å¯¹åº”çš„ *.rej 文件ä¸" #: builtin/apply.c:4579 msgid "allow overlapping hunks" msgstr "å…许é‡å çš„è¡¥ä¸ç‰‡æ®µ" #: builtin/apply.c:4582 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "å…许ä¸æ£ç¡®çš„文件末尾æ¢è¡Œç¬¦" #: builtin/apply.c:4585 msgid "do not trust the line counts in the hunk headers" msgstr "ä¸ä¿¡ä»»è¡¥ä¸ç‰‡æ®µçš„头信æ¯ä¸çš„è¡Œå·" #: builtin/apply.c:4588 msgid "prepend <root> to all filenames" msgstr "为所有文件åå‰æ·»åŠ <æ ¹ç›®å½•>" #: builtin/apply.c:4610 msgid "--3way outside a repository" msgstr "--3way 在一个仓库之外" #: builtin/apply.c:4618 msgid "--index outside a repository" msgstr "--index 在一个仓库之外" #: builtin/apply.c:4621 msgid "--cached outside a repository" msgstr "--cached 在一个仓库之外" #: builtin/apply.c:4640 #, c-format msgid "can't open patch '%s'" msgstr "ä¸èƒ½æ‰“å¼€è¡¥ä¸ '%s'" #: builtin/apply.c:4654 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "抑制下ä»æœ‰ %d 个空白å—符误用" msgstr[1] "抑制下ä»æœ‰ %d 个空白å—符误用" #: builtin/apply.c:4660 builtin/apply.c:4670 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d 行有空白å—符误用。" msgstr[1] "%d 行有空白å—符误用。" #: builtin/archive.c:17 #, c-format msgid "could not create archive file '%s'" msgstr "ä¸èƒ½åˆ›å»ºå½’档文件 '%s'" #: builtin/archive.c:20 msgid "could not redirect output" msgstr "ä¸èƒ½é‡å®šå‘输出" #: builtin/archive.c:37 msgid "git archive: Remote with no URL" msgstr "git archive:未æ供远程 URL" #: builtin/archive.c:58 msgid "git archive: expected ACK/NAK, got EOF" msgstr "git archive:应为 ACK/NACK,å´å¾—到 EOF" #: builtin/archive.c:61 #, c-format msgid "git archive: NACK %s" msgstr "git archive:NACK %s" #: builtin/archive.c:63 #, c-format msgid "remote error: %s" msgstr "远程错误:%s" #: builtin/archive.c:64 msgid "git archive: protocol error" msgstr "git archive:å议错误" #: builtin/archive.c:68 msgid "git archive: expected a flush" msgstr "git archive:应为刷新" #: builtin/bisect--helper.c:7 msgid "git bisect--helper --next-all [--no-checkout]" msgstr "git bisect--helper --next-all [--no-checkout]" #: builtin/bisect--helper.c:17 msgid "perform 'git bisect next'" msgstr "执行 'git bisect next'" #: builtin/bisect--helper.c:19 msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "æ›´æ–° BISECT_HEAD 而éžæ£€å‡ºå½“å‰æ交" #: builtin/blame.c:32 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>" #: builtin/blame.c:37 msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "<版本选项> 的文档记录在 git-rev-list(1) ä¸" #: builtin/blame.c:2500 msgid "Show blame entries as we find them, incrementally" msgstr "增é‡å¼åœ°æ˜¾ç¤ºå‘现的 blame æ¡ç›®" #: builtin/blame.c:2501 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "边界æ交显示空的 SHA-1(默认:关é—)" #: builtin/blame.c:2502 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "ä¸æŠŠæ ¹æ交作为边界(默认:关é—)" #: builtin/blame.c:2503 msgid "Show work cost statistics" msgstr "显示命令消耗统计" #: builtin/blame.c:2504 msgid "Show output score for blame entries" msgstr "æ˜¾ç¤ºåˆ¤æ– blame æ¡ç›®ä½ç§»çš„得分诊æ–ä¿¡æ¯" #: builtin/blame.c:2505 msgid "Show original filename (Default: auto)" msgstr "显示原始文件å(默认:自动)" #: builtin/blame.c:2506 msgid "Show original linenumber (Default: off)" msgstr "显示原始的行å·ï¼ˆé»˜è®¤ï¼šå…³é—)" #: builtin/blame.c:2507 msgid "Show in a format designed for machine consumption" msgstr "显示为一个适åˆæœºå™¨è¯»å–çš„æ ¼å¼" #: builtin/blame.c:2508 msgid "Show porcelain format with per-line commit information" msgstr "为æ¯ä¸€è¡Œæ˜¾ç¤ºæœºå™¨é€‚用的æ交信æ¯" #: builtin/blame.c:2509 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "使用和 git-annotate 相åŒçš„输出模å¼ï¼ˆé»˜è®¤ï¼šå…³é—)" #: builtin/blame.c:2510 msgid "Show raw timestamp (Default: off)" msgstr "显示原始时间戳(默认:关é—)" #: builtin/blame.c:2511 msgid "Show long commit SHA1 (Default: off)" msgstr "显示长的 SHA1 æ交å·ï¼ˆé»˜è®¤ï¼šå…³é—)" #: builtin/blame.c:2512 msgid "Suppress author name and timestamp (Default: off)" msgstr "éšè—作者åå—和时间戳(默认:关é—)" #: builtin/blame.c:2513 msgid "Show author email instead of name (Default: off)" msgstr "显示作者的邮箱而ä¸æ˜¯åå—(默认:关é—)" #: builtin/blame.c:2514 msgid "Ignore whitespace differences" msgstr "忽略空白差异" #: builtin/blame.c:2515 msgid "Spend extra cycles to find better match" msgstr "花费é¢å¤–的循环æ¥æ‰¾åˆ°æ›´å¥½çš„匹é…" #: builtin/blame.c:2516 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "使用æ¥è‡ª <文件> 的修订集而ä¸æ˜¯è°ƒç”¨ git-rev-list" #: builtin/blame.c:2517 msgid "Use <file>'s contents as the final image" msgstr "使用 <文件> 的内容作为最终的图片" #: builtin/blame.c:2518 builtin/blame.c:2519 msgid "score" msgstr "得分" #: builtin/blame.c:2518 msgid "Find line copies within and across files" msgstr "找到文件内åŠè·¨æ–‡ä»¶çš„行拷è´" #: builtin/blame.c:2519 msgid "Find line movements within and across files" msgstr "找到文件内åŠè·¨æ–‡ä»¶çš„行移动" #: builtin/blame.c:2520 msgid "n,m" msgstr "n,m" #: builtin/blame.c:2520 msgid "Process only line range n,m, counting from 1" msgstr "åªå¤„ç†è¡ŒèŒƒå›´åœ¨ n å’Œ m 之间的,从 1 开始" #. 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:2601 msgid "4 years, 11 months ago" msgstr "4 å¹´ 11 个月å‰" #: builtin/branch.c:24 msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]" msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]" #: builtin/branch.c:25 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]" msgstr "git branch [<选项>] [-l] [-f] <分支å> [<起始点>]" #: builtin/branch.c:26 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..." msgstr "git branch [<选项>] [-r] (-d | -D) <分支å>..." #: builtin/branch.c:27 msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>" msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>" # 译者:ä¿æŒåŽŸæ¢è¡Œæ ¼å¼ï¼Œåœ¨è¾“出时 %s 的替代内容会让å—符串å˜é•¿ #: builtin/branch.c:150 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" " '%s', but not yet merged to HEAD." msgstr "" "å°†è¦åˆ 除的分支 '%s' å·²ç»è¢«åˆå¹¶åˆ°\n" " '%s',但未åˆå¹¶åˆ° HEAD。" # 译者:ä¿æŒåŽŸæ¢è¡Œæ ¼å¼ï¼Œåœ¨è¾“出时 %s 的替代内容会让å—符串å˜é•¿ #: builtin/branch.c:154 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" " '%s', even though it is merged to HEAD." msgstr "" "å¹¶æœªåˆ é™¤åˆ†æ”¯ '%s', 虽然它已ç»åˆå¹¶åˆ° HEAD,\n" " 然而å´å°šæœªè¢«åˆå¹¶åˆ°åˆ†æ”¯ '%s' 。" #: builtin/branch.c:168 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "æ— æ³•æŸ¥è¯¢ '%s' 指å‘çš„æ交对象" #: builtin/branch.c:172 #, c-format msgid "" "The branch '%s' is not fully merged.\n" "If you are sure you want to delete it, run 'git branch -D %s'." msgstr "" "分支 '%s' 没有完全åˆå¹¶ã€‚\n" "如果您确认è¦åˆ 除它,执行 'git branch -D %s'。" #: builtin/branch.c:185 msgid "Update of config-file failed" msgstr "æ— æ³•æ›´æ–° config 文件" #: builtin/branch.c:213 msgid "cannot use -a with -d" msgstr "ä¸èƒ½å°† -a å’Œ -d åŒæ—¶ä½¿ç”¨" #: builtin/branch.c:219 msgid "Couldn't look up commit object for HEAD" msgstr "æ— æ³•æŸ¥è¯¢ HEAD 指å‘çš„æ交对象" #: builtin/branch.c:227 #, c-format msgid "Cannot delete the branch '%s' which you are currently on." msgstr "æ— æ³•åˆ é™¤æ‚¨å½“å‰æ‰€åœ¨çš„分支 '%s'。" #: builtin/branch.c:243 #, c-format msgid "remote-tracking branch '%s' not found." msgstr "未能找到远程跟踪分支 '%s'。" #: builtin/branch.c:244 #, c-format msgid "branch '%s' not found." msgstr "分支 '%s' 未å‘现。" #: builtin/branch.c:259 #, c-format msgid "Error deleting remote-tracking branch '%s'" msgstr "æ— æ³•åˆ é™¤è¿œç¨‹è·Ÿè¸ªåˆ†æ”¯ '%s'" #: builtin/branch.c:260 #, c-format msgid "Error deleting branch '%s'" msgstr "æ— æ³•åˆ é™¤åˆ†æ”¯ '%s'" #: builtin/branch.c:267 #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "å·²åˆ é™¤è¿œç¨‹è·Ÿè¸ªåˆ†æ”¯ %s(曾为 %s)。\n" #: builtin/branch.c:268 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "å·²åˆ é™¤åˆ†æ”¯ %s(曾为 %s)。\n" #: builtin/branch.c:369 #, c-format msgid "branch '%s' does not point at a commit" msgstr "分支 '%s' 未指å‘一个æ交" #: builtin/branch.c:452 #, c-format msgid "[%s: gone]" msgstr "[%s: 丢失]" #: builtin/branch.c:457 #, c-format msgid "[%s]" msgstr "[%s]" #: builtin/branch.c:462 #, c-format msgid "[%s: behind %d]" msgstr "[%s:è½åŽ %d]" #: builtin/branch.c:464 #, c-format msgid "[behind %d]" msgstr "[è½åŽ %d]" #: builtin/branch.c:468 #, c-format msgid "[%s: ahead %d]" msgstr "[%s:领先 %d]" #: builtin/branch.c:470 #, c-format msgid "[ahead %d]" msgstr "[领先 %d]" #: builtin/branch.c:473 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "[%s:领先 %d,è½åŽ %d]" #: builtin/branch.c:476 #, c-format msgid "[ahead %d, behind %d]" msgstr "[领先 %d,è½åŽ %d]" #: builtin/branch.c:489 msgid " **** invalid ref ****" msgstr " **** æ— æ•ˆå¼•ç”¨ ****" #: builtin/branch.c:580 #, c-format msgid "(no branch, rebasing %s)" msgstr "(éžåˆ†æ”¯ï¼Œæ£å˜åŸº %s)" #: builtin/branch.c:583 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(éžåˆ†æ”¯ï¼ŒäºŒåˆ†æŸ¥æ‰¾å¼€å§‹äºŽ %s)" #: builtin/branch.c:589 #, c-format msgid "(HEAD detached at %s)" msgstr "(头指针分离于 %s)" #: builtin/branch.c:592 #, c-format msgid "(HEAD detached from %s)" msgstr "(头指针分离自 %s)" #: builtin/branch.c:596 msgid "(no branch)" msgstr "(éžåˆ†æ”¯ï¼‰" #: builtin/branch.c:643 #, c-format msgid "object '%s' does not point to a commit" msgstr "对象 '%s' 没有指å‘一个æ交" #: builtin/branch.c:691 msgid "some refs could not be read" msgstr "一些引用ä¸èƒ½è¯»å–" #: builtin/branch.c:704 msgid "cannot rename the current branch while not on any." msgstr "æ— æ³•é‡å‘½å当å‰åˆ†æ”¯å› 为ä¸å¤„于任何分支上。" #: builtin/branch.c:714 #, c-format msgid "Invalid branch name: '%s'" msgstr "æ— æ•ˆçš„åˆ†æ”¯å:'%s'" #: builtin/branch.c:729 msgid "Branch rename failed" msgstr "分支é‡å‘½å失败" #: builtin/branch.c:733 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "é‡å‘½å掉一个错误命å的旧分支 '%s'" #: builtin/branch.c:737 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "分支é‡å‘½å为 %s,但 HEAD 没有更新ï¼" #: builtin/branch.c:744 msgid "Branch is renamed, but update of config-file failed" msgstr "分支被é‡å‘½å,但更新 config 文件失败" #: builtin/branch.c:759 #, c-format msgid "malformed object name %s" msgstr "éžæ³•çš„对象å %s" #: builtin/branch.c:781 #, c-format msgid "could not write branch description template: %s" msgstr "ä¸èƒ½å†™åˆ†æ”¯æ述模版:%s" #: builtin/branch.c:811 msgid "Generic options" msgstr "通用选项" #: builtin/branch.c:813 msgid "show hash and subject, give twice for upstream branch" msgstr "显示哈希值和主题,若å‚数出现两次则显示上游分支" #: builtin/branch.c:814 msgid "suppress informational messages" msgstr "ä¸æ˜¾ç¤ºä¿¡æ¯" #: builtin/branch.c:815 msgid "set up tracking mode (see git-pull(1))" msgstr "设置跟踪模å¼ï¼ˆå‚è§ git-pull(1))" #: builtin/branch.c:817 msgid "change upstream info" msgstr "改å˜ä¸Šæ¸¸ä¿¡æ¯" #: builtin/branch.c:821 msgid "use colored output" msgstr "使用彩色输出" #: builtin/branch.c:822 msgid "act on remote-tracking branches" msgstr "作用于远程跟踪分支" #: builtin/branch.c:825 builtin/branch.c:831 builtin/branch.c:852 #: builtin/branch.c:858 builtin/commit.c:1580 builtin/commit.c:1581 #: builtin/commit.c:1582 builtin/commit.c:1583 builtin/tag.c:618 #: builtin/tag.c:624 msgid "commit" msgstr "æ交" #: builtin/branch.c:826 builtin/branch.c:832 msgid "print only branches that contain the commit" msgstr "åªæ‰“å°åŒ…å«è¯¥æ交的分支" #: builtin/branch.c:838 msgid "Specific git-branch actions:" msgstr "具体的 git-branch 动作:" #: builtin/branch.c:839 msgid "list both remote-tracking and local branches" msgstr "列出远程跟踪åŠæœ¬åœ°åˆ†æ”¯" #: builtin/branch.c:841 msgid "delete fully merged branch" msgstr "åˆ é™¤å®Œå…¨åˆå¹¶çš„分支" #: builtin/branch.c:842 msgid "delete branch (even if not merged)" msgstr "åˆ é™¤åˆ†æ”¯ï¼ˆå³ä½¿æ²¡æœ‰åˆå¹¶ï¼‰" #: builtin/branch.c:843 msgid "move/rename a branch and its reflog" msgstr "移动/é‡å‘½å一个分支,以åŠå®ƒçš„引用日志" #: builtin/branch.c:844 msgid "move/rename a branch, even if target exists" msgstr "移动/é‡å‘½å一个分支,å³ä½¿ç›®æ ‡å·²å˜åœ¨" #: builtin/branch.c:845 msgid "list branch names" msgstr "列出分支å" #: builtin/branch.c:846 msgid "create the branch's reflog" msgstr "创建分支的引用日志" #: builtin/branch.c:848 msgid "edit the description for the branch" msgstr "æ ‡è®°åˆ†æ”¯çš„æè¿°" #: builtin/branch.c:849 msgid "force creation, move/rename, deletion" msgstr "强制创建ã€ç§»åŠ¨/é‡å‘½åã€åˆ 除" #: builtin/branch.c:852 msgid "print only not merged branches" msgstr "åªæ‰“å°æ²¡æœ‰åˆå¹¶çš„分支" #: builtin/branch.c:858 msgid "print only merged branches" msgstr "åªæ‰“å°åˆå¹¶çš„分支" #: builtin/branch.c:862 msgid "list branches in columns" msgstr "以列的方å¼æ˜¾ç¤ºåˆ†æ”¯" #: builtin/branch.c:875 msgid "Failed to resolve HEAD as a valid ref." msgstr "æ— æ³•å°† HEAD 解æžä¸ºæœ‰æ•ˆå¼•ç”¨ã€‚" #: builtin/branch.c:879 builtin/clone.c:690 msgid "HEAD not found below refs/heads!" msgstr "HEAD 没有ä½äºŽ /refs/heads 之下ï¼" #: builtin/branch.c:901 msgid "--column and --verbose are incompatible" msgstr "--column å’Œ --verbose ä¸å…¼å®¹" #: builtin/branch.c:912 builtin/branch.c:951 msgid "branch name required" msgstr "å¿…é¡»æ供分支å" #: builtin/branch.c:927 msgid "Cannot give description to detached HEAD" msgstr "ä¸èƒ½å‘分离头指针æä¾›æè¿°" #: builtin/branch.c:932 msgid "cannot edit description of more than one branch" msgstr "ä¸èƒ½ä¸ºä¸€ä¸ªä»¥ä¸Šçš„分支编辑æè¿°" #: builtin/branch.c:939 #, c-format msgid "No commit on branch '%s' yet." msgstr "分支 '%s' å°šæ— æ交。" #: builtin/branch.c:942 #, c-format msgid "No branch named '%s'." msgstr "没有分支 '%s'。" #: builtin/branch.c:957 msgid "too many branches for a rename operation" msgstr "为é‡å‘½åæ“作æ供了太多的分支å" #: builtin/branch.c:962 msgid "too many branches to set new upstream" msgstr "为设置新上游æ供了太多的分支å" #: builtin/branch.c:966 #, 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:969 builtin/branch.c:991 builtin/branch.c:1012 #, c-format msgid "no such branch '%s'" msgstr "没有æ¤åˆ†æ”¯ '%s'" #: builtin/branch.c:973 #, c-format msgid "branch '%s' does not exist" msgstr "分支 '%s' ä¸å˜åœ¨" #: builtin/branch.c:985 msgid "too many branches to unset upstream" msgstr "为å–消上游设置æ“作æ供了太多的分支å" #: builtin/branch.c:989 msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "æ— æ³•å–消 HEAD çš„ä¸Šæ¸¸è®¾ç½®å› ä¸ºå®ƒæ²¡æœ‰æŒ‡å‘一个分支" #: builtin/branch.c:995 #, c-format msgid "Branch '%s' has no upstream information" msgstr "分支 '%s' 没有上游信æ¯" #: builtin/branch.c:1009 msgid "it does not make sense to create 'HEAD' manually" msgstr "手工创建 'HEAD' 没有æ„义" #: builtin/branch.c:1015 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "'git branch' çš„ -a å’Œ -r 选项带一个分支åå‚数没有æ„义" #: builtin/branch.c:1018 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" "track or --set-upstream-to\n" msgstr "" "选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n" #: builtin/branch.c:1035 #, c-format msgid "" "\n" "If you wanted to make '%s' track '%s', do this:\n" "\n" msgstr "" "\n" "å¦‚æžœä½ æƒ³ç”¨ '%s' 跟踪 '%s', 这么åšï¼š\n" "\n" #: builtin/branch.c:1036 #, c-format msgid " git branch -d %s\n" msgstr " git branch -d %s\n" #: builtin/branch.c:1037 #, c-format msgid " git branch --set-upstream-to %s\n" msgstr " git branch --set-upstream-to %s\n" #: builtin/bundle.c:51 #, c-format msgid "%s is okay\n" msgstr "%s å¯ä»¥\n" #: builtin/bundle.c:64 msgid "Need a repository to create a bundle." msgstr "需è¦ä¸€ä¸ªä»“库æ¥åˆ›å»ºåŒ…。" #: builtin/bundle.c:68 msgid "Need a repository to unbundle." msgstr "需è¦ä¸€ä¸ªä»“库æ¥è§£åŒ…。" #: builtin/cat-file.c:428 msgid "" "git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|" "<type>|--textconv) <object>" msgstr "" "git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|<类型" ">|--textconv) <对象>" #: builtin/cat-file.c:429 msgid "" "git cat-file (--batch | --batch-check) [--follow-symlinks] < <list-of-" "objects>" msgstr "" "git cat-file (--batch | --batch-check) [--follow-symlinks] < <对象列表>" #: builtin/cat-file.c:466 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<类型> å¯ä»¥æ˜¯å…¶ä¸ä¹‹ä¸€ï¼šblobã€treeã€commitã€tag" #: builtin/cat-file.c:467 msgid "show object type" msgstr "显示对象类型" #: builtin/cat-file.c:468 msgid "show object size" msgstr "显示对象大å°" #: builtin/cat-file.c:470 msgid "exit with zero when there's no error" msgstr "当没有错误时退出并返回零" #: builtin/cat-file.c:471 msgid "pretty-print object's content" msgstr "美观地打å°å¯¹è±¡çš„内容" #: builtin/cat-file.c:473 msgid "for blob objects, run textconv on object's content" msgstr "对于数æ®å¯¹è±¡ï¼Œå¯¹å…¶å†…容执行 textconv" #: builtin/cat-file.c:475 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "å…许 -s å’Œ -t 对æŸå的对象生效" #: builtin/cat-file.c:476 msgid "buffer --batch output" msgstr "缓冲 --batch 的输出" #: builtin/cat-file.c:478 msgid "show info and content of objects fed from the standard input" msgstr "æ˜¾ç¤ºä»Žæ ‡å‡†è¾“å…¥æ供的对象的信æ¯å’Œå†…容" #: builtin/cat-file.c:481 msgid "show info about objects fed from the standard input" msgstr "æ˜¾ç¤ºä»Žæ ‡å‡†è¾“å…¥æ供的对象的信æ¯" #: builtin/cat-file.c:484 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "è·Ÿéšæ ‘内符å·é“¾æŽ¥ï¼ˆå’Œ --batch 或 --batch-check 共用)" #: builtin/cat-file.c:486 msgid "show all objects with --batch or --batch-check" msgstr "使用 --batch 或 --batch-check å‚数显示所有对象" #: builtin/check-attr.c:11 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..." msgstr "git check-attr [-a | --all | <属性>...] [--] <路径å>..." #: builtin/check-attr.c:12 msgid "git check-attr --stdin [-z] [-a | --all | <attr>...] < <list-of-paths>" msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...] < <路径列表>" #: builtin/check-attr.c:19 msgid "report all attributes set on file" msgstr "报告设置在文件上的所有属性" #: builtin/check-attr.c:20 msgid "use .gitattributes only from the index" msgstr "åªä½¿ç”¨ç´¢å¼•ä¸çš„ .gitattributes" #: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:96 msgid "read file names from stdin" msgstr "ä»Žæ ‡å‡†è¾“å…¥è¯»å‡ºæ–‡ä»¶å" #: builtin/check-attr.c:23 builtin/check-ignore.c:24 msgid "terminate input and output records by a NUL character" msgstr "输入和输出的记录使用 NUL å—符终结" #: builtin/check-ignore.c:18 builtin/checkout.c:1133 builtin/gc.c:267 msgid "suppress progress reporting" msgstr "ä¸æ˜¾ç¤ºè¿›åº¦æŠ¥å‘Š" #: builtin/check-ignore.c:26 msgid "show non-matching input paths" msgstr "显示未匹é…的输入路径" #: builtin/check-ignore.c:28 msgid "ignore index when checking" msgstr "检查时忽略索引" #: builtin/check-ignore.c:154 msgid "cannot specify pathnames with --stdin" msgstr "ä¸èƒ½åŒæ—¶æŒ‡å®šè·¯å¾„åŠ --stdin å‚æ•°" #: builtin/check-ignore.c:157 msgid "-z only makes sense with --stdin" msgstr "-z 需è¦å’Œ --stdin å‚数共用æ‰æœ‰æ„义" #: builtin/check-ignore.c:159 msgid "no path specified" msgstr "未指定路径" #: builtin/check-ignore.c:163 msgid "--quiet is only valid with a single pathname" msgstr "å‚æ•° --quiet åªåœ¨æ供一个路径å时有效" #: builtin/check-ignore.c:165 msgid "cannot have both --quiet and --verbose" msgstr "ä¸èƒ½åŒæ—¶æä¾› --quiet å’Œ --verbose å‚æ•°" #: builtin/check-ignore.c:168 msgid "--non-matching is only valid with --verbose" msgstr "--non-matching 选项åªåœ¨ä½¿ç”¨ --verbose 时有效" #: builtin/check-mailmap.c:8 msgid "git check-mailmap [<options>] <contact>..." msgstr "git check-mailmap [<选项>] <è”系地å€>..." #: builtin/check-mailmap.c:13 msgid "also read contacts from stdin" msgstr "è¿˜ä»Žæ ‡å‡†è¾“å…¥è¯»å–è”系地å€" #: builtin/check-mailmap.c:24 #, c-format msgid "unable to parse contact: %s" msgstr "ä¸èƒ½è§£æžè”系地å€ï¼š%s" #: builtin/check-mailmap.c:47 msgid "no contacts specified" msgstr "未指定è”系地å€" #: builtin/checkout-index.c:126 msgid "git checkout-index [<options>] [--] [<file>...]" msgstr "git checkout-index [<选项>] [--] [<文件>...]" #: builtin/checkout-index.c:188 msgid "check out all files in the index" msgstr "检出索引区的所有文件" #: builtin/checkout-index.c:189 msgid "force overwrite of existing files" msgstr "强制覆盖现有的文件" #: builtin/checkout-index.c:191 msgid "no warning for existing files and files not in index" msgstr "å˜åœ¨æˆ–ä¸åœ¨ç´¢å¼•ä¸çš„文件都没有è¦å‘Š" #: builtin/checkout-index.c:193 msgid "don't checkout new files" msgstr "ä¸æ£€å‡ºæ–°æ–‡ä»¶" #: builtin/checkout-index.c:195 msgid "update stat information in the index file" msgstr "更新索引ä¸æ–‡ä»¶çš„状æ€ä¿¡æ¯" #: builtin/checkout-index.c:201 msgid "read list of paths from the standard input" msgstr "ä»Žæ ‡å‡†è¾“å…¥è¯»å–路径列表" #: builtin/checkout-index.c:203 msgid "write the content to temporary files" msgstr "将内容写入临时文件" #: builtin/checkout-index.c:204 builtin/column.c:30 msgid "string" msgstr "å—符串" #: builtin/checkout-index.c:205 msgid "when creating files, prepend <string>" msgstr "在创建文件时,在å‰é¢åŠ 上 <å—符串>" #: builtin/checkout-index.c:208 msgid "copy out the files from named stage" msgstr "从指定暂å˜åŒºä¸æ‹·å‡ºæ–‡ä»¶" #: builtin/checkout.c:25 msgid "git checkout [<options>] <branch>" msgstr "git checkout [<选项>] <分支>" #: builtin/checkout.c:26 msgid "git checkout [<options>] [<branch>] -- <file>..." msgstr "git checkout [<选项>] [<分支>] -- <文件>..." #: builtin/checkout.c:133 builtin/checkout.c:166 #, c-format msgid "path '%s' does not have our version" msgstr "路径 '%s' 没有我们的版本" #: builtin/checkout.c:135 builtin/checkout.c:168 #, c-format msgid "path '%s' does not have their version" msgstr "路径 '%s' 没有他们的版本" #: builtin/checkout.c:151 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "路径 '%s' 没有全部必须的版本" #: builtin/checkout.c:195 #, c-format msgid "path '%s' does not have necessary versions" msgstr "路径 '%s' 没有必须的版本" #: builtin/checkout.c:212 #, c-format msgid "path '%s': cannot merge" msgstr "path '%s'ï¼šæ— æ³•åˆå¹¶" #: builtin/checkout.c:229 #, c-format msgid "Unable to add merge result for '%s'" msgstr "æ— æ³•ä¸º '%s' æ·»åŠ åˆå¹¶ç»“æžœ" #: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256 #: builtin/checkout.c:259 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' ä¸èƒ½åœ¨æ›´æ–°è·¯å¾„时使用" #: builtin/checkout.c:262 builtin/checkout.c:265 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' ä¸èƒ½å’Œ %s åŒæ—¶ä½¿ç”¨" #: builtin/checkout.c:268 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "ä¸èƒ½åŒæ—¶æ›´æ–°è·¯å¾„并切æ¢åˆ°åˆ†æ”¯'%s'。" #: builtin/checkout.c:279 builtin/checkout.c:473 msgid "corrupt index file" msgstr "æŸå的索引文件" #: builtin/checkout.c:339 builtin/checkout.c:346 #, c-format msgid "path '%s' is unmerged" msgstr "路径 '%s' 未åˆå¹¶" #: builtin/checkout.c:495 msgid "you need to resolve your current index first" msgstr "您需è¦å…ˆè§£å†³å½“å‰ç´¢å¼•çš„冲çª" #: builtin/checkout.c:622 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "ä¸èƒ½å¯¹ '%s' 执行 reflog æ“作:%s\n" #: builtin/checkout.c:660 msgid "HEAD is now at" msgstr "HEAD ç›®å‰ä½äºŽ" #: builtin/checkout.c:667 #, c-format msgid "Reset branch '%s'\n" msgstr "é‡ç½®åˆ†æ”¯ '%s'\n" #: builtin/checkout.c:670 #, c-format msgid "Already on '%s'\n" msgstr "å·²ç»ä½äºŽ '%s'\n" #: builtin/checkout.c:674 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "切æ¢å¹¶é‡ç½®åˆ†æ”¯ '%s'\n" #: builtin/checkout.c:676 builtin/checkout.c:1065 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "切æ¢åˆ°ä¸€ä¸ªæ–°åˆ†æ”¯ '%s'\n" #: builtin/checkout.c:678 #, c-format msgid "Switched to branch '%s'\n" msgstr "切æ¢åˆ°åˆ†æ”¯ '%s'\n" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: builtin/checkout.c:730 #, c-format msgid " ... and %d more.\n" msgstr " ... åŠå…¶å®ƒ %d 个。\n" #: builtin/checkout.c:736 #, 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:755 #, 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:791 msgid "internal error in revision walk" msgstr "在版本é历时é‡åˆ°å†…部错误" #: builtin/checkout.c:795 msgid "Previous HEAD position was" msgstr "之å‰çš„ HEAD ä½ç½®æ˜¯" #: builtin/checkout.c:822 builtin/checkout.c:1060 msgid "You are on a branch yet to be born" msgstr "您ä½äºŽä¸€ä¸ªå°šæœªåˆå§‹åŒ–的分支" #: builtin/checkout.c:967 #, c-format msgid "only one reference expected, %d given." msgstr "åªè¦ä¸€ä¸ªå¼•ç”¨ï¼Œå´ç»™å‡ºäº† %d 个" #: builtin/checkout.c:1006 builtin/worktree.c:210 #, c-format msgid "invalid reference: %s" msgstr "æ— æ•ˆå¼•ç”¨ï¼š%s" #: builtin/checkout.c:1035 #, c-format msgid "reference is not a tree: %s" msgstr "引用ä¸æ˜¯ä¸€ä¸ªæ ‘:%s" #: builtin/checkout.c:1074 msgid "paths cannot be used with switching branches" msgstr "路径ä¸èƒ½å’Œåˆ‡æ¢åˆ†æ”¯åŒæ—¶ä½¿ç”¨" #: builtin/checkout.c:1077 builtin/checkout.c:1081 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' ä¸èƒ½å’Œåˆ‡æ¢åˆ†æ”¯åŒæ—¶ä½¿ç”¨" #: builtin/checkout.c:1085 builtin/checkout.c:1088 builtin/checkout.c:1093 #: builtin/checkout.c:1096 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' ä¸èƒ½å’Œ '%s' åŒæ—¶ä½¿ç”¨" #: builtin/checkout.c:1101 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "ä¸èƒ½åˆ‡æ¢åˆ†æ”¯åˆ°ä¸€ä¸ªéžæ交 '%s'" #: builtin/checkout.c:1134 builtin/checkout.c:1136 builtin/clone.c:83 #: builtin/remote.c:159 builtin/remote.c:161 builtin/worktree.c:317 #: builtin/worktree.c:319 msgid "branch" msgstr "分支" #: builtin/checkout.c:1135 msgid "create and checkout a new branch" msgstr "创建并检出一个新的分支" #: builtin/checkout.c:1137 msgid "create/reset and checkout a branch" msgstr "创建/é‡ç½®å¹¶æ£€å‡ºä¸€ä¸ªåˆ†æ”¯" #: builtin/checkout.c:1138 msgid "create reflog for new branch" msgstr "为新的分支创建引用日志" #: builtin/checkout.c:1139 msgid "detach the HEAD at named commit" msgstr "æˆä¸ºæŒ‡å‘该æ交的分离头指针" #: builtin/checkout.c:1140 msgid "set upstream info for new branch" msgstr "为新的分支设置上游信æ¯" #: builtin/checkout.c:1142 msgid "new-branch" msgstr "新分支" #: builtin/checkout.c:1142 msgid "new unparented branch" msgstr "新的没有父æ交的分支" #: builtin/checkout.c:1143 msgid "checkout our version for unmerged files" msgstr "对尚未åˆå¹¶çš„文件检出我们的版本" #: builtin/checkout.c:1145 msgid "checkout their version for unmerged files" msgstr "对尚未åˆå¹¶çš„文件检出他们的版本" #: builtin/checkout.c:1147 msgid "force checkout (throw away local modifications)" msgstr "强制检出(丢弃本地修改)" #: builtin/checkout.c:1148 msgid "perform a 3-way merge with the new branch" msgstr "和新的分支执行三方åˆå¹¶" #: builtin/checkout.c:1149 builtin/merge.c:227 msgid "update ignored files (default)" msgstr "更新忽略的文件(默认)" #: builtin/checkout.c:1150 builtin/log.c:1264 parse-options.h:249 msgid "style" msgstr "é£Žæ ¼" #: builtin/checkout.c:1151 msgid "conflict style (merge or diff3)" msgstr "冲çªè¾“å‡ºé£Žæ ¼ï¼ˆmerge 或 diff3)" #: builtin/checkout.c:1154 msgid "do not limit pathspecs to sparse entries only" msgstr "对路径ä¸åšç¨€ç–检出的é™åˆ¶" #: builtin/checkout.c:1156 msgid "second guess 'git checkout <no-such-branch>'" msgstr "二次猜测'git checkout <æ— æ¤åˆ†æ”¯>'" #: builtin/checkout.c:1158 msgid "do not check if another worktree is holding the given ref" msgstr "ä¸æ£€æŸ¥æŒ‡å®šçš„引用是å¦è¢«å…¶ä»–工作区所å 用" #: builtin/checkout.c:1181 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-bã€-B å’Œ --orphan 是互斥的" #: builtin/checkout.c:1198 msgid "--track needs a branch name" msgstr "--track 需è¦ä¸€ä¸ªåˆ†æ”¯å" #: builtin/checkout.c:1203 msgid "Missing branch name; try -b" msgstr "缺少分支åï¼›å°è¯• -b" #: builtin/checkout.c:1239 msgid "invalid path specification" msgstr "æ— æ•ˆçš„è·¯å¾„è§„æ ¼" #: builtin/checkout.c:1246 #, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" "Did you intend to checkout '%s' which can not be resolved as commit?" msgstr "" "ä¸èƒ½åŒæ—¶æ›´æ–°è·¯å¾„并切æ¢åˆ°åˆ†æ”¯'%s'。\n" "您是想è¦æ£€å‡º '%s' 但其未能解æžä¸ºæ交么?" #: builtin/checkout.c:1251 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout:--detach ä¸èƒ½æŽ¥æ”¶è·¯å¾„å‚æ•° '%s'" #: builtin/checkout.c:1255 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:25 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:29 #, c-format msgid "Removing %s\n" msgstr "æ£åˆ 除 %s\n" #: builtin/clean.c:30 #, c-format msgid "Would remove %s\n" msgstr "å°†åˆ é™¤ %s\n" #: builtin/clean.c:31 #, c-format msgid "Skipping repository %s\n" msgstr "忽略仓库 %s\n" #: builtin/clean.c:32 #, c-format msgid "Would skip repository %s\n" msgstr "将忽略仓库 %s\n" #: builtin/clean.c:33 #, c-format msgid "failed to remove %s" msgstr "æ— æ³•åˆ é™¤ %s" #: builtin/clean.c:317 msgid "" "Prompt help:\n" "1 - select a numbered item\n" "foo - select item based on unique prefix\n" " - (empty) select nothing" msgstr "" "帮助:\n" "1 - 通过编å·é€‰æ‹©ä¸€ä¸ªé€‰é¡¹\n" "foo - é€šè¿‡æ ‡é¢˜é€‰æ‹©ä¸€ä¸ªé€‰é¡¹\n" " - (空)什么也ä¸é€‰æ‹©" #: builtin/clean.c:321 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" msgstr "" "帮助:\n" "1 - 选择一个选项\n" "3-5 - 选择一个范围内的所有选项\n" "2-3,6-9 - 选择多个范围内的所有选项\n" "foo - é€šè¿‡æ ‡é¢˜é€‰æ‹©ä¸€ä¸ªé€‰é¡¹\n" "-... - å选特定的选项\n" "* - 选择所有选项\n" " - (空)结æŸé€‰æ‹©" #: builtin/clean.c:537 #, c-format msgid "Huh (%s)?" msgstr "嗯(%s)?" #: builtin/clean.c:679 #, c-format msgid "Input ignore patterns>> " msgstr "输入模版以排除æ¡ç›®>> " #: builtin/clean.c:716 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "è¦å‘Šï¼šæ— 法找到和 %s 匹é…çš„æ¡ç›®" #: builtin/clean.c:737 msgid "Select items to delete" msgstr "选择è¦åˆ 除的æ¡ç›®" #. TRANSLATORS: Make sure to keep [y/N] as is #: builtin/clean.c:778 #, c-format msgid "Remove %s [y/N]? " msgstr "åˆ é™¤ %s [y/N]?" #: builtin/clean.c:803 msgid "Bye." msgstr "å†è§ã€‚" #: builtin/clean.c:811 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:838 msgid "*** Commands ***" msgstr "*** 命令 ***" #: builtin/clean.c:839 msgid "What now" msgstr "请选择" #: builtin/clean.c:847 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "å°†åˆ é™¤å¦‚ä¸‹æ¡ç›®ï¼š" msgstr[1] "å°†åˆ é™¤å¦‚ä¸‹æ¡ç›®ï¼š" #: builtin/clean.c:864 msgid "No more files to clean, exiting." msgstr "没有è¦æ¸…ç†çš„文件,退出。" #: builtin/clean.c:895 msgid "do not print names of files removed" msgstr "ä¸æ‰“å°åˆ 除文件的å称" #: builtin/clean.c:897 msgid "force" msgstr "强制" #: builtin/clean.c:898 msgid "interactive cleaning" msgstr "交互å¼æ¸…除" #: builtin/clean.c:900 msgid "remove whole directories" msgstr "åˆ é™¤æ•´ä¸ªç›®å½•" #: builtin/clean.c:901 builtin/describe.c:407 builtin/grep.c:714 #: builtin/ls-files.c:443 builtin/name-rev.c:311 builtin/show-ref.c:187 msgid "pattern" msgstr "模å¼" #: builtin/clean.c:902 msgid "add <pattern> to ignore rules" msgstr "æ·»åŠ <模å¼> 到忽略规则" #: builtin/clean.c:903 msgid "remove ignored files, too" msgstr "ä¹Ÿåˆ é™¤å¿½ç•¥çš„æ–‡ä»¶" #: builtin/clean.c:905 msgid "remove only ignored files" msgstr "åªåˆ 除忽略的文件" #: builtin/clean.c:923 msgid "-x and -X cannot be used together" msgstr "-x å’Œ -X ä¸èƒ½åŒæ—¶ä½¿ç”¨" #: builtin/clean.c:927 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:930 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:37 msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<选项>] [--] <仓库> [<路径>]" #: builtin/clone.c:57 builtin/fetch.c:112 builtin/merge.c:224 #: builtin/pull.c:109 builtin/push.c:560 builtin/send-pack.c:168 msgid "force progress reporting" msgstr "强制显示进度报告" #: builtin/clone.c:59 msgid "don't create a checkout" msgstr "ä¸åˆ›å»ºä¸€ä¸ªæ£€å‡º" #: builtin/clone.c:60 builtin/clone.c:62 builtin/init-db.c:504 msgid "create a bare repository" msgstr "创建一个纯仓库" #: builtin/clone.c:64 msgid "create a mirror repository (implies bare)" msgstr "创建一个镜åƒä»“库(也是纯仓库)" #: builtin/clone.c:66 msgid "to clone from a local repository" msgstr "从本地仓库克隆" #: builtin/clone.c:68 msgid "don't use local hardlinks, always copy" msgstr "ä¸ä½¿ç”¨æœ¬åœ°ç¡¬é“¾æŽ¥ï¼Œå§‹ç»ˆå¤åˆ¶" #: builtin/clone.c:70 msgid "setup as shared repository" msgstr "设置为共享仓库" #: builtin/clone.c:72 builtin/clone.c:74 msgid "initialize submodules in the clone" msgstr "在克隆时åˆå§‹åŒ–å模组" #: builtin/clone.c:75 builtin/init-db.c:501 msgid "template-directory" msgstr "模æ¿ç›®å½•" #: builtin/clone.c:76 builtin/init-db.c:502 msgid "directory from which templates will be used" msgstr "模æ¿ç›®å½•å°†è¢«ä½¿ç”¨" #: builtin/clone.c:78 msgid "reference repository" msgstr "å‚考仓库" #: builtin/clone.c:80 msgid "use --reference only while cloning" msgstr "仅在克隆时å‚考 --reference 指å‘的本地仓库" #: builtin/clone.c:81 builtin/column.c:26 builtin/merge-file.c:44 msgid "name" msgstr "å称" #: builtin/clone.c:82 msgid "use <name> instead of 'origin' to track upstream" msgstr "使用 <å称> 而ä¸æ˜¯ 'origin' 去跟踪上游" #: builtin/clone.c:84 msgid "checkout <branch> instead of the remote's HEAD" msgstr "检出 <分支> 而ä¸æ˜¯è¿œç¨‹ HEAD" #: builtin/clone.c:86 msgid "path to git-upload-pack on the remote" msgstr "远程 git-upload-pack 路径" #: builtin/clone.c:87 builtin/fetch.c:113 builtin/grep.c:659 #: builtin/pull.c:186 msgid "depth" msgstr "深度" #: builtin/clone.c:88 msgid "create a shallow clone of that depth" msgstr "创建一个指定深度的浅克隆" #: builtin/clone.c:90 msgid "clone only one branch, HEAD or --branch" msgstr "åªå…‹éš†ä¸€ä¸ªåˆ†æ”¯ã€HEAD 或 --branch" #: builtin/clone.c:91 builtin/init-db.c:510 msgid "gitdir" msgstr "git目录" #: builtin/clone.c:92 builtin/init-db.c:511 msgid "separate git dir from working tree" msgstr "git目录和工作区分离" #: builtin/clone.c:93 msgid "key=value" msgstr "key=value" #: builtin/clone.c:94 msgid "set config inside the new repository" msgstr "在新仓库ä¸è®¾ç½®é…置信æ¯" #: builtin/clone.c:298 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "å‚考仓库 '%s' ä¸æ˜¯ä¸€ä¸ªæœ¬åœ°ä»“库。" #: builtin/clone.c:302 #, c-format msgid "reference repository '%s' is shallow" msgstr "å‚考仓库 '%s' 是一个浅克隆" #: builtin/clone.c:305 #, c-format msgid "reference repository '%s' is grafted" msgstr "å‚考仓库 '%s' 已被å«æŽ¥" #: builtin/clone.c:370 builtin/diff.c:84 #, c-format msgid "failed to stat '%s'" msgstr "æ— æ³•æžšä¸¾ '%s' 状æ€" #: builtin/clone.c:372 #, c-format msgid "%s exists and is not a directory" msgstr "%s å˜åœ¨ä¸”ä¸æ˜¯ä¸€ä¸ªç›®å½•" #: builtin/clone.c:386 #, c-format msgid "failed to stat %s\n" msgstr "æ— æ³•æžšä¸¾ %s 状æ€\n" #: builtin/clone.c:408 #, c-format msgid "failed to create link '%s'" msgstr "æ— æ³•åˆ›å»ºé“¾æŽ¥ '%s'" #: builtin/clone.c:412 #, c-format msgid "failed to copy file to '%s'" msgstr "æ— æ³•æ‹·è´æ–‡ä»¶è‡³ '%s'" #: builtin/clone.c:435 builtin/clone.c:619 #, c-format msgid "done.\n" msgstr "完æˆã€‚\n" #: builtin/clone.c:447 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:524 #, c-format msgid "Could not find remote branch %s to clone." msgstr "ä¸èƒ½å‘现è¦å…‹éš†çš„远程分支 %s。" #: builtin/clone.c:614 #, c-format msgid "Checking connectivity... " msgstr "检查连接... " #: builtin/clone.c:617 msgid "remote did not send all necessary objects" msgstr "远程没有å‘é€æ‰€æœ‰å¿…须的对象" #: builtin/clone.c:681 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "远程 HEAD 指å‘一个ä¸å˜åœ¨çš„å¼•ç”¨ï¼Œæ— æ³•æ£€å‡ºã€‚\n" #: builtin/clone.c:712 msgid "unable to checkout working tree" msgstr "ä¸èƒ½æ£€å‡ºå·¥ä½œåŒº" #: builtin/clone.c:799 msgid "cannot repack to clean up" msgstr "æ— æ³•æ‰§è¡Œ repack æ¥æ¸…ç†" #: builtin/clone.c:801 msgid "cannot unlink temporary alternates file" msgstr "æ— æ³•åˆ é™¤ä¸´æ—¶çš„ alternates 文件" #: builtin/clone.c:831 msgid "Too many arguments." msgstr "太多å‚数。" #: builtin/clone.c:835 msgid "You must specify a repository to clone." msgstr "您必须指定一个仓库æ¥å…‹éš†ã€‚" #: builtin/clone.c:846 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "--bare å’Œ --origin %s 选项ä¸å…¼å®¹ã€‚" #: builtin/clone.c:849 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare å’Œ --separate-git-dir 选项ä¸å…¼å®¹ã€‚" #: builtin/clone.c:862 #, c-format msgid "repository '%s' does not exist" msgstr "仓库 '%s' ä¸å˜åœ¨" #: builtin/clone.c:868 builtin/fetch.c:1168 #, c-format msgid "depth %s is not a positive number" msgstr "深度 %s ä¸æ˜¯ä¸€ä¸ªæ£æ•°" #: builtin/clone.c:878 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "ç›®æ ‡è·¯å¾„ '%s' å·²ç»å˜åœ¨ï¼Œå¹¶ä¸”ä¸æ˜¯ä¸€ä¸ªç©ºç›®å½•ã€‚" #: builtin/clone.c:888 #, c-format msgid "working tree '%s' already exists." msgstr "工作区 '%s' å·²ç»å˜åœ¨ã€‚" #: builtin/clone.c:903 builtin/clone.c:914 builtin/worktree.c:218 #: builtin/worktree.c:245 #, c-format msgid "could not create leading directories of '%s'" msgstr "ä¸èƒ½ä¸º '%s' 创建先导目录" #: builtin/clone.c:906 #, c-format msgid "could not create work tree dir '%s'" msgstr "ä¸èƒ½åˆ›å»ºå·¥ä½œåŒºç›®å½• '%s'" #: builtin/clone.c:924 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "克隆到纯仓库 '%s'...\n" #: builtin/clone.c:926 #, c-format msgid "Cloning into '%s'...\n" msgstr "æ£å…‹éš†åˆ° '%s'...\n" #: builtin/clone.c:951 msgid "--dissociate given, but there is no --reference" msgstr "æ供了å‚æ•° --dissociate,但未æä¾› --reference" #: builtin/clone.c:968 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth 在本地克隆被忽略,改为 file:// å议试试。" #: builtin/clone.c:971 msgid "source repository is shallow, ignoring --local" msgstr "æºä»“库是浅克隆,忽略 --local" #: builtin/clone.c:976 msgid "--local is ignored" msgstr "--local 被忽略" #: builtin/clone.c:980 #, c-format msgid "Don't know how to clone %s" msgstr "ä¸çŸ¥é“如何克隆 %s" #: builtin/clone.c:1029 builtin/clone.c:1037 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "远程分支 %s 在上游 %s 未å‘现" #: builtin/clone.c:1040 msgid "You appear to have cloned an empty repository." msgstr "您似乎克隆了一个空仓库。" #: builtin/column.c:9 msgid "git column [<options>]" msgstr "git column [<选项>]" #: builtin/column.c:26 msgid "lookup config vars" msgstr "查找é…ç½®å˜é‡" #: builtin/column.c:27 builtin/column.c:28 msgid "layout to use" msgstr "è¦ä½¿ç”¨çš„布局" #: builtin/column.c:29 msgid "Maximum width" msgstr "最大宽度" #: builtin/column.c:30 msgid "Padding space on left border" msgstr "左边框的填充空间" #: builtin/column.c:31 msgid "Padding space on right border" msgstr "å³è¾¹æ¡†çš„填充空间" #: builtin/column.c:32 msgid "Padding space between columns" msgstr "两列之间的填充空间" #: builtin/column.c:51 msgid "--command must be the first argument" msgstr "--command 必须是第一个å‚æ•°" #: builtin/commit.c: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 "" "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" #: builtin/commit.c:60 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" "You can suppress this message by setting them explicitly:\n" "\n" " git config --global user.name \"Your Name\"\n" " git config --global user.email you@example.com\n" "\n" "After doing this, you may fix the identity used for this commit with:\n" "\n" " git commit --amend --reset-author\n" msgstr "" "您的姓å和邮件地å€åŸºäºŽç™»å½•å和主机å进行了自动设置。请检查它们æ£ç¡®\n" "与å¦ã€‚您å¯ä»¥å¯¹å…¶è¿›è¡Œè®¾ç½®ä»¥å…å†å‡ºçŽ°æœ¬æ示信æ¯ï¼š\n" "\n" " git config --global user.name \"Your Name\"\n" " git config --global user.email you@example.com\n" "\n" "设置完毕åŽï¼Œæ‚¨å¯ä»¥ç”¨ä¸‹é¢çš„命令æ¥ä¿®æ£æœ¬æ¬¡æ交所使用的用户身份:\n" "\n" " git commit --amend --reset-author\n" #: builtin/commit.c:72 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:77 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:84 msgid "Otherwise, please use 'git reset'\n" msgstr "å¦åˆ™ï¼Œè¯·ä½¿ç”¨å‘½ä»¤ 'git reset'\n" #: builtin/commit.c:87 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:304 msgid "failed to unpack HEAD tree object" msgstr "æ— æ³•è§£åŒ… HEAD æ ‘å¯¹è±¡" #: builtin/commit.c:345 msgid "unable to create temporary index" msgstr "ä¸èƒ½åˆ›å»ºä¸´æ—¶ç´¢å¼•" #: builtin/commit.c:351 msgid "interactive add failed" msgstr "交互å¼æ·»åŠ 失败" #: builtin/commit.c:364 msgid "unable to update temporary index" msgstr "æ— æ³•æ›´æ–°ä¸´æ—¶ç´¢å¼•" #: builtin/commit.c:366 msgid "Failed to update main cache tree" msgstr "ä¸èƒ½æ›´æ–°æ ‘的主缓å˜" #: builtin/commit.c:390 builtin/commit.c:413 builtin/commit.c:462 msgid "unable to write new_index file" msgstr "æ— æ³•å†™ new_index 文件" #: builtin/commit.c:444 msgid "cannot do a partial commit during a merge." msgstr "在åˆå¹¶è¿‡ç¨‹ä¸ä¸èƒ½åšéƒ¨åˆ†æ交。" #: builtin/commit.c:446 msgid "cannot do a partial commit during a cherry-pick." msgstr "在拣选过程ä¸ä¸èƒ½åšéƒ¨åˆ†æ交。" #: builtin/commit.c:455 msgid "cannot read the index" msgstr "æ— æ³•è¯»å–索引" #: builtin/commit.c:474 msgid "unable to write temporary index file" msgstr "æ— æ³•å†™ä¸´æ—¶ç´¢å¼•æ–‡ä»¶" #: builtin/commit.c:579 #, c-format msgid "commit '%s' lacks author header" msgstr "æ交 '%s' 缺少作者信æ¯" #: builtin/commit.c:581 #, c-format msgid "commit '%s' has malformed author line" msgstr "æ交 '%s' 有éžæ³•çš„作者信æ¯" #: builtin/commit.c:600 msgid "malformed --author parameter" msgstr "éžæ³•çš„ --author å‚æ•°" #: builtin/commit.c:608 #, c-format msgid "invalid date format: %s" msgstr "æ— æ•ˆçš„æ—¥æœŸæ ¼å¼ï¼š%s" #: builtin/commit.c:652 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" msgstr "æ— æ³•é€‰æ‹©ä¸€ä¸ªæœªè¢«å½“å‰æ交说明使用的注释å—符" #: builtin/commit.c:689 builtin/commit.c:722 builtin/commit.c:1079 #, c-format msgid "could not lookup commit %s" msgstr "ä¸èƒ½æŸ¥è¯¢æ交 %s" #: builtin/commit.c:701 builtin/shortlog.c:273 #, c-format msgid "(reading log message from standard input)\n" msgstr "(æ£ä»Žæ ‡å‡†è¾“å…¥ä¸è¯»å–日志信æ¯ï¼‰\n" #: builtin/commit.c:703 msgid "could not read log from standard input" msgstr "ä¸èƒ½ä»Žæ ‡å‡†è¾“å…¥ä¸è¯»å–日志信æ¯" #: builtin/commit.c:707 #, c-format msgid "could not read log file '%s'" msgstr "ä¸èƒ½è¯»å–日志文件 '%s'" #: builtin/commit.c:729 msgid "could not read MERGE_MSG" msgstr "ä¸èƒ½è¯»å– MERGE_MSG" #: builtin/commit.c:733 msgid "could not read SQUASH_MSG" msgstr "ä¸èƒ½è¯»å– SQUASH_MSG" #: builtin/commit.c:784 msgid "could not write commit template" msgstr "ä¸èƒ½å†™æ交模版" #: builtin/commit.c:802 #, 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:807 #, 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:820 #, 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:827 #, 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:847 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%s作者: %.*s <%.*s>" # 译者:为ä¿è¯åœ¨è¾“出ä¸å¯¹é½ï¼Œæ³¨æ„调整å¥ä¸ç©ºæ ¼ï¼ #: builtin/commit.c:855 #, c-format msgid "%sDate: %s" msgstr "%s日期: %s" # 译者:为ä¿è¯åœ¨è¾“出ä¸å¯¹é½ï¼Œæ³¨æ„调整å¥ä¸ç©ºæ ¼ï¼ #: builtin/commit.c:862 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sæ交者:%.*s <%.*s>" #: builtin/commit.c:880 msgid "Cannot read index" msgstr "æ— æ³•è¯»å–索引" #: builtin/commit.c:937 msgid "Error building trees" msgstr "æ— æ³•åˆ›å»ºæ ‘å¯¹è±¡" #: builtin/commit.c:952 builtin/tag.c:495 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "请使用 -m 或 -F 选项æä¾›æ交说明。\n" #: builtin/commit.c:1054 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "--author '%s' ä¸æ˜¯ 'Name <email>' æ ¼å¼ï¼Œä¸”未能在现有作者ä¸æ‰¾åˆ°åŒ¹é…" #: builtin/commit.c:1069 builtin/commit.c:1309 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "æ— æ•ˆçš„æœªè¿½è¸ªæ–‡ä»¶å‚æ•° '%s'" #: builtin/commit.c:1106 msgid "--long and -z are incompatible" msgstr "--long å’Œ -z 选项ä¸å…¼å®¹" #: builtin/commit.c:1136 msgid "Using both --reset-author and --author does not make sense" msgstr "åŒæ—¶ä½¿ç”¨ --reset-author å’Œ --author 没有æ„义" #: builtin/commit.c:1145 msgid "You have nothing to amend." msgstr "您没有å¯ä¿®è¡¥çš„æ交。" #: builtin/commit.c:1148 msgid "You are in the middle of a merge -- cannot amend." msgstr "您æ£å¤„于一个åˆå¹¶è¿‡ç¨‹ä¸ -- æ— æ³•ä¿®è¡¥æ交。" #: builtin/commit.c:1150 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "您æ£å¤„äºŽä¸€ä¸ªæ‹£é€‰è¿‡ç¨‹ä¸ -- æ— æ³•ä¿®è¡¥æ交。" #: builtin/commit.c:1153 msgid "Options --squash and --fixup cannot be used together" msgstr "选项 --squash å’Œ --fixup ä¸èƒ½åŒæ—¶ä½¿ç”¨" #: builtin/commit.c:1163 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "åªèƒ½ç”¨ä¸€ä¸ª -c/-C/-F/--fixup 选项。" #: builtin/commit.c:1165 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "选项 -m ä¸èƒ½å’Œ -c/-C/-F/--fixup åŒæ—¶ä½¿ç”¨ã€‚" #: builtin/commit.c:1173 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author åªèƒ½å’Œ -Cã€-c 或 --amend åŒæ—¶ä½¿ç”¨ã€‚" #: builtin/commit.c:1190 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "åªèƒ½ç”¨ä¸€ä¸ª --include/--only/--all/--interactive/--patch 选项。" #: builtin/commit.c:1192 msgid "No paths with --include/--only does not make sense." msgstr "å‚æ•° --include/--only ä¸è·Ÿè·¯å¾„没有æ„义。" #: builtin/commit.c:1194 msgid "Clever... amending the last one with dirty index." msgstr "èªæ˜Ž... 用è„索引修补最åŽä¸€ä¸ªæ交。" #: builtin/commit.c:1196 msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "指定了明确的路径而没有使用 -i 或 -o 选项,认为是 --only paths..." #: builtin/commit.c:1208 builtin/tag.c:730 #, c-format msgid "Invalid cleanup mode %s" msgstr "æ— æ•ˆçš„æ¸…ç†æ¨¡å¼ %s" #: builtin/commit.c:1213 msgid "Paths with -a does not make sense." msgstr "路径和 -a 选项åŒæ—¶ä½¿ç”¨æ²¡æœ‰æ„义。" #: builtin/commit.c:1323 builtin/commit.c:1602 msgid "show status concisely" msgstr "以简æ´çš„æ ¼å¼æ˜¾ç¤ºçŠ¶æ€" #: builtin/commit.c:1325 builtin/commit.c:1604 msgid "show branch information" msgstr "显示分支信æ¯" #: builtin/commit.c:1327 builtin/commit.c:1606 builtin/push.c:546 msgid "machine-readable output" msgstr "机器å¯è¯»çš„输出" #: builtin/commit.c:1330 builtin/commit.c:1608 msgid "show status in long format (default)" msgstr "ä»¥é•¿æ ¼å¼æ˜¾ç¤ºçŠ¶æ€ï¼ˆé»˜è®¤ï¼‰" #: builtin/commit.c:1333 builtin/commit.c:1611 msgid "terminate entries with NUL" msgstr "æ¡ç›®ä»¥ NUL å—符结尾" #: builtin/commit.c:1335 builtin/commit.c:1614 builtin/fast-export.c:981 #: builtin/fast-export.c:984 builtin/tag.c:604 msgid "mode" msgstr "模å¼" #: builtin/commit.c:1336 builtin/commit.c:1614 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "显示未跟踪的文件,“模å¼â€çš„å¯é€‰å‚数:allã€normalã€no。(默认:all)" #: builtin/commit.c:1339 msgid "show ignored files" msgstr "显示忽略的文件" #: builtin/commit.c:1340 parse-options.h:155 msgid "when" msgstr "何时" #: builtin/commit.c:1341 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" "忽略å模组的更改,“何时â€çš„å¯é€‰å‚数:allã€dirtyã€untracked。(默认:all)" #: builtin/commit.c:1343 msgid "list untracked files in columns" msgstr "以列的方å¼æ˜¾ç¤ºæœªè·Ÿè¸ªçš„文件" #: builtin/commit.c:1429 msgid "couldn't look up newly created commit" msgstr "æ— æ³•æ‰¾åˆ°æ–°åˆ›å»ºçš„æ交" #: builtin/commit.c:1431 msgid "could not parse newly created commit" msgstr "ä¸èƒ½è§£æžæ–°åˆ›å»ºçš„æ交" #: builtin/commit.c:1476 msgid "detached HEAD" msgstr "分离头指针" # 译者:ä¸æ–‡å—符串拼接,å¯åˆ 除å‰å¯¼ç©ºæ ¼ #: builtin/commit.c:1479 msgid " (root-commit)" msgstr "ï¼ˆæ ¹æ交)" #: builtin/commit.c:1572 msgid "suppress summary after successful commit" msgstr "æ交æˆåŠŸåŽä¸æ˜¾ç¤ºæ¦‚è¿°ä¿¡æ¯" #: builtin/commit.c:1573 msgid "show diff in commit message template" msgstr "在æ交说明模æ¿é‡Œæ˜¾ç¤ºå·®å¼‚" #: builtin/commit.c:1575 msgid "Commit message options" msgstr "æ交说明选项" #: builtin/commit.c:1576 builtin/tag.c:602 msgid "read message from file" msgstr "从文件ä¸è¯»å–æ交说明" #: builtin/commit.c:1577 msgid "author" msgstr "作者" #: builtin/commit.c:1577 msgid "override author for commit" msgstr "æ交时覆盖作者" #: builtin/commit.c:1578 builtin/gc.c:268 msgid "date" msgstr "日期" #: builtin/commit.c:1578 msgid "override date for commit" msgstr "æ交时覆盖日期" #: builtin/commit.c:1579 builtin/merge.c:218 builtin/notes.c:392 #: builtin/notes.c:555 builtin/tag.c:600 msgid "message" msgstr "说明" #: builtin/commit.c:1579 msgid "commit message" msgstr "æ交说明" #: builtin/commit.c:1580 msgid "reuse and edit message from specified commit" msgstr "é‡ç”¨å¹¶ç¼–辑指定æ交的æ交说明" #: builtin/commit.c:1581 msgid "reuse message from specified commit" msgstr "é‡ç”¨æŒ‡å®šæ交的æ交说明" #: builtin/commit.c:1582 msgid "use autosquash formatted message to fixup specified commit" msgstr "使用 autosquash æ ¼å¼çš„æ交说明用以修æ£æŒ‡å®šçš„æ交" #: builtin/commit.c:1583 msgid "use autosquash formatted message to squash specified commit" msgstr "使用 autosquash æ ¼å¼çš„æ交说明用以压缩至指定的æ交" #: builtin/commit.c:1584 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "现在将该æ交的作者改为我(和 -C/-c/--amend å‚数共用)" #: builtin/commit.c:1585 builtin/log.c:1216 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "æ·»åŠ Signed-off-by: ç¾å" #: builtin/commit.c:1586 msgid "use specified template file" msgstr "使用指定的模æ¿æ–‡ä»¶" #: builtin/commit.c:1587 msgid "force edit of commit" msgstr "强制编辑æ交" # 译者:å¯é€‰å€¼ï¼Œä¸èƒ½ç¿»è¯‘(或是原文ä¸ç¬”误,应为 mode) #: builtin/commit.c:1588 msgid "default" msgstr "default" #: builtin/commit.c:1588 builtin/tag.c:605 msgid "how to strip spaces and #comments from message" msgstr "è®¾ç½®å¦‚ä½•åˆ é™¤æäº¤è¯´æ˜Žé‡Œçš„ç©ºæ ¼å’Œ#注释" #: builtin/commit.c:1589 msgid "include status in commit message template" msgstr "在æ交说明模æ¿é‡ŒåŒ…å«çŠ¶æ€ä¿¡æ¯" #: builtin/commit.c:1591 builtin/merge.c:226 builtin/pull.c:156 #: builtin/revert.c:93 msgid "GPG sign commit" msgstr "GPG æ交ç¾å" #: builtin/commit.c:1594 msgid "Commit contents options" msgstr "æ交内容选项" #: builtin/commit.c:1595 msgid "commit all changed files" msgstr "æ交所有改动的文件" #: builtin/commit.c:1596 msgid "add specified files to index for commit" msgstr "æ·»åŠ æŒ‡å®šçš„æ–‡ä»¶åˆ°ç´¢å¼•åŒºç‰å¾…æ交" #: builtin/commit.c:1597 msgid "interactively add files" msgstr "交互å¼æ·»åŠ 文件" #: builtin/commit.c:1598 msgid "interactively add changes" msgstr "交互å¼æ·»åŠ å˜æ›´" #: builtin/commit.c:1599 msgid "commit only specified files" msgstr "åªæ交指定的文件" #: builtin/commit.c:1600 msgid "bypass pre-commit hook" msgstr "绕过 pre-commit é’©å" #: builtin/commit.c:1601 msgid "show what would be committed" msgstr "显示将è¦æ交的内容" #: builtin/commit.c:1612 msgid "amend previous commit" msgstr "修改先å‰çš„æ交" #: builtin/commit.c:1613 msgid "bypass post-rewrite hook" msgstr "绕过 post-rewrite é’©å" #: builtin/commit.c:1618 msgid "ok to record an empty change" msgstr "å…许一个空æ交" #: builtin/commit.c:1620 msgid "ok to record a change with an empty message" msgstr "å…许空的æ交说明" #: builtin/commit.c:1649 msgid "could not parse HEAD commit" msgstr "ä¸èƒ½è§£æž HEAD æ交" #: builtin/commit.c:1695 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "æŸåçš„ MERGE_HEAD 文件(%s)" #: builtin/commit.c:1702 msgid "could not read MERGE_MODE" msgstr "ä¸èƒ½è¯»å– MERGE_MODE" #: builtin/commit.c:1721 #, c-format msgid "could not read commit message: %s" msgstr "ä¸èƒ½è¯»å–æ交说明:%s" #: builtin/commit.c:1732 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "终æ¢æ交;您未更改æ¥è‡ªæ¨¡ç‰ˆçš„æ交说明。\n" #: builtin/commit.c:1737 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "终æ¢æäº¤å› ä¸ºæ交说明为空。\n" #: builtin/commit.c:1785 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/config.c:8 msgid "git config [<options>]" msgstr "git config [<选项>]" #: builtin/config.c:54 msgid "Config file location" msgstr "é…置文件ä½ç½®" #: builtin/config.c:55 msgid "use global config file" msgstr "使用全局é…置文件" #: builtin/config.c:56 msgid "use system config file" msgstr "使用系统级é…置文件" #: builtin/config.c:57 msgid "use repository config file" msgstr "使用仓库级é…置文件" #: builtin/config.c:58 msgid "use given config file" msgstr "使用指定的é…置文件" #: builtin/config.c:59 msgid "blob-id" msgstr "æ•°æ®å¯¹è±¡ ID" #: builtin/config.c:59 msgid "read config from given blob object" msgstr "从给定的数æ®å¯¹è±¡è¯»å–é…ç½®" #: builtin/config.c:60 msgid "Action" msgstr "æ“作" #: builtin/config.c:61 msgid "get value: name [value-regex]" msgstr "获å–值:name [value-regex]" #: builtin/config.c:62 msgid "get all values: key [value-regex]" msgstr "获得所有的值:key [value-regex]" #: builtin/config.c:63 msgid "get values for regexp: name-regex [value-regex]" msgstr "æ ¹æ®æ£åˆ™è¡¨è¾¾å¼èŽ·å¾—值:name-regex [value-regex]" #: builtin/config.c:64 msgid "get value specific for the URL: section[.var] URL" msgstr "获得 URL å–值:section[.var] URL" #: builtin/config.c:65 msgid "replace all matching variables: name value [value_regex]" msgstr "替æ¢æ‰€æœ‰åŒ¹é…çš„å˜é‡ï¼šname value [value_regex]" #: builtin/config.c:66 msgid "add a new variable: name value" msgstr "æ·»åŠ ä¸€ä¸ªæ–°çš„å˜é‡ï¼šname value" #: builtin/config.c:67 msgid "remove a variable: name [value-regex]" msgstr "åˆ é™¤ä¸€ä¸ªå˜é‡ï¼šname [value-regex]" #: builtin/config.c:68 msgid "remove all matches: name [value-regex]" msgstr "åˆ é™¤æ‰€æœ‰åŒ¹é…项:name [value-regex]" #: builtin/config.c:69 msgid "rename section: old-name new-name" msgstr "é‡å‘½åå°èŠ‚:old-name new-name" #: builtin/config.c:70 msgid "remove a section: name" msgstr "åˆ é™¤ä¸€ä¸ªå°èŠ‚:name" #: builtin/config.c:71 msgid "list all" msgstr "列出所有" #: builtin/config.c:72 msgid "open an editor" msgstr "打开一个编辑器" #: builtin/config.c:73 msgid "find the color configured: slot [default]" msgstr "获得é…置的颜色:é…ç½® [默认]" #: builtin/config.c:74 msgid "find the color setting: slot [stdout-is-tty]" msgstr "获得颜色设置:é…ç½® [stdout-is-tty]" #: builtin/config.c:75 msgid "Type" msgstr "类型" #: builtin/config.c:76 msgid "value is \"true\" or \"false\"" msgstr "值是 \"true\" 或 \"false\"" #: builtin/config.c:77 msgid "value is decimal number" msgstr "值是å进制数" #: builtin/config.c:78 msgid "value is --bool or --int" msgstr "值是 --bool or --int" #: builtin/config.c:79 msgid "value is a path (file or directory name)" msgstr "值是一个路径(文件或目录å)" #: builtin/config.c:80 msgid "Other" msgstr "其它" #: builtin/config.c:81 msgid "terminate values with NUL byte" msgstr "终æ¢å€¼æ˜¯ NUL å—节" #: builtin/config.c:82 msgid "show variable names only" msgstr "åªæ˜¾ç¤ºå˜é‡å" #: builtin/config.c:83 msgid "respect include directives on lookup" msgstr "查询时å‚ç…§ include 指令递归查找" #: builtin/config.c:311 msgid "unable to parse default color value" msgstr "ä¸èƒ½è§£æžé»˜è®¤é¢œè‰²å€¼" #: builtin/config.c:449 #, 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:583 #, c-format msgid "cannot create configuration file %s" msgstr "ä¸èƒ½åˆ›å»ºé…置文件 %s" #: builtin/count-objects.c:55 msgid "git count-objects [-v] [-H | --human-readable]" msgstr "git count-objects [-v] [-H | --human-readable]" #: builtin/count-objects.c:65 msgid "print sizes in human readable format" msgstr "以用户å¯è¯»çš„æ ¼å¼æ˜¾ç¤ºå¤§å°" #: builtin/describe.c:17 msgid "git describe [<options>] [<commit-ish>...]" msgstr "git describe [<选项>] [<æ交å·>...]" #: builtin/describe.c:18 msgid "git describe [<options>] --dirty" msgstr "git describe [<选项>] --dirty" #: builtin/describe.c:217 #, c-format msgid "annotated tag %s not available" msgstr "é™„æ³¨æ ‡ç¾ %s æ— æ•ˆ" #: builtin/describe.c:221 #, c-format msgid "annotated tag %s has no embedded name" msgstr "é™„æ³¨æ ‡ç¾ %s 没有嵌入å称" #: builtin/describe.c:223 #, c-format msgid "tag '%s' is really '%s' here" msgstr "æ ‡ç¾ '%s' 的确是在 '%s'" #: builtin/describe.c:250 builtin/log.c:459 #, c-format msgid "Not a valid object name %s" msgstr "ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„对象å %s" #: builtin/describe.c:253 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„ '%s' 对象" #: builtin/describe.c:270 #, c-format msgid "no tag exactly matches '%s'" msgstr "æ²¡æœ‰æ ‡ç¾å‡†ç¡®åŒ¹é… '%s'" #: builtin/describe.c:272 #, c-format msgid "searching to describe %s\n" msgstr "æœç´¢æè¿° %s\n" #: builtin/describe.c:319 #, c-format msgid "finished search at %s\n" msgstr "完æˆæœç´¢ %s\n" #: builtin/describe.c:346 #, c-format msgid "" "No annotated tags can describe '%s'.\n" "However, there were unannotated tags: try --tags." msgstr "" "æ²¡æœ‰é™„æ³¨æ ‡ç¾èƒ½æè¿° '%s'。\n" "然而,å˜åœ¨æœªé™„æ³¨æ ‡ç¾ï¼šå°è¯• --tags。" #: builtin/describe.c:350 #, c-format msgid "" "No tags can describe '%s'.\n" "Try --always, or create some tags." msgstr "" "æ²¡æœ‰æ ‡ç¾èƒ½æè¿° '%s'。\n" "å°è¯• --alwaysï¼Œæˆ–è€…åˆ›å»ºä¸€äº›æ ‡ç¾ã€‚" #: builtin/describe.c:371 #, c-format msgid "traversed %lu commits\n" msgstr "å·²é历 %lu 个æ交\n" #: builtin/describe.c:374 #, 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:396 msgid "find the tag that comes after the commit" msgstr "寻找该æ交之åŽçš„æ ‡ç¾" #: builtin/describe.c:397 msgid "debug search strategy on stderr" msgstr "åœ¨æ ‡å‡†é”™è¯¯ä¸Šè°ƒè¯•æœç´¢ç–ç•¥" #: builtin/describe.c:398 msgid "use any ref" msgstr "使用任æ„引用" #: builtin/describe.c:399 msgid "use any tag, even unannotated" msgstr "使用任æ„æ ‡ç¾ï¼Œå³ä½¿æœªé™„带注释" #: builtin/describe.c:400 msgid "always use long format" msgstr "始终使用长æ交å·æ ¼å¼" #: builtin/describe.c:401 msgid "only follow first parent" msgstr "åªè·Ÿéšç¬¬ä¸€ä¸ªçˆ¶æ交" #: builtin/describe.c:404 msgid "only output exact matches" msgstr "åªè¾“出精确匹é…" #: builtin/describe.c:406 msgid "consider <n> most recent tags (default: 10)" msgstr "考虑最近 <n> ä¸ªæ ‡ç¾ï¼ˆé»˜è®¤ï¼š10)" #: builtin/describe.c:408 msgid "only consider tags matching <pattern>" msgstr "åªè€ƒè™‘åŒ¹é… <模å¼> çš„æ ‡ç¾" #: builtin/describe.c:410 builtin/name-rev.c:318 msgid "show abbreviated commit object as fallback" msgstr "显示简写的æ交å·ä½œä¸ºåŽå¤‡" #: builtin/describe.c:411 msgid "mark" msgstr "æ ‡è®°" #: builtin/describe.c:412 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "对于è„å·¥ä½œåŒºï¼Œè¿½åŠ <æ ‡è®°>(默认:\"-dirty\")" #: builtin/describe.c:430 msgid "--long is incompatible with --abbrev=0" msgstr "--long 与 --abbrev=0 ä¸å…¼å®¹" #: builtin/describe.c:456 msgid "No names found, cannot describe anything." msgstr "没有å‘现åç§°ï¼Œæ— æ³•æ述任何东西。" #: builtin/describe.c:476 msgid "--dirty is incompatible with commit-ishes" msgstr "--dirty ä¸èƒ½ä¸Žæ交åŒæ—¶ä½¿ç”¨" #: builtin/diff.c:86 #, c-format msgid "'%s': not a regular file or symlink" msgstr "'%s':ä¸æ˜¯ä¸€ä¸ªæ£è§„文件或符å·é“¾æŽ¥" #: builtin/diff.c:237 #, c-format msgid "invalid option: %s" msgstr "æ— æ•ˆé€‰é¡¹ï¼š%s" #: builtin/diff.c:358 msgid "Not a git repository" msgstr "ä¸æ˜¯ä¸€ä¸ª git 仓库" #: builtin/diff.c:401 #, c-format msgid "invalid object '%s' given." msgstr "æä¾›äº†æ— æ•ˆå¯¹è±¡ '%s'。" #: builtin/diff.c:410 #, c-format msgid "more than two blobs given: '%s'" msgstr "æ供了超过两个数æ®å¯¹è±¡ï¼š'%s'" #: builtin/diff.c:417 #, c-format msgid "unhandled object '%s' given." msgstr "æ— æ³•å¤„ç†çš„对象 '%s'。" #: builtin/fast-export.c:25 msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [rev-list-opts]" #: builtin/fast-export.c:980 msgid "show progress after <n> objects" msgstr "在 <n> 个对象之åŽæ˜¾ç¤ºè¿›åº¦" #: builtin/fast-export.c:982 msgid "select handling of signed tags" msgstr "选择如何处ç†ç¾åæ ‡ç¾" #: builtin/fast-export.c:985 msgid "select handling of tags that tag filtered objects" msgstr "é€‰æ‹©å½“æ ‡ç¾æŒ‡å‘è¢«è¿‡æ»¤å¯¹è±¡æ—¶è¯¥æ ‡ç¾çš„处ç†æ–¹å¼" #: builtin/fast-export.c:988 msgid "Dump marks to this file" msgstr "æŠŠæ ‡è®°å˜å‚¨åˆ°è¿™ä¸ªæ–‡ä»¶" #: builtin/fast-export.c:990 msgid "Import marks from this file" msgstr "ä»Žè¿™ä¸ªæ–‡ä»¶å¯¼å…¥æ ‡è®°" #: builtin/fast-export.c:992 msgid "Fake a tagger when tags lack one" msgstr "å½“æ ‡ç¾ç¼ºå°‘æ ‡è®°è€…å—段时,å‡è£…æ供一个" #: builtin/fast-export.c:994 msgid "Output full tree for each commit" msgstr "æ¯æ¬¡æäº¤éƒ½è¾“å‡ºæ•´ä¸ªæ ‘" #: builtin/fast-export.c:996 msgid "Use the done feature to terminate the stream" msgstr "使用 done 功能æ¥ç»ˆæ¢æµ" #: builtin/fast-export.c:997 msgid "Skip output of blob data" msgstr "跳过数æ®å¯¹è±¡çš„输出" #: builtin/fast-export.c:998 msgid "refspec" msgstr "å¼•ç”¨è§„æ ¼" #: builtin/fast-export.c:999 msgid "Apply refspec to exported refs" msgstr "å¯¹å¯¼å‡ºçš„å¼•ç”¨åº”ç”¨å¼•ç”¨è§„æ ¼" #: builtin/fast-export.c:1000 msgid "anonymize output" msgstr "匿å输出" #: builtin/fetch.c:20 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<选项>] [<仓库> [<å¼•ç”¨è§„æ ¼>...]]" #: builtin/fetch.c:21 msgid "git fetch [<options>] <group>" msgstr "git fetch [<选项>] <组>" #: builtin/fetch.c:22 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]" #: builtin/fetch.c:23 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<选项>]" #: builtin/fetch.c:90 builtin/pull.c:162 msgid "fetch from all remotes" msgstr "从所有的远程抓å–" #: builtin/fetch.c:92 builtin/pull.c:165 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "è¿½åŠ åˆ° .git/FETCH_HEAD 而ä¸æ˜¯è¦†ç›–它" #: builtin/fetch.c:94 builtin/pull.c:168 msgid "path to upload pack on remote end" msgstr "ä¸Šä¼ åŒ…åˆ°è¿œç¨‹çš„è·¯å¾„" #: builtin/fetch.c:95 builtin/pull.c:170 msgid "force overwrite of local branch" msgstr "强制覆盖本地分支" #: builtin/fetch.c:97 msgid "fetch from multiple remotes" msgstr "从多个远程抓å–" #: builtin/fetch.c:99 builtin/pull.c:172 msgid "fetch all tags and associated objects" msgstr "抓å–æ‰€æœ‰çš„æ ‡ç¾å’Œå…³è”对象" #: builtin/fetch.c:101 msgid "do not fetch all tags (--no-tags)" msgstr "ä¸æŠ“å–ä»»ä½•æ ‡ç¾(--no-tags)" #: builtin/fetch.c:103 builtin/pull.c:175 msgid "prune remote-tracking branches no longer on remote" msgstr "清除远程已ç»ä¸å˜åœ¨çš„分支的跟踪分支" # 译者:å¯é€‰å€¼ï¼Œä¸èƒ½ç¿»è¯‘ #: builtin/fetch.c:104 builtin/pull.c:178 msgid "on-demand" msgstr "on-demand" #: builtin/fetch.c:105 builtin/pull.c:179 msgid "control recursive fetching of submodules" msgstr "控制å模组的递归抓å–" #: builtin/fetch.c:109 builtin/pull.c:184 msgid "keep downloaded pack" msgstr "ä¿æŒä¸‹è½½åŒ…" #: builtin/fetch.c:111 msgid "allow updating of HEAD ref" msgstr "å…许更新 HEAD 引用" #: builtin/fetch.c:114 builtin/pull.c:187 msgid "deepen history of shallow clone" msgstr "深化浅克隆的历å²" #: builtin/fetch.c:116 builtin/pull.c:190 msgid "convert to a complete repository" msgstr "转æ¢ä¸ºä¸€ä¸ªå®Œæ•´çš„仓库" #: builtin/fetch.c:118 builtin/log.c:1233 msgid "dir" msgstr "目录" #: builtin/fetch.c:119 msgid "prepend this to submodule path output" msgstr "在å模组路径输出的å‰é¢åŠ 上æ¤ç›®å½•" #: builtin/fetch.c:122 msgid "default mode for recursion" msgstr "递归的默认模å¼" #: builtin/fetch.c:124 builtin/pull.c:193 msgid "accept refs that update .git/shallow" msgstr "接å—æ›´æ–° .git/shallow 的引用" #: builtin/fetch.c:125 builtin/pull.c:195 msgid "refmap" msgstr "å¼•ç”¨æ˜ å°„" #: builtin/fetch.c:126 builtin/pull.c:196 msgid "specify fetch refmap" msgstr "指定获å–æ“ä½œçš„å¼•ç”¨æ˜ å°„" #: builtin/fetch.c:378 msgid "Couldn't find remote ref HEAD" msgstr "æ— æ³•å‘现远程 HEAD 引用" #: builtin/fetch.c:458 #, c-format msgid "object %s not found" msgstr "对象 %s 未å‘现" #: builtin/fetch.c:463 msgid "[up to date]" msgstr "[最新]" #: builtin/fetch.c:477 #, c-format msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgstr "! %-*s %-*s -> %s (在当å‰åˆ†æ”¯ä¸‹ä¸èƒ½èŽ·å–)" #: builtin/fetch.c:478 builtin/fetch.c:564 msgid "[rejected]" msgstr "[已拒ç»]" #: builtin/fetch.c:489 msgid "[tag update]" msgstr "[æ ‡ç¾æ›´æ–°]" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: builtin/fetch.c:491 builtin/fetch.c:526 builtin/fetch.c:544 msgid " (unable to update local ref)" msgstr " (ä¸èƒ½æ›´æ–°æœ¬åœ°å¼•ç”¨ï¼‰" #: builtin/fetch.c:509 msgid "[new tag]" msgstr "[æ–°æ ‡ç¾]" #: builtin/fetch.c:512 msgid "[new branch]" msgstr "[新分支]" #: builtin/fetch.c:515 msgid "[new ref]" msgstr "[新引用]" #: builtin/fetch.c:560 msgid "unable to update local ref" msgstr "ä¸èƒ½æ›´æ–°æœ¬åœ°å¼•ç”¨" #: builtin/fetch.c:560 msgid "forced update" msgstr "强制更新" #: builtin/fetch.c:566 msgid "(non-fast-forward)" msgstr "(éžå¿«è¿›å¼ï¼‰" #: builtin/fetch.c:600 builtin/fetch.c:842 #, c-format msgid "cannot open %s: %s\n" msgstr "æ— æ³•æ‰“å¼€ %s:%s\n" #: builtin/fetch.c:609 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s 未å‘é€æ‰€æœ‰å¿…须的对象\n" #: builtin/fetch.c:627 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "æ‹’ç» %s å› ä¸ºæµ…å…‹éš†ä¸å…许被更新" #: builtin/fetch.c:715 builtin/fetch.c:807 #, c-format msgid "From %.*s\n" msgstr "æ¥è‡ª %.*s\n" #: builtin/fetch.c:726 #, 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:778 #, c-format msgid " (%s will become dangling)" msgstr " (%s å°†æˆä¸ºæ‘‡æ‘†çŠ¶æ€ï¼‰" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: builtin/fetch.c:779 #, c-format msgid " (%s has become dangling)" msgstr " (%s å·²æˆä¸ºæ‘‡æ‘†çŠ¶æ€ï¼‰" #: builtin/fetch.c:811 msgid "[deleted]" msgstr "[å·²åˆ é™¤]" #: builtin/fetch.c:812 builtin/remote.c:1034 msgid "(none)" msgstr "ï¼ˆæ— ï¼‰" #: builtin/fetch.c:832 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "æ‹’ç»èŽ·å–到éžçº¯ä»“库的当å‰åˆ†æ”¯ %s" #: builtin/fetch.c:851 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s æ˜¯æ— æ•ˆçš„" #: builtin/fetch.c:854 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "选项 \"%s\" 为 %s 所忽略\n" #: builtin/fetch.c:910 #, c-format msgid "Don't know how to fetch from %s" msgstr "ä¸çŸ¥é“如何从 %s 获å–" #: builtin/fetch.c:1071 #, c-format msgid "Fetching %s\n" msgstr "æ£åœ¨èŽ·å– %s\n" #: builtin/fetch.c:1073 builtin/remote.c:90 #, c-format msgid "Could not fetch %s" msgstr "ä¸èƒ½èŽ·å– %s" #: builtin/fetch.c:1091 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:1114 msgid "You need to specify a tag name." msgstr "您需è¦æŒ‡å®šä¸€ä¸ªæ ‡ç¾å称。" #: builtin/fetch.c:1156 msgid "--depth and --unshallow cannot be used together" msgstr "--depth å’Œ --unshallow ä¸èƒ½åŒæ—¶ä½¿ç”¨" #: builtin/fetch.c:1158 msgid "--unshallow on a complete repository does not make sense" msgstr "对于一个完整的仓库,å‚æ•° --unshallow 没有æ„义" #: builtin/fetch.c:1181 msgid "fetch --all does not take a repository argument" msgstr "fetch --all ä¸èƒ½å¸¦ä¸€ä¸ªä»“库å‚æ•°" #: builtin/fetch.c:1183 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all å¸¦å¼•ç”¨è§„æ ¼æ²¡æœ‰ä»»ä½•æ„义" #: builtin/fetch.c:1194 #, c-format msgid "No such remote or remote group: %s" msgstr "æ²¡æœ‰è¿™æ ·çš„è¿œç¨‹æˆ–è¿œç¨‹ç»„ï¼š%s" #: builtin/fetch.c:1202 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "获å–ç»„å¹¶æŒ‡å®šå¼•ç”¨è§„æ ¼æ²¡æœ‰æ„义" #: builtin/fmt-merge-msg.c:14 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:670 msgid "populate log with at most <n> entries from shortlog" msgstr "å‘æ交说明ä¸æœ€å¤šå¤åˆ¶æŒ‡å®šæ¡ç›®ï¼ˆåˆå¹¶è€Œæ¥çš„æ交)的简çŸè¯´æ˜Ž" #: builtin/fmt-merge-msg.c:673 msgid "alias for --log (deprecated)" msgstr "å‚æ•° --log 的别å(已弃用)" #: builtin/fmt-merge-msg.c:676 msgid "text" msgstr "文本" #: builtin/fmt-merge-msg.c:677 msgid "use <text> as start of message" msgstr "使用 <文本> 作为æ交说明的开始" #: builtin/fmt-merge-msg.c:678 msgid "file to read from" msgstr "从文件ä¸è¯»å–" #: builtin/for-each-ref.c:9 msgid "git for-each-ref [<options>] [<pattern>]" msgstr "git for-each-ref [<选项>] [<模å¼>]" #: builtin/for-each-ref.c:24 msgid "quote placeholders suitably for shells" msgstr "引用å ä½ç¬¦é€‚用于 shells" #: builtin/for-each-ref.c:26 msgid "quote placeholders suitably for perl" msgstr "引用å ä½ç¬¦é€‚用于 perl" #: builtin/for-each-ref.c:28 msgid "quote placeholders suitably for python" msgstr "引用å ä½ç¬¦é€‚用于 python" #: builtin/for-each-ref.c:30 msgid "quote placeholders suitably for Tcl" msgstr "引用å ä½ç¬¦é€‚用于 Tcl" #: builtin/for-each-ref.c:33 msgid "show only <n> matched refs" msgstr "åªæ˜¾ç¤º <n> 个匹é…的引用" #: builtin/for-each-ref.c:34 msgid "format to use for the output" msgstr "è¾“å‡ºæ ¼å¼" #: builtin/for-each-ref.c:35 msgid "key" msgstr "key" #: builtin/for-each-ref.c:36 msgid "field name to sort on" msgstr "排åºçš„å—段å" #: builtin/fsck.c:163 builtin/prune.c:137 msgid "Checking connectivity" msgstr "检查连接ä¸" #: builtin/fsck.c:568 msgid "Checking object directories" msgstr "检查对象目录ä¸" #: builtin/fsck.c:631 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<选项>] [<对象>...]" #: builtin/fsck.c:637 msgid "show unreachable objects" msgstr "显示ä¸å¯è¾¾çš„对象" #: builtin/fsck.c:638 msgid "show dangling objects" msgstr "显示摇摆的对象" #: builtin/fsck.c:639 msgid "report tags" msgstr "æŠ¥å‘Šæ ‡ç¾" #: builtin/fsck.c:640 msgid "report root nodes" msgstr "æŠ¥å‘Šæ ¹èŠ‚ç‚¹" #: builtin/fsck.c:641 msgid "make index objects head nodes" msgstr "将索引亦作为检查的头节点" #: builtin/fsck.c:642 msgid "make reflogs head nodes (default)" msgstr "将引用日志作为检查的头节点(默认)" #: builtin/fsck.c:643 msgid "also consider packs and alternate objects" msgstr "也考虑包和备用对象" #: builtin/fsck.c:644 msgid "check only connectivity" msgstr "仅检查连通性" #: builtin/fsck.c:645 msgid "enable more strict checking" msgstr "å¯ç”¨æ›´ä¸¥æ ¼çš„检查" #: builtin/fsck.c:647 msgid "write dangling objects in .git/lost-found" msgstr "将摇摆对象写入 .git/lost-found ä¸" #: builtin/fsck.c:648 builtin/prune.c:107 msgid "show progress" msgstr "显示进度" #: builtin/fsck.c:707 msgid "Checking objects" msgstr "检查对象ä¸" #: builtin/gc.c:25 msgid "git gc [<options>]" msgstr "git gc [<选项>]" #: builtin/gc.c:55 #, c-format msgid "Invalid %s: '%s'" msgstr "æ— æ•ˆ %s:'%s'" #: builtin/gc.c:100 #, c-format msgid "insanely long object directory %.*s" msgstr "ä¸æ£å¸¸çš„长对象目录 %.*s" #: builtin/gc.c:269 msgid "prune unreferenced objects" msgstr "清除未引用的对象" #: builtin/gc.c:271 msgid "be more thorough (increased runtime)" msgstr "æ›´å½»åº•ï¼ˆå¢žåŠ è¿è¡Œæ—¶é—´ï¼‰" #: builtin/gc.c:272 msgid "enable auto-gc mode" msgstr "å¯ç”¨è‡ªåŠ¨åžƒåœ¾å›žæ”¶æ¨¡å¼" #: builtin/gc.c:273 msgid "force running gc even if there may be another gc running" msgstr "强制执行 gc å³ä½¿å¦å¤–一个 gc æ£åœ¨æ‰§è¡Œ" #: builtin/gc.c:315 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "自动在åŽå°æ‰§è¡Œä»“库打包以求最佳性能。\n" #: builtin/gc.c:317 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "自动打包仓库以求最佳性能。\n" #: builtin/gc.c:318 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "手工维护å‚è§ \"git help gc\"。\n" #: builtin/gc.c:336 #, 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:364 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "有太多ä¸å¯è¾¾çš„æ¾æ•£å¯¹è±¡ï¼Œè¿è¡Œ 'git prune' åˆ é™¤å®ƒä»¬ã€‚" #: builtin/grep.c:23 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "git grep [<选项>] [-e] <模å¼> [<版本>...] [[--] <路径>...]" #: builtin/grep.c:218 #, c-format msgid "grep: failed to create thread: %s" msgstr "grepï¼šæ— æ³•åˆ›å»ºçº¿ç¨‹ï¼š%s" #: builtin/grep.c:441 builtin/grep.c:476 #, c-format msgid "unable to read tree (%s)" msgstr "æ— æ³•è¯»å–æ ‘ï¼ˆ%s)" #: builtin/grep.c:491 #, c-format msgid "unable to grep from object of type %s" msgstr "æ— æ³•æŠ“å–æ¥è‡ªäºŽ %s 类型的对象" #: builtin/grep.c:547 #, c-format msgid "switch `%c' expects a numerical value" msgstr "开关 `%c' 期望一个数å—值" #: builtin/grep.c:564 #, c-format msgid "cannot open '%s'" msgstr "ä¸èƒ½æ‰“å¼€ '%s'" #: builtin/grep.c:638 msgid "search in index instead of in the work tree" msgstr "在索引区æœç´¢è€Œä¸æ˜¯åœ¨å·¥ä½œåŒº" #: builtin/grep.c:640 msgid "find in contents not managed by git" msgstr "在未被 git 管ç†çš„内容ä¸æŸ¥æ‰¾" # 译者:ä¸æ–‡å—符串拼接,å¯åˆ 除å‰å¯¼ç©ºæ ¼ #: builtin/grep.c:642 msgid "search in both tracked and untracked files" msgstr "在跟踪和未跟踪的文件ä¸æœç´¢" #: builtin/grep.c:644 msgid "ignore files specified via '.gitignore'" msgstr "忽略 '.gitignore' 包å«çš„文件" #: builtin/grep.c:647 msgid "show non-matching lines" msgstr "显示未匹é…çš„è¡Œ" #: builtin/grep.c:649 msgid "case insensitive matching" msgstr "ä¸åŒºåˆ†å¤§å°å†™åŒ¹é…" #: builtin/grep.c:651 msgid "match patterns only at word boundaries" msgstr "åªåœ¨å•è¯è¾¹ç•ŒåŒ¹é…模å¼" #: builtin/grep.c:653 msgid "process binary files as text" msgstr "把二进制文件当åšæ–‡æœ¬å¤„ç†" #: builtin/grep.c:655 msgid "don't match patterns in binary files" msgstr "ä¸åœ¨äºŒè¿›åˆ¶æ–‡ä»¶ä¸åŒ¹é…模å¼" #: builtin/grep.c:658 msgid "process binary files with textconv filters" msgstr "用 textconv 过滤器处ç†äºŒè¿›åˆ¶æ–‡ä»¶" #: builtin/grep.c:660 msgid "descend at most <depth> levels" msgstr "最多以指定的深度å‘下寻找" #: builtin/grep.c:664 msgid "use extended POSIX regular expressions" msgstr "使用扩展的 POSIX æ£åˆ™è¡¨è¾¾å¼" #: builtin/grep.c:667 msgid "use basic POSIX regular expressions (default)" msgstr "使用基本的 POSIX æ£åˆ™è¡¨è¾¾å¼ï¼ˆé»˜è®¤ï¼‰" #: builtin/grep.c:670 msgid "interpret patterns as fixed strings" msgstr "把模å¼è§£æžä¸ºå›ºå®šçš„å—符串" #: builtin/grep.c:673 msgid "use Perl-compatible regular expressions" msgstr "使用 Perl 兼容的æ£åˆ™è¡¨è¾¾å¼" #: builtin/grep.c:676 msgid "show line numbers" msgstr "显示行å·" #: builtin/grep.c:677 msgid "don't show filenames" msgstr "ä¸æ˜¾ç¤ºæ–‡ä»¶å" #: builtin/grep.c:678 msgid "show filenames" msgstr "显示文件å" #: builtin/grep.c:680 msgid "show filenames relative to top directory" msgstr "显示相对于顶级目录的文件å" #: builtin/grep.c:682 msgid "show only filenames instead of matching lines" msgstr "åªæ˜¾ç¤ºæ–‡ä»¶å而ä¸æ˜¾ç¤ºåŒ¹é…çš„è¡Œ" #: builtin/grep.c:684 msgid "synonym for --files-with-matches" msgstr "å’Œ --files-with-matches åŒä¹‰" #: builtin/grep.c:687 msgid "show only the names of files without match" msgstr "åªæ˜¾ç¤ºæœªåŒ¹é…的文件å" #: builtin/grep.c:689 msgid "print NUL after filenames" msgstr "在文件ååŽè¾“出 NUL å—符" #: builtin/grep.c:691 msgid "show the number of matches instead of matching lines" msgstr "显示总匹é…行数,而ä¸æ˜¾ç¤ºåŒ¹é…çš„è¡Œ" #: builtin/grep.c:692 msgid "highlight matches" msgstr "高亮显示匹é…项" #: builtin/grep.c:694 msgid "print empty line between matches from different files" msgstr "在ä¸åŒæ–‡ä»¶çš„匹é…项之间打å°ç©ºè¡Œ" #: builtin/grep.c:696 msgid "show filename only once above matches from same file" msgstr "åªåœ¨åŒä¸€æ–‡ä»¶çš„匹é…项的上é¢æ˜¾ç¤ºä¸€æ¬¡æ–‡ä»¶å" #: builtin/grep.c:699 msgid "show <n> context lines before and after matches" msgstr "显示匹é…项å‰åŽçš„ <n> 行上下文" #: builtin/grep.c:702 msgid "show <n> context lines before matches" msgstr "显示匹é…é¡¹å‰ <n> 行上下文" #: builtin/grep.c:704 msgid "show <n> context lines after matches" msgstr "显示匹é…é¡¹åŽ <n> 行上下文" #: builtin/grep.c:705 msgid "shortcut for -C NUM" msgstr "å¿«æ·é”® -C æ•°å—" #: builtin/grep.c:708 msgid "show a line with the function name before matches" msgstr "在匹é…çš„å‰é¢æ˜¾ç¤ºä¸€è¡Œå‡½æ•°å" #: builtin/grep.c:710 msgid "show the surrounding function" msgstr "显示所在函数的å‰åŽå†…容" #: builtin/grep.c:713 msgid "read patterns from file" msgstr "从文件读å–模å¼" #: builtin/grep.c:715 msgid "match <pattern>" msgstr "åŒ¹é… <模å¼>" #: builtin/grep.c:717 msgid "combine patterns specified with -e" msgstr "组åˆç”¨ -e å‚数设定的模å¼" #: builtin/grep.c:729 msgid "indicate hit with exit status without output" msgstr "ä¸è¾“出,而用退出ç æ ‡è¯†å‘½ä¸çŠ¶æ€" #: builtin/grep.c:731 msgid "show only matches from files that match all patterns" msgstr "åªæ˜¾ç¤ºåŒ¹é…所有模å¼çš„文件ä¸çš„匹é…" #: builtin/grep.c:733 msgid "show parse tree for grep expression" msgstr "显示 grep 表达å¼çš„解æžæ ‘" #: builtin/grep.c:737 msgid "pager" msgstr "分页" #: builtin/grep.c:737 msgid "show matching files in the pager" msgstr "分页显示匹é…的文件" #: builtin/grep.c:740 msgid "allow calling of grep(1) (ignored by this build)" msgstr "å…许调用 grep(1)(本次构建忽略)" #: builtin/grep.c:741 builtin/show-ref.c:189 msgid "show usage" msgstr "显示用法" #: builtin/grep.c:808 msgid "no pattern given." msgstr "未æ供模å¼åŒ¹é…。" #: builtin/grep.c:866 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager 仅用于工作区" #: builtin/grep.c:892 msgid "--cached or --untracked cannot be used with --no-index." msgstr "--cached 或 --untracked ä¸èƒ½ä¸Ž --no-index åŒæ—¶ä½¿ç”¨ã€‚" #: builtin/grep.c:897 msgid "--no-index or --untracked cannot be used with revs." msgstr "--no-index 或 --untracked ä¸èƒ½å’Œç‰ˆæœ¬åŒæ—¶ä½¿ç”¨ã€‚" #: builtin/grep.c:900 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "--[no-]exclude-standard ä¸èƒ½ç”¨äºŽå·²è·Ÿè¸ªå†…容。" #: builtin/grep.c:908 msgid "both --cached and trees are given." msgstr "åŒæ—¶ç»™å‡ºäº† --cached å’Œæ ‘å¯¹è±¡ã€‚" #: builtin/hash-object.c:80 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:81 msgid "git hash-object --stdin-paths < <list-of-paths>" msgstr "git hash-object --stdin-paths < <路径列表>" #: builtin/hash-object.c:92 builtin/tag.c:614 msgid "type" msgstr "类型" #: builtin/hash-object.c:92 msgid "object type" msgstr "对象类型" #: builtin/hash-object.c:93 msgid "write the object into the object database" msgstr "将对象写入对象数æ®åº“" #: builtin/hash-object.c:95 msgid "read the object from stdin" msgstr "ä»Žæ ‡å‡†è¾“å…¥è¯»å–对象" #: builtin/hash-object.c:97 msgid "store file as is without filters" msgstr "åŽŸæ ·å˜å‚¨æ–‡ä»¶ä¸ä½¿ç”¨è¿‡æ»¤å™¨" #: builtin/hash-object.c:98 msgid "" "just hash any random garbage to create corrupt objects for debugging Git" msgstr "å…许对任æ„éšæœºåžƒåœ¾æ•°æ®åšæ•£åˆ—æ¥åˆ›å»ºæŸå的对象以便调试 Git" #: builtin/hash-object.c:99 msgid "process file as it were from this path" msgstr "处ç†æ–‡ä»¶å¹¶å‡è®¾å…¶æ¥è‡ªäºŽæ¤è·¯å¾„" #: builtin/help.c:41 msgid "print all available commands" msgstr "打å°æ‰€æœ‰å¯ç”¨çš„命令" #: builtin/help.c:42 msgid "print list of useful guides" msgstr "显示有用的指å—列表" #: builtin/help.c:43 msgid "show man page" msgstr "显示 man 手册" #: builtin/help.c:44 msgid "show manual in web browser" msgstr "在 web æµè§ˆå™¨ä¸æ˜¾ç¤ºæ‰‹å†Œ" #: builtin/help.c:46 msgid "show info page" msgstr "显示 info 手册" #: builtin/help.c:52 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]" msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]" #: builtin/help.c:64 #, c-format msgid "unrecognized help format '%s'" msgstr "æœªèƒ½è¯†åˆ«çš„å¸®åŠ©æ ¼å¼ '%s'" #: builtin/help.c:91 msgid "Failed to start emacsclient." msgstr "æ— æ³•å¯åŠ¨ emacsclient。" #: builtin/help.c:104 msgid "Failed to parse emacsclient version." msgstr "æ— æ³•è§£æž emacsclient 版本。" #: builtin/help.c:112 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "emacsclient 版本 '%d' 太è€ï¼ˆ< 22)。" #: builtin/help.c:130 builtin/help.c:158 builtin/help.c:167 builtin/help.c:175 #, c-format msgid "failed to exec '%s': %s" msgstr "æ— æ³•æ‰§è¡Œ '%s':%s" #: builtin/help.c:215 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" "Please consider using 'man.<tool>.cmd' instead." msgstr "" "'%s':ä¸æ”¯æŒçš„ man 手册查看器的路径。\n" "请使用 'man.<工具>.cmd'。" #: builtin/help.c:227 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" "Please consider using 'man.<tool>.path' instead." msgstr "" "'%s': 支æŒçš„ man 手册查看器命令。\n" "请使用 'man.<工具>.path'。" #: builtin/help.c:354 #, c-format msgid "'%s': unknown man viewer." msgstr "'%s':未知的 man 查看器。" #: builtin/help.c:371 msgid "no man viewer handled the request" msgstr "没有 man 查看器处ç†æ¤è¯·æ±‚" #: builtin/help.c:379 msgid "no info viewer handled the request" msgstr "没有 info 查看器处ç†æ¤è¯·æ±‚" #: builtin/help.c:428 msgid "Defining attributes per path" msgstr "定义路径的属性" #: builtin/help.c:429 msgid "Everyday Git With 20 Commands Or So" msgstr "æ¯ä¸€å¤© Git 常用的约 20 æ¡å‘½ä»¤" #: builtin/help.c:430 msgid "A Git glossary" msgstr "Git è¯æ±‡è¡¨" #: builtin/help.c:431 msgid "Specifies intentionally untracked files to ignore" msgstr "忽略指定的未跟踪文件" #: builtin/help.c:432 msgid "Defining submodule properties" msgstr "定义å模组属性" #: builtin/help.c:433 msgid "Specifying revisions and ranges for Git" msgstr "指定 Git 的版本和版本范围" #: builtin/help.c:434 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" msgstr "一个 Git 教程(针对 1.5.1 或更新版本)" #: builtin/help.c:435 msgid "An overview of recommended workflows with Git" msgstr "Git 推è的工作æµæ¦‚览" #: builtin/help.c:447 msgid "The common Git guides are:\n" msgstr "最常用的 Git å‘导有:\n" #: builtin/help.c:468 builtin/help.c:485 #, c-format msgid "usage: %s%s" msgstr "用法:%s%s" #: builtin/help.c:501 #, c-format msgid "`git %s' is aliased to `%s'" msgstr "`git %s' 是 `%s' 的别å" #: builtin/index-pack.c:152 #, c-format msgid "unable to open %s" msgstr "ä¸èƒ½æ‰“å¼€ %s" #: builtin/index-pack.c:202 #, c-format msgid "object type mismatch at %s" msgstr "%s 的对象类型ä¸åŒ¹é…" #: builtin/index-pack.c:222 #, c-format msgid "did not receive expected object %s" msgstr "未能获å–期望的对象 %s" #: builtin/index-pack.c:225 #, c-format msgid "object %s: expected type %s, found %s" msgstr "对象 %s:期待类型 %s,å´æ˜¯ %s" #: builtin/index-pack.c:267 #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "æ— æ³•å¡«å…… %d å—节" msgstr[1] "æ— æ³•å¡«å…… %d å—节" #: builtin/index-pack.c:277 msgid "early EOF" msgstr "过早的文件结æŸç¬¦ï¼ˆEOF)" #: builtin/index-pack.c:278 msgid "read error on input" msgstr "输入上的读错误" #: builtin/index-pack.c:290 msgid "used more bytes than were available" msgstr "用掉了超过å¯ç”¨çš„å—节" #: builtin/index-pack.c:297 msgid "pack too large for current definition of off_t" msgstr "åŒ…å¤ªå¤§è¶…è¿‡äº†å½“å‰ off_t 的定义" #: builtin/index-pack.c:313 #, c-format msgid "unable to create '%s'" msgstr "ä¸èƒ½åˆ›å»º '%s'" #: builtin/index-pack.c:318 #, c-format msgid "cannot open packfile '%s'" msgstr "æ— æ³•æ‰“å¼€åŒ…æ–‡ä»¶ '%s'" #: builtin/index-pack.c:332 msgid "pack signature mismatch" msgstr "包ç¾åä¸åŒ¹é…" #: builtin/index-pack.c:334 #, c-format msgid "pack version %<PRIu32> unsupported" msgstr "ä¸æ”¯æŒåŒ…版本 %<PRIu32>" #: builtin/index-pack.c:352 #, c-format msgid "pack has bad object at offset %lu: %s" msgstr "包ä¸æœ‰é”™è¯¯çš„对象ä½äºŽ %lu:%s" #: builtin/index-pack.c:473 #, c-format msgid "inflate returned %d" msgstr "解压缩返回 %d" #: builtin/index-pack.c:522 msgid "offset value overflow for delta base object" msgstr "å移值覆盖了 delta 基准对象" #: builtin/index-pack.c:530 msgid "delta base offset is out of bound" msgstr "delta 基准å移越界" #: builtin/index-pack.c:538 #, c-format msgid "unknown object type %d" msgstr "未知对象类型 %d" #: builtin/index-pack.c:569 msgid "cannot pread pack file" msgstr "æ— æ³•è¯»å–包文件" #: builtin/index-pack.c:571 #, c-format msgid "premature end of pack file, %lu byte missing" msgid_plural "premature end of pack file, %lu bytes missing" msgstr[0] "包文件过早结æŸï¼Œç¼ºå°‘ %lu å—节" msgstr[1] "包文件过早结æŸï¼Œç¼ºå°‘ %lu å—节" #: builtin/index-pack.c:597 msgid "serious inflate inconsistency" msgstr "解压缩严é‡çš„ä¸ä¸€è‡´" #: builtin/index-pack.c:743 builtin/index-pack.c:749 builtin/index-pack.c:772 #: builtin/index-pack.c:806 builtin/index-pack.c:815 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "å‘现 %s 出现 SHA1 冲çªï¼" #: builtin/index-pack.c:746 builtin/pack-objects.c:162 #: builtin/pack-objects.c:254 #, c-format msgid "unable to read %s" msgstr "ä¸èƒ½è¯» %s" #: builtin/index-pack.c:812 #, c-format msgid "cannot read existing object %s" msgstr "ä¸èƒ½è¯»å–现å˜å¯¹è±¡ %s" #: builtin/index-pack.c:826 #, c-format msgid "invalid blob object %s" msgstr "æ— æ•ˆçš„æ•°æ®å¯¹è±¡ %s" #: builtin/index-pack.c:840 #, c-format msgid "invalid %s" msgstr "æ— æ•ˆçš„ %s" #: builtin/index-pack.c:843 msgid "Error in object" msgstr "对象ä¸å‡ºé”™" #: builtin/index-pack.c:845 #, c-format msgid "Not all child objects of %s are reachable" msgstr "%s 的所有å对象并éžéƒ½å¯è¾¾" #: builtin/index-pack.c:917 builtin/index-pack.c:948 msgid "failed to apply delta" msgstr "æ— æ³•åº”ç”¨ delta" #: builtin/index-pack.c:1118 msgid "Receiving objects" msgstr "接收对象ä¸" #: builtin/index-pack.c:1118 msgid "Indexing objects" msgstr "索引对象ä¸" #: builtin/index-pack.c:1150 msgid "pack is corrupted (SHA1 mismatch)" msgstr "包冲çªï¼ˆSHA1 ä¸åŒ¹é…)" #: builtin/index-pack.c:1155 msgid "cannot fstat packfile" msgstr "ä¸èƒ½æžšä¸¾åŒ…文件状æ€" #: builtin/index-pack.c:1158 msgid "pack has junk at the end" msgstr "包的结尾有垃圾数æ®" #: builtin/index-pack.c:1169 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "parse_pack_objects() ä¸é‡åˆ°ä¸å¯ç†å–»çš„问题" #: builtin/index-pack.c:1194 msgid "Resolving deltas" msgstr "å¤„ç† delta ä¸" #: builtin/index-pack.c:1205 #, c-format msgid "unable to create thread: %s" msgstr "ä¸èƒ½åˆ›å»ºçº¿ç¨‹ï¼š%s" #: builtin/index-pack.c:1247 msgid "confusion beyond insanity" msgstr "ä¸å¯ç†å–»" #: builtin/index-pack.c:1253 #, c-format msgid "completed with %d local objects" msgstr "å®Œæˆ %d 个本地对象" #: builtin/index-pack.c:1263 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "对 %s çš„å°¾éƒ¨æ ¡éªŒå‡ºçŽ°æ„外(ç£ç›˜æŸå?)" #: builtin/index-pack.c:1267 #, 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:1291 #, c-format msgid "unable to deflate appended object (%d)" msgstr "ä¸èƒ½åŽ‹ç¼©é™„åŠ å¯¹è±¡ï¼ˆ%d)" #: builtin/index-pack.c:1367 #, c-format msgid "local object %s is corrupt" msgstr "本地对象 %s å·²æŸå" #: builtin/index-pack.c:1391 msgid "error while closing pack file" msgstr "å…³é—包文件时出错" #: builtin/index-pack.c:1404 #, c-format msgid "cannot write keep file '%s'" msgstr "æ— æ³•å†™ä¿ç•™æ–‡ä»¶ '%s'" #: builtin/index-pack.c:1412 #, c-format msgid "cannot close written keep file '%s'" msgstr "æ— æ³•å…³é—ä¿ç•™æ–‡ä»¶ '%s'" #: builtin/index-pack.c:1425 msgid "cannot store pack file" msgstr "æ— æ³•å˜å‚¨åŒ…文件" #: builtin/index-pack.c:1436 msgid "cannot store index file" msgstr "æ— æ³•å˜å‚¨ç´¢å¼•æ–‡ä»¶" #: builtin/index-pack.c:1469 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "åçš„ pack.indexversion=%<PRIu32>" #: builtin/index-pack.c:1475 #, c-format msgid "invalid number of threads specified (%d)" msgstr "æŒ‡å®šçš„çº¿ç¨‹æ•°æ— æ•ˆï¼ˆ%d)" #: builtin/index-pack.c:1479 builtin/index-pack.c:1663 #, c-format msgid "no threads support, ignoring %s" msgstr "没有线程支æŒï¼Œå¿½ç•¥ %s" #: builtin/index-pack.c:1537 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "æ— æ³•æ‰“å¼€çŽ°å˜åŒ…文件 '%s'" #: builtin/index-pack.c:1539 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "æ— æ³•ä¸º %s 打开包索引文件" #: builtin/index-pack.c:1586 #, 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:1593 #, 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:1623 msgid "Cannot come back to cwd" msgstr "æ— æ³•è¿”å›žå½“å‰å·¥ä½œç›®å½•" #: builtin/index-pack.c:1675 builtin/index-pack.c:1678 #: builtin/index-pack.c:1690 builtin/index-pack.c:1694 #, c-format msgid "bad %s" msgstr "错误选项 %s" #: builtin/index-pack.c:1708 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin ä¸èƒ½å’Œ --stdin åŒæ—¶ä½¿ç”¨" #: builtin/index-pack.c:1712 builtin/index-pack.c:1721 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "包文件å '%s' 没有以 '.pack' 结尾" #: builtin/index-pack.c:1729 msgid "--verify with no packfile name given" msgstr "--verify 没有æ供包文件åå‚æ•°" #: builtin/init-db.c:36 #, c-format msgid "Could not make %s writable by group" msgstr "ä¸èƒ½è®¾ç½® %s 为组å¯å†™" #: builtin/init-db.c:63 #, c-format msgid "insanely long template name %s" msgstr "太长的模版å %s" #: builtin/init-db.c:68 #, c-format msgid "cannot stat '%s'" msgstr "ä¸èƒ½æžšä¸¾ '%s' 状æ€" #: builtin/init-db.c:74 #, c-format msgid "cannot stat template '%s'" msgstr "ä¸èƒ½æžšä¸¾æ¨¡ç‰ˆ '%s' 状æ€" #: builtin/init-db.c:81 #, c-format msgid "cannot opendir '%s'" msgstr "ä¸èƒ½æ‰“开目录 '%s'" #: builtin/init-db.c:98 #, c-format msgid "cannot readlink '%s'" msgstr "ä¸èƒ½è¯»å–链接 '%s'" #: builtin/init-db.c:100 #, c-format msgid "insanely long symlink %s" msgstr "太长的符å·é“¾æŽ¥ %s" #: builtin/init-db.c:103 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "ä¸èƒ½è‡ª '%s' 到 '%s' 创建符å·é“¾æŽ¥" #: builtin/init-db.c:107 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "ä¸èƒ½æ‹·è´ '%s' 至 '%s'" #: builtin/init-db.c:111 #, c-format msgid "ignoring template %s" msgstr "忽略模版 %s" #: builtin/init-db.c:137 #, c-format msgid "insanely long template path %s" msgstr "太长的模版路径 %s" #: builtin/init-db.c:145 #, c-format msgid "templates not found %s" msgstr "模版未找到 %s" #: builtin/init-db.c:158 #, c-format msgid "not copying templates of a wrong format version %d from '%s'" msgstr "没有从 '%2$s' å¤åˆ¶å¸¦æœ‰é”™è¯¯ç‰ˆæœ¬ %1$d 的模版" #: builtin/init-db.c:212 #, c-format msgid "insane git directory %s" msgstr "ä¸æ£å¸¸çš„ git 目录 %s" #: builtin/init-db.c:344 builtin/init-db.c:347 #, c-format msgid "%s already exists" msgstr "%s å·²ç»å˜åœ¨" #: builtin/init-db.c:375 #, c-format msgid "unable to handle file type %d" msgstr "ä¸èƒ½å¤„ç† %d 类型的文件" #: builtin/init-db.c:378 #, c-format msgid "unable to move %s to %s" msgstr "ä¸èƒ½ç§»åŠ¨ %s 至 %s" #. TRANSLATORS: The first '%s' is either "Reinitialized #. existing" or "Initialized empty", the second " shared" or #. "", and the last '%s%s' is the verbatim directory name. #: builtin/init-db.c:434 #, c-format msgid "%s%s Git repository in %s%s\n" msgstr "%s%s Git 仓库于 %s%s\n" #: builtin/init-db.c:435 msgid "Reinitialized existing" msgstr "é‡æ–°åˆå§‹åŒ–现å˜çš„" #: builtin/init-db.c:435 msgid "Initialized empty" msgstr "åˆå§‹åŒ–空的" # 译者:ä¸æ–‡å—符串拼接,å¯åˆ 除å‰å¯¼ç©ºæ ¼ #: builtin/init-db.c:436 msgid " shared" msgstr "共享" #: builtin/init-db.c:483 msgid "" "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" "shared[=<permissions>]] [<directory>]" msgstr "" "git init [-q | --quiet] [--bare] [--template=<模æ¿ç›®å½•>] [--shared[=<æƒé™>]] " "[<目录>]" #: builtin/init-db.c:506 msgid "permissions" msgstr "æƒé™" #: builtin/init-db.c:507 msgid "specify that the git repository is to be shared amongst several users" msgstr "指定 git 仓库是多个用户之间共享的" #: builtin/init-db.c:541 builtin/init-db.c:546 #, c-format msgid "cannot mkdir %s" msgstr "ä¸èƒ½åˆ›å»ºç›®å½• %s" #: builtin/init-db.c:550 #, c-format msgid "cannot chdir to %s" msgstr "ä¸èƒ½åˆ‡æ¢ç›®å½•åˆ° %s" #: builtin/init-db.c:571 #, 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:599 #, c-format msgid "Cannot access work tree '%s'" msgstr "ä¸èƒ½è®¿é—®å·¥ä½œåŒº '%s'" #: builtin/interpret-trailers.c:15 msgid "" "git interpret-trailers [--trim-empty] [(--trailer <token>[(=|:)<value>])...] " "[<file>...]" msgstr "" "git interpret-trailers [--trim-empty] [(--trailer <é”®>[(=|:)<值>])...] [<文件" ">...]" #: builtin/interpret-trailers.c:25 msgid "trim empty trailers" msgstr "åˆ é™¤ç©ºç¾å" #: builtin/interpret-trailers.c:26 msgid "trailer" msgstr "ç¾å" #: builtin/interpret-trailers.c:27 msgid "trailer(s) to add" msgstr "è¦æ·»åŠ çš„ç¾å" #: builtin/log.c:43 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]" #: builtin/log.c:44 msgid "git show [<options>] <object>..." msgstr "git show [<选项>] <对象>..." #: builtin/log.c:83 #, c-format msgid "invalid --decorate option: %s" msgstr "æ— æ•ˆçš„ --decorate 选项:%s" #: builtin/log.c:131 msgid "suppress diff output" msgstr "ä¸æ˜¾ç¤ºå·®å¼‚输出" #: builtin/log.c:132 msgid "show source" msgstr "显示æº" #: builtin/log.c:133 msgid "Use mail map file" msgstr "ä½¿ç”¨é‚®ä»¶æ˜ å°„æ–‡ä»¶" #: builtin/log.c:134 msgid "decorate options" msgstr "修饰选项" #: builtin/log.c:137 msgid "Process line range n,m in file, counting from 1" msgstr "处ç†æ–‡ä»¶ä¸ç¬¬ n 到 m 之间的行,从 1 开始" #: builtin/log.c:233 #, c-format msgid "Final output: %d %s\n" msgstr "最终输出:%d %s\n" #: builtin/log.c:465 #, c-format msgid "git show %s: bad file" msgstr "git show %s: æŸå的文件" #: builtin/log.c:479 builtin/log.c:572 #, c-format msgid "Could not read object %s" msgstr "ä¸èƒ½è¯»å–对象 %s" #: builtin/log.c:596 #, c-format msgid "Unknown type: %d" msgstr "未知类型:%d" #: builtin/log.c:714 msgid "format.headers without value" msgstr "format.headers 没有值" #: builtin/log.c:798 msgid "name of output directory is too long" msgstr "输出目录å太长" #: builtin/log.c:814 #, c-format msgid "Cannot open patch file %s" msgstr "æ— æ³•æ‰“å¼€è¡¥ä¸æ–‡ä»¶ %s" #: builtin/log.c:828 msgid "Need exactly one range." msgstr "åªéœ€è¦ä¸€ä¸ªèŒƒå›´ã€‚" #: builtin/log.c:838 msgid "Not a range." msgstr "ä¸æ˜¯ä¸€ä¸ªèŒƒå›´ã€‚" #: builtin/log.c:944 msgid "Cover letter needs email format" msgstr "ä¿¡å°éœ€è¦é‚®ä»¶åœ°å€æ ¼å¼" #: builtin/log.c:1023 #, c-format msgid "insane in-reply-to: %s" msgstr "ä¸æ£å¸¸çš„ in-reply-to:%s" #: builtin/log.c:1051 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<选项>] [<从> | <版本范围>]" #: builtin/log.c:1096 msgid "Two output directories?" msgstr "两个输出目录?" #: builtin/log.c:1211 msgid "use [PATCH n/m] even with a single patch" msgstr "使用 [PATCH n/m],å³ä½¿åªæœ‰ä¸€ä¸ªè¡¥ä¸" #: builtin/log.c:1214 msgid "use [PATCH] even with multiple patches" msgstr "使用 [PATCH],å³ä½¿æœ‰å¤šä¸ªè¡¥ä¸" #: builtin/log.c:1218 msgid "print patches to standard out" msgstr "打å°è¡¥ä¸åˆ°æ ‡å‡†è¾“出" #: builtin/log.c:1220 msgid "generate a cover letter" msgstr "生æˆä¸€å°é™„ä¿¡" #: builtin/log.c:1222 msgid "use simple number sequence for output file names" msgstr "使用简å•çš„æ•°å—åºåˆ—作为输出文件å" #: builtin/log.c:1223 msgid "sfx" msgstr "åŽç¼€" #: builtin/log.c:1224 msgid "use <sfx> instead of '.patch'" msgstr "使用 <åŽç¼€> 代替 '.patch'" #: builtin/log.c:1226 msgid "start numbering patches at <n> instead of 1" msgstr "è¡¥ä¸ä»¥ <n> 开始编å·ï¼Œè€Œä¸æ˜¯1" #: builtin/log.c:1228 msgid "mark the series as Nth re-roll" msgstr "æ ‡è®°è¡¥ä¸ç³»åˆ—æ˜¯ç¬¬å‡ æ¬¡é‡åˆ¶" #: builtin/log.c:1230 msgid "Use [<prefix>] instead of [PATCH]" msgstr "使用 [<å‰ç¼€>] 代替 [PATCH]" #: builtin/log.c:1233 msgid "store resulting files in <dir>" msgstr "把结果文件å˜å‚¨åœ¨ <目录>" #: builtin/log.c:1236 msgid "don't strip/add [PATCH]" msgstr "ä¸åˆ 除/æ·»åŠ [PATCH]" #: builtin/log.c:1239 msgid "don't output binary diffs" msgstr "ä¸è¾“出二进制差异" #: builtin/log.c:1241 msgid "don't include a patch matching a commit upstream" msgstr "ä¸åŒ…å«å·²åœ¨ä¸Šæ¸¸æ交ä¸çš„è¡¥ä¸" #: builtin/log.c:1243 msgid "show patch format instead of default (patch + stat)" msgstr "显示纯补ä¸æ ¼å¼è€Œéžé»˜è®¤çš„(补ä¸+状æ€ï¼‰" #: builtin/log.c:1245 msgid "Messaging" msgstr "邮件å‘é€" #: builtin/log.c:1246 msgid "header" msgstr "header" #: builtin/log.c:1247 msgid "add email header" msgstr "æ·»åŠ é‚®ä»¶å¤´" #: builtin/log.c:1248 builtin/log.c:1250 msgid "email" msgstr "邮件地å€" #: builtin/log.c:1248 msgid "add To: header" msgstr "æ·»åŠ æ”¶ä»¶äºº" #: builtin/log.c:1250 msgid "add Cc: header" msgstr "æ·»åŠ æŠ„é€" #: builtin/log.c:1252 msgid "ident" msgstr "æ ‡è¯†" #: builtin/log.c:1253 msgid "set From address to <ident> (or committer ident if absent)" msgstr "å°† From 地å€è®¾ç½®ä¸º <æ ‡è¯†>(如若ä¸æ供,则用æ交者 ID åšä¸ºåœ°å€ï¼‰" #: builtin/log.c:1255 msgid "message-id" msgstr "é‚®ä»¶æ ‡è¯†" #: builtin/log.c:1256 msgid "make first mail a reply to <message-id>" msgstr "使第一å°é‚®ä»¶ä½œä¸ºå¯¹ <é‚®ä»¶æ ‡è¯†> 的回å¤" #: builtin/log.c:1257 builtin/log.c:1260 msgid "boundary" msgstr "边界" #: builtin/log.c:1258 msgid "attach the patch" msgstr "附件方å¼æ·»åŠ è¡¥ä¸" #: builtin/log.c:1261 msgid "inline the patch" msgstr "内è”显示补ä¸" #: builtin/log.c:1265 msgid "enable message threading, styles: shallow, deep" msgstr "å¯ç”¨é‚®ä»¶çº¿ç´¢ï¼Œé£Žæ ¼ï¼šæµ…,深" #: builtin/log.c:1267 msgid "signature" msgstr "ç¾å" #: builtin/log.c:1268 msgid "add a signature" msgstr "æ·»åŠ ä¸€ä¸ªç¾å" #: builtin/log.c:1270 msgid "add a signature from a file" msgstr "ä»Žæ–‡ä»¶æ·»åŠ ä¸€ä¸ªç¾å" #: builtin/log.c:1271 msgid "don't print the patch filenames" msgstr "ä¸è¦æ‰“å°è¡¥ä¸æ–‡ä»¶å" #: builtin/log.c:1360 msgid "-n and -k are mutually exclusive." msgstr "-n å’Œ -k 互斥。" #: builtin/log.c:1362 msgid "--subject-prefix and -k are mutually exclusive." msgstr "--subject-prefix å’Œ -k 互斥。" #: builtin/log.c:1370 msgid "--name-only does not make sense" msgstr "--name-only æ— æ„义" #: builtin/log.c:1372 msgid "--name-status does not make sense" msgstr "--name-status æ— æ„义" #: builtin/log.c:1374 msgid "--check does not make sense" msgstr "--check æ— æ„义" #: builtin/log.c:1397 msgid "standard output, or directory, which one?" msgstr "æ ‡å‡†è¾“å‡ºæˆ–ç›®å½•ï¼Œå“ªä¸€ä¸ªï¼Ÿ" #: builtin/log.c:1399 #, c-format msgid "Could not create directory '%s'" msgstr "ä¸èƒ½åˆ›å»ºç›®å½• '%s'" #: builtin/log.c:1496 #, c-format msgid "unable to read signature file '%s'" msgstr "æ— æ³•è¯»å–ç¾å文件 '%s'" #: builtin/log.c:1559 msgid "Failed to create output files" msgstr "æ— æ³•åˆ›å»ºè¾“å‡ºæ–‡ä»¶" #: builtin/log.c:1607 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<上游> [<头> [<é™åˆ¶>]]]" #: builtin/log.c:1661 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "ä¸èƒ½æ‰¾åˆ°è·Ÿè¸ªçš„远程分支,请手工指定 <上游>。\n" #: builtin/log.c:1672 builtin/log.c:1674 builtin/log.c:1686 #, c-format msgid "Unknown commit %s" msgstr "未知æ交 %s" #: builtin/ls-files.c:358 msgid "git ls-files [<options>] [<file>...]" msgstr "git ls-files [<选项>] [<文件>...]" #: builtin/ls-files.c:415 msgid "identify the file status with tags" msgstr "ç”¨æ ‡ç¾æ ‡è¯†æ–‡ä»¶çš„状æ€" #: builtin/ls-files.c:417 msgid "use lowercase letters for 'assume unchanged' files" msgstr "使用å°å†™å—æ¯è¡¨ç¤º 'å‡è®¾æœªæ”¹å˜çš„' 文件" #: builtin/ls-files.c:419 msgid "show cached files in the output (default)" msgstr "显示缓å˜çš„文件(默认)" #: builtin/ls-files.c:421 msgid "show deleted files in the output" msgstr "æ˜¾ç¤ºå·²åˆ é™¤çš„æ–‡ä»¶" #: builtin/ls-files.c:423 msgid "show modified files in the output" msgstr "显示已修改的文件" #: builtin/ls-files.c:425 msgid "show other files in the output" msgstr "显示其它文件" #: builtin/ls-files.c:427 msgid "show ignored files in the output" msgstr "显示忽略的文件" #: builtin/ls-files.c:430 msgid "show staged contents' object name in the output" msgstr "显示暂å˜åŒºå†…容的对象å称" #: builtin/ls-files.c:432 msgid "show files on the filesystem that need to be removed" msgstr "显示文件系统需è¦åˆ 除的文件" #: builtin/ls-files.c:434 msgid "show 'other' directories' names only" msgstr "åªæ˜¾ç¤ºâ€œå…¶ä»–â€ç›®å½•çš„å称" #: builtin/ls-files.c:437 msgid "don't show empty directories" msgstr "ä¸æ˜¾ç¤ºç©ºç›®å½•" #: builtin/ls-files.c:440 msgid "show unmerged files in the output" msgstr "显示未åˆå¹¶çš„文件" #: builtin/ls-files.c:442 msgid "show resolve-undo information" msgstr "显示 resolve-undo ä¿¡æ¯" #: builtin/ls-files.c:444 msgid "skip files matching pattern" msgstr "匹é…排除文件的模å¼" #: builtin/ls-files.c:447 msgid "exclude patterns are read from <file>" msgstr "从 <文件> ä¸è¯»å–排除模å¼" #: builtin/ls-files.c:450 msgid "read additional per-directory exclude patterns in <file>" msgstr "从 <文件> 读å–é¢å¤–çš„æ¯ä¸ªç›®å½•çš„排除模å¼" #: builtin/ls-files.c:452 msgid "add the standard git exclusions" msgstr "æ·»åŠ æ ‡å‡†çš„ git 排除" #: builtin/ls-files.c:455 msgid "make the output relative to the project top directory" msgstr "显示相对于顶级目录的文件å" #: builtin/ls-files.c:458 msgid "if any <file> is not in the index, treat this as an error" msgstr "如果任何 <文件> 都ä¸åœ¨ç´¢å¼•åŒºï¼Œè§†ä¸ºé”™è¯¯" #: builtin/ls-files.c:459 msgid "tree-ish" msgstr "æ ‘æˆ–æ交" #: builtin/ls-files.c:460 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "å‡è£…自从 <æ ‘æˆ–æ交> 之åŽåˆ 除的路径ä»ç„¶å˜åœ¨" #: builtin/ls-files.c:462 msgid "show debugging data" msgstr "显示调试数æ®" #: builtin/ls-tree.c:28 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/merge.c:45 msgid "git merge [<options>] [<commit>...]" msgstr "git merge [<选项>] [<æ交>...]" #: builtin/merge.c:46 msgid "git merge [<options>] <msg> HEAD <commit>" msgstr "git merge [<选项>] <说明> HEAD <æ交>" #: builtin/merge.c:47 msgid "git merge --abort" msgstr "git merge --abort" #: builtin/merge.c:100 msgid "switch `m' requires a value" msgstr "开关 `m' 需è¦ä¸€ä¸ªå€¼" #: builtin/merge.c:137 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "ä¸èƒ½æ‰¾åˆ°åˆå¹¶ç–ç•¥ '%s'。\n" #: builtin/merge.c:138 #, c-format msgid "Available strategies are:" msgstr "å¯ç”¨çš„ç–略有:" #: builtin/merge.c:143 #, c-format msgid "Available custom strategies are:" msgstr "å¯ç”¨çš„自定义ç–略有:" #: builtin/merge.c:193 builtin/pull.c:119 msgid "do not show a diffstat at the end of the merge" msgstr "在åˆå¹¶çš„最åŽä¸æ˜¾ç¤ºå·®å¼‚统计" #: builtin/merge.c:196 builtin/pull.c:122 msgid "show a diffstat at the end of the merge" msgstr "在åˆå¹¶çš„最åŽæ˜¾ç¤ºå·®å¼‚统计" #: builtin/merge.c:197 builtin/pull.c:125 msgid "(synonym to --stat)" msgstr "(和 --stat åŒä¹‰ï¼‰" #: builtin/merge.c:199 builtin/pull.c:128 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "在åˆå¹¶æ交信æ¯ä¸æ·»åŠ (最多 <n> æ¡ï¼‰ç²¾ç®€æ交记录" #: builtin/merge.c:202 builtin/pull.c:131 msgid "create a single commit instead of doing a merge" msgstr "创建一个å•ç‹¬çš„æ交而ä¸æ˜¯åšä¸€æ¬¡åˆå¹¶" #: builtin/merge.c:204 builtin/pull.c:134 msgid "perform a commit if the merge succeeds (default)" msgstr "如果åˆå¹¶æˆåŠŸï¼Œæ‰§è¡Œä¸€æ¬¡æ交(默认)" #: builtin/merge.c:206 builtin/pull.c:137 msgid "edit message before committing" msgstr "在æ交å‰ç¼–辑æ交说明" #: builtin/merge.c:207 msgid "allow fast-forward (default)" msgstr "å…许快进(默认)" #: builtin/merge.c:209 builtin/pull.c:143 msgid "abort if fast-forward is not possible" msgstr "如果ä¸èƒ½å¿«è¿›å°±æ”¾å¼ƒåˆå¹¶" #: builtin/merge.c:213 msgid "Verify that the named commit has a valid GPG signature" msgstr "验è¯æŒ‡å®šçš„æ交是å¦åŒ…å«ä¸€ä¸ªæœ‰æ•ˆçš„ GPG ç¾å" #: builtin/merge.c:214 builtin/notes.c:767 builtin/pull.c:148 #: builtin/revert.c:89 msgid "strategy" msgstr "ç–ç•¥" #: builtin/merge.c:215 builtin/pull.c:149 msgid "merge strategy to use" msgstr "è¦ä½¿ç”¨çš„åˆå¹¶ç–ç•¥" #: builtin/merge.c:216 builtin/pull.c:152 msgid "option=value" msgstr "option=value" #: builtin/merge.c:217 builtin/pull.c:153 msgid "option for selected merge strategy" msgstr "所选的åˆå¹¶ç–略的选项" #: builtin/merge.c:219 msgid "merge commit message (for a non-fast-forward merge)" msgstr "åˆå¹¶çš„æ交说明(针对éžå¿«è¿›å¼åˆå¹¶ï¼‰" #: builtin/merge.c:223 msgid "abort the current in-progress merge" msgstr "放弃当å‰æ£åœ¨è¿›è¡Œçš„åˆå¹¶" #: builtin/merge.c:251 msgid "could not run stash." msgstr "ä¸èƒ½è¿›è¡Œè¿›åº¦ä¿å˜ã€‚" #: builtin/merge.c:256 msgid "stash failed" msgstr "进度ä¿å˜å¤±è´¥" #: builtin/merge.c:261 #, c-format msgid "not a valid object: %s" msgstr "ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆå¯¹è±¡ï¼š%s" #: builtin/merge.c:280 builtin/merge.c:297 msgid "read-tree failed" msgstr "读å–æ ‘å¤±è´¥" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: builtin/merge.c:327 msgid " (nothing to squash)" msgstr " ï¼ˆæ— å¯åŽ‹ç¼©ï¼‰" #: builtin/merge.c:340 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "压缩æ交 -- 未更新 HEAD\n" #: builtin/merge.c:344 builtin/merge.c:763 builtin/merge.c:975 #: builtin/merge.c:988 #, c-format msgid "Could not write to '%s'" msgstr "ä¸èƒ½å†™å…¥ '%s'" #: builtin/merge.c:372 msgid "Writing SQUASH_MSG" msgstr "写入 SQUASH_MSG" #: builtin/merge.c:374 msgid "Finishing SQUASH_MSG" msgstr "å®Œæˆ SQUASH_MSG" #: builtin/merge.c:397 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "æ— åˆå¹¶ä¿¡æ¯ -- 未更新 HEAD\n" #: builtin/merge.c:447 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' 没有指å‘一个æ交" #: builtin/merge.c:537 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "åçš„ branch.%s.mergeoptions å—符串:%s" #: builtin/merge.c:656 msgid "Not handling anything other than two heads merge." msgstr "ä¸èƒ½å¤„ç†ä¸¤ä¸ªå¤´åˆå¹¶ä¹‹å¤–的任何æ“作。" #: builtin/merge.c:670 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "merge-recursive 的未知选项:-X%s" #: builtin/merge.c:683 #, c-format msgid "unable to write %s" msgstr "ä¸èƒ½å†™ %s" #: builtin/merge.c:772 #, c-format msgid "Could not read from '%s'" msgstr "ä¸èƒ½ä»Ž '%s' 读å–" #: builtin/merge.c:781 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "未æ交åˆå¹¶ï¼Œä½¿ç”¨ 'git commit' 完æˆæ¤æ¬¡åˆå¹¶ã€‚\n" #: builtin/merge.c:787 #, 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:811 msgid "Empty commit message." msgstr "空æ交信æ¯ã€‚" #: builtin/merge.c:823 #, c-format msgid "Wonderful.\n" msgstr "太棒了。\n" #: builtin/merge.c:878 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "自动åˆå¹¶å¤±è´¥ï¼Œä¿®æ£å†²çªç„¶åŽæ交修æ£çš„结果。\n" #: builtin/merge.c:894 #, c-format msgid "'%s' is not a commit" msgstr "'%s' ä¸æ˜¯ä¸€ä¸ªæ交" #: builtin/merge.c:935 msgid "No current branch." msgstr "没有当å‰åˆ†æ”¯ã€‚" #: builtin/merge.c:937 msgid "No remote for the current branch." msgstr "当å‰åˆ†æ”¯æ²¡æœ‰å¯¹åº”的远程仓库。" #: builtin/merge.c:939 msgid "No default upstream defined for the current branch." msgstr "当å‰åˆ†æ”¯æ²¡æœ‰å®šä¹‰é»˜è®¤çš„上游分支。" #: builtin/merge.c:944 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "对于 %s 没有æ¥è‡ª %s 的远程跟踪分支" #: builtin/merge.c:1081 #, c-format msgid "could not close '%s'" msgstr "ä¸èƒ½å…³é— '%s'" #: builtin/merge.c:1208 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "没有è¦ç»ˆæ¢çš„åˆå¹¶ï¼ˆMERGE_HEAD 丢失)。" #: builtin/merge.c:1224 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:1231 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:1234 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "您尚未结æŸæ‚¨çš„拣选(å˜åœ¨ CHERRY_PICK_HEAD)。" #: builtin/merge.c:1243 msgid "You cannot combine --squash with --no-ff." msgstr "您ä¸èƒ½å°† --squash 与 --no-ff åŒæ—¶ä½¿ç”¨ã€‚" #: builtin/merge.c:1251 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "未指定æ交并且 merge.defaultToUpstream 未设置。" #: builtin/merge.c:1268 msgid "Squash commit into empty head not supported yet" msgstr "å°šä¸æ”¯æŒåˆ°ç©ºåˆ†æ”¯çš„压缩æ交" #: builtin/merge.c:1270 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "到空分支的éžå¿«è¿›å¼æ交没有æ„义" #: builtin/merge.c:1276 #, c-format msgid "%s - not something we can merge" msgstr "%s - ä¸èƒ½è¢«åˆå¹¶" #: builtin/merge.c:1278 msgid "Can merge only exactly one commit into empty head" msgstr "åªèƒ½å°†ä¸€ä¸ªæ交åˆå¹¶åˆ°ç©ºåˆ†æ”¯ä¸Š" #: builtin/merge.c:1333 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "æ交 %s 有一个éžå¯ä¿¡çš„声称æ¥è‡ª %s çš„ GPG ç¾å。" #: builtin/merge.c:1336 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "æ交 %s 有一个错误的声称æ¥è‡ª %s çš„ GPG ç¾å。" #: builtin/merge.c:1339 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "æ交 %s 没有一个 GPG ç¾å。" #: builtin/merge.c:1342 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "æ交 %s 有一个æ¥è‡ª %s 的好的 GPG ç¾å。\n" #: builtin/merge.c:1423 #, 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:1501 msgid "Not possible to fast-forward, aborting." msgstr "æ— æ³•å¿«è¿›ï¼Œç»ˆæ¢ã€‚" #: builtin/merge.c:1524 builtin/merge.c:1603 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "å°†æ ‘å›žæ»šè‡³åŽŸå§‹çŠ¶æ€...\n" #: builtin/merge.c:1528 #, c-format msgid "Trying merge strategy %s...\n" msgstr "å°è¯•åˆå¹¶ç–ç•¥ %s...\n" #: builtin/merge.c:1594 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "没有åˆå¹¶ç–略处ç†æ¤åˆå¹¶ã€‚\n" #: builtin/merge.c:1596 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "使用ç–ç•¥ %s åˆå¹¶å¤±è´¥ã€‚\n" #: builtin/merge.c:1605 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "使用 %s 以准备手工解决。\n" #: builtin/merge.c:1617 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "自动åˆå¹¶è¿›å±•é¡ºåˆ©ï¼ŒæŒ‰è¦æ±‚在æ交å‰åœæ¢\n" #: builtin/merge-base.c:29 msgid "git merge-base [-a | --all] <commit> <commit>..." msgstr "git merge-base [-a | --all] <æ交> <æ交>..." #: builtin/merge-base.c:30 msgid "git merge-base [-a | --all] --octopus <commit>..." msgstr "git merge-base [-a | --all] --octopus <æ交>..." #: builtin/merge-base.c:31 msgid "git merge-base --independent <commit>..." msgstr "git merge-base --independent <æ交>..." #: builtin/merge-base.c:32 msgid "git merge-base --is-ancestor <commit> <commit>" msgstr "git merge-base --is-ancestor <æ交> <æ交>" #: builtin/merge-base.c:33 msgid "git merge-base --fork-point <ref> [<commit>]" msgstr "git merge-base --fork-point <引用> [<æ交>]" #: builtin/merge-base.c:214 msgid "output all common ancestors" msgstr "输出所有共åŒçš„祖先" #: builtin/merge-base.c:216 msgid "find ancestors for a single n-way merge" msgstr "查找一个多路åˆå¹¶çš„祖先æ交" #: builtin/merge-base.c:218 msgid "list revs not reachable from others" msgstr "显示ä¸èƒ½è¢«å…¶ä»–访问到的版本" #: builtin/merge-base.c:220 msgid "is the first one ancestor of the other?" msgstr "第一个是其他的祖先æ交么?" #: builtin/merge-base.c:222 msgid "find where <commit> forked from reflog of <ref>" msgstr "æ ¹æ® <引用> 的引用日志查找 <æ交> 的派生处" #: builtin/merge-file.c:8 msgid "" "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> " "<orig-file> <file2>" msgstr "" "git merge-file [<选项>] [-L <文件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/mktree.c:64 msgid "git mktree [-z] [--missing] [--batch]" msgstr "git mktree [-z] [--missing] [--batch]" #: builtin/mktree.c:150 msgid "input is NUL terminated" msgstr "输入以 NUL å—符终æ¢" #: builtin/mktree.c:151 builtin/write-tree.c:24 msgid "allow missing objects" msgstr "å…许丢失的对象" #: builtin/mktree.c:152 msgid "allow creation of more than one tree" msgstr "å…è®¸åˆ›å»ºä¸€ä¸ªä»¥ä¸Šçš„æ ‘" #: builtin/mv.c:15 msgid "git mv [<options>] <source>... <destination>" msgstr "git mv [<选项>] <æº>... <ç›®æ ‡>" #: builtin/mv.c:69 #, c-format msgid "Directory %s is in index and no submodule?" msgstr "目录 %s 在索引ä¸å¹¶ä¸”ä¸æ˜¯å模组?" #: builtin/mv.c:71 msgid "Please stage your changes to .gitmodules or stash them to proceed" msgstr "请将您的修改暂å˜åˆ° .gitmodules ä¸æˆ–ä¿å˜è¿›åº¦åŽå†ç»§ç»" #: builtin/mv.c:89 #, c-format msgid "%.*s is in index" msgstr "%.*s 在索引ä¸" #: builtin/mv.c:111 msgid "force move/rename even if target exists" msgstr "强制移动/é‡å‘½ä»¤ï¼Œå³ä½¿ç›®æ ‡å˜åœ¨" #: builtin/mv.c:112 msgid "skip move/rename errors" msgstr "跳过移动/é‡å‘½å错误" #: builtin/mv.c:151 #, c-format msgid "destination '%s' is not a directory" msgstr "ç›®æ ‡ '%s' ä¸æ˜¯ä¸€ä¸ªç›®å½•" #: builtin/mv.c:162 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "检查 '%s' 到 '%s' çš„é‡å‘½å\n" #: builtin/mv.c:166 msgid "bad source" msgstr "åçš„æº" #: builtin/mv.c:169 msgid "can not move directory into itself" msgstr "ä¸èƒ½å°†ç›®å½•ç§»åŠ¨åˆ°è‡ªèº«" #: builtin/mv.c:172 msgid "cannot move directory over file" msgstr "ä¸èƒ½å°†ç›®å½•ç§»åŠ¨åˆ°æ–‡ä»¶" #: builtin/mv.c:181 msgid "source directory is empty" msgstr "æºç›®å½•ä¸ºç©º" #: builtin/mv.c:206 msgid "not under version control" msgstr "ä¸åœ¨ç‰ˆæœ¬æŽ§åˆ¶ä¹‹ä¸‹" #: builtin/mv.c:209 msgid "destination exists" msgstr "ç›®æ ‡å·²å˜åœ¨" #: builtin/mv.c:217 #, c-format msgid "overwriting '%s'" msgstr "覆盖 '%s'" #: builtin/mv.c:220 msgid "Cannot overwrite" msgstr "ä¸èƒ½è¦†ç›–" #: builtin/mv.c:223 msgid "multiple sources for the same target" msgstr "åŒä¸€ç›®æ ‡å…·æœ‰å¤šä¸ªæº" #: builtin/mv.c:225 msgid "destination directory does not exist" msgstr "ç›®æ ‡ç›®å½•ä¸å˜åœ¨" #: builtin/mv.c:232 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s,æº=%sï¼Œç›®æ ‡=%s" #: builtin/mv.c:253 #, c-format msgid "Renaming %s to %s\n" msgstr "é‡å‘½å %s 至 %s\n" #: builtin/mv.c:256 builtin/remote.c:722 builtin/repack.c:362 #, c-format msgid "renaming '%s' failed" msgstr "é‡å‘½å '%s' 失败" #: builtin/name-rev.c:255 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<选项>] <æ交>..." #: builtin/name-rev.c:256 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<选项>] --all" #: builtin/name-rev.c:257 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<选项>] --stdin" #: builtin/name-rev.c:309 msgid "print only names (no SHA-1)" msgstr "åªæ‰“å°åç§°ï¼ˆæ— SHA-1)" #: builtin/name-rev.c:310 msgid "only use tags to name the commits" msgstr "åªä½¿ç”¨æ ‡ç¾æ¥å‘½åæ交" #: builtin/name-rev.c:312 msgid "only use refs matching <pattern>" msgstr "åªä½¿ç”¨å’Œ <模å¼> 相匹é…的引用" #: builtin/name-rev.c:314 msgid "list all commits reachable from all refs" msgstr "列出å¯ä»¥ä»Žæ‰€æœ‰å¼•ç”¨è®¿é—®çš„æ交" #: builtin/name-rev.c:315 msgid "read from stdin" msgstr "ä»Žæ ‡å‡†è¾“å…¥è¯»å–" #: builtin/name-rev.c:316 msgid "allow to print `undefined` names (default)" msgstr "å…è®¸æ‰“å° `未定义` çš„å称(默认)" #: builtin/name-rev.c:322 msgid "dereference tags in the input (internal use)" msgstr "åå‘解æžè¾“å…¥ä¸çš„æ ‡ç¾ï¼ˆå†…部使用)" #: builtin/notes.c:25 msgid "git notes [--ref <notes-ref>] [list [<object>]]" msgstr "git notes [--ref <注解引用>] [list [<对象>]]" #: builtin/notes.c:26 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:27 msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>" msgstr "git notes [--ref <注解引用>] copy [-f] <æºå¯¹è±¡> <ç›®æ ‡å¯¹è±¡>" #: builtin/notes.c:28 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:29 msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]" msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]" #: builtin/notes.c:30 msgid "git notes [--ref <notes-ref>] show [<object>]" msgstr "git notes [--ref <注解引用>] show [<对象>]" #: builtin/notes.c:31 msgid "" "git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>" msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <ç–ç•¥> ] <注解引用>" #: builtin/notes.c:32 msgid "git notes merge --commit [-v | -q]" msgstr "git notes merge --commit [-v | -q]" #: builtin/notes.c:33 msgid "git notes merge --abort [-v | -q]" msgstr "git notes merge --abort [-v | -q]" #: builtin/notes.c:34 msgid "git notes [--ref <notes-ref>] remove [<object>...]" msgstr "git notes [--ref <注解引用>] remove [<对象>...]" #: builtin/notes.c:35 msgid "git notes [--ref <notes-ref>] prune [-n | -v]" msgstr "git notes [--ref <注解引用>] prune [-n | -v]" #: builtin/notes.c:36 msgid "git notes [--ref <notes-ref>] get-ref" msgstr "git notes [--ref <注解引用>] get-ref" #: builtin/notes.c:41 msgid "git notes [list [<object>]]" msgstr "git notes [list [<对象>]]" #: builtin/notes.c:46 msgid "git notes add [<options>] [<object>]" msgstr "git notes add [<选项>] [<对象>]" #: builtin/notes.c:51 msgid "git notes copy [<options>] <from-object> <to-object>" msgstr "git notes copy [<选项>] <æºå¯¹è±¡> <ç›®æ ‡å¯¹è±¡>" #: builtin/notes.c:52 msgid "git notes copy --stdin [<from-object> <to-object>]..." msgstr "git notes copy --stdin [<æºå¯¹è±¡> <ç›®æ ‡å¯¹è±¡>]..." #: builtin/notes.c:57 msgid "git notes append [<options>] [<object>]" msgstr "git notes append [<选项>] [<对象>]" #: builtin/notes.c:62 msgid "git notes edit [<object>]" msgstr "git notes edit [<对象>]" #: builtin/notes.c:67 msgid "git notes show [<object>]" msgstr "git notes show [<对象>]" #: builtin/notes.c:72 msgid "git notes merge [<options>] <notes-ref>" msgstr "git notes merge [<选项>] <注解引用>" #: builtin/notes.c:73 msgid "git notes merge --commit [<options>]" msgstr "git notes merge --commit [<选项>]" #: builtin/notes.c:74 msgid "git notes merge --abort [<options>]" msgstr "git notes merge --abort [<选项>]" #: builtin/notes.c:79 msgid "git notes remove [<object>]" msgstr "git notes remove [<对象>]" #: builtin/notes.c:84 msgid "git notes prune [<options>]" msgstr "git notes prune [<选项>]" #: builtin/notes.c:89 msgid "git notes get-ref" msgstr "git notes get-ref" #: builtin/notes.c:147 #, c-format msgid "unable to start 'show' for object '%s'" msgstr "ä¸èƒ½ä¸ºå¯¹è±¡ '%s' 开始 'show'" #: builtin/notes.c:151 msgid "could not read 'show' output" msgstr "ä¸èƒ½è¯»å– 'show' 的输出" #: builtin/notes.c:159 #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "æ— æ³•ä¸ºå¯¹è±¡ '%s' å®Œæˆ 'show'" #: builtin/notes.c:174 builtin/tag.c:477 #, c-format msgid "could not create file '%s'" msgstr "ä¸èƒ½åˆ›å»ºæ–‡ä»¶ '%s'" #: builtin/notes.c:193 msgid "Please supply the note contents using either -m or -F option" msgstr "请通过 -m 或 -F 选项为注解æ供内容" #: builtin/notes.c:202 msgid "unable to write note object" msgstr "ä¸èƒ½å†™æ³¨è§£å¯¹è±¡" #: builtin/notes.c:204 #, c-format msgid "The note contents have been left in %s" msgstr "注解内容被留在 %s ä¸" #: builtin/notes.c:232 builtin/tag.c:695 #, c-format msgid "cannot read '%s'" msgstr "ä¸èƒ½è¯»å– '%s'" #: builtin/notes.c:234 builtin/tag.c:698 #, c-format msgid "could not open or read '%s'" msgstr "ä¸èƒ½æ‰“å¼€æˆ–è¯»å– '%s'" #: builtin/notes.c:253 builtin/notes.c:304 builtin/notes.c:306 #: builtin/notes.c:366 builtin/notes.c:421 builtin/notes.c:507 #: builtin/notes.c:512 builtin/notes.c:590 builtin/notes.c:653 #: builtin/notes.c:877 builtin/tag.c:711 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "æ— æ³•è§£æž '%s' 为一个有效引用。" #: builtin/notes.c:256 #, c-format msgid "Failed to read object '%s'." msgstr "æ— æ³•è¯»å–对象 '%s'。" #: builtin/notes.c:260 #, c-format msgid "Cannot read note data from non-blob object '%s'." msgstr "ä¸èƒ½ä»Žéžæ•°æ®å¯¹è±¡ '%s' ä¸è¯»å–注解数æ®" #: builtin/notes.c:359 builtin/notes.c:414 builtin/notes.c:490 #: builtin/notes.c:502 builtin/notes.c:578 builtin/notes.c:646 #: builtin/notes.c:942 msgid "too many parameters" msgstr "å‚数太多" #: builtin/notes.c:372 builtin/notes.c:659 #, c-format msgid "No note found for object %s." msgstr "未å‘现对象 %s 的注解。" #: builtin/notes.c:393 builtin/notes.c:556 msgid "note contents as a string" msgstr "注解内容作为一个å—符串" #: builtin/notes.c:396 builtin/notes.c:559 msgid "note contents in a file" msgstr "注解内容到一个文件ä¸" #: builtin/notes.c:398 builtin/notes.c:401 builtin/notes.c:561 #: builtin/notes.c:564 builtin/tag.c:630 msgid "object" msgstr "对象" #: builtin/notes.c:399 builtin/notes.c:562 msgid "reuse and edit specified note object" msgstr "é‡ç”¨å’Œç¼–辑指定的注解对象" #: builtin/notes.c:402 builtin/notes.c:565 msgid "reuse specified note object" msgstr "é‡ç”¨æŒ‡å®šçš„注解对象" #: builtin/notes.c:405 builtin/notes.c:568 msgid "allow storing empty note" msgstr "å…许ä¿å˜ç©ºç™½æ³¨é‡Š" #: builtin/notes.c:406 builtin/notes.c:477 msgid "replace existing notes" msgstr "替æ¢å·²å˜åœ¨çš„注解" #: builtin/notes.c:431 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "ä¸èƒ½æ·»åŠ 注解。å‘现对象 %s å·²å˜åœ¨æ³¨è§£ã€‚使用 '-f' 覆盖现å˜æ³¨è§£" #: builtin/notes.c:446 builtin/notes.c:525 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "覆盖对象 %s 现å˜æ³¨è§£\n" #: builtin/notes.c:457 builtin/notes.c:618 builtin/notes.c:882 #, c-format msgid "Removing note for object %s\n" msgstr "åˆ é™¤å¯¹è±¡ %s 的注解\n" #: builtin/notes.c:478 msgid "read objects from stdin" msgstr "ä»Žæ ‡å‡†è¾“å…¥è¯»å–对象" #: builtin/notes.c:480 msgid "load rewriting config for <command> (implies --stdin)" msgstr "é‡æ–°åŠ è½½ <命令> çš„é…置(éšå« --stdin)" #: builtin/notes.c:498 msgid "too few parameters" msgstr "å‚数太少" #: builtin/notes.c:519 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "ä¸èƒ½æ‹·è´æ³¨è§£ã€‚å‘现对象 %s å·²å˜åœ¨æ³¨è§£ã€‚使用 '-f' 覆盖现å˜æ³¨è§£" #: builtin/notes.c:531 #, c-format msgid "Missing notes on source object %s. Cannot copy." msgstr "æºå¯¹è±¡ %s 缺少注解。ä¸èƒ½æ‹·è´ã€‚" #: builtin/notes.c:583 #, 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:764 msgid "General options" msgstr "通用选项" #: builtin/notes.c:766 msgid "Merge options" msgstr "åˆå¹¶é€‰é¡¹" #: builtin/notes.c:768 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:770 msgid "Committing unmerged notes" msgstr "æ交未åˆå¹¶çš„注解" #: builtin/notes.c:772 msgid "finalize notes merge by committing unmerged notes" msgstr "通过æ交未åˆå¹¶çš„注解æ¥å®Œæˆæ³¨è§£åˆå¹¶" #: builtin/notes.c:774 msgid "Aborting notes merge resolution" msgstr "ä¸æ¢æ³¨è§£åˆå¹¶çš„方案" #: builtin/notes.c:776 msgid "abort notes merge" msgstr "ä¸æ¢æ³¨è§£åˆå¹¶" #: builtin/notes.c:853 #, c-format msgid "A notes merge into %s is already in-progress at %s" msgstr "一个到 %s 的注解åˆå¹¶å·²ç»åœ¨ %s 执行ä¸" #: builtin/notes.c:880 #, c-format msgid "Object %s has no note\n" msgstr "对象 %s 没有注解\n" #: builtin/notes.c:892 msgid "attempt to remove non-existent note is not an error" msgstr "å°è¯•åˆ 除ä¸å˜åœ¨çš„注解ä¸æ˜¯ä¸€ä¸ªé”™è¯¯" #: builtin/notes.c:895 msgid "read object names from the standard input" msgstr "ä»Žæ ‡å‡†è¾“å…¥è¯»å–对象å称" #: builtin/notes.c:976 msgid "notes-ref" msgstr "注解引用" #: builtin/notes.c:977 msgid "use notes from <notes-ref>" msgstr "从 <注解引用> 使用注解" #: builtin/notes.c:1012 builtin/remote.c:1588 #, c-format msgid "Unknown subcommand: %s" msgstr "未知å命令:%s" #: builtin/pack-objects.c:28 msgid "" "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]" msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]" #: builtin/pack-objects.c:29 msgid "" "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]" msgstr "git pack-objects [<选项>...] <base-name> [< <引用列表> | < <对象列表>]" #: builtin/pack-objects.c:175 builtin/pack-objects.c:178 #, c-format msgid "deflate error (%d)" msgstr "压缩错误 (%d)" #: builtin/pack-objects.c:771 msgid "Writing objects" msgstr "写入对象ä¸" #: builtin/pack-objects.c:1011 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "ç¦ç”¨ bitmap å†™å…¥ï¼Œå› ä¸ºä¸€äº›å¯¹è±¡å°†ä¸ä¼šè¢«æ‰“包" #: builtin/pack-objects.c:2171 msgid "Compressing objects" msgstr "压缩对象ä¸" #: builtin/pack-objects.c:2568 #, c-format msgid "unsupported index version %s" msgstr "ä¸æ”¯æŒçš„索引版本 %s" #: builtin/pack-objects.c:2572 #, c-format msgid "bad index version '%s'" msgstr "å的索引版本 '%s'" #: builtin/pack-objects.c:2602 msgid "do not show progress meter" msgstr "ä¸æ˜¾ç¤ºè¿›åº¦è¡¨" #: builtin/pack-objects.c:2604 msgid "show progress meter" msgstr "显示进度表" #: builtin/pack-objects.c:2606 msgid "show progress meter during object writing phase" msgstr "在对象写入阶段显示进度表" #: builtin/pack-objects.c:2609 msgid "similar to --all-progress when progress meter is shown" msgstr "当进度表显示时类似于 --all-progress" #: builtin/pack-objects.c:2610 msgid "version[,offset]" msgstr "版本[,å移]" #: builtin/pack-objects.c:2611 msgid "write the pack index file in the specified idx format version" msgstr "用指定的 idx æ ¼å¼ç‰ˆæœ¬æ¥å†™åŒ…索引文件" #: builtin/pack-objects.c:2614 msgid "maximum size of each output pack file" msgstr "æ¯ä¸ªè¾“出包的最大尺寸" #: builtin/pack-objects.c:2616 msgid "ignore borrowed objects from alternate object store" msgstr "忽略从备用对象å˜å‚¨é‡Œå€Ÿç”¨å¯¹è±¡" #: builtin/pack-objects.c:2618 msgid "ignore packed objects" msgstr "忽略包对象" #: builtin/pack-objects.c:2620 msgid "limit pack window by objects" msgstr "é™åˆ¶æ‰“包窗å£çš„对象数" #: builtin/pack-objects.c:2622 msgid "limit pack window by memory in addition to object limit" msgstr "除对象数é‡é™åˆ¶å¤–设置打包窗å£çš„内å˜é™åˆ¶" #: builtin/pack-objects.c:2624 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "打包å…许的 delta 链的最大长度" #: builtin/pack-objects.c:2626 msgid "reuse existing deltas" msgstr "é‡ç”¨å·²å˜åœ¨çš„ deltas" #: builtin/pack-objects.c:2628 msgid "reuse existing objects" msgstr "é‡ç”¨å·²å˜åœ¨çš„对象" #: builtin/pack-objects.c:2630 msgid "use OFS_DELTA objects" msgstr "使用 OFS_DELTA 对象" #: builtin/pack-objects.c:2632 msgid "use threads when searching for best delta matches" msgstr "使用线程查询最佳 delta 匹é…" #: builtin/pack-objects.c:2634 msgid "do not create an empty pack output" msgstr "ä¸åˆ›å»ºç©ºçš„包输出" #: builtin/pack-objects.c:2636 msgid "read revision arguments from standard input" msgstr "ä»Žæ ‡å‡†è¾“å…¥è¯»å–版本å·å‚æ•°" #: builtin/pack-objects.c:2638 msgid "limit the objects to those that are not yet packed" msgstr "é™åˆ¶é‚£äº›å°šæœªæ‰“包的对象" #: builtin/pack-objects.c:2641 msgid "include objects reachable from any reference" msgstr "包括å¯ä»¥ä»Žä»»ä½•å¼•ç”¨è®¿é—®åˆ°çš„对象" #: builtin/pack-objects.c:2644 msgid "include objects referred by reflog entries" msgstr "包括被引用日志引用到的对象" #: builtin/pack-objects.c:2647 msgid "include objects referred to by the index" msgstr "包括被索引引用到的对象" #: builtin/pack-objects.c:2650 msgid "output pack to stdout" msgstr "è¾“å‡ºåŒ…åˆ°æ ‡å‡†è¾“å‡º" #: builtin/pack-objects.c:2652 msgid "include tag objects that refer to objects to be packed" msgstr "åŒ…æ‹¬é‚£äº›å¼•ç”¨äº†å¾…æ‰“åŒ…å¯¹è±¡çš„æ ‡ç¾å¯¹è±¡" #: builtin/pack-objects.c:2654 msgid "keep unreachable objects" msgstr "ç»´æŒä¸å¯è¾¾çš„对象" #: builtin/pack-objects.c:2655 parse-options.h:142 msgid "time" msgstr "时间" #: builtin/pack-objects.c:2656 msgid "unpack unreachable objects newer than <time>" msgstr "将比给定 <时间> æ–°çš„æ— æ³•è®¿é—®çš„å¯¹è±¡è§£åŒ…" #: builtin/pack-objects.c:2659 msgid "create thin packs" msgstr "创建精简包" #: builtin/pack-objects.c:2661 msgid "create packs suitable for shallow fetches" msgstr "创建适åˆæµ…克隆仓库获å–的包" #: builtin/pack-objects.c:2663 msgid "ignore packs that have companion .keep file" msgstr "忽略é…有 .keep 文件的包" #: builtin/pack-objects.c:2665 msgid "pack compression level" msgstr "打包压缩级别" #: builtin/pack-objects.c:2667 msgid "do not hide commits by grafts" msgstr "显示被å«æŽ¥éšè—çš„æ交" #: builtin/pack-objects.c:2669 msgid "use a bitmap index if available to speed up counting objects" msgstr "使用 bitmap 索引(如果有的è¯ï¼‰ä»¥æ高对象计数时的速度" #: builtin/pack-objects.c:2671 msgid "write a bitmap index together with the pack index" msgstr "在建立包索引的åŒæ—¶åˆ›å»º bitmap 索引" #: builtin/pack-objects.c:2762 msgid "Counting objects" msgstr "对象计数ä¸" #: builtin/pack-refs.c:6 msgid "git pack-refs [<options>]" msgstr "git pack-refs [<选项>]" #: builtin/pack-refs.c:14 msgid "pack everything" msgstr "打包一切" #: builtin/pack-refs.c:15 msgid "prune loose refs (default)" msgstr "清除æ¾æ•£çš„引用(默认)" #: builtin/prune-packed.c:7 msgid "git prune-packed [-n | --dry-run] [-q | --quiet]" msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]" #: builtin/prune-packed.c:40 msgid "Removing duplicate objects" msgstr "æ£åœ¨åˆ 除é‡å¤å¯¹è±¡" #: builtin/prune.c:11 msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]" #: builtin/prune.c:105 builtin/worktree.c:121 msgid "do not remove, show only" msgstr "ä¸åˆ 除,åªæ˜¾ç¤º" #: builtin/prune.c:106 builtin/worktree.c:122 msgid "report pruned objects" msgstr "报告清除的对象" #: builtin/prune.c:109 builtin/worktree.c:124 msgid "expire objects older than <time>" msgstr "使早于给定时间的对象过期" #: builtin/pull.c:69 msgid "git pull [options] [<repository> [<refspec>...]]" msgstr "git pull [<选项>] [<仓库> [<å¼•ç”¨è§„æ ¼>...]]" #: builtin/pull.c:113 msgid "Options related to merging" msgstr "å’Œåˆå¹¶ç›¸å…³çš„选项" #: builtin/pull.c:116 msgid "incorporate changes by rebasing rather than merging" msgstr "使用å˜åŸºæ“作å–代åˆå¹¶æ“作以åˆå…¥ä¿®æ”¹" #: builtin/pull.c:140 builtin/revert.c:105 msgid "allow fast-forward" msgstr "å…许快进å¼" #: builtin/pull.c:146 msgid "verify that the named commit has a valid GPG signature" msgstr "验è¯æŒ‡å®šçš„æ交是å¦åŒ…å«ä¸€ä¸ªæœ‰æ•ˆçš„ GPG ç¾å" #: builtin/pull.c:160 msgid "Options related to fetching" msgstr "和获å–相关的å‚æ•°" #: builtin/pull.c:268 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "pull.ff çš„å–å€¼æ— æ•ˆï¼š%s" #: builtin/pull.c:352 msgid "Cannot pull with rebase: You have unstaged changes." msgstr "æ— æ³•é€šè¿‡å˜åŸºæ–¹å¼æ‹‰å–:您有未暂å˜çš„å˜æ›´ã€‚" #: builtin/pull.c:358 msgid "Additionally, your index contains uncommitted changes." msgstr "而且您的索引ä¸åŒ…å«æœªæ交的å˜æ›´ã€‚" #: builtin/pull.c:360 msgid "Cannot pull with rebase: Your index contains uncommitted changes." msgstr "æ— æ³•é€šè¿‡å˜åŸºæ–¹å¼æ‹‰å–:您的索引ä¸åŒ…å«æœªæ交的å˜æ›´ã€‚" #: builtin/pull.c:436 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." msgstr "在您刚刚获å–到的引用ä¸æ²¡æœ‰å˜åŸºæ“作的候选。" #: builtin/pull.c:438 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "在您刚刚获å–到的引用ä¸æ²¡æœ‰åˆå¹¶æ“作的候选。" #: builtin/pull.c:439 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." msgstr "通常这æ„味ç€æ‚¨æ供了一个通é…ç¬¦å¼•ç”¨è§„æ ¼ä½†æœªèƒ½å’Œè¿œç«¯åŒ¹é…。" #: builtin/pull.c:442 #, 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:447 msgid "You are not currently on a branch." msgstr "您当å‰ä¸åœ¨ä¸€ä¸ªåˆ†æ”¯ä¸Šã€‚" #: builtin/pull.c:449 builtin/pull.c:464 msgid "Please specify which branch you want to rebase against." msgstr "请指定您è¦å˜åŸºåˆ°å“ªä¸€ä¸ªåˆ†æ”¯ã€‚" #: builtin/pull.c:451 builtin/pull.c:466 msgid "Please specify which branch you want to merge with." msgstr "请指定您è¦åˆå¹¶å“ªä¸€ä¸ªåˆ†æ”¯ã€‚" #: builtin/pull.c:452 builtin/pull.c:467 msgid "See git-pull(1) for details." msgstr "è¯¦è§ git-pull(1)。" #: builtin/pull.c:462 msgid "There is no tracking information for the current branch." msgstr "当å‰åˆ†æ”¯æ²¡æœ‰è·Ÿè¸ªä¿¡æ¯ã€‚" #: builtin/pull.c:471 #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" "\n" " git branch --set-upstream-to=%s/<branch> %s\n" msgstr "" "如果您想è¦ä¸ºæ¤åˆ†æ”¯åˆ›å»ºè·Ÿè¸ªä¿¡æ¯ï¼Œæ‚¨å¯ä»¥æ‰§è¡Œï¼š\n" "\n" " git branch --set-upstream-to=%s/<branch> %s\n" #: builtin/pull.c:476 #, 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:830 msgid "Updating an unborn branch with changes added to the index." msgstr "更新尚未诞生的分支,å˜æ›´æ·»åŠ 至索引。" #: builtin/pull.c:859 #, 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:864 #, 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:879 msgid "Cannot merge multiple branches into empty head." msgstr "æ— æ³•å°†å¤šä¸ªåˆ†æ”¯åˆå¹¶åˆ°ç©ºåˆ†æ”¯ã€‚" #: builtin/pull.c:883 msgid "Cannot rebase onto multiple branches." msgstr "æ— æ³•å˜åŸºåˆ°å¤šä¸ªåˆ†æ”¯ã€‚" #: builtin/push.c:15 msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "git push [<选项>] [<仓库> [<å¼•ç”¨è§„æ ¼>...]]" #: builtin/push.c:86 msgid "tag shorthand without <tag>" msgstr "æ ‡ç¾åŽé¢æœªæä¾› <æ ‡ç¾> å‚æ•°" #: builtin/push.c:96 msgid "--delete only accepts plain target ref names" msgstr "--delete åªæŽ¥å—简å•çš„ç›®æ ‡å¼•ç”¨å" #: builtin/push.c:140 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." msgstr "" "\n" "为了永久地选择任一选项,å‚è§ 'git help config' ä¸çš„ push.default。" #: builtin/push.c:143 #, 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:158 #, 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:172 #, 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:180 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "当å‰åˆ†æ”¯ %s 有多个上游分支,拒ç»æŽ¨é€ã€‚" #: builtin/push.c:183 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" "your current branch '%s', without telling me what to push\n" "to update which remote branch." msgstr "" "您æ£æŽ¨é€è‡³è¿œç¨‹ '%s'(其并éžå½“å‰åˆ†æ”¯ '%s' 的上游),\n" "而没有告诉我è¦æŽ¨é€ä»€ä¹ˆã€æ›´æ–°å“ªä¸ªè¿œç¨‹åˆ†æ”¯ã€‚" # 译者:å—符串首行行首è¦æ·»åŠ “warning: â€å—串,故æ¤é¦–è¡Œè¦è¾ƒå…¶ä½™è¡ŒçŸ #: builtin/push.c:206 msgid "" "push.default is unset; its implicit value has changed in\n" "Git 2.0 from 'matching' to 'simple'. To squelch this message\n" "and maintain the traditional behavior, use:\n" "\n" " git config --global push.default matching\n" "\n" "To squelch this message and adopt the new behavior now, use:\n" "\n" " git config --global push.default simple\n" "\n" "When push.default is set to 'matching', git will push local branches\n" "to the remote branches that already exist with the same name.\n" "\n" "Since Git 2.0, Git defaults to the more conservative 'simple'\n" "behavior, which only pushes the current branch to the corresponding\n" "remote branch that 'git pull' uses to update the current branch.\n" "\n" "See 'git help config' and search for 'push.default' for further " "information.\n" "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n" "'current' instead of 'simple' if you sometimes use older versions of Git)" msgstr "" "push.default 尚未设置,它的默认值在 Git 2.0 已从 'matching'\n" "å˜æ›´ä¸º 'simple'。若è¦ä¸å†æ˜¾ç¤ºæœ¬ä¿¡æ¯å¹¶ä¿æŒä¼ ç»Ÿä¹ æƒ¯ï¼Œè¿›è¡Œå¦‚ä¸‹è®¾ç½®ï¼š\n" "\n" " git config --global push.default matching\n" "\n" "è‹¥è¦ä¸å†æ˜¾ç¤ºæœ¬ä¿¡æ¯å¹¶ä»ŽçŽ°åœ¨å¼€å§‹é‡‡ç”¨æ–°çš„ä½¿ç”¨ä¹ æƒ¯ï¼Œè®¾ç½®ï¼š\n" "\n" " git config --global push.default simple\n" "\n" "当 push.default 设置为 'matching' åŽï¼Œgit 将推é€å’Œè¿œç¨‹åŒå的所有\n" "本地分支。\n" "\n" "从 Git 2.0 开始,Git 默认采用更为ä¿å®ˆçš„ 'simple' 模å¼ï¼ŒåªæŽ¨é€å½“å‰\n" "分支到远程关è”çš„åŒååˆ†æ”¯ï¼Œå³ 'git push' 推é€å½“å‰åˆ†æ”¯ã€‚\n" "\n" "å‚è§ 'git help config' 并查找 'push.default' 以获å–更多信æ¯ã€‚\n" "('simple' 模å¼ç”± Git 1.7.11 版本引入。如果您有时è¦ä½¿ç”¨è€ç‰ˆæœ¬çš„ Git,\n" "为ä¿æŒå…¼å®¹ï¼Œè¯·ç”¨ 'current' 代替 'simple')" #: builtin/push.c:273 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "您没有为推é€æŒ‡å®šä»»ä½•å¼•ç”¨è§„æ ¼ï¼Œå¹¶ä¸” push.default 为 \"nothing\"。" #: builtin/push.c:280 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:286 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:292 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:299 msgid "Updates were rejected because the tag already exists in the remote." msgstr "更新被拒ç»ï¼Œå› ä¸ºè¯¥æ ‡ç¾åœ¨è¿œç¨‹å·²ç»å˜åœ¨ã€‚" #: builtin/push.c:302 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:361 #, c-format msgid "Pushing to %s\n" msgstr "推é€åˆ° %s\n" #: builtin/push.c:365 #, 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:411 msgid "--all and --tags are incompatible" msgstr "--all å’Œ --tags ä¸å…¼å®¹" #: builtin/push.c:412 msgid "--all can't be combined with refspecs" msgstr "--all ä¸èƒ½å’Œå¼•ç”¨è§„æ ¼åŒæ—¶ä½¿ç”¨" #: builtin/push.c:417 msgid "--mirror and --tags are incompatible" msgstr "--mirror å’Œ --tags ä¸å…¼å®¹" #: builtin/push.c:418 msgid "--mirror can't be combined with refspecs" msgstr "--mirror ä¸èƒ½å’Œå¼•ç”¨è§„æ ¼åŒæ—¶ä½¿ç”¨" #: builtin/push.c:423 msgid "--all and --mirror are incompatible" msgstr "--all å’Œ --mirror ä¸å…¼å®¹" #: builtin/push.c:539 msgid "repository" msgstr "仓库" #: builtin/push.c:540 builtin/send-pack.c:161 msgid "push all refs" msgstr "推é€æ‰€æœ‰å¼•ç”¨" #: builtin/push.c:541 builtin/send-pack.c:163 msgid "mirror all refs" msgstr "é•œåƒæ‰€æœ‰å¼•ç”¨" #: builtin/push.c:543 msgid "delete refs" msgstr "åˆ é™¤å¼•ç”¨" #: builtin/push.c:544 msgid "push tags (can't be used with --all or --mirror)" msgstr "推é€æ ‡ç¾ï¼ˆä¸èƒ½ä½¿ç”¨ --all or --mirror)" #: builtin/push.c:547 builtin/send-pack.c:164 msgid "force updates" msgstr "强制更新" #: builtin/push.c:549 builtin/send-pack.c:175 msgid "refname>:<expect" msgstr "引用å>:<期望值" #: builtin/push.c:550 builtin/send-pack.c:176 msgid "require old value of ref to be at this value" msgstr "è¦æ±‚引用旧的å–值为设定值" #: builtin/push.c:553 msgid "control recursive pushing of submodules" msgstr "控制å模组的递归推é€" #: builtin/push.c:555 builtin/send-pack.c:169 msgid "use thin pack" msgstr "使用精简打包" #: builtin/push.c:556 builtin/push.c:557 builtin/send-pack.c:158 #: builtin/send-pack.c:159 msgid "receive pack program" msgstr "接收包程åº" #: builtin/push.c:558 msgid "set upstream for git pull/status" msgstr "设置 git pull/status 的上游" #: builtin/push.c:561 msgid "prune locally removed refs" msgstr "æ¸…é™¤æœ¬åœ°åˆ é™¤çš„å¼•ç”¨" #: builtin/push.c:563 msgid "bypass pre-push hook" msgstr "绕过 pre-push é’©å" #: builtin/push.c:564 msgid "push missing but relevant tags" msgstr "推é€ç¼ºå¤±ä½†æœ‰å…³çš„æ ‡ç¾" #: builtin/push.c:567 builtin/send-pack.c:166 msgid "GPG sign the push" msgstr "用 GPG 为推é€ç¾å" #: builtin/push.c:569 builtin/send-pack.c:170 msgid "request atomic transaction on remote side" msgstr "需è¦è¿œç«¯æ”¯æŒåŽŸå事务" #: builtin/push.c:579 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete 与 --allã€--mirror åŠ --tags ä¸å…¼å®¹" #: builtin/push.c:581 msgid "--delete doesn't make sense without any refs" msgstr "--delete 未接任何引用没有æ„义" #: builtin/read-tree.c:37 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:110 msgid "write resulting index to <file>" msgstr "将索引结果写入 <文件>" #: builtin/read-tree.c:113 msgid "only empty the index" msgstr "åªæ˜¯æ¸…空索引" #: builtin/read-tree.c:115 msgid "Merging" msgstr "åˆå¹¶" #: builtin/read-tree.c:117 msgid "perform a merge in addition to a read" msgstr "读å–之余å†æ‰§è¡Œä¸€ä¸ªåˆå¹¶" #: builtin/read-tree.c:119 msgid "3-way merge if no file level merging required" msgstr "如果没有文件级åˆå¹¶éœ€è¦ï¼Œæ‰§è¡Œä¸‰æ–¹åˆå¹¶" #: builtin/read-tree.c:121 msgid "3-way merge in presence of adds and removes" msgstr "å˜åœ¨æ·»åŠ å’Œåˆ é™¤æ—¶ï¼Œä¹Ÿæ‰§è¡Œä¸‰æ–¹åˆå¹¶" #: builtin/read-tree.c:123 msgid "same as -m, but discard unmerged entries" msgstr "类似于 -m,但丢弃未åˆå¹¶çš„æ¡ç›®" #: builtin/read-tree.c:124 msgid "<subdirectory>/" msgstr "<å目录>/" #: builtin/read-tree.c:125 msgid "read the tree into the index under <subdirectory>/" msgstr "读å–æ ‘å¯¹è±¡åˆ°ç´¢å¼•çš„ <å目录>/ 下" #: builtin/read-tree.c:128 msgid "update working tree with merge result" msgstr "用åˆå¹¶çš„结果更新工作区" #: builtin/read-tree.c:130 msgid "gitignore" msgstr "gitignore" #: builtin/read-tree.c:131 msgid "allow explicitly ignored files to be overwritten" msgstr "å…许忽略文件ä¸è®¾å®šçš„文件å¯ä»¥è¢«è¦†ç›–" #: builtin/read-tree.c:134 msgid "don't check the working tree after merging" msgstr "åˆå¹¶åŽä¸æ£€æŸ¥å·¥ä½œåŒº" #: builtin/read-tree.c:135 msgid "don't update the index or the work tree" msgstr "ä¸æ›´æ–°ç´¢å¼•åŒºå’Œå·¥ä½œåŒº" #: builtin/read-tree.c:137 msgid "skip applying sparse checkout filter" msgstr "跳过应用稀ç–检出过滤器" #: builtin/read-tree.c:139 msgid "debug unpack-trees" msgstr "调试 unpack-trees" #: builtin/reflog.c:432 #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "'%2$s' 的值 '%1$s' ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„时间戳" #: builtin/reflog.c:549 builtin/reflog.c:554 #, c-format msgid "'%s' is not a valid timestamp" msgstr "'%s' ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„时间戳" #: builtin/remote.c:12 msgid "git remote [-v | --verbose]" msgstr "git remote [-v | --verbose]" #: builtin/remote.c:13 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:14 builtin/remote.c:33 msgid "git remote rename <old> <new>" msgstr "git remote rename <æ—§å称> <æ–°å称>" #: builtin/remote.c:15 builtin/remote.c:38 msgid "git remote remove <name>" msgstr "git remote remove <å称>" #: builtin/remote.c:16 builtin/remote.c:43 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" msgstr "git remote set-head <å称> (-a | --auto | -d | --delete | <分支>)" #: builtin/remote.c:17 msgid "git remote [-v | --verbose] show [-n] <name>" msgstr "git remote [-v | --verbose] show [-n] <å称>" #: builtin/remote.c:18 msgid "git remote prune [-n | --dry-run] <name>" msgstr "git remote prune [-n | --dry-run] <å称>" #: builtin/remote.c:19 msgid "" "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]" #: builtin/remote.c:20 msgid "git remote set-branches [--add] <name> <branch>..." msgstr "git remote set-branches [--add] <å称> <分支>..." #: builtin/remote.c:21 builtin/remote.c:69 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" msgstr "git remote set-url [--push] <å称> <新的地å€> [<旧的地å€>]" #: builtin/remote.c:22 builtin/remote.c:70 msgid "git remote set-url --add <name> <newurl>" msgstr "git remote set-url --add <å称> <新的地å€>" #: builtin/remote.c:23 builtin/remote.c:71 msgid "git remote set-url --delete <name> <url>" msgstr "git remote set-url --delete <å称> <地å€>" #: builtin/remote.c:28 msgid "git remote add [<options>] <name> <url>" msgstr "git remote add [<选项>] <å称> <地å€>" #: builtin/remote.c:48 msgid "git remote set-branches <name> <branch>..." msgstr "git remote set-branches <å称> <分支>..." #: builtin/remote.c:49 msgid "git remote set-branches --add <name> <branch>..." msgstr "git remote set-branches --add <å称> <分支>..." #: builtin/remote.c:54 msgid "git remote show [<options>] <name>" msgstr "git remote show [<选项>] <å称>" #: builtin/remote.c:59 msgid "git remote prune [<options>] <name>" msgstr "git remote prune [<选项>] <å称>" #: builtin/remote.c:64 msgid "git remote update [<options>] [<group> | <remote>]..." msgstr "git remote update [<选项>] [<组> | <远程>]..." #: builtin/remote.c:88 #, c-format msgid "Updating %s" msgstr "æ›´æ–° %s ä¸" #: builtin/remote.c:120 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:137 #, c-format msgid "unknown mirror argument: %s" msgstr "未知的镜åƒå‚数:%s" #: builtin/remote.c:153 msgid "fetch the remote branches" msgstr "抓å–远程的分支" #: builtin/remote.c:155 msgid "import all tags and associated objects when fetching" msgstr "抓å–æ—¶å¯¼å…¥æ‰€æœ‰çš„æ ‡ç¾å’Œå…³è”对象" #: builtin/remote.c:158 msgid "or do not fetch any tag at all (--no-tags)" msgstr "或ä¸æŠ“å–ä»»ä½•æ ‡ç¾ï¼ˆ--no-tags)" #: builtin/remote.c:160 msgid "branch(es) to track" msgstr "跟踪的分支" #: builtin/remote.c:161 msgid "master branch" msgstr "主线分支" #: builtin/remote.c:162 msgid "push|fetch" msgstr "push|fetch" #: builtin/remote.c:163 msgid "set up remote as a mirror to push to or fetch from" msgstr "把远程设置为用以推é€æˆ–抓å–çš„é•œåƒ" #: builtin/remote.c:175 msgid "specifying a master branch makes no sense with --mirror" msgstr "指定一个 master 分支并使用 --mirror 选项没有æ„义" #: builtin/remote.c:177 msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "指定è¦è·Ÿè¸ªçš„分支åªåœ¨ä¸ŽèŽ·å–é•œåƒåŒæ—¶ä½¿ç”¨æ‰æœ‰æ„义" #: builtin/remote.c:187 builtin/remote.c:637 #, c-format msgid "remote %s already exists." msgstr "远程 %s å·²ç»å˜åœ¨ã€‚" #: builtin/remote.c:191 builtin/remote.c:641 #, c-format msgid "'%s' is not a valid remote name" msgstr "'%s' ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„远程å称" #: builtin/remote.c:235 #, c-format msgid "Could not setup master '%s'" msgstr "æ— æ³•è®¾ç½® master '%s'" #: builtin/remote.c:335 #, c-format msgid "Could not get fetch map for refspec %s" msgstr "æ— æ³•å¾—åˆ°å¼•ç”¨è§„æ ¼ %s 的获å–列表" #: builtin/remote.c:436 builtin/remote.c:444 msgid "(matching)" msgstr "(匹é…)" #: builtin/remote.c:448 msgid "(delete)" msgstr "ï¼ˆåˆ é™¤ï¼‰" #: builtin/remote.c:588 builtin/remote.c:594 builtin/remote.c:600 #, c-format msgid "Could not append '%s' to '%s'" msgstr "ä¸èƒ½æ·»åŠ '%s' 至 '%s'" #: builtin/remote.c:630 builtin/remote.c:769 builtin/remote.c:869 #, c-format msgid "No such remote: %s" msgstr "æ²¡æœ‰è¿™æ ·çš„è¿œç¨‹ï¼š%s" #: builtin/remote.c:647 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "ä¸èƒ½é‡å‘½åé…ç½®å°èŠ‚ '%s' 到 '%s'" #: builtin/remote.c:653 builtin/remote.c:821 #, c-format msgid "Could not remove config section '%s'" msgstr "ä¸èƒ½ç§»é™¤é…ç½®å°èŠ‚ '%s'" #: builtin/remote.c:668 #, 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:674 #, c-format msgid "Could not append '%s'" msgstr "ä¸èƒ½è¿½åŠ '%s'" #: builtin/remote.c:685 #, c-format msgid "Could not set '%s'" msgstr "ä¸èƒ½è®¾ç½® '%s'" #: builtin/remote.c:707 #, c-format msgid "deleting '%s' failed" msgstr "åˆ é™¤ '%s' 失败" #: builtin/remote.c:741 #, c-format msgid "creating '%s' failed" msgstr "创建 '%s' 失败" #: builtin/remote.c:807 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:922 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " 新的(下一次获å–å°†å˜å‚¨äºŽ remotes/%s)" #: builtin/remote.c:925 msgid " tracked" msgstr " 已跟踪" #: builtin/remote.c:927 msgid " stale (use 'git remote prune' to remove)" msgstr " 过时(使用 'git remote prune' æ¥ç§»é™¤ï¼‰" #: builtin/remote.c:929 msgid " ???" msgstr " ???" #: builtin/remote.c:970 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "æ— æ•ˆçš„ branch.%s.merge,ä¸èƒ½å˜åŸºåˆ°ä¸€ä¸ªä»¥ä¸Šçš„分支" #: builtin/remote.c:977 #, 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:981 msgid " and with remote" msgstr " 且有远程" #: builtin/remote.c:983 #, c-format msgid "merges with remote %s" msgstr "与远程 %s åˆå¹¶" #: builtin/remote.c:984 msgid " and with remote" msgstr " 且有远程" #: builtin/remote.c:1030 msgid "create" msgstr "创建" #: builtin/remote.c:1033 msgid "delete" msgstr "åˆ é™¤" #: builtin/remote.c:1037 msgid "up to date" msgstr "最新" #: builtin/remote.c:1040 msgid "fast-forwardable" msgstr "å¯å¿«è¿›" #: builtin/remote.c:1043 msgid "local out of date" msgstr "本地已过时" #: builtin/remote.c:1050 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s 强制推é€è‡³ %-*s (%s)" #: builtin/remote.c:1053 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s 推é€è‡³ %-*s (%s)" #: builtin/remote.c:1057 #, c-format msgid " %-*s forces to %s" msgstr " %-*s 强制推é€è‡³ %s" #: builtin/remote.c:1060 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s 推é€è‡³ %s" #: builtin/remote.c:1128 msgid "do not query remotes" msgstr "ä¸æŸ¥è¯¢è¿œç¨‹" #: builtin/remote.c:1155 #, c-format msgid "* remote %s" msgstr "* 远程 %s" #: builtin/remote.c:1156 #, c-format msgid " Fetch URL: %s" msgstr " 获å–地å€ï¼š%s" #: builtin/remote.c:1157 builtin/remote.c:1308 msgid "(no URL)" msgstr "(æ— URL)" #: builtin/remote.c:1166 builtin/remote.c:1168 #, c-format msgid " Push URL: %s" msgstr " 推é€åœ°å€ï¼š%s" #: builtin/remote.c:1170 builtin/remote.c:1172 builtin/remote.c:1174 #, c-format msgid " HEAD branch: %s" msgstr " HEAD 分支:%s" #: builtin/remote.c:1176 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr " HEAD 分支(远程 HEAD 模糊,å¯èƒ½æ˜¯ä¸‹åˆ—ä¸çš„一个):\n" #: builtin/remote.c:1188 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " 远程分支:%s" msgstr[1] " 远程分支:%s" # 译者:ä¸æ–‡å—符串拼接,å¯åˆ 除å‰å¯¼ç©ºæ ¼ #: builtin/remote.c:1191 builtin/remote.c:1218 msgid " (status not queried)" msgstr "(状æ€æœªæŸ¥è¯¢ï¼‰" #: builtin/remote.c:1200 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:1208 msgid " Local refs will be mirrored by 'git push'" msgstr " 本地引用将在 'git push' 时被镜åƒ" #: builtin/remote.c:1215 #, 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:1236 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "æ ¹æ®è¿œç¨‹è®¾ç½® refs/remotes/<å称>/HEAD" #: builtin/remote.c:1238 msgid "delete refs/remotes/<name>/HEAD" msgstr "åˆ é™¤ refs/remotes/<å称>/HEAD" #: builtin/remote.c:1253 msgid "Cannot determine remote HEAD" msgstr "æ— æ³•ç¡®å®šè¿œç¨‹ HEAD" #: builtin/remote.c:1255 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:" #: builtin/remote.c:1265 #, c-format msgid "Could not delete %s" msgstr "æ— æ³•åˆ é™¤ %s" #: builtin/remote.c:1273 #, c-format msgid "Not a valid ref: %s" msgstr "ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆå¼•ç”¨ï¼š%s" #: builtin/remote.c:1275 #, c-format msgid "Could not setup %s" msgstr "ä¸èƒ½è®¾ç½® %s" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: builtin/remote.c:1293 #, c-format msgid " %s will become dangling!" msgstr " %s å°†æˆä¸ºæ‘‡æ‘†çŠ¶æ€ï¼" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: builtin/remote.c:1294 #, c-format msgid " %s has become dangling!" msgstr " %s å·²æˆä¸ºæ‘‡æ‘†çŠ¶æ€ï¼" #: builtin/remote.c:1304 #, c-format msgid "Pruning %s" msgstr "修剪 %s" #: builtin/remote.c:1305 #, c-format msgid "URL: %s" msgstr "URL:%s" #: builtin/remote.c:1321 #, c-format msgid " * [would prune] %s" msgstr " * [å°†åˆ é™¤] %s" #: builtin/remote.c:1324 #, c-format msgid " * [pruned] %s" msgstr " * [å·²åˆ é™¤] %s" #: builtin/remote.c:1369 msgid "prune remotes after fetching" msgstr "抓å–åŽæ¸…除远程" #: builtin/remote.c:1435 builtin/remote.c:1509 #, c-format msgid "No such remote '%s'" msgstr "没有æ¤è¿œç¨‹ '%s'" #: builtin/remote.c:1455 msgid "add branch" msgstr "æ·»åŠ åˆ†æ”¯" #: builtin/remote.c:1462 msgid "no remote specified" msgstr "未指定远程" #: builtin/remote.c:1484 msgid "manipulate push URLs" msgstr "æ“ä½œæŽ¨é€ URLS" #: builtin/remote.c:1486 msgid "add URL" msgstr "æ·»åŠ URL" #: builtin/remote.c:1488 msgid "delete URLs" msgstr "åˆ é™¤ URLS" #: builtin/remote.c:1495 msgid "--add --delete doesn't make sense" msgstr "--add --delete æ— æ„义" #: builtin/remote.c:1535 #, c-format msgid "Invalid old URL pattern: %s" msgstr "æ— æ•ˆçš„æ—§ URL 匹é…模版:%s" #: builtin/remote.c:1543 #, c-format msgid "No such URL found: %s" msgstr "æœªæ‰¾åˆ°æ¤ URL:%s" #: builtin/remote.c:1545 msgid "Will not delete all non-push URLs" msgstr "å°†ä¸ä¼šåˆ 除所有éžæŽ¨é€ URL 地å€" #: builtin/remote.c:1559 msgid "be verbose; must be placed before a subcommand" msgstr "冗长输出;必须置于å命令之å‰" #: builtin/repack.c:17 msgid "git repack [<options>]" msgstr "git repack [<选项>]" #: builtin/repack.c:159 msgid "pack everything in a single pack" msgstr "所有内容打包到一个包文件ä¸" #: builtin/repack.c:161 msgid "same as -a, and turn unreachable objects loose" msgstr "å’Œ -a 相åŒï¼Œå¹¶å°†ä¸å¯è¾¾çš„对象设为æ¾æ•£å¯¹è±¡" #: builtin/repack.c:164 msgid "remove redundant packs, and run git-prune-packed" msgstr "åˆ é™¤å¤šä½™çš„åŒ…ï¼Œè¿è¡Œ git-prune-packed" #: builtin/repack.c:166 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "å‘ git-pack-objects ä¼ é€’å‚æ•° --no-reuse-delta" #: builtin/repack.c:168 msgid "pass --no-reuse-object to git-pack-objects" msgstr "å‘ git-pack-objects ä¼ é€’å‚æ•° --no-reuse-object" #: builtin/repack.c:170 msgid "do not run git-update-server-info" msgstr "ä¸è¿è¡Œ git-update-server-info" #: builtin/repack.c:173 msgid "pass --local to git-pack-objects" msgstr "å‘ git-pack-objects ä¼ é€’å‚æ•° --local" #: builtin/repack.c:175 msgid "write bitmap index" msgstr "写 bitmap 索引" #: builtin/repack.c:176 msgid "approxidate" msgstr "近似日期" #: builtin/repack.c:177 msgid "with -A, do not loosen objects older than this" msgstr "使用 -A,ä¸è¦å°†æ—©äºŽç»™å®šæ—¶é—´çš„对象过期" #: builtin/repack.c:179 msgid "size of the window used for delta compression" msgstr "用于增é‡åŽ‹ç¼©çš„窗å£å€¼" #: builtin/repack.c:180 builtin/repack.c:184 msgid "bytes" msgstr "å—节" #: builtin/repack.c:181 msgid "same as the above, but limit memory size instead of entries count" msgstr "和上é¢çš„相似,但é™åˆ¶å†…å˜å¤§å°è€Œéžæ¡ç›®æ•°" #: builtin/repack.c:183 msgid "limits the maximum delta depth" msgstr "é™åˆ¶æœ€å¤§å¢žé‡æ·±åº¦" #: builtin/repack.c:185 msgid "maximum size of each packfile" msgstr "æ¯ä¸ªåŒ…文件的最大尺寸" #: builtin/repack.c:187 msgid "repack objects in packs marked with .keep" msgstr "å¯¹æ ‡è®°ä¸º .keep 的包ä¸çš„对象é‡æ–°æ‰“包" #: builtin/repack.c:378 #, c-format msgid "removing '%s' failed" msgstr "åˆ é™¤ '%s' 失败" #: builtin/replace.c:19 msgid "git replace [-f] <object> <replacement>" msgstr "git replace [-f] <对象> <替æ¢ç‰©>" #: builtin/replace.c:20 msgid "git replace [-f] --edit <object>" msgstr "git replace [-f] --edit <对象>" #: builtin/replace.c:21 msgid "git replace [-f] --graft <commit> [<parent>...]" msgstr "git replace [-f] --graft <æ交> [<父æ交>...]" #: builtin/replace.c:22 msgid "git replace -d <object>..." msgstr "git replace -d <对象>..." #: builtin/replace.c:23 msgid "git replace [--format=<format>] [-l [<pattern>]]" msgstr "git replace [--format=<æ ¼å¼>] [-l [<模å¼>]]" #: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391 #, c-format msgid "Not a valid object name: '%s'" msgstr "ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„对象å:'%s'" #: builtin/replace.c:355 #, c-format msgid "bad mergetag in commit '%s'" msgstr "æ交 '%s' ä¸å«æœ‰æŸåçš„åˆå¹¶æ ‡ç¾" #: builtin/replace.c:357 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "æ交 '%s' ä¸å«æœ‰éžæ³•çš„åˆå¹¶æ ‡ç¾" #: builtin/replace.c:368 #, 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:401 #, c-format msgid "the original commit '%s' has a gpg signature." msgstr "原始æ交 '%s' ä¸åŒ…å«ä¸€ä¸ª GPG ç¾å" #: builtin/replace.c:402 msgid "the signature will be removed in the replacement commit!" msgstr "在替æ¢çš„æ交ä¸ç¾å将被移除ï¼" #: builtin/replace.c:408 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "ä¸èƒ½ä¸º '%s' 写替æ¢æ交" #: builtin/replace.c:432 msgid "list replace refs" msgstr "列出替æ¢çš„引用" #: builtin/replace.c:433 msgid "delete replace refs" msgstr "åˆ é™¤æ›¿æ¢çš„引用" #: builtin/replace.c:434 msgid "edit existing object" msgstr "编辑现å˜çš„对象" #: builtin/replace.c:435 msgid "change a commit's parents" msgstr "修改一个æ交的父æ交" #: builtin/replace.c:436 msgid "replace the ref if it exists" msgstr "如果å˜åœ¨åˆ™æ›¿æ¢å¼•ç”¨" #: builtin/replace.c:437 msgid "do not pretty-print contents for --edit" msgstr "ä¸è¦ä¸º --edit æ“作美观显示内容" #: builtin/replace.c:438 msgid "use this format" msgstr "使用æ¤æ ¼å¼" #: builtin/rerere.c:12 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]" msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]" #: builtin/rerere.c:57 msgid "register clean resolutions in index" msgstr "在索引ä¸æ³¨å†Œå¹²å‡€çš„解决方案" #: builtin/reset.c:26 msgid "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<æ交>]" #: builtin/reset.c:27 msgid "git reset [-q] <tree-ish> [--] <paths>..." msgstr "git reset [-q] <æ ‘æˆ–æ交> [--] <路径>..." #: builtin/reset.c:28 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" msgstr "git reset --patch [<æ ‘æˆ–æ交>] [--] [<路径>...]" #: builtin/reset.c:34 msgid "mixed" msgstr "æ··æ‚" #: builtin/reset.c:34 msgid "soft" msgstr "软性" #: builtin/reset.c:34 msgid "hard" msgstr "硬性" #: builtin/reset.c:34 msgid "merge" msgstr "åˆå¹¶" #: builtin/reset.c:34 msgid "keep" msgstr "ä¿æŒ" #: builtin/reset.c:74 msgid "You do not have a valid HEAD." msgstr "您没有一个有效的 HEAD。" #: builtin/reset.c:76 msgid "Failed to find tree of HEAD." msgstr "æ— æ³•æ‰¾åˆ° HEAD 指å‘çš„æ ‘ã€‚" #: builtin/reset.c:82 #, c-format msgid "Failed to find tree of %s." msgstr "æ— æ³•æ‰¾åˆ° %s 指å‘çš„æ ‘ã€‚" #: builtin/reset.c:100 #, c-format msgid "HEAD is now at %s" msgstr "HEAD 现在ä½äºŽ %s" # 译者:汉å—ä¹‹é—´æ— ç©ºæ ¼ï¼Œæ•…åˆ é™¤%så‰åŽç©ºæ ¼ #: builtin/reset.c:183 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "在åˆå¹¶è¿‡ç¨‹ä¸ä¸èƒ½åš%sé‡ç½®æ“作。" #: builtin/reset.c:276 msgid "be quiet, only report errors" msgstr "安é™æ¨¡å¼ï¼ŒåªæŠ¥å‘Šé”™è¯¯" #: builtin/reset.c:278 msgid "reset HEAD and index" msgstr "é‡ç½® HEAD 和索引" #: builtin/reset.c:279 msgid "reset only HEAD" msgstr "åªé‡ç½® HEAD" #: builtin/reset.c:281 builtin/reset.c:283 msgid "reset HEAD, index and working tree" msgstr "é‡ç½® HEADã€ç´¢å¼•å’Œå·¥ä½œåŒº" #: builtin/reset.c:285 msgid "reset HEAD but keep local changes" msgstr "é‡ç½® HEAD 但ä¿å˜æœ¬åœ°å˜æ›´" #: builtin/reset.c:288 msgid "record only the fact that removed paths will be added later" msgstr "å°†åˆ é™¤çš„è·¯å¾„æ ‡è®°ä¸ºç¨åŽæ·»åŠ " #: builtin/reset.c:305 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "æ— æ³•å°† '%s' 解æžä¸ºä¸€ä¸ªæœ‰æ•ˆçš„版本。" #: builtin/reset.c:313 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "æ— æ³•å°† '%s' 解æžä¸ºä¸€ä¸ªæœ‰æ•ˆçš„æ ‘å¯¹è±¡ã€‚" #: builtin/reset.c:322 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch 与 --{hardã€mixedã€soft} 选项ä¸å…¼å®¹" #: builtin/reset.c:331 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "--mixed 带路径已弃用,而是用 'git reset -- <路径>'。" # 译者:汉å—ä¹‹é—´æ— ç©ºæ ¼ï¼Œæ•…åˆ é™¤%så‰åŽç©ºæ ¼ #: builtin/reset.c:333 #, c-format msgid "Cannot do %s reset with paths." msgstr "ä¸èƒ½å¸¦è·¯å¾„进行%sé‡ç½®ã€‚" # 译者:汉å—ä¹‹é—´æ— ç©ºæ ¼ï¼Œæ•…åˆ é™¤%så‰åŽç©ºæ ¼ #: builtin/reset.c:343 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "ä¸èƒ½å¯¹çº¯ä»“库进行%sé‡ç½®" #: builtin/reset.c:347 msgid "-N can only be used with --mixed" msgstr "-N åªèƒ½å’Œ --mixed åŒæ—¶ä½¿ç”¨" #: builtin/reset.c:364 msgid "Unstaged changes after reset:" msgstr "é‡ç½®åŽå–消暂å˜çš„å˜æ›´ï¼š" #: builtin/reset.c:370 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "ä¸èƒ½é‡ç½®ç´¢å¼•æ–‡ä»¶è‡³ç‰ˆæœ¬ '%s'。" #: builtin/reset.c:374 msgid "Could not write new index file." msgstr "ä¸èƒ½å†™å…¥æ–°çš„索引文件。" #: builtin/rev-list.c:354 msgid "rev-list does not support display of notes" msgstr "rev-list ä¸æ”¯æŒæ˜¾ç¤ºæ³¨è§£" #: builtin/rev-parse.c:361 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" msgstr "git rev-parse --parseopt [<选项>] -- [<å‚æ•°>...]" #: builtin/rev-parse.c:366 msgid "keep the `--` passed as an arg" msgstr "ä¿æŒ `--` 作为一个å‚æ•°ä¼ é€’" #: builtin/rev-parse.c:368 msgid "stop parsing after the first non-option argument" msgstr "é‡åˆ°ç¬¬ä¸€ä¸ªéžé€‰é¡¹å‚æ•°åŽåœæ¢è§£æž" #: builtin/rev-parse.c:371 msgid "output in stuck long form" msgstr "ä»¥å›ºå®šé•¿æ ¼å¼è¾“出" #: builtin/rev-parse.c:502 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:22 msgid "git revert [<options>] <commit-ish>..." msgstr "git revert [<选项>] <æ交å·>..." #: builtin/revert.c:23 msgid "git revert <subcommand>" msgstr "git revert <å命令>" #: builtin/revert.c:28 msgid "git cherry-pick [<options>] <commit-ish>..." msgstr "git cherry-pick [<选项>] <æ交å·>..." #: builtin/revert.c:29 msgid "git cherry-pick <subcommand>" msgstr "git cherry-pick <å命令>" #: builtin/revert.c:71 #, c-format msgid "%s: %s cannot be used with %s" msgstr "%s:%s ä¸èƒ½å’Œ %s åŒæ—¶ä½¿ç”¨" #: builtin/revert.c:80 msgid "end revert or cherry-pick sequence" msgstr "终æ¢å转或拣选æ“作" #: builtin/revert.c:81 msgid "resume revert or cherry-pick sequence" msgstr "继ç»å转或拣选æ“作" #: builtin/revert.c:82 msgid "cancel revert or cherry-pick sequence" msgstr "å–消å转或拣选æ“作" #: builtin/revert.c:83 msgid "don't automatically commit" msgstr "ä¸è¦è‡ªåŠ¨æ交" #: builtin/revert.c:84 msgid "edit the commit message" msgstr "编辑æ交说明" #: builtin/revert.c:87 msgid "parent number" msgstr "父编å·" #: builtin/revert.c:89 msgid "merge strategy" msgstr "åˆå¹¶ç–ç•¥" #: builtin/revert.c:90 msgid "option" msgstr "选项" #: builtin/revert.c:91 msgid "option for merge strategy" msgstr "åˆå¹¶ç–略的选项" #: builtin/revert.c:104 msgid "append commit name" msgstr "è¿½åŠ æ交å称" #: builtin/revert.c:106 msgid "preserve initially empty commits" msgstr "ä¿ç•™åˆå§‹åŒ–的空æ交" #: builtin/revert.c:107 msgid "allow commits with empty messages" msgstr "å…许æ交说明为空" #: builtin/revert.c:108 msgid "keep redundant, empty commits" msgstr "ä¿æŒå¤šä½™çš„ã€ç©ºçš„æ交" #: builtin/revert.c:112 msgid "program error" msgstr "程åºé”™è¯¯" #: builtin/revert.c:197 msgid "revert failed" msgstr "还原失败" #: builtin/revert.c:212 msgid "cherry-pick failed" msgstr "拣选失败" #: builtin/rm.c:17 msgid "git rm [<options>] [--] <file>..." msgstr "git rm [<选项>] [--] <文件>..." #: builtin/rm.c:65 msgid "" "the following submodule (or one of its nested submodules)\n" "uses a .git directory:" msgid_plural "" "the following submodules (or one of their nested submodules)\n" "use a .git directory:" msgstr[0] "以下å模组(或一个其嵌套å模组)使用了一个 .git 目录:" msgstr[1] "以下å模组(或一个其嵌套å模组)使用了一个 .git 目录:" #: builtin/rm.c:71 msgid "" "\n" "(use 'rm -rf' if you really want to remove it including all of its history)" msgstr "" "\n" "(使用 'rm -rf' å‘½ä»¤å¦‚æžœæ‚¨çœŸçš„æƒ³åˆ é™¤å®ƒåŠå…¶å…¨éƒ¨åŽ†å²ï¼‰" #: builtin/rm.c:230 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:235 msgid "" "\n" "(use -f to force removal)" msgstr "" "\n" "(使用 -f å¼ºåˆ¶åˆ é™¤ï¼‰" #: builtin/rm.c:239 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:243 builtin/rm.c:254 msgid "" "\n" "(use --cached to keep the file, or -f to force removal)" msgstr "" "\n" "(使用 --cached ä¿ç•™æœ¬åœ°æ–‡ä»¶ï¼Œæˆ–用 -f å¼ºåˆ¶åˆ é™¤ï¼‰" #: builtin/rm.c:251 msgid "the following file has local modifications:" msgid_plural "the following files have local modifications:" msgstr[0] "如下文件有本地修改:" msgstr[1] "如下文件有本地修改:" #: builtin/rm.c:269 msgid "do not list removed files" msgstr "ä¸åˆ—å‡ºåˆ é™¤çš„æ–‡ä»¶" #: builtin/rm.c:270 msgid "only remove from the index" msgstr "åªä»Žç´¢å¼•åŒºåˆ 除" #: builtin/rm.c:271 msgid "override the up-to-date check" msgstr "忽略文件更新状æ€æ£€æŸ¥" #: builtin/rm.c:272 msgid "allow recursive removal" msgstr "å…è®¸é€’å½’åˆ é™¤" #: builtin/rm.c:274 msgid "exit with a zero status even if nothing matched" msgstr "å³ä½¿æ²¡æœ‰åŒ¹é…,也以零状æ€é€€å‡º" #: builtin/rm.c:317 msgid "Please, stage your changes to .gitmodules or stash them to proceed" msgstr "请将您的修改缓å˜åˆ° .gitmodules ä¸æˆ–ä¿å˜è¿›åº¦åŽå†ç»§ç»" #: builtin/rm.c:335 #, c-format msgid "not removing '%s' recursively without -r" msgstr "未æä¾› -r 选项ä¸ä¼šé€’å½’åˆ é™¤ '%s'" #: builtin/rm.c:374 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm:ä¸èƒ½åˆ 除 %s" #: builtin/send-pack.c:18 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:160 msgid "remote name" msgstr "远程å称" #: builtin/send-pack.c:171 msgid "use stateless RPC protocol" msgstr "ä½¿ç”¨æ— çŠ¶æ€çš„ RPC åè®®" #: builtin/send-pack.c:172 msgid "read refs from stdin" msgstr "ä»Žæ ‡å‡†è¾“å…¥è¯»å–引用" #: builtin/send-pack.c:173 msgid "print status from remote helper" msgstr "打å°æ¥è‡ªè¿œç¨‹ helper 的状æ€" #: builtin/shortlog.c:13 msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]" msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]" #: builtin/shortlog.c:131 #, c-format msgid "Missing author: %s" msgstr "缺少作者:%s" #: builtin/shortlog.c:230 msgid "sort output according to the number of commits per author" msgstr "æ ¹æ®æ¯ä¸ªä½œè€…çš„æ交数é‡æŽ’åº" #: builtin/shortlog.c:232 msgid "Suppress commit descriptions, only provides commit count" msgstr "éšè—æ交说明,åªæä¾›æ交数é‡" #: builtin/shortlog.c:234 msgid "Show the email address of each author" msgstr "显示æ¯ä¸ªä½œè€…的电å邮件地å€" #: builtin/shortlog.c:235 msgid "w[,i1[,i2]]" msgstr "w[,i1[,i2]]" #: builtin/shortlog.c:236 msgid "Linewrap output" msgstr "折行输出" #: builtin/show-branch.c:9 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:13 msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]" msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<引用>]" #: builtin/show-branch.c:659 msgid "show remote-tracking and local branches" msgstr "显示远程跟踪的和本地的分支" #: builtin/show-branch.c:661 msgid "show remote-tracking branches" msgstr "显示远程跟踪的分支" #: builtin/show-branch.c:663 msgid "color '*!+-' corresponding to the branch" msgstr "ç€è‰² '*!+-' 到相应的分支" #: builtin/show-branch.c:665 msgid "show <n> more commits after the common ancestor" msgstr "显示共åŒç¥–å…ˆåŽçš„ <n> 个æ交" #: builtin/show-branch.c:667 msgid "synonym to more=-1" msgstr "å’Œ more=-1 åŒä¹‰" #: builtin/show-branch.c:668 msgid "suppress naming strings" msgstr "ä¸æ˜¾ç¤ºå—符串命å" #: builtin/show-branch.c:670 msgid "include the current branch" msgstr "包括当å‰åˆ†æ”¯" #: builtin/show-branch.c:672 msgid "name commits with their object names" msgstr "以对象åå—命åæ交" #: builtin/show-branch.c:674 msgid "show possible merge bases" msgstr "显示å¯èƒ½åˆå¹¶çš„基线" #: builtin/show-branch.c:676 msgid "show refs unreachable from any other ref" msgstr "显示没有任何引用的的引用" #: builtin/show-branch.c:678 msgid "show commits in topological order" msgstr "以拓扑顺åºæ˜¾ç¤ºæ交" #: builtin/show-branch.c:681 msgid "show only commits not on the first branch" msgstr "åªæ˜¾ç¤ºä¸åœ¨ç¬¬ä¸€ä¸ªåˆ†æ”¯ä¸Šçš„æ交" #: builtin/show-branch.c:683 msgid "show merges reachable from only one tip" msgstr "显示仅一个分支å¯è®¿é—®çš„åˆå¹¶æ交" #: builtin/show-branch.c:685 msgid "topologically sort, maintaining date order where possible" msgstr "拓扑方å¼æŽ’åºï¼Œå¹¶å°½å¯èƒ½åœ°ä¿æŒæ—¥æœŸé¡ºåº" #: builtin/show-branch.c:688 msgid "<n>[,<base>]" msgstr "<n>[,<base>]" #: builtin/show-branch.c:689 msgid "show <n> most recent ref-log entries starting at base" msgstr "显示从 base 开始的 <n> æ¡æœ€è¿‘的引用日志记录" #: builtin/show-ref.c:10 msgid "" "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]" msgstr "" "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --" "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模å¼>...]" #: builtin/show-ref.c:11 msgid "git show-ref --exclude-existing[=<pattern>] < <ref-list>" msgstr "git show-ref --exclude-existing[=<模å¼>] < <引用列表>" #: builtin/show-ref.c:170 msgid "only show tags (can be combined with heads)" msgstr "åªæ˜¾ç¤ºæ ‡ç¾ï¼ˆå¯ä»¥å’Œå¤´å…±ç”¨ï¼‰" #: builtin/show-ref.c:171 msgid "only show heads (can be combined with tags)" msgstr "åªæ˜¾ç¤ºå¤´ï¼ˆå¯ä»¥å’Œæ ‡ç¾å…±ç”¨ï¼‰" #: builtin/show-ref.c:172 msgid "stricter reference checking, requires exact ref path" msgstr "æ›´ä¸¥æ ¼çš„å¼•ç”¨æ£€æµ‹ï¼Œéœ€è¦ç²¾ç¡®çš„引用路径" #: builtin/show-ref.c:175 builtin/show-ref.c:177 msgid "show the HEAD reference, even if it would be filtered out" msgstr "显示 HEAD 引用,å³ä½¿è¢«è¿‡æ»¤æŽ‰" #: builtin/show-ref.c:179 msgid "dereference tags into object IDs" msgstr "转æ¢æ ‡ç¾åˆ°å¯¹è±¡ ID" #: builtin/show-ref.c:181 msgid "only show SHA1 hash using <n> digits" msgstr "åªæ˜¾ç¤ºä½¿ç”¨ <n> 个数å—çš„ SHA1 哈希" #: builtin/show-ref.c:185 msgid "do not print results to stdout (useful with --verify)" msgstr "ä¸æ‰“å°ç»“æžœåˆ°æ ‡å‡†è¾“å‡ºï¼ˆä¾‹å¦‚ä¸Ž --verify å‚数共用)" #: builtin/show-ref.c:187 msgid "show refs from stdin that aren't in local repository" msgstr "æ˜¾ç¤ºä»Žæ ‡å‡†è¾“å…¥ä¸è¯»å…¥çš„ä¸åœ¨æœ¬åœ°ä»“库ä¸çš„引用" #: builtin/symbolic-ref.c:7 msgid "git symbolic-ref [<options>] <name> [<ref>]" msgstr "git symbolic-ref [<选项>] <å称> [<引用>]" #: builtin/symbolic-ref.c:8 msgid "git symbolic-ref -d [-q] <name>" msgstr "git symbolic-ref -d [-q] <å称>" #: builtin/symbolic-ref.c:40 msgid "suppress error message for non-symbolic (detached) refs" msgstr "ä¸æ˜¾ç¤ºéžç¬¦å·ï¼ˆåˆ†ç¦»çš„)引用的错误信æ¯" #: builtin/symbolic-ref.c:41 msgid "delete symbolic ref" msgstr "åˆ é™¤ç¬¦å·å¼•ç”¨" #: builtin/symbolic-ref.c:42 msgid "shorten ref output" msgstr "简çŸçš„引用输出" #: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 msgid "reason" msgstr "åŽŸå› " #: builtin/symbolic-ref.c:43 builtin/update-ref.c:362 msgid "reason of the update" msgstr "æ›´æ–°çš„åŽŸå› " #: builtin/tag.c:22 msgid "" "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> " "[<head>]" msgstr "" "git tag [-a | -s | -u <key-id>] [-f] [-m <说明> | -F <文件>] <æ ‡ç¾å> [<头>]" #: builtin/tag.c:23 msgid "git tag -d <tagname>..." msgstr "git tag -d <æ ‡ç¾å>..." #: builtin/tag.c:24 msgid "" "git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n" "\t\t[<pattern>...]" msgstr "" "git tag -l [-n[<æ•°å—>]] [--contains <æ交>] [--points-at <对象>] [<模å¼>...]" #: builtin/tag.c:26 msgid "git tag -v <tagname>..." msgstr "git tag -v <æ ‡ç¾å>..." #: builtin/tag.c:69 #, c-format msgid "malformed object at '%s'" msgstr "éžæ³•çš„对象于 '%s'" #: builtin/tag.c:301 #, c-format msgid "tag name too long: %.*s..." msgstr "æ ‡ç¾å称太长:%.*s..." #: builtin/tag.c:306 #, c-format msgid "tag '%s' not found." msgstr "未å‘çŽ°æ ‡ç¾ '%s'。" #: builtin/tag.c:321 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "å·²åˆ é™¤æ ‡ç¾ '%s'(曾为 %s)\n" #: builtin/tag.c:333 #, c-format msgid "could not verify the tag '%s'" msgstr "ä¸èƒ½æ ¡éªŒè¯¥æ ‡ç¾ '%s'" #: builtin/tag.c:343 #, 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:347 #, 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:371 #, c-format msgid "unsupported sort specification '%s'" msgstr "ä¸æ”¯æŒçš„排åºè§„æ ¼ '%s'" #: builtin/tag.c:373 #, c-format msgid "unsupported sort specification '%s' in variable '%s'" msgstr "ä¸æ”¯æŒå˜é‡ '%2$s' 的排åºè§„æ ¼ '%1$s'" #: builtin/tag.c:428 msgid "unable to sign the tag" msgstr "æ— æ³•ç¾ç½²æ ‡ç¾" #: builtin/tag.c:430 msgid "unable to write tag file" msgstr "æ— æ³•å†™æ ‡ç¾æ–‡ä»¶" #: builtin/tag.c:455 msgid "bad object type." msgstr "å的对象类型。" #: builtin/tag.c:468 msgid "tag header too big." msgstr "æ ‡ç¾å¤´ä¿¡æ¯å¤ªå¤§ã€‚" #: builtin/tag.c:504 msgid "no tag message?" msgstr "æ— æ ‡ç¾è¯´æ˜Žï¼Ÿ" #: builtin/tag.c:510 #, c-format msgid "The tag message has been left in %s\n" msgstr "æ ‡ç¾è¯´æ˜Žè¢«ä¿ç•™åœ¨ %s\n" #: builtin/tag.c:559 msgid "switch 'points-at' requires an object" msgstr "开关 'points-at' 需è¦ä¸€ä¸ªå¯¹è±¡" #: builtin/tag.c:561 #, c-format msgid "malformed object name '%s'" msgstr "éžæ³•çš„对象å '%s'" #: builtin/tag.c:590 msgid "list tag names" msgstr "åˆ—å‡ºæ ‡ç¾å称" #: builtin/tag.c:592 msgid "print <n> lines of each tag message" msgstr "æ¯ä¸ªæ ‡ç¾ä¿¡æ¯æ‰“å° <n> è¡Œ" #: builtin/tag.c:594 msgid "delete tags" msgstr "åˆ é™¤æ ‡ç¾" #: builtin/tag.c:595 msgid "verify tags" msgstr "验è¯æ ‡ç¾" #: builtin/tag.c:597 msgid "Tag creation options" msgstr "æ ‡ç¾åˆ›å»ºé€‰é¡¹" #: builtin/tag.c:599 msgid "annotated tag, needs a message" msgstr "é™„æ³¨æ ‡ç¾ï¼Œéœ€è¦ä¸€ä¸ªè¯´æ˜Ž" #: builtin/tag.c:601 msgid "tag message" msgstr "æ ‡ç¾è¯´æ˜Ž" #: builtin/tag.c:603 msgid "annotated and GPG-signed tag" msgstr "é™„æ³¨å¹¶é™„åŠ GPG ç¾åçš„æ ‡ç¾" #: builtin/tag.c:607 msgid "use another key to sign the tag" msgstr "使用å¦å¤–çš„ç§é’¥ç¾åè¯¥æ ‡ç¾" #: builtin/tag.c:608 msgid "replace the tag if exists" msgstr "如果å˜åœ¨ï¼Œæ›¿æ¢çŽ°æœ‰çš„æ ‡ç¾" #: builtin/tag.c:609 builtin/update-ref.c:368 msgid "create a reflog" msgstr "创建引用日志" #: builtin/tag.c:611 msgid "Tag listing options" msgstr "æ ‡ç¾åˆ—表选项" #: builtin/tag.c:612 msgid "show tag list in columns" msgstr "以列的方å¼æ˜¾ç¤ºæ ‡ç¾åˆ—表" #: builtin/tag.c:614 msgid "sort tags" msgstr "排åºæ ‡ç¾" #: builtin/tag.c:619 builtin/tag.c:625 msgid "print only tags that contain the commit" msgstr "åªæ‰“å°åŒ…å«æäº¤çš„æ ‡ç¾" #: builtin/tag.c:631 msgid "print only tags of the object" msgstr "åªæ‰“å°å¯¹è±¡çš„æ ‡ç¾" #: builtin/tag.c:657 msgid "--column and -n are incompatible" msgstr "--column å’Œ -n ä¸å…¼å®¹" #: builtin/tag.c:669 msgid "--sort and -n are incompatible" msgstr "--sort å’Œ -n ä¸å…¼å®¹" #: builtin/tag.c:676 msgid "-n option is only allowed with -l." msgstr "-n 选项åªå…许和 -l åŒæ—¶ä½¿ç”¨ã€‚" #: builtin/tag.c:678 msgid "--contains option is only allowed with -l." msgstr "--contains 选项åªå…许和 -l åŒæ—¶ä½¿ç”¨ã€‚" #: builtin/tag.c:680 msgid "--points-at option is only allowed with -l." msgstr "--points-at 选项åªå…许和 -l åŒæ—¶ä½¿ç”¨ã€‚" #: builtin/tag.c:688 msgid "only one -F or -m option is allowed." msgstr "åªå…许一个 -F 或 -m 选项。" #: builtin/tag.c:708 msgid "too many params" msgstr "太多å‚æ•°" #: builtin/tag.c:714 #, c-format msgid "'%s' is not a valid tag name." msgstr "'%s' ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„æ ‡ç¾å称。" #: builtin/tag.c:719 #, c-format msgid "tag '%s' already exists" msgstr "æ ‡ç¾ '%s' å·²å˜åœ¨" #: builtin/tag.c:744 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "å·²æ›´æ–°æ ‡ç¾ '%s'(曾为 %s)\n" #: builtin/unpack-objects.c:490 msgid "Unpacking objects" msgstr "展开对象ä¸" #: builtin/update-index.c:70 #, c-format msgid "failed to create directory %s" msgstr "æ— æ³•åˆ›å»ºç›®å½• %s" #: builtin/update-index.c:76 #, c-format msgid "failed to stat %s" msgstr "æ— æ³•æžšä¸¾ %s 状æ€" #: builtin/update-index.c:86 #, c-format msgid "failed to create file %s" msgstr "æ— æ³•åˆ›å»ºæ–‡ä»¶ %s" #: builtin/update-index.c:94 #, c-format msgid "failed to delete file %s" msgstr "æ— æ³•åˆ é™¤æ–‡ä»¶ %s" #: builtin/update-index.c:101 builtin/update-index.c:203 #, c-format msgid "failed to delete directory %s" msgstr "æ— æ³•åˆ é™¤ç›®å½• %s" #: builtin/update-index.c:124 #, c-format msgid "Testing " msgstr "æ£åœ¨æµ‹è¯• " #: builtin/update-index.c:136 msgid "directory stat info does not change after adding a new file" msgstr "æ·»åŠ ä¸€ä¸ªæ–°æ–‡ä»¶åŽï¼Œç›®å½•çš„状æ€ä¿¡æ¯æœªæ”¹å˜" #: builtin/update-index.c:149 msgid "directory stat info does not change after adding a new directory" msgstr "æ·»åŠ ä¸€ä¸ªæ–°ç›®å½•åŽï¼Œç›®å½•çš„状æ€ä¿¡æ¯æœªæ”¹å˜" #: builtin/update-index.c:162 msgid "directory stat info changes after updating a file" msgstr "更新一个文件åŽï¼Œç›®å½•çš„状æ€ä¿¡æ¯è¢«ä¿®æ”¹" #: builtin/update-index.c:173 msgid "directory stat info changes after adding a file inside subdirectory" msgstr "在å目录ä¸æ·»åŠ 文件åŽï¼Œç›®å½•çš„状æ€ä¿¡æ¯è¢«ä¿®æ”¹" #: builtin/update-index.c:184 msgid "directory stat info does not change after deleting a file" msgstr "åˆ é™¤ä¸€ä¸ªæ–‡ä»¶åŽï¼Œç›®å½•çš„状æ€ä¿¡æ¯æœªæ”¹å˜" #: builtin/update-index.c:197 msgid "directory stat info does not change after deleting a directory" msgstr "åˆ é™¤ä¸€ä¸ªç›®å½•åŽï¼Œç›®å½•çš„状æ€ä¿¡æ¯æœªæ”¹å˜" #: builtin/update-index.c:204 msgid " OK" msgstr " OK" #: builtin/update-index.c:564 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<选项>] [--] [<文件>...]" #: builtin/update-index.c:918 msgid "continue refresh even when index needs update" msgstr "当索引需è¦æ›´æ–°æ—¶ç»§ç»åˆ·æ–°" #: builtin/update-index.c:921 msgid "refresh: ignore submodules" msgstr "刷新:忽略å模组" #: builtin/update-index.c:924 msgid "do not ignore new files" msgstr "ä¸å¿½ç•¥æ–°çš„文件" #: builtin/update-index.c:926 msgid "let files replace directories and vice-versa" msgstr "让文件替æ¢ç›®å½•ï¼ˆå之亦然)" #: builtin/update-index.c:928 msgid "notice files missing from worktree" msgstr "通知文件从工作区丢失" #: builtin/update-index.c:930 msgid "refresh even if index contains unmerged entries" msgstr "å³ä½¿ç´¢å¼•åŒºåŒ…å«æœªåˆå¹¶çš„æ¡ç›®ä¹Ÿæ‰§è¡Œåˆ·æ–°" #: builtin/update-index.c:933 msgid "refresh stat information" msgstr "刷新统计信æ¯" #: builtin/update-index.c:937 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置" #: builtin/update-index.c:941 msgid "<mode>,<object>,<path>" msgstr "<å˜å–模å¼>,<对象>,<路径>" #: builtin/update-index.c:942 msgid "add the specified entry to the index" msgstr "æ·»åŠ æŒ‡å®šçš„æ¡ç›®åˆ°ç´¢å¼•åŒº" #: builtin/update-index.c:946 msgid "(+/-)x" msgstr "(+/-)x" #: builtin/update-index.c:947 msgid "override the executable bit of the listed files" msgstr "覆盖列表里文件的å¯æ‰§è¡Œä½" #: builtin/update-index.c:951 msgid "mark files as \"not changing\"" msgstr "æŠŠæ–‡ä»¶æ ‡è®°ä¸º \"没有å˜æ›´\"" #: builtin/update-index.c:954 msgid "clear assumed-unchanged bit" msgstr "清除 assumed-unchanged ä½" #: builtin/update-index.c:957 msgid "mark files as \"index-only\"" msgstr "æŠŠæ–‡ä»¶æ ‡è®°ä¸º \"仅索引\"" #: builtin/update-index.c:960 msgid "clear skip-worktree bit" msgstr "清除 skip-worktree ä½" #: builtin/update-index.c:963 msgid "add to index only; do not add content to object database" msgstr "åªæ·»åŠ 到索引区;ä¸æ·»åŠ 对象到对象库" #: builtin/update-index.c:965 msgid "remove named paths even if present in worktree" msgstr "å³ä½¿å˜åœ¨å·¥ä½œåŒºé‡Œï¼Œä¹Ÿåˆ 除路径" #: builtin/update-index.c:967 msgid "with --stdin: input lines are terminated by null bytes" msgstr "æºå¸¦ --stdin:输入的行以 null å—符终æ¢" #: builtin/update-index.c:969 msgid "read list of paths to be updated from standard input" msgstr "ä»Žæ ‡å‡†è¾“å…¥ä¸è¯»å–需è¦æ›´æ–°çš„路径列表" #: builtin/update-index.c:973 msgid "add entries from standard input to the index" msgstr "ä»Žæ ‡å‡†è¾“å…¥æ·»åŠ æ¡ç›®åˆ°ç´¢å¼•åŒº" #: builtin/update-index.c:977 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "为指定文件é‡æ–°ç”Ÿæˆç¬¬2和第3æš‚å˜åŒº" #: builtin/update-index.c:981 msgid "only update entries that differ from HEAD" msgstr "åªæ›´æ–°ä¸Ž HEAD ä¸åŒçš„æ¡ç›®" #: builtin/update-index.c:985 msgid "ignore files missing from worktree" msgstr "忽略工作区丢失的文件" #: builtin/update-index.c:988 msgid "report actions to standard output" msgstr "åœ¨æ ‡å‡†è¾“å‡ºæ˜¾ç¤ºæ“作" #: builtin/update-index.c:990 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "(for porcelains) 忘记ä¿å˜çš„未解决的冲çª" #: builtin/update-index.c:994 msgid "write index in this format" msgstr "以这ç§æ ¼å¼å†™å…¥ç´¢å¼•åŒº" #: builtin/update-index.c:996 msgid "enable or disable split index" msgstr "å¯ç”¨æˆ–ç¦ç”¨ç´¢å¼•æ‹†åˆ†" #: builtin/update-index.c:998 msgid "enable/disable untracked cache" msgstr "å¯ç”¨/ç¦ç”¨å¯¹æœªè·Ÿè¸ªæ–‡ä»¶çš„缓å˜" #: builtin/update-index.c:1000 msgid "enable untracked cache without testing the filesystem" msgstr "æ— éœ€æ£€æµ‹æ–‡ä»¶ç³»ç»Ÿï¼Œå¯ç”¨å¯¹æœªè·Ÿè¸ªæ–‡ä»¶çš„缓å˜" #: builtin/update-ref.c:9 msgid "git update-ref [<options>] -d <refname> [<old-val>]" msgstr "git update-ref [<选项>] -d <引用å> [<旧值>]" #: builtin/update-ref.c:10 msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]" msgstr "git update-ref [<选项>] <引用å> <新值> [<旧值>]" #: builtin/update-ref.c:11 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:6 msgid "git update-server-info [--force]" msgstr "git update-server-info [--force]" #: builtin/update-server-info.c:14 msgid "update the info files from scratch" msgstr "从头开始更新文件信æ¯" #: builtin/verify-commit.c:17 msgid "git verify-commit [-v | --verbose] <commit>..." msgstr "git verify-commit [-v | --verbose] <æ交>..." #: builtin/verify-commit.c:72 msgid "print commit contents" msgstr "打å°æ交内容" #: builtin/verify-commit.c:73 builtin/verify-tag.c:84 msgid "print raw gpg status output" msgstr "打å°åŽŸå§‹ gpg 状æ€è¾“出" #: builtin/verify-pack.c:54 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..." msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..." #: builtin/verify-pack.c:64 msgid "verbose" msgstr "冗长输出" #: builtin/verify-pack.c:66 msgid "show statistics only" msgstr "åªæ˜¾ç¤ºç»Ÿè®¡" #: builtin/verify-tag.c:17 msgid "git verify-tag [-v | --verbose] <tag>..." msgstr "git verify-tag [-v | --verbose] <æ ‡ç¾>..." #: builtin/verify-tag.c:83 msgid "print tag contents" msgstr "打å°æ ‡ç¾å†…容" #: builtin/worktree.c:13 msgid "git worktree add [<options>] <path> <branch>" msgstr "git worktree add [<选项>] <路径> <分支>" #: builtin/worktree.c:14 msgid "git worktree prune [<options>]" msgstr "git worktree prune [<选项>]" #: builtin/worktree.c:36 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "åˆ é™¤å·¥ä½œåŒº/%s:ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„目录" #: builtin/worktree.c:42 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "åˆ é™¤ worktrees/%s:gitdir 文件ä¸å˜åœ¨" #: builtin/worktree.c:47 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "åˆ é™¤ worktrees/%sï¼šæ— æ³•è¯»å– gitdir 文件 (%s)" #: builtin/worktree.c:58 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "åˆ é™¤ worktrees/%sï¼šæ— æ•ˆçš„ gitdir 文件" #: builtin/worktree.c:74 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "åˆ é™¤ worktrees/%s:gitdir 文件的指å‘ä¸å˜åœ¨" #: builtin/worktree.c:109 #, c-format msgid "failed to remove: %s" msgstr "æ— æ³•åˆ é™¤ï¼š%s" #: builtin/worktree.c:198 #, c-format msgid "'%s' already exists" msgstr "'%s' å·²ç»å˜åœ¨" #: builtin/worktree.c:232 #, c-format msgid "could not create directory of '%s'" msgstr "ä¸èƒ½åˆ›å»ºç›®å½• '%s'" #: builtin/worktree.c:268 #, c-format msgid "Preparing %s (identifier %s)" msgstr "准备 %s ï¼ˆæ ‡è¯†ç¬¦ %s)" #: builtin/worktree.c:316 msgid "checkout <branch> even if already checked out in other worktree" msgstr "检出分支 <branch> å³ä½¿å·²ç»è¢«æ£€å‡ºåˆ°å…¶å®ƒå·¥ä½œåŒº" #: builtin/worktree.c:318 msgid "create a new branch" msgstr "创建一个新分支" #: builtin/worktree.c:320 msgid "create or reset a branch" msgstr "创建或é‡ç½®ä¸€ä¸ªåˆ†æ”¯" #: builtin/worktree.c:321 msgid "detach HEAD at named commit" msgstr "HEAD 从指定的æ交分离" #: builtin/worktree.c:328 msgid "-b, -B, and --detach are mutually exclusive" msgstr "-bã€-B å’Œ --detach 是互斥的" #: builtin/write-tree.c:13 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" msgstr "git write-tree [--missing-ok] [--prefix=<å‰ç¼€>/]" #: builtin/write-tree.c:26 msgid "<prefix>/" msgstr "<å‰ç¼€>/" #: builtin/write-tree.c:27 msgid "write tree object for a subdirectory <prefix>" msgstr "å°† <å‰ç¼€> åç›®å½•å†…å®¹å†™åˆ°ä¸€ä¸ªæ ‘å¯¹è±¡" #: builtin/write-tree.c:30 msgid "only useful for debugging" msgstr "åªå¯¹è°ƒè¯•æœ‰ç”¨" #: credential-cache--daemon.c:255 msgid "print debugging messages to stderr" msgstr "调试信æ¯è¾“å‡ºåˆ°æ ‡å‡†é”™è¯¯" #: git.c:14 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" "帮助。" #: common-cmds.h:9 msgid "start a working area (see also: git help tutorial)" msgstr "开始一个工作区(å‚è§ï¼šgit help tutorial)" #: common-cmds.h:10 msgid "work on the current change (see also: git help everyday)" msgstr "在当å‰å˜æ›´ä¸Šå·¥ä½œï¼ˆå‚è§ï¼šgit help everyday)" #: common-cmds.h:11 msgid "examine the history and state (see also: git help revisions)" msgstr "检查历å²å’ŒçŠ¶æ€ï¼ˆå‚è§ï¼šgit help revisions)" #: common-cmds.h:12 msgid "grow, mark and tweak your common history" msgstr "扩展ã€æ ‡è®°å’Œè°ƒæ ¡æ‚¨çš„历å²è®°å½•" #: common-cmds.h:13 msgid "collaborate (see also: git help workflows)" msgstr "ååŒï¼ˆå‚è§ï¼šgit help workflows)" #: common-cmds.h:17 msgid "Add file contents to the index" msgstr "æ·»åŠ æ–‡ä»¶å†…å®¹è‡³ç´¢å¼•" #: common-cmds.h:18 msgid "Use binary search to find the commit that introduced a bug" msgstr "通过二分查找定ä½å¼•å…¥ bug çš„æ交" #: common-cmds.h:19 msgid "List, create, or delete branches" msgstr "列出ã€åˆ›å»ºæˆ–åˆ é™¤åˆ†æ”¯" #: common-cmds.h:20 msgid "Switch branches or restore working tree files" msgstr "切æ¢åˆ†æ”¯æˆ–æ¢å¤å·¥ä½œåŒºæ–‡ä»¶" #: common-cmds.h:21 msgid "Clone a repository into a new directory" msgstr "克隆一个仓库到一个新目录" #: common-cmds.h:22 msgid "Record changes to the repository" msgstr "记录å˜æ›´åˆ°ä»“库" #: common-cmds.h:23 msgid "Show changes between commits, commit and working tree, etc" msgstr "显示æ交之间ã€æ交和工作区之间ç‰çš„差异" #: common-cmds.h:24 msgid "Download objects and refs from another repository" msgstr "从å¦å¤–一个仓库下载对象和引用" #: common-cmds.h:25 msgid "Print lines matching a pattern" msgstr "输出和模å¼åŒ¹é…çš„è¡Œ" #: common-cmds.h:26 msgid "Create an empty Git repository or reinitialize an existing one" msgstr "创建一个空的 Git 仓库或é‡æ–°åˆå§‹åŒ–一个已å˜åœ¨çš„仓库" #: common-cmds.h:27 msgid "Show commit logs" msgstr "显示æ交日志" #: common-cmds.h:28 msgid "Join two or more development histories together" msgstr "åˆå¹¶ä¸¤ä¸ªæˆ–更多开å‘历å²" #: common-cmds.h:29 msgid "Move or rename a file, a directory, or a symlink" msgstr "移动或é‡å‘½å一个文件ã€ç›®å½•æˆ–符å·é“¾æŽ¥" #: common-cmds.h:30 msgid "Fetch from and integrate with another repository or a local branch" msgstr "获å–并整åˆå¦å¤–的仓库或一个本地分支" #: common-cmds.h:31 msgid "Update remote refs along with associated objects" msgstr "更新远程引用和相关的对象" #: common-cmds.h:32 msgid "Forward-port local commits to the updated upstream head" msgstr "本地æ交转移至更新åŽçš„上游分支ä¸" #: common-cmds.h:33 msgid "Reset current HEAD to the specified state" msgstr "é‡ç½®å½“å‰ HEAD 到指定状æ€" #: common-cmds.h:34 msgid "Remove files from the working tree and from the index" msgstr "从工作区和索引ä¸åˆ 除文件" #: common-cmds.h:35 msgid "Show various types of objects" msgstr "显示å„ç§ç±»åž‹çš„对象" #: common-cmds.h:36 msgid "Show the working tree status" msgstr "显示工作区状æ€" #: common-cmds.h:37 msgid "Create, list, delete or verify a tag object signed with GPG" msgstr "创建ã€åˆ—出ã€åˆ é™¤æˆ–æ ¡éªŒä¸€ä¸ª GPG ç¾åçš„æ ‡ç¾å¯¹è±¡" #: parse-options.h:145 msgid "expiry-date" msgstr "到期时间" #: parse-options.h:160 msgid "no-op (backward compatibility)" msgstr "空æ“作(å‘åŽå…¼å®¹ï¼‰" #: parse-options.h:236 msgid "be more verbose" msgstr "æ›´åŠ è¯¦ç»†" #: parse-options.h:238 msgid "be more quiet" msgstr "æ›´åŠ å®‰é™" #: parse-options.h:244 msgid "use <n> digits to display SHA-1s" msgstr "用 <n> ä½æ•°å—显示 SHA-1 哈希值" #: rerere.h:28 msgid "update the index with reused conflict resolution if possible" msgstr "如果å¯èƒ½ï¼Œé‡ç”¨å†²çªè§£å†³æ›´æ–°ç´¢å¼•" #: git-bisect.sh:50 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:56 msgid "Do you want me to do it for you [Y/n]? " msgstr "æ‚¨æƒ³è®©æˆ‘ä¸ºæ‚¨è¿™æ ·åšä¹ˆ[Y/n]? " #: git-bisect.sh:99 #, sh-format msgid "unrecognised option: '$arg'" msgstr "未能识别的选项:'$arg'" #: git-bisect.sh:103 #, sh-format msgid "'$arg' does not appear to be a valid revision" msgstr "'$arg' 看起æ¥ä¸åƒæ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„版本" #: git-bisect.sh:132 msgid "Bad HEAD - I need a HEAD" msgstr "åçš„ HEAD - 我需è¦ä¸€ä¸ª HEAD" #: git-bisect.sh:145 #, sh-format msgid "" "Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'." msgstr "检出 '$start_head' 失败。å°è¯• 'git bisect reset <有效分支>'。" #: git-bisect.sh:155 msgid "won't bisect on cg-seek'ed tree" msgstr "ä¸ä¼šåœ¨åšäº† cg-seek çš„æ ‘ä¸ŠåšäºŒåˆ†æŸ¥æ‰¾" #: git-bisect.sh:159 msgid "Bad HEAD - strange symbolic ref" msgstr "åçš„ HEAD - 奇怪的符å·å¼•ç”¨" #: git-bisect.sh:211 #, sh-format msgid "Bad bisect_write argument: $state" msgstr "åçš„ bisect_write å‚数:$state" #: git-bisect.sh:240 #, sh-format msgid "Bad rev input: $arg" msgstr "输入å的版本:$arg" #: git-bisect.sh:255 msgid "Please call 'bisect_state' with at least one argument." msgstr "请在调用 'bisect_state' 时跟至少一个å‚数。" #: git-bisect.sh:267 #, sh-format msgid "Bad rev input: $rev" msgstr "输入å的版本:$rev" #: git-bisect.sh:276 #, sh-format msgid "'git bisect $TERM_BAD' can take only one argument." msgstr "'git bisect $TERM_BAD' åªèƒ½å¸¦ä¸€ä¸ªå‚数。" #: git-bisect.sh:299 #, 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:305 msgid "Are you sure [Y/n]? " msgstr "您确认么[Y/n]? " #: git-bisect.sh:317 #, 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:320 #, 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:391 git-bisect.sh:521 msgid "We are not bisecting." msgstr "我们没有在二分查找。" #: git-bisect.sh:398 #, sh-format msgid "'$invalid' is not a valid commit" msgstr "'$invalid' ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„æ交" #: git-bisect.sh:407 #, 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:435 msgid "No logfile given" msgstr "未æ供日志文件" #: git-bisect.sh:436 #, sh-format msgid "cannot read $file for replaying" msgstr "ä¸èƒ½è¯»å– $file æ¥é‡æ”¾" #: git-bisect.sh:455 msgid "?? what are you talking about?" msgstr "?? 您在说什么?" #: git-bisect.sh:467 #, sh-format msgid "running $command" msgstr "è¿è¡Œ $command" #: git-bisect.sh:474 #, 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:500 msgid "bisect run cannot continue any more" msgstr "二分查找ä¸èƒ½ç»§ç»è¿è¡Œ" #: git-bisect.sh:506 #, sh-format msgid "" "bisect run failed:\n" "'bisect_state $state' exited with error code $res" msgstr "" "二分查找è¿è¡Œå¤±è´¥ï¼š\n" "'bisect_state $state' 退出ç 为 $res" #: git-bisect.sh:513 msgid "bisect run success" msgstr "二分查找è¿è¡ŒæˆåŠŸ" #: git-bisect.sh:548 #, sh-format msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect." msgstr "æ— æ•ˆçš„å‘½ä»¤ï¼šæ‚¨å½“å‰æ£å¤„于一个 $TERM_BAD/$TERM_GOOD 二分查找。" #: git-rebase.sh:57 msgid "" "When you have resolved this problem, run \"git rebase --continue\".\n" "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n" "To check out the original branch and stop rebasing, run \"git rebase --abort" "\"." msgstr "" "当您解决了æ¤é—®é¢˜åŽï¼Œæ‰§è¡Œ \"git rebase --continue\"。\n" "如果您想跳过æ¤è¡¥ä¸ï¼Œåˆ™æ‰§è¡Œ \"git rebase --skip\"。\n" "è¦æ¢å¤åŽŸåˆ†æ”¯å¹¶åœæ¢å˜åŸºï¼Œæ‰§è¡Œ \"git rebase --abort\"。" #: git-rebase.sh:165 msgid "Applied autostash." msgstr "æˆåŠŸåº”用 autostash。" #: git-rebase.sh:168 #, sh-format msgid "Cannot store $stash_sha1" msgstr "æ— æ³•ä¿å˜ $stash_sha1" #: git-rebase.sh:169 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" "您的修改安全地ä¿å˜åœ¨ stash ä¸ã€‚\n" "您å¯ä»¥åœ¨ä»»ä½•æ—¶å€™è¿è¡Œ \"git stash pop\" 或 \"git stash drop\"。\n" #: git-rebase.sh:208 msgid "The pre-rebase hook refused to rebase." msgstr "é’©å pre-rebase æ‹’ç»å˜åŸºæ“作。" #: git-rebase.sh:213 msgid "It looks like git-am is in progress. Cannot rebase." msgstr "似乎æ£å¤„于在 git-am 的执行过程ä¸ã€‚æ— æ³•å˜åŸºã€‚" #: git-rebase.sh:351 msgid "The --exec option must be used with the --interactive option" msgstr "选项 --exec 必须和选项 --interactive åŒæ—¶ä½¿ç”¨" #: git-rebase.sh:356 msgid "No rebase in progress?" msgstr "没有æ£åœ¨è¿›è¡Œçš„å˜åŸºï¼Ÿ" #: git-rebase.sh:367 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "动作 --edit-todo åªèƒ½ç”¨åœ¨äº¤äº’å¼å˜åŸºè¿‡ç¨‹ä¸ã€‚" #: git-rebase.sh:374 msgid "Cannot read HEAD" msgstr "ä¸èƒ½è¯»å– HEAD" #: git-rebase.sh:377 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" msgstr "" "您必须编辑所有的åˆå¹¶å†²çªï¼Œç„¶åŽé€šè¿‡ git add\n" "å‘½ä»¤å°†å®ƒä»¬æ ‡è®°ä¸ºå·²è§£å†³" #: git-rebase.sh:395 #, sh-format msgid "Could not move back to $head_name" msgstr "æ— æ³•ç§»å›ž $head_name" #: git-rebase.sh:414 #, 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:465 #, sh-format msgid "invalid upstream $upstream_name" msgstr "æ— æ•ˆçš„ä¸Šæ¸¸ $upstream_name" #: git-rebase.sh:489 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "$onto_name: 有一个以上的åˆå¹¶åŸºå‡†" #: git-rebase.sh:492 git-rebase.sh:496 #, sh-format msgid "$onto_name: there is no merge base" msgstr "$onto_name: 没有åˆå¹¶åŸºå‡†" #: git-rebase.sh:501 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "没有指å‘一个有效的æ交:$onto_name" #: git-rebase.sh:524 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "严é‡é”™è¯¯ï¼šæ— æ¤åˆ†æ”¯ï¼š$branch_name" #: git-rebase.sh:557 msgid "Cannot autostash" msgstr "æ— æ³• autostash" #: git-rebase.sh:562 #, sh-format msgid "Created autostash: $stash_abbrev" msgstr "创建了 autostash: $stash_abbrev" #: git-rebase.sh:566 msgid "Please commit or stash them." msgstr "请æ交或为它们ä¿å˜è¿›åº¦ã€‚" #: git-rebase.sh:586 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "当å‰åˆ†æ”¯ $branch_name 是最新的。" #: git-rebase.sh:590 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "当å‰åˆ†æ”¯ $branch_name 是最新的,强制å˜åŸºã€‚" #: git-rebase.sh:601 #, sh-format msgid "Changes from $mb to $onto:" msgstr "å˜æ›´ä»Ž $mb 到 $onto:" #: git-rebase.sh:610 msgid "First, rewinding head to replay your work on top of it..." msgstr "首先,回退分支以便在上é¢é‡æ”¾æ‚¨çš„工作..." #: git-rebase.sh:620 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "å¿«è¿› $branch_name 至 $onto_name。" #: git-stash.sh:51 msgid "git stash clear with parameters is unimplemented" msgstr "git stash clear ä¸æ”¯æŒå‚æ•°" #: git-stash.sh:74 msgid "You do not have the initial commit yet" msgstr "您尚未建立åˆå§‹æ交" #: git-stash.sh:89 msgid "Cannot save the current index state" msgstr "æ— æ³•ä¿å˜å½“å‰ç´¢å¼•çŠ¶æ€" #: git-stash.sh:124 git-stash.sh:137 msgid "Cannot save the current worktree state" msgstr "æ— æ³•ä¿å˜å½“å‰å·¥ä½œåŒºçŠ¶æ€" #: git-stash.sh:141 msgid "No changes selected" msgstr "没有选择å˜æ›´" #: git-stash.sh:144 msgid "Cannot remove temporary index (can't happen)" msgstr "æ— æ³•åˆ é™¤ä¸´æ—¶ç´¢å¼•ï¼ˆä¸åº”å‘生)" #: git-stash.sh:157 msgid "Cannot record working tree state" msgstr "ä¸èƒ½è®°å½•å·¥ä½œåŒºçŠ¶æ€" #: git-stash.sh:189 #, sh-format msgid "Cannot update $ref_stash with $w_commit" msgstr "æ— æ³•ç”¨ $w_commit æ›´æ–° $ref_stash" #. TRANSLATORS: $option is an invalid option, like #. `--blah-blah'. The 7 spaces at the beginning of the #. second line correspond to "error: ". So you should line #. up the second line with however many characters the #. translation of "error: " takes in your language. E.g. in #. English this is: #. #. $ git stash save --blah-blah 2>&1 | head -n 2 #. error: unknown option for 'stash save': --blah-blah #. To provide a message, use git stash save -- '--blah-blah' #: git-stash.sh:239 #, sh-format msgid "" "error: unknown option for 'stash save': $option\n" " To provide a message, use git stash save -- '$option'" msgstr "" "错误:'stash save' 的未知选项:$option\n" " è¦æ供一个æè¿°ä¿¡æ¯ï¼Œä½¿ç”¨ git stash save -- '$option'" #: git-stash.sh:260 msgid "No local changes to save" msgstr "没有è¦ä¿å˜çš„本地修改" #: git-stash.sh:264 msgid "Cannot initialize stash" msgstr "æ— æ³•åˆå§‹åŒ– stash" #: git-stash.sh:268 msgid "Cannot save the current status" msgstr "æ— æ³•ä¿å˜å½“å‰çŠ¶æ€" #: git-stash.sh:286 msgid "Cannot remove worktree changes" msgstr "æ— æ³•åˆ é™¤å·¥ä½œåŒºå˜æ›´" #: git-stash.sh:387 #, sh-format msgid "unknown option: $opt" msgstr "未知选项: $opt" #: git-stash.sh:397 msgid "No stash found." msgstr "未å‘现 stash。" #: git-stash.sh:404 #, sh-format msgid "Too many revisions specified: $REV" msgstr "指定了太多的版本:$REV" #: git-stash.sh:410 #, sh-format msgid "$reference is not a valid reference" msgstr "$reference ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„引用" #: git-stash.sh:438 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "'$args' ä¸æ˜¯ stash æ ·æ交" #: git-stash.sh:449 #, sh-format msgid "'$args' is not a stash reference" msgstr "'$args' ä¸æ˜¯ä¸€ä¸ª stash 引用" #: git-stash.sh:457 msgid "unable to refresh index" msgstr "æ— æ³•åˆ·æ–°ç´¢å¼•" #: git-stash.sh:461 msgid "Cannot apply a stash in the middle of a merge" msgstr "æ— æ³•åœ¨åˆå¹¶è¿‡ç¨‹ä¸æ¢å¤è¿›åº¦" #: git-stash.sh:469 msgid "Conflicts in index. Try without --index." msgstr "索引ä¸æœ‰å†²çªã€‚å°è¯•ä¸ä½¿ç”¨ --index。" #: git-stash.sh:471 msgid "Could not save index tree" msgstr "ä¸èƒ½ä¿å˜ç´¢å¼•æ ‘" #: git-stash.sh:505 msgid "Cannot unstage modified files" msgstr "æ— æ³•å°†ä¿®æ”¹çš„æ–‡ä»¶å–消暂å˜" #: git-stash.sh:520 msgid "Index was not unstashed." msgstr "索引的进度没有被æ¢å¤ã€‚" #: git-stash.sh:543 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "丢弃了 ${REV} ($s)" #: git-stash.sh:544 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}:ä¸èƒ½ä¸¢å¼ƒè¿›åº¦æ¡ç›®" #: git-stash.sh:552 msgid "No branch name specified" msgstr "未指定分支å" #: git-stash.sh:624 msgid "(To restore them type \"git stash apply\")" msgstr "(为æ¢å¤æ•°æ®è¾“å…¥ \"git stash apply\")" #: git-submodule.sh:95 #, sh-format msgid "cannot strip one component off url '$remoteurl'" msgstr "æ— æ³•ä»Ž url '$remoteurl' 剥离一个组件" #: git-submodule.sh:237 #, sh-format msgid "No submodule mapping found in .gitmodules for path '$sm_path'" msgstr "未在 .gitmodules ä¸å‘现路径 '$sm_path' çš„åæ¨¡ç»„æ˜ å°„" #: git-submodule.sh:287 #, sh-format msgid "Clone of '$url' into submodule path '$sm_path' failed" msgstr "æ— æ³•å…‹éš† '$url' 到å模组路径 '$sm_path'" #: git-submodule.sh:296 #, sh-format msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa" msgstr "Gitdir '$a' 在å模组路径 '$b' 之下或相å" #: git-submodule.sh:406 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "åªèƒ½åœ¨å·¥ä½œåŒºçš„顶级目录ä¸ä½¿ç”¨ç›¸å¯¹è·¯å¾„" #: git-submodule.sh:416 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "仓库 URL:'$repo' 必须是ç»å¯¹è·¯å¾„或以 ./|../ 起始" #: git-submodule.sh:433 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "'$sm_path' å·²ç»å˜åœ¨äºŽç´¢å¼•ä¸" #: git-submodule.sh:437 #, 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:455 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "æ·»åŠ ä½äºŽ '$sm_path' 的现å˜ä»“库到索引" #: git-submodule.sh:457 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "'$sm_path' å·²å˜åœ¨ä¸”ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„ git 仓库" #: git-submodule.sh:465 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "本地å‘现 '$sm_name' 的一个 git 目录,与其对应的远程仓库:" #: git-submodule.sh:467 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from" msgstr "如果您想é‡ç”¨æ¤æœ¬åœ° git 目录而ä¸æ˜¯é‡æ–°å…‹éš†è‡ª" #: git-submodule.sh:469 #, sh-format msgid "" "use the '--force' option. If the local git directory is not the correct repo" msgstr "使用 '--force' å‚数。如果本地 git 目录ä¸æ˜¯æ£ç¡®çš„仓库" #: git-submodule.sh:470 #, sh-format msgid "" "or you are unsure what this means choose another name with the '--name' " "option." msgstr "或者您ä¸ç¡®å®šå…¶ä¸å«ä¹‰ä½¿ç”¨ '--name' å‚数选择å¦å¤–一个å称。" #: git-submodule.sh:472 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "激活本地 git 目录到å模组 '$sm_name'。" #: git-submodule.sh:484 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "ä¸èƒ½æ£€å‡ºå模组 '$sm_path'" #: git-submodule.sh:489 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "æ— æ³•æ·»åŠ å模组 '$sm_path'" #: git-submodule.sh:498 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "æ— æ³•æ³¨å†Œå模组 '$sm_path'" #: git-submodule.sh:542 #, sh-format msgid "Entering '$prefix$displaypath'" msgstr "æ£åœ¨è¿›å…¥ '$prefix$displaypath'" #: git-submodule.sh:562 #, sh-format msgid "Stopping at '$prefix$displaypath'; script returned non-zero status." msgstr "åœæ¢äºŽ '$prefix$displaypath',脚本返回éžé›¶å€¼ã€‚" #: git-submodule.sh:608 #, sh-format msgid "No url found for submodule path '$displaypath' in .gitmodules" msgstr "在 .gitmodules ä¸æœªæ‰¾åˆ°å模组路径 '$displaypath' çš„ url" #: git-submodule.sh:617 #, sh-format msgid "Failed to register url for submodule path '$displaypath'" msgstr "æ— æ³•ä¸ºå模组路径 '$displaypath' 注册 url" #: git-submodule.sh:619 #, sh-format msgid "Submodule '$name' ($url) registered for path '$displaypath'" msgstr "å模组 '$name' ($url) 未对路径 '$displaypath' 注册" #: git-submodule.sh:636 #, sh-format msgid "Failed to register update mode for submodule path '$displaypath'" msgstr "æ— æ³•ä¸ºå模组路径 '$displaypath' 注册更新模å¼" #: git-submodule.sh:674 #, sh-format msgid "Use '.' if you really want to deinitialize all submodules" msgstr "使用 '.' 如果您真的想è¦å¯¹æ‰€æœ‰å模组å–消åˆå§‹åŒ–" #: git-submodule.sh:691 #, sh-format msgid "Submodule work tree '$displaypath' contains a .git directory" msgstr "å模组工作区 '$displaypath' 包å«ä¸€ä¸ª .git 目录" #: git-submodule.sh:692 #, sh-format msgid "" "(use 'rm -rf' if you really want to remove it including all of its history)" msgstr "(使用 'rm -rf' å‘½ä»¤å¦‚æžœæ‚¨çœŸçš„æƒ³åˆ é™¤å®ƒåŠå…¶å…¨éƒ¨åŽ†å²ï¼‰" #: git-submodule.sh:698 #, sh-format msgid "" "Submodule work tree '$displaypath' contains local modifications; use '-f' to " "discard them" msgstr "å模组工作区 '$displaypath' 包å«æœ¬åœ°ä¿®æ”¹ï¼›ä½¿ç”¨ '-f' 丢弃它们" #: git-submodule.sh:701 #, sh-format msgid "Cleared directory '$displaypath'" msgstr "已清除目录 '$displaypath'" #: git-submodule.sh:702 #, sh-format msgid "Could not remove submodule work tree '$displaypath'" msgstr "æ— æ³•ç§»é™¤å模组工作区 '$displaypath'" #: git-submodule.sh:705 #, sh-format msgid "Could not create empty submodule directory '$displaypath'" msgstr "ä¸èƒ½åˆ›å»ºç©ºçš„å模组目录 '$displaypath'" #: git-submodule.sh:714 #, sh-format msgid "Submodule '$name' ($url) unregistered for path '$displaypath'" msgstr "å模组 '$name' ($url) 未对路径 '$displaypath' 注册" #: git-submodule.sh:830 #, sh-format msgid "" "Submodule path '$displaypath' not initialized\n" "Maybe you want to use 'update --init'?" msgstr "" "å模组路径 '$displaypath' 没有åˆå§‹åŒ–\n" "也许您想用 'update --init'?" #: git-submodule.sh:843 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "æ— æ³•åœ¨å模组路径 '$displaypath' ä¸æ‰¾åˆ°å½“å‰ç‰ˆæœ¬" #: git-submodule.sh:852 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "æ— æ³•åœ¨å模组路径 '$sm_path' ä¸èŽ·å–" #: git-submodule.sh:876 #, sh-format msgid "Unable to fetch in submodule path '$displaypath'" msgstr "æ— æ³•åœ¨å模组路径 '$displaypath' ä¸èŽ·å–" #: git-submodule.sh:890 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "æ— æ³•åœ¨å模组路径 '$displaypath' ä¸æ£€å‡º '$sha1'" #: git-submodule.sh:891 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "å模组路径 '$displaypath':检出 '$sha1'" #: git-submodule.sh:895 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "æ— æ³•åœ¨å模组路径 '$displaypath' ä¸å˜åŸº '$sha1'" #: git-submodule.sh:896 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "å模组路径 '$displaypath':å˜åŸºè‡³ '$sha1'" #: git-submodule.sh:901 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "æ— æ³•åˆå¹¶ '$sha1' 到å模组路径 '$displaypath' ä¸" #: git-submodule.sh:902 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "å模组路径 '$displaypath':已åˆå¹¶å…¥ '$sha1'" #: git-submodule.sh:907 #, sh-format msgid "" "Execution of '$command $sha1' failed in submodule path '$prefix$sm_path'" msgstr "在å模组路径 '$prefix$sm_path' ä¸æ‰§è¡Œ '$command $sha1' 失败" #: git-submodule.sh:908 #, sh-format msgid "Submodule path '$prefix$sm_path': '$command $sha1'" msgstr "å模组路径 '$prefix$sm_path': '$command $sha1'" #: git-submodule.sh:938 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "æ— æ³•é€’å½’è¿›å模组路径 '$displaypath'" #: git-submodule.sh:1046 msgid "The --cached option cannot be used with the --files option" msgstr "选项 --cached ä¸èƒ½å’Œé€‰é¡¹ --files åŒæ—¶ä½¿ç”¨" #: git-submodule.sh:1098 #, sh-format msgid "unexpected mode $mod_dst" msgstr "æ„å¤–çš„æ¨¡å¼ $mod_dst" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: git-submodule.sh:1118 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " è¦å‘Šï¼š$display_name 未包å«æ交 $sha1_src" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: git-submodule.sh:1121 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " è¦å‘Šï¼š$display_name 未包å«æ交 $sha1_dst" # 译者:注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ #: git-submodule.sh:1124 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr " è¦å‘Šï¼š$display_name 未包å«æ交 $sha1_src å’Œ $sha1_dst" #: git-submodule.sh:1149 msgid "blob" msgstr "æ•°æ®å¯¹è±¡" #: git-submodule.sh:1267 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "æ— æ³•é€’å½’è¿›å模组路径 '$sm_path'" #: git-submodule.sh:1331 #, sh-format msgid "Synchronizing submodule url for '$displaypath'" msgstr "为 '$displaypath' åŒæ¥å模组 url" #~ msgid "false|true|preserve" #~ msgstr "false|true|preserve" #~ msgid "BUG: reopen a lockfile that is still open" #~ msgstr "BUG: é‡æ–°æ‰“开一个ä»æ‰“å¼€ç€çš„é”文件" #~ msgid "BUG: reopen a lockfile that has been committed" #~ msgstr "BUG: é‡æ–°æ‰“开一个已æ交的é”文件" #~ msgid "option %s does not accept negative form" #~ msgstr "选项 %s ä¸æŽ¥å—å¦å®šæ ¼å¼" #~ msgid "unable to parse value '%s' for option %s" #~ msgstr "ä¸èƒ½è§£æžé€‰é¡¹ %1$s 的值 '%2$s'" #~ msgid "unable to resolve HEAD" #~ msgstr "ä¸èƒ½è§£æž HEAD" #~ msgid "-b and -B are mutually exclusive" #~ msgstr "-b å’Œ -B 互斥" #~ msgid "You need to set your committer info first" #~ msgstr "您需è¦å…ˆè®¾ç½®ä½ çš„æ交者信æ¯" #~ msgid "" #~ "When you have resolved this problem, run \"$cmdline --continue\".\n" #~ "If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n" #~ "To restore the original branch and stop patching, run \"$cmdline --abort" #~ "\"." #~ msgstr "" #~ "当您解决了æ¤é—®é¢˜åŽï¼Œæ‰§è¡Œ \"$cmdline --continue\"。\n" #~ "如果您想跳过æ¤è¡¥ä¸ï¼Œåˆ™æ‰§è¡Œ \"$cmdline --skip\"。\n" #~ "è¦æ¢å¤åŽŸåˆ†æ”¯å¹¶åœæ¢æ‰“è¡¥ä¸ï¼Œæ‰§è¡Œ \"$cmdline --abort\"。" #~ msgid "Patch format $patch_format is not supported." #~ msgstr "ä¸æ”¯æŒ $patch_format è¡¥ä¸æ ¼å¼ã€‚" #~ msgid "Please make up your mind. --skip or --abort?" #~ msgstr "请下决心。--skip 或是 --abort ?" #~ msgid "" #~ "Patch is empty. Was it split wrong?\n" #~ "If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n" #~ "To restore the original branch and stop patching run \"$cmdline --abort\"." #~ msgstr "" #~ "è¡¥ä¸ä¸ºç©ºã€‚是ä¸æ˜¯åˆ‡åˆ†é”™è¯¯ï¼Ÿ\n" #~ "如果您想è¦è·³è¿‡è¿™ä¸ªè¡¥ä¸ï¼Œæ‰§è¡Œ \"$cmdline --skip\"。\n" #~ "è¦æ¢å¤åŽŸåˆ†æ”¯å¹¶åœæ¢æ‰“è¡¥ä¸ï¼Œæ‰§è¡Œ \"$cmdline --abort\"。" #~ msgid "Patch does not have a valid e-mail address." #~ msgstr "è¡¥ä¸ä¸æ²¡æœ‰ä¸€ä¸ªæœ‰æ•ˆçš„邮件地å€ã€‚" #~ msgid "Applying: $FIRSTLINE" #~ msgstr "æ£åº”用:$FIRSTLINE" #~ msgid "Patch failed at $msgnum $FIRSTLINE" #~ msgstr "è¡¥ä¸å¤±è´¥äºŽ $msgnum $FIRSTLINE" #~ msgid "" #~ "Pull is not possible because you have unmerged files.\n" #~ "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n" #~ "as appropriate to mark resolution and make a commit." #~ msgstr "" #~ "Pull ä¸å¯ç”¨ï¼Œå› 为您尚有未åˆå¹¶çš„文件。请先在工作区改æ£æ–‡ä»¶ï¼Œ\n" #~ "然åŽé…Œæƒ…使用 'git add/rm <文件>' æ ‡è®°è§£å†³æ–¹æ¡ˆï¼Œå†åšæ交。" #~ msgid "Pull is not possible because you have unmerged files." #~ msgstr "Pull ä¸å¯ç”¨ï¼Œå› 为您尚有未åˆå¹¶çš„文件。"