# Chinese translations for Git package # Git 软件包的简体中文翻译. # Copyright (C) 2012,2013 Jiang Xin # This file is distributed under the same license as the Git package. # Contributors: # - Fangyi Zhou # - Jiang Xin # - Lian Cheng # - Ray Chen # - Riku # - Thynson # - ws3389 # - Wang Sheng # - 依云 # - Yichao Yu # - Zhuang Ya # # 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 | 数据对象 # bloom filter | 布隆过滤器 # 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 工具 # cover letter | 附函 # DAG | 有向无环图 # dangling object | 悬空对象 # detached HEAD | 分离头指针 # directory | 目录 # dirty | 脏(的工作区) # dumb HTTP protocol | 哑 HTTP 协议 # evil merge | 坏合并(合并引入了父提交没有的修改) # fast-forward | 快进 # fetch | 获取 # file system | 文件系统 # fork | 派生 # Git archive | 仓库(对于 arch 用户) # gitfile | gitfile(仓库链接文件) # grafts | (提交)移植 # hash | 哈希值 # HEAD | HEAD(头指针,亦即当前分支) # head | 头、分支 # head ref | 分支 # header | 头信息 # hook | 钩子 # hunk | 补丁片段 # index | 索引 # index entry | 索引条目 # loose object | 松散对象 # loose refs | 松散引用 # master | master(默认分支名) # merge | 合并 # object | 对象 # object database | 对象库 # object identifier | 对象标识符 # object name | 对象名称 # object type | 对象类型 # octopus | 章鱼式合并(两分支以上的合并) # origin | origin(默认的远程名称) # pack | 包 # pack index | 包索引 # packfile | 包文件 # parent | 父提交 # patch | 补丁 # pathspec | 路径规格 # pattern | 模式 # pickaxe | 挖掘 # plumbing | 管件(Git 底层核心命令的别称) # porcelain | 瓷件(Git 上层封装命令的别称) # precious-objects repo | 珍品仓库 # promisor | 承诺者 # prune | 清除 # pull | 拉,拉取 # push | 推,推送 # reachable | 可达 # rebase | 变基 # ref | 引用 # reflog | 引用日志 # refspec | 引用规格 # remote | 远程,远程仓库 # remote-tracking branch | 远程跟踪分支 # replay | 重放 # repo | 仓库 # repository | 仓库 # resolve | (冲突)解决 # revert | 还原 # revision | 版本 # rewind | 回退 # SCM | 源代码管理(工具) # SHA-1 | SHA-1(安全哈希算法1) # shallow repository | 浅(克隆)仓库 # signed tag | 签名标签 # smart HTTP protocol | 智能 HTTP 协议 # squash | 挤压 # stage | n. 暂存区(即索引); v. 暂存 # stash | n. 贮藏区; v. 贮藏 # submodule | 子模组 # symref | 符号引用 # tag | n. 标签; v. 打标签 # tag object | 标签对象 # tagger | 打标签者 # topic branch | 主题分支 # track | 跟踪 # trailer | 尾注 # tree | 树(工作区或树对象) # tree object | 树对象 # tree-ish (also treeish) | 树对象(或可以解析为一树对象) # unmerged index | 未合并索引 # unpack | 解包 # unreachable object | 不可达对象 # unstage | 取消暂存 # upstream | 上游 # upstream branch | 上游分支 # working tree | 工作区 # msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List \n" "POT-Creation-Date: 2021-05-17 16:02+0800\n" "PO-Revision-Date: 2021-07-01 16:01+0800\n" "Last-Translator: Jiang Xin \n" "Language-Team: GitHub \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" #: add-interactive.c:376 #, c-format msgid "Huh (%s)?" msgstr "嗯(%s)?" #: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3493 #: sequencer.c:3944 sequencer.c:4099 builtin/rebase.c:1528 #: builtin/rebase.c:1953 msgid "could not read index" msgstr "不能读取索引" #: add-interactive.c:584 git-add--interactive.perl:269 #: git-add--interactive.perl:294 msgid "binary" msgstr "二进制" #: add-interactive.c:642 git-add--interactive.perl:278 #: git-add--interactive.perl:332 msgid "nothing" msgstr "无" #: add-interactive.c:643 git-add--interactive.perl:314 #: git-add--interactive.perl:329 msgid "unchanged" msgstr "没有修改" #: add-interactive.c:680 git-add--interactive.perl:641 msgid "Update" msgstr "更新" #: add-interactive.c:697 add-interactive.c:885 #, c-format msgid "could not stage '%s'" msgstr "不能暂存 '%s'" #: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3687 msgid "could not write index" msgstr "不能写入索引" #: add-interactive.c:706 git-add--interactive.perl:626 #, c-format, perl-format msgid "updated %d path\n" msgid_plural "updated %d paths\n" msgstr[0] "更新了 %d 个路径\n" msgstr[1] "更新了 %d 个路径\n" #: add-interactive.c:724 git-add--interactive.perl:676 #, c-format, perl-format msgid "note: %s is untracked now.\n" msgstr "说明:%s 现已成为未跟踪的。\n" #: add-interactive.c:729 apply.c:4127 builtin/checkout.c:298 #: builtin/reset.c:145 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "对路径 '%s' 的 make_cache_entry 操作失败" #: add-interactive.c:759 git-add--interactive.perl:653 msgid "Revert" msgstr "还原" #: add-interactive.c:775 msgid "Could not parse HEAD^{tree}" msgstr "不能解析 HEAD^{tree}" #: add-interactive.c:813 git-add--interactive.perl:629 #, c-format, perl-format msgid "reverted %d path\n" msgid_plural "reverted %d paths\n" msgstr[0] "还原了 %d 个路径\n" msgstr[1] "还原了 %d 个路径\n" #: add-interactive.c:864 git-add--interactive.perl:693 #, c-format msgid "No untracked files.\n" msgstr "没有未跟踪的文件。\n" #: add-interactive.c:868 git-add--interactive.perl:687 msgid "Add untracked" msgstr "添加未跟踪的" #: add-interactive.c:895 git-add--interactive.perl:623 #, c-format, perl-format msgid "added %d path\n" msgid_plural "added %d paths\n" msgstr[0] "增加了 %d 个路径\n" msgstr[1] "增加了 %d 个路径\n" #: add-interactive.c:925 #, c-format msgid "ignoring unmerged: %s" msgstr "忽略未合入的:%s" #: add-interactive.c:937 add-patch.c:1751 git-add--interactive.perl:1369 #, c-format msgid "Only binary files changed.\n" msgstr "只有二进制文件被修改。\n" #: add-interactive.c:939 add-patch.c:1749 git-add--interactive.perl:1371 #, c-format msgid "No changes.\n" msgstr "没有修改。\n" #: add-interactive.c:943 git-add--interactive.perl:1379 msgid "Patch update" msgstr "补丁更新" #: add-interactive.c:982 git-add--interactive.perl:1792 msgid "Review diff" msgstr "检视 diff" #: add-interactive.c:1010 msgid "show paths with changes" msgstr "显示含变更的路径" #: add-interactive.c:1012 msgid "add working tree state to the staged set of changes" msgstr "将工作区状态添加到暂存区修改集中" #: add-interactive.c:1014 msgid "revert staged set of changes back to the HEAD version" msgstr "将暂存的修改集恢复为 HEAD 版本" #: add-interactive.c:1016 msgid "pick hunks and update selectively" msgstr "挑选数据块并有选择地更新" #: add-interactive.c:1018 msgid "view diff between HEAD and index" msgstr "显示 HEAD 和索引的差异" #: add-interactive.c:1020 msgid "add contents of untracked files to the staged set of changes" msgstr "将未跟踪文件的内容添加到暂存区修改集中" #: add-interactive.c:1028 add-interactive.c:1077 msgid "Prompt help:" msgstr "帮助:" #: add-interactive.c:1030 msgid "select a single item" msgstr "选择一个条目" #: add-interactive.c:1032 msgid "select a range of items" msgstr "选择一系列条目" #: add-interactive.c:1034 msgid "select multiple ranges" msgstr "选择多个范围" #: add-interactive.c:1036 add-interactive.c:1081 msgid "select item based on unique prefix" msgstr "基于唯一前缀选择条目" #: add-interactive.c:1038 msgid "unselect specified items" msgstr "反选指定的条目" #: add-interactive.c:1040 msgid "choose all items" msgstr "选择所有条目" #: add-interactive.c:1042 msgid "(empty) finish selecting" msgstr "(空)结束选择" #: add-interactive.c:1079 msgid "select a numbered item" msgstr "选择一个编号条目" #: add-interactive.c:1083 msgid "(empty) select nothing" msgstr "(空)不选择任何内容" #: add-interactive.c:1091 builtin/clean.c:816 git-add--interactive.perl:1896 msgid "*** Commands ***" msgstr "*** 命令 ***" #: add-interactive.c:1092 builtin/clean.c:817 git-add--interactive.perl:1893 msgid "What now" msgstr "请选择" #: add-interactive.c:1144 git-add--interactive.perl:213 msgid "staged" msgstr "缓存" #: add-interactive.c:1144 git-add--interactive.perl:213 msgid "unstaged" msgstr "未缓存" #: add-interactive.c:1144 apply.c:4994 apply.c:4997 builtin/am.c:2308 #: builtin/am.c:2311 builtin/bugreport.c:135 builtin/clone.c:128 #: builtin/fetch.c:152 builtin/merge.c:285 builtin/pull.c:190 #: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1819 #: builtin/submodule--helper.c:1822 builtin/submodule--helper.c:2327 #: builtin/submodule--helper.c:2330 builtin/submodule--helper.c:2573 #: git-add--interactive.perl:213 msgid "path" msgstr "路径" #: add-interactive.c:1151 msgid "could not refresh index" msgstr "不能刷新索引" #: add-interactive.c:1165 builtin/clean.c:781 git-add--interactive.perl:1803 #, c-format msgid "Bye.\n" msgstr "再见。\n" #: add-patch.c:34 git-add--interactive.perl:1431 #, c-format, perl-format msgid "Stage mode change [y,n,q,a,d%s,?]? " msgstr "暂存模式变更 [y,n,q,a,d%s,?]? " #: add-patch.c:35 git-add--interactive.perl:1432 #, c-format, perl-format msgid "Stage deletion [y,n,q,a,d%s,?]? " msgstr "暂存删除动作 [y,n,q,a,d%s,?]? " #: add-patch.c:36 git-add--interactive.perl:1433 #, c-format, perl-format msgid "Stage addition [y,n,q,a,d%s,?]? " msgstr "暂存添加动作 [y,n,q,a,d%s,?]? " #: add-patch.c:37 git-add--interactive.perl:1434 #, c-format, perl-format msgid "Stage this hunk [y,n,q,a,d%s,?]? " msgstr "暂存该块 [y,n,q,a,d%s,?]? " #: add-patch.c:39 msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "staging." msgstr "如果补丁能正确地应用,编辑块将立即标记为暂存。" #: add-patch.c:42 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" "q - quit; do not stage this hunk or any of the remaining ones\n" "a - stage this hunk and all later hunks in the file\n" "d - do not stage this hunk or any of the later hunks in the file\n" msgstr "" "y - 暂存该块\n" "n - 不要暂存该块\n" "q - 退出。不暂存该块及后面的全部块\n" "a - 暂存该块和本文件中后面的全部块\n" "d - 不暂存该块和本文件中后面的全部块\n" #: add-patch.c:56 git-add--interactive.perl:1437 #, c-format, perl-format msgid "Stash mode change [y,n,q,a,d%s,?]? " msgstr "贮藏模式变更 [y,n,q,a,d%s,?]? " #: add-patch.c:57 git-add--interactive.perl:1438 #, c-format, perl-format msgid "Stash deletion [y,n,q,a,d%s,?]? " msgstr "贮藏删除动作 [y,n,q,a,d%s,?]? " #: add-patch.c:58 git-add--interactive.perl:1439 #, c-format, perl-format msgid "Stash addition [y,n,q,a,d%s,?]? " msgstr "贮藏添加动作 [y,n,q,a,d%s,?]? " #: add-patch.c:59 git-add--interactive.perl:1440 #, c-format, perl-format msgid "Stash this hunk [y,n,q,a,d%s,?]? " msgstr "贮藏该块 [y,n,q,a,d%s,?]? " #: add-patch.c:61 msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "stashing." msgstr "如果补丁能正确地应用,编辑块将立即标记为贮藏。" #: add-patch.c:64 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" "q - quit; do not stash this hunk or any of the remaining ones\n" "a - stash this hunk and all later hunks in the file\n" "d - do not stash this hunk or any of the later hunks in the file\n" msgstr "" "y - 贮藏该块\n" "n - 不要贮藏该块\n" "q - 退出。不贮藏该块及后面的全部块\n" "a - 贮藏该块和本文件中后面的全部块\n" "d - 不贮藏该块和本文件中后面的全部块\n" #: add-patch.c:80 git-add--interactive.perl:1443 #, c-format, perl-format msgid "Unstage mode change [y,n,q,a,d%s,?]? " msgstr "取消暂存模式变更 [y,n,q,a,d%s,?]? " #: add-patch.c:81 git-add--interactive.perl:1444 #, c-format, perl-format msgid "Unstage deletion [y,n,q,a,d%s,?]? " msgstr "取消暂存删除动作 [y,n,q,a,d%s,?]? " #: add-patch.c:82 git-add--interactive.perl:1445 #, c-format, perl-format msgid "Unstage addition [y,n,q,a,d%s,?]? " msgstr "取消暂存添加动作 [y,n,q,a,d%s,?]? " #: add-patch.c:83 git-add--interactive.perl:1446 #, c-format, perl-format msgid "Unstage this hunk [y,n,q,a,d%s,?]? " msgstr "取消暂存该块 [y,n,q,a,d%s,?]? " #: add-patch.c:85 msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "unstaging." msgstr "如果补丁能正确地应用,编辑块将立即标记为未暂存。" #: add-patch.c:88 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" "q - quit; do not unstage this hunk or any of the remaining ones\n" "a - unstage this hunk and all later hunks in the file\n" "d - do not unstage this hunk or any of the later hunks in the file\n" msgstr "" "y - 取消暂存该块\n" "n - 不要取消暂存该块\n" "q - 退出。不要取消暂存该块及后面的全部块\n" "a - 取消暂存该块和本文件中后面的全部块\n" "d - 不要取消暂存该块和本文件中后面的全部块\n" #: add-patch.c:103 git-add--interactive.perl:1449 #, c-format, perl-format msgid "Apply mode change to index [y,n,q,a,d%s,?]? " msgstr "将模式变更应用到索引 [y,n,q,a,d%s,?]? " #: add-patch.c:104 git-add--interactive.perl:1450 #, c-format, perl-format msgid "Apply deletion to index [y,n,q,a,d%s,?]? " msgstr "将删除操作应用到索引 [y,n,q,a,d%s,?]? " #: add-patch.c:105 git-add--interactive.perl:1451 #, c-format, perl-format msgid "Apply addition to index [y,n,q,a,d%s,?]? " msgstr "将添加操作应用到索引 [y,n,q,a,d%s,?]? " #: add-patch.c:106 git-add--interactive.perl:1452 #, c-format, perl-format msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " msgstr "将该块应用到索引 [y,n,q,a,d%s,?]? " #: add-patch.c:108 add-patch.c:176 add-patch.c:221 msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "applying." msgstr "如果补丁能正确地应用,编辑块将立即标记为应用。" #: add-patch.c:111 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" "q - quit; do not apply this hunk or any of the remaining ones\n" "a - apply this hunk and all later hunks in the file\n" "d - do not apply this hunk or any of the later hunks in the file\n" msgstr "" "y - 在索引中应用该块\n" "n - 不要在索引中应用该块\n" "q - 退出。不要应用该块及后面的全部块\n" "a - 应用该块和本文件中后面的全部块\n" "d - 不要应用该块和本文件中后面的全部块\n" #: add-patch.c:126 git-add--interactive.perl:1455 #: git-add--interactive.perl:1473 #, c-format, perl-format msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " msgstr "从工作区中丢弃模式变更 [y,n,q,a,d%s,?]? " #: add-patch.c:127 git-add--interactive.perl:1456 #: git-add--interactive.perl:1474 #, c-format, perl-format msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " msgstr "从工作区中丢弃删除动作 [y,n,q,a,d%s,?]? " #: add-patch.c:128 git-add--interactive.perl:1457 #: git-add--interactive.perl:1475 #, c-format, perl-format msgid "Discard addition from worktree [y,n,q,a,d%s,?]? " msgstr "从工作区中丢弃添加动作 [y,n,q,a,d%s,?]? " #: add-patch.c:129 git-add--interactive.perl:1458 #: git-add--interactive.perl:1476 #, c-format, perl-format msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " msgstr "从工作区中丢弃该块 [y,n,q,a,d%s,?]? " #: add-patch.c:131 add-patch.c:154 add-patch.c:199 msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "discarding." msgstr "如果补丁能正确地应用,编辑块将立即标记为丢弃。" #: add-patch.c:134 add-patch.c:202 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" "q - quit; do not discard this hunk or any of the remaining ones\n" "a - discard this hunk and all later hunks in the file\n" "d - do not discard this hunk or any of the later hunks in the file\n" msgstr "" "y - 在工作区中丢弃该块\n" "n - 不要在工作区中丢弃该块\n" "q - 退出。不要丢弃该块及后面的全部块\n" "a - 丢弃该块和本文件中后面的全部块\n" "d - 不要丢弃该块和本文件中后面的全部块\n" #: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461 #, c-format, perl-format msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " msgstr "从索引和工作区中丢弃模式变更 [y,n,q,a,d%s,?]? " #: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462 #, c-format, perl-format msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " msgstr "从索引和工作区中丢弃删除动作 [y,n,q,a,d%s,?]? " #: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463 #, c-format, perl-format msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? " msgstr "从索引和工作区中丢弃添加动作 [y,n,q,a,d%s,?]? " #: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1464 #, c-format, perl-format msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " msgstr "从索引和工作区中丢弃该块 [y,n,q,a,d%s,?]? " #: add-patch.c:157 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" "q - quit; do not discard this hunk or any of the remaining ones\n" "a - discard this hunk and all later hunks in the file\n" "d - do not discard this hunk or any of the later hunks in the file\n" msgstr "" "y - 在索引和工作区中丢弃该块\n" "n - 不要在索引和工作区中丢弃该块\n" "q - 退出。不要丢弃该块及后面的全部块\n" "a - 丢弃该块和本文件中后面的全部块\n" "d - 不要丢弃该块和本文件中后面的全部块\n" #: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467 #, c-format, perl-format msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " msgstr "将模式变更应用到索引和工作区 [y,n,q,a,d%s,?]? " #: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468 #, c-format, perl-format msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " msgstr "将删除操作应用到索引和工作区 [y,n,q,a,d%s,?]? " #: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469 #, c-format, perl-format msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? " msgstr "将添加操作应用到索引和工作区 [y,n,q,a,d%s,?]? " #: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470 #, c-format, perl-format msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " msgstr "将该块应用到索引和工作区 [y,n,q,a,d%s,?]? " #: add-patch.c:179 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" "q - quit; do not apply this hunk or any of the remaining ones\n" "a - apply this hunk and all later hunks in the file\n" "d - do not apply this hunk or any of the later hunks in the file\n" msgstr "" "y - 在索引和工作区中应用该块\n" "n - 不要在索引和工作区中应用该块\n" "q - 退出。不要应用该块及后面的全部块\n" "a - 应用该块和本文件中后面的全部块\n" "d - 不要应用该块和本文件中后面的全部块\n" #: add-patch.c:224 msgid "" "y - apply this hunk to worktree\n" "n - do not apply this hunk to worktree\n" "q - quit; do not apply this hunk or any of the remaining ones\n" "a - apply this hunk and all later hunks in the file\n" "d - do not apply this hunk or any of the later hunks in the file\n" msgstr "" "y - 在工作区中应用该块\n" "n - 不要在工作区中应用该块\n" "q - 退出。不要应用该块及后面的全部块\n" "a - 应用该块和本文件中后面的全部块\n" "d - 不要应用该块和本文件中后面的全部块\n" #: add-patch.c:342 #, c-format msgid "could not parse hunk header '%.*s'" msgstr "无法解析数据块头信息 '%.*s'" #: add-patch.c:361 add-patch.c:365 #, c-format msgid "could not parse colored hunk header '%.*s'" msgstr "无法解析彩色数据块头信息 '%.*s'" #: add-patch.c:419 msgid "could not parse diff" msgstr "不能解析差异信息" #: add-patch.c:438 msgid "could not parse colored diff" msgstr "不能解析彩色差异信息" #: add-patch.c:452 #, c-format msgid "failed to run '%s'" msgstr "运行 '%s' 失败" #: add-patch.c:611 msgid "mismatched output from interactive.diffFilter" msgstr "interactive.diffFilter 的输出不匹配" #: add-patch.c:612 msgid "" "Your filter must maintain a one-to-one correspondence\n" "between its input and output lines." msgstr "您的过滤器必须在其输入和输出的行之间保持一一对应的关系。" #: add-patch.c:790 #, c-format msgid "" "expected context line #%d in\n" "%.*s" msgstr "" "预期上下文行 #%d 于\n" "%.*s" #: add-patch.c:805 #, c-format msgid "" "hunks do not overlap:\n" "%.*s\n" "\tdoes not end with:\n" "%.*s" msgstr "" "块不重叠:\n" "%.*s\n" "\t不是结尾于:\n" "%.*s" #: add-patch.c:1081 git-add--interactive.perl:1115 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" msgstr "手动块编辑模式 -- 查看底部的快速指南。\n" #: add-patch.c:1085 #, c-format msgid "" "---\n" "To remove '%c' lines, make them ' ' lines (context).\n" "To remove '%c' lines, delete them.\n" "Lines starting with %c will be removed.\n" msgstr "" "---\n" "要删除 '%c' 开始的行,使其成为 ' ' 开始的行(上下文)。\n" "要删除 '%c' 开始的行,删除它们。\n" "以 %c 开始的行将被删除。\n" #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. #: add-patch.c:1099 git-add--interactive.perl:1129 msgid "" "If it does not apply cleanly, you will be given an opportunity to\n" "edit again. If all lines of the hunk are removed, then the edit is\n" "aborted and the hunk is left unchanged.\n" msgstr "" "如果不能干净地应用,您将有机会重新编辑。如果该块的全部内容删除,则\n" "此次编辑被终止,该块不会被修改。\n" #: add-patch.c:1132 msgid "could not parse hunk header" msgstr "无法解析数据块头信息" #: add-patch.c:1177 msgid "'git apply --cached' failed" msgstr "'git apply --cached' 失败" #. TRANSLATORS: do not translate [y/n] #. The program will only accept that input at this point. #. Consider translating (saying "no" discards!) as #. (saying "n" for "no" discards!) if the translation #. of the word "no" does not start with n. #. #. TRANSLATORS: do not translate [y/n] #. The program will only accept that input #. at this point. #. Consider translating (saying "no" discards!) as #. (saying "n" for "no" discards!) if the translation #. of the word "no" does not start with n. #: add-patch.c:1246 git-add--interactive.perl:1242 msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "您的编辑块不能被应用。重新编辑(选择 \"no\" 丢弃!) [y/n]? " #: add-patch.c:1289 msgid "The selected hunks do not apply to the index!" msgstr "选中的块不能应用到索引!" #: add-patch.c:1290 git-add--interactive.perl:1346 msgid "Apply them to the worktree anyway? " msgstr "无论如何都要应用到工作区么?" #: add-patch.c:1297 git-add--interactive.perl:1349 msgid "Nothing was applied.\n" msgstr "未应用。\n" #: add-patch.c:1354 msgid "" "j - leave this hunk undecided, see next undecided hunk\n" "J - leave this hunk undecided, see next hunk\n" "k - leave this hunk undecided, see previous undecided hunk\n" "K - leave this hunk undecided, see previous hunk\n" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" "s - split the current hunk into smaller hunks\n" "e - manually edit the current hunk\n" "? - print help\n" msgstr "" "j - 维持该块未决状态,查看下一个未决块\n" "J - 维持该块未决状态,查看下一个块\n" "k - 维持该块未决状态,查看上一个未决块\n" "K - 维持该块未决状态,查看上一个块\n" "g - 选择跳转到一个块\n" "/ - 查找和给定正则表达式匹配的块\n" "s - 拆分当前块为更小的块\n" "e - 手动编辑当前块\n" "? - 显示帮助\n" #: add-patch.c:1516 add-patch.c:1526 msgid "No previous hunk" msgstr "没有前一个块" #: add-patch.c:1521 add-patch.c:1531 msgid "No next hunk" msgstr "没有下一个块" #: add-patch.c:1537 msgid "No other hunks to goto" msgstr "没有其它可供跳转的块" #: add-patch.c:1548 git-add--interactive.perl:1606 msgid "go to which hunk ( to see more)? " msgstr "跳转到哪个块(<回车> 查看更多)? " #: add-patch.c:1549 git-add--interactive.perl:1608 msgid "go to which hunk? " msgstr "跳转到哪个块?" #: add-patch.c:1560 #, c-format msgid "Invalid number: '%s'" msgstr "无效数字:'%s'" #: add-patch.c:1565 #, c-format msgid "Sorry, only %d hunk available." msgid_plural "Sorry, only %d hunks available." msgstr[0] "对不起,只有 %d 个可用块。" msgstr[1] "对不起,只有 %d 个可用块。" #: add-patch.c:1574 msgid "No other hunks to search" msgstr "没有其它可供查找的块" #: add-patch.c:1580 git-add--interactive.perl:1661 msgid "search for regex? " msgstr "使用正则表达式搜索?" #: add-patch.c:1595 #, c-format msgid "Malformed search regexp %s: %s" msgstr "错误的正则表达式 %s:%s" #: add-patch.c:1612 msgid "No hunk matches the given pattern" msgstr "没有和给定模式相匹配的块" #: add-patch.c:1619 msgid "Sorry, cannot split this hunk" msgstr "对不起,不能拆分这个块" #: add-patch.c:1623 #, c-format msgid "Split into %d hunks." msgstr "拆分为 %d 块。" #: add-patch.c:1627 msgid "Sorry, cannot edit this hunk" msgstr "对不起,不能编辑这个块" #: add-patch.c:1679 msgid "'git apply' failed" msgstr "'git apply' 失败" #: advice.c:145 #, c-format msgid "" "\n" "Disable this message with \"git config advice.%s false\"" msgstr "" "\n" "使用 \"git config advice.%s false\" 来关闭此消息" #: advice.c:161 #, c-format msgid "%shint: %.*s%s\n" msgstr "%s提示:%.*s%s\n" #: advice.c:252 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "无法拣选,因为您有未合并的文件。" #: advice.c:254 msgid "Committing is not possible because you have unmerged files." msgstr "无法提交,因为您有未合并的文件。" #: advice.c:256 msgid "Merging is not possible because you have unmerged files." msgstr "无法合并,因为您有未合并的文件。" #: advice.c:258 msgid "Pulling is not possible because you have unmerged files." msgstr "无法拉取,因为您有未合并的文件。" #: advice.c:260 msgid "Reverting is not possible because you have unmerged files." msgstr "无法回退,因为您有未合并的文件。" #: advice.c:262 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "无法 %s,因为您有未合并的文件。" #: advice.c:270 msgid "" "Fix them up in the work tree, and then use 'git add/rm '\n" "as appropriate to mark resolution and make a commit." msgstr "" "请在工作区改正文件,然后酌情使用 'git add/rm <文件>' 命令标记\n" "解决方案并提交。" #: advice.c:278 msgid "Exiting because of an unresolved conflict." msgstr "因为存在未解决的冲突而退出。" #: advice.c:283 builtin/merge.c:1374 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。" #: advice.c:285 msgid "Please, commit your changes before merging." msgstr "请在合并前先提交您的修改。" #: advice.c:286 msgid "Exiting because of unfinished merge." msgstr "因为存在未完成的合并而退出。" #: advice.c:296 #, c-format msgid "" "The following pathspecs didn't match any eligible path, but they do match " "index\n" "entries outside the current sparse checkout:\n" msgstr "以下路径规格不匹配任何适合的路径,但它们和当前稀疏检出之外的索引条目匹配:\n" #: advice.c:303 msgid "" "Disable or modify the sparsity rules if you intend to update such entries." msgstr "如果您打算更新此类条目,请禁用或修改稀疏规则。" #: advice.c:310 #, c-format msgid "" "Note: switching to '%s'.\n" "\n" "You are in 'detached HEAD' state. You can look around, make experimental\n" "changes and commit them, and you can discard any commits you make in this\n" "state without impacting any branches by switching back to a branch.\n" "\n" "If you want to create a new branch to retain commits you create, you may\n" "do so (now or later) by using -c with the switch command. Example:\n" "\n" " git switch -c \n" "\n" "Or undo this operation with:\n" "\n" " git switch -\n" "\n" "Turn off this advice by setting config variable advice.detachedHead to " "false\n" "\n" msgstr "" "注意:正在切换到 '%s'。\n" "\n" "您正处于分离头指针状态。您可以查看、做试验性的修改及提交,并且您可以在切换\n" "回一个分支时,丢弃在此状态下所做的提交而不对分支造成影响。\n" "\n" "如果您想要通过创建分支来保留在此状态下所做的提交,您可以通过在 switch 命令\n" "中添加参数 -c 来实现(现在或稍后)。例如:\n" "\n" " git switch -c <新分支名>\n" "\n" "或者撤销此操作:\n" "\n" " git switch -\n" "\n" "通过将配置变量 advice.detachedHead 设置为 false 来关闭此建议\n" "\n" #: alias.c:50 msgid "cmdline ends with \\" msgstr "命令行以 \\ 结尾" #: alias.c:51 msgid "unclosed quote" msgstr "未关闭的引号" #: apply.c:70 #, c-format msgid "unrecognized whitespace option '%s'" msgstr "未能识别的空白字符选项 '%s'" #: apply.c:86 #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "未能识别的空白字符忽略选项 '%s'" #: apply.c:136 msgid "--reject and --3way cannot be used together." msgstr "--reject 和 --3way 不能同时使用。" #: apply.c:139 msgid "--3way outside a repository" msgstr "--3way 在一个仓库之外" #: apply.c:150 msgid "--index outside a repository" msgstr "--index 在一个仓库之外" #: apply.c:153 msgid "--cached outside a repository" msgstr "--cached 在一个仓库之外" #: apply.c:800 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "无法准备时间戳正则表达式 %s" #: apply.c:809 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec 返回 %d,输入为:%s" #: apply.c:883 #, c-format msgid "unable to find filename in patch at line %d" msgstr "不能在补丁的第 %d 行找到文件名" #: apply.c:921 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s" #: apply.c:927 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致" #: apply.c:928 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致" #: apply.c:933 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null" #: apply.c:962 #, c-format msgid "invalid mode on line %d: %s" msgstr "第 %d 行包含无效文件模式:%s" #: apply.c:1281 #, c-format msgid "inconsistent header lines %d and %d" msgstr "不一致的文件头,%d 行和 %d 行" #: apply.c:1371 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " "component (line %d)" msgid_plural "" "git diff header lacks filename information when removing %d leading pathname " "components (line %d)" msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)" msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)" #: apply.c:1384 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "git diff 的头信息中缺乏文件名信息(第 %d 行)" #: apply.c:1480 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount:意外的行:%.*s" #: apply.c:1549 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "第 %d 行的补丁片段没有头信息:%.*s" #: apply.c:1752 msgid "new file depends on old contents" msgstr "新文件依赖旧内容" #: apply.c:1754 msgid "deleted file still has contents" msgstr "删除的文件仍有内容" #: apply.c:1788 #, c-format msgid "corrupt patch at line %d" msgstr "补丁在第 %d 行损坏" #: apply.c:1825 #, c-format msgid "new file %s depends on old contents" msgstr "新文件 %s 依赖旧内容" #: apply.c:1827 #, c-format msgid "deleted file %s still has contents" msgstr "删除的文件 %s 仍有内容" #: apply.c:1830 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** 警告:文件 %s 成为空文件但并未删除" #: apply.c:1977 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "二进制补丁在第 %d 行损坏:%.*s" #: apply.c:2014 #, c-format msgid "unrecognized binary patch at line %d" msgstr "未能识别的二进制补丁位于第 %d 行" #: apply.c:2176 #, c-format msgid "patch with only garbage at line %d" msgstr "补丁文件的第 %d 行只有垃圾数据" #: apply.c:2262 #, c-format msgid "unable to read symlink %s" msgstr "无法读取符号链接 %s" #: apply.c:2266 #, c-format msgid "unable to open or read %s" msgstr "不能打开或读取 %s" #: apply.c:2935 #, c-format msgid "invalid start of line: '%c'" msgstr "无效的行首字符:'%c'" #: apply.c:3056 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "块 #%d 成功应用于 %d(偏移 %d 行)" msgstr[1] "块 #%d 成功应用于 %d(偏移 %d 行)" #: apply.c:3068 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段" #: apply.c:3074 #, c-format msgid "" "while searching for:\n" "%.*s" msgstr "" "当查询:\n" "%.*s" #: apply.c:3096 #, c-format msgid "missing binary patch data for '%s'" msgstr "缺失 '%s' 的二进制补丁数据" #: apply.c:3104 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "不能反向应用一个缺少到 '%s' 的反向数据块的二进制补丁" #: apply.c:3151 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁" #: apply.c:3162 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." msgstr "补丁应用到 '%s'(%s),但是和当前内容不匹配。" #: apply.c:3170 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "补丁应用到空文件 '%s',但其并非空文件" #: apply.c:3188 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "无法读取 '%2$s' 必需的目标文件 %1$s" #: apply.c:3201 #, c-format msgid "binary patch does not apply to '%s'" msgstr "二进制补丁未应用到 '%s'" #: apply.c:3208 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)" #: apply.c:3229 #, c-format msgid "patch failed: %s:%ld" msgstr "打补丁失败:%s:%ld" #: apply.c:3352 #, c-format msgid "cannot checkout %s" msgstr "不能检出 %s" #: apply.c:3404 apply.c:3415 apply.c:3461 midx.c:98 pack-revindex.c:214 #: setup.c:308 #, c-format msgid "failed to read %s" msgstr "无法读取 %s" #: apply.c:3412 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "读取位于符号链接中的 '%s'" #: apply.c:3441 apply.c:3687 #, c-format msgid "path %s has been renamed/deleted" msgstr "路径 %s 已经被重命名/删除" #: apply.c:3527 apply.c:3702 #, c-format msgid "%s: does not exist in index" msgstr "%s:不存在于索引中" #: apply.c:3536 apply.c:3710 apply.c:3954 #, c-format msgid "%s: does not match index" msgstr "%s:和索引不匹配" #: apply.c:3571 msgid "repository lacks the necessary blob to perform 3-way merge." msgstr "仓库缺乏执行三方合并所必需的数据对象。" #: apply.c:3574 #, c-format msgid "Performing three-way merge...\n" msgstr "执行三方合并...\n" #: apply.c:3590 apply.c:3594 #, c-format msgid "cannot read the current contents of '%s'" msgstr "无法读取 '%s' 的当前内容" #: apply.c:3606 #, c-format msgid "Failed to perform three-way merge...\n" msgstr "无法执行三方合并...\n" #: apply.c:3620 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "应用补丁到 '%s' 存在冲突。\n" #: apply.c:3625 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "成功应用补丁到 '%s'。\n" #: apply.c:3642 #, c-format msgid "Falling back to direct application...\n" msgstr "回落到直接应用...\n" #: apply.c:3654 msgid "removal patch leaves file contents" msgstr "移除补丁仍留下了文件内容" #: apply.c:3727 #, c-format msgid "%s: wrong type" msgstr "%s:错误类型" #: apply.c:3729 #, c-format msgid "%s has type %o, expected %o" msgstr "%s 的类型是 %o,应为 %o" #: apply.c:3894 apply.c:3896 read-cache.c:861 read-cache.c:890 #: read-cache.c:1351 #, c-format msgid "invalid path '%s'" msgstr "无效路径 '%s'" #: apply.c:3952 #, c-format msgid "%s: already exists in index" msgstr "%s:已经存在于索引中" #: apply.c:3956 #, c-format msgid "%s: already exists in working directory" msgstr "%s:已经存在于工作区中" #: apply.c:3976 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配" #: apply.c:3981 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配" #: apply.c:4001 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "受影响的文件 '%s' 位于符号链接中" #: apply.c:4005 #, c-format msgid "%s: patch does not apply" msgstr "%s:补丁未应用" #: apply.c:4020 #, c-format msgid "Checking patch %s..." msgstr "正在检查补丁 %s..." #: apply.c:4112 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "子模组 %s 的 sha1 信息缺失或无效" #: apply.c:4119 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "%s 的模式变更,但它不在当前 HEAD 中" #: apply.c:4122 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "sha1 信息缺失或无效(%s)。" #: apply.c:4131 #, c-format msgid "could not add %s to temporary index" msgstr "不能在临时索引中添加 %s" #: apply.c:4141 #, c-format msgid "could not write temporary index to %s" msgstr "不能把临时索引写入到 %s" #: apply.c:4279 #, c-format msgid "unable to remove %s from index" msgstr "不能从索引中移除 %s" #: apply.c:4313 #, c-format msgid "corrupt patch for submodule %s" msgstr "子模组 %s 损坏的补丁" #: apply.c:4319 #, c-format msgid "unable to stat newly created file '%s'" msgstr "不能对新建文件 '%s' 调用 stat" #: apply.c:4327 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "不能为新建文件 %s 创建后端存储" #: apply.c:4333 apply.c:4478 #, c-format msgid "unable to add cache entry for %s" msgstr "无法为 %s 添加缓存条目" #: apply.c:4376 builtin/bisect--helper.c:523 #, c-format msgid "failed to write to '%s'" msgstr "写入 '%s' 失败" #: apply.c:4380 #, c-format msgid "closing file '%s'" msgstr "关闭文件 '%s'" #: apply.c:4450 #, c-format msgid "unable to write file '%s' mode %o" msgstr "不能写文件 '%s' 权限 %o" #: apply.c:4548 #, c-format msgid "Applied patch %s cleanly." msgstr "成功应用补丁 %s。" #: apply.c:4556 msgid "internal error" msgstr "内部错误" #: apply.c:4559 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..." msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..." #: apply.c:4570 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "截短 .rej 文件名为 %.*s.rej" #: apply.c:4578 builtin/fetch.c:993 builtin/fetch.c:1394 #, c-format msgid "cannot open %s" msgstr "不能打开 %s" #: apply.c:4592 #, c-format msgid "Hunk #%d applied cleanly." msgstr "第 #%d 个片段成功应用。" #: apply.c:4596 #, c-format msgid "Rejected hunk #%d." msgstr "拒绝第 #%d 个片段。" #: apply.c:4725 #, c-format msgid "Skipped patch '%s'." msgstr "略过补丁 '%s'。" #: apply.c:4733 msgid "unrecognized input" msgstr "未能识别的输入" #: apply.c:4753 msgid "unable to read index file" msgstr "无法读取索引文件" #: apply.c:4910 #, c-format msgid "can't open patch '%s': %s" msgstr "不能打开补丁 '%s':%s" #: apply.c:4937 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "抑制下仍有 %d 个空白字符误用" msgstr[1] "抑制下仍有 %d 个空白字符误用" #: apply.c:4943 apply.c:4958 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d 行新增了空白字符误用。" msgstr[1] "%d 行新增了空白字符误用。" #: apply.c:4951 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "修复空白错误后,应用了 %d 行。" msgstr[1] "修复空白错误后,应用了 %d 行。" #: apply.c:4967 builtin/add.c:679 builtin/mv.c:304 builtin/rm.c:423 msgid "Unable to write new index file" msgstr "无法写入新索引文件" #: apply.c:4995 msgid "don't apply changes matching the given path" msgstr "不要应用与给出路径向匹配的变更" #: apply.c:4998 msgid "apply changes matching the given path" msgstr "应用与给出路径向匹配的变更" #: apply.c:5000 builtin/am.c:2317 msgid "num" msgstr "数字" #: apply.c:5001 msgid "remove leading slashes from traditional diff paths" msgstr "从传统的 diff 路径中移除指定数量的前导斜线" #: apply.c:5004 msgid "ignore additions made by the patch" msgstr "忽略补丁中的添加的文件" #: apply.c:5006 msgid "instead of applying the patch, output diffstat for the input" msgstr "不应用补丁,而是显示输入的差异统计(diffstat)" #: apply.c:5010 msgid "show number of added and deleted lines in decimal notation" msgstr "以十进制数显示添加和删除的行数" #: apply.c:5012 msgid "instead of applying the patch, output a summary for the input" msgstr "不应用补丁,而是显示输入的概要" #: apply.c:5014 msgid "instead of applying the patch, see if the patch is applicable" msgstr "不应用补丁,而是查看补丁是否可应用" #: apply.c:5016 msgid "make sure the patch is applicable to the current index" msgstr "确认补丁可以应用到当前索引" #: apply.c:5018 msgid "mark new files with `git add --intent-to-add`" msgstr "使用命令 `git add --intent-to-add` 标记新增文件" #: apply.c:5020 msgid "apply a patch without touching the working tree" msgstr "应用补丁而不修改工作区" #: apply.c:5022 msgid "accept a patch that touches outside the working area" msgstr "接受修改工作区之外文件的补丁" #: apply.c:5025 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)" #: apply.c:5027 msgid "attempt three-way merge, fall back on normal patch if that fails" msgstr "尝试三路合并,如果失败则尝试正常补丁模式" #: apply.c:5029 msgid "build a temporary index based on embedded index information" msgstr "创建一个临时索引基于嵌入的索引信息" #: apply.c:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617 msgid "paths are separated with NUL character" msgstr "路径以 NUL 字符分隔" #: apply.c:5034 msgid "ensure at least lines of context match" msgstr "确保至少匹配 行上下文" #: apply.c:5035 builtin/am.c:2293 builtin/am.c:2296 #: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100 #: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3831 #: builtin/rebase.c:1347 msgid "action" msgstr "动作" #: apply.c:5036 msgid "detect new or modified lines that have whitespace errors" msgstr "检查新增和修改的行中间的空白字符滥用" #: apply.c:5039 apply.c:5042 msgid "ignore changes in whitespace when finding context" msgstr "查找上下文时忽略空白字符的变更" #: apply.c:5045 msgid "apply the patch in reverse" msgstr "反向应用补丁" #: apply.c:5047 msgid "don't expect at least one line of context" msgstr "无需至少一行上下文" #: apply.c:5049 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中" #: apply.c:5051 msgid "allow overlapping hunks" msgstr "允许重叠的补丁片段" #: apply.c:5052 builtin/add.c:364 builtin/check-ignore.c:22 #: builtin/commit.c:1474 builtin/count-objects.c:98 builtin/fsck.c:755 #: builtin/log.c:2295 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "冗长输出" #: apply.c:5054 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "允许不正确的文件末尾换行符" #: apply.c:5057 msgid "do not trust the line counts in the hunk headers" msgstr "不信任补丁片段的头信息中的行号" #: apply.c:5059 builtin/am.c:2305 msgid "root" msgstr "根目录" #: apply.c:5060 msgid "prepend to all filenames" msgstr "为所有文件名前添加 <根目录>" #: archive-tar.c:125 archive-zip.c:345 #, c-format msgid "cannot stream blob %s" msgstr "不能打开数据对象 %s" #: archive-tar.c:265 archive-zip.c:358 #, c-format msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "不支持的文件模式:0%o (SHA1: %s)" #: archive-tar.c:450 #, c-format msgid "unable to start '%s' filter" msgstr "无法启动 '%s' 过滤器" #: archive-tar.c:453 msgid "unable to redirect descriptor" msgstr "无法重定向描述符" #: archive-tar.c:460 #, c-format msgid "'%s' filter reported error" msgstr "'%s' 过滤器报告了错误" #: archive-zip.c:318 #, c-format msgid "path is not valid UTF-8: %s" msgstr "路径不是有效的 UTF-8:%s" #: archive-zip.c:322 #, c-format msgid "path too long (%d chars, SHA1: %s): %s" msgstr "路径太长(%d 字符,SHA1:%s):%s" #: archive-zip.c:469 builtin/pack-objects.c:244 builtin/pack-objects.c:247 #, c-format msgid "deflate error (%d)" msgstr "压缩错误 (%d)" #: archive-zip.c:603 #, c-format msgid "timestamp too large for this system: %" msgstr "对于本系统时间戳太大:%" #: archive.c:14 msgid "git archive [] [...]" msgstr "git archive [<选项>] <树对象> [<路径>...]" #: archive.c:15 msgid "git archive --list" msgstr "git archive --list" #: archive.c:16 msgid "" "git archive --remote [--exec ] [] [...]" msgstr "" "git archive --remote <仓库> [--exec <命令>] [<选项>] <树对象> [<路径>...]" #: archive.c:17 msgid "git archive --remote [--exec ] --list" msgstr "git archive --remote <仓库> [--exec <命令>] --list" #: archive.c:188 #, c-format msgid "cannot read %s" msgstr "不能读取 %s" #: archive.c:342 sequencer.c:460 sequencer.c:1915 sequencer.c:3095 #: sequencer.c:3536 sequencer.c:3645 builtin/am.c:261 builtin/commit.c:833 #: builtin/merge.c:1143 #, c-format msgid "could not read '%s'" msgstr "不能读取 '%s'" #: archive.c:427 builtin/add.c:205 builtin/add.c:646 builtin/rm.c:328 #, c-format msgid "pathspec '%s' did not match any files" msgstr "路径规格 '%s' 未匹配任何文件" #: archive.c:451 #, c-format msgid "no such ref: %.*s" msgstr "无此引用:%.*s" #: archive.c:457 #, c-format msgid "not a valid object name: %s" msgstr "不是一个有效的对象名:%s" #: archive.c:470 #, c-format msgid "not a tree object: %s" msgstr "不是一个树对象:%s" #: archive.c:482 msgid "current working directory is untracked" msgstr "当前工作目录未被跟踪" #: archive.c:523 #, c-format msgid "File not found: %s" msgstr "文件未找到:%s" #: archive.c:525 #, c-format msgid "Not a regular file: %s" msgstr "不是一个常规文件:%s" #: archive.c:552 msgid "fmt" msgstr "格式" #: archive.c:552 msgid "archive format" msgstr "归档格式" #: archive.c:553 builtin/log.c:1772 msgid "prefix" msgstr "前缀" #: archive.c:554 msgid "prepend prefix to each pathname in the archive" msgstr "为归档中每个路径名加上前缀" #: archive.c:555 archive.c:558 builtin/blame.c:884 builtin/blame.c:888 #: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135 #: builtin/fast-export.c:1207 builtin/fast-export.c:1209 #: builtin/fast-export.c:1213 builtin/grep.c:922 builtin/hash-object.c:105 #: builtin/ls-files.c:653 builtin/ls-files.c:656 builtin/notes.c:412 #: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:191 msgid "file" msgstr "文件" #: archive.c:556 msgid "add untracked file to archive" msgstr "将未跟踪文件添加到归档" #: archive.c:559 builtin/archive.c:90 msgid "write the archive to this file" msgstr "归档写入此文件" #: archive.c:561 msgid "read .gitattributes in working directory" msgstr "读取工作区中的 .gitattributes" #: archive.c:562 msgid "report archived files on stderr" msgstr "在标准错误上报告归档文件" #: archive.c:564 msgid "set compression level" msgstr "设置压缩级别" #: archive.c:567 msgid "list supported archive formats" msgstr "列出支持的归档格式" #: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121 #: builtin/submodule--helper.c:1831 builtin/submodule--helper.c:2336 msgid "repo" msgstr "仓库" #: archive.c:570 builtin/archive.c:92 msgid "retrieve the archive from remote repository " msgstr "从远程仓库(<仓库>)提取归档文件" #: archive.c:571 builtin/archive.c:93 builtin/difftool.c:718 #: builtin/notes.c:498 msgid "command" msgstr "命令" #: archive.c:572 builtin/archive.c:94 msgid "path to the remote git-upload-archive command" msgstr "远程 git-upload-archive 命令的路径" #: archive.c:579 msgid "Unexpected option --remote" msgstr "未知参数 --remote" #: archive.c:581 msgid "Option --exec can only be used together with --remote" msgstr "选项 --exec 只能和 --remote 同时使用" #: archive.c:583 msgid "Unexpected option --output" msgstr "未知参数 --output" #: archive.c:585 msgid "Options --add-file and --remote cannot be used together" msgstr "选项 --add-file 和 --remote 不能同时使用" #: archive.c:607 #, c-format msgid "Unknown archive format '%s'" msgstr "未知归档格式 '%s'" #: archive.c:616 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "参数不支持此格式 '%s':-%d" #: attr.c:202 #, c-format msgid "%.*s is not a valid attribute name" msgstr "%.*s 不是一个有效的属性名" #: attr.c:363 #, c-format msgid "%s not allowed: %s:%d" msgstr "不允许 %s:%s:%d" #: attr.c:403 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." msgstr "" "负值模版在 git attributes 中被忽略\n" "当字符串确实要以感叹号开始时,使用 '\\!'。" #: bisect.c:489 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "文件 '%s' 包含错误的引用格式:%s" #: bisect.c:699 #, c-format msgid "We cannot bisect more!\n" msgstr "我们无法进行更多的二分查找!\n" #: bisect.c:766 #, c-format msgid "Not a valid commit name %s" msgstr "不是一个有效的提交名 %s" #: bisect.c:791 #, c-format msgid "" "The merge base %s is bad.\n" "This means the bug has been fixed between %s and [%s].\n" msgstr "" "合并基线 %s 是坏的。\n" "这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n" #: bisect.c:796 #, c-format msgid "" "The merge base %s is new.\n" "The property has changed between %s and [%s].\n" msgstr "" "合并基线 %s 是新的。\n" "介于 %s 和 [%s] 之间的属性已经被修改。\n" #: bisect.c:801 #, c-format msgid "" "The merge base %s is %s.\n" "This means the first '%s' commit is between %s and [%s].\n" msgstr "" "合并基线 %s 是 %s。\n" "这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n" #: bisect.c:809 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" "git bisect cannot work properly in this case.\n" "Maybe you mistook %s and %s revs?\n" msgstr "" "一些 %s 版本不是 %s 版本的祖先。\n" "这种情况下 git 二分查找无法正常工作。\n" "您可能弄错了 %s 和 %s 版本?\n" #: bisect.c:822 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" "So we cannot be sure the first %s commit is between %s and %s.\n" "We continue anyway." msgstr "" "介于 %s 和 [%s] 的合并基线一定被忽略了。\n" "所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n" "我们仍旧继续。" #: bisect.c:861 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "二分查找中:合并基线必须是经过测试的\n" #: bisect.c:911 #, c-format msgid "a %s revision is needed" msgstr "需要一个 %s 版本" #: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298 #, c-format msgid "could not create file '%s'" msgstr "不能创建文件 '%s'" #: bisect.c:987 builtin/merge.c:153 #, c-format msgid "could not read file '%s'" msgstr "不能读取文件 '%s'" #: bisect.c:1027 msgid "reading bisect refs failed" msgstr "读取二分查找引用失败" #: bisect.c:1057 #, c-format msgid "%s was both %s and %s\n" msgstr "%s 同时为 %s 和 %s\n" #: bisect.c:1066 #, c-format msgid "" "No testable commit found.\n" "Maybe you started with bad path arguments?\n" msgstr "" "没有发现可测试的提交。\n" "可能您在运行时使用了错误的路径参数?\n" #: bisect.c:1095 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" msgstr[0] "(大概 %d 步)" msgstr[1] "(大概 %d 步)" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. #: bisect.c:1101 #, c-format msgid "Bisecting: %d revision left to test after this %s\n" msgid_plural "Bisecting: %d revisions left to test after this %s\n" msgstr[0] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n" msgstr[1] "二分查找中:在此之后,还剩 %d 个版本待测试 %s\n" #: blame.c:2776 msgid "--contents and --reverse do not blend well." msgstr "--contents 和 --reverse 不能混用。" #: blame.c:2790 msgid "cannot use --contents with final commit object name" msgstr "不能将 --contents 和最终的提交对象名共用" #: blame.c:2811 msgid "--reverse and --first-parent together require specified latest commit" msgstr "--reverse 和 --first-parent 共用,需要指定最新的提交" #: blame.c:2820 bundle.c:213 ref-filter.c:2207 remote.c:2041 sequencer.c:2333 #: sequencer.c:4866 submodule.c:857 builtin/commit.c:1106 builtin/log.c:411 #: builtin/log.c:1018 builtin/log.c:1626 builtin/log.c:2054 builtin/log.c:2344 #: builtin/merge.c:428 builtin/pack-objects.c:3183 builtin/pack-objects.c:3646 #: builtin/pack-objects.c:3661 builtin/shortlog.c:255 msgid "revision walk setup failed" msgstr "版本遍历设置失败" #: blame.c:2838 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "--reverse 和 --first-parent 共用,需要第一祖先链上的提交范围" #: blame.c:2849 #, c-format msgid "no such path %s in %s" msgstr "在 %2$s 中无此路径 %1$s" #: blame.c:2860 #, c-format msgid "cannot read blob %s for path %s" msgstr "不能为路径 %2$s 读取数据对象 %1$s" #: branch.c:53 #, c-format msgid "" "\n" "After fixing the error cause you may try to fix up\n" "the remote tracking information by invoking\n" "\"git branch --set-upstream-to=%s%s%s\"." msgstr "" "\n" "在修复错误后,您可以尝试修改远程跟踪分支,通过执行命令\n" "\"git branch --set-upstream-to=%s%s%s\" 。" #: branch.c:67 #, c-format msgid "Not setting branch %s as its own upstream." msgstr "未设置分支 %s 作为它自己的上游。" #: branch.c:93 #, 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:94 #, c-format msgid "Branch '%s' set up to track remote branch '%s' from '%s'." msgstr "分支 '%1$s' 设置为跟踪来自 '%3$s' 的远程分支 '%2$s'。" #: branch.c:98 #, c-format msgid "Branch '%s' set up to track local branch '%s' by rebasing." msgstr "分支 '%s' 设置为使用变基来跟踪本地分支 '%s'。" #: branch.c:99 #, c-format msgid "Branch '%s' set up to track local branch '%s'." msgstr "分支 '%s' 设置为跟踪本地分支 '%s'。" #: branch.c:104 #, c-format msgid "Branch '%s' set up to track remote ref '%s' by rebasing." msgstr "分支 '%s' 设置为使用变基来跟踪远程引用 '%s'。" #: branch.c:105 #, c-format msgid "Branch '%s' set up to track remote ref '%s'." msgstr "分支 '%s' 设置为跟踪远程引用 '%s'。" #: branch.c:109 #, c-format msgid "Branch '%s' set up to track local ref '%s' by rebasing." msgstr "分支 '%s' 设置为使用变基来跟踪本地引用 '%s'。" #: branch.c:110 #, c-format msgid "Branch '%s' set up to track local ref '%s'." msgstr "分支 '%s' 设置为跟踪本地引用 '%s'。" #: branch.c:119 msgid "Unable to write upstream branch configuration" msgstr "无法写入上游分支配置" #: branch.c:156 #, c-format msgid "Not tracking: ambiguous information for ref %s" msgstr "未跟踪:引用 %s 有歧义" #: branch.c:189 #, c-format msgid "'%s' is not a valid branch name." msgstr "'%s' 不是一个有效的分支名称。" #: branch.c:208 #, c-format msgid "A branch named '%s' already exists." msgstr "一个分支名 '%s' 已经存在。" #: branch.c:213 msgid "Cannot force update the current branch." msgstr "无法强制更新当前分支。" #: branch.c:233 #, c-format msgid "Cannot setup tracking information; starting point '%s' is not a branch." msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。" #: branch.c:235 #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "请求的上游分支 '%s' 不存在" #: branch.c:237 msgid "" "\n" "If you are planning on basing your work on an upstream\n" "branch that already exists at the remote, you may need to\n" "run \"git fetch\" to retrieve it.\n" "\n" "If you are planning to push out a new local branch that\n" "will track its remote counterpart, you may want to use\n" "\"git push -u\" to set the upstream config as you push." msgstr "" "\n" "如果您正计划基于远程一个现存的上游分支开始你的工作,\n" "您可能需要执行 \"git fetch\" 来获取分支。\n" "\n" "如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支,\n" "您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。" #: branch.c:281 #, c-format msgid "Not a valid object name: '%s'." msgstr "不是一个有效的对象名:'%s'。" #: branch.c:301 #, c-format msgid "Ambiguous object name: '%s'." msgstr "歧义的对象名:'%s'。" #: branch.c:306 #, c-format msgid "Not a valid branch point: '%s'." msgstr "无效的分支点:'%s'。" #: branch.c:366 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "'%s' 已经检出到 '%s'" #: branch.c:389 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "工作区 %s 的 HEAD 指向没有被更新" #: bundle.