# 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 | 工作区 # Fangyi Zhou , 2021. # msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List \n" "POT-Creation-Date: 2021-10-30 09:36+0800\n" "PO-Revision-Date: 2021-11-02 18:03+0000\n" "Last-Translator: Fangyi Zhou \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" "X-Generator: Gtranslator 41.0\n" #: add-interactive.c:380 #, c-format msgid "Huh (%s)?" msgstr "嗯（%s）？" #: add-interactive.c:533 add-interactive.c:834 reset.c:65 sequencer.c:3510 #: sequencer.c:3977 sequencer.c:4139 builtin/rebase.c:1233 #: builtin/rebase.c:1642 msgid "could not read index" msgstr "不能读取索引" #: add-interactive.c:588 git-add--interactive.perl:269 #: git-add--interactive.perl:294 msgid "binary" msgstr "二进制" #: add-interactive.c:646 git-add--interactive.perl:278 #: git-add--interactive.perl:332 msgid "nothing" msgstr "无" #: add-interactive.c:647 git-add--interactive.perl:314 #: git-add--interactive.perl:329 msgid "unchanged" msgstr "没有修改" #: add-interactive.c:684 git-add--interactive.perl:641 msgid "Update" msgstr "更新" #: add-interactive.c:701 add-interactive.c:889 #, c-format msgid "could not stage '%s'" msgstr "不能暂存 '%s'" #: add-interactive.c:707 add-interactive.c:896 reset.c:89 sequencer.c:3716 msgid "could not write index" msgstr "不能写入索引" #: add-interactive.c:710 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:728 git-add--interactive.perl:676 #, c-format, perl-format msgid "note: %s is untracked now.\n" msgstr "说明：%s 现已成为未跟踪的。\n" #: add-interactive.c:733 apply.c:4149 builtin/checkout.c:298 #: builtin/reset.c:151 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "对路径 '%s' 的 make_cache_entry 操作失败" #: add-interactive.c:763 git-add--interactive.perl:653 msgid "Revert" msgstr "还原" #: add-interactive.c:779 msgid "Could not parse HEAD^{tree}" msgstr "不能解析 HEAD^{tree}" #: add-interactive.c:817 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:868 git-add--interactive.perl:693 #, c-format msgid "No untracked files.\n" msgstr "没有未跟踪的文件。\n" #: add-interactive.c:872 git-add--interactive.perl:687 msgid "Add untracked" msgstr "添加未跟踪的" #: add-interactive.c:899 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:929 #, c-format msgid "ignoring unmerged: %s" msgstr "忽略未合入的：%s" #: add-interactive.c:941 add-patch.c:1752 git-add--interactive.perl:1369 #, c-format msgid "Only binary files changed.\n" msgstr "只有二进制文件被修改。\n" #: add-interactive.c:943 add-patch.c:1750 git-add--interactive.perl:1371 #, c-format msgid "No changes.\n" msgstr "没有修改。\n" #: add-interactive.c:947 git-add--interactive.perl:1379 msgid "Patch update" msgstr "补丁更新" #: add-interactive.c:986 git-add--interactive.perl:1792 msgid "Review diff" msgstr "检视 diff" #: add-interactive.c:1014 msgid "show paths with changes" msgstr "显示含变更的路径" #: add-interactive.c:1016 msgid "add working tree state to the staged set of changes" msgstr "将工作区状态添加到暂存区修改集中" #: add-interactive.c:1018 msgid "revert staged set of changes back to the HEAD version" msgstr "将暂存的修改集恢复为 HEAD 版本" #: add-interactive.c:1020 msgid "pick hunks and update selectively" msgstr "挑选数据块并有选择地更新" #: add-interactive.c:1022 msgid "view diff between HEAD and index" msgstr "显示 HEAD 和索引的差异" #: add-interactive.c:1024 msgid "add contents of untracked files to the staged set of changes" msgstr "将未跟踪文件的内容添加到暂存区修改集中" #: add-interactive.c:1032 add-interactive.c:1081 msgid "Prompt help:" msgstr "帮助：" #: add-interactive.c:1034 msgid "select a single item" msgstr "选择一个条目" #: add-interactive.c:1036 msgid "select a range of items" msgstr "选择一系列条目" #: add-interactive.c:1038 msgid "select multiple ranges" msgstr "选择多个范围" #: add-interactive.c:1040 add-interactive.c:1085 msgid "select item based on unique prefix" msgstr "基于唯一前缀选择条目" #: add-interactive.c:1042 msgid "unselect specified items" msgstr "反选指定的条目" #: add-interactive.c:1044 msgid "choose all items" msgstr "选择所有条目" #: add-interactive.c:1046 msgid "(empty) finish selecting" msgstr "（空）结束选择" #: add-interactive.c:1083 msgid "select a numbered item" msgstr "选择一个编号条目" #: add-interactive.c:1087 msgid "(empty) select nothing" msgstr "（空）不选择任何内容" #: add-interactive.c:1095 builtin/clean.c:813 git-add--interactive.perl:1896 msgid "*** Commands ***" msgstr "*** 命令 ***" #: add-interactive.c:1096 builtin/clean.c:814 git-add--interactive.perl:1893 msgid "What now" msgstr "请选择" #: add-interactive.c:1148 git-add--interactive.perl:213 msgid "staged" msgstr "缓存" #: add-interactive.c:1148 git-add--interactive.perl:213 msgid "unstaged" msgstr "未缓存" #: add-interactive.c:1148 apply.c:5016 apply.c:5019 builtin/am.c:2311 #: builtin/am.c:2314 builtin/bugreport.c:107 builtin/clone.c:128 #: builtin/fetch.c:152 builtin/merge.c:286 builtin/pull.c:190 #: builtin/submodule--helper.c:404 builtin/submodule--helper.c:1857 #: builtin/submodule--helper.c:1860 builtin/submodule--helper.c:2503 #: builtin/submodule--helper.c:2506 builtin/submodule--helper.c:2573 #: builtin/submodule--helper.c:2578 builtin/submodule--helper.c:2811 #: git-add--interactive.perl:213 msgid "path" msgstr "路径" #: add-interactive.c:1155 msgid "could not refresh index" msgstr "不能刷新索引" #: add-interactive.c:1169 builtin/clean.c:778 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:343 #, c-format msgid "could not parse hunk header '%.*s'" msgstr "无法解析数据块头信息 '%.*s'" #: add-patch.c:362 add-patch.c:366 #, c-format msgid "could not parse colored hunk header '%.*s'" msgstr "无法解析彩色数据块头信息 '%.*s'" #: add-patch.c:420 msgid "could not parse diff" msgstr "不能解析差异信息" #: add-patch.c:439 msgid "could not parse colored diff" msgstr "不能解析彩色差异信息" #: add-patch.c:453 #, c-format msgid "failed to run '%s'" msgstr "运行 '%s' 失败" #: add-patch.c:612 msgid "mismatched output from interactive.diffFilter" msgstr "interactive.diffFilter 的输出不匹配" #: add-patch.c:613 msgid "" "Your filter must maintain a one-to-one correspondence\n" "between its input and output lines." msgstr "您的过滤器必须在其输入和输出的行之间保持一一对应的关系。" #: add-patch.c:791 #, c-format msgid "" "expected context line #%d in\n" "%.*s" msgstr "" "预期上下文行 #%d 于\n" "%.*s" #: add-patch.c:806 #, 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:1082 git-add--interactive.perl:1115 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" msgstr "手动块编辑模式 -- 查看底部的快速指南。\n" #: add-patch.c:1086 #, 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:1100 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:1133 msgid "could not parse hunk header" msgstr "无法解析数据块头信息" #: add-patch.c:1178 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:1247 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:1290 msgid "The selected hunks do not apply to the index!" msgstr "选中的块不能应用到索引！" #: add-patch.c:1291 git-add--interactive.perl:1346 msgid "Apply them to the worktree anyway? " msgstr "无论如何都要应用到工作区么？" #: add-patch.c:1298 git-add--interactive.perl:1349 msgid "Nothing was applied.\n" msgstr "未应用。\n" #: add-patch.c:1355 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:1517 add-patch.c:1527 msgid "No previous hunk" msgstr "没有前一个块" #: add-patch.c:1522 add-patch.c:1532 msgid "No next hunk" msgstr "没有下一个块" #: add-patch.c:1538 msgid "No other hunks to goto" msgstr "没有其它可供跳转的块" #: add-patch.c:1549 git-add--interactive.perl:1606 msgid "go to which hunk ( to see more)? " msgstr "跳转到哪个块（<回车> 查看更多）？ " #: add-patch.c:1550 git-add--interactive.perl:1608 msgid "go to which hunk? " msgstr "跳转到哪个块？" #: add-patch.c:1561 #, c-format msgid "Invalid number: '%s'" msgstr "无效数字：'%s'" #: add-patch.c:1566 #, c-format msgid "Sorry, only %d hunk available." msgid_plural "Sorry, only %d hunks available." msgstr[0] "对不起，只有 %d 个可用块。" msgstr[1] "对不起，只有 %d 个可用块。" #: add-patch.c:1575 msgid "No other hunks to search" msgstr "没有其它可供查找的块" #: add-patch.c:1581 git-add--interactive.perl:1661 msgid "search for regex? " msgstr "使用正则表达式搜索？" #: add-patch.c:1596 #, c-format msgid "Malformed search regexp %s: %s" msgstr "错误的正则表达式 %s：%s" #: add-patch.c:1613 msgid "No hunk matches the given pattern" msgstr "没有和给定模式相匹配的块" #: add-patch.c:1620 msgid "Sorry, cannot split this hunk" msgstr "对不起，不能拆分这个块" #: add-patch.c:1624 #, c-format msgid "Split into %d hunks." msgstr "拆分为 %d 块。" #: add-patch.c:1628 msgid "Sorry, cannot edit this hunk" msgstr "对不起，不能编辑这个块" #: add-patch.c:1680 msgid "'git apply' failed" msgstr "'git apply' 失败" #: advice.c:78 #, c-format msgid "" "\n" "Disable this message with \"git config advice.%s false\"" msgstr "" "\n" "使用 \"git config advice.%s false\" 来关闭此消息" #: advice.c:94 #, c-format msgid "%shint: %.*s%s\n" msgstr "%s提示：%.*s%s\n" #: advice.c:178 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "无法拣选，因为您有未合并的文件。" #: advice.c:180 msgid "Committing is not possible because you have unmerged files." msgstr "无法提交，因为您有未合并的文件。" #: advice.c:182 msgid "Merging is not possible because you have unmerged files." msgstr "无法合并，因为您有未合并的文件。" #: advice.c:184 msgid "Pulling is not possible because you have unmerged files." msgstr "无法拉取，因为您有未合并的文件。" #: advice.c:186 msgid "Reverting is not possible because you have unmerged files." msgstr "无法回退，因为您有未合并的文件。" #: advice.c:188 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "无法 %s，因为您有未合并的文件。" #: advice.c:196 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:204 msgid "Exiting because of an unresolved conflict." msgstr "因为存在未解决的冲突而退出。" #: advice.c:209 builtin/merge.c:1379 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。" #: advice.c:211 msgid "Please, commit your changes before merging." msgstr "请在合并前先提交您的修改。" #: advice.c:212 msgid "Exiting because of unfinished merge." msgstr "因为存在未完成的合并而退出。" #: advice.c:217 msgid "Not possible to fast-forward, aborting." msgstr "无法快进，终止。" #: advice.c:227 #, c-format msgid "" "The following paths and/or pathspecs matched paths that exist\n" "outside of your sparse-checkout definition, so will not be\n" "updated in the index:\n" msgstr "" "下面的路径和/或者路径规格匹配了您定义的稀疏检出以外的路径，\n" "所以不会在索引中更新：\n" #: advice.c:234 msgid "" "If you intend to update such entries, try one of the following:\n" "* Use the --sparse option.\n" "* Disable or modify the sparsity rules." msgstr "" "如果您意图更新这些条目，请尝试下列其中之一：\n" "* 使用 --sparse 选项。\n" "* 禁用或者修改稀疏规则。" #: advice.c:242 #, 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:1978 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "二进制补丁在第 %d 行损坏：%.*s" #: apply.c:2015 #, c-format msgid "unrecognized binary patch at line %d" msgstr "未能识别的二进制补丁位于第 %d 行" #: apply.c:2177 #, c-format msgid "patch with only garbage at line %d" msgstr "补丁文件的第 %d 行只有垃圾数据" #: apply.c:2263 #, c-format msgid "unable to read symlink %s" msgstr "无法读取符号链接 %s" #: apply.c:2267 #, c-format msgid "unable to open or read %s" msgstr "不能打开或读取 %s" #: apply.c:2936 #, c-format msgid "invalid start of line: '%c'" msgstr "无效的行首字符：'%c'" #: apply.c:3057 #, 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:3069 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "上下文减少到（%ld/%ld）以在第 %d 行应用补丁片段" #: apply.c:3075 #, c-format msgid "" "while searching for:\n" "%.*s" msgstr "" "当查询：\n" "%.*s" #: apply.c:3097 #, c-format msgid "missing binary patch data for '%s'" msgstr "缺失 '%s' 的二进制补丁数据" #: apply.c:3105 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "不能反向应用一个缺少到 '%s' 的反向数据块的二进制补丁" #: apply.c:3152 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁" #: apply.c:3163 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." msgstr "补丁应用到 '%s'（%s），但是和当前内容不匹配。" #: apply.c:3171 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "补丁应用到空文件 '%s'，但其并非空文件" #: apply.c:3189 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "无法读取 '%2$s' 必需的目标文件 %1$s" #: apply.c:3202 #, c-format msgid "binary patch does not apply to '%s'" msgstr "二进制补丁未应用到 '%s'" #: apply.c:3209 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "到 '%s' 的二进制补丁产生了不正确的结果（应为 %s，却为 %s）" #: apply.c:3230 #, c-format msgid "patch failed: %s:%ld" msgstr "打补丁失败：%s:%ld" #: apply.c:3353 #, c-format msgid "cannot checkout %s" msgstr "不能检出 %s" #: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:102 pack-revindex.c:214 #: setup.c:308 #, c-format msgid "failed to read %s" msgstr "无法读取 %s" #: apply.c:3413 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "读取位于符号链接中的 '%s'" #: apply.c:3442 apply.c:3709 #, c-format msgid "path %s has been renamed/deleted" msgstr "路径 %s 已经被重命名/删除" #: apply.c:3549 apply.c:3724 #, c-format msgid "%s: does not exist in index" msgstr "%s：不存在于索引中" #: apply.c:3558 apply.c:3732 apply.c:3976 #, c-format msgid "%s: does not match index" msgstr "%s：和索引不匹配" #: apply.c:3593 msgid "repository lacks the necessary blob to perform 3-way merge." msgstr "仓库缺乏执行三方合并所必需的数据对象。" #: apply.c:3596 #, c-format msgid "Performing three-way merge...\n" msgstr "执行三方合并...\n" #: apply.c:3612 apply.c:3616 #, c-format msgid "cannot read the current contents of '%s'" msgstr "无法读取 '%s' 的当前内容" #: apply.c:3628 #, c-format msgid "Failed to perform three-way merge...\n" msgstr "无法执行三方合并...\n" #: apply.c:3642 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "应用补丁到 '%s' 存在冲突。\n" #: apply.c:3647 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "成功应用补丁到 '%s'。\n" #: apply.c:3664 #, c-format msgid "Falling back to direct application...\n" msgstr "回落到直接应用...\n" #: apply.c:3676 msgid "removal patch leaves file contents" msgstr "移除补丁仍留下了文件内容" #: apply.c:3749 #, c-format msgid "%s: wrong type" msgstr "%s：错误类型" #: apply.c:3751 #, c-format msgid "%s has type %o, expected %o" msgstr "%s 的类型是 %o，应为 %o" #: apply.c:3916 apply.c:3918 read-cache.c:876 read-cache.c:905 #: read-cache.c:1368 #, c-format msgid "invalid path '%s'" msgstr "无效路径 '%s'" #: apply.c:3974 #, c-format msgid "%s: already exists in index" msgstr "%s：已经存在于索引中" #: apply.c:3978 #, c-format msgid "%s: already exists in working directory" msgstr "%s：已经存在于工作区中" #: apply.c:3998 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "%2$s 的新模式（%1$o）和旧模式（%3$o）不匹配" #: apply.c:4003 #, 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:4023 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "受影响的文件 '%s' 位于符号链接中" #: apply.c:4027 #, c-format msgid "%s: patch does not apply" msgstr "%s：补丁未应用" #: apply.c:4042 #, c-format msgid "Checking patch %s..." msgstr "正在检查补丁 %s..." #: apply.c:4134 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "子模组 %s 的 sha1 信息缺失或无效" #: apply.c:4141 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "%s 的模式变更，但它不在当前 HEAD 中" #: apply.c:4144 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "sha1 信息缺失或无效（%s）。" #: apply.c:4153 #, c-format msgid "could not add %s to temporary index" msgstr "不能在临时索引中添加 %s" #: apply.c:4163 #, c-format msgid "could not write temporary index to %s" msgstr "不能把临时索引写入到 %s" #: apply.c:4301 #, c-format msgid "unable to remove %s from index" msgstr "不能从索引中移除 %s" #: apply.c:4335 #, c-format msgid "corrupt patch for submodule %s" msgstr "子模组 %s 损坏的补丁" #: apply.c:4341 #, c-format msgid "unable to stat newly created file '%s'" msgstr "不能对新建文件 '%s' 调用 stat" #: apply.c:4349 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "不能为新建文件 %s 创建后端存储" #: apply.c:4355 apply.c:4500 #, c-format msgid "unable to add cache entry for %s" msgstr "无法为 %s 添加缓存条目" #: apply.c:4398 builtin/bisect--helper.c:540 builtin/gc.c:2242 #: builtin/gc.c:2277 #, c-format msgid "failed to write to '%s'" msgstr "写入 '%s' 失败" #: apply.c:4402 #, c-format msgid "closing file '%s'" msgstr "关闭文件 '%s'" #: apply.c:4472 #, c-format msgid "unable to write file '%s' mode %o" msgstr "不能写文件 '%s' 权限 %o" #: apply.c:4570 #, c-format msgid "Applied patch %s cleanly." msgstr "成功应用补丁 %s。" #: apply.c:4578 msgid "internal error" msgstr "内部错误" #: apply.c:4581 #, 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:4592 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "截短 .rej 文件名为 %.*s.rej" #: apply.c:4600 builtin/fetch.c:998 builtin/fetch.c:1408 #, c-format msgid "cannot open %s" msgstr "不能打开 %s" #: apply.c:4614 #, c-format msgid "Hunk #%d applied cleanly." msgstr "第 #%d 个片段成功应用。" #: apply.c:4618 #, c-format msgid "Rejected hunk #%d." msgstr "拒绝第 #%d 个片段。" #: apply.c:4747 #, c-format msgid "Skipped patch '%s'." msgstr "略过补丁 '%s'。" #: apply.c:4755 msgid "unrecognized input" msgstr "未能识别的输入" #: apply.c:4775 msgid "unable to read index file" msgstr "无法读取索引文件" #: apply.c:4932 #, c-format msgid "can't open patch '%s': %s" msgstr "不能打开补丁 '%s'：%s" #: apply.c:4959 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "抑制下仍有 %d 个空白字符误用" msgstr[1] "抑制下仍有 %d 个空白字符误用" #: apply.c:4965 apply.c:4980 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d 行新增了空白字符误用。" msgstr[1] "%d 行新增了空白字符误用。" #: apply.c:4973 #, 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:4989 builtin/add.c:707 builtin/mv.c:338 builtin/rm.c:429 msgid "Unable to write new index file" msgstr "无法写入新索引文件" #: apply.c:5017 msgid "don't apply changes matching the given path" msgstr "不要应用与给出路径向匹配的变更" #: apply.c:5020 msgid "apply changes matching the given path" msgstr "应用与给出路径向匹配的变更" #: apply.c:5022 builtin/am.c:2320 msgid "num" msgstr "数字" #: apply.c:5023 msgid "remove leading slashes from traditional diff paths" msgstr "从传统的 diff 路径中移除指定数量的前导斜线" #: apply.c:5026 msgid "ignore additions made by the patch" msgstr "忽略补丁中的添加的文件" #: apply.c:5028 msgid "instead of applying the patch, output diffstat for the input" msgstr "不应用补丁，而是显示输入的差异统计（diffstat）" #: apply.c:5032 msgid "show number of added and deleted lines in decimal notation" msgstr "以十进制数显示添加和删除的行数" #: apply.c:5034 msgid "instead of applying the patch, output a summary for the input" msgstr "不应用补丁，而是显示输入的概要" #: apply.c:5036 msgid "instead of applying the patch, see if the patch is applicable" msgstr "不应用补丁，而是查看补丁是否可应用" #: apply.c:5038 msgid "make sure the patch is applicable to the current index" msgstr "确认补丁可以应用到当前索引" #: apply.c:5040 msgid "mark new files with `git add --intent-to-add`" msgstr "使用命令 `git add --intent-to-add` 标记新增文件" #: apply.c:5042 msgid "apply a patch without touching the working tree" msgstr "应用补丁而不修改工作区" #: apply.c:5044 msgid "accept a patch that touches outside the working area" msgstr "接受修改工作区之外文件的补丁" #: apply.c:5047 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "还应用此补丁（与 --stat/--summary/--check 选项同时使用）" #: apply.c:5049 msgid "attempt three-way merge, fall back on normal patch if that fails" msgstr "尝试三路合并，如果失败则回落至正常补丁模式" #: apply.c:5051 msgid "build a temporary index based on embedded index information" msgstr "创建一个临时索引基于嵌入的索引信息" #: apply.c:5054 builtin/checkout-index.c:196 msgid "paths are separated with NUL character" msgstr "路径以 NUL 字符分隔" #: apply.c:5056 msgid "ensure at least lines of context match" msgstr "确保至少匹配 行上下文" #: apply.c:5057 builtin/am.c:2296 builtin/am.c:2299 #: builtin/interpret-trailers.c:98 builtin/interpret-trailers.c:100 #: builtin/interpret-trailers.c:102 builtin/pack-objects.c:3960 #: builtin/rebase.c:1051 msgid "action" msgstr "动作" #: apply.c:5058 msgid "detect new or modified lines that have whitespace errors" msgstr "检查新增和修改的行中间的空白字符滥用" #: apply.c:5061 apply.c:5064 msgid "ignore changes in whitespace when finding context" msgstr "查找上下文时忽略空白字符的变更" #: apply.c:5067 msgid "apply the patch in reverse" msgstr "反向应用补丁" #: apply.c:5069 msgid "don't expect at least one line of context" msgstr "无需至少一行上下文" #: apply.c:5071 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中" #: apply.c:5073 msgid "allow overlapping hunks" msgstr "允许重叠的补丁片段" #: apply.c:5074 builtin/add.c:372 builtin/check-ignore.c:22 #: builtin/commit.c:1483 builtin/count-objects.c:98 builtin/fsck.c:788 #: builtin/log.c:2297 builtin/mv.c:123 builtin/read-tree.c:120 msgid "be verbose" msgstr "冗长输出" #: apply.c:5076 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "允许不正确的文件末尾换行符" #: apply.c:5079 msgid "do not trust the line counts in the hunk headers" msgstr "不信任补丁片段的头信息中的行号" #: apply.c:5081 builtin/am.c:2308 msgid "root" msgstr "根目录" #: apply.c:5082 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:365 builtin/pack-objects.c:368 #, 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:341 sequencer.c:473 sequencer.c:1930 sequencer.c:3112 #: sequencer.c:3554 sequencer.c:3682 builtin/am.c:263 builtin/commit.c:834 #: builtin/merge.c:1145 #, c-format msgid "could not read '%s'" msgstr "不能读取 '%s'" #: archive.c:426 builtin/add.c:215 builtin/add.c:674 builtin/rm.c:334 #, c-format msgid "pathspec '%s' did not match any files" msgstr "路径规格 '%s' 未匹配任何文件" #: archive.c:450 #, c-format msgid "no such ref: %.*s" msgstr "无此引用：%.*s" #: archive.c:456 #, c-format msgid "not a valid object name: %s" msgstr "不是一个有效的对象名：%s" #: archive.c:469 #, c-format msgid "not a tree object: %s" msgstr "不是一个树对象：%s" #: archive.c:481 msgid "current working directory is untracked" msgstr "当前工作目录未被跟踪" #: archive.c:522 #, c-format msgid "File not found: %s" msgstr "文件未找到：%s" #: archive.c:524 #, c-format msgid "Not a regular file: %s" msgstr "不是一个常规文件：%s" #: archive.c:551 msgid "fmt" msgstr "格式" #: archive.c:551 msgid "archive format" msgstr "归档格式" #: archive.c:552 builtin/log.c:1775 msgid "prefix" msgstr "前缀" #: archive.c:553 msgid "prepend prefix to each pathname in the archive" msgstr "为归档中每个路径名加上前缀" #: archive.c:554 archive.c:557 builtin/blame.c:880 builtin/blame.c:884 #: builtin/blame.c:885 builtin/commit-tree.c:115 builtin/config.c:135 #: builtin/fast-export.c:1208 builtin/fast-export.c:1210 #: builtin/fast-export.c:1214 builtin/grep.c:935 builtin/hash-object.c:103 #: builtin/ls-files.c:651 builtin/ls-files.c:654 builtin/notes.c:410 #: builtin/notes.c:576 builtin/read-tree.c:115 parse-options.h:190 msgid "file" msgstr "文件" #: archive.c:555 msgid "add untracked file to archive" msgstr "将未跟踪文件添加到归档" #: archive.c:558 builtin/archive.c:88 msgid "write the archive to this file" msgstr "归档写入此文件" #: archive.c:560 msgid "read .gitattributes in working directory" msgstr "读取工作区中的 .gitattributes" #: archive.c:561 msgid "report archived files on stderr" msgstr "在标准错误上报告归档文件" #: archive.c:563 msgid "set compression level" msgstr "设置压缩级别" #: archive.c:566 msgid "list supported archive formats" msgstr "列出支持的归档格式" #: archive.c:568 builtin/archive.c:89 builtin/clone.c:118 builtin/clone.c:121 #: builtin/submodule--helper.c:1869 builtin/submodule--helper.c:2512 msgid "repo" msgstr "仓库" #: archive.c:569 builtin/archive.c:90 msgid "retrieve the archive from remote repository " msgstr "从远程仓库（<仓库>）提取归档文件" #: archive.c:570 builtin/archive.c:91 builtin/difftool.c:714 #: builtin/notes.c:496 msgid "command" msgstr "命令" #: archive.c:571 builtin/archive.c:92 msgid "path to the remote git-upload-archive command" msgstr "远程 git-upload-archive 命令的路径" #: archive.c:578 msgid "Unexpected option --remote" msgstr "未知参数 --remote" #: archive.c:580 msgid "Option --exec can only be used together with --remote" msgstr "选项 --exec 只能和 --remote 同时使用" #: archive.c:582 msgid "Unexpected option --output" msgstr "未知参数 --output" #: archive.c:584 msgid "Options --add-file and --remote cannot be used together" msgstr "选项 --add-file 和 --remote 不能同时使用" #: archive.c:606 #, c-format msgid "Unknown archive format '%s'" msgstr "未知归档格式 '%s'" #: archive.c:615 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "参数不支持此格式 '%s'：-%d" #: attr.c:203 #, c-format msgid "%.*s is not a valid attribute name" msgstr "%.*s 不是一个有效的属性名" #: attr.c:364 #, c-format msgid "%s not allowed: %s:%d" msgstr "不允许 %s：%s:%d" #: attr.c:404 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." msgstr "" "负值模版在 git attributes 中被忽略\n" "当字符串确实要以感叹号开始时，使用 '\\!'。" #: bisect.c:488 #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "文件 '%s' 包含错误的引用格式：%s" #: bisect.c:698 #, c-format msgid "We cannot bisect more!\n" msgstr "我们无法进行更多的二分查找！\n" #: bisect.c:764 #, c-format msgid "Not a valid commit name %s" msgstr "不是一个有效的提交名 %s" #: bisect.c:789 #, 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:794 #, 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:799 #, 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:807 #, 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:820 #, 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:859 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "二分查找中：合并基线必须是经过测试的\n" #: bisect.c:909 #, c-format msgid "a %s revision is needed" msgstr "需要一个 %s 版本" #: bisect.c:939 #, c-format msgid "could not create file '%s'" msgstr "不能创建文件 '%s'" #: bisect.c:985 builtin/merge.c:154 #, c-format msgid "could not read file '%s'" msgstr "不能读取文件 '%s'" #: bisect.c:1025 msgid "reading bisect refs failed" msgstr "读取二分查找引用失败" #: bisect.c:1055 #, c-format msgid "%s was both %s and %s\n" msgstr "%s 同时为 %s 和 %s\n" #: bisect.c:1064 #, c-format msgid "" "No testable commit found.\n" "Maybe you started with bad path arguments?\n" msgstr "" "没有发现可测试的提交。\n" "可能您在运行时使用了错误的路径参数？\n" #: bisect.c:1093 #, 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:1099 #, 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:224 midx.c:1039 ref-filter.c:2370 remote.c:2041 #: sequencer.c:2348 sequencer.c:4900 submodule.c:883 builtin/commit.c:1114 #: builtin/log.c:414 builtin/log.c:1021 builtin/log.c:1629 builtin/log.c:2056 #: builtin/log.c:2346 builtin/merge.c:429 builtin/pack-objects.c:3373 #: builtin/pack-objects.c:3775 builtin/pack-objects.c:3790 #: 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.c:44 #, c-format msgid "unrecognized bundle hash algorithm: %s" msgstr "未能识别的归档包哈希算法：%s" #: bundle.c:48 #, c-format msgid "unknown capability '%s'" msgstr "未知能力 '%s'" #: bundle.c:74 #, c-format msgid "'%s' does not look like a v2 or v3 bundle file" msgstr "'%s' 不像是一个 v2 或 v3 版本的归档包文件" #: bundle.c:113 #, c-format msgid "unrecognized header: %s%s (%d)" msgstr "未能识别的包头：%s%s (%d)" #: bundle.c:140 rerere.c:464 rerere.c:674 sequencer.c:2616 sequencer.c:3402 #: builtin/commit.c:862 #, c-format msgid "could not open '%s'" msgstr "不能打开 '%s'" #: bundle.c:198 msgid "Repository lacks these prerequisite commits:" msgstr "仓库中缺少这些必备的提交：" #: bundle.c:201 msgid "need a repository to verify a bundle" msgstr "需要一个仓库来校验一个归档包" #: bundle.c:257 #, c-format msgid "The bundle contains this ref:" msgid_plural "The bundle contains these %d refs:" msgstr[0] "这个归档包中含有这个引用：" msgstr[1] "这个归档包中含有 %d 个引用：" #: bundle.c:264 msgid "The bundle records a complete history." msgstr "这个归档包记录一个完整历史。" #: bundle.c:266 #, c-format msgid "The bundle requires this ref:" msgid_plural "The bundle requires these %d refs:" msgstr[0] "这个归档包需要这个引用：" msgstr[1] "这个归档包需要 %d 个引用：" #: bundle.c:333 msgid "unable to dup bundle descriptor" msgstr "无法复制归档包描述符" #: bundle.c:340 msgid "Could not spawn pack-objects" msgstr "不能生成 pack-objects 进程" #: bundle.c:351 msgid "pack-objects died" msgstr "pack-objects 终止" #: bundle.c:400 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "引用 '%s' 被 rev-list 选项排除" #: bundle.c:504 #, c-format msgid "unsupported bundle version %d" msgstr "不支持的归档包版本 %d" #: bundle.c:506 #, c-format msgid "cannot write bundle version %d with algorithm %s" msgstr "不能写入，归档包版本 %d 不支持算法 %s" #: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:399 #, c-format msgid "unrecognized argument: %s" msgstr "未能识别的参数：%s" #: bundle.c:553 msgid "Refusing to create empty bundle." msgstr "不能创建空的归档包。" #: bundle.c:563 #, c-format msgid "cannot create '%s'" msgstr "不能创建 '%s'" #: bundle.c:588 msgid "index-pack died" msgstr "index-pack 终止" #: chunk-format.c:117 msgid "terminating chunk id appears earlier than expected" msgstr "终止块 ID 比预期更早出现" #: chunk-format.c:126 #, c-format msgid "improper chunk offset(s) % and %" msgstr "不正确的块偏移 % 和 %" #: chunk-format.c:133 #, c-format msgid "duplicate chunk ID % found" msgstr "发现重复的块ID %" #: chunk-format.c:147 #, c-format msgid "final chunk has non-zero id %" msgstr "最终块有非零 ID %" #: color.c:329 #, c-format msgid "invalid color value: %.*s" msgstr "无效的颜色值：%.*s" #: commit-graph.c:204 midx.c:51 msgid "invalid hash version" msgstr "无效的哈希版本" #: commit-graph.c:262 msgid "commit-graph file is too small" msgstr "提交图形文件太小" #: commit-graph.c:355 #, c-format msgid "commit-graph signature %X does not match signature %X" msgstr "提交图形签名 %X 和签名 %X 不匹配" #: commit-graph.c:362 #, c-format msgid "commit-graph version %X does not match version %X" msgstr "提交图形版本 %X 和版本 %X 不匹配" #: commit-graph.c:369 #, c-format msgid "commit-graph hash version %X does not match version %X" msgstr "提交图形哈希版本 %X 和版本 %X 不匹配" #: commit-graph.c:386 #, c-format msgid "commit-graph file is too small to hold %u chunks" msgstr "提交图形文件太小，容不下 %u 个块" #: commit-graph.c:482 msgid "commit-graph has no base graphs chunk" msgstr "提交图形没有基础图形块" #: commit-graph.c:492 msgid "commit-graph chain does not match" msgstr "提交图形链不匹配" #: commit-graph.c:540 #, c-format msgid "invalid commit-graph chain: line '%s' not a hash" msgstr "无效的提交图形链：行 '%s' 不是一个哈希值" #: commit-graph.c:564 msgid "unable to find all commit-graph files" msgstr "无法找到所有提交图形文件" #: commit-graph.c:746 commit-graph.c:783 msgid "invalid commit position. commit-graph is likely corrupt" msgstr "无效的提交位置。提交图形可能已损坏" #: commit-graph.c:767 #, c-format msgid "could not find commit %s" msgstr "无法找到提交 %s" #: commit-graph.c:800 msgid "commit-graph requires overflow generation data but has none" msgstr "提交图需要溢出世代数据，但是没有" #: commit-graph.c:1105 builtin/am.c:1342 #, c-format msgid "unable to parse commit %s" msgstr "不能解析提交 %s" #: commit-graph.c:1367 builtin/pack-objects.c:3070 #, c-format msgid "unable to get type of object %s" msgstr "无法获得对象 %s 类型" #: commit-graph.c:1398 msgid "Loading known commits in commit graph" msgstr "正在加载提交图中的已知提交" #: commit-graph.c:1415 msgid "Expanding reachable commits in commit graph" msgstr "正在扩展提交图中的可达提交" #: commit-graph.c:1435 msgid "Clearing commit marks in commit graph" msgstr "正在清除提交图中的提交标记" #: commit-graph.c:1454 msgid "Computing commit graph topological levels" msgstr "正在计算提交图拓扑级别" #: commit-graph.c:1507 msgid "Computing commit graph generation numbers" msgstr "正在计算提交图世代数字" #: commit-graph.c:1588 msgid "Computing commit changed paths Bloom filters" msgstr "计算提交变更路径的布隆过滤器" #: commit-graph.c:1665 msgid "Collecting referenced commits" msgstr "正在收集引用的提交" #: commit-graph.c:1690 #, c-format msgid "Finding commits for commit graph in %d pack" msgid_plural "Finding commits for commit graph in %d packs" msgstr[0] "正在 %d 个包中查找提交图的提交" msgstr[1] "正在 %d 个包中查找提交图的提交" #: commit-graph.c:1703 #, c-format msgid "error adding pack %s" msgstr "添加包 %s 出错" #: commit-graph.c:1707 #, c-format msgid "error opening index for %s" msgstr "为 %s 打开索引出错" #: commit-graph.c:1744 msgid "Finding commits for commit graph among packed objects" msgstr "正在打包对象中查找提交图的提交" #: commit-graph.c:1762 msgid "Finding extra edges in commit graph" msgstr "正在查找提交图中额外的边" #: commit-graph.c:1811 msgid "failed to write correct number of base graph ids" msgstr "无法写入正确数量的基础图形 ID" #: commit-graph.c:1842 midx.c:1146 #, c-format msgid "unable to create leading directories of %s" msgstr "不能为 %s 创建先导目录" #: commit-graph.c:1855 msgid "unable to create temporary graph layer" msgstr "无法创建临时图层" #: commit-graph.c:1860 #, c-format msgid "unable to adjust shared permissions for '%s'" msgstr "无法为 '%s' 调整共享权限" #: commit-graph.c:1917 #, c-format msgid "Writing out commit graph in %d pass" msgid_plural "Writing out commit graph in %d passes" msgstr[0] "正在用 %d 步写出提交图" msgstr[1] "正在用 %d 步写出提交图" #: commit-graph.c:1953 msgid "unable to open commit-graph chain file" msgstr "无法打开提交图形链文件" #: commit-graph.c:1969 msgid "failed to rename base commit-graph file" msgstr "无法重命名基础提交图形文件" #: commit-graph.c:1989 msgid "failed to rename temporary commit-graph file" msgstr "无法重命名临时提交图形文件" #: commit-graph.c:2122 msgid "Scanning merged commits" msgstr "正在扫描合并提交" #: commit-graph.c:2166 msgid "Merging commit-graph" msgstr "正在合并提交图形" #: commit-graph.c:2274 msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled" msgstr "正尝试写提交图，但是 'core.commitGraph' 被禁用" #: commit-graph.c:2381 msgid "too many commits to write graph" msgstr "提交太多不能画图" #: commit-graph.c:2479 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "提交图文件的校验码错误，可能已经损坏" #: commit-graph.c:2489 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "提交图形的对象 ID 顺序不正确：%s 然后 %s" #: commit-graph.c:2499 commit-graph.c:2514 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "提交图形有不正确的扇出值：fanout[%d] = %u != %u" #: commit-graph.c:2506 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "无法从提交图形中解析提交 %s" #: commit-graph.c:2524 msgid "Verifying commits in commit graph" msgstr "正在校验提交图中的提交" #: commit-graph.c:2539 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "无法从提交图形的对象库中解析提交 %s" #: commit-graph.c:2546 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "提交图形中的提交 %s 的根树对象 ID 是 %s != %s" #: commit-graph.c:2556 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "提交 %s 的提交图形父提交列表太长了" #: commit-graph.c:2565 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "%s 的提交图形父提交是 %s != %s" #: commit-graph.c:2579 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "提交 %s 的提交图形父提交列表过早终止" #: commit-graph.c:2584 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" msgstr "提交图形中提交 %s 的世代号是零，但其它地方非零" #: commit-graph.c:2588 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" msgstr "提交图形中提交 %s 的世代号非零，但其它地方是零" #: commit-graph.c:2605 #, c-format msgid "commit-graph generation for commit %s is % < %" msgstr "提交图形中的提交 %s 的世代号是 % < %" #: commit-graph.c:2611 #, c-format msgid "commit date for commit %s in commit-graph is % != %" msgstr "提交图形中提交 %s 的提交日期是 % != %" #: commit.c:53 sequencer.c:3105 builtin/am.c:373 builtin/am.c:418 #: builtin/am.c:423 builtin/am.c:1421 builtin/am.c:2068 builtin/replace.c:457 #, c-format msgid "could not parse %s" msgstr "不能解析 %s" #: commit.c:55 #, c-format msgid "%s %s is not a commit!" msgstr "%s %s 不是一个提交！" #: commit.c:196 msgid "" "Support for /info/grafts is deprecated\n" "and will be removed in a future Git version.\n" "\n" "Please use \"git replace --convert-graft-file\"\n" "to convert the grafts into replace refs.\n" "\n" "Turn this message off by running\n" "\"git config advice.graftFileDeprecated false\"" msgstr "" "对 /info/grafts 的支持已过时，并将在\n" "未来的Git版本中被移除。\n" "\n" "请使用 \"git replace --convert-graft-file\" 将\n" "grafts 转换为替换引用。\n" "\n" "设置 \"git config advice.graftFileDeprecated false\"\n" "可关闭本消息" #: commit.c:1239 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。" #: commit.c:1243 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。" #: commit.c:1246 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "提交 %s 没有 GPG 签名。" #: commit.c:1249 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n" #: commit.c:1503 msgid "" "Warning: commit message did not conform to UTF-8.\n" "You may want to amend it after fixing the message, or set the config\n" "variable i18n.commitencoding to the encoding your project uses.\n" msgstr "" "警告：提交说明不符合 UTF-8 字符编码。\n" "您可以通过修补提交来改正提交说明，或者将配置变量 i18n.commitencoding\n" "设置为您项目所用的字符编码。\n" #: compat/obstack.c:406 compat/obstack.c:408 msgid "memory exhausted" msgstr "内存耗尽" #: config.c:125 #, c-format msgid "" "exceeded maximum include depth (%d) while including\n" "\t%s\n" "from\n" "\t%s\n" "This might be due to circular includes." msgstr "" "超过了最大包含深度（%1$d），当从\n" "\t%3$s\n" "包含\n" "\t%2$s\n" "这可能是因为循环包含。" #: config.c:141 #, c-format msgid "could not expand include path '%s'" msgstr "无法扩展包含路径 '%s'" #: config.c:152 msgid "relative config includes must come from files" msgstr "相对路径的配置文件引用必须来自于文件" #: config.c:201 msgid "relative config include conditionals must come from files" msgstr "相对路径的配置文件条件引用必须来自于文件" #: config.c:398 #, c-format msgid "invalid config format: %s" msgstr "无效的配置格式：%s" #: config.c:402 #, c-format msgid "missing environment variable name for configuration '%.*s'" msgstr "配置 '%.*s' 缺少环境变量名称" #: config.c:407 #, c-format msgid "missing environment variable '%s' for configuration '%.*s'" msgstr "缺少环境变量 '%s' 于配置 '%.*s' " #: config.c:443 #, c-format msgid "key does not contain a section: %s" msgstr "键名没有包含一个小节名称：%s" #: config.c:448 #, c-format msgid "key does not contain variable name: %s" msgstr "键名没有包含变量名：%s" #: config.c:470 sequencer.c:2802 #, c-format msgid "invalid key: %s" msgstr "无效键名：%s" #: config.c:475 #, c-format msgid "invalid key (newline): %s" msgstr "无效键名（有换行符）：%s" #: config.c:495 msgid "empty config key" msgstr "空的配置键名" #: config.c:513 config.c:525 #, c-format msgid "bogus config parameter: %s" msgstr "伪配置参数：%s" #: config.c:539 config.c:556 config.c:563 config.c:572 #, c-format msgid "bogus format in %s" msgstr "%s 中格式错误" #: config.c:606 #, c-format msgid "bogus count in %s" msgstr "%s 中错误计数" #: config.c:610 #, c-format msgid "too many entries in %s" msgstr "%s 中太多的条目" #: config.c:620 #, c-format msgid "missing config key %s" msgstr "缺失配置键名 %s" #: config.c:628 #, c-format msgid "missing config value %s" msgstr "缺失配置取值 %s" #: config.c:979 #, c-format msgid "bad config line %d in blob %s" msgstr "数据对象 %2$s 中错误的配置行 %1$d" #: config.c:983 #, c-format msgid "bad config line %d in file %s" msgstr "文件 %2$s 中错误的配置行 %1$d" #: config.c:987 #, c-format msgid "bad config line %d in standard input" msgstr "标准输入中错误的配置行 %d" #: config.c:991 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d" #: config.c:995 #, c-format msgid "bad config line %d in command line %s" msgstr "命令行 %2$s 中错误的配置行 %1$d" #: config.c:999 #, c-format msgid "bad config line %d in %s" msgstr "在 %2$s 中错误的配置行 %1$d" #: config.c:1136 msgid "out of range" msgstr "超出范围" #: config.c:1136 msgid "invalid unit" msgstr "无效的单位" #: config.c:1137 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误：%3$s" #: config.c:1147 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s" #: config.c:1150 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s" #: config.c:1153 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s'：%3$s" #: config.c:1156 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s" #: config.c:1159 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s" #: config.c:1162 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s" #: config.c:1241 #, c-format msgid "bad boolean config value '%s' for '%s'" msgstr "'%2$s' 的错误的布尔取值 '%1$s'" #: config.c:1259 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "无法扩展用户目录：'%s'" #: config.c:1268 #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳" #: config.c:1361 #, c-format msgid "abbrev length out of range: %d" msgstr "缩写长度超出范围：%d" #: config.c:1375 config.c:1386 #, c-format msgid "bad zlib compression level %d" msgstr "错误的 zlib 压缩级别 %d" #: config.c:1476 msgid "core.commentChar should only be one character" msgstr "core.commentChar 应该是一个字符" #: config.c:1509 #, c-format msgid "invalid mode for object creation: %s" msgstr "无效的对象创建模式：%s" #: config.c:1581 #, c-format msgid "malformed value for %s" msgstr "%s 的取值格式错误" #: config.c:1607 #, c-format msgid "malformed value for %s: %s" msgstr "%s 的取值格式错误：%s" #: config.c:1608 msgid "must be one of nothing, matching, simple, upstream or current" msgstr "必须是其中之一：nothing、matching、simple、upstream 或 current" #: config.c:1669 builtin/pack-objects.c:4053 #, c-format msgid "bad pack compression level %d" msgstr "错误的打包压缩级别 %d" #: config.c:1792 #, c-format msgid "unable to load config blob object '%s'" msgstr "无法从数据对象 '%s' 加载配置" #: config.c:1795 #, c-format msgid "reference '%s' does not point to a blob" msgstr "引用 '%s' 没有指向一个数据对象" #: config.c:1813 #, c-format msgid "unable to resolve config blob '%s'" msgstr "不能解析配置对象 '%s'" #: config.c:1858 #, c-format msgid "failed to parse %s" msgstr "解析 %s 失败" #: config.c:1914 msgid "unable to parse command-line config" msgstr "无法解析命令行中的配置" #: config.c:2282 msgid "unknown error occurred while reading the configuration files" msgstr "在读取配置文件时遇到未知错误" #: config.c:2456 #, c-format msgid "Invalid %s: '%s'" msgstr "无效 %s：'%s'" #: config.c:2501 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间" #: config.c:2547 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "无法解析命令行配置中的 '%s'" #: config.c:2549 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'" #: config.c:2633 #, c-format msgid "invalid section name '%s'" msgstr "无效的小节名称 '%s'" #: config.c:2665 #, c-format msgid "%s has multiple values" msgstr "%s 有多个取值" #: config.c:2694 #, c-format msgid "failed to write new configuration file %s" msgstr "写入新的配置文件 %s 失败" #: config.c:2946 config.c:3273 #, c-format msgid "could not lock config file %s" msgstr "不能锁定配置文件 %s" #: config.c:2957 #, c-format msgid "opening %s" msgstr "打开 %s" #: config.c:2994 builtin/config.c:361 #, c-format msgid "invalid pattern: %s" msgstr "无效模式：%s" #: config.c:3019 #, c-format msgid "invalid config file %s" msgstr "无效的配置文件 %s" #: config.c:3032 config.c:3286 #, c-format msgid "fstat on %s failed" msgstr "对 %s 调用 fstat 失败" #: config.c:3043 #, c-format msgid "unable to mmap '%s'%s" msgstr "不能 mmap '%s'%s" #: config.c:3053 config.c:3291 #, c-format msgid "chmod on %s failed" msgstr "对 %s 调用 chmod 失败" #: config.c:3138 config.c:3388 #, c-format msgid "could not write config file %s" msgstr "不能写入配置文件 %s" #: config.c:3172 #, c-format msgid "could not set '%s' to '%s'" msgstr "不能设置 '%s' 为 '%s'" #: config.c:3174 builtin/remote.c:662 builtin/remote.c:860 builtin/remote.c:868 #, c-format msgid "could not unset '%s'" msgstr "不能取消设置 '%s'" #: config.c:3264 #, c-format msgid "invalid section name: %s" msgstr "无效的小节名称：%s" #: config.c:3431 #, c-format msgid "missing value for '%s'" msgstr "%s 的取值缺失" #: connect.c:61 msgid "the remote end hung up upon initial contact" msgstr "远端在初始连接时即挂断" #: connect.c:63 msgid "" "Could not read from remote repository.\n" "\n" "Please make sure you have the correct access rights\n" "and the repository exists." msgstr "" "无法读取远程仓库。\n" "\n" "请确认您有正确的访问权限并且仓库存在。" #: connect.c:81 #, c-format msgid "server doesn't support '%s'" msgstr "服务器不支持 '%s'" #: connect.c:118 #, c-format msgid "server doesn't support feature '%s'" msgstr "服务器不支持特性 '%s'" #: connect.c:129 msgid "expected flush after capabilities" msgstr "在能力之后应为一个 flush 包" #: connect.c:265 #, c-format msgid "ignoring capabilities after first line '%s'" msgstr "忽略第一行 '%s' 之后的能力字段" #: connect.c:286 msgid "protocol error: unexpected capabilities^{}" msgstr "协议错误：意外的 capabilities^{}" #: connect.c:308 #, c-format msgid "protocol error: expected shallow sha-1, got '%s'" msgstr "协议错误：预期浅克隆 sha-1，却得到 '%s'" #: connect.c:310 msgid "repository on the other end cannot be shallow" msgstr "另一端的仓库不能是浅克隆仓库" #: connect.c:349 msgid "invalid packet" msgstr "无效数据包" #: connect.c:369 #, c-format msgid "protocol error: unexpected '%s'" msgstr "协议错误：意外的 '%s'" #: connect.c:499 #, c-format msgid "unknown object format '%s' specified by server" msgstr "服务器给出未知的对象格式 '%s'" #: connect.c:528 #, c-format msgid "invalid ls-refs response: %s" msgstr "无效的 ls-refs 响应：%s" #: connect.c:532 msgid "expected flush after ref listing" msgstr "在引用列表之后应该有一个 flush 包" #: connect.c:535 msgid "expected response end packet after ref listing" msgstr "在引用列表之后应该有响应结束包" #: connect.c:670 #, c-format msgid "protocol '%s' is not supported" msgstr "不支持 '%s' 协议" #: connect.c:721 msgid "unable to set SO_KEEPALIVE on socket" msgstr "无法为 socket 设置 SO_KEEPALIVE" #: connect.c:761 connect.c:824 #, c-format msgid "Looking up %s ... " msgstr "查找 %s ..." #: connect.c:765 #, c-format msgid "unable to look up %s (port %s) (%s)" msgstr "无法查找 %s（端口 %s）（%s）" #. TRANSLATORS: this is the end of "Looking up %s ... " #: connect.c:769 connect.c:840 #, c-format msgid "" "done.\n" "Connecting to %s (port %s) ... " msgstr "" "完成。\n" "连接到 %s（端口 %s）... " #: connect.c:791 connect.c:868 #, c-format msgid "" "unable to connect to %s:\n" "%s" msgstr "" "无法连接到 %s：\n" "%s" #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... " #: connect.c:797 connect.c:874 msgid "done." msgstr "完成。" #: connect.c:828 #, c-format msgid "unable to look up %s (%s)" msgstr "无法查找 %s（%s）" #: connect.c:834 #, c-format msgid "unknown port %s" msgstr "未知端口 %s" #: connect.c:971 connect.c:1303 #, c-format msgid "strange hostname '%s' blocked" msgstr "已阻止奇怪的主机名 '%s'" #: connect.c:973 #, c-format msgid "strange port '%s' blocked" msgstr "已阻止奇怪的端口号 '%s'" #: connect.c:983 #, c-format msgid "cannot start proxy %s" msgstr "不能启动代理 %s" #: connect.c:1054 msgid "no path specified; see 'git help pull' for valid url syntax" msgstr "未指定路径，执行 'git help pull' 查看有效的 url 语法" #: connect.c:1194 msgid "newline is forbidden in git:// hosts and repo paths" msgstr "在 git:// 主机和仓库路径中禁止使用换行符" #: connect.c:1251 msgid "ssh variant 'simple' does not support -4" msgstr "ssh 变体 'simple' 不支持 -4" #: connect.c:1263 msgid "ssh variant 'simple' does not support -6" msgstr "ssh 变体 'simple' 不支持 -6" #: connect.c:1280 msgid "ssh variant 'simple' does not support setting port" msgstr "ssh 变体 'simple' 不支持设置端口" #: connect.c:1392 #, c-format msgid "strange pathname '%s' blocked" msgstr "已阻止奇怪的路径名 '%s'" #: connect.c:1440 msgid "unable to fork" msgstr "无法 fork" #: connected.c:109 builtin/fsck.c:189 builtin/prune.c:45 msgid "Checking connectivity" msgstr "正在检查连通性" #: connected.c:122 msgid "Could not run 'git rev-list'" msgstr "不能执行 'git rev-list'" #: connected.c:146 msgid "failed write to rev-list" msgstr "写入 rev-list 失败" #: connected.c:151 msgid "failed to close rev-list's stdin" msgstr "关闭 rev-list 的标准输入失败" #: convert.c:183 #, c-format msgid "illegal crlf_action %d" msgstr "非法的 crlf_action %d" #: convert.c:196 #, c-format msgid "CRLF would be replaced by LF in %s" msgstr "%s 中的 CRLF 将被 LF 替换" #: convert.c:198 #, c-format msgid "" "CRLF will be replaced by LF in %s.\n" "The file will have its original line endings in your working directory" msgstr "" "%s 中的 CRLF 将被 LF 替换。<\n" "在工作区中该文件仍保持原有的换行符。" #: convert.c:206 #, c-format msgid "LF would be replaced by CRLF in %s" msgstr "文件 %s 中的 LF 将被 CRLF 替换" #: convert.c:208 #, c-format msgid "" "LF will be replaced by CRLF in %s.\n" "The file will have its original line endings in your working directory" msgstr "" "%s 中的 LF 将被 CRLF 替换。\n" "在工作区中该文件仍保持原有的换行符" #: convert.c:273 #, c-format msgid "BOM is prohibited in '%s' if encoded as %s" msgstr "如果使用 %2$s 编码，禁止在 '%1$s' 中使用 BOM" #: convert.c:280 #, c-format msgid "" "The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as " "working-tree-encoding." msgstr "" "文件 '%s' 包含一个字节顺序标记（BOM）。请使用 UTF-%.*s 作为工作区编码。" #: convert.c:293 #, c-format msgid "BOM is required in '%s' if encoded as %s" msgstr "如果编码为 %2$s，需要在 '%1$s' 中使用 BOM" #: convert.c:295 #, c-format msgid "" "The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-" "%sLE (depending on the byte order) as working-tree-encoding." msgstr "" "文件 '%s' 缺失一个字节顺序标记（BOM）。请使用 UTF-%sBE or UTF-%sLE（取决于字" "节序）作为工作区编码。" #: convert.c:408 convert.c:479 #, c-format msgid "failed to encode '%s' from %s to %s" msgstr "无法对 '%s' 进行从 %s 到 %s 的编码" #: convert.c:451 #, c-format msgid "encoding '%s' from %s to %s and back is not the same" msgstr "将'%s' 的编码从 %s 到 %s 来回转换不一致" #: convert.c:654 #, c-format msgid "cannot fork to run external filter '%s'" msgstr "不能 fork 以执行外部过滤器 '%s'" #: convert.c:674 #, c-format msgid "cannot feed the input to external filter '%s'" msgstr "不能将输入传递给外部过滤器 '%s'" #: convert.c:681 #, c-format msgid "external filter '%s' failed %d" msgstr "外部过滤器 '%s' 失败码 %d" #: convert.c:716 convert.c:719 #, c-format msgid "read from external filter '%s' failed" msgstr "从外部过滤器 '%s' 读取失败" #: convert.c:722 convert.c:777 #, c-format msgid "external filter '%s' failed" msgstr "外部过滤器 '%s' 失败" #: convert.c:826 msgid "unexpected filter type" msgstr "意外的过滤类型" #: convert.c:837 msgid "path name too long for external filter" msgstr "外部过滤器的路径名太长" #: convert.c:935 #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " "been filtered" msgstr "外部过滤器 '%s' 不再可用，但并非所有路径都已过滤" #: convert.c:1236 msgid "true/false are no valid working-tree-encodings" msgstr "true/false 不是有效的工作区编码" #: convert.c:1416 convert.c:1449 #, c-format msgid "%s: clean filter '%s' failed" msgstr "%s：clean 过滤器 '%s' 失败" #: convert.c:1492 #, c-format msgid "%s: smudge filter %s failed" msgstr "%s：smudge 过滤器 %s 失败" #: credential.c:96 #, c-format msgid "skipping credential lookup for key: credential.%s" msgstr "跳过凭据查询：credential.%s" #: credential.c:112 msgid "refusing to work with credential missing host field" msgstr "拒绝使用缺少主机字段的凭据" #: credential.c:114 msgid "refusing to work with credential missing protocol field" msgstr "拒绝使用缺少协议字段的凭据" #: credential.c:395 #, c-format msgid "url contains a newline in its %s component: %s" msgstr "URL 的 %s 组件中包含换行符：%s" #: credential.c:439 #, c-format msgid "url has no scheme: %s" msgstr "URL 没有 scheme：%s" #: credential.c:512 #, c-format msgid "credential url cannot be parsed: %s" msgstr "不能解析凭据 URL：%s" #: date.c:138 msgid "in the future" msgstr "在将来" #: date.c:144 #, c-format msgid "% second ago" msgid_plural "% seconds ago" msgstr[0] "% 秒钟前" msgstr[1] "% 秒钟前" #: date.c:151 #, c-format msgid "% minute ago" msgid_plural "% minutes ago" msgstr[0] "% 分钟前" msgstr[1] "% 分钟前" #: date.c:158 #, c-format msgid "% hour ago" msgid_plural "% hours ago" msgstr[0] "% 小时前" msgstr[1] "% 小时前" #: date.c:165 #, c-format msgid "% day ago" msgid_plural "% days ago" msgstr[0] "% 天前" msgstr[1] "% 天前" #: date.c:171 #, c-format msgid "% week ago" msgid_plural "% weeks ago" msgstr[0] "% 周前" msgstr[1] "% 周前" #: date.c:178 #, c-format msgid "% month ago" msgid_plural "% months ago" msgstr[0] "% 个月前" msgstr[1] "% 个月前" #: date.c:189 #, c-format msgid "% year" msgid_plural "% years" msgstr[0] "% 年" msgstr[1] "% 年" #. TRANSLATORS: "%s" is " years" #: date.c:192 #, c-format msgid "%s, % month ago" msgid_plural "%s, % months ago" msgstr[0] "%s % 个月前" msgstr[1] "%s % 个月前" #: date.c:197 date.c:202 #, c-format msgid "% year ago" msgid_plural "% years ago" msgstr[0] "% 年前" msgstr[1] "% 年前" #: delta-islands.c:272 msgid "Propagating island marks" msgstr "正在传播数据岛标记" #: delta-islands.c:290 #, c-format msgid "bad tree object %s" msgstr "坏的树对象 %s" #: delta-islands.c:334 #, c-format msgid "failed to load island regex for '%s': %s" msgstr "未能加载 '%s' 的数据岛正则表达式：%s" #: delta-islands.c:390 #, c-format msgid "island regex from config has too many capture groups (max=%d)" msgstr "来自 config 的数据岛正则表达式有太多的捕获组（最多 %d 个）" #: delta-islands.c:467 #, c-format msgid "Marked %d islands, done.\n" msgstr "已标记 %d 个数据岛，结束。\n" #: diff-merges.c:70 #, c-format msgid "unknown value for --diff-merges: %s" msgstr "未知的 --diff-merges 取值：%s" #: diff-lib.c:561 msgid "--merge-base does not work with ranges" msgstr "--merge-base 不适用于范围" #: diff-lib.c:563 msgid "--merge-base only works with commits" msgstr "--merge-base 仅适用于提交" #: diff-lib.c:580 msgid "unable to get HEAD" msgstr "不能解析 HEAD" #: diff-lib.c:587 msgid "no merge base found" msgstr "未找到合并基线" #: diff-lib.c:589 msgid "multiple merge bases found" msgstr "找到了多条合并基线" #: diff-no-index.c:237 msgid "git diff --no-index [] " msgstr "git diff --no-index [<选项>] <路径> <路径>" #: diff-no-index.c:262 msgid "" "Not a git repository. Use --no-index to compare two paths outside a working " "tree" msgstr "不是 git 仓库。使用 --no-index 比较工作区之外的两个路径" # 译者：注意保持前导空格 #: diff.c:157 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr " 无法解析 dirstat 截止（cut-off）百分比 '%s'\n" # 译者：注意保持前导空格 #: diff.c:162 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " 未知的 dirstat 参数 '%s'\n" #: diff.c:298 msgid "" "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', " "'dimmed-zebra', 'plain'" msgstr "" "移动的颜色设置必须是 'no'、'default'、'blocks'、'zebra'、'dimmed-zebra' 或 " "'plain'" #: diff.c:326 #, c-format msgid "" "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', " "'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'" msgstr "" "未知的 color-moved-ws 模式 '%s'，可能的取值有 'ignore-space-change'、'ignore-" "space-at-eol'、'ignore-all-space'、'allow-indentation-change'" #: diff.c:334 msgid "" "color-moved-ws: allow-indentation-change cannot be combined with other " "whitespace modes" msgstr "color-moved-ws：allow-indentation-change 不能与其它空白字符模式共用" #: diff.c:411 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "配置变量 'diff.submodule' 未知的取值：'%s'" #: diff.c:471 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" "%s" msgstr "" "发现配置变量 'diff.dirstat' 中的错误：\n" "%s" #: diff.c:4290 #, c-format msgid "external diff died, stopping at %s" msgstr "外部 diff 退出，停止在 %s" #: diff.c:4642 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "--name-only、--name-status、--check 和 -s 是互斥的" #: diff.c:4645 msgid "-G, -S and --find-object are mutually exclusive" msgstr "-G、-S 和 --find-object 是互斥的" #: diff.c:4648 msgid "" "-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S" msgstr "-G 和 --pickaxe-regex 互斥，使用 --pickaxe-regex 和 -S" #: diff.c:4651 msgid "" "--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all " "with -G and -S" msgstr "---pickaxe-all 和 --find-object 互斥，使用 --pickaxe-all 与 -G 和 -S" #: diff.c:4730 msgid "--follow requires exactly one pathspec" msgstr "--follow 明确要求只跟一个路径规格" #: diff.c:4778 #, c-format msgid "invalid --stat value: %s" msgstr "无效的 --stat 值：%s" #: diff.c:4783 diff.c:4788 diff.c:4793 diff.c:4798 diff.c:5326 #: parse-options.c:217 parse-options.c:221 #, c-format msgid "%s expects a numerical value" msgstr "%s 期望一个数字值" #: diff.c:4815 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" "%s" msgstr "" "无法解析 --dirstat/-X 选项的参数：\n" "%s" #: diff.c:4900 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "--diff-filter=%2$s 中未知的变更类 '%1$c'" #: diff.c:4924 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "ws-error-highlight=%.*s 之后未知的值" #: diff.c:4938 #, c-format msgid "unable to resolve '%s'" msgstr "不能解析 '%s'" #: diff.c:4988 diff.c:4994 #, c-format msgid "%s expects / form" msgstr "%s 期望 / 格式" #: diff.c:5006 #, c-format msgid "%s expects a character, got '%s'" msgstr "%s 期望一个字符，得到 '%s'" #: diff.c:5027 #, c-format msgid "bad --color-moved argument: %s" msgstr "坏的 --color-moved 参数：%s" #: diff.c:5046 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "--color-moved-ws 中的无效模式 '%s' " #: diff.c:5086 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" msgstr "" "diff-algorithm 选项有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\"" #: diff.c:5122 diff.c:5142 #, c-format msgid "invalid argument to %s" msgstr "%s 的参数无效" #: diff.c:5246 #, c-format msgid "invalid regex given to -I: '%s'" msgstr "选项 -I 的正则表达式无效：'%s'" #: diff.c:5295 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "无法解析 --submodule 选项的参数：'%s'" #: diff.c:5351 #, c-format msgid "bad --word-diff argument: %s" msgstr "坏的 --word-diff 参数：%s" #: diff.c:5387 msgid "Diff output format options" msgstr "差异输出格式化选项" #: diff.c:5389 diff.c:5395 msgid "generate patch" msgstr "生成补丁" #: diff.c:5392 builtin/log.c:179 msgid "suppress diff output" msgstr "不显示差异输出" #: diff.c:5397 diff.c:5511 diff.c:5518 msgid "" msgstr "" #: diff.c:5398 diff.c:5401 msgid "generate diffs with lines context" msgstr "生成含 行上下文的差异" #: diff.c:5403 msgid "generate the diff in raw format" msgstr "生成原始格式的差异" #: diff.c:5406 msgid "synonym for '-p --raw'" msgstr "和 '-p --raw' 同义" #: diff.c:5410 msgid "synonym for '-p --stat'" msgstr "和 '-p --stat' 同义" #: diff.c:5414 msgid "machine friendly --stat" msgstr "机器友好的 --stat" #: diff.c:5417 msgid "output only the last line of --stat" msgstr "只输出 --stat 的最后一行" #: diff.c:5419 diff.c:5427 msgid "..." msgstr "<参数1,参数2>..." #: diff.c:5420 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "输出每个子目录相对变更的分布" #: diff.c:5424 msgid "synonym for --dirstat=cumulative" msgstr "和 --dirstat=cumulative 同义" #: diff.c:5428 msgid "synonym for --dirstat=files,param1,param2..." msgstr "是 --dirstat=files,param1,param2... 的同义词" #: diff.c:5432 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "如果变更中引入冲突定界符或空白错误，给出警告" #: diff.c:5435 msgid "condensed summary such as creations, renames and mode changes" msgstr "精简摘要，例如创建、重命名和模式变更" #: diff.c:5438 msgid "show only names of changed files" msgstr "只显示变更文件的文件名" #: diff.c:5441 msgid "show only names and status of changed files" msgstr "只显示变更文件的文件名和状态" #: diff.c:5443 msgid "[,[,]]" msgstr "<宽度>[,<文件名宽度>[,<次数>]]" #: diff.c:5444 msgid "generate diffstat" msgstr "生成差异统计（diffstat）" #: diff.c:5446 diff.c:5449 diff.c:5452 msgid "" msgstr "<宽度>" #: diff.c:5447 msgid "generate diffstat with a given width" msgstr "使用给定的长度生成差异统计" #: diff.c:5450 msgid "generate diffstat with a given name width" msgstr "使用给定的文件名长度生成差异统计" #: diff.c:5453 msgid "generate diffstat with a given graph width" msgstr "使用给定的图形长度生成差异统计" #: diff.c:5455 msgid "" msgstr "<次数>" #: diff.c:5456 msgid "generate diffstat with limited lines" msgstr "生成有限行数的差异统计" #: diff.c:5459 msgid "generate compact summary in diffstat" msgstr "生成差异统计的简洁摘要" #: diff.c:5462 msgid "output a binary diff that can be applied" msgstr "输出一个可以应用的二进制差异" #: diff.c:5465 msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "在 \"index\" 行显示完整的前后对象名称" #: diff.c:5467 msgid "show colored diff" msgstr "显示带颜色的差异" #: diff.c:5468 msgid "" msgstr "<类型>" #: diff.c:5469 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" msgstr "对于差异中的上下文、旧的和新的行，加亮显示错误的空白字符" #: diff.c:5472 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" msgstr "" "在 --raw 或者 --numstat 中，不对路径字符转码并使用 NUL 字符做为输出字段的分隔" "符" #: diff.c:5475 diff.c:5478 diff.c:5481 diff.c:5590 msgid "" msgstr "<前缀>" #: diff.c:5476 msgid "show the given source prefix instead of \"a/\"" msgstr "显示给定的源前缀取代 \"a/\"" #: diff.c:5479 msgid "show the given destination prefix instead of \"b/\"" msgstr "显示给定的目标前缀取代 \"b/\"" #: diff.c:5482 msgid "prepend an additional prefix to every line of output" msgstr "输出的每一行附加前缀" #: diff.c:5485 msgid "do not show any source or destination prefix" msgstr "不显示任何源和目标前缀" #: diff.c:5488 msgid "show context between diff hunks up to the specified number of lines" msgstr "显示指定行数的差异块间的上下文" #: diff.c:5492 diff.c:5497 diff.c:5502 msgid "" msgstr "<字符>" #: diff.c:5493 msgid "specify the character to indicate a new line instead of '+'" msgstr "指定一个字符取代 '+' 来表示新的一行" #: diff.c:5498 msgid "specify the character to indicate an old line instead of '-'" msgstr "指定一个字符取代 '-' 来表示旧的一行" #: diff.c:5503 msgid "specify the character to indicate a context instead of ' '" msgstr "指定一个字符取代 ' ' 来表示一行上下文" #: diff.c:5506 msgid "Diff rename options" msgstr "差异重命名选项" #: diff.c:5507 msgid "[/]" msgstr "[/]" #: diff.c:5508 msgid "break complete rewrite changes into pairs of delete and create" msgstr "将完全重写的变更打破为成对的删除和创建" #: diff.c:5512 msgid "detect renames" msgstr "检测重命名" #: diff.c:5516 msgid "omit the preimage for deletes" msgstr "省略删除操作的差异输出" #: diff.c:5519 msgid "detect copies" msgstr "检测拷贝" #: diff.c:5523 msgid "use unmodified files as source to find copies" msgstr "使用未修改的文件做为发现拷贝的源" #: diff.c:5525 msgid "disable rename detection" msgstr "禁用重命名探测" #: diff.c:5528 msgid "use empty blobs as rename source" msgstr "使用空的数据对象做为重命名的源" #: diff.c:5530 msgid "continue listing the history of a file beyond renames" msgstr "继续列出文件重命名以外的历史记录" #: diff.c:5533 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" msgstr "如果重命名/拷贝目标超过给定的限制，禁止重命名/拷贝检测" #: diff.c:5535 msgid "Diff algorithm options" msgstr "差异算法选项" #: diff.c:5537 msgid "produce the smallest possible diff" msgstr "生成尽可能小的差异" #: diff.c:5540 msgid "ignore whitespace when comparing lines" msgstr "行比较时忽略空白字符" #: diff.c:5543 msgid "ignore changes in amount of whitespace" msgstr "忽略空白字符的变更" #: diff.c:5546 msgid "ignore changes in whitespace at EOL" msgstr "忽略行尾的空白字符变更" #: diff.c:5549 msgid "ignore carrier-return at the end of line" msgstr "忽略行尾的回车符（CR）" #: diff.c:5552 msgid "ignore changes whose lines are all blank" msgstr "忽略整行都是空白的变更" #: diff.c:5554 diff.c:5576 diff.c:5579 diff.c:5624 msgid "" msgstr "<正则>" #: diff.c:5555 msgid "ignore changes whose all lines match " msgstr "忽略所有行都和正则表达式匹配的变更" #: diff.c:5558 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "启发式转换差异边界以便阅读" #: diff.c:5561 msgid "generate diff using the \"patience diff\" algorithm" msgstr "使用 \"patience diff\" 算法生成差异" #: diff.c:5565 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "使用 \"histogram diff\" 算法生成差异" #: diff.c:5567 msgid "" msgstr "<算法>" #: diff.c:5568 msgid "choose a diff algorithm" msgstr "选择一个差异算法" #: diff.c:5570 msgid "" msgstr "<文本>" #: diff.c:5571 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "使用 \"anchored diff\" 算法生成差异" #: diff.c:5573 diff.c:5582 diff.c:5585 msgid "" msgstr "<模式>" #: diff.c:5574 msgid "show word diff, using to delimit changed words" msgstr "显示单词差异，使用 <模式> 分隔变更的单词" #: diff.c:5577 msgid "use to decide what a word is" msgstr "使用 <正则表达式> 确定何为一个词" #: diff.c:5580 msgid "equivalent to --word-diff=color --word-diff-regex=" msgstr "相当于 --word-diff=color --word-diff-regex=<正则>" #: diff.c:5583 msgid "moved lines of code are colored differently" msgstr "移动的代码行用不同方式着色" #: diff.c:5586 msgid "how white spaces are ignored in --color-moved" msgstr "在 --color-moved 下如何忽略空白字符" #: diff.c:5589 msgid "Other diff options" msgstr "其它差异选项" #: diff.c:5591 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "当从子目录运行，排除目录之外的变更并显示相对路径" #: diff.c:5595 msgid "treat all files as text" msgstr "把所有文件当做文本处理" #: diff.c:5597 msgid "swap two inputs, reverse the diff" msgstr "交换两个输入，反转差异" #: diff.c:5599 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "有差异时退出码为 1，否则为 0" #: diff.c:5601 msgid "disable all output of the program" msgstr "禁用本程序的所有输出" #: diff.c:5603 msgid "allow an external diff helper to be executed" msgstr "允许执行一个外置的差异助手" #: diff.c:5605 msgid "run external text conversion filters when comparing binary files" msgstr "当比较二进制文件时，运行外部的文本转换过滤器" #: diff.c:5607 msgid "" msgstr "<何时>" #: diff.c:5608 msgid "ignore changes to submodules in the diff generation" msgstr "在生成差异时，忽略子模组的更改" #: diff.c:5611 msgid "" msgstr "<格式>" #: diff.c:5612 msgid "specify how differences in submodules are shown" msgstr "指定子模组的差异如何显示" #: diff.c:5616 msgid "hide 'git add -N' entries from the index" msgstr "隐藏索引中 'git add -N' 条目" #: diff.c:5619 msgid "treat 'git add -N' entries as real in the index" msgstr "将索引中 'git add -N' 条目当做真实的" #: diff.c:5621 msgid "" msgstr "<字符串>" #: diff.c:5622 msgid "" "look for differences that change the number of occurrences of the specified " "string" msgstr "查找改变了指定字符串出现次数的差异" #: diff.c:5625 msgid "" "look for differences that change the number of occurrences of the specified " "regex" msgstr "查找改变指定正则匹配出现次数的差异" #: diff.c:5628 msgid "show all changes in the changeset with -S or -G" msgstr "显示使用 -S 或 -G 的变更集的所有变更" #: diff.c:5631 msgid "treat in -S as extended POSIX regular expression" msgstr "将 -S 的 当做扩展的 POSIX 正则表达式" #: diff.c:5634 msgid "control the order in which files appear in the output" msgstr "控制输出中的文件显示顺序" #: diff.c:5635 diff.c:5638 msgid "" msgstr "<路径>" #: diff.c:5636 msgid "show the change in the specified path first" msgstr "先显示指定路径的变更" #: diff.c:5639 msgid "skip the output to the specified path" msgstr "跳过指定路径的输出" #: diff.c:5641 msgid "" msgstr "<对象 ID>" #: diff.c:5642 msgid "" "look for differences that change the number of occurrences of the specified " "object" msgstr "查找改变指定对象出现次数的差异" #: diff.c:5644 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" #: diff.c:5645 msgid "select files by diff type" msgstr "通过差异类型选择文件" #: diff.c:5647 msgid "" msgstr "<文件>" #: diff.c:5648 msgid "Output to a specific file" msgstr "输出到一个指定的文件" #: diff.c:6306 msgid "exhaustive rename detection was skipped due to too many files." msgstr "由于文件太多，跳过详尽的重命名检查。" #: diff.c:6309 msgid "only found copies from modified paths due to too many files." msgstr "由于文件太多，只在修改的路径中找到了拷贝。" #: diff.c:6312 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令。" #: diffcore-order.c:24 #, c-format msgid "failed to read orderfile '%s'" msgstr "读取排序文件 '%s' 失败" #: diffcore-rename.c:1564 msgid "Performing inexact rename detection" msgstr "正在进行非精确的重命名探测" #: diffcore-rotate.c:29 #, c-format msgid "No such path '%s' in the diff" msgstr "在差异中无此路径 '%s'" #: dir.c:593 #, c-format msgid "pathspec '%s' did not match any file(s) known to git" msgstr "路径规格 '%s' 未匹配任何 git 已知文件" #: dir.c:733 dir.c:762 dir.c:775 #, c-format msgid "unrecognized pattern: '%s'" msgstr "未识别的模式：'%s'" #: dir.c:790 dir.c:804 #, c-format msgid "unrecognized negative pattern: '%s'" msgstr "未识别的反向模式：'%s'" #: dir.c:820 #, c-format msgid "your sparse-checkout file may have issues: pattern '%s' is repeated" msgstr "您的 sparse-checkout 文件可能有问题：重复的模式 '%s'" #: dir.c:830 msgid "disabling cone pattern matching" msgstr "禁止 cone 模式匹配" #: dir.c:1214 #, c-format msgid "cannot use %s as an exclude file" msgstr "不能将 %s 用作排除文件" #: dir.c:2464 #, c-format msgid "could not open directory '%s'" msgstr "不能打开目录 '%s'" #: dir.c:2766 msgid "failed to get kernel name and information" msgstr "无法获得内核名称和信息" #: dir.c:2890 msgid "untracked cache is disabled on this system or location" msgstr "缓存未跟踪文件在本系统或位置中被禁用" #: dir.c:3158 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" msgstr "" "无法猜到目录名。\n" "请在命令行指定一个目录" #: dir.c:3837 #, c-format msgid "index file corrupt in repo %s" msgstr "仓库 %s 中的索引文件损坏" #: dir.c:3884 dir.c:3889 #, c-format msgid "could not create directories for %s" msgstr "不能为 %s 创建目录" #: dir.c:3918 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "不能从 '%s' 迁移 git 目录到 '%s'" #: editor.c:77 #, c-format msgid "hint: Waiting for your editor to close the file...%c" msgstr "提示：等待您的编辑器关闭文件...%c" #: entry.c:177 msgid "Filtering content" msgstr "过滤内容" #: entry.c:498 #, c-format msgid "could not stat file '%s'" msgstr "不能对文件 '%s' 调用 stat" #: environment.c:143 #, c-format msgid "bad git namespace path \"%s\"" msgstr "错误的 git 名字空间路径 \"%s\"" #: exec-cmd.c:363 #, c-format msgid "too many args to run %s" msgstr "执行 %s 的参数太多" #: fetch-pack.c:193 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack：应为 shallow 列表" #: fetch-pack.c:196 msgid "git fetch-pack: expected a flush packet after shallow list" msgstr "git fetch-pack：在浅克隆列表之后期望一个 flush 包" #: fetch-pack.c:207 msgid "git fetch-pack: expected ACK/NAK, got a flush packet" msgstr "git fetch-pack：期望 ACK/NAK，却得到 flush 包" #: fetch-pack.c:227 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack：应为 ACK/NAK，却得到 '%s'" #: fetch-pack.c:238 msgid "unable to write to remote" msgstr "无法写到远程" #: fetch-pack.c:299 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc 需要 multi_ack_detailed" #: fetch-pack.c:394 fetch-pack.c:1434 #, c-format msgid "invalid shallow line: %s" msgstr "无效的 shallow 信息：%s" #: fetch-pack.c:400 fetch-pack.c:1440 #, c-format msgid "invalid unshallow line: %s" msgstr "无效的 unshallow 信息：%s" #: fetch-pack.c:402 fetch-pack.c:1442 #, c-format msgid "object not found: %s" msgstr "对象未找到：%s" #: fetch-pack.c:405 fetch-pack.c:1445 #, c-format msgid "error in object: %s" msgstr "对象中出错：%s" #: fetch-pack.c:407 fetch-pack.c:1447 #, c-format msgid "no shallow found: %s" msgstr "未发现 shallow：%s" #: fetch-pack.c:410 fetch-pack.c:1451 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "应为 shallow/unshallow，却得到 %s" #: fetch-pack.c:450 #, c-format msgid "got %s %d %s" msgstr "得到 %s %d %s" #: fetch-pack.c:467 #, c-format msgid "invalid commit %s" msgstr "无效提交 %s" #: fetch-pack.c:498 msgid "giving up" msgstr "放弃" #: fetch-pack.c:511 progress.c:339 msgid "done" msgstr "完成" #: fetch-pack.c:523 #, c-format msgid "got %s (%d) %s" msgstr "得到 %s (%d) %s" #: fetch-pack.c:559 #, c-format msgid "Marking %s as complete" msgstr "标记 %s 为完成" #: fetch-pack.c:774 #, c-format msgid "already have %s (%s)" msgstr "已经有 %s（%s）" #: fetch-pack.c:860 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack：无法派生 sideband 多路输出" #: fetch-pack.c:868 msgid "protocol error: bad pack header" msgstr "协议错误：坏的包头" #: fetch-pack.c:962 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack：无法派生进程 %s" #: fetch-pack.c:968 msgid "fetch-pack: invalid index-pack output" msgstr "fetch-pack：无效的 index-pack 输出" #: fetch-pack.c:985 #, c-format msgid "%s failed" msgstr "%s 失败" #: fetch-pack.c:987 msgid "error in sideband demultiplexer" msgstr "sideband 多路输出出错" #: fetch-pack.c:1030 #, c-format msgid "Server version is %.*s" msgstr "服务器版本 %.*s" #: fetch-pack.c:1038 fetch-pack.c:1044 fetch-pack.c:1047 fetch-pack.c:1053 #: fetch-pack.c:1057 fetch-pack.c:1061 fetch-pack.c:1065 fetch-pack.c:1069 #: fetch-pack.c:1073 fetch-pack.c:1077 fetch-pack.c:1081 fetch-pack.c:1085 #: fetch-pack.c:1091 fetch-pack.c:1097 fetch-pack.c:1102 fetch-pack.c:1107 #, c-format msgid "Server supports %s" msgstr "服务器支持 %s" #: fetch-pack.c:1040 msgid "Server does not support shallow clients" msgstr "服务器不支持浅客户端" #: fetch-pack.c:1100 msgid "Server does not support --shallow-since" msgstr "服务器不支持 --shallow-since" #: fetch-pack.c:1105 msgid "Server does not support --shallow-exclude" msgstr "服务器不支持 --shallow-exclude" #: fetch-pack.c:1109 msgid "Server does not support --deepen" msgstr "服务器不支持 --deepen" #: fetch-pack.c:1111 msgid "Server does not support this repository's object format" msgstr "服务器不支持这个仓库的对象格式" #: fetch-pack.c:1124 msgid "no common commits" msgstr "没有共同的提交" #: fetch-pack.c:1133 fetch-pack.c:1480 builtin/clone.c:1130 msgid "source repository is shallow, reject to clone." msgstr "源仓库是浅克隆，拒绝克隆。" #: fetch-pack.c:1139 fetch-pack.c:1671 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack：获取失败。" #: fetch-pack.c:1253 #, c-format msgid "mismatched algorithms: client %s; server %s" msgstr "不匹配的算法：客户端 %s，服务端 %s" #: fetch-pack.c:1257 #, c-format msgid "the server does not support algorithm '%s'" msgstr "服务器不支持算法 '%s'" #: fetch-pack.c:1290 msgid "Server does not support shallow requests" msgstr "服务器不支持浅克隆请求" #: fetch-pack.c:1297 msgid "Server supports filter" msgstr "服务器支持 filter" #: fetch-pack.c:1340 fetch-pack.c:2053 msgid "unable to write request to remote" msgstr "无法将请求写到远程" #: fetch-pack.c:1358 #, c-format msgid "error reading section header '%s'" msgstr "读取节标题 '%s' 出错" #: fetch-pack.c:1364 #, c-format msgid "expected '%s', received '%s'" msgstr "预期 '%s'，得到 '%s'" #: fetch-pack.c:1398 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "意外的确认行：'%s'" #: fetch-pack.c:1403 #, c-format msgid "error processing acks: %d" msgstr "处理 ack 出错：%d" #: fetch-pack.c:1413 msgid "expected packfile to be sent after 'ready'" msgstr "预期在 'ready' 之后发送 packfile" #: fetch-pack.c:1415 msgid "expected no other sections to be sent after no 'ready'" msgstr "在没有 'ready' 不应该发送其它小节" #: fetch-pack.c:1456 #, c-format msgid "error processing shallow info: %d" msgstr "处理浅克隆信息出错：%d" #: fetch-pack.c:1505 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "预期 wanted-ref，得到 '%s'" #: fetch-pack.c:1510 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "意外的 wanted-ref：'%s'" #: fetch-pack.c:1515 #, c-format msgid "error processing wanted refs: %d" msgstr "处理要获取的引用出错：%d" #: fetch-pack.c:1545 msgid "git fetch-pack: expected response end packet" msgstr "git fetch-pack：预期响应结束包" #: fetch-pack.c:1949 msgid "no matching remote head" msgstr "没有匹配的远程分支" #: fetch-pack.c:1972 builtin/clone.c:581 msgid "remote did not send all necessary objects" msgstr "远程没有发送所有必需的对象" #: fetch-pack.c:2075 msgid "unexpected 'ready' from remote" msgstr "来自远程的意外的 'ready'" #: fetch-pack.c:2098 #, c-format msgid "no such remote ref %s" msgstr "没有这样的远程引用 %s" #: fetch-pack.c:2101 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "服务器不允许请求未公开的对象 %s" #: gpg-interface.c:329 gpg-interface.c:449 gpg-interface.c:900 #: gpg-interface.c:916 msgid "could not create temporary file" msgstr "不能创建临时文件" #: gpg-interface.c:332 gpg-interface.c:452 #, c-format msgid "failed writing detached signature to '%s'" msgstr "无法将分离式签名写入 '%s'" #: gpg-interface.c:443 msgid "" "gpg.ssh.allowedSignersFile needs to be configured and exist for ssh " "signature verification" msgstr "ssh 签名验证需要 gpg.ssh.allowedSignersFile 被设置且存在" #: gpg-interface.c:467 msgid "" "ssh-keygen -Y find-principals/verify is needed for ssh signature " "verification (available in openssh version 8.2p1+)" msgstr "" "ssh 签名验证需要 ssh-keygen -Y find-principals/verify \n" "（openssh 8.2p1+ 版本可用）" #: gpg-interface.c:521 #, c-format msgid "ssh signing revocation file configured but not found: %s" msgstr "设置了 ssh 签名吊销文件但无法找到：%s" #: gpg-interface.c:574 #, c-format msgid "bad/incompatible signature '%s'" msgstr "坏的/不兼容的签名 '%s‘" #: gpg-interface.c:733 gpg-interface.c:738 #, c-format msgid "failed to get the ssh fingerprint for key '%s'" msgstr "无法得到密钥 '%s' 的 ssh 指纹" #: gpg-interface.c:760 msgid "" "either user.signingkey or gpg.ssh.defaultKeyCommand needs to be configured" msgstr "需要配置 user.signingkey 或者 gpg.ssh.defaultKeyCommand 其中之一" #: gpg-interface.c:778 #, c-format msgid "gpg.ssh.defaultKeycommand succeeded but returned no keys: %s %s" msgstr "gpg.ssh.defaultKeyCommand 成功，但没有返回密钥：%s %s" #: gpg-interface.c:784 #, c-format msgid "gpg.ssh.defaultKeyCommand failed: %s %s" msgstr "gpg.ssh.defaultKeyCommand 失败：%s %s" #: gpg-interface.c:872 msgid "gpg failed to sign the data" msgstr "gpg 数据签名失败" #: gpg-interface.c:893 msgid "user.signingkey needs to be set for ssh signing" msgstr "ssh 签名需要设置 user.signingkey" #: gpg-interface.c:904 #, c-format msgid "failed writing ssh signing key to '%s'" msgstr "无法将 ssh 签名密钥写入 '%s'" #: gpg-interface.c:922 #, c-format msgid "failed writing ssh signing key buffer to '%s'" msgstr "无法将 ssh 签名密钥缓冲区写入 '%s'" #: gpg-interface.c:940 msgid "" "ssh-keygen -Y sign is needed for ssh signing (available in openssh version " "8.2p1+)" msgstr "ssh 签名需要 ssh-keygen -Y sign （openssh 8.2p1+ 版本可用）" #: gpg-interface.c:952 #, c-format msgid "failed reading ssh signing data buffer from '%s'" msgstr "无法从 '%s' 读入 ssh 签名数据" #: graph.c:98 #, c-format msgid "ignored invalid color '%.*s' in log.graphColors" msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'" #: grep.c:531 msgid "" "given pattern contains NULL byte (via -f ). This is only supported " "with -P under PCRE v2" msgstr "" "给定的模式包含 NULL 字符（通过 -f <文件> 参数）。只有 PCRE v2 下的 -P 支持此" "功能" #: grep.c:1907 #, c-format msgid "'%s': unable to read %s" msgstr "'%s'：无法读取 %s" #: grep.c:1924 setup.c:176 builtin/clone.c:302 builtin/diff.c:90 #: builtin/rm.c:136 #, c-format msgid "failed to stat '%s'" msgstr "对 '%s' 调用 stat 失败" #: grep.c:1935 #, c-format msgid "'%s': short read" msgstr "'%s'：读取不完整" #: help.c:24 msgid "start a working area (see also: git help tutorial)" msgstr "开始一个工作区（参见：git help tutorial）" #: help.c:25 msgid "work on the current change (see also: git help everyday)" msgstr "在当前变更上工作（参见：git help everyday）" #: help.c:26 msgid "examine the history and state (see also: git help revisions)" msgstr "检查历史和状态（参见：git help revisions）" #: help.c:27 msgid "grow, mark and tweak your common history" msgstr "扩展、标记和调校您的历史记录" #: help.c:28 msgid "collaborate (see also: git help workflows)" msgstr "协同（参见：git help workflows）" #: help.c:32 msgid "Main Porcelain Commands" msgstr "主要的上层命令" #: help.c:33 msgid "Ancillary Commands / Manipulators" msgstr "辅助命令/操作者" #: help.c:34 msgid "Ancillary Commands / Interrogators" msgstr "辅助命令/询问者" #: help.c:35 msgid "Interacting with Others" msgstr "与其它系统交互" #: help.c:36 msgid "Low-level Commands / Manipulators" msgstr "低级命令/操作者" #: help.c:37 msgid "Low-level Commands / Interrogators" msgstr "低级命令/询问者" #: help.c:38 msgid "Low-level Commands / Syncing Repositories" msgstr "低级命令/同步仓库" #: help.c:39 msgid "Low-level Commands / Internal Helpers" msgstr "低级命令/内部助手" #: help.c:313 #, c-format msgid "available git commands in '%s'" msgstr "在 '%s' 下可用的 git 命令" #: help.c:320 msgid "git commands available from elsewhere on your $PATH" msgstr "在 $PATH 路径中的其他地方可用的 git 命令" #: help.c:329 msgid "These are common Git commands used in various situations:" msgstr "这些是各种场合常见的 Git 命令：" #: help.c:378 git.c:100 #, c-format msgid "unsupported command listing type '%s'" msgstr "不支持的命令列表类型 '%s'" #: help.c:418 msgid "The Git concept guides are:" msgstr "Git 概念向导有：" #: help.c:442 msgid "See 'git help ' to read about a specific subcommand" msgstr "执行　'git help ' 来查看特定子命令" #: help.c:447 msgid "External commands" msgstr "外部命令" #: help.c:462 msgid "Command aliases" msgstr "命令别名" #: help.c:543 #, 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:565 help.c:662 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git：'%s' 不是一个 git 命令。参见 'git --help'。" #: help.c:613 msgid "Uh oh. Your system reports no Git commands at all." msgstr "唉呀，您的系统中未发现 Git 命令。" #: help.c:635 #, c-format msgid "WARNING: You called a Git command named '%s', which does not exist." msgstr "警告：您运行了一个并不存在的 Git 命令 '%s'。" #: help.c:640 #, c-format msgid "Continuing under the assumption that you meant '%s'." msgstr "假定您想要的是 '%s' 并继续。" #: help.c:646 #, c-format msgid "Run '%s' instead? (y/N)" msgstr "取而代之运行 '%s' ？ (y/N)" #: help.c:654 #, c-format msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." msgstr "假定您想要的是 '%2$s'，在 %1$0.1f 秒钟后继续。" #: help.c:666 msgid "" "\n" "The most similar command is" msgid_plural "" "\n" "The most similar commands are" msgstr[0] "" "\n" "最相似的命令是" msgstr[1] "" "\n" "最相似的命令是" #: help.c:706 msgid "git version []" msgstr "git version [<选项>]" #: help.c:761 #, c-format msgid "%s: %s - %s" msgstr "%s：%s - %s" #: help.c:765 msgid "" "\n" "Did you mean this?" msgid_plural "" "\n" "Did you mean one of these?" msgstr[0] "" "\n" "您指的是这个么？" msgstr[1] "" "\n" "您指的是这其中的某一个么？" #: hook.c:27 #, c-format msgid "" "The '%s' hook was ignored because it's not set as executable.\n" "You can disable this warning with `git config advice.ignoredHook false`." msgstr "" "因为没有将钩子 '%s' 设置为可执行，钩子被忽略。您可以通过\n" "配置 `git config advice.ignoredHook false` 来关闭这条警告。" #: ident.c:353 msgid "Author identity unknown\n" msgstr "作者身份未知\n" #: ident.c:356 msgid "Committer identity unknown\n" msgstr "提交者身份未知\n" #: ident.c:362 msgid "" "\n" "*** Please tell me who you are.\n" "\n" "Run\n" "\n" " git config --global user.email \"you@example.com\"\n" " git config --global user.name \"Your Name\"\n" "\n" "to set your account's default identity.\n" "Omit --global to set the identity only in this repository.\n" "\n" msgstr "" "\n" "*** 请告诉我您是谁。\n" "\n" "运行\n" "\n" " git config --global user.email \"you@example.com\"\n" " git config --global user.name \"Your Name\"\n" "\n" "来设置您账号的缺省身份标识。\n" "如果仅在本仓库设置身份标识，则省略 --global 参数。\n" #: ident.c:397 msgid "no email was given and auto-detection is disabled" msgstr "未提供邮件地址且自动探测被禁用" #: ident.c:402 #, c-format msgid "unable to auto-detect email address (got '%s')" msgstr "无法自动探测邮件地址（得到 '%s'）" #: ident.c:419 msgid "no name was given and auto-detection is disabled" msgstr "未提供姓名且自动探测被禁用" #: ident.c:425 #, c-format msgid "unable to auto-detect name (got '%s')" msgstr "无法自动探测姓名（得到 '%s'）" #: ident.c:433 #, c-format msgid "empty ident name (for <%s>) not allowed" msgstr "不允许空的姓名（对于 <%s>）" #: ident.c:439 #, c-format msgid "name consists only of disallowed characters: %s" msgstr "姓名中仅包含禁用字符：%s" #: ident.c:454 builtin/commit.c:648 #, c-format msgid "invalid date format: %s" msgstr "无效的日期格式：%s" #: list-objects-filter-options.c:83 msgid "expected 'tree:'" msgstr "期望 'tree:<深度>'" #: list-objects-filter-options.c:98 msgid "sparse:path filters support has been dropped" msgstr "sparse:path 过滤器支持已被删除" #: list-objects-filter-options.c:105 #, c-format msgid "'%s' for 'object:type=' is not a valid object type" msgstr "'object:type=' 的值 '%s' 不是有效的对象类型" #: list-objects-filter-options.c:124 #, c-format msgid "invalid filter-spec '%s'" msgstr "无效的过滤器表达式 '%s'" #: list-objects-filter-options.c:140 #, c-format msgid "must escape char in sub-filter-spec: '%c'" msgstr "必须对 sub-filter-spec 中的字符进行转义：'%c'" #: list-objects-filter-options.c:182 msgid "expected something after combine:" msgstr "期望在组合后有一些东西：" #: list-objects-filter-options.c:264 msgid "multiple filter-specs cannot be combined" msgstr "不能混用多种过滤规格" #: list-objects-filter-options.c:376 msgid "unable to upgrade repository format to support partial clone" msgstr "无法升级仓库格式以支持部分克隆" #: list-objects-filter.c:532 #, c-format msgid "unable to access sparse blob in '%s'" msgstr "不能访问 '%s' 中的稀疏数据对象" #: list-objects-filter.c:535 #, c-format msgid "unable to parse sparse filter data in %s" msgstr "无法解析 %s 中的稀疏过滤器数据" #: list-objects.c:127 #, c-format msgid "entry '%s' in tree %s has tree mode, but is not a tree" msgstr "树 %2$s 中的条目 '%1$s' 具有树的模式，但不是一个树对象" #: list-objects.c:140 #, c-format msgid "entry '%s' in tree %s has blob mode, but is not a blob" msgstr "树 %2$s 中的条目 '%1$s' 具有数据对象的模式，但不是一个数据对象" #: list-objects.c:398 #, c-format msgid "unable to load root tree for commit %s" msgstr "无法为提交 %s 加载根树" #: lockfile.c:152 #, c-format msgid "" "Unable to create '%s.lock': %s.\n" "\n" "Another git process seems to be running in this repository, e.g.\n" "an editor opened by 'git commit'. Please make sure all processes\n" "are terminated then try again. If it still fails, a git process\n" "may have crashed in this repository earlier:\n" "remove the file manually to continue." msgstr "" "无法创建 '%s.lock'：%s。\n" "\n" "似乎另外一个 git 进程在这个仓库中运行，例如：'git commit' 命令打\n" "开了一个编辑器。请确认所有进程都已经关闭然后重试。如果仍然报错，\n" "可能之前有一个 git 进程在这个仓库中异常退出：\n" "手动删除这个文件再继续。" #: lockfile.c:160 #, c-format msgid "Unable to create '%s.lock': %s" msgstr "不能创建 '%s.lock'：%s" #: ls-refs.c:37 #, c-format msgid "invalid value '%s' for lsrefs.unborn" msgstr "lsrefs.unborn 的取值 '%s' 无效" #: ls-refs.c:174 #, c-format msgid "unexpected line: '%s'" msgstr "意外的行：'%s'" #: ls-refs.c:178 msgid "expected flush after ls-refs arguments" msgstr "在 ls-refs 参数后应该有一个 flush 包" #: mailinfo.c:1050 msgid "quoted CRLF detected" msgstr "检测到被引用的 CRLF" #: mailinfo.c:1254 builtin/am.c:177 builtin/mailinfo.c:46 #, c-format msgid "bad action '%s' for '%s'" msgstr "'%2$s' 的错误动作 '%1$s'" #: merge-ort.c:1584 merge-recursive.c:1211 #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "无法合并子模组 %s （没有检出）" #: merge-ort.c:1593 merge-recursive.c:1218 #, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "无法合并子模组 %s（提交不存在）" #: merge-ort.c:1602 merge-recursive.c:1225 #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" msgstr "无法合并子模组 %s （提交未跟随合并基线）" #: merge-ort.c:1612 merge-ort.c:1620 #, c-format msgid "Note: Fast-forwarding submodule %s to %s" msgstr "注意：快进子模组 %s 到 %s" #: merge-ort.c:1642 #, c-format msgid "Failed to merge submodule %s" msgstr "无法合并子模组 %s" #: merge-ort.c:1649 #, c-format msgid "" "Failed to merge submodule %s, but a possible merge resolution exists:\n" "%s\n" msgstr "" "无法合并子模组 %s，但是存在一个可能的合并方案：\n" "%s\n" #: merge-ort.c:1653 merge-recursive.c:1281 #, c-format msgid "" "If this is correct simply add it to the index for example\n" "by using:\n" "\n" " git update-index --cacheinfo 160000 %s \"%s\"\n" "\n" "which will accept this suggestion.\n" msgstr "" "如果这个正确，将其添加到索引，例如使用命令：\n" "\n" " git update-index --cacheinfo 160000 %s \"%s\"\n" "\n" "以接受此建议。\n" #: merge-ort.c:1666 #, c-format msgid "" "Failed to merge submodule %s, but multiple possible merges exist:\n" "%s" msgstr "" "无法合并子模组 %s，但是存在多个可能的合并：\n" "%s" #: merge-ort.c:1887 merge-recursive.c:1372 msgid "Failed to execute internal merge" msgstr "无法执行内部合并" #: merge-ort.c:1892 merge-recursive.c:1377 #, c-format msgid "Unable to add %s to database" msgstr "不能添加 %s 至对象库" #: merge-ort.c:1899 merge-recursive.c:1410 #, c-format msgid "Auto-merging %s" msgstr "自动合并 %s" #: merge-ort.c:2038 merge-recursive.c:2132 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " "implicit directory rename(s) putting the following path(s) there: %s." msgstr "" "冲突（隐式目录重命名）：处于隐式目录重命名的现存文件/目录 %s，将以下路径放" "在：%s。" #: merge-ort.c:2048 merge-recursive.c:2142 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " "implicit directory renames tried to put these paths there: %s" msgstr "" "冲突（隐式目录重命名）：无法映射一个以上路径到 %s，隐式目录重命名尝试将这些路" "径放置于此：%s" #: merge-ort.c:2106 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to rename %s to; it was " "renamed to multiple other directories, with no destination getting a " "majority of the files." msgstr "" "冲突（分割的目录重命名）：不清楚重命名 %s 到哪里，因为它被重命名到多个其他目" "录中，没有一个目标目录中包含多数文件。" #: merge-ort.c:2260 merge-recursive.c:2478 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " "renamed." msgstr "警告：避免应用 %s -> %s 的重命名到 %s，因为 %s 本身已被重命名。" #: merge-ort.c:2400 merge-recursive.c:3261 #, c-format msgid "" "Path updated: %s added in %s inside a directory that was renamed in %s; " "moving it to %s." msgstr "" "路径已更新：%s 添加到 %s，位于一个被重命名到 %s 的目录中，将其移动到 %s。" #: merge-ort.c:2407 merge-recursive.c:3268 #, c-format msgid "" "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " "%s; moving it to %s." msgstr "" "路径已更新：%1$s 重命名为 %3$s 中的 %2$s，而该目录被重命名到 %4$s 中，将其移" "动到 %5$s。" #: merge-ort.c:2420 merge-recursive.c:3264 #, c-format msgid "" "CONFLICT (file location): %s added in %s inside a directory that was renamed " "in %s, suggesting it should perhaps be moved to %s." msgstr "" "冲突（文件位置）：%s 添加到 %s，位于一个被重命名为 %s 的目录中，建议将其移动" "到 %s。" #: merge-ort.c:2428 merge-recursive.c:3271 #, c-format msgid "" "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " "was renamed in %s, suggesting it should perhaps be moved to %s." msgstr "" "冲突（文件位置）：%1$s 重命名为 %3$s 中的 %2$s，而该目录被重命名到 %4$s 中，" "建议将其移动到 %5$s。" #: merge-ort.c:2584 #, c-format msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s." msgstr "" "冲突（重命名/重命名）：%1$s 重命名为 %3$s 中的 %2$s，以及在 %5$s 中的 %4$s。" #: merge-ort.c:2679 #, c-format msgid "" "CONFLICT (rename involved in collision): rename of %s -> %s has content " "conflicts AND collides with another path; this may result in nested conflict " "markers." msgstr "" "冲突（重命名卷入冲突）：重命名 %s -> %s 有内容冲突并且和另外一个路径碰撞，这" "可能导致嵌套的冲突标签。" #: merge-ort.c:2698 merge-ort.c:2722 #, c-format msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s." msgstr "冲突（重命名/删除）：%1$s 在 %3$s 中重命名为 %2$s，但在 %4$s 中删除。" #: merge-ort.c:3212 merge-recursive.c:3022 #, c-format msgid "cannot read object %s" msgstr "不能读取对象 %s" #: merge-ort.c:3215 merge-recursive.c:3025 #, c-format msgid "object %s is not a blob" msgstr "对象 %s 不是一个数据对象" #: merge-ort.c:3644 #, c-format msgid "" "CONFLICT (file/directory): directory in the way of %s from %s; moving it to " "%s instead." msgstr "冲突（文件/目录）：目录已存在于 %2$s 中的 %1$s，将其移动到 %3$s。" #: merge-ort.c:3721 #, c-format msgid "" "CONFLICT (distinct types): %s had different types on each side; renamed both " "of them so each can be recorded somewhere." msgstr "" "冲突（不同类型）：%s 在两侧有不同的类型，将两者都重命名以便它们能记录在不同位" "置。" #: merge-ort.c:3728 #, c-format msgid "" "CONFLICT (distinct types): %s had different types on each side; renamed one " "of them so each can be recorded somewhere." msgstr "" "冲突（不同类型）：%s 在两侧有不同的类型，将其中之一重命名以便它们能记录在不同" "位置。" #: merge-ort.c:3819 merge-recursive.c:3101 msgid "content" msgstr "内容" #: merge-ort.c:3821 merge-recursive.c:3105 msgid "add/add" msgstr "添加/添加" #: merge-ort.c:3823 merge-recursive.c:3150 msgid "submodule" msgstr "子模组" #: merge-ort.c:3825 merge-recursive.c:3151 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "冲突（%s）：合并冲突于 %s" #: merge-ort.c:3856 #, c-format msgid "" "CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s " "of %s left in tree." msgstr "" "冲突（修改/删除）：%1$s 在 %2$s 中被删除，在 %3$s 中被修改。%5$s 的 %4$s 版本" "在树中被保留。" #: merge-ort.c:4152 #, c-format msgid "" "Note: %s not up to date and in way of checking out conflicted version; old " "copy renamed to %s" msgstr "注意：%s 不是最新的，并且与要检出的版本冲突。旧副本重命名为 %s" #. TRANSLATORS: The %s arguments are: 1) tree hash of a merge #. base, and 2-3) the trees for the two trees we're merging. #. #: merge-ort.c:4521 #, c-format msgid "collecting merge info failed for trees %s, %s, %s" msgstr "无法收集树 %s、%s、%s 的合并信息" #: merge-ort-wrappers.c:13 merge-recursive.c:3716 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" " %s" msgstr "" "您对下列文件的本地修改将被合并操作覆盖：\n" " %s" #: merge-ort-wrappers.c:33 merge-recursive.c:3482 builtin/merge.c:403 msgid "Already up to date." msgstr "已经是最新的。" #: merge-recursive.c:353 msgid "(bad commit)\n" msgstr "（坏提交）\n" #: merge-recursive.c:381 #, c-format msgid "add_cacheinfo failed for path '%s'; merge aborting." msgstr "add_cacheinfo 对路径 '%s' 执行失败，合并终止。" #: merge-recursive.c:390 #, c-format msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." msgstr "add_cacheinfo 无法刷新路径 '%s'，合并终止。" #: merge-recursive.c:881 #, c-format msgid "failed to create path '%s'%s" msgstr "创建路径 '%s'%s 失败" #: merge-recursive.c:892 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "删除 %s 以便为子目录留出空间\n" #: merge-recursive.c:906 merge-recursive.c:925 msgid ": perhaps a D/F conflict?" msgstr "：可能是一个目录/文件冲突？" #: merge-recursive.c:915 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "拒绝丢弃 '%s' 中的未跟踪文件" #: merge-recursive.c:956 builtin/cat-file.c:41 #, c-format msgid "cannot read object %s '%s'" msgstr "不能读取对象 %s '%s'" #: merge-recursive.c:961 #, c-format msgid "blob expected for %s '%s'" msgstr "%s '%s' 应为数据对象" #: merge-recursive.c:986 #, c-format msgid "failed to open '%s': %s" msgstr "打开 '%s' 失败：%s" #: merge-recursive.c:997 #, c-format msgid "failed to symlink '%s': %s" msgstr "创建符号链接 '%s' 失败：%s" #: merge-recursive.c:1002 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "不知道如何处理 %06o %s '%s'" #: merge-recursive.c:1233 merge-recursive.c:1246 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "子模组 %s 快进到如下提交：" #: merge-recursive.c:1236 merge-recursive.c:1249 #, c-format msgid "Fast-forwarding submodule %s" msgstr "快进子模组 %s" #: merge-recursive.c:1273 #, c-format msgid "Failed to merge submodule %s (merge following commits not found)" msgstr "无法合并子模组 %s （没发现合并跟随的提交）" #: merge-recursive.c:1277 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "无法合并子模组 %s（非快进）" #: merge-recursive.c:1278 msgid "Found a possible merge resolution for the submodule:\n" msgstr "找到子模组的一个可能的合并方案：\n" #: merge-recursive.c:1290 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "无法合并子模组 %s （发现多个合并）" #: merge-recursive.c:1434 #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." msgstr "错误：拒绝丢失未跟踪文件 '%s'，而是写入 %s。" #: merge-recursive.c:1506 #, 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:1511 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " "left in tree." msgstr "" "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 " "%7$s 版本被保留。" #: merge-recursive.c:1518 #, 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:1523 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " "left in tree at %s." msgstr "" "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 " "%7$s 版本保留在 %9$s 中。" #: merge-recursive.c:1558 msgid "rename" msgstr "重命名" #: merge-recursive.c:1558 msgid "renamed" msgstr "重命名" #: merge-recursive.c:1609 merge-recursive.c:2515 merge-recursive.c:3178 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "拒绝丢失脏文件 '%s'" #: merge-recursive.c:1619 #, c-format msgid "Refusing to lose untracked file at %s, even though it's in the way." msgstr "拒绝在 '%s' 处失去未跟踪文件，即使它存在于重命名中。" #: merge-recursive.c:1677 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" msgstr "冲突（重命名/添加）：在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s" #: merge-recursive.c:1708 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加" #: merge-recursive.c:1713 #, c-format msgid "Refusing to lose untracked file at %s; adding as %s instead" msgstr "拒绝丢失未跟踪文件 '%s'，而是添加为 %s" #: merge-recursive.c:1740 #, 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:1745 msgid " (left unresolved)" msgstr "（留下未解决）" #: merge-recursive.c:1837 #, 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:2100 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " "directory %s was renamed to multiple other directories, with no destination " "getting a majority of the files." msgstr "" "冲突（分割的目录重命名）：不清楚 %s 应该放在哪里，因为目录 %s 被重命名到多个" "其它目录，没有目录包含大部分文件。" #: merge-recursive.c:2234 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" ">%s in %s" msgstr "" "冲突（重命名/重命名）：在 %3$s 中重命名目录 %1$s->%2$s，在 %6$s 中重命名目录 " "%4$s->%5$s" #: merge-recursive.c:3089 msgid "modify" msgstr "修改" #: merge-recursive.c:3089 msgid "modified" msgstr "修改" #: merge-recursive.c:3128 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "略过 %s（已经做过相同合并）" #: merge-recursive.c:3181 #, c-format msgid "Adding as %s instead" msgstr "而是以 %s 为名添加" #: merge-recursive.c:3385 #, c-format msgid "Removing %s" msgstr "删除 %s" #: merge-recursive.c:3408 msgid "file/directory" msgstr "文件/目录" #: merge-recursive.c:3413 msgid "directory/file" msgstr "目录/文件" #: merge-recursive.c:3420 #, 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:3429 #, c-format msgid "Adding %s" msgstr "添加 %s" #: merge-recursive.c:3438 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "冲突（add/add）：合并冲突于 %s" #: merge-recursive.c:3491 #, c-format msgid "merging of trees %s and %s failed" msgstr "无法合并树 %s 和 %s" #: merge-recursive.c:3585 msgid "Merging:" msgstr "合并：" #: merge-recursive.c:3598 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "发现 %u 个共同祖先：" msgstr[1] "发现 %u 个共同祖先：" #: merge-recursive.c:3648 msgid "merge returned no commit" msgstr "合并未返回提交" #: merge-recursive.c:3816 #, c-format msgid "Could not parse object '%s'" msgstr "不能解析对象 '%s'" #: merge-recursive.c:3834 builtin/merge.c:718 builtin/merge.c:904 #: builtin/stash.c:489 msgid "Unable to write index." msgstr "不能写入索引。" #: merge.c:41 msgid "failed to read the cache" msgstr "读取缓存失败" #: merge.c:102 rerere.c:704 builtin/am.c:1933 builtin/am.c:1967 #: builtin/checkout.c:590 builtin/checkout.c:842 builtin/clone.c:706 #: builtin/stash.c:269 msgid "unable to write new index file" msgstr "无法写新的索引文件" #: midx.c:78 msgid "multi-pack-index OID fanout is of the wrong size" msgstr "多包索引的对象ID扇出表大小错误" #: midx.c:109 #, c-format msgid "multi-pack-index file %s is too small" msgstr "多包索引文件 %s 太小" #: midx.c:125 #, c-format msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" msgstr "多包索引签名 0x%08x 和签名 0x%08x 不匹配" #: midx.c:130 #, c-format msgid "multi-pack-index version %d not recognized" msgstr "multi-pack-index 版本 %d 不能被识别" #: midx.c:135 #, c-format msgid "multi-pack-index hash version %u does not match version %u" msgstr "多包索引哈希版本 %u 和版本 %u 不匹配" #: midx.c:152 msgid "multi-pack-index missing required pack-name chunk" msgstr "多包索引缺少必需的包名块" #: midx.c:154 msgid "multi-pack-index missing required OID fanout chunk" msgstr "多包索引缺少必需的对象 ID 扇出块" #: midx.c:156 msgid "multi-pack-index missing required OID lookup chunk" msgstr "多包索引缺少必需的对象 ID 查询块" #: midx.c:158 msgid "multi-pack-index missing required object offsets chunk" msgstr "多包索引缺少必需的对象偏移块" #: midx.c:174 #, c-format msgid "multi-pack-index pack names out of order: '%s' before '%s'" msgstr "多包索引包名无序：'%s' 在 '%s' 之前" #: midx.c:221 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "错的 pack-int-id：%u（共有 %u 个包）" #: midx.c:271 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "多包索引存储一个64位偏移，但是 off_t 太小" #: midx.c:502 #, c-format msgid "failed to add packfile '%s'" msgstr "添加包文件 '%s' 失败" #: midx.c:508 #, c-format msgid "failed to open pack-index '%s'" msgstr "打开包索引 '%s' 失败" #: midx.c:576 #, c-format msgid "failed to locate object %d in packfile" msgstr "在包文件中定位对象 %d 失败" #: midx.c:892 msgid "cannot store reverse index file" msgstr "无法存储反向索引文件" #: midx.c:990 #, c-format msgid "could not parse line: %s" msgstr "不能解析行： %s" #: midx.c:992 #, c-format msgid "malformed line: %s" msgstr "格式错误的行：%s" #: midx.c:1159 msgid "ignoring existing multi-pack-index; checksum mismatch" msgstr "忽略已存在的多包索引，校验码不匹配" #: midx.c:1184 msgid "could not load pack" msgstr "不能载入包" #: midx.c:1190 #, c-format msgid "could not open index for %s" msgstr "不能打开 %s 的索引" #: midx.c:1201 msgid "Adding packfiles to multi-pack-index" msgstr "添加包文件到多包索引" #: midx.c:1244 #, c-format msgid "unknown preferred pack: '%s'" msgstr "未知的首选包：'%s'" #: midx.c:1289 #, c-format msgid "cannot select preferred pack %s with no objects" msgstr "不能选择没有对象的首选包 %s" #: midx.c:1321 #, c-format msgid "did not see pack-file %s to drop" msgstr "没有看到要丢弃的包文件 %s" #: midx.c:1367 #, c-format msgid "preferred pack '%s' is expired" msgstr "首选包 '%s' 已过期" #: midx.c:1380 msgid "no pack files to index." msgstr "没有要索引的包文件。" #: midx.c:1417 msgid "could not write multi-pack bitmap" msgstr "无法写入多包位图" #: midx.c:1427 msgid "could not write multi-pack-index" msgstr "无法写入多包索引" #: midx.c:1486 builtin/clean.c:37 #, c-format msgid "failed to remove %s" msgstr "删除 %s 失败" #: midx.c:1517 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "清理位于 %s 的多包索引失败" #: midx.c:1577 msgid "multi-pack-index file exists, but failed to parse" msgstr "多包索引文件存在，但无法解析" #: midx.c:1585 msgid "incorrect checksum" msgstr "不正确的校验码" #: midx.c:1588 msgid "Looking for referenced packfiles" msgstr "正在查找引用的包文件" #: midx.c:1603 #, c-format msgid "" "oid fanout out of order: fanout[%d] = % > % = fanout[%d]" msgstr "对象 ID 扇出无序：fanout[%d] = % > % = fanout[%d]" #: midx.c:1608 msgid "the midx contains no oid" msgstr "midx 不包含 oid" #: midx.c:1617 msgid "Verifying OID order in multi-pack-index" msgstr "校验多包索引中的 OID 顺序" #: midx.c:1626 #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" msgstr "对象 ID 查询无序：oid[%d] = %s >= %s = oid[%d]" #: midx.c:1646 msgid "Sorting objects by packfile" msgstr "通过包文件为对象排序" #: midx.c:1653 msgid "Verifying object offsets" msgstr "校验对象偏移" #: midx.c:1669 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "为 oid[%d] = %s 加载包条目失败" #: midx.c:1675 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "为包文件 %s 加载包索引失败" #: midx.c:1684 #, c-format msgid "incorrect object offset for oid[%d] = %s: % != %" msgstr "oid[%d] = %s 错误的对象偏移：% != %" #: midx.c:1709 msgid "Counting referenced objects" msgstr "正在对引用对象计数" #: midx.c:1719 msgid "Finding and deleting unreferenced packfiles" msgstr "正在查找和删除未引用的包文件" #: midx.c:1911 msgid "could not start pack-objects" msgstr "不能开始 pack-objects" #: midx.c:1931 msgid "could not finish pack-objects" msgstr "不能结束 pack-objects" #: name-hash.c:542 #, c-format msgid "unable to create lazy_dir thread: %s" msgstr "不能创建 lazy_dir 线程：%s" #: name-hash.c:564 #, c-format msgid "unable to create lazy_name thread: %s" msgstr "不能创建 lazy_name 线程：%s" #: name-hash.c:570 #, c-format msgid "unable to join lazy_name thread: %s" msgstr "不能加入 lazy_name 线程：%s" #: notes-merge.c:277 #, c-format msgid "" "You have not concluded your previous notes merge (%s exists).\n" "Please, use 'git notes merge --commit' or 'git notes merge --abort' to " "commit/abort the previous merge before you start a new notes merge." msgstr "" "您的前一次注释合并尚未结束（存在 %s）。\n" "在开始一个新的注释合并之前，请使用 'git notes merge --commit' 或者 'git " "notes merge --abort' 来提交/终止前一次合并。" #: notes-merge.c:284 #, c-format msgid "You have not concluded your notes merge (%s exists)." msgstr "您尚未结束注释合并（存在 %s）。" #: notes-utils.c:46 msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "不能提交未初始化/未引用的注解树" #: notes-utils.c:105 #, c-format msgid "Bad notes.rewriteMode value: '%s'" msgstr "坏的 notes.rewriteMode 值：'%s'" #: notes-utils.c:115 #, 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:145 #, c-format msgid "Bad %s value: '%s'" msgstr "坏的 %s 值：'%s'" #: object-file.c:459 #, c-format msgid "object directory %s does not exist; check .git/objects/info/alternates" msgstr "对象目录 %s 不存在，检查 .git/objects/info/alternates" #: object-file.c:517 #, c-format msgid "unable to normalize alternate object path: %s" msgstr "无法规范化备用对象路径：%s" #: object-file.c:591 #, c-format msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "%s：忽略备用对象库，嵌套太深" #: object-file.c:598 #, c-format msgid "unable to normalize object directory: %s" msgstr "无法规范化对象目录: %s" #: object-file.c:641 msgid "unable to fdopen alternates lockfile" msgstr "无法 fdopen 替换锁文件" #: object-file.c:659 msgid "unable to read alternates file" msgstr "无法读取替代文件" #: object-file.c:666 msgid "unable to move new alternates file into place" msgstr "无法将新的替代文件移动到位" #: object-file.c:701 #, c-format msgid "path '%s' does not exist" msgstr "路径 '%s' 不存在" #: object-file.c:722 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。" #: object-file.c:728 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "参考仓库 '%s' 不是一个本地仓库。" #: object-file.c:734 #, c-format msgid "reference repository '%s' is shallow" msgstr "参考仓库 '%s' 是一个浅克隆" #: object-file.c:742 #, c-format msgid "reference repository '%s' is grafted" msgstr "参考仓库 '%s' 已被移植" #: object-file.c:773 #, c-format msgid "could not find object directory matching %s" msgstr "无法找到和 %s 匹配的对象目录" #: object-file.c:823 #, c-format msgid "invalid line while parsing alternate refs: %s" msgstr "解析备用引用时无效的行：%s" #: object-file.c:973 #, c-format msgid "attempting to mmap % over limit %" msgstr "尝试 mmap %，超过了最大值 %" #: object-file.c:1008 #, c-format msgid "mmap failed%s" msgstr "mmap 失败%s" #: object-file.c:1174 #, c-format msgid "object file %s is empty" msgstr "对象文件 %s 为空" #: object-file.c:1293 object-file.c:2499 #, c-format msgid "corrupt loose object '%s'" msgstr "损坏的松散对象 '%s'" #: object-file.c:1295 object-file.c:2503 #, c-format msgid "garbage at end of loose object '%s'" msgstr "松散对象 '%s' 后面有垃圾数据" #: object-file.c:1417 #, c-format msgid "unable to parse %s header" msgstr "无法解析 %s 头部" #: object-file.c:1419 msgid "invalid object type" msgstr "无效的对象类型" #: object-file.c:1430 #, c-format msgid "unable to unpack %s header" msgstr "无法解开 %s 头部" #: object-file.c:1434 #, c-format msgid "header for %s too long, exceeds %d bytes" msgstr "%s 的头部太长，超出了 %d 字节" #: object-file.c:1664 #, c-format msgid "failed to read object %s" msgstr "读取对象 %s 失败" #: object-file.c:1668 #, c-format msgid "replacement %s not found for %s" msgstr "找不到 %2$s 的替代 %1$s" #: object-file.c:1672 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "松散对象 %s（保存在 %s）已损坏" #: object-file.c:1676 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "打包对象 %s（保存在 %s）已损坏" #: object-file.c:1781 #, c-format msgid "unable to write file %s" msgstr "无法写文件 %s" #: object-file.c:1788 #, c-format msgid "unable to set permission to '%s'" msgstr "无法为 '%s' 设置权限" #: object-file.c:1795 msgid "file write error" msgstr "文件写错误" #: object-file.c:1815 msgid "error when closing loose object file" msgstr "关闭松散对象文件时出错" #: object-file.c:1882 #, c-format msgid "insufficient permission for adding an object to repository database %s" msgstr "权限不足，无法在仓库对象库 %s 中添加对象" #: object-file.c:1884 msgid "unable to create temporary file" msgstr "无法创建临时文件" #: object-file.c:1908 msgid "unable to write loose object file" msgstr "不能写松散对象文件" #: object-file.c:1914 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "不能压缩新对象 %s（%d）" #: object-file.c:1918 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "在对象 %s 上调用 deflateEnd 失败（%d）" #: object-file.c:1922 #, c-format msgid "confused by unstable object source data for %s" msgstr "被 %s 的不稳定对象源数据搞糊涂了" #: object-file.c:1933 builtin/pack-objects.c:1243 #, c-format msgid "failed utime() on %s" msgstr "在 %s 上调用 utime() 失败" #: object-file.c:2011 #, c-format msgid "cannot read object for %s" msgstr "不能读取对象 %s" #: object-file.c:2062 msgid "corrupt commit" msgstr "损坏的提交" #: object-file.c:2070 msgid "corrupt tag" msgstr "损坏的标签" #: object-file.c:2170 #, c-format msgid "read error while indexing %s" msgstr "索引 %s 时读取错误" #: object-file.c:2173 #, c-format msgid "short read while indexing %s" msgstr "索引 %s 时读入不完整" #: object-file.c:2246 object-file.c:2256 #, c-format msgid "%s: failed to insert into database" msgstr "%s：插入数据库失败" #: object-file.c:2262 #, c-format msgid "%s: unsupported file type" msgstr "%s：不支持的文件类型" #: object-file.c:2286 builtin/fetch.c:1445 #, c-format msgid "%s is not a valid object" msgstr "%s 不是一个有效的对象" #: object-file.c:2288 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s 不是一个有效的 '%s' 对象" #: object-file.c:2315 #, c-format msgid "unable to open %s" msgstr "不能打开 %s" #: object-file.c:2510 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "%s 的哈希值不匹配（预期 %s）" #: object-file.c:2533 #, c-format msgid "unable to mmap %s" msgstr "不能 mmap %s" #: object-file.c:2539 #, c-format msgid "unable to unpack header of %s" msgstr "无法解压缩 %s 的头部" #: object-file.c:2544 #, c-format msgid "unable to parse header of %s" msgstr "无法解析 %s 的头部" #: object-file.c:2555 #, c-format msgid "unable to unpack contents of %s" msgstr "无法解压缩 %s 的内容" #: object-name.c:480 #, c-format msgid "short object ID %s is ambiguous" msgstr "短对象ID %s 存在歧义" #: object-name.c:491 msgid "The candidates are:" msgstr "候选者有：" #: object-name.c:790 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 switch -c $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 switch -c $br $(git rev-parse ...)\n" "\n" "当 \"$br\" 某种原因空白时，一个40位十六进制的引用将被创建。请检查这些\n" "引用，可能需要删除它们。运行 \"git config advice.objectNameWarning\n" "false\" 命令关闭本消息通知。" #: object-name.c:910 #, c-format msgid "log for '%.*s' only goes back to %s" msgstr "'%.*s' 的日志仅能回到 %s" #: object-name.c:918 #, c-format msgid "log for '%.*s' only has %d entries" msgstr "'%.*s' 的日志仅有 %d 个条目" #: object-name.c:1696 #, c-format msgid "path '%s' exists on disk, but not in '%.*s'" msgstr "路径 '%s' 在磁盘上，但是不在 '%.*s' 中" #: object-name.c:1702 #, c-format msgid "" "path '%s' exists, but not '%s'\n" "hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?" msgstr "" "路径 '%s' 存在，而 '%s' 不存在\n" "提示：您的意思是 '%.*s:%s' 亦即 '%.*s:./%s'？" #: object-name.c:1711 #, c-format msgid "path '%s' does not exist in '%.*s'" msgstr "路径 '%s' 不在 '%.*s' 中" #: object-name.c:1739 #, c-format msgid "" "path '%s' is in the index, but not at stage %d\n" "hint: Did you mean ':%d:%s'?" msgstr "" "路径 '%s' 在索引中，但不在暂存区 %d 中\n" "提示：您的意思是 ':%d:%s'？" #: object-name.c:1755 #, c-format msgid "" "path '%s' is in the index, but not '%s'\n" "hint: Did you mean ':%d:%s' aka ':%d:./%s'?" msgstr "" "路径 '%s' 在索引中，但 '%s' 不在\n" "提示：您的意思是 ':%d:%s' 亦即 ':%d:./%s'？" #: object-name.c:1763 #, c-format msgid "path '%s' exists on disk, but not in the index" msgstr "路径 '%s' 在磁盘上，但不在索引里" #: object-name.c:1765 #, c-format msgid "path '%s' does not exist (neither on disk nor in the index)" msgstr "路径 '%s' 不存在（既不在磁盘上，也不在索引中）" #: object-name.c:1778 msgid "relative path syntax can't be used outside working tree" msgstr "不能在工作区之外使用相对路径语法" #: object-name.c:1916 #, c-format msgid "invalid object name '%.*s'." msgstr "无效的对象名 '%.*s'。" #: object.c:53 #, c-format msgid "invalid object type \"%s\"" msgstr "无效的对象类型 \"%s\"" #: object.c:173 #, c-format msgid "object %s is a %s, not a %s" msgstr "对象 %s 是一个 %s，不是一个 %s" #: object.c:250 #, c-format msgid "object %s has unknown type id %d" msgstr "对象 %s 有未知的类型 id %d" #: object.c:263 #, c-format msgid "unable to parse object: %s" msgstr "不能解析对象：%s" #: object.c:283 object.c:295 #, c-format msgid "hash mismatch %s" msgstr "哈希值与 %s 不匹配" #: pack-bitmap.c:348 msgid "multi-pack bitmap is missing required reverse index" msgstr "多包位图缺少必需的反向索引" #: pack-bitmap.c:424 msgid "load_reverse_index: could not open pack" msgstr "load_reverse_index：无法打开包" #: pack-bitmap.c:1064 pack-bitmap.c:1070 builtin/pack-objects.c:2424 #, c-format msgid "unable to get size of %s" msgstr "无法得到 %s 的大小" #: pack-bitmap.c:1916 #, c-format msgid "could not find %s in pack %s at offset %" msgstr "在包 %2$s 偏移 %3$ 中无法找到 %1$s" #: pack-bitmap.c:1952 builtin/rev-list.c:92 #, c-format msgid "unable to get disk usage of %s" msgstr "无法得到 %s 的磁盘使用量" #: pack-revindex.c:221 #, c-format msgid "reverse-index file %s is too small" msgstr "反向索引文件 %s 太小" #: pack-revindex.c:226 #, c-format msgid "reverse-index file %s is corrupt" msgstr "反向索引文件 %s 损坏" #: pack-revindex.c:234 #, c-format msgid "reverse-index file %s has unknown signature" msgstr "反向索引文件 %s 有错误的签名" #: pack-revindex.c:238 #, c-format msgid "reverse-index file %s has unsupported version %" msgstr "反向索引文件 %s 不支持的版本 %" #: pack-revindex.c:243 #, c-format msgid "reverse-index file %s has unsupported hash id %" msgstr "反向索引文件 %s 有不支持的哈希 ID %" #: pack-write.c:251 msgid "cannot both write and verify reverse index" msgstr "无法同时写入和校验反向索引" #: pack-write.c:270 #, c-format msgid "could not stat: %s" msgstr "不能调用 stat：%s" #: pack-write.c:282 #, c-format msgid "failed to make %s readable" msgstr "无法设置 %s 为可读" #: pack-write.c:520 #, c-format msgid "could not write '%s' promisor file" msgstr "无法写入 '%s' 承诺者文件" #: packfile.c:626 msgid "offset before end of packfile (broken .idx?)" msgstr "偏移量在包文件结束之前（损坏的 .idx？）" #: packfile.c:656 #, c-format msgid "packfile %s cannot be mapped%s" msgstr "包文件 %s 不能被映射%s" #: packfile.c:1923 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "偏移量在 %s 的包索引开始之前（损坏的索引？）" #: packfile.c:1927 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "偏移量越过了 %s 的包索引的结尾（被截断的索引？）" #: parse-options-cb.c:20 parse-options-cb.c:24 builtin/commit-graph.c:175 #, c-format msgid "option `%s' expects a numerical value" msgstr "选项 `%s' 期望一个数字值" #: parse-options-cb.c:41 #, c-format msgid "malformed expiration date '%s'" msgstr "格式错误的到期时间：'%s'" #: parse-options-cb.c:54 #, c-format msgid "option `%s' expects \"always\", \"auto\", or \"never\"" msgstr "选项 `%s' 期望 \"always\"、\"auto\" 或 \"never\"" #: parse-options-cb.c:132 parse-options-cb.c:149 #, c-format msgid "malformed object name '%s'" msgstr "格式错误的对象名 '%s'" #: parse-options.c:58 #, c-format msgid "%s requires a value" msgstr "%s 需要一个值" #: parse-options.c:93 #, c-format msgid "%s is incompatible with %s" msgstr "%s 与 %s 不兼容" #: parse-options.c:98 #, c-format msgid "%s : incompatible with something else" msgstr "%s：和其它的不兼容" #: parse-options.c:112 parse-options.c:116 #, c-format msgid "%s takes no value" msgstr "%s 不取值" #: parse-options.c:114 #, c-format msgid "%s isn't available" msgstr "%s 不可用" #: parse-options.c:237 #, c-format msgid "%s expects a non-negative integer value with an optional k/m/g suffix" msgstr "%s 期望一个非负整数和一个可选的 k/m/g 后缀" #: parse-options.c:393 #, c-format msgid "ambiguous option: %s (could be --%s%s or --%s%s)" msgstr "有歧义的选项：%s（可以是 --%s%s 或 --%s%s）" #: parse-options.c:427 parse-options.c:435 #, c-format msgid "did you mean `--%s` (with two dashes)?" msgstr "您的意思是 `--%s`（有两个短线）？" #: parse-options.c:677 parse-options.c:1053 #, c-format msgid "alias of --%s" msgstr "--%s 的别名" #: parse-options.c:891 #, c-format msgid "unknown option `%s'" msgstr "未知选项 `%s'" #: parse-options.c:893 #, c-format msgid "unknown switch `%c'" msgstr "未知开关 `%c'" #: parse-options.c:895 #, c-format msgid "unknown non-ascii option in string: `%s'" msgstr "字符串中未知的非 ascii 字符选项：`%s'" #: parse-options.c:919 msgid "..." msgstr "..." #: parse-options.c:933 #, c-format msgid "usage: %s" msgstr "用法：%s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. #: parse-options.c:948 #, c-format msgid " or: %s" msgstr " 或：%s" #. TRANSLATORS: You should only need to translate this format #. string if your language is a RTL language (e.g. Arabic, #. Hebrew etc.), not if it's a LTR language (e.g. German, #. Russian, Chinese etc.). #. * #. When a translated usage string has an embedded "\n" it's #. because options have wrapped to the next line. The line #. after the "\n" will then be padded to align with the #. command name, such as N_("git cmd [opt]\n<8 #. spaces>[opt2]"), where the 8 spaces are the same length as #. "git cmd ". #. * #. This format string prints out that already-translated #. line. The "%*s" is whitespace padding to account for the #. padding at the start of the line that we add in this #. function. The "%s" is a line in the (hopefully already #. translated) N_() usage string, which contained embedded #. newlines before we split it up. #. #: parse-options.c:969 #, c-format msgid "%*s%s" msgstr "%*s%s" # 译者：为保证在输出中对齐，注意调整句中空格！ #: parse-options.c:992 #, c-format msgid " %s" msgstr " %s" #: parse-options.c:1039 msgid "-NUM" msgstr "-数字" #: path.c:922 #, c-format msgid "Could not make %s writable by group" msgstr "不能设置 %s 为组可写" #: pathspec.c:150 msgid "Escape character '\\' not allowed as last character in attr value" msgstr "转义字符 '\\' 不能作为属性值的最后一个字符" #: pathspec.c:168 msgid "Only one 'attr:' specification is allowed." msgstr "只允许一个 'attr:' 规格。" #: pathspec.c:171 msgid "attr spec must not be empty" msgstr "属性规格不能为空" #: pathspec.c:214 #, c-format msgid "invalid attribute name %s" msgstr "无效的属性名 %s" #: pathspec.c:279 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容" #: pathspec.c:286 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容" #: pathspec.c:326 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "路径规格包含无效的神奇前缀" #: pathspec.c:347 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'" #: pathspec.c:352 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'" #: pathspec.c:390 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'" #: pathspec.c:449 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "%s：'literal' 和 'glob' 不兼容" #: pathspec.c:465 #, c-format msgid "%s: '%s' is outside repository at '%s'" msgstr "%s：'%s' 在位于 '%s' 的仓库之外" #: pathspec.c:541 #, c-format msgid "'%s' (mnemonic: '%c')" msgstr "'%s'（助记符：'%c'）" #: pathspec.c:551 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "%s：路径规格神奇前缀不被此命令支持：%s" #: pathspec.c:618 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "路径规格 '%s' 位于符号链接中" #: pathspec.c:663 #, c-format msgid "line is badly quoted: %s" msgstr "行被错误地引用：%s" #: pkt-line.c:92 msgid "unable to write flush packet" msgstr "无法写 flush 包" #: pkt-line.c:99 msgid "unable to write delim packet" msgstr "无法写 delim 包" #: pkt-line.c:106 msgid "unable to write response end packet" msgstr "无法写入响应结束数据包" #: pkt-line.c:113 msgid "flush packet write failed" msgstr "flush 包写错误" #: pkt-line.c:153 msgid "protocol error: impossibly long line" msgstr "协议错误：不可能的长行" #: pkt-line.c:169 pkt-line.c:171 msgid "packet write with format failed" msgstr "格式化包写入错误" #: pkt-line.c:204 pkt-line.c:252 msgid "packet write failed - data exceeds max packet size" msgstr "写数据包失败：数据超过了包的最大长度" #: pkt-line.c:222 #, c-format msgid "packet write failed: %s" msgstr "数据包写入失败：%s" #: pkt-line.c:349 pkt-line.c:350 msgid "read error" msgstr "读取错误" #: pkt-line.c:360 pkt-line.c:361 msgid "the remote end hung up unexpectedly" msgstr "远端意外挂断了" #: pkt-line.c:390 pkt-line.c:392 #, c-format msgid "protocol error: bad line length character: %.4s" msgstr "协议错误：错误的行长度字符串：%.4s" #: pkt-line.c:407 pkt-line.c:409 pkt-line.c:415 pkt-line.c:417 #, c-format msgid "protocol error: bad line length %d" msgstr "协议错误：错误的行长度 %d" #: pkt-line.c:434 sideband.c:165 #, c-format msgid "remote error: %s" msgstr "远程错误：%s" #: preload-index.c:125 msgid "Refreshing index" msgstr "正在刷新索引" #: preload-index.c:144 #, c-format msgid "unable to create threaded lstat: %s" msgstr "无法创建线程 lstat：%s" #: pretty.c:988 msgid "unable to parse --pretty format" msgstr "不能解析 --pretty 格式" #: promisor-remote.c:31 msgid "promisor-remote: unable to fork off fetch subprocess" msgstr "promisor-remote：无法派生 fetch 子进程" #: promisor-remote.c:38 promisor-remote.c:40 msgid "promisor-remote: could not write to fetch subprocess" msgstr "promisor-remote：无法向 fetch 子进程写入" #: promisor-remote.c:44 msgid "promisor-remote: could not close stdin to fetch subprocess" msgstr "promisor-remote：无法关闭至 fetch 子进程的标准输入" #: promisor-remote.c:54 #, c-format msgid "promisor remote name cannot begin with '/': %s" msgstr "promisor 远程名称不能以 '/' 开始：%s" #: protocol-caps.c:103 msgid "object-info: expected flush after arguments" msgstr "object-info：在参数之后应有一个 flush" #: prune-packed.c:35 msgid "Removing duplicate objects" msgstr "正在删除重复对象" #: range-diff.c:67 msgid "could not start `log`" msgstr "不能启动 `log`" #: range-diff.c:69 msgid "could not read `log` output" msgstr "不能读取 `log` 的输出" #: range-diff.c:97 sequencer.c:5603 #, c-format msgid "could not parse commit '%s'" msgstr "不能解析提交 '%s'" #: range-diff.c:111 #, c-format msgid "" "could not parse first line of `log` output: did not start with 'commit ': " "'%s'" msgstr "无法解析 `log` 输出的首行：不是以 'commit ' 开头：'%s'" #: range-diff.c:137 #, c-format msgid "could not parse git header '%.*s'" msgstr "无法解析 git 头 '%.*s'" #: range-diff.c:304 msgid "failed to generate diff" msgstr "生成 diff 失败" #: range-diff.c:559 msgid "--left-only and --right-only are mutually exclusive" msgstr "--left-only 和 --right-only 互斥" #: range-diff.c:562 range-diff.c:564 #, c-format msgid "could not parse log for '%s'" msgstr "不能解析 '%s' 的日志" #: read-cache.c:710 #, c-format msgid "will not add file alias '%s' ('%s' already exists in index)" msgstr "将不会添加文件别名 '%s'（'%s' 已经存在于索引中）" #: read-cache.c:726 msgid "cannot create an empty blob in the object database" msgstr "不能在对象数据库中创建空的数据对象" #: read-cache.c:748 #, c-format msgid "%s: can only add regular files, symbolic links or git-directories" msgstr "%s：只能添加常规文件、符号链接或 git 目录" #: read-cache.c:753 builtin/submodule--helper.c:3241 #, c-format msgid "'%s' does not have a commit checked out" msgstr "'%s' 没有检出一个提交" #: read-cache.c:805 #, c-format msgid "unable to index file '%s'" msgstr "无法索引文件 '%s'" #: read-cache.c:824 #, c-format msgid "unable to add '%s' to index" msgstr "无法在索引中添加 '%s'" #: read-cache.c:835 #, c-format msgid "unable to stat '%s'" msgstr "无法对 %s 执行 stat" #: read-cache.c:1373 #, c-format msgid "'%s' appears as both a file and as a directory" msgstr "'%s' 看起来既是文件又是目录" #: read-cache.c:1588 msgid "Refresh index" msgstr "刷新索引" #: read-cache.c:1720 #, c-format msgid "" "index.version set, but the value is invalid.\n" "Using version %i" msgstr "" "设置了 index.version，但是取值无效。\n" "使用版本 %i" #: read-cache.c:1730 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" "Using version %i" msgstr "" "设置了 GIT_INDEX_VERSION，但是取值无效。\n" "使用版本 %i" #: read-cache.c:1786 #, c-format msgid "bad signature 0x%08x" msgstr "坏的签名 0x%08x" #: read-cache.c:1789 #, c-format msgid "bad index version %d" msgstr "坏的索引版本 %d" #: read-cache.c:1798 msgid "bad index file sha1 signature" msgstr "坏的索引文件 sha1 签名" #: read-cache.c:1832 #, c-format msgid "index uses %.4s extension, which we do not understand" msgstr "索引使用不被支持的 %.4s 扩展" # #: read-cache.c:1834 #, c-format msgid "ignoring %.4s extension" msgstr "忽略 %.4s 扩展" #: read-cache.c:1871 #, c-format msgid "unknown index entry format 0x%08x" msgstr "未知的索引条目格式 0x%08x" #: read-cache.c:1887 #, c-format msgid "malformed name field in the index, near path '%s'" msgstr "索引中靠近路径 '%s' 有错误的名称字段" #: read-cache.c:1944 msgid "unordered stage entries in index" msgstr "索引中有未排序的暂存条目" #: read-cache.c:1947 #, c-format msgid "multiple stage entries for merged file '%s'" msgstr "合并文件 '%s' 有多个暂存条目" #: read-cache.c:1950 #, c-format msgid "unordered stage entries for '%s'" msgstr "'%s' 的未排序暂存条目" #: read-cache.c:2065 read-cache.c:2363 rerere.c:549 rerere.c:583 rerere.c:1095 #: submodule.c:1662 builtin/add.c:603 builtin/check-ignore.c:183 #: builtin/checkout.c:519 builtin/checkout.c:708 builtin/clean.c:987 #: builtin/commit.c:378 builtin/diff-tree.c:122 builtin/grep.c:519 #: builtin/mv.c:148 builtin/reset.c:253 builtin/rm.c:293 #: builtin/submodule--helper.c:327 builtin/submodule--helper.c:3201 msgid "index file corrupt" msgstr "索引文件损坏" #: read-cache.c:2209 #, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "无法创建 load_cache_entries 线程：%s" #: read-cache.c:2222 #, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "无法加入 load_cache_entries 线程：%s" #: read-cache.c:2255 #, c-format msgid "%s: index file open failed" msgstr "%s：打开索引文件失败" #: read-cache.c:2259 #, c-format msgid "%s: cannot stat the open index" msgstr "%s：不能对打开的索引执行 stat 操作" #: read-cache.c:2263 #, c-format msgid "%s: index file smaller than expected" msgstr "%s：索引文件比预期的小" #: read-cache.c:2267 #, c-format msgid "%s: unable to map index file%s" msgstr "%s：无法映射索引文件%s" #: read-cache.c:2310 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "无法创建 load_index_extensions 线程：%s" #: read-cache.c:2337 #, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "无法加入 load_index_extensions 线程：%s" #: read-cache.c:2375 #, c-format msgid "could not freshen shared index '%s'" msgstr "无法刷新共享索引 '%s'" #: read-cache.c:2434 #, c-format msgid "broken index, expect %s in %s, got %s" msgstr "损坏的索引，期望在 %2$s 中的 %1$s，得到 %3$s" #: read-cache.c:3065 strbuf.c:1179 wrapper.c:641 builtin/merge.c:1147 #, c-format msgid "could not close '%s'" msgstr "不能关闭 '%s'" #: read-cache.c:3108 msgid "failed to convert to a sparse-index" msgstr "无法转换为稀疏索引" #: read-cache.c:3179 #, c-format msgid "could not stat '%s'" msgstr "不能对 '%s' 调用 stat" #: read-cache.c:3192 #, c-format msgid "unable to open git dir: %s" msgstr "不能打开 git 目录：%s" #: read-cache.c:3204 #, c-format msgid "unable to unlink: %s" msgstr "无法删除：%s" #: read-cache.c:3233 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "不能修复 '%s' 的权限位" #: read-cache.c:3390 #, c-format msgid "%s: cannot drop to stage #0" msgstr "%s：不能落到暂存区 #0" #: rebase-interactive.c:11 msgid "" "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" "continue'.\n" "Or you can abort the rebase with 'git rebase --abort'.\n" msgstr "" "您可以用 'git rebase --edit-todo' 修正，然后执行 'git rebase --continue'。\n" "或者您可以用 'git rebase --abort' 终止变基。\n" #: rebase-interactive.c:33 #, c-format msgid "" "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." msgstr "选项 rebase.missingCommitsCheck 的值 %s 无法识别。已忽略。" #: rebase-interactive.c:42 msgid "" "\n" "Commands:\n" "p, pick = use commit\n" "r, reword = use commit, but edit the commit message\n" "e, edit = use commit, but stop for amending\n" "s, squash = use commit, but meld into previous commit\n" "f, fixup [-C | -c] = like \"squash\" but keep only the previous\n" " commit's log message, unless -C is used, in which case\n" " keep only this commit's message; -c is same as -C but\n" " opens the editor\n" "x, exec = run command (the rest of the line) using shell\n" "b, break = stop here (continue rebase later with 'git rebase --continue')\n" "d, drop = remove commit\n" "l, label