# 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) | 提交号 # cone | 锥形（稀疏检出模型）；锥（稀疏检出） # conflict | 冲突 # core Git | 核心 Git 工具 # cover letter | 附函 # DAG | 有向无环图 # dangling object | 悬空对象 # detached HEAD | 分离头指针 # directory | 目录 # dirty | 脏（的工作区） # dumb HTTP protocol | 哑 HTTP 协议 # enlistment | 登记（在 scalar 中使用） # 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. 暂存 # stale | 过期的 # 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-2022. # msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List \n" "POT-Creation-Date: 2022-12-01 14:04+0000\n" "PO-Revision-Date: 2022-12-01 14:17+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 42.0\n" #: add-interactive.c #, c-format msgid "Huh (%s)?" msgstr "嗯（%s）？" #: add-interactive.c builtin/merge.c builtin/rebase.c reset.c sequencer.c msgid "could not read index" msgstr "不能读取索引" #: add-interactive.c git-add--interactive.perl msgid "binary" msgstr "二进制" #: add-interactive.c git-add--interactive.perl msgid "nothing" msgstr "无" #: add-interactive.c git-add--interactive.perl msgid "unchanged" msgstr "没有修改" #: add-interactive.c git-add--interactive.perl msgid "Update" msgstr "更新" #: add-interactive.c #, c-format msgid "could not stage '%s'" msgstr "不能暂存 '%s'" #: add-interactive.c builtin/stash.c reset.c sequencer.c msgid "could not write index" msgstr "不能写入索引" #: add-interactive.c git-add--interactive.perl #, 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 git-add--interactive.perl #, c-format, perl-format msgid "note: %s is untracked now.\n" msgstr "说明：%s 现已成为未跟踪的。\n" #: add-interactive.c apply.c builtin/checkout.c builtin/reset.c #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "对路径 '%s' 的 make_cache_entry 操作失败" #: add-interactive.c git-add--interactive.perl msgid "Revert" msgstr "还原" #: add-interactive.c msgid "Could not parse HEAD^{tree}" msgstr "不能解析 HEAD^{tree}" #: add-interactive.c git-add--interactive.perl #, 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 git-add--interactive.perl #, c-format msgid "No untracked files.\n" msgstr "没有未跟踪的文件。\n" #: add-interactive.c git-add--interactive.perl msgid "Add untracked" msgstr "添加未跟踪的" #: add-interactive.c git-add--interactive.perl #, 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 #, c-format msgid "ignoring unmerged: %s" msgstr "忽略未合入的：%s" #: add-interactive.c add-patch.c git-add--interactive.perl #, c-format msgid "Only binary files changed.\n" msgstr "只有二进制文件被修改。\n" #: add-interactive.c add-patch.c git-add--interactive.perl #, c-format msgid "No changes.\n" msgstr "没有修改。\n" #: add-interactive.c git-add--interactive.perl msgid "Patch update" msgstr "补丁更新" #: add-interactive.c git-add--interactive.perl msgid "Review diff" msgstr "检视 diff" #: add-interactive.c msgid "show paths with changes" msgstr "显示含变更的路径" #: add-interactive.c msgid "add working tree state to the staged set of changes" msgstr "将工作区状态添加到暂存区修改集中" #: add-interactive.c msgid "revert staged set of changes back to the HEAD version" msgstr "将暂存的修改集恢复为 HEAD 版本" #: add-interactive.c msgid "pick hunks and update selectively" msgstr "挑选数据块并有选择地更新" #: add-interactive.c msgid "view diff between HEAD and index" msgstr "显示 HEAD 和索引的差异" #: add-interactive.c msgid "add contents of untracked files to the staged set of changes" msgstr "将未跟踪文件的内容添加到暂存区修改集中" #: add-interactive.c msgid "Prompt help:" msgstr "帮助：" #: add-interactive.c msgid "select a single item" msgstr "选择一个条目" #: add-interactive.c msgid "select a range of items" msgstr "选择一系列条目" #: add-interactive.c msgid "select multiple ranges" msgstr "选择多个范围" #: add-interactive.c msgid "select item based on unique prefix" msgstr "基于唯一前缀选择条目" #: add-interactive.c msgid "unselect specified items" msgstr "反选指定的条目" #: add-interactive.c msgid "choose all items" msgstr "选择所有条目" #: add-interactive.c msgid "(empty) finish selecting" msgstr "（空）结束选择" #: add-interactive.c msgid "select a numbered item" msgstr "选择一个编号条目" #: add-interactive.c msgid "(empty) select nothing" msgstr "（空）不选择任何内容" #: add-interactive.c builtin/clean.c git-add--interactive.perl msgid "*** Commands ***" msgstr "*** 命令 ***" #: add-interactive.c builtin/clean.c git-add--interactive.perl msgid "What now" msgstr "请选择" #: add-interactive.c git-add--interactive.perl msgid "staged" msgstr "缓存" #: add-interactive.c git-add--interactive.perl msgid "unstaged" msgstr "未缓存" #: add-interactive.c apply.c builtin/am.c builtin/bugreport.c builtin/clone.c #: builtin/diagnose.c builtin/fetch.c builtin/merge.c builtin/pull.c #: builtin/submodule--helper.c git-add--interactive.perl msgid "path" msgstr "路径" #: add-interactive.c msgid "could not refresh index" msgstr "不能刷新索引" #: add-interactive.c builtin/clean.c git-add--interactive.perl #, c-format msgid "Bye.\n" msgstr "再见。\n" #: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Stage mode change [y,n,q,a,d%s,?]? " msgstr "暂存模式变更 [y,n,q,a,d%s,?]? " #: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Stage deletion [y,n,q,a,d%s,?]? " msgstr "暂存删除动作 [y,n,q,a,d%s,?]? " #: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Stage addition [y,n,q,a,d%s,?]? " msgstr "暂存添加动作 [y,n,q,a,d%s,?]? " #: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Stage this hunk [y,n,q,a,d%s,?]? " msgstr "暂存该块 [y,n,q,a,d%s,?]? " #: add-patch.c msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "staging." msgstr "如果补丁能正确地应用，编辑块将立即标记为暂存。" #: add-patch.c 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 git-add--interactive.perl #, c-format, perl-format msgid "Stash mode change [y,n,q,a,d%s,?]? " msgstr "贮藏模式变更 [y,n,q,a,d%s,?]? " #: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Stash deletion [y,n,q,a,d%s,?]? " msgstr "贮藏删除动作 [y,n,q,a,d%s,?]? " #: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Stash addition [y,n,q,a,d%s,?]? " msgstr "贮藏添加动作 [y,n,q,a,d%s,?]? " #: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Stash this hunk [y,n,q,a,d%s,?]? " msgstr "贮藏该块 [y,n,q,a,d%s,?]? " #: add-patch.c msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "stashing." msgstr "如果补丁能正确地应用，编辑块将立即标记为贮藏。" #: add-patch.c 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 git-add--interactive.perl #, c-format, perl-format msgid "Unstage mode change [y,n,q,a,d%s,?]? " msgstr "取消暂存模式变更 [y,n,q,a,d%s,?]? " #: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Unstage deletion [y,n,q,a,d%s,?]? " msgstr "取消暂存删除动作 [y,n,q,a,d%s,?]? " #: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Unstage addition [y,n,q,a,d%s,?]? " msgstr "取消暂存添加动作 [y,n,q,a,d%s,?]? " #: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Unstage this hunk [y,n,q,a,d%s,?]? " msgstr "取消暂存该块 [y,n,q,a,d%s,?]? " #: add-patch.c msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "unstaging." msgstr "如果补丁能正确地应用，编辑块将立即标记为未暂存。" #: add-patch.c 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 git-add--interactive.perl #, 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 git-add--interactive.perl #, 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 git-add--interactive.perl #, 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 git-add--interactive.perl #, 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 msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "applying." msgstr "如果补丁能正确地应用，编辑块将立即标记为应用。" #: add-patch.c 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 git-add--interactive.perl #, 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 git-add--interactive.perl #, 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 git-add--interactive.perl #, 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 git-add--interactive.perl #, 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 msgid "" "If the patch applies cleanly, the edited hunk will immediately be marked for " "discarding." msgstr "如果补丁能正确地应用，编辑块将立即标记为丢弃。" #: add-patch.c 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 git-add--interactive.perl #, 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 git-add--interactive.perl #, 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 git-add--interactive.perl #, 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 git-add--interactive.perl #, 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 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 git-add--interactive.perl #, 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 git-add--interactive.perl #, 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 git-add--interactive.perl #, 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 git-add--interactive.perl #, 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 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 git-add--interactive.perl #, c-format, perl-format msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " msgstr "将模式变更应用到工作区 [y,n,q,a,d%s,?]? " #: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " msgstr "将删除操作应用到工作区 [y,n,q,a,d%s,?]? " #: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Apply addition to worktree [y,n,q,a,d%s,?]? " msgstr "将添加操作应用到工作区 [y,n,q,a,d%s,?]? " #: add-patch.c git-add--interactive.perl #, c-format, perl-format msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " msgstr "将该块应用到工作区 [y,n,q,a,d%s,?]? " #: add-patch.c 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 #, c-format msgid "could not parse hunk header '%.*s'" msgstr "无法解析数据块头信息 '%.*s'" #: add-patch.c msgid "could not parse diff" msgstr "不能解析差异信息" #: add-patch.c msgid "could not parse colored diff" msgstr "不能解析彩色差异信息" #: add-patch.c #, c-format msgid "failed to run '%s'" msgstr "无法运行 '%s'" #: add-patch.c msgid "mismatched output from interactive.diffFilter" msgstr "interactive.diffFilter 的输出不匹配" #: add-patch.c msgid "" "Your filter must maintain a one-to-one correspondence\n" "between its input and output lines." msgstr "您的过滤器必须在其输入和输出的行之间保持一一对应的关系。" #: add-patch.c #, c-format msgid "" "expected context line #%d in\n" "%.*s" msgstr "" "预期上下文行 #%d 于\n" "%.*s" #: add-patch.c #, 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 git-add--interactive.perl msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" msgstr "手动块编辑模式 -- 查看底部的快速指南。\n" #: add-patch.c #, 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" #. #-#-#-#-# git-add--interactive.perl.po #-#-#-#-# #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. #: add-patch.c git-add--interactive.perl 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 msgid "could not parse hunk header" msgstr "无法解析数据块头信息" #: add-patch.c msgid "'git apply --cached' failed" msgstr "'git apply --cached' 失败" #. #-#-#-#-# add-patch.c.po #-#-#-#-# #. TRANSLATORS: do not translate [y/n] #. The program will only accept that input at this point. #. Consider translating (saying "no" discards!) as #. (saying "n" for "no" discards!) if the translation #. of the word "no" does not start with n. #. #. #-#-#-#-# git-add--interactive.perl.po #-#-#-#-# #. 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 git-add--interactive.perl msgid "" "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " msgstr "您的编辑块不能被应用。重新编辑（选择 \"no\" 丢弃！） [y/n]? " #: add-patch.c msgid "The selected hunks do not apply to the index!" msgstr "选中的块不能应用到索引！" #: add-patch.c git-add--interactive.perl msgid "Apply them to the worktree anyway? " msgstr "无论如何都要应用到工作区么？" #: add-patch.c git-add--interactive.perl msgid "Nothing was applied.\n" msgstr "未应用。\n" #: add-patch.c 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 msgid "No previous hunk" msgstr "没有前一个块" #: add-patch.c msgid "No next hunk" msgstr "没有下一个块" #: add-patch.c msgid "No other hunks to goto" msgstr "没有其它可供跳转的块" #: add-patch.c git-add--interactive.perl msgid "go to which hunk ( to see more)? " msgstr "跳转到哪个块（<回车> 查看更多）？ " #: add-patch.c git-add--interactive.perl msgid "go to which hunk? " msgstr "跳转到哪个块？" #: add-patch.c #, c-format msgid "Invalid number: '%s'" msgstr "无效数字：'%s'" #: add-patch.c #, c-format msgid "Sorry, only %d hunk available." msgid_plural "Sorry, only %d hunks available." msgstr[0] "对不起，只有 %d 个可用块。" msgstr[1] "对不起，只有 %d 个可用块。" #: add-patch.c msgid "No other hunks to search" msgstr "没有其它可供查找的块" #: add-patch.c git-add--interactive.perl msgid "search for regex? " msgstr "使用正则表达式搜索？" #: add-patch.c #, c-format msgid "Malformed search regexp %s: %s" msgstr "错误的正则表达式 %s：%s" #: add-patch.c msgid "No hunk matches the given pattern" msgstr "没有和给定模式相匹配的块" #: add-patch.c msgid "Sorry, cannot split this hunk" msgstr "对不起，不能拆分这个块" #: add-patch.c #, c-format msgid "Split into %d hunks." msgstr "拆分为 %d 块。" #: add-patch.c msgid "Sorry, cannot edit this hunk" msgstr "对不起，不能编辑这个块" #: add-patch.c msgid "'git apply' failed" msgstr "'git apply' 失败" #: advice.c #, c-format msgid "" "\n" "Disable this message with \"git config advice.%s false\"" msgstr "" "\n" "使用 \"git config advice.%s false\" 来关闭此消息" #: advice.c #, c-format msgid "%shint: %.*s%s\n" msgstr "%s提示：%.*s%s\n" #: advice.c msgid "Cherry-picking is not possible because you have unmerged files." msgstr "无法拣选，因为您有未合并的文件。" #: advice.c msgid "Committing is not possible because you have unmerged files." msgstr "无法提交，因为您有未合并的文件。" #: advice.c msgid "Merging is not possible because you have unmerged files." msgstr "无法合并，因为您有未合并的文件。" #: advice.c msgid "Pulling is not possible because you have unmerged files." msgstr "无法拉取，因为您有未合并的文件。" #: advice.c msgid "Reverting is not possible because you have unmerged files." msgstr "无法回退，因为您有未合并的文件。" #: advice.c #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "无法 %s，因为您有未合并的文件。" #: advice.c 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 msgid "Exiting because of an unresolved conflict." msgstr "因为存在未解决的冲突而退出。" #: advice.c builtin/merge.c msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。" #: advice.c msgid "Please, commit your changes before merging." msgstr "请在合并前先提交您的修改。" #: advice.c msgid "Exiting because of unfinished merge." msgstr "因为存在未完成的合并而退出。" #: advice.c msgid "Not possible to fast-forward, aborting." msgstr "无法快进，终止。" #: advice.c #, 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 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 #, 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" #: advice.c #, c-format msgid "" "The following paths have been moved outside the\n" "sparse-checkout definition but are not sparse due to local\n" "modifications.\n" msgstr "" "下列的路径已经被移动至稀疏检出的定义之外，\n" "但是由于本地的修改而并非稀疏。\n" #: advice.c msgid "" "To correct the sparsity of these paths, do the following:\n" "* Use \"git add --sparse \" to update the index\n" "* Use \"git sparse-checkout reapply\" to apply the sparsity rules" msgstr "" "为了修正这些的路径的稀疏性，请运行下列命令：\n" "* 使用 \"git add --sparse <路径>\" 来更新索引\n" "* 使用 \"git sparse-checkout reapply\" 来应用稀疏规则" #: alias.c msgid "cmdline ends with \\" msgstr "命令行以 \\ 结尾" #: alias.c msgid "unclosed quote" msgstr "未关闭的引号" #: alias.c builtin/cat-file.c builtin/notes.c builtin/prune-packed.c #: builtin/receive-pack.c builtin/tag.c msgid "too many arguments" msgstr "太多参数" #: apply.c #, c-format msgid "unrecognized whitespace option '%s'" msgstr "未能识别的空白字符选项 '%s'" #: apply.c #, c-format msgid "unrecognized whitespace ignore option '%s'" msgstr "未能识别的空白字符忽略选项 '%s'" #: apply.c archive.c builtin/add.c builtin/branch.c builtin/checkout.c #: builtin/clone.c builtin/commit.c builtin/describe.c builtin/diff-tree.c #: builtin/difftool.c builtin/fast-export.c builtin/fetch.c builtin/help.c #: builtin/index-pack.c builtin/init-db.c builtin/log.c builtin/ls-files.c #: builtin/merge-base.c builtin/merge.c builtin/pack-objects.c builtin/push.c #: builtin/rebase.c builtin/repack.c builtin/reset.c builtin/rev-list.c #: builtin/show-branch.c builtin/stash.c builtin/submodule--helper.c #: builtin/tag.c builtin/worktree.c parse-options.c range-diff.c revision.c #, c-format msgid "options '%s' and '%s' cannot be used together" msgstr "选项 '%s' 和 '%s' 不能同时使用" #: apply.c #, c-format msgid "'%s' outside a repository" msgstr "'%s' 在仓库之外" #: apply.c #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "无法准备时间戳正则表达式 %s" #: apply.c #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec 返回 %d，输入为：%s" #: apply.c #, c-format msgid "unable to find filename in patch at line %d" msgstr "不能在补丁的第 %d 行找到文件名" #: apply.c #, 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 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "git apply：错误的 git-diff - 第 %d 行上新文件名不一致" #: apply.c #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "git apply：错误的 git-diff - 第 %d 行上旧文件名不一致" #: apply.c #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply：错误的 git-diff - 第 %d 行处应为 /dev/null" #: apply.c #, c-format msgid "invalid mode on line %d: %s" msgstr "第 %d 行包含无效文件模式：%s" #: apply.c #, c-format msgid "inconsistent header lines %d and %d" msgstr "不一致的文件头，%d 行和 %d 行" #: apply.c #, 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 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "git diff 的头信息中缺乏文件名信息（第 %d 行）" #: apply.c #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount：意外的行：%.*s" #: apply.c #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "第 %d 行的补丁片段没有头信息：%.*s" #: apply.c msgid "new file depends on old contents" msgstr "新文件依赖旧内容" #: apply.c msgid "deleted file still has contents" msgstr "删除的文件仍有内容" #: apply.c #, c-format msgid "corrupt patch at line %d" msgstr "补丁在第 %d 行损坏" #: apply.c #, c-format msgid "new file %s depends on old contents" msgstr "新文件 %s 依赖旧内容" #: apply.c #, c-format msgid "deleted file %s still has contents" msgstr "删除的文件 %s 仍有内容" #: apply.c #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** 警告：文件 %s 成为空文件但并未删除" #: apply.c #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "二进制补丁在第 %d 行损坏：%.*s" #: apply.c #, c-format msgid "unrecognized binary patch at line %d" msgstr "未能识别的二进制补丁位于第 %d 行" #: apply.c #, c-format msgid "patch with only garbage at line %d" msgstr "补丁文件的第 %d 行只有垃圾数据" #: apply.c #, c-format msgid "unable to read symlink %s" msgstr "无法读取符号链接 %s" #: apply.c #, c-format msgid "unable to open or read %s" msgstr "不能打开或读取 %s" #: apply.c #, c-format msgid "invalid start of line: '%c'" msgstr "无效的行首字符：'%c'" #: apply.c #, 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 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "上下文减少到（%ld/%ld）以在第 %d 行应用补丁片段" #: apply.c #, c-format msgid "" "while searching for:\n" "%.*s" msgstr "" "当查询：\n" "%.*s" #: apply.c #, c-format msgid "missing binary patch data for '%s'" msgstr "缺失 '%s' 的二进制补丁数据" #: apply.c #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "不能反向应用一个缺少到 '%s' 的反向数据块的二进制补丁" #: apply.c #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁" #: apply.c #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." msgstr "补丁应用到 '%s'（%s），但是和当前内容不匹配。" #: apply.c #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "补丁应用到空文件 '%s'，但其并非空文件" #: apply.c #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "无法读取 '%2$s' 必需的目标文件 %1$s" #: apply.c #, c-format msgid "binary patch does not apply to '%s'" msgstr "二进制补丁未应用到 '%s'" #: apply.c #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "到 '%s' 的二进制补丁产生了不正确的结果（应为 %s，却为 %s）" #: apply.c #, c-format msgid "patch failed: %s:%ld" msgstr "打补丁失败：%s:%ld" #: apply.c builtin/mv.c #, c-format msgid "cannot checkout %s" msgstr "不能检出 %s" #: apply.c midx.c pack-mtimes.c pack-revindex.c setup.c #, c-format msgid "failed to read %s" msgstr "无法读取 %s" #: apply.c #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "读取位于符号链接中的 '%s'" #: apply.c #, c-format msgid "path %s has been renamed/deleted" msgstr "路径 %s 已经被重命名/删除" #: apply.c #, c-format msgid "%s: does not exist in index" msgstr "%s：不存在于索引中" #: apply.c #, c-format msgid "%s: does not match index" msgstr "%s：和索引不匹配" #: apply.c msgid "repository lacks the necessary blob to perform 3-way merge." msgstr "仓库缺乏执行三方合并所必需的数据对象。" #: apply.c #, c-format msgid "Performing three-way merge...\n" msgstr "执行三方合并...\n" #: apply.c #, c-format msgid "cannot read the current contents of '%s'" msgstr "无法读取 '%s' 的当前内容" #: apply.c #, c-format msgid "Failed to perform three-way merge...\n" msgstr "无法执行三方合并...\n" #: apply.c #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "应用补丁到 '%s' 存在冲突。\n" #: apply.c #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "成功应用补丁到 '%s'。\n" #: apply.c #, c-format msgid "Falling back to direct application...\n" msgstr "回落到直接应用...\n" #: apply.c msgid "removal patch leaves file contents" msgstr "移除补丁仍留下了文件内容" #: apply.c #, c-format msgid "%s: wrong type" msgstr "%s：错误类型" #: apply.c #, c-format msgid "%s has type %o, expected %o" msgstr "%s 的类型是 %o，应为 %o" #: apply.c read-cache.c #, c-format msgid "invalid path '%s'" msgstr "无效路径 '%s'" #: apply.c #, c-format msgid "%s: already exists in index" msgstr "%s：已经存在于索引中" #: apply.c #, c-format msgid "%s: already exists in working directory" msgstr "%s：已经存在于工作区中" #: apply.c #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "%2$s 的新模式（%1$o）和旧模式（%3$o）不匹配" #: apply.c #, 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 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "受影响的文件 '%s' 位于符号链接中" #: apply.c #, c-format msgid "%s: patch does not apply" msgstr "%s：补丁未应用" #: apply.c #, c-format msgid "Checking patch %s..." msgstr "正在检查补丁 %s..." #: apply.c #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "子模组 %s 的 sha1 信息缺失或无效" #: apply.c #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "%s 的模式变更，但它不在当前 HEAD 中" #: apply.c #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "sha1 信息缺失或无效（%s）。" #: apply.c #, c-format msgid "could not add %s to temporary index" msgstr "不能在临时索引中添加 %s" #: apply.c #, c-format msgid "could not write temporary index to %s" msgstr "不能把临时索引写入到 %s" #: apply.c #, c-format msgid "unable to remove %s from index" msgstr "不能从索引中移除 %s" #: apply.c #, c-format msgid "corrupt patch for submodule %s" msgstr "子模组 %s 损坏的补丁" #: apply.c #, c-format msgid "unable to stat newly created file '%s'" msgstr "不能对新建文件 '%s' 调用 stat" #: apply.c #, c-format msgid "unable to create backing store for newly created file %s" msgstr "不能为新建文件 %s 创建后端存储" #: apply.c #, c-format msgid "unable to add cache entry for %s" msgstr "无法为 %s 添加缓存条目" #: apply.c builtin/bisect--helper.c builtin/gc.c #, c-format msgid "failed to write to '%s'" msgstr "无法写入 '%s'" #: apply.c #, c-format msgid "closing file '%s'" msgstr "关闭文件 '%s'" #: apply.c #, c-format msgid "unable to write file '%s' mode %o" msgstr "不能写文件 '%s' 权限 %o" #: apply.c #, c-format msgid "Applied patch %s cleanly." msgstr "成功应用补丁 %s。" #: apply.c msgid "internal error" msgstr "内部错误" #: apply.c #, 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 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "截短 .rej 文件名为 %.*s.rej" #: apply.c #, c-format msgid "cannot open %s" msgstr "不能打开 %s" #: apply.c #, c-format msgid "Hunk #%d applied cleanly." msgstr "第 #%d 个片段成功应用。" #: apply.c #, c-format msgid "Rejected hunk #%d." msgstr "拒绝第 #%d 个片段。" #: apply.c #, c-format msgid "Skipped patch '%s'." msgstr "略过补丁 '%s'。" #: apply.c msgid "No valid patches in input (allow with \"--allow-empty\")" msgstr "输入中没有合法的补丁 （使用 \"--allow-empty\" 来允许）" #: apply.c t/helper/test-cache-tree.c msgid "unable to read index file" msgstr "无法读取索引文件" #: apply.c #, c-format msgid "can't open patch '%s': %s" msgstr "不能打开补丁 '%s'：%s" #: apply.c #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "抑制下仍有 %d 个空白字符误用" msgstr[1] "抑制下仍有 %d 个空白字符误用" #: apply.c #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d 行新增了空白字符误用。" msgstr[1] "%d 行新增了空白字符误用。" #: apply.c #, 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 builtin/add.c builtin/mv.c builtin/rm.c msgid "Unable to write new index file" msgstr "无法写入新索引文件" #: apply.c msgid "don't apply changes matching the given path" msgstr "不要应用与给出路径向匹配的变更" #: apply.c msgid "apply changes matching the given path" msgstr "应用与给出路径向匹配的变更" #: apply.c builtin/am.c msgid "num" msgstr "数字" #: apply.c msgid "remove leading slashes from traditional diff paths" msgstr "从传统的 diff 路径中移除指定数量的前导斜线" #: apply.c msgid "ignore additions made by the patch" msgstr "忽略补丁中的添加的文件" #: apply.c msgid "instead of applying the patch, output diffstat for the input" msgstr "不应用补丁，而是显示输入的差异统计（diffstat）" #: apply.c msgid "show number of added and deleted lines in decimal notation" msgstr "以十进制数显示添加和删除的行数" #: apply.c msgid "instead of applying the patch, output a summary for the input" msgstr "不应用补丁，而是显示输入的概要" #: apply.c msgid "instead of applying the patch, see if the patch is applicable" msgstr "不应用补丁，而是查看补丁是否可应用" #: apply.c msgid "make sure the patch is applicable to the current index" msgstr "确认补丁可以应用到当前索引" #: apply.c msgid "mark new files with `git add --intent-to-add`" msgstr "使用命令 `git add --intent-to-add` 标记新增文件" #: apply.c msgid "apply a patch without touching the working tree" msgstr "应用补丁而不修改工作区" #: apply.c msgid "accept a patch that touches outside the working area" msgstr "接受修改工作区之外文件的补丁" #: apply.c msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "还应用此补丁（与 --stat/--summary/--check 选项同时使用）" #: apply.c msgid "attempt three-way merge, fall back on normal patch if that fails" msgstr "尝试三路合并，如果失败则回落至正常补丁模式" #: apply.c msgid "build a temporary index based on embedded index information" msgstr "创建一个临时索引基于嵌入的索引信息" #: apply.c builtin/checkout-index.c msgid "paths are separated with NUL character" msgstr "路径以 NUL 字符分隔" #: apply.c msgid "ensure at least lines of context match" msgstr "确保至少匹配 行上下文" #: apply.c builtin/am.c builtin/interpret-trailers.c builtin/pack-objects.c #: builtin/rebase.c msgid "action" msgstr "动作" #: apply.c msgid "detect new or modified lines that have whitespace errors" msgstr "检查新增和修改的行中间的空白字符滥用" #: apply.c msgid "ignore changes in whitespace when finding context" msgstr "查找上下文时忽略空白字符的变更" #: apply.c msgid "apply the patch in reverse" msgstr "反向应用补丁" #: apply.c msgid "don't expect at least one line of context" msgstr "无需至少一行上下文" #: apply.c msgid "leave the rejected hunks in corresponding *.rej files" msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中" #: apply.c msgid "allow overlapping hunks" msgstr "允许重叠的补丁片段" #: apply.c msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "允许不正确的文件末尾换行符" #: apply.c msgid "do not trust the line counts in the hunk headers" msgstr "不信任补丁片段的头信息中的行号" #: apply.c builtin/am.c msgid "root" msgstr "根目录" #: apply.c msgid "prepend to all filenames" msgstr "为所有文件名前添加 <根目录>" #: apply.c msgid "don't return error for empty patches" msgstr "对空的补丁不返回错误" #: archive-tar.c archive-zip.c #, c-format msgid "cannot stream blob %s" msgstr "不能打开数据对象 %s" #: archive-tar.c archive-zip.c #, c-format msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "不支持的文件模式：0%o (SHA1: %s)" #: archive-tar.c archive-zip.c builtin/pack-objects.c #, c-format msgid "deflate error (%d)" msgstr "压缩错误 (%d)" #: archive-tar.c #, c-format msgid "unable to start '%s' filter" msgstr "无法启动 '%s' 过滤器" #: archive-tar.c msgid "unable to redirect descriptor" msgstr "无法重定向描述符" #: archive-tar.c #, c-format msgid "'%s' filter reported error" msgstr "'%s' 过滤器报告了错误" #: archive-zip.c #, c-format msgid "path is not valid UTF-8: %s" msgstr "路径不是有效的 UTF-8：%s" #: archive-zip.c #, c-format msgid "path too long (%d chars, SHA1: %s): %s" msgstr "路径太长（%d 字符，SHA1：%s）：%s" #: archive-zip.c #, c-format msgid "timestamp too large for this system: %" msgstr "对于本系统时间戳太大：%" #: archive.c msgid "git archive [] [...]" msgstr "git archive [<选项>] <树对象> [<路径>...]" #: archive.c msgid "" "git archive --remote [--exec ] [] [...]" msgstr "" "git archive --remote <仓库> [--exec <命令>] [<选项>] <树对象> [<路径>...]" #: archive.c msgid "git archive --remote [--exec ] --list" msgstr "git archive --remote <仓库> [--exec <命令>] --list" #: archive.c builtin/gc.c builtin/notes.c builtin/tag.c #, c-format msgid "cannot read '%s'" msgstr "不能读取 '%s'" #: archive.c builtin/add.c builtin/rm.c #, c-format msgid "pathspec '%s' did not match any files" msgstr "路径规格 '%s' 未匹配任何文件" #: archive.c #, c-format msgid "no such ref: %.*s" msgstr "无此引用：%.*s" #: archive.c #, c-format msgid "not a valid object name: %s" msgstr "不是一个有效的对象名：%s" #: archive.c t/helper/test-cache-tree.c #, c-format msgid "not a tree object: %s" msgstr "不是一个树对象：%s" #: archive.c msgid "current working directory is untracked" msgstr "当前工作目录未被跟踪" #: archive.c #, c-format msgid "File not found: %s" msgstr "文件未找到：%s" #: archive.c #, c-format msgid "Not a regular file: %s" msgstr "不是一个常规文件：%s" #: archive.c #, c-format msgid "unclosed quote: '%s'" msgstr "未关闭的引号：'%s'" #: archive.c #, c-format msgid "missing colon: '%s'" msgstr "缺失冒号：'%s'" #: archive.c #, c-format msgid "empty file name: '%s'" msgstr "空的文件名：'%s'" #: archive.c msgid "fmt" msgstr "格式" #: archive.c msgid "archive format" msgstr "归档格式" #: archive.c builtin/log.c msgid "prefix" msgstr "前缀" #: archive.c msgid "prepend prefix to each pathname in the archive" msgstr "为归档中每个路径名加上前缀" #: archive.c builtin/blame.c builtin/commit-tree.c builtin/config.c #: builtin/fast-export.c builtin/gc.c builtin/grep.c builtin/hash-object.c #: builtin/ls-files.c builtin/notes.c builtin/read-tree.c parse-options.h msgid "file" msgstr "文件" #: archive.c msgid "add untracked file to archive" msgstr "将未跟踪文件添加到归档" #: archive.c msgid "path:content" msgstr "路径:内容" #: archive.c builtin/archive.c msgid "write the archive to this file" msgstr "归档写入此文件" #: archive.c msgid "read .gitattributes in working directory" msgstr "读取工作区中的 .gitattributes" #: archive.c msgid "report archived files on stderr" msgstr "在标准错误上报告归档文件" #: archive.c msgid "set compression level" msgstr "设置压缩级别" #: archive.c msgid "list supported archive formats" msgstr "列出支持的归档格式" #: archive.c builtin/archive.c builtin/clone.c builtin/submodule--helper.c msgid "repo" msgstr "仓库" #: archive.c builtin/archive.c msgid "retrieve the archive from remote repository " msgstr "从远程仓库（<仓库>）提取归档文件" #: archive.c builtin/archive.c builtin/difftool.c builtin/notes.c msgid "command" msgstr "命令" #: archive.c builtin/archive.c msgid "path to the remote git-upload-archive command" msgstr "远程 git-upload-archive 命令的路径" #: archive.c msgid "Unexpected option --remote" msgstr "未知参数 --remote" #: archive.c builtin/add.c builtin/checkout.c builtin/clone.c builtin/commit.c #: builtin/fast-export.c builtin/index-pack.c builtin/log.c builtin/reset.c #: builtin/rm.c builtin/stash.c builtin/worktree.c fetch-pack.c http-fetch.c #: revision.c #, c-format msgid "the option '%s' requires '%s'" msgstr "选项 '%s' 需要 '%s'" #: archive.c msgid "Unexpected option --output" msgstr "未知参数 --output" #: archive.c #, c-format msgid "Unknown archive format '%s'" msgstr "未知归档格式 '%s'" #: archive.c #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "参数不支持此格式 '%s'：-%d" #: attr.c #, c-format msgid "%.*s is not a valid attribute name" msgstr "%.*s 不是一个有效的属性名" #: attr.c #, c-format msgid "%s not allowed: %s:%d" msgstr "不允许 %s：%s:%d" #: attr.c msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." msgstr "" "负值模版在 git attributes 中被忽略\n" "当字符串确实要以感叹号开始时，使用 '\\!'。" #: bisect.c #, c-format msgid "Badly quoted content in file '%s': %s" msgstr "文件 '%s' 包含错误的引用格式：%s" #: bisect.c #, c-format msgid "We cannot bisect more!\n" msgstr "我们无法进行更多的二分查找！\n" #: bisect.c #, c-format msgid "Not a valid commit name %s" msgstr "不是一个有效的提交名 %s" #: bisect.c #, 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 #, 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 #, 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 #, 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 #, 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 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "二分查找中：合并基线必须是经过测试的\n" #: bisect.c #, c-format msgid "a %s revision is needed" msgstr "需要一个 %s 版本" #: bisect.c #, c-format msgid "could not create file '%s'" msgstr "不能创建文件 '%s'" #: bisect.c builtin/merge.c #, c-format msgid "could not read file '%s'" msgstr "不能读取文件 '%s'" #: bisect.c msgid "reading bisect refs failed" msgstr "读取二分查找引用失败" #: bisect.c #, c-format msgid "%s was both %s and %s\n" msgstr "%s 同时为 %s 和 %s\n" #: bisect.c #, c-format msgid "" "No testable commit found.\n" "Maybe you started with bad path arguments?\n" msgstr "" "没有发现可测试的提交。\n" "可能您在运行时使用了错误的路径参数？\n" #: bisect.c #, 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 #, 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 msgid "--contents and --reverse do not blend well." msgstr "--contents 和 --reverse 不能混用。" #: blame.c msgid "cannot use --contents with final commit object name" msgstr "不能将 --contents 和最终的提交对象名共用" #: blame.c msgid "--reverse and --first-parent together require specified latest commit" msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交" #: blame.c builtin/commit.c builtin/log.c builtin/merge.c #: builtin/pack-objects.c builtin/shortlog.c bundle.c midx.c pack-bitmap.c #: ref-filter.c remote.c sequencer.c submodule.c msgid "revision walk setup failed" msgstr "版本遍历初始化失败" #: blame.c msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "--reverse 和 --first-parent 共用，需要第一祖先链上的提交范围" #: blame.c #, c-format msgid "no such path %s in %s" msgstr "在 %2$s 中无此路径 %1$s" #: blame.c #, c-format msgid "cannot read blob %s for path %s" msgstr "不能为路径 %2$s 读取数据对象 %1$s" #: branch.c msgid "" "cannot inherit upstream tracking configuration of multiple refs when " "rebasing is requested" msgstr "在请求变基时无法继承上游多个引用的跟踪设置" #: branch.c #, c-format msgid "not setting branch '%s' as its own upstream" msgstr "没有将分支 '%s' 设置为它自己的上游" #: branch.c #, c-format msgid "branch '%s' set up to track '%s' by rebasing." msgstr "分支 '%s' 设置为使用变基来跟踪 '%s'。" #: branch.c #, c-format msgid "branch '%s' set up to track '%s'." msgstr "分支 '%s' 设置为跟踪 '%s'。" #: branch.c #, c-format msgid "branch '%s' set up to track:" msgstr "分支 '%s' 设置为跟踪：" #: branch.c msgid "unable to write upstream branch configuration" msgstr "无法写入上游分支配置" #: branch.c msgid "" "\n" "After fixing the error cause you may try to fix up\n" "the remote tracking information by invoking:" msgstr "" "\n" "在修复错误后，您可以通过执行以下命令来尝试修改远程跟踪分支：" #: branch.c #, c-format msgid "asked to inherit tracking from '%s', but no remote is set" msgstr "要求从 '%s' 继承跟踪信息，但是没有设置远程" #: branch.c #, c-format msgid "asked to inherit tracking from '%s', but no merge configuration is set" msgstr "要求从 '%s' 继承跟踪信息，但是没有设置合并配置" #: branch.c #, c-format msgid "not tracking: ambiguous information for ref '%s'" msgstr "不在跟踪中：引用 '%s' 有歧义的信息" # 译者：为保证在输出中对齐，注意调整句中空格！ #. #-#-#-#-# branch.c.po #-#-#-#-# #. TRANSLATORS: This is a line listing a remote with duplicate #. refspecs in the advice message below. For RTL languages you'll #. probably want to swap the "%s" and leading " " space around. #. #. #-#-#-#-# object-name.c.po #-#-#-#-# #. TRANSLATORS: This is line item of ambiguous object output #. from describe_ambiguous_object() above. For RTL languages #. you'll probably want to swap the "%s" and leading " " space #. around. #. #: branch.c object-name.c #, c-format msgid " %s\n" msgstr " %s\n" #. TRANSLATORS: The second argument is a \n-delimited list of #. duplicate refspecs, composed above. #. #: branch.c #, c-format msgid "" "There are multiple remotes whose fetch refspecs map to the remote\n" "tracking ref '%s':\n" "%s\n" "This is typically a configuration error.\n" "\n" "To support setting up tracking branches, ensure that\n" "different remotes' fetch refspecs map into different\n" "tracking namespaces." msgstr "" "有多个远程的获取引用规格映射到了追踪引用 '%s'：\n" "%s\n" "这一般是个配置错误。\n" "\n" "如果要支持设置追踪分支，请保证不同远程的获取引用规格映射至不同的追踪命名空" "间。" #: branch.c #, c-format msgid "'%s' is not a valid branch name" msgstr "'%s' 不是一个有效的分支名称" #: branch.c #, c-format msgid "a branch named '%s' already exists" msgstr "一个名为 '%s' 的分支已经存在" #: branch.c #, c-format msgid "cannot force update the branch '%s' checked out at '%s'" msgstr "无法强制更新检出于 '%2$s' 的分支 '%1$s'" #: branch.c #, c-format msgid "cannot set up tracking information; starting point '%s' is not a branch" msgstr "无法设置跟踪信息；起始点 '%s' 不是一个分支" #: branch.c #, c-format msgid "the requested upstream branch '%s' does not exist" msgstr "请求的上游分支 '%s' 不存在" #: branch.c 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 builtin/replace.c #, c-format msgid "not a valid object name: '%s'" msgstr "不是一个有效的对象名：'%s'" #: branch.c #, c-format msgid "ambiguous object name: '%s'" msgstr "歧义的对象名：'%s'" #: branch.c #, c-format msgid "not a valid branch point: '%s'" msgstr "无效的分支点：'%s'" #: branch.c #, c-format msgid "submodule '%s': unable to find submodule" msgstr "子模组 '%s'：无法找到子模组" #: branch.c #, c-format msgid "" "You may try updating the submodules using 'git checkout %s && git submodule " "update --init'" msgstr "" "你可以用 'git checkout %s && git submodule update --init' 来尝试更新子模组" #: branch.c #, c-format msgid "submodule '%s': cannot create branch '%s'" msgstr "子模组 '%s'：不能创建分支 '%s'" #: branch.c #, c-format msgid "'%s' is already checked out at '%s'" msgstr "'%s' 已经检出到 '%s'" #: branch.c #, c-format msgid "HEAD of working tree %s is not updated" msgstr "工作区 %s 的 HEAD 指向没有被更新" #: builtin/add.c msgid "git add [] [--] ..." msgstr "git add [<选项>] [--] <路径规格>..." #: builtin/add.c #, c-format msgid "cannot chmod %cx '%s'" msgstr "不能 chmod %cx '%s'" #: builtin/add.c #, c-format msgid "unexpected diff status %c" msgstr "意外的差异状态 %c" #: builtin/add.c builtin/commit.c msgid "updating files failed" msgstr "更新文件失败" #: builtin/add.c #, c-format msgid "remove '%s'\n" msgstr "删除 '%s'\n" #: builtin/add.c msgid "Unstaged changes after refreshing the index:" msgstr "刷新索引之后尚未被暂存的变更：" #: builtin/add.c builtin/rev-parse.c msgid "Could not read the index" msgstr "不能读取索引" #: builtin/add.c msgid "Could not write patch" msgstr "不能生成补丁" #: builtin/add.c msgid "editing patch failed" msgstr "编辑补丁失败" #: builtin/add.c #, c-format msgid "Could not stat '%s'" msgstr "不能对 '%s' 调用 stat" #: builtin/add.c msgid "Empty patch. Aborted." msgstr "空补丁。异常终止。" #: builtin/add.c #, c-format msgid "Could not apply '%s'" msgstr "不能应用 '%s'" #: builtin/add.c msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n" #: builtin/add.c builtin/clean.c builtin/fetch.c builtin/mv.c #: builtin/prune-packed.c builtin/pull.c builtin/push.c builtin/remote.c #: builtin/rm.c builtin/send-pack.c msgid "dry run" msgstr "演习" #: builtin/add.c builtin/check-ignore.c builtin/commit.c #: builtin/count-objects.c builtin/fsck.c builtin/log.c builtin/mv.c #: builtin/read-tree.c msgid "be verbose" msgstr "冗长输出" #: builtin/add.c msgid "interactive picking" msgstr "交互式拣选" #: builtin/add.c builtin/checkout.c builtin/reset.c msgid "select hunks interactively" msgstr "交互式挑选数据块" #: builtin/add.c msgid "edit current diff and apply" msgstr "编辑当前差异并应用" #: builtin/add.c msgid "allow adding otherwise ignored files" msgstr "允许添加忽略的文件" #: builtin/add.c msgid "update tracked files" msgstr "更新已跟踪的文件" #: builtin/add.c msgid "renormalize EOL of tracked files (implies -u)" msgstr "对已跟踪文件（暗含 -u）重新归一换行符" #: builtin/add.c msgid "record only the fact that the path will be added later" msgstr "只记录，该路径稍后再添加" #: builtin/add.c msgid "add changes from all tracked and untracked files" msgstr "添加所有改变的已跟踪文件和未跟踪文件" #: builtin/add.c msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "忽略工作区中移除的路径（和 --no-all 相同）" #: builtin/add.c msgid "don't add, only refresh the index" msgstr "不添加，只刷新索引" #: builtin/add.c msgid "just skip files which cannot be added because of errors" msgstr "跳过因出错不能添加的文件" #: builtin/add.c msgid "check if - even missing - files are ignored in dry run" msgstr "检查在演习模式下文件（即使不存在）是否被忽略" #: builtin/add.c builtin/mv.c builtin/rm.c msgid "allow updating entries outside of the sparse-checkout cone" msgstr "允许更新稀疏检出锥以外的条目" #: builtin/add.c builtin/update-index.c msgid "override the executable bit of the listed files" msgstr "覆盖列表里文件的可执行位" #: builtin/add.c msgid "warn when adding an embedded repository" msgstr "创建一个嵌入式仓库时给予警告" #: builtin/add.c #, c-format msgid "" "You've added another git repository inside your current repository.\n" "Clones of the outer repository will not contain the contents of\n" "the embedded repository and will not know how to obtain it.\n" "If you meant to add a submodule, use:\n" "\n" "\tgit submodule add %s\n" "\n" "If you added this path by mistake, you can remove it from the\n" "index with:\n" "\n" "\tgit rm --cached %s\n" "\n" "See \"git help submodule\" for more information." msgstr "" "您在当前仓库中添加了另一个Git仓库。克隆外层的仓库将不包含嵌入仓库的\n" "内容，并且不知道该如何获取它。如果您要添加一个子模组，使用：\n" "\n" "\tgit submodule add %s\n" "\n" "如果您不小心添加了这个路径，可以用下面的命令将其从索引中删除：\n" "\n" "\tgit rm --cached %s\n" "\n" "参见 \"git help submodule\" 获取更多信息。" #: builtin/add.c #, c-format msgid "adding embedded git repository: %s" msgstr "正在添加嵌入式 git 仓库：%s" #: builtin/add.c msgid "" "Use -f if you really want to add them.\n" "Turn this message off by running\n" "\"git config advice.addIgnoredFile false\"" msgstr "" "如果您确实要添加它们，使用 -f 参数。\n" "运行下面的命令来关闭本消息\n" "\"git config advice.addIgnoredFile false\"" #: builtin/add.c msgid "adding files failed" msgstr "添加文件失败" #: builtin/add.c #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x" #: builtin/add.c builtin/checkout.c builtin/commit.c builtin/reset.c #: builtin/rm.c builtin/stash.c #, c-format msgid "'%s' and pathspec arguments cannot be used together" msgstr "'%s' 和路径规格参数不能同时使用" #: builtin/add.c #, c-format msgid "Nothing specified, nothing added.\n" msgstr "没有指定文件，也没有文件被添加。\n" #: builtin/add.c msgid "" "Maybe you wanted to say 'git add .'?\n" "Turn this message off by running\n" "\"git config advice.addEmptyPathspec false\"" msgstr "" "也许您想要执行 'git add .'？\n" "运行下面的命令来关闭本消息\n" "\"git config advice.addEmptyPathspec false\"" #: builtin/add.c builtin/check-ignore.c builtin/checkout.c builtin/clean.c #: builtin/commit.c builtin/diff-tree.c builtin/grep.c builtin/mv.c #: builtin/reset.c builtin/rm.c builtin/submodule--helper.c read-cache.c #: rerere.c submodule.c msgid "index file corrupt" msgstr "索引文件损坏" #: builtin/am.c builtin/mailinfo.c mailinfo.c #, c-format msgid "bad action '%s' for '%s'" msgstr "'%2$s' 的错误动作 '%1$s'" #: builtin/am.c builtin/blame.c builtin/fetch.c builtin/pack-objects.c #: builtin/pull.c diff-merges.c gpg-interface.c ls-refs.c parallel-checkout.c #: sequencer.c setup.c #, c-format msgid "invalid value for '%s': '%s'" msgstr "'%s' 的值无效：'%s'" #: builtin/am.c builtin/commit.c builtin/merge.c sequencer.c #, c-format msgid "could not read '%s'" msgstr "不能读取 '%s'" #: builtin/am.c msgid "could not parse author script" msgstr "不能解析作者脚本" #: builtin/am.c builtin/replace.c commit.c sequencer.c #, c-format msgid "could not parse %s" msgstr "不能解析 %s" #: builtin/am.c #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "'%s' 被 applypatch-msg 钩子删除" #: builtin/am.c #, c-format msgid "Malformed input line: '%s'." msgstr "非法的输入行：'%s'。" #: builtin/am.c #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "从 '%s' 拷贝注解到 '%s' 时失败" #: builtin/am.c msgid "fseek failed" msgstr "fseek 失败" #: builtin/am.c builtin/rebase.c sequencer.c wrapper.c #, c-format msgid "could not open '%s' for reading" msgstr "无法打开 '%s' 进行读取" #: builtin/am.c builtin/rebase.c sequencer.c strbuf.c wrapper.c #, c-format msgid "could not open '%s' for writing" msgstr "无法打开 '%s' 进行写入" #: builtin/am.c #, c-format msgid "could not parse patch '%s'" msgstr "无法解析补丁 '%s'" #: builtin/am.c msgid "Only one StGIT patch series can be applied at once" msgstr "一次只能有一个 StGIT 补丁队列被应用" #: builtin/am.c msgid "invalid timestamp" msgstr "无效的时间戳" #: builtin/am.c msgid "invalid Date line" msgstr "无效的日期行" #: builtin/am.c msgid "invalid timezone offset" msgstr "无效的时区偏移值" #: builtin/am.c msgid "Patch format detection failed." msgstr "补丁格式探测失败。" #: builtin/am.c builtin/clone.c #, c-format msgid "failed to create directory '%s'" msgstr "无法创建目录 '%s'" #: builtin/am.c msgid "Failed to split patches." msgstr "无法拆分补丁。" #: builtin/am.c #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "当您解决这一问题，执行 \"%s --continue\"。" #: builtin/am.c #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "如果您想要跳过这一补丁，则执行 \"%s --skip\"。" #: builtin/am.c #, c-format msgid "To record the empty patch as an empty commit, run \"%s --allow-empty\"." msgstr "若要把空补丁记录为空提交，执行 \"%s --allow-empty\"。" #: builtin/am.c #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "若要复原至原始分支并停止补丁操作，执行 \"%s --abort\"。" #: builtin/am.c msgid "Patch sent with format=flowed; space at the end of lines might be lost." msgstr "补丁使用 format=flowed 格式发送，行尾的空格可能会丢失。" #: builtin/am.c #, c-format msgid "missing author line in commit %s" msgstr "在提交 %s 中缺失作者行" #: builtin/am.c #, c-format msgid "invalid ident line: %.*s" msgstr "无效的身份标识：%.*s" #: builtin/am.c builtin/checkout.c builtin/clone.c commit-graph.c #, c-format msgid "unable to parse commit %s" msgstr "不能解析提交 %s" #: builtin/am.c msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "仓库缺乏必要的数据对象以进行三方合并。" #: builtin/am.c msgid "Using index info to reconstruct a base tree..." msgstr "使用索引来重建一个（三方合并的）基础目录树..." #: builtin/am.c msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." msgstr "" "您是否曾手动编辑过您的补丁？\n" "无法应用补丁到索引中的数据对象上。" #: builtin/am.c msgid "Falling back to patching base and 3-way merge..." msgstr "回落到基础版本上打补丁及进行三方合并..." #: builtin/am.c msgid "Failed to merge in the changes." msgstr "无法合并变更。" #: builtin/am.c builtin/merge.c sequencer.c msgid "git write-tree failed to write a tree" msgstr "git write-tree 无法写入树对象" #: builtin/am.c msgid "applying to an empty history" msgstr "正应用到一个空历史上" #: builtin/am.c builtin/commit.c builtin/merge.c sequencer.c #: t/helper/test-fast-rebase.c msgid "failed to write commit object" msgstr "无法写提交对象" #: builtin/am.c #, c-format msgid "cannot resume: %s does not exist." msgstr "无法继续：%s 不存在。" #: builtin/am.c msgid "Commit Body is:" msgstr "提交内容为：" #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] #. in your translation. The program will only accept English #. input at this point. #. #: builtin/am.c #, c-format msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "应用？是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]：" #: builtin/am.c builtin/commit.c msgid "unable to write index file" msgstr "无法写入索引文件" #: builtin/am.c #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "脏索引：不能应用补丁（脏文件：%s）" #: builtin/am.c #, c-format msgid "Skipping: %.*s" msgstr "跳过：%.*s" #: builtin/am.c #, c-format msgid "Creating an empty commit: %.*s" msgstr "创建空提交：%.*s" #: builtin/am.c msgid "Patch is empty." msgstr "补丁为空。" #: builtin/am.c #, c-format msgid "Applying: %.*s" msgstr "应用：%.*s" #: builtin/am.c msgid "No changes -- Patch already applied." msgstr "没有变更 —— 补丁已经应用过。" #: builtin/am.c #, c-format msgid "Patch failed at %s %.*s" msgstr "打补丁失败于 %s %.*s" #: builtin/am.c msgid "Use 'git am --show-current-patch=diff' to see the failed patch" msgstr "用 'git am --show-current-patch=diff' 命令查看失败的补丁" #: builtin/am.c msgid "No changes - recorded it as an empty commit." msgstr "没有变更 —— 记录为空提交。" #: builtin/am.c msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" "already introduced the same changes; you might want to skip this patch." msgstr "" "没有变更 —— 您是不是忘了执行 'git add'？\n" "如果没有什么要添加到暂存区的，则很可能是其它提交已经引入了相同的变更。\n" "您也许想要跳过这个补丁。" #: builtin/am.c msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " "such.\n" "You might run `git rm` on a file to accept \"deleted by them\" for it." msgstr "" "在您的索引中仍存在未合并的路径。\n" "您应该对已经冲突解决的每一个文件执行 'git add' 来标记已经完成。 \n" "您可以对 \"由他们删除\" 的文件执行 `git rm` 命令。" #: builtin/am.c builtin/checkout.c builtin/clone.c builtin/stash.c merge.c #: rerere.c msgid "unable to write new index file" msgstr "无法写新的索引文件" #: builtin/am.c builtin/reset.c #, c-format msgid "Could not parse object '%s'." msgstr "不能解析对象 '%s'。" #: builtin/am.c msgid "failed to clean index" msgstr "无法清空索引" #: builtin/am.c msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD" #: builtin/am.c builtin/bisect--helper.c worktree.c #, c-format msgid "failed to read '%s'" msgstr "无法读取 '%s'" #: builtin/am.c #, c-format msgid "options '%s=%s' and '%s=%s' cannot be used together" msgstr "选项 '%s=%s' 和 '%s=%s' 不能同时使用" #: builtin/am.c msgid "git am [] [( | )...]" msgstr "git am [<选项>] [( | )...]" #: builtin/am.c msgid "git am [] (--continue | --skip | --abort)" msgstr "git am [<选项>] (--continue | --skip | --abort)" #: builtin/am.c msgid "run interactively" msgstr "以交互式方式运行" #: builtin/am.c msgid "historical option -- no-op" msgstr "老的参数 —— 无作用" #: builtin/am.c msgid "allow fall back on 3way merging if needed" msgstr "如果必要，允许使用三方合并。" #: builtin/am.c builtin/init-db.c builtin/prune-packed.c builtin/repack.c #: builtin/stash.c msgid "be quiet" msgstr "静默模式" #: builtin/am.c msgid "add a Signed-off-by trailer to the commit message" msgstr "在提交说明中添加 Signed-off-by 尾注" #: builtin/am.c msgid "recode into utf8 (default)" msgstr "使用 utf8 字符集（默认）" #: builtin/am.c msgid "pass -k flag to git-mailinfo" msgstr "向 git-mailinfo 传递 -k 参数" #: builtin/am.c msgid "pass -b flag to git-mailinfo" msgstr "向 git-mailinfo 传递 -b 参数" #: builtin/am.c msgid "pass -m flag to git-mailinfo" msgstr "向 git-mailinfo 传递 -m 参数" #: builtin/am.c msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "针对 mbox 格式，向 git-mailsplit 传递 --keep-cr 参数" #: builtin/am.c msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "不向 git-mailsplit 传递 --keep-cr 参数，覆盖 am.keepcr 的设置" #: builtin/am.c msgid "strip everything before a scissors line" msgstr "丢弃裁切线前的所有内容" #: builtin/am.c msgid "pass it through git-mailinfo" msgstr "传递给 git-mailinfo" #: builtin/am.c msgid "pass it through git-apply" msgstr "传递给 git-apply" #: builtin/am.c builtin/commit.c builtin/fmt-merge-msg.c builtin/grep.c #: builtin/merge.c builtin/pull.c builtin/rebase.c builtin/repack.c #: builtin/show-branch.c builtin/show-ref.c builtin/tag.c parse-options.h msgid "n" msgstr "n" #: builtin/am.c builtin/branch.c builtin/bugreport.c builtin/cat-file.c #: builtin/diagnose.c builtin/for-each-ref.c builtin/ls-files.c #: builtin/ls-tree.c builtin/replace.c builtin/tag.c builtin/verify-tag.c msgid "format" msgstr "格式" #: builtin/am.c msgid "format the patch(es) are in" msgstr "补丁的格式" #: builtin/am.c msgid "override error message when patch failure occurs" msgstr "打补丁失败时显示的错误信息" #: builtin/am.c msgid "continue applying patches after resolving a conflict" msgstr "冲突解决后继续应用补丁" #: builtin/am.c msgid "synonyms for --continue" msgstr "和 --continue 同义" #: builtin/am.c msgid "skip the current patch" msgstr "跳过当前补丁" #: builtin/am.c msgid "restore the original branch and abort the patching operation" msgstr "恢复原始分支并终止打补丁操作" #: builtin/am.c msgid "abort the patching operation but keep HEAD where it is" msgstr "终止补丁操作但保持 HEAD 不变" #: builtin/am.c msgid "show the patch being applied" msgstr "显示正在应用的补丁" #: builtin/am.c msgid "record the empty patch as an empty commit" msgstr "把空补丁记录为空提交" #: builtin/am.c msgid "lie about committer date" msgstr "将作者日期作为提交日期" #: builtin/am.c msgid "use current timestamp for author date" msgstr "用当前时间作为作者日期" #: builtin/am.c builtin/commit-tree.c builtin/commit.c builtin/merge.c #: builtin/pull.c builtin/rebase.c builtin/revert.c builtin/tag.c msgid "key-id" msgstr "key-id" #: builtin/am.c builtin/rebase.c msgid "GPG-sign commits" msgstr "使用 GPG 签名提交" #: builtin/am.c msgid "how to handle empty patches" msgstr "如何处理空补丁" #: builtin/am.c msgid "(internal use for git-rebase)" msgstr "（内部使用，用于 git-rebase）" #: builtin/am.c msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." msgstr "" "参数 -b/--binary 已经很长时间不做任何实质操作了，并且将被移除。\n" "请不要再使用它了。" #: builtin/am.c msgid "failed to read the index" msgstr "无法读取索引" #: builtin/am.c #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "之前的变基目录 %s 仍然存在，但却提供了 mbox。" #: builtin/am.c #, c-format msgid "" "Stray %s directory found.\n" "Use \"git am --abort\" to remove it." msgstr "" "发现了错误的 %s 目录。\n" "使用 \"git am --abort\" 删除它。" #: builtin/am.c msgid "Resolve operation not in progress, we are not resuming." msgstr "解决操作未进行，我们不会继续。" #: builtin/am.c msgid "interactive mode requires patches on the command line" msgstr "交互式模式需要命令行上提供补丁" #: builtin/apply.c msgid "git apply [] [...]" msgstr "git apply [<选项>] [<补丁>...]" #: builtin/archive.c diagnose.c msgid "could not redirect output" msgstr "不能重定向输出" #: builtin/archive.c msgid "git archive: Remote with no URL" msgstr "git archive：未提供远程 URL" #: builtin/archive.c msgid "git archive: expected ACK/NAK, got a flush packet" msgstr "git archive：期望是 ACK/NAK，却得到 flush 包" #: builtin/archive.c #, c-format msgid "git archive: NACK %s" msgstr "git archive：NACK %s" #: builtin/archive.c msgid "git archive: protocol error" msgstr "git archive：协议错误" #: builtin/archive.c msgid "git archive: expected a flush" msgstr "git archive：应有一个 flush 包" #: builtin/bisect--helper.c msgid "git bisect--helper --bisect-reset []" msgstr "git bisect--helper --bisect-reset [<提交>]" #: builtin/bisect--helper.c msgid "" "git bisect--helper --bisect-start [--term-{new,bad}= --term-{old,good}" "=] [--no-checkout] [--first-parent] [ [...]] [--] " "[...]" msgstr "" "git bisect--helper --bisect-start [--term-{new,bad}=<术语> --term-{old,good}" "=<术语>] [--no-checkout] [--first-parent] [<坏> [<好>...]] [--] [<路径>...]" #: builtin/bisect--helper.c msgid "git bisect--helper --bisect-state (bad|new) []" msgstr "git bisect--helper --bisect-state (bad|new) [<版本>]" #: builtin/bisect--helper.c msgid "git bisect--helper --bisect-state (good|old) [...]" msgstr "git bisect--helper --bisect-state (good|old) [<版本>...]" #: builtin/bisect--helper.c msgid "git bisect--helper --bisect-replay " msgstr "git bisect--helper --bisect-replay <文件>" #: builtin/bisect--helper.c msgid "git bisect--helper --bisect-skip [(|)...]" msgstr "git bisect--helper --bisect-skip [(<版本>|<范围>)...]" #: builtin/bisect--helper.c msgid "git bisect--helper --bisect-run ..." msgstr "git bisect--helper --bisect-run <命令>..." #: builtin/bisect--helper.c #, c-format msgid "cannot open file '%s' in mode '%s'" msgstr "不能以 '%2$s' 模式打开文件 '%1$s'" #: builtin/bisect--helper.c #, c-format msgid "could not write to file '%s'" msgstr "不能写入文件 '%s'" #: builtin/bisect--helper.c #, c-format msgid "cannot open file '%s' for reading" msgstr "不能打开文件 '%s' 来读取" #: builtin/bisect--helper.c #, c-format msgid "'%s' is not a valid term" msgstr "'%s' 不是一个有效的术语" #: builtin/bisect--helper.c #, c-format msgid "can't use the builtin command '%s' as a term" msgstr "不能使用内置命令 '%s' 作为术语" #: builtin/bisect--helper.c #, c-format msgid "can't change the meaning of the term '%s'" msgstr "不能修改术语 '%s' 的含义" #: builtin/bisect--helper.c msgid "please use two different terms" msgstr "请使用两个不同的术语" #: builtin/bisect--helper.c #, c-format msgid "We are not bisecting.\n" msgstr "我们没有在二分查找。\n" #: builtin/bisect--helper.c #, c-format msgid "'%s' is not a valid commit" msgstr "'%s' 不是一个有效的提交" #: builtin/bisect--helper.c #, c-format msgid "" "could not check out original HEAD '%s'. Try 'git bisect reset '." msgstr "不能检出原始 HEAD '%s'。尝试 'git bisect reset <提交>'。" #: builtin/bisect--helper.c #, c-format msgid "Bad bisect_write argument: %s" msgstr "坏的 bisect_write 参数：%s" #: builtin/bisect--helper.c #, c-format msgid "couldn't get the oid of the rev '%s'" msgstr "无法获取版本 '%s' 的对象 ID" #: builtin/bisect--helper.c #, c-format msgid "couldn't open the file '%s'" msgstr "无法打开文件 '%s'" #: builtin/bisect--helper.c #, c-format msgid "Invalid command: you're currently in a %s/%s bisect" msgstr "无效的命令：您当前正处于一个 %s/%s 二分查找中" #: builtin/bisect--helper.c #, c-format msgid "" "You need to give me at least one %s and %s revision.\n" "You can use \"git bisect %s\" and \"git bisect %s\" for that." msgstr "" "您需要给我至少一个 %s 和一个 %s 版本。\n" "为此您可以用 \"git bisect %s\" 和 \"git bisect %s\"。" #: builtin/bisect--helper.c #, c-format msgid "" "You need to start by \"git bisect start\".\n" "You then need to give me at least one %s and %s revision.\n" "You can use \"git bisect %s\" and \"git bisect %s\" for that." msgstr "" "您需要执行 \"git bisect start\" 来开始。\n" "然后需要提供我至少一个 %s 和一个 %s 版本。\n" "为此您可以用 \"git bisect %s\" 和 \"git bisect %s\" 命令。" #: builtin/bisect--helper.c #, c-format msgid "bisecting only with a %s commit" msgstr "在只有一个 %s 提交的情况下二分查找" #. TRANSLATORS: Make sure to include [Y] and [n] in your #. translation. The program will only accept English input #. at this point. #. #: builtin/bisect--helper.c msgid "Are you sure [Y/n]? " msgstr "您确认么[Y/n]？ " #: builtin/bisect--helper.c msgid "status: waiting for both good and bad commits\n" msgstr "状态：正在等待好的和坏的提交\n" #: builtin/bisect--helper.c #, c-format msgid "status: waiting for bad commit, %d good commit known\n" msgid_plural "status: waiting for bad commit, %d good commits known\n" msgstr[0] "状态：正在等待坏的提交，已知 %d 个好的提交\n" msgstr[1] "状态：正在等待坏的提交，已知 %d 个好的提交\n" #: builtin/bisect--helper.c msgid "status: waiting for good commit(s), bad commit known\n" msgstr "状态：正在等待好的提交，已知坏的提交\n" #: builtin/bisect--helper.c msgid "no terms defined" msgstr "未定义术语" #: builtin/bisect--helper.c #, c-format msgid "" "Your current terms are %s for the old state\n" "and %s for the new state.\n" msgstr "您当前针对旧状态的术语是 %s，对新状态的术语是 %s。\n" #: builtin/bisect--helper.c #, c-format msgid "" "invalid argument %s for 'git bisect terms'.\n" "Supported options are: --term-good|--term-old and --term-bad|--term-new." msgstr "" "命令 'git bisect terms' 的参数 %s 无效。\n" "支持的选项有：--term-good|--term-old 和 --term-bad|--term-new。" #: builtin/bisect--helper.c msgid "revision walk setup failed\n" msgstr "版本遍历设置失败\n" #: builtin/bisect--helper.c #, c-format msgid "could not open '%s' for appending" msgstr "无法打开 '%s' 进行追加" #: builtin/bisect--helper.c msgid "'' is not a valid term" msgstr "'' 不是一个有效的术语" #: builtin/bisect--helper.c #, c-format msgid "unrecognized option: '%s'" msgstr "未识别的选项：'%s'" #: builtin/bisect--helper.c #, c-format msgid "'%s' does not appear to be a valid revision" msgstr "'%s' 看起来不是一个有效的版本" #: builtin/bisect--helper.c msgid "bad HEAD - I need a HEAD" msgstr "坏的 HEAD - 我需要一个 HEAD" #: builtin/bisect--helper.c #, c-format msgid "checking out '%s' failed. Try 'git bisect start '." msgstr "检出 '%s' 失败。尝试 'git bisect start <有效分支>'。" #: builtin/bisect--helper.c msgid "won't bisect on cg-seek'ed tree" msgstr "不会在做了 cg-seek 的树上做二分查找" #: builtin/bisect--helper.c msgid "bad HEAD - strange symbolic ref" msgstr "坏的 HEAD - 奇怪的符号引用" #: builtin/bisect--helper.c #, c-format msgid "invalid ref: '%s'" msgstr "无效的引用：'%s'" #: builtin/bisect--helper.c msgid "You need to start by \"git bisect start\"\n" msgstr "您需要执行 \"git bisect start\" 来开始\n" #. TRANSLATORS: Make sure to include [Y] and [n] in your #. translation. The program will only accept English input #. at this point. #. #: builtin/bisect--helper.c msgid "Do you want me to do it for you [Y/n]? " msgstr "您想让我为您这样做么[Y/n]？ " #: builtin/bisect--helper.c msgid "Please call `--bisect-state` with at least one argument" msgstr "请使用至少一个参数调用 `--bisect-state`" #: builtin/bisect--helper.c #, c-format msgid "'git bisect %s' can take only one argument." msgstr "'git bisect %s' 只能带一个参数。" #: builtin/bisect--helper.c #, c-format msgid "Bad rev input: %s" msgstr "坏的版本输入：%s" #: builtin/bisect--helper.c #, c-format msgid "Bad rev input (not a commit): %s" msgstr "坏的版本输入（不是提交）：%s" #: builtin/bisect--helper.c msgid "We are not bisecting." msgstr "我们没有在二分查找。" #: builtin/bisect--helper.c #, c-format msgid "'%s'?? what are you talking about?" msgstr "'%s'?? 您在说什么?" #: builtin/bisect--helper.c #, c-format msgid "cannot read file '%s' for replaying" msgstr "不能读取文件 '%s' 来重放" #: builtin/bisect--helper.c #, c-format msgid "running %s\n" msgstr "正在执行 %s\n" #: builtin/bisect--helper.c msgid "bisect run failed: no command provided." msgstr "二分查找运行失败：没有提供命令。" #: builtin/bisect--helper.c #, c-format msgid "unable to verify '%s' on good revision" msgstr "无法在好版本中验证 '%s'" #: builtin/bisect--helper.c #, c-format msgid "bogus exit code %d for good revision" msgstr "好版本返回错误的退出码 %d" #: builtin/bisect--helper.c #, c-format msgid "bisect run failed: exit code %d from '%s' is < 0 or >= 128" msgstr "二分查找运行失败：命令 '%2$s' 的退出码 %1$d < 0 或 >= 128" #: builtin/bisect--helper.c #, c-format msgid "cannot open file '%s' for writing" msgstr "无法打开文件 '%s' 进行写入" #: builtin/bisect--helper.c msgid "bisect run cannot continue any more" msgstr "二分查找不能继续运行" #: builtin/bisect--helper.c #, c-format msgid "bisect run success" msgstr "二分查找运行成功" #: builtin/bisect--helper.c #, c-format msgid "bisect found first bad commit" msgstr "二分查找找到了第一个坏的提交" #: builtin/bisect--helper.c #, c-format msgid "" "bisect run failed: 'git bisect--helper --bisect-state %s' exited with error " "code %d" msgstr "二分查找运行失败：'git bisect--helper --bisect-state %s' 退出码为 %d" #: builtin/bisect--helper.c msgid "--bisect-reset requires either no argument or a commit" msgstr "--bisect-reset 无需参数或者需要一个提交" #: builtin/bisect--helper.c msgid "--bisect-terms requires 0 or 1 argument" msgstr "--bisect-terms 需要 0 或 1 个参数" #: builtin/bisect--helper.c msgid "--bisect-next requires 0 arguments" msgstr "--bisect-next 需要 0 个参数" #: builtin/bisect--helper.c msgid "--bisect-log requires 0 arguments" msgstr "--bisect-log 需要 0 个参数" #: builtin/bisect--helper.c msgid "no logfile given" msgstr "未提供日志文件" #: builtin/blame.c msgid "git blame [] [] [] [--] " msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>" #: builtin/blame.c msgid "git annotate [] [] [] [--] " msgstr "git annotate [<选项>] [<版本选项>] [<版本>] [--] <文件>" #: builtin/blame.c msgid " are documented in git-rev-list(1)" msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中" #: builtin/blame.c #, c-format msgid "expecting a color: %s" msgstr "期望一个颜色：%s" #: builtin/blame.c msgid "must end with a color" msgstr "必须以一个颜色结尾" #: builtin/blame.c #, c-format msgid "cannot find revision %s to ignore" msgstr "不能找到要忽略的版本 %s" #: builtin/blame.c msgid "show blame entries as we find them, incrementally" msgstr "增量式地显示发现的 blame 条目" #: builtin/blame.c msgid "do not show object names of boundary commits (Default: off)" msgstr "不显示边界提交的对象名（默认：关闭）" #: builtin/blame.c msgid "do not treat root commits as boundaries (Default: off)" msgstr "不把根提交作为边界（默认：关闭）" #: builtin/blame.c msgid "show work cost statistics" msgstr "显示工作消耗统计" #: builtin/blame.c builtin/checkout.c builtin/clone.c builtin/commit-graph.c #: builtin/fetch.c builtin/merge.c builtin/multi-pack-index.c builtin/pull.c #: builtin/push.c builtin/remote.c builtin/send-pack.c msgid "force progress reporting" msgstr "强制显示进度报告" #: builtin/blame.c msgid "show output score for blame entries" msgstr "显示 blame 条目的输出得分" #: builtin/blame.c msgid "show original filename (Default: auto)" msgstr "显示原始文件名（默认：自动）" #: builtin/blame.c msgid "show original linenumber (Default: off)" msgstr "显示原始的行号（默认：关闭）" #: builtin/blame.c msgid "show in a format designed for machine consumption" msgstr "显示为一个适合机器读取的格式" #: builtin/blame.c msgid "show porcelain format with per-line commit information" msgstr "为每一行显示机器适用的提交信息" #: builtin/blame.c msgid "use the same output mode as git-annotate (Default: off)" msgstr "使用和 git-annotate 相同的输出模式（默认：关闭）" #: builtin/blame.c msgid "show raw timestamp (Default: off)" msgstr "显示原始时间戳（默认：关闭）" #: builtin/blame.c msgid "show long commit SHA1 (Default: off)" msgstr "显示长的 SHA1 提交号（默认：关闭）" #: builtin/blame.c msgid "suppress author name and timestamp (Default: off)" msgstr "隐藏作者名字和时间戳（默认：关闭）" #: builtin/blame.c msgid "show author email instead of name (Default: off)" msgstr "显示作者的邮箱而不是名字（默认：关闭）" #: builtin/blame.c msgid "ignore whitespace differences" msgstr "忽略空白差异" #: builtin/blame.c builtin/log.c msgid "rev" msgstr "版本" #: builtin/blame.c msgid "ignore when blaming" msgstr "在执行 blame 操作时忽略 <版本>" #: builtin/blame.c msgid "ignore revisions from " msgstr "忽略来自 <文件> 中的版本" #: builtin/blame.c msgid "color redundant metadata from previous line differently" msgstr "使用颜色间隔输出与前一行不同的重复元信息" #: builtin/blame.c msgid "color lines by age" msgstr "依据时间着色" #: builtin/blame.c msgid "spend extra cycles to find better match" msgstr "花费额外的循环来找到更好的匹配" #: builtin/blame.c msgid "use revisions from instead of calling git-rev-list" msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list" #: builtin/blame.c msgid "use 's contents as the final image" msgstr "使用 <文件> 的内容作为最终的镜像" #: builtin/blame.c msgid "score" msgstr "得分" #: builtin/blame.c msgid "find line copies within and across files" msgstr "找到文件内及跨文件的行拷贝" #: builtin/blame.c msgid "find line movements within and across files" msgstr "找到文件内及跨文件的行移动" #: builtin/blame.c msgid "range" msgstr "范围" #: builtin/blame.c msgid "process only line range , or function :" msgstr "只处理在 <开始>,<结束> 范围内的行，或者函数：<函数名>" #: builtin/blame.c msgid "--progress can't be used with --incremental or porcelain formats" msgstr "--progress 不能和 --incremental 或机器内部格式一起使用" #. TRANSLATORS: This string is used to tell us the #. maximum display width for a relative timestamp in #. "git blame" output. For C locale, "4 years, 11 #. months ago", which takes 22 places, is the longest #. among various forms of relative timestamps, but #. your language may need more or fewer display #. columns. #. #: builtin/blame.c msgid "4 years, 11 months ago" msgstr "4 年 11 个月前" #: builtin/blame.c #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" msgstr[0] "文件 %s 只有 %lu 行" msgstr[1] "文件 %s 只有 %lu 行" #: builtin/blame.c msgid "Blaming lines" msgstr "追踪代码行" #: builtin/branch.c msgid "git branch [] [-r | -a] [--merged] [--no-merged]" msgstr "git branch [<选项>] [-r | -a] [--merged] [--no-merged]" #: builtin/branch.c msgid "" "git branch [] [-f] [--recurse-submodules] []" msgstr "git branch [<选项>] [-f] [--recurse-submodules] <分支名> [<起始点>]" #: builtin/branch.c msgid "git branch [] [-l] [...]" msgstr "git branch [<选项>] [-l] [<模式>...]" #: builtin/branch.c msgid "git branch [] [-r] (-d | -D) ..." msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..." #: builtin/branch.c msgid "git branch [] (-m | -M) [] " msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>" #: builtin/branch.c msgid "git branch [] (-c | -C) [] " msgstr "git branch [<选项>] (-c | -C) [<老分支>] <新分支>" #: builtin/branch.c msgid "git branch [] [-r | -a] [--points-at]" msgstr "git branch [<选项>] [-r | -a] [--points-at]" #: builtin/branch.c msgid "git branch [] [-r | -a] [--format]" msgstr "git branch [<选项>] [-r | -a] [--format]" # 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长 #: builtin/branch.c #, c-format msgid "" "deleting branch '%s' that has been merged to\n" " '%s', but not yet merged to HEAD." msgstr "" "将要删除的分支 '%s' 已经被合并到\n" " '%s'，但未合并到 HEAD。" # 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长 #: builtin/branch.c #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" " '%s', even though it is merged to HEAD." msgstr "" "并未删除分支 '%s'， 虽然它已经合并到 HEAD，\n" " 然而却尚未被合并到分支 '%s' 。" #: builtin/branch.c #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "无法查询 '%s' 指向的提交对象" #: builtin/branch.c #, c-format msgid "" "The branch '%s' is not fully merged.\n" "If you are sure you want to delete it, run 'git branch -D %s'." msgstr "" "分支 '%s' 没有完全合并。\n" "如果您确认要删除它，执行 'git branch -D %s'。" #: builtin/branch.c msgid "Update of config-file failed" msgstr "更新配置文件失败" #: builtin/branch.c msgid "cannot use -a with -d" msgstr "不能将 -a 和 -d 同时使用" #: builtin/branch.c #, c-format msgid "Cannot delete branch '%s' checked out at '%s'" msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。" #: builtin/branch.c #, c-format msgid "remote-tracking branch '%s' not found." msgstr "未能找到远程跟踪分支 '%s'。" #: builtin/branch.c #, c-format msgid "branch '%s' not found." msgstr "分支 '%s' 未发现。" #: builtin/branch.c #, c-format msgid "Deleted remote-tracking branch %s (was %s).\n" msgstr "已删除远程跟踪分支 %s（曾为 %s）。\n" #: builtin/branch.c #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "已删除分支 %s（曾为 %s）。\n" #: builtin/branch.c builtin/tag.c msgid "unable to parse format string" msgstr "不能解析格式化字符串" #: builtin/branch.c msgid "could not resolve HEAD" msgstr "不能解析 HEAD 提交" #: builtin/branch.c #, c-format msgid "HEAD (%s) points outside of refs/heads/" msgstr "HEAD (%s) 指向 refs/heads/ 之外" #: builtin/branch.c #, c-format msgid "Branch %s is being rebased at %s" msgstr "分支 %s 正被变基到 %s" #: builtin/branch.c #, c-format msgid "Branch %s is being bisected at %s" msgstr "分支 %s 正被二分查找于 %s" #: builtin/branch.c #, c-format msgid "Invalid branch name: '%s'" msgstr "无效的分支名：'%s'" #: builtin/branch.c #, c-format msgid "No commit on branch '%s' yet." msgstr "分支 '%s' 尚无提交。" #: builtin/branch.c #, c-format msgid "No branch named '%s'." msgstr "没有分支 '%s'。" #: builtin/branch.c msgid "Branch rename failed" msgstr "分支重命名失败" #: builtin/branch.c msgid "Branch copy failed" msgstr "分支拷贝失败" #: builtin/branch.c #, c-format msgid "Created a copy of a misnamed branch '%s'" msgstr "已为错误命名的分支 '%s' 创建了一个副本" #: builtin/branch.c #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "已将错误命名的分支 '%s' 重命名" #: builtin/branch.c #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "分支重命名为 %s，但 HEAD 没有更新！" #: builtin/branch.c msgid "Branch is renamed, but update of config-file failed" msgstr "分支被重命名，但更新配置文件失败" #: builtin/branch.c msgid "Branch is copied, but update of config-file failed" msgstr "分支已拷贝，但更新配置文件失败" #: builtin/branch.c #, c-format msgid "" "Please edit the description for the branch\n" " %s\n" "Lines starting with '%c' will be stripped.\n" msgstr "" "请编辑分支的描述\n" " %s\n" "以 '%c' 开头的行将被过滤。\n" #: builtin/branch.c msgid "Generic options" msgstr "通用选项" #: builtin/branch.c msgid "show hash and subject, give twice for upstream branch" msgstr "显示哈希值和主题，若参数出现两次则显示上游分支" #: builtin/branch.c msgid "suppress informational messages" msgstr "不显示信息" #: builtin/branch.c builtin/checkout.c builtin/submodule--helper.c msgid "set branch tracking configuration" msgstr "设置分支跟踪配置" #: builtin/branch.c msgid "do not use" msgstr "不要使用" #: builtin/branch.c msgid "upstream" msgstr "上游" #: builtin/branch.c msgid "change the upstream info" msgstr "改变上游信息" #: builtin/branch.c msgid "unset the upstream info" msgstr "取消上游信息的设置" #: builtin/branch.c msgid "use colored output" msgstr "使用彩色输出" #: builtin/branch.c msgid "act on remote-tracking branches" msgstr "作用于远程跟踪分支" #: builtin/branch.c msgid "print only branches that contain the commit" msgstr "只打印包含该提交的分支" #: builtin/branch.c msgid "print only branches that don't contain the commit" msgstr "只打印不包含该提交的分支" #: builtin/branch.c msgid "Specific git-branch actions:" msgstr "具体的 git-branch 动作：" #: builtin/branch.c msgid "list both remote-tracking and local branches" msgstr "列出远程跟踪及本地分支" #: builtin/branch.c msgid "delete fully merged branch" msgstr "删除完全合并的分支" #: builtin/branch.c msgid "delete branch (even if not merged)" msgstr "删除分支（即使没有合并）" #: builtin/branch.c msgid "move/rename a branch and its reflog" msgstr "移动/重命名一个分支，以及它的引用日志" #: builtin/branch.c msgid "move/rename a branch, even if target exists" msgstr "移动/重命名一个分支，即使目标已存在" #: builtin/branch.c msgid "copy a branch and its reflog" msgstr "拷贝一个分支和它的引用日志" #: builtin/branch.c msgid "copy a branch, even if target exists" msgstr "拷贝一个分支，即使目标已存在" #: builtin/branch.c msgid "list branch names" msgstr "列出分支名" #: builtin/branch.c msgid "show current branch name" msgstr "显示当前分支名" #: builtin/branch.c builtin/submodule--helper.c msgid "create the branch's reflog" msgstr "创建分支的引用日志" #: builtin/branch.c msgid "edit the description for the branch" msgstr "标记分支的描述" #: builtin/branch.c msgid "force creation, move/rename, deletion" msgstr "强制创建、移动/重命名、删除" #: builtin/branch.c msgid "print only branches that are merged" msgstr "只打印已经合并的分支" #: builtin/branch.c msgid "print only branches that are not merged" msgstr "只打印尚未合并的分支" #: builtin/branch.c msgid "list branches in columns" msgstr "以列的方式显示分支" #: builtin/branch.c builtin/for-each-ref.c builtin/notes.c builtin/tag.c msgid "object" msgstr "对象" #: builtin/branch.c msgid "print only branches of the object" msgstr "只打印指向该对象的分支" #: builtin/branch.c builtin/for-each-ref.c builtin/tag.c msgid "sorting and filtering are case insensitive" msgstr "排序和过滤属于大小写不敏感" #: builtin/branch.c builtin/ls-files.c msgid "recurse through submodules" msgstr "在子模组中递归" #: builtin/branch.c builtin/for-each-ref.c builtin/ls-files.c builtin/ls-tree.c #: builtin/tag.c builtin/verify-tag.c msgid "format to use for the output" msgstr "输出格式" #: builtin/branch.c builtin/submodule--helper.c submodule.c msgid "Failed to resolve HEAD as a valid ref." msgstr "无法将 HEAD 解析为有效引用。" #: builtin/branch.c builtin/clone.c msgid "HEAD not found below refs/heads!" msgstr "HEAD 没有位于 /refs/heads 之下！" #: builtin/branch.c msgid "" "branch with --recurse-submodules can only be used if submodule." "propagateBranches is enabled" msgstr "" "带有 --recurse-submodules 的分支只能在 submodule.propagateBranches 启用时使用" #: builtin/branch.c msgid "--recurse-submodules can only be used to create branches" msgstr "--recurse-submodules 只能用于创建分支" #: builtin/branch.c msgid "branch name required" msgstr "必须提供分支名" #: builtin/branch.c msgid "Cannot give description to detached HEAD" msgstr "不能向分离头指针提供描述" #: builtin/branch.c msgid "cannot edit description of more than one branch" msgstr "不能为一个以上的分支编辑描述" #: builtin/branch.c msgid "cannot copy the current branch while not on any." msgstr "不处于任何分支上，无法拷贝当前分支。" #: builtin/branch.c msgid "cannot rename the current branch while not on any." msgstr "不处于任何分支上，无法重命名当前分支。" #: builtin/branch.c msgid "too many branches for a copy operation" msgstr "为拷贝操作提供了太多的分支名" #: builtin/branch.c msgid "too many arguments for a rename operation" msgstr "为重命名操作提供了太多的参数" #: builtin/branch.c msgid "too many arguments to set new upstream" msgstr "为设置新上游提供了太多的参数" #: builtin/branch.c #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." msgstr "无法设置 HEAD 的上游为 %s，因为 HEAD 没有指向任何分支。" #: builtin/branch.c #, c-format msgid "no such branch '%s'" msgstr "没有此分支 '%s'" #: builtin/branch.c #, c-format msgid "branch '%s' does not exist" msgstr "分支 '%s' 不存在" #: builtin/branch.c msgid "too many arguments to unset upstream" msgstr "为取消上游设置操作提供了太多的参数" #: builtin/branch.c msgid "could not unset upstream of HEAD when it does not point to any branch." msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支" #: builtin/branch.c #, c-format msgid "Branch '%s' has no upstream information" msgstr "分支 '%s' 没有上游信息" #: builtin/branch.c msgid "" "The -a, and -r, options to 'git branch' do not take a branch name.\n" "Did you mean to use: -a|-r --list ?" msgstr "" "'git branch' 的 -a 和 -r 选项不带一个分支名。\n" "您是否想要使用：-a|-r --list <模式>？" #: builtin/branch.c msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." msgstr "" "不再支持选项 '--set-upstream'。请使用 '--track' 或 '--set-upstream-to'。" #: builtin/bugreport.c msgid "git version:\n" msgstr "git 版本：\n" #: builtin/bugreport.c #, c-format msgid "uname() failed with error '%s' (%d)\n" msgstr "uname() 失败，错误为 '%s'（%d）\n" #: builtin/bugreport.c msgid "compiler info: " msgstr "编译器信息：" #: builtin/bugreport.c msgid "libc info: " msgstr "libc 信息：" #: builtin/bugreport.c msgid "not run from a git repository - no hooks to show\n" msgstr "不是在 git 仓库中执行 - 没有可显示的钩子\n" #: builtin/bugreport.c msgid "" "git bugreport [(-o | --output-directory) ] [(-s | --suffix) ]\n" " [--diagnose[=]]" msgstr "" "git bugreport [-o|--output-directory <文件>] [(-s|--suffix) <格式>]\n" " [--diagnose[=<模式>]" #: builtin/bugreport.c msgid "" "Thank you for filling out a Git bug report!\n" "Please answer the following questions to help us understand your issue.\n" "\n" "What did you do before the bug happened? (Steps to reproduce your issue)\n" "\n" "What did you expect to happen? (Expected behavior)\n" "\n" "What happened instead? (Actual behavior)\n" "\n" "What's different between what you expected and what actually happened?\n" "\n" "Anything else you want to add:\n" "\n" "Please review the rest of the bug report below.\n" "You can delete any lines you don't wish to share.\n" msgstr "" "感谢您填写 Git 错误报告！\n" "请填写以下问卷，以帮助我们了解您的问题。\n" "\n" "在错误发生之前，您做了什么？（重现问题的步骤）\n" "\n" "您期望发生什么？（预期行为）\n" "\n" "实际发生了什么？（实际行为）\n" "\n" "您所期望的与实际发生的有什么不同？\n" "\n" "您想要补充的其它内容：\n" "\n" "请检查下面错误报告中余下的内容。\n" "您可以删除任何您不想共享的内容。\n" #: builtin/bugreport.c builtin/commit.c builtin/fast-export.c builtin/rebase.c #: parse-options.h msgid "mode" msgstr "模式" #: builtin/bugreport.c msgid "" "create an additional zip archive of detailed diagnostics (default 'stats')" msgstr "额外创建详细诊断信息的压缩包（默认 'stats'）" #: builtin/bugreport.c msgid "specify a destination for the bugreport file(s)" msgstr "指定错误报告文件的目标位置" #: builtin/bugreport.c msgid "specify a strftime format suffix for the filename(s)" msgstr "指定文件的 strftime 格式后缀" #: builtin/bugreport.c builtin/diagnose.c #, c-format msgid "could not create leading directories for '%s'" msgstr "不能为 '%s' 创建先导目录" #: builtin/bugreport.c builtin/diagnose.c #, c-format msgid "unable to create diagnostics archive %s" msgstr "不能创建诊断归档包 %s" #: builtin/bugreport.c msgid "System Info" msgstr "系统信息" #: builtin/bugreport.c msgid "Enabled Hooks" msgstr "启用的钩子" #: builtin/bugreport.c #, c-format msgid "unable to write to %s" msgstr "无法写入 %s" #: builtin/bugreport.c #, c-format msgid "Created new report at '%s'.\n" msgstr "在 '%s' 创建了新报告。\n" #: builtin/bundle.c msgid "" "git bundle create [-q | --quiet | --progress | --all-progress] [--all-" "progress-implied]\n" " [--version=] " msgstr "" "git bundle create [-q | --quiet | --progress | --all-progress] [--all-" "progress-implied]\n" " [--version=<版本>] <文件> " #: builtin/bundle.c msgid "git bundle verify [-q | --quiet] " msgstr "git bundle verify [-q | --quiet] <文件>" #: builtin/bundle.c msgid "git bundle list-heads [...]" msgstr "git bundle list-heads <文件> [<引用名>...]" #: builtin/bundle.c msgid "git bundle unbundle [--progress] [...]" msgstr "git bundle unbundle [--progress] <文件> [<引用名>...]" #: builtin/bundle.c builtin/pack-objects.c msgid "do not show progress meter" msgstr "不显示进度表" #: builtin/bundle.c builtin/pack-objects.c msgid "show progress meter" msgstr "显示进度表" #: builtin/bundle.c builtin/pack-objects.c msgid "show progress meter during object writing phase" msgstr "在对象写入阶段显示进度表" #: builtin/bundle.c builtin/pack-objects.c msgid "similar to --all-progress when progress meter is shown" msgstr "当进度表显示时类似于 --all-progress" #: builtin/bundle.c msgid "specify bundle format version" msgstr "指定归档包的格式版本" #: builtin/bundle.c msgid "Need a repository to create a bundle." msgstr "需要一个仓库来创建归档包。" #: builtin/bundle.c msgid "do not show bundle details" msgstr "不显示归档包的细节" #: builtin/bundle.c #, c-format msgid "%s is okay\n" msgstr "%s 可以\n" #: builtin/bundle.c msgid "Need a repository to unbundle." msgstr "需要一个仓库来解开归档包。" #: builtin/bundle.c msgid "Unbundling objects" msgstr "解包对象中" #: builtin/cat-file.c merge-recursive.c #, c-format msgid "cannot read object %s '%s'" msgstr "不能读取对象 %s '%s'" #: builtin/cat-file.c msgid "flush is only for --buffer mode" msgstr "flush 只在 --buffer 模式中使用" #: builtin/cat-file.c msgid "empty command in input" msgstr "输入为空的命令" #: builtin/cat-file.c #, c-format msgid "whitespace before command: '%s'" msgstr "命令前存在空白：'%s'" #: builtin/cat-file.c #, c-format msgid "%s requires arguments" msgstr "%s 需要参数" #: builtin/cat-file.c #, c-format msgid "%s takes no arguments" msgstr "%s 不需要参数" #: builtin/cat-file.c #, c-format msgid "unknown command: '%s'" msgstr "未知命令：'%s'" #: builtin/cat-file.c msgid "only one batch option may be specified" msgstr "只能指定一个批处理选项" #: builtin/cat-file.c msgid "git cat-file " msgstr "git cat-file <类型> <对象>" #: builtin/cat-file.c msgid "git cat-file (-e | -p) " msgstr "git cat-file (-e | -p) <对象>" #: builtin/cat-file.c msgid "git cat-file (-t | -s) [--allow-unknown-type] " msgstr "git cat-file (-t | -s) [--allow-unknown-type] <对象>" #: builtin/cat-file.c msgid "" "git cat-file (--batch | --batch-check | --batch-command) [--batch-all-" "objects]\n" " [--buffer] [--follow-symlinks] [--unordered]\n" " [--textconv | --filters] [-z]" msgstr "" "git cat-file (--batch | --batch-check | --batch-command) [--batch-all-" "objects]\n" " [--buffer] [--follow-symlinks] [--unordered]\n" " [--textconv | --filters] [-z]" #: builtin/cat-file.c msgid "" "git cat-file (--textconv | --filters)\n" " [: | --path= ]" msgstr "" "git cat-file (--textconv | --filters)\n" " [<版本>:<路径|树对象> | --path=<路径|树对象> <版本>]" #: builtin/cat-file.c msgid "Check object existence or emit object contents" msgstr "检查对象存在或输出对象内容" #: builtin/cat-file.c msgid "check if exists" msgstr "检查 <对象> 是否存在" #: builtin/cat-file.c msgid "pretty-print content" msgstr "美观地打印 <对象> 的内容" #: builtin/cat-file.c msgid "Emit [broken] object attributes" msgstr "输出 [坏的] 对象属性" #: builtin/cat-file.c msgid "show object type (one of 'blob', 'tree', 'commit', 'tag', ...)" msgstr "显示对象的类型（'blob'、'tree'、'commit'、'tag'……其中之一）" #: builtin/cat-file.c msgid "show object size" msgstr "显示对象大小" #: builtin/cat-file.c msgid "allow -s and -t to work with broken/corrupt objects" msgstr "允许 -s 和 -t 对损坏的对象生效" #: builtin/cat-file.c builtin/log.c msgid "use mail map file" msgstr "使用邮件映射文件" #: builtin/cat-file.c msgid "Batch objects requested on stdin (or --batch-all-objects)" msgstr "批量处理标准输入中请求的对象（或者 --batch-all-objects）" #: builtin/cat-file.c msgid "show full or contents" msgstr "显示完整的 <对象> 或 <版本> 内容" #: builtin/cat-file.c msgid "like --batch, but don't emit " msgstr "类似于 --batch，但不输出 <内容>" #: builtin/cat-file.c msgid "stdin is NUL-terminated" msgstr "标准输入以 NUL 字符分隔" #: builtin/cat-file.c msgid "read commands from stdin" msgstr "从标准输入读取命令" #: builtin/cat-file.c msgid "with --batch[-check]: ignores stdin, batches all known objects" msgstr "带有 --batch[-check]：忽略标准输入，批量处理所有已知的对象" #: builtin/cat-file.c msgid "Change or optimize batch output" msgstr "更改或优化批处理输出" #: builtin/cat-file.c msgid "buffer --batch output" msgstr "缓冲 --batch 的输出" #: builtin/cat-file.c msgid "follow in-tree symlinks" msgstr "跟随树内符号链接" #: builtin/cat-file.c msgid "do not order objects before emitting them" msgstr "在输出对象前不要排序" #: builtin/cat-file.c msgid "" "Emit object (blob or tree) with conversion or filter (stand-alone, or with " "batch)" msgstr "转换或过滤后输出对象（数据对象或树）（单独或批处理）" #: builtin/cat-file.c msgid "run textconv on object's content" msgstr "对对象内容做文本转换" #: builtin/cat-file.c msgid "run filters on object's content" msgstr "对对象内容做过滤" #: builtin/cat-file.c msgid "blob|tree" msgstr "数据对象|树" #: builtin/cat-file.c msgid "use a for (--textconv | --filters); Not with 'batch'" msgstr "(--textconv | --filters) 使用 <路径>；而不是 'batch'" #: builtin/cat-file.c #, c-format msgid "'%s=<%s>' needs '%s' or '%s'" msgstr "'%s=<%s>' 需要 '%s' 或 '%s'" #: builtin/cat-file.c msgid "path|tree-ish" msgstr "路径|树对象" #: builtin/cat-file.c #, c-format msgid "'%s' requires a batch mode" msgstr "'%s' 需要批处理模式" #: builtin/cat-file.c #, c-format msgid "'-%c' is incompatible with batch mode" msgstr "'-%c' 与批处理模式不兼容" #: builtin/cat-file.c msgid "batch modes take no arguments" msgstr "批处理模式不带其他参数" #: builtin/cat-file.c #, c-format msgid " required with '%s'" msgstr "'%s' 需要 <版本>" #: builtin/cat-file.c #, c-format msgid " required with '-%c'" msgstr "'-%c' 需要 <对象>" #: builtin/cat-file.c #, c-format msgid "only two arguments allowed in mode, not %d" msgstr "<类型> <对象> 模式只允许两个参数，而不是 %d 个" #: builtin/check-attr.c msgid "git check-attr [-a | --all | ...] [--] ..." msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..." #: builtin/check-attr.c msgid "git check-attr --stdin [-z] [-a | --all | ...]" msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...]" #: builtin/check-attr.c msgid "report all attributes set on file" msgstr "报告设置在文件上的所有属性" #: builtin/check-attr.c msgid "use .gitattributes only from the index" msgstr "只使用索引中的 .gitattributes" #: builtin/check-attr.c builtin/check-ignore.c builtin/hash-object.c msgid "read file names from stdin" msgstr "从标准输入读出文件名" #: builtin/check-attr.c builtin/check-ignore.c msgid "terminate input and output records by a NUL character" msgstr "输入和输出的记录使用 NUL 字符终结" #: builtin/check-ignore.c builtin/checkout.c builtin/gc.c builtin/worktree.c msgid "suppress progress reporting" msgstr "不显示进度报告" #: builtin/check-ignore.c msgid "show non-matching input paths" msgstr "显示未匹配的输入路径" #: builtin/check-ignore.c msgid "ignore index when checking" msgstr "检查时忽略索引" #: builtin/check-ignore.c msgid "cannot specify pathnames with --stdin" msgstr "不能同时指定路径及 --stdin 参数" #: builtin/check-ignore.c msgid "-z only makes sense with --stdin" msgstr "-z 需要和 --stdin 参数共用才有意义" #: builtin/check-ignore.c msgid "no path specified" msgstr "未指定路径" #: builtin/check-ignore.c msgid "--quiet is only valid with a single pathname" msgstr "参数 --quiet 只在提供一个路径名时有效" #: builtin/check-ignore.c msgid "cannot have both --quiet and --verbose" msgstr "不能同时提供 --quiet 和 --verbose 参数" #: builtin/check-ignore.c msgid "--non-matching is only valid with --verbose" msgstr "--non-matching 选项只在使用 --verbose 时有效" #: builtin/check-mailmap.c msgid "git check-mailmap [] ..." msgstr "git check-mailmap [<选项>] <联系地址>..." #: builtin/check-mailmap.c msgid "also read contacts from stdin" msgstr "还从标准输入读取联系地址" #: builtin/check-mailmap.c #, c-format msgid "unable to parse contact: %s" msgstr "不能解析联系地址：%s" #: builtin/check-mailmap.c msgid "no contacts specified" msgstr "未指定联系地址" #: builtin/checkout--worker.c msgid "git checkout--worker []" msgstr "git checkout--worker [<选项>]" #: builtin/checkout--worker.c builtin/checkout-index.c builtin/column.c #: builtin/submodule--helper.c builtin/worktree.c msgid "string" msgstr "字符串" #: builtin/checkout--worker.c builtin/checkout-index.c msgid "when creating files, prepend " msgstr "在创建文件时，在前面加上 <字符串>" #: builtin/checkout-index.c msgid "git checkout-index [] [--] [...]" msgstr "git checkout-index [<选项>] [--] [<文件>...]" #: builtin/checkout-index.c msgid "stage should be between 1 and 3 or all" msgstr "索引值应该取值 1 到 3 或者 all" #: builtin/checkout-index.c msgid "check out all files in the index" msgstr "检出索引区的所有文件" #: builtin/checkout-index.c msgid "do not skip files with skip-worktree set" msgstr "在 skip-worktree 设置时不要跳过文件" #: builtin/checkout-index.c msgid "force overwrite of existing files" msgstr "强制覆盖现有的文件" #: builtin/checkout-index.c msgid "no warning for existing files and files not in index" msgstr "存在或不在索引中的文件都没有警告" #: builtin/checkout-index.c msgid "don't checkout new files" msgstr "不检出新文件" #: builtin/checkout-index.c msgid "update stat information in the index file" msgstr "更新索引中文件的状态信息" #: builtin/checkout-index.c msgid "read list of paths from the standard input" msgstr "从标准输入读取路径列表" #: builtin/checkout-index.c msgid "write the content to temporary files" msgstr "将内容写入临时文件" #: builtin/checkout-index.c msgid "copy out the files from named stage" msgstr "从指定暂存区中拷出文件" #: builtin/checkout.c msgid "git checkout [] " msgstr "git checkout [<选项>] <分支>" #: builtin/checkout.c msgid "git checkout [] [] -- ..." msgstr "git checkout [<选项>] [<分支>] -- <文件>..." #: builtin/checkout.c msgid "git switch [] []" msgstr "git switch [<选项>] [<分支>]" #: builtin/checkout.c msgid "git restore [] [--source=] ..." msgstr "git restore [<选项>] [--source=<分支>] <文件>..." #: builtin/checkout.c #, c-format msgid "path '%s' does not have our version" msgstr "路径 '%s' 没有我们的版本" #: builtin/checkout.c #, c-format msgid "path '%s' does not have their version" msgstr "路径 '%s' 没有他们的版本" #: builtin/checkout.c #, c-format msgid "path '%s' does not have all necessary versions" msgstr "路径 '%s' 没有全部必需的版本" #: builtin/checkout.c #, c-format msgid "path '%s' does not have necessary versions" msgstr "路径 '%s' 没有必需的版本" #: builtin/checkout.c #, c-format msgid "path '%s': cannot merge" msgstr "path '%s'：无法合并" #: builtin/checkout.c #, c-format msgid "Unable to add merge result for '%s'" msgstr "无法为 '%s' 添加合并结果" #: builtin/checkout.c #, c-format msgid "Recreated %d merge conflict" msgid_plural "Recreated %d merge conflicts" msgstr[0] "重新创建了 %d 个合并冲突" msgstr[1] "重新创建了 %d 个合并冲突" #: builtin/checkout.c #, c-format msgid "Updated %d path from %s" msgid_plural "Updated %d paths from %s" msgstr[0] "从 %2$s 更新了 %1$d 个路径" msgstr[1] "从 %2$s 更新了 %1$d 个路径" #: builtin/checkout.c #, c-format msgid "Updated %d path from the index" msgid_plural "Updated %d paths from the index" msgstr[0] "从索引区更新了 %d 个路径" msgstr[1] "从索引区更新了 %d 个路径" #: builtin/checkout.c #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' 不能在更新路径时使用" #: builtin/checkout.c #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "不能同时更新路径并切换到分支'%s'。" #: builtin/checkout.c #, c-format msgid "neither '%s' or '%s' is specified" msgstr "'%s' 或 '%s' 都没有指定" #: builtin/checkout.c #, c-format msgid "'%s' must be used when '%s' is not specified" msgstr "未指定 '%2$s' 时，必须使用 '%1$s'" #: builtin/checkout.c #, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "'%s' 或 '%s' 不能和 %s 一起使用" #: builtin/checkout.c #, c-format msgid "path '%s' is unmerged" msgstr "路径 '%s' 未合并" #: builtin/checkout.c msgid "you need to resolve your current index first" msgstr "您需要先解决当前索引的冲突" #: builtin/checkout.c #, c-format msgid "" "cannot continue with staged changes in the following files:\n" "%s" msgstr "" "不能继续，下列文件有暂存的修改：\n" "%s" #: builtin/checkout.c #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "不能对 '%s' 执行 reflog 操作：%s\n" #: builtin/checkout.c msgid "HEAD is now at" msgstr "HEAD 目前位于" #: builtin/checkout.c builtin/clone.c t/helper/test-fast-rebase.c msgid "unable to update HEAD" msgstr "不能更新 HEAD" #: builtin/checkout.c #, c-format msgid "Reset branch '%s'\n" msgstr "重置分支 '%s'\n" #: builtin/checkout.c #, c-format msgid "Already on '%s'\n" msgstr "已经位于 '%s'\n" #: builtin/checkout.c #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "切换并重置分支 '%s'\n" #: builtin/checkout.c #, c-format msgid "Switched to a new branch '%s'\n" msgstr "切换到一个新分支 '%s'\n" #: builtin/checkout.c #, c-format msgid "Switched to branch '%s'\n" msgstr "切换到分支 '%s'\n" # 译者：注意保持前导空格 #: builtin/checkout.c #, c-format msgid " ... and %d more.\n" msgstr " ... 及其它 %d 个。\n" #: builtin/checkout.c #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" "any of your branches:\n" "\n" "%s\n" msgid_plural "" "Warning: you are leaving %d commits behind, not connected to\n" "any of your branches:\n" "\n" "%s\n" msgstr[0] "" "警告：您正丢下 %d 个提交，未和任何分支关联：\n" "\n" "%s\n" msgstr[1] "" "警告：您正丢下 %d 个提交，未和任何分支关联：\n" "\n" "%s\n" #: builtin/checkout.c #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" "to do so with:\n" "\n" " git branch %s\n" "\n" msgid_plural "" "If you want to keep them by creating a new branch, this may be a good time\n" "to do so with:\n" "\n" " git branch %s\n" "\n" msgstr[0] "" "如果您想要通过创建新分支保存它，这可能是一个好时候。\n" "如下操作：\n" "\n" " git branch <新分支名> %s\n" "\n" msgstr[1] "" "如果您想要通过创建新分支保存它们，这可能是一个好时候。\n" "如下操作：\n" "\n" " git branch <新分支名> %s\n" "\n" #: builtin/checkout.c msgid "internal error in revision walk" msgstr "在版本遍历时遇到内部错误" #: builtin/checkout.c msgid "Previous HEAD position was" msgstr "之前的 HEAD 位置是" #: builtin/checkout.c msgid "You are on a branch yet to be born" msgstr "您位于一个尚未初始化的分支" #: builtin/checkout.c #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" "Please use -- (and optionally --no-guess) to disambiguate" msgstr "" "'%s' 既可以是一个本地文件，也可以是一个跟踪分支。\n" "请使用 --（和可选的 --no-guess）来消除歧义" #: builtin/checkout.c msgid "" "If you meant to check out a remote tracking branch on, e.g. 'origin',\n" "you can do so by fully qualifying the name with the --track option:\n" "\n" " git checkout --track origin/\n" "\n" "If you'd like to always have checkouts of an ambiguous prefer\n" "one remote, e.g. the 'origin' remote, consider setting\n" "checkout.defaultRemote=origin in your config." msgstr "" "如果您想要检出一个远程跟踪分支，例如在 'origin' 上的，您可以使用分支\n" "全名和 --track 选项：\n" "\n" " git checkout --track origin/<名称>\n" "\n" "如果您总是喜欢使用模糊的简短分支名 <名称>，而不喜欢如 'origin' 的远程\n" "名称，可以在配置中设置 checkout.defaultRemote=origin。" #: builtin/checkout.c #, c-format msgid "'%s' matched multiple (%d) remote tracking branches" msgstr "'%s' 匹配多个（%d 个）远程跟踪分支" #: builtin/checkout.c msgid "only one reference expected" msgstr "只期望一个引用" #: builtin/checkout.c #, c-format msgid "only one reference expected, %d given." msgstr "应只有一个引用，却给出了 %d 个" #: builtin/checkout.c builtin/worktree.c #, c-format msgid "invalid reference: %s" msgstr "无效引用：%s" #: builtin/checkout.c #, c-format msgid "reference is not a tree: %s" msgstr "引用不是一个树：%s" #: builtin/checkout.c #, c-format msgid "a branch is expected, got tag '%s'" msgstr "期望一个分支，得到标签 '%s'" #: builtin/checkout.c #, c-format msgid "a branch is expected, got remote branch '%s'" msgstr "期望一个分支，得到远程分支 '%s'" #: builtin/checkout.c #, c-format msgid "a branch is expected, got '%s'" msgstr "期望一个分支，得到 '%s'" #: builtin/checkout.c #, c-format msgid "a branch is expected, got commit '%s'" msgstr "期望一个分支，得到提交 '%s'" #: builtin/checkout.c msgid "" "If you want to detach HEAD at the commit, try again with the --detach option." msgstr "如果你在本提交分离头指针，使用 --detach 选项重试。" #: builtin/checkout.c msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." msgstr "" "不能在合并时切换分支\n" "考虑使用 \"git merge --quit\" 或 \"git worktree add\"。" #: builtin/checkout.c msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." msgstr "" "不能在一个 am 会话期间切换分支\n" "考虑使用 \"git am --quit\" 或 \"git worktree add\"。" #: builtin/checkout.c msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." msgstr "" "不能在变基时切换分支\n" "考虑使用 \"git rebase --quit\" 或 \"git worktree add\"。" #: builtin/checkout.c msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." msgstr "" "不能在拣选时切换分支\n" "考虑使用 \"git cherry-pick --quit\" 或 \"git worktree add\"。" #: builtin/checkout.c msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." msgstr "" "不能在还原时切换分支\n" "考虑使用 \"git revert --quit\" 或 \"git worktree add\"。" #: builtin/checkout.c msgid "you are switching branch while bisecting" msgstr "您在执行二分查找时切换分支" #: builtin/checkout.c msgid "paths cannot be used with switching branches" msgstr "路径不能和切换分支同时使用" #: builtin/checkout.c #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' 不能和切换分支同时使用" #: builtin/checkout.c #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' 不能和 '%s' 同时使用" #: builtin/checkout.c #, c-format msgid "'%s' cannot take " msgstr "'%s' 不带 <起始点>" #: builtin/checkout.c #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "不能切换分支到一个非提交 '%s'" #: builtin/checkout.c msgid "missing branch or commit argument" msgstr "缺少分支或提交参数" #: builtin/checkout.c msgid "perform a 3-way merge with the new branch" msgstr "和新的分支执行三方合并" #: builtin/checkout.c builtin/log.c parse-options.h msgid "style" msgstr "风格" #: builtin/checkout.c msgid "conflict style (merge, diff3, or zdiff3)" msgstr "冲突输出风格（merge、diff3 或 zdiff3）" #: builtin/checkout.c builtin/worktree.c msgid "detach HEAD at named commit" msgstr "HEAD 从指定的提交分离" #: builtin/checkout.c msgid "force checkout (throw away local modifications)" msgstr "强制检出（丢弃本地修改）" #: builtin/checkout.c msgid "new-branch" msgstr "新分支" #: builtin/checkout.c msgid "new unparented branch" msgstr "新的没有父提交的分支" #: builtin/checkout.c builtin/merge.c msgid "update ignored files (default)" msgstr "更新忽略的文件（默认）" #: builtin/checkout.c msgid "do not check if another worktree is holding the given ref" msgstr "不检查指定的引用是否被其他工作区所占用" #: builtin/checkout.c msgid "checkout our version for unmerged files" msgstr "对尚未合并的文件检出我们的版本" #: builtin/checkout.c msgid "checkout their version for unmerged files" msgstr "对尚未合并的文件检出他们的版本" #: builtin/checkout.c msgid "do not limit pathspecs to sparse entries only" msgstr "对路径不做稀疏检出的限制" #: builtin/checkout.c #, c-format msgid "options '-%c', '-%c', and '%s' cannot be used together" msgstr "选项 '-%c'、'-%c' 和 ‘%s' 不能同时使用" #: builtin/checkout.c msgid "--track needs a branch name" msgstr "--track 需要一个分支名" #: builtin/checkout.c #, c-format msgid "missing branch name; try -%c" msgstr "缺少分支名，尝试 -%c" #: builtin/checkout.c #, c-format msgid "could not resolve %s" msgstr "无法解析 %s" #: builtin/checkout.c msgid "invalid path specification" msgstr "无效的路径规格" #: builtin/checkout.c #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "'%s' 不是一个提交，不能基于它创建分支 '%s'" #: builtin/checkout.c #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout：--detach 不能接收路径参数 '%s'" #: builtin/checkout.c msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." msgstr "" "git checkout：在从索引检出时，--ours/--theirs、--force 和 --merge 不兼容。" #: builtin/checkout.c msgid "you must specify path(s) to restore" msgstr "您必须指定要恢复的路径" #: builtin/checkout.c builtin/clone.c builtin/remote.c #: builtin/submodule--helper.c builtin/worktree.c msgid "branch" msgstr "分支" #: builtin/checkout.c msgid "create and checkout a new branch" msgstr "创建并检出一个新的分支" #: builtin/checkout.c msgid "create/reset and checkout a branch" msgstr "创建/重置并检出一个分支" #: builtin/checkout.c msgid "create reflog for new branch" msgstr "为新的分支创建引用日志" #: builtin/checkout.c msgid "second guess 'git checkout ' (default)" msgstr "二次猜测 'git checkout <无此分支>'（默认）" #: builtin/checkout.c msgid "use overlay mode (default)" msgstr "使用叠加模式（默认）" #: builtin/checkout.c msgid "create and switch to a new branch" msgstr "创建并切换一个新分支" #: builtin/checkout.c msgid "create/reset and switch to a branch" msgstr "创建/重置并切换一个分支" #: builtin/checkout.c msgid "second guess 'git switch '" msgstr "二次猜测 'git switch <无此分支>'" #: builtin/checkout.c msgid "throw away local modifications" msgstr "丢弃本地修改" #: builtin/checkout.c msgid "which tree-ish to checkout from" msgstr "要检出哪一个树" #: builtin/checkout.c msgid "restore the index" msgstr "恢复索引" #: builtin/checkout.c msgid "restore the working tree (default)" msgstr "恢复工作区（默认）" #: builtin/checkout.c msgid "ignore unmerged entries" msgstr "忽略未合并条目" #: builtin/checkout.c msgid "use overlay mode" msgstr "使用叠加模式" #: builtin/clean.c msgid "" "git clean [-d] [-f] [-i] [-n] [-q] [-e ] [-x | -X] [--] " "[...]" msgstr "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径规格>..." #: builtin/clean.c #, c-format msgid "Removing %s\n" msgstr "正删除 %s\n" #: builtin/clean.c #, c-format msgid "Would remove %s\n" msgstr "将删除 %s\n" #: builtin/clean.c #, c-format msgid "Skipping repository %s\n" msgstr "忽略仓库 %s\n" #: builtin/clean.c #, c-format msgid "Would skip repository %s\n" msgstr "将忽略仓库 %s\n" #: builtin/clean.c midx.c #, c-format msgid "failed to remove %s" msgstr "无法删除 %s" #: builtin/clean.c #, c-format msgid "could not lstat %s\n" msgstr "不能对 %s 调用 lstat\n" #: builtin/clean.c msgid "Refusing to remove current working directory\n" msgstr "拒绝删除当前工作目录\n" #: builtin/clean.c msgid "Would refuse to remove current working directory\n" msgstr "将拒绝删除当前工作目录\n" #: builtin/clean.c git-add--interactive.perl #, c-format msgid "" "Prompt help:\n" "1 - select a numbered item\n" "foo - select item based on unique prefix\n" " - (empty) select nothing\n" msgstr "" "帮助：\n" "1 - 通过编号选择一个选项\n" "foo - 通过唯一前缀选择一个选项\n" " - （空）什么也不选择\n" #: builtin/clean.c git-add--interactive.perl #, c-format msgid "" "Prompt help:\n" "1 - select a single item\n" "3-5 - select a range of items\n" "2-3,6-9 - select multiple ranges\n" "foo - select item based on unique prefix\n" "-... - unselect specified items\n" "* - choose all items\n" " - (empty) finish selecting\n" msgstr "" "帮助：\n" "1 - 选择一个选项\n" "3-5 - 选择一个范围内的所有选项\n" "2-3,6-9 - 选择多个范围内的所有选项\n" "foo - 通过唯一前缀选择一个选项\n" "-... - 反选特定的选项\n" "* - 选择所有选项\n" " - （空）结束选择\n" #: builtin/clean.c git-add--interactive.perl #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "嗯（%s）？\n" #: builtin/clean.c #, c-format msgid "Input ignore patterns>> " msgstr "输入模版以排除条目>> " #: builtin/clean.c #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "警告：无法找到和 %s 匹配的条目" #: builtin/clean.c msgid "Select items to delete" msgstr "选择要删除的条目" #. TRANSLATORS: Make sure to keep [y/N] as is #: builtin/clean.c #, c-format msgid "Remove %s [y/N]? " msgstr "删除 %s [y/N]？" #: builtin/clean.c msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" "select by numbers - select items to be deleted by numbers\n" "ask each - confirm each deletion (like \"rm -i\")\n" "quit - stop cleaning\n" "help - this screen\n" "? - help for prompt selection" msgstr "" "clean - 开始清理\n" "filter by pattern - 通过模版排除要删除的条目\n" "select by numbers - 通过数字选择要删除的条目\n" "ask each - 针对删除逐一询问（就像 \"rm -i\"）\n" "quit - 停止删除并退出\n" "help - 显示本帮助\n" "? - 显示如何在提示符下选择的帮助" #: builtin/clean.c msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "将删除如下条目：" msgstr[1] "将删除如下条目：" #: builtin/clean.c msgid "No more files to clean, exiting." msgstr "没有要清理的文件，退出。" #: builtin/clean.c msgid "do not print names of files removed" msgstr "不打印删除文件的名称" #: builtin/clean.c msgid "force" msgstr "强制" #: builtin/clean.c msgid "interactive cleaning" msgstr "交互式清除" #: builtin/clean.c msgid "remove whole directories" msgstr "删除整个目录" #: builtin/clean.c builtin/describe.c builtin/grep.c builtin/log.c #: builtin/ls-files.c builtin/name-rev.c builtin/show-ref.c msgid "pattern" msgstr "模式" #: builtin/clean.c msgid "add to ignore rules" msgstr "添加 <模式> 到忽略规则" #: builtin/clean.c msgid "remove ignored files, too" msgstr "也删除忽略的文件" #: builtin/clean.c msgid "remove only ignored files" msgstr "只删除忽略的文件" #: builtin/clean.c msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" msgstr "" "clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作" #: builtin/clean.c msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" msgstr "" "clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作" #: builtin/clean.c msgid "-x and -X cannot be used together" msgstr "-x 和 -X 不能同时使用" #: builtin/clone.c msgid "git clone [] [--] []" msgstr "git clone [<选项>] [--] <仓库> [<路径>]" #: builtin/clone.c msgid "don't clone shallow repository" msgstr "不克隆浅仓库" #: builtin/clone.c msgid "don't create a checkout" msgstr "不创建一个检出" #: builtin/clone.c builtin/init-db.c msgid "create a bare repository" msgstr "创建一个纯仓库" #: builtin/clone.c msgid "create a mirror repository (implies bare)" msgstr "创建一个镜像仓库（也是纯仓库）" #: builtin/clone.c msgid "to clone from a local repository" msgstr "从本地仓库克隆" #: builtin/clone.c msgid "don't use local hardlinks, always copy" msgstr "不使用本地硬链接，始终复制" #: builtin/clone.c msgid "setup as shared repository" msgstr "设置为共享仓库" #: builtin/clone.c msgid "pathspec" msgstr "路径规格" #: builtin/clone.c msgid "initialize submodules in the clone" msgstr "在克隆时初始化子模组" #: builtin/clone.c msgid "number of submodules cloned in parallel" msgstr "并发克隆的子模组的数量" #: builtin/clone.c builtin/init-db.c msgid "template-directory" msgstr "模板目录" #: builtin/clone.c builtin/init-db.c msgid "directory from which templates will be used" msgstr "模板目录将被使用" #: builtin/clone.c builtin/submodule--helper.c msgid "reference repository" msgstr "参考仓库" #: builtin/clone.c builtin/submodule--helper.c msgid "use --reference only while cloning" msgstr "仅在克隆时参考 --reference 指向的本地仓库" #: builtin/clone.c builtin/column.c builtin/fmt-merge-msg.c builtin/init-db.c #: builtin/merge-file.c builtin/merge.c builtin/pack-objects.c builtin/repack.c #: builtin/submodule--helper.c t/helper/test-simple-ipc.c msgid "name" msgstr "名称" #: builtin/clone.c msgid "use instead of 'origin' to track upstream" msgstr "使用 <名称> 而不是 'origin' 去跟踪上游" #: builtin/clone.c msgid "checkout instead of the remote's HEAD" msgstr "检出 <分支> 而不是远程 HEAD" #: builtin/clone.c msgid "path to git-upload-pack on the remote" msgstr "远程 git-upload-pack 路径" #: builtin/clone.c builtin/fetch.c builtin/grep.c builtin/pull.c msgid "depth" msgstr "深度" #: builtin/clone.c msgid "create a shallow clone of that depth" msgstr "创建一个指定深度的浅克隆" #: builtin/clone.c builtin/fetch.c builtin/pack-objects.c builtin/pull.c msgid "time" msgstr "时间" #: builtin/clone.c msgid "create a shallow clone since a specific time" msgstr "从一个特定时间创建一个浅克隆" #: builtin/clone.c builtin/fetch.c builtin/pull.c builtin/rebase.c msgid "revision" msgstr "版本" #: builtin/clone.c builtin/fetch.c builtin/pull.c msgid "deepen history of shallow clone, excluding rev" msgstr "深化浅克隆的历史，除了特定版本" #: builtin/clone.c builtin/submodule--helper.c msgid "clone only one branch, HEAD or --branch" msgstr "只克隆一个分支、HEAD 或 --branch" #: builtin/clone.c msgid "don't clone any tags, and make later fetches not to follow them" msgstr "不要克隆任何标签，并且后续获取操作也不下载它们" #: builtin/clone.c msgid "any cloned submodules will be shallow" msgstr "子模组将以浅下载模式克隆" #: builtin/clone.c builtin/init-db.c msgid "gitdir" msgstr "git目录" #: builtin/clone.c builtin/init-db.c msgid "separate git dir from working tree" msgstr "git目录和工作区分离" #: builtin/clone.c msgid "key=value" msgstr "key=value" #: builtin/clone.c msgid "set config inside the new repository" msgstr "在新仓库中设置配置信息" #: builtin/clone.c builtin/fetch.c builtin/ls-remote.c builtin/pull.c #: builtin/push.c builtin/send-pack.c msgid "server-specific" msgstr "server-specific" #: builtin/clone.c builtin/fetch.c builtin/ls-remote.c builtin/pull.c #: builtin/push.c builtin/send-pack.c msgid "option to transmit" msgstr "传输选项" #: builtin/clone.c builtin/fetch.c builtin/pull.c builtin/push.c msgid "use IPv4 addresses only" msgstr "只使用 IPv4 地址" #: builtin/clone.c builtin/fetch.c builtin/pull.c builtin/push.c msgid "use IPv6 addresses only" msgstr "只使用 IPv6 地址" #: builtin/clone.c msgid "apply partial clone filters to submodules" msgstr "对子模组使用部分克隆过滤器" #: builtin/clone.c msgid "any cloned submodules will use their remote-tracking branch" msgstr "任何克隆的子模组将使用它们的远程跟踪分支" #: builtin/clone.c msgid "initialize sparse-checkout file to include only files at root" msgstr "初始化稀疏检出文件，只包含根目录文件" #: builtin/clone.c msgid "uri" msgstr "uri" #: builtin/clone.c msgid "a URI for downloading bundles before fetching from origin remote" msgstr "用于在从 origin 远程获取之前下载归档包的 URI" #: builtin/clone.c #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "info: 不能为 '%s' 添加一个备用：%s\n" #: builtin/clone.c builtin/diff.c builtin/rm.c grep.c setup.c #, c-format msgid "failed to stat '%s'" msgstr "无法对 '%s' 调用 stat" #: builtin/clone.c #, c-format msgid "%s exists and is not a directory" msgstr "%s 存在且不是一个目录" #: builtin/clone.c #, c-format msgid "failed to start iterator over '%s'" msgstr "无法在 '%s' 上启动迭代器" #: builtin/clone.c #, c-format msgid "symlink '%s' exists, refusing to clone with --local" msgstr "符号链接 '%s' 存在，拒绝用 --local 克隆" #: builtin/clone.c compat/precompose_utf8.c #, c-format msgid "failed to unlink '%s'" msgstr "无法删除 '%s'" #: builtin/clone.c #, c-format msgid "failed to create link '%s'" msgstr "无法创建链接 '%s'" #: builtin/clone.c #, c-format msgid "failed to copy file to '%s'" msgstr "无法拷贝文件至 '%s'" #: builtin/clone.c #, c-format msgid "failed to iterate over '%s'" msgstr "无法在 '%s' 上迭代" #: builtin/clone.c #, c-format msgid "done.\n" msgstr "完成。\n" #: builtin/clone.c msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" "and retry with 'git restore --source=HEAD :/'\n" msgstr "" "克隆成功，但是检出失败。\n" "您可以通过 'git status' 检查哪些已被检出，然后使用命令\n" "'git restore --source=HEAD :/' 重试\n" #: builtin/clone.c #, c-format msgid "Could not find remote branch %s to clone." msgstr "不能发现要克隆的远程分支 %s。" #: builtin/clone.c fetch-pack.c msgid "remote did not send all necessary objects" msgstr "远程没有发送所有必需的对象" #: builtin/clone.c #, c-format msgid "unable to update %s" msgstr "不能更新 %s" #: builtin/clone.c msgid "failed to initialize sparse-checkout" msgstr "无法初始化稀疏检出" #: builtin/clone.c msgid "remote HEAD refers to nonexistent ref, unable to checkout" msgstr "远程 HEAD 指向一个不存在的引用，无法检出" #: builtin/clone.c msgid "unable to checkout working tree" msgstr "不能检出工作区" #: builtin/clone.c msgid "unable to write parameters to config file" msgstr "无法将参数写入配置文件" #: builtin/clone.c msgid "cannot repack to clean up" msgstr "无法执行 repack 来清理" #: builtin/clone.c msgid "cannot unlink temporary alternates file" msgstr "无法删除临时的 alternates 文件" #: builtin/clone.c msgid "Too many arguments." msgstr "太多参数。" #: builtin/clone.c scalar.c msgid "You must specify a repository to clone." msgstr "您必须指定一个仓库来克隆。" #: builtin/clone.c msgid "" "--bundle-uri is incompatible with --depth, --shallow-since, and --shallow-" "exclude" msgstr "--bundle-uri 与 --depth、--shallow-since 和 --shallow-exclude 不兼容" #: builtin/clone.c #, c-format msgid "repository '%s' does not exist" msgstr "仓库 '%s' 不存在" #: builtin/clone.c builtin/fetch.c #, c-format msgid "depth %s is not a positive number" msgstr "深度 %s 不是一个正数" #: builtin/clone.c #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。" #: builtin/clone.c #, c-format msgid "repository path '%s' already exists and is not an empty directory." msgstr "仓库路径 '%s' 已经存在，并且不是一个空目录。" #: builtin/clone.c #, c-format msgid "working tree '%s' already exists." msgstr "工作区 '%s' 已经存在。" #: builtin/clone.c builtin/difftool.c builtin/log.c builtin/worktree.c #, c-format msgid "could not create leading directories of '%s'" msgstr "不能为 '%s' 创建先导目录" #: builtin/clone.c #, c-format msgid "could not create work tree dir '%s'" msgstr "不能创建工作区目录 '%s'" #: builtin/clone.c #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "克隆到纯仓库 '%s'...\n" #: builtin/clone.c #, c-format msgid "Cloning into '%s'...\n" msgstr "正克隆到 '%s'...\n" #: builtin/clone.c msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不兼容" #: builtin/clone.c builtin/remote.c #, c-format msgid "'%s' is not a valid remote name" msgstr "'%s' 不是一个有效的远程名称" #: builtin/clone.c msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth 在本地克隆时被忽略，请改用 file:// 协议。" #: builtin/clone.c msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "--shallow-since 在本地克隆时被忽略，请改用 file:// 协议。" #: builtin/clone.c msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "--shallow-exclude 在本地克隆时被忽略，请改用 file:// 协议。" #: builtin/clone.c msgid "--filter is ignored in local clones; use file:// instead." msgstr "--filter 在本地克隆时被忽略，请改用 file:// 协议。" #: builtin/clone.c fetch-pack.c msgid "source repository is shallow, reject to clone." msgstr "源仓库是浅克隆，拒绝克隆。" #: builtin/clone.c msgid "source repository is shallow, ignoring --local" msgstr "源仓库是浅克隆，忽略 --local" #: builtin/clone.c msgid "--local is ignored" msgstr "--local 被忽略" #: builtin/clone.c msgid "cannot clone from filtered bundle" msgstr "无法从经过过滤的归档包克隆" #: builtin/clone.c msgid "failed to initialize the repo, skipping bundle URI" msgstr "无法初始化仓库，跳过归档包 URI" #: builtin/clone.c #, c-format msgid "failed to fetch objects from bundle URI '%s'" msgstr "无法从归档包 URI '%s' 获取对象" #: builtin/clone.c msgid "remote transport reported error" msgstr "远程传输报告错误" #: builtin/clone.c #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "远程分支 %s 在上游 %s 未发现" #: builtin/clone.c msgid "You appear to have cloned an empty repository." msgstr "您似乎克隆了一个空仓库。" #: builtin/column.c msgid "git column []" msgstr "git column [<选项>]" #: builtin/column.c msgid "lookup config vars" msgstr "查找配置变量" #: builtin/column.c msgid "layout to use" msgstr "要使用的布局" #: builtin/column.c msgid "maximum width" msgstr "最大宽度" #: builtin/column.c msgid "padding space on left border" msgstr "左边框的填充空间" #: builtin/column.c msgid "padding space on right border" msgstr "右边框的填充空间" #: builtin/column.c msgid "padding space between columns" msgstr "两列之间的填充空间" #: builtin/column.c msgid "--command must be the first argument" msgstr "--command 必须是第一个参数" #: builtin/commit-graph.c msgid "" "git commit-graph verify [--object-dir ] [--shallow] [--[no-]progress]" msgstr "" "git commit-graph verify [--object-dir <目录>] [--shallow] [--[no-]progress]" #: builtin/commit-graph.c msgid "" "git commit-graph write [--object-dir ] [--append]\n" " [--split[=]] [--reachable | --stdin-packs | " "--stdin-commits]\n" " [--changed-paths] [--[no-]max-new-filters ] [--" "[no-]progress]\n" " " msgstr "" "git commit-graph write [--object-dir <目录>] [--append]\n" " [--split[=<策略>]] [--reachable | --stdin-packs | --" "stdin-commits] \n" " [--changed-paths] [--[no-]max-new-filters ] [--" "[no-]progress]\n" " <切分选项>" #: builtin/commit-graph.c builtin/fetch.c builtin/log.c builtin/repack.c msgid "dir" msgstr "目录" #: builtin/commit-graph.c msgid "the object directory to store the graph" msgstr "保存图形的对象目录" #: builtin/commit-graph.c msgid "if the commit-graph is split, only verify the tip file" msgstr "如果提交图形被拆分，只验证头一个文件" #: builtin/commit-graph.c #, c-format msgid "Could not open commit-graph '%s'" msgstr "无法打开提交图形 '%s'" #: builtin/commit-graph.c #, c-format msgid "unrecognized --split argument, %s" msgstr "未能识别的 --split 参数，%s" #: builtin/commit-graph.c #, c-format msgid "unexpected non-hex object ID: %s" msgstr "意外的非十六进制对象 ID：%s" #: builtin/commit-graph.c #, c-format msgid "invalid object: %s" msgstr "无效对象：%s" #: builtin/commit-graph.c parse-options-cb.c #, c-format msgid "option `%s' expects a numerical value" msgstr "选项 `%s' 期望一个数字值" #: builtin/commit-graph.c msgid "start walk at all refs" msgstr "开始遍历所有引用" #: builtin/commit-graph.c msgid "scan pack-indexes listed by stdin for commits" msgstr "从标准输入中的包索引文件列表中扫描提交" #: builtin/commit-graph.c msgid "start walk at commits listed by stdin" msgstr "从标准输入中的提交开始扫描" #: builtin/commit-graph.c msgid "include all commits already in the commit-graph file" msgstr "包含 commit-graph 文件中已有所有提交" #: builtin/commit-graph.c msgid "enable computation for changed paths" msgstr "启用变更路径的计算" #: builtin/commit-graph.c msgid "allow writing an incremental commit-graph file" msgstr "允许写一个增量提交图形文件" #: builtin/commit-graph.c msgid "maximum number of commits in a non-base split commit-graph" msgstr "在非基本拆分提交图形中的最大提交数" #: builtin/commit-graph.c msgid "maximum ratio between two levels of a split commit-graph" msgstr "一个拆分提交图形的两个级别之间的最大比率" #: builtin/commit-graph.c msgid "only expire files older than a given date-time" msgstr "只让早于给定时间的文件过期" #: builtin/commit-graph.c msgid "maximum number of changed-path Bloom filters to compute" msgstr "要计算的变更路径布隆过滤器的最大数" #: builtin/commit-graph.c msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" msgstr "不能同时使用 --reachable、--stdin-commits 或 --stdin-packs" #: builtin/commit-graph.c msgid "Collecting commits from input" msgstr "正从标准输入收集提交" #: builtin/commit-tree.c msgid "git commit-tree [(-p )...]" msgstr "git commit-tree <树> [(-p <父提交>)...]" #: builtin/commit-tree.c msgid "" "git commit-tree [(-p )...] [-S[]] [(-m )...]\n" " [(-F )...] " msgstr "" "git commit-tree [(-p <父提交>)...] [-S[<私钥 ID>]] [(-m <消息>)...]\n" " [(-F <文件>)...] <树>" #: builtin/commit-tree.c #, c-format msgid "duplicate parent %s ignored" msgstr "忽略重复的父提交 %s" #: builtin/commit-tree.c builtin/log.c #, c-format msgid "not a valid object name %s" msgstr "不是一个有效的对象名 %s" #: builtin/commit-tree.c #, c-format msgid "git commit-tree: failed to read '%s'" msgstr "git commit-tree：无法读取 '%s'" #: builtin/commit-tree.c #, c-format msgid "git commit-tree: failed to close '%s'" msgstr "git commit-tree：无法关闭 '%s'" #: builtin/commit-tree.c msgid "parent" msgstr "父提交" #: builtin/commit-tree.c msgid "id of a parent commit object" msgstr "父提交对象 ID" #: builtin/commit-tree.c builtin/commit.c builtin/merge.c builtin/notes.c #: builtin/stash.c builtin/tag.c msgid "message" msgstr "说明" #: builtin/commit-tree.c builtin/commit.c msgid "commit message" msgstr "提交说明" #: builtin/commit-tree.c msgid "read commit log message from file" msgstr "从文件中读取提交说明" #: builtin/commit-tree.c builtin/commit.c builtin/merge.c builtin/pull.c #: builtin/revert.c msgid "GPG sign commit" msgstr "GPG 提交签名" #: builtin/commit-tree.c msgid "must give exactly one tree" msgstr "必须精确地提供一个树" #: builtin/commit-tree.c msgid "git commit-tree: failed to read" msgstr "git commit-tree：无法读取" #: builtin/commit.c msgid "" "git commit [-a | --interactive | --patch] [-s] [-v] [-u] [--amend]\n" " [--dry-run] [(-c | -C | --squash) | --fixup [(amend|" "reword):])]\n" " [-F | -m ] [--reset-author] [--allow-empty]\n" " [--allow-empty-message] [--no-verify] [-e] [--author=]\n" " [--date=] [--cleanup=] [--[no-]status]\n" " [-i | -o] [--pathspec-from-file= [--pathspec-file-nul]]\n" " [(--trailer [(=|:)])...] [-S[]]\n" " [--] [...]" msgstr "" "git commit [-a | --interactive | --patch] [-s] [-v] [-u<模式>] [--amend]\n" " [--dry-run] [(-c | -C | --squash) <提交> | --fixup [(amend|" "reword):]<提交>)]\n" " [-F <文件> | -m <消息>] [--reset-author] [--allow-empty]\n" " [--allow-empty-message] [--no-verify] [-e] [--author=<作者>]\n" " [--date=<日期>] [--cleanup=<模式>] [--[no-]status]\n" " [-i | -o] [--pathspec-from-file=<文件> [--pathspec-file-nul]]\n" " [(--trailer <键>[(=|:)<值>])...] [-S[<私钥 ID>]]\n" " [--] [<路径规格>...]" #: builtin/commit.c msgid "git status [] [--] [...]" msgstr "git status [<选项>] [--] [<路径规格>...]" #: builtin/commit.c msgid "" "You asked to amend the most recent commit, but doing so would make\n" "it empty. You can repeat your command with --allow-empty, or you can\n" "remove the commit entirely with \"git reset HEAD^\".\n" msgstr "" "您要修补最近的提交，但这么做会让它成为空提交。您可以重复您的命令并带上\n" "--allow-empty 选项，或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n" #: builtin/commit.c msgid "" "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" "If you wish to commit it anyway, use:\n" "\n" " git commit --allow-empty\n" "\n" msgstr "" "之前的拣选操作现在是一个空提交，可能是由冲突解决导致的。如果您无论如何\n" "也要提交，使用命令：\n" "\n" " git commit --allow-empty\n" "\n" #: builtin/commit.c msgid "Otherwise, please use 'git rebase --skip'\n" msgstr "否则，请使用 'git rebase --skip'\n" #: builtin/commit.c msgid "Otherwise, please use 'git cherry-pick --skip'\n" msgstr "否则，请使用 'git cherry-pick --skip'\n" #: builtin/commit.c msgid "" "and then use:\n" "\n" " git cherry-pick --continue\n" "\n" "to resume cherry-picking the remaining commits.\n" "If you wish to skip this commit, use:\n" "\n" " git cherry-pick --skip\n" "\n" msgstr "" "然后使用：\n" "\n" " git cherry-pick --continue\n" "\n" "来继续拣选剩余提交。如果您想跳过此提交，使用：\n" "\n" " git cherry-pick --skip\n" "\n" #: builtin/commit.c msgid "failed to unpack HEAD tree object" msgstr "无法解包 HEAD 树对象" #: builtin/commit.c msgid "No paths with --include/--only does not make sense." msgstr "参数 --include/--only 不跟路径没有意义。" #: builtin/commit.c msgid "unable to create temporary index" msgstr "不能创建临时索引" #: builtin/commit.c msgid "interactive add failed" msgstr "交互式添加失败" #: builtin/commit.c msgid "unable to update temporary index" msgstr "无法更新临时索引" #: builtin/commit.c msgid "Failed to update main cache tree" msgstr "不能更新树的主缓存" #: builtin/commit.c msgid "unable to write new_index file" msgstr "无法写 new_index 文件" #: builtin/commit.c msgid "cannot do a partial commit during a merge." msgstr "在合并过程中不能做部分提交。" #: builtin/commit.c msgid "cannot do a partial commit during a cherry-pick." msgstr "在拣选过程中不能做部分提交。" #: builtin/commit.c msgid "cannot do a partial commit during a rebase." msgstr "在变基过程中不能做部分提交。" #: builtin/commit.c msgid "cannot read the index" msgstr "无法读取索引" #: builtin/commit.c msgid "unable to write temporary index file" msgstr "无法写临时索引文件" #: builtin/commit.c #, c-format msgid "commit '%s' lacks author header" msgstr "提交 '%s' 缺少作者信息" #: builtin/commit.c #, c-format msgid "commit '%s' has malformed author line" msgstr "提交 '%s' 有格式错误的作者信息" #: builtin/commit.c msgid "malformed --author parameter" msgstr "格式错误的 --author 参数" #: builtin/commit.c ident.c #, c-format msgid "invalid date format: %s" msgstr "无效的日期格式：%s" #: builtin/commit.c msgid "" "unable to select a comment character that is not used\n" "in the current commit message" msgstr "无法选择一个未被当前提交说明使用的注释字符" #: builtin/commit.c #, c-format msgid "could not lookup commit %s" msgstr "不能查询提交 %s" #: builtin/commit.c builtin/shortlog.c #, c-format msgid "(reading log message from standard input)\n" msgstr "（正从标准输入中读取日志信息）\n" #: builtin/commit.c msgid "could not read log from standard input" msgstr "不能从标准输入中读取日志信息" #: builtin/commit.c #, c-format msgid "could not read log file '%s'" msgstr "不能读取日志文件 '%s'" #: builtin/commit.c #, c-format msgid "options '%s' and '%s:%s' cannot be used together" msgstr "选项 '%s' 和 '%s:%s' 不能同时使用" #: builtin/commit.c msgid "could not read SQUASH_MSG" msgstr "不能读取 SQUASH_MSG" #: builtin/commit.c msgid "could not read MERGE_MSG" msgstr "不能读取 MERGE_MSG" #: builtin/commit.c bundle.c rerere.c sequencer.c #, c-format msgid "could not open '%s'" msgstr "不能打开 '%s'" #: builtin/commit.c msgid "could not write commit template" msgstr "不能写提交模版" #: builtin/commit.c #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '%c' will be ignored.\n" msgstr "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略。\n" #: builtin/commit.c #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '%c' will be ignored, and an empty message aborts the commit.\n" msgstr "" "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略，而一个空的提交\n" "说明将会终止提交。\n" #: builtin/commit.c #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '%c' will be kept; you may remove them yourself if you want to.\n" msgstr "" "请为您的变更输入提交说明。以 '%c' 开始的行将被保留，如果您愿意\n" "也可以删除它们。\n" #: builtin/commit.c #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '%c' will be kept; you may remove them yourself if you want to.\n" "An empty message aborts the commit.\n" msgstr "" "请为您的变更输入提交说明。以 '%c' 开始的行将被保留，如果您愿意\n" "也可以删除它们。一个空的提交说明将会终止提交。\n" #: builtin/commit.c msgid "" "\n" "It looks like you may be committing a merge.\n" "If this is not correct, please run\n" "\tgit update-ref -d MERGE_HEAD\n" "and try again.\n" msgstr "" "\n" "似乎您正在做一个合并提交。如果不对，请运行\n" "\tgit update-ref -d MERGE_HEAD\n" "然后重试。\n" #: builtin/commit.c msgid "" "\n" "It looks like you may be committing a cherry-pick.\n" "If this is not correct, please run\n" "\tgit update-ref -d CHERRY_PICK_HEAD\n" "and try again.\n" msgstr "" "\n" "似乎您正在做一个拣选提交。如果不对，请运行\n" "\tgit update-ref -d CHERRY_PICK_HEAD\n" "然后重试。\n" # 译者：为保证在输出中对齐，注意调整句中空格！ #: builtin/commit.c #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%s作者： %.*s <%.*s>" # 译者：为保证在输出中对齐，注意调整句中空格！ #: builtin/commit.c #, c-format msgid "%sDate: %s" msgstr "%s日期： %s" # 译者：为保证在输出中对齐，注意调整句中空格！ #: builtin/commit.c #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%s提交者：%.*s <%.*s>" #: builtin/commit.c msgid "Cannot read index" msgstr "无法读取索引" #: builtin/commit.c msgid "unable to pass trailers to --trailers" msgstr "无法将尾注传递给 --trailers" #: builtin/commit.c msgid "Error building trees" msgstr "无法创建树对象" #: builtin/commit.c builtin/tag.c #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "请使用 -m 或 -F 选项提供提交说明。\n" #: builtin/commit.c #, c-format msgid "--author '%s' is not 'Name ' and matches no existing author" msgstr "--author '%s' 不是 '姓名 <邮箱>' 格式，且未能在现有作者中找到匹配" #: builtin/commit.c #, c-format msgid "Invalid ignored mode '%s'" msgstr "无效的忽略模式 '%s'" #: builtin/commit.c #, c-format msgid "Invalid untracked files mode '%s'" msgstr "无效的未跟踪文件参数 '%s'" #: builtin/commit.c msgid "You are in the middle of a merge -- cannot reword." msgstr "您正处于一个合并过程中 -- 无法改写说明。" #: builtin/commit.c msgid "You are in the middle of a cherry-pick -- cannot reword." msgstr "您正处于一个拣选过程中 -- 无法改写说明。" #: builtin/commit.c #, c-format msgid "reword option of '%s' and path '%s' cannot be used together" msgstr "改写说明选项 '%s' 和路径 '%s' 不能同时使用" #: builtin/commit.c #, c-format msgid "reword option of '%s' and '%s' cannot be used together" msgstr "改写说明选项 '%s' 和 '%s' 不能同时使用" #: builtin/commit.c msgid "You have nothing to amend." msgstr "您没有可修补的提交。" #: builtin/commit.c msgid "You are in the middle of a merge -- cannot amend." msgstr "您正处于一个合并过程中 -- 无法修补提交。" #: builtin/commit.c msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "您正处于一个拣选过程中 -- 无法修补提交。" #: builtin/commit.c msgid "You are in the middle of a rebase -- cannot amend." msgstr "您正处于一个变基过程中 -- 无法修补提交。" #: builtin/commit.c msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。" #: builtin/commit.c #, c-format msgid "unknown option: --fixup=%s:%s" msgstr "未知选项：--fixup=%s:%s" #: builtin/commit.c #, c-format msgid "paths '%s ...' with -a does not make sense" msgstr "路径 '%s ...' 和 -a 选项同时使用没有意义" #: builtin/commit.c msgid "show status concisely" msgstr "以简洁的格式显示状态" #: builtin/commit.c msgid "show branch information" msgstr "显示分支信息" #: builtin/commit.c msgid "show stash information" msgstr "显示贮藏区信息" #: builtin/commit.c msgid "compute full ahead/behind values" msgstr "计算完整的领先/落后值" #: builtin/commit.c msgid "version" msgstr "版本" #: builtin/commit.c builtin/push.c builtin/worktree.c msgid "machine-readable output" msgstr "机器可读的输出" #: builtin/commit.c msgid "show status in long format (default)" msgstr "以长格式显示状态（默认）" #: builtin/commit.c msgid "terminate entries with NUL" msgstr "条目以 NUL 字符结尾" #: builtin/commit.c msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "显示未跟踪的文件，“模式”的可选参数：all、normal、no。（默认：all）" #: builtin/commit.c msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" msgstr "" "显示已忽略的文件，可选模式：traditional、matching、no。（默认：traditional）" #: builtin/commit.c parse-options.h msgid "when" msgstr "何时" #: builtin/commit.c msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" "忽略子模组的更改，“何时”的可选参数：all、dirty、untracked。（默认：all）" #: builtin/commit.c msgid "list untracked files in columns" msgstr "以列的方式显示未跟踪的文件" #: builtin/commit.c msgid "do not detect renames" msgstr "不检测重命名" #: builtin/commit.c msgid "detect renames, optionally set similarity index" msgstr "检测重命名，可以设置索引相似度" #: builtin/commit.c msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "不支持已忽略和未跟踪文件参数的组合" #: builtin/commit.c msgid "suppress summary after successful commit" msgstr "提交成功后不显示概述信息" #: builtin/commit.c msgid "show diff in commit message template" msgstr "在提交说明模板里显示差异" #: builtin/commit.c msgid "Commit message options" msgstr "提交说明选项" #: builtin/commit.c builtin/merge.c builtin/tag.c msgid "read message from file" msgstr "从文件中读取提交说明" #: builtin/commit.c msgid "author" msgstr "作者" #: builtin/commit.c msgid "override author for commit" msgstr "提交时覆盖作者" #: builtin/commit.c builtin/gc.c msgid "date" msgstr "日期" #: builtin/commit.c msgid "override date for commit" msgstr "提交时覆盖日期" #: builtin/commit.c parse-options.h ref-filter.h msgid "commit" msgstr "提交" #: builtin/commit.c msgid "reuse and edit message from specified commit" msgstr "重用并编辑指定提交的提交说明" #: builtin/commit.c msgid "reuse message from specified commit" msgstr "重用指定提交的提交说明" #. TRANSLATORS: Leave "[(amend|reword):]" as-is, #. and only translate . #. #: builtin/commit.c msgid "[(amend|reword):]commit" msgstr "[(amend|reword):]提交" #: builtin/commit.c msgid "" "use autosquash formatted message to fixup or amend/reword specified commit" msgstr "使用自动挤压格式的提交说明对指定的提交进行修正、修补或改写说明" #: builtin/commit.c msgid "use autosquash formatted message to squash specified commit" msgstr "使用自动挤压格式的提交说明用以挤压至指定的提交" #: builtin/commit.c msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "现在将该提交的作者改为我（和 -C/-c/--amend 参数共用）" #: builtin/commit.c builtin/interpret-trailers.c msgid "trailer" msgstr "尾注" #: builtin/commit.c msgid "add custom trailer(s)" msgstr "添加自定义尾注" #: builtin/commit.c builtin/log.c builtin/merge.c builtin/pull.c #: builtin/revert.c msgid "add a Signed-off-by trailer" msgstr "添加 Signed-off-by 尾注" #: builtin/commit.c msgid "use specified template file" msgstr "使用指定的模板文件" #: builtin/commit.c msgid "force edit of commit" msgstr "强制编辑提交" #: builtin/commit.c msgid "include status in commit message template" msgstr "在提交说明模板里包含状态信息" #: builtin/commit.c msgid "Commit contents options" msgstr "提交内容选项" #: builtin/commit.c msgid "commit all changed files" msgstr "提交所有改动的文件" #: builtin/commit.c msgid "add specified files to index for commit" msgstr "添加指定的文件到索引区等待提交" #: builtin/commit.c msgid "interactively add files" msgstr "交互式添加文件" #: builtin/commit.c msgid "interactively add changes" msgstr "交互式添加变更" #: builtin/commit.c msgid "commit only specified files" msgstr "只提交指定的文件" #: builtin/commit.c msgid "bypass pre-commit and commit-msg hooks" msgstr "绕过 pre-commit 和 commit-msg 钩子" #: builtin/commit.c msgid "show what would be committed" msgstr "显示将要提交的内容" #: builtin/commit.c msgid "amend previous commit" msgstr "修改先前的提交" #: builtin/commit.c msgid "bypass post-rewrite hook" msgstr "绕过 post-rewrite 钩子" #: builtin/commit.c msgid "ok to record an empty change" msgstr "允许一个空提交" #: builtin/commit.c msgid "ok to record a change with an empty message" msgstr "允许空的提交说明" #: builtin/commit.c sequencer.c msgid "could not parse HEAD commit" msgstr "不能解析 HEAD 提交" #: builtin/commit.c #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "损坏的 MERGE_HEAD 文件（%s）" #: builtin/commit.c msgid "could not read MERGE_MODE" msgstr "不能读取 MERGE_MODE" #: builtin/commit.c #, c-format msgid "could not read commit message: %s" msgstr "不能读取提交说明：%s" #: builtin/commit.c #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "终止提交因为提交说明为空。\n" #: builtin/commit.c #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "终止提交；您未更改来自模版的提交说明。\n" #: builtin/commit.c #, c-format msgid "Aborting commit due to empty commit message body.\n" msgstr "因提交说明的正文为空而终止提交。\n" #: builtin/commit.c msgid "" "repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" "not exceeded, and then \"git restore --staged :/\" to recover." msgstr "" "仓库已更新，但无法写 new_index 文件。检查是否磁盘已满或\n" "磁盘配额已耗尽，然后执行 \"git restore --staged :/\" 恢复。" #: builtin/config.c msgid "git config []" msgstr "git config [<选项>]" #: builtin/config.c builtin/env--helper.c #, c-format msgid "unrecognized --type argument, %s" msgstr "未能识别的 --type 参数，%s" #: builtin/config.c msgid "only one type at a time" msgstr "一次只能一个类型" #: builtin/config.c msgid "Config file location" msgstr "配置文件位置" #: builtin/config.c msgid "use global config file" msgstr "使用全局配置文件" #: builtin/config.c msgid "use system config file" msgstr "使用系统级配置文件" #: builtin/config.c msgid "use repository config file" msgstr "使用仓库级配置文件" #: builtin/config.c msgid "use per-worktree config file" msgstr "使用工作区级别的配置文件" #: builtin/config.c builtin/gc.c msgid "use given config file" msgstr "使用指定的配置文件" #: builtin/config.c msgid "blob-id" msgstr "数据对象 ID" #: builtin/config.c msgid "read config from given blob object" msgstr "从给定的数据对象读取配置" #: builtin/config.c msgid "Action" msgstr "操作" #: builtin/config.c msgid "get value: name [value-pattern]" msgstr "获取值：名称 [值模式]" #: builtin/config.c msgid "get all values: key [value-pattern]" msgstr "获得所有的值：键 [值模式]" #: builtin/config.c msgid "get values for regexp: name-regex [value-pattern]" msgstr "根据正则表达式获得值：名称正则 [值模式]" #: builtin/config.c msgid "get value specific for the URL: section[.var] URL" msgstr "获得 URL 取值：section[.var] URL" #: builtin/config.c msgid "replace all matching variables: name value [value-pattern]" msgstr "替换所有匹配的变量：名称 值 [值模式]" #: builtin/config.c msgid "add a new variable: name value" msgstr "添加一个新的变量：名称 值" #: builtin/config.c msgid "remove a variable: name [value-pattern]" msgstr "删除一个变量：名称 [值模式]" #: builtin/config.c msgid "remove all matches: name [value-pattern]" msgstr "删除所有匹配项：名称 [值模式]" #: builtin/config.c msgid "rename section: old-name new-name" msgstr "重命名小节：old-name new-name" #: builtin/config.c msgid "remove a section: name" msgstr "删除一个小节：name" #: builtin/config.c msgid "list all" msgstr "列出所有" #: builtin/config.c msgid "use string equality when comparing values to 'value-pattern'" msgstr "在比较值与 '值模式' 时，使用字符串字面比较" #: builtin/config.c msgid "open an editor" msgstr "打开一个编辑器" #: builtin/config.c msgid "find the color configured: slot [default]" msgstr "获得配置的颜色：配置 [默认]" #: builtin/config.c msgid "find the color setting: slot [stdout-is-tty]" msgstr "获得颜色设置：配置 [stdout-is-tty]" #: builtin/config.c msgid "Type" msgstr "类型" #: builtin/config.c builtin/env--helper.c builtin/hash-object.c msgid "type" msgstr "类型" #: builtin/config.c builtin/env--helper.c msgid "value is given this type" msgstr "取值为该类型" #: builtin/config.c msgid "value is \"true\" or \"false\"" msgstr "值是 \"true\" 或 \"false\"" #: builtin/config.c msgid "value is decimal number" msgstr "值是十进制数" #: builtin/config.c msgid "value is --bool or --int" msgstr "值是 --bool 或 --int" #: builtin/config.c msgid "value is --bool or string" msgstr "值是 --bool 或字符串" #: builtin/config.c msgid "value is a path (file or directory name)" msgstr "值是一个路径（文件或目录名）" #: builtin/config.c msgid "value is an expiry date" msgstr "值是一个到期日期" #: builtin/config.c msgid "Other" msgstr "其它" #: builtin/config.c msgid "terminate values with NUL byte" msgstr "终止值是 NUL 字节" #: builtin/config.c msgid "show variable names only" msgstr "只显示变量名" #: builtin/config.c msgid "respect include directives on lookup" msgstr "查询时参照 include 指令递归查找" #: builtin/config.c msgid "show origin of config (file, standard input, blob, command line)" msgstr "显示配置的来源（文件、标准输入、数据对象，或命令行）" #: builtin/config.c msgid "show scope of config (worktree, local, global, system, command)" msgstr "显示配置的作用域（工作区、本地、全局、系统、命令）" #: builtin/config.c builtin/env--helper.c msgid "value" msgstr "取值" #: builtin/config.c msgid "with --get, use default value when missing entry" msgstr "使用 --get 参数，当缺少设置时使用默认值" #: builtin/config.c #, c-format msgid "wrong number of arguments, should be %d" msgstr "错误的参数个数，应该为 %d 个" #: builtin/config.c #, c-format msgid "wrong number of arguments, should be from %d to %d" msgstr "错误的参数个数，应该为从 %d 个到 %d 个" #: builtin/config.c #, c-format msgid "invalid key pattern: %s" msgstr "无效键名模式：%s" #: builtin/config.c config.c #, c-format msgid "invalid pattern: %s" msgstr "无效模式：%s" #: builtin/config.c #, c-format msgid "failed to format default config value: %s" msgstr "无法格式化默认配置值：%s" #: builtin/config.c #, c-format msgid "cannot parse color '%s'" msgstr "无法解析颜色 '%s'" #: builtin/config.c msgid "unable to parse default color value" msgstr "无法解析默认颜色值" #: builtin/config.c msgid "not in a git directory" msgstr "不在 git 仓库中" #: builtin/config.c msgid "writing to stdin is not supported" msgstr "不支持写到标准输入" #: builtin/config.c msgid "writing config blobs is not supported" msgstr "不支持写到配置数据对象" #: builtin/config.c #, c-format msgid "" "# This is Git's per-user configuration file.\n" "[user]\n" "# Please adapt and uncomment the following lines:\n" "#\tname = %s\n" "#\temail = %s\n" msgstr "" "# This is Git's per-user configuration file.\n" "[user]\n" "# Please adapt and uncomment the following lines:\n" "#\tname = %s\n" "#\temail = %s\n" #: builtin/config.c msgid "only one config file at a time" msgstr "一次只能有一个配置文件" #: builtin/config.c msgid "--local can only be used inside a git repository" msgstr "--local 只能在 git 仓库内使用" #: builtin/config.c msgid "--blob can only be used inside a git repository" msgstr "--blob 只能在 git 仓库内使用" #: builtin/config.c msgid "--worktree can only be used inside a git repository" msgstr "--worktree 只能在 git 仓库内使用" #: builtin/config.c builtin/gc.c msgid "$HOME not set" msgstr "$HOME 未设置" #: builtin/config.c msgid "" "--worktree cannot be used with multiple working trees unless the config\n" "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n" "section in \"git help worktree\" for details" msgstr "" "不能和多个工作区一起使用 --worktree，除非启用 worktreeConfig 配置扩展。\n" "详情请阅读“git help worktree”的“CONFIGURATION FILE”小节" #: builtin/config.c msgid "--get-color and variable type are incoherent" msgstr "--get-color 和变量类型不兼容" #: builtin/config.c msgid "only one action at a time" msgstr "一次只能有一个动作" #: builtin/config.c msgid "--name-only is only applicable to --list or --get-regexp" msgstr "--name-only 仅适用于 --list 或 --get-regexp" #: builtin/config.c msgid "" "--show-origin is only applicable to --get, --get-all, --get-regexp, and --" "list" msgstr "--show-origin 仅适用于 --get、--get-all、--get-regexp 和 --list" #: builtin/config.c msgid "--default is only applicable to --get" msgstr "--default 仅适用于 --get" #: builtin/config.c msgid "--fixed-value only applies with 'value-pattern'" msgstr "--fixed-value 仅适用于有 '值模式'" #: builtin/config.c #, c-format msgid "unable to read config file '%s'" msgstr "无法读取配置文件 '%s'" #: builtin/config.c msgid "error processing config file(s)" msgstr "处理配置文件出错" #: builtin/config.c msgid "editing stdin is not supported" msgstr "不支持编辑标准输入" #: builtin/config.c msgid "editing blobs is not supported" msgstr "不支持编辑数据对象" #: builtin/config.c #, c-format msgid "cannot create configuration file %s" msgstr "不能创建配置文件 %s" #: builtin/config.c #, c-format msgid "" "cannot overwrite multiple values with a single value\n" " Use a regexp, --add or --replace-all to change %s." msgstr "" "无法用一个值覆盖多个值\n" " 使用一个正则表达式、--add 或 --replace-all 来修改 %s。" #: builtin/config.c #, c-format msgid "no such section: %s" msgstr "无此小节：%s" #: builtin/count-objects.c msgid "print sizes in human readable format" msgstr "以用户可读的格式显示大小" #: builtin/credential-cache--daemon.c #, c-format msgid "" "The permissions on your socket directory are too loose; other\n" "users may be able to read your cached credentials. Consider running:\n" "\n" "\tchmod 0700 %s" msgstr "" "您的 socket 目录权限过于宽松，其他用户可能会读取您缓存的认证信息。考虑执" "行：\n" "\n" "\tchmod 0700 %s" #: builtin/credential-cache--daemon.c msgid "print debugging messages to stderr" msgstr "输出调试信息到标准错误" #: builtin/credential-cache--daemon.c msgid "credential-cache--daemon unavailable; no unix socket support" msgstr "credential-cache--daemon 不可用，不支持 unix 套接字" #: builtin/credential-cache.c msgid "credential-cache unavailable; no unix socket support" msgstr "credential-cache 不可用，不支持 unix 套接字" #: builtin/credential-store.c #, c-format msgid "unable to get credential storage lock in %d ms" msgstr "无法在 %d ms 获得凭证存储锁" #: builtin/describe.c msgid "" "git describe [--all] [--tags] [--contains] [--abbrev=] [...]" msgstr "" "git describe [--all] [--tags] [--contains] [--abbrev=] [<提交号>...]" #: builtin/describe.c msgid "" "git describe [--all] [--tags] [--contains] [--abbrev=] --dirty[=]" msgstr "" "git describe [--all] [--tags] [--contains] [--abbrev=] --dirty[=<标记>]" #: builtin/describe.c msgid "git describe " msgstr "git describe <数据对象>" #: builtin/describe.c msgid "head" msgstr "头" #: builtin/describe.c msgid "lightweight" msgstr "轻量级的" #: builtin/describe.c msgid "annotated" msgstr "附注的" #: builtin/describe.c #, c-format msgid "annotated tag %s not available" msgstr "附注标签 %s 无效" #: builtin/describe.c #, c-format msgid "tag '%s' is externally known as '%s'" msgstr "标签 '%s' 在外部被认为是 '%s'" #: builtin/describe.c #, c-format msgid "no tag exactly matches '%s'" msgstr "没有标签准确匹配 '%s'" #: builtin/describe.c #, c-format msgid "No exact match on refs or tags, searching to describe\n" msgstr "没有精确匹配到引用或标签，继续搜索进行描述\n" #: builtin/describe.c #, c-format msgid "finished search at %s\n" msgstr "完成搜索 %s\n" #: builtin/describe.c #, c-format msgid "" "No annotated tags can describe '%s'.\n" "However, there were unannotated tags: try --tags." msgstr "" "没有附注标签能描述 '%s'。\n" "然而，存在未附注标签：尝试 --tags。" #: builtin/describe.c #, c-format msgid "" "No tags can describe '%s'.\n" "Try --always, or create some tags." msgstr "" "没有标签能描述 '%s'。\n" "尝试 --always，或者创建一些标签。" #: builtin/describe.c #, c-format msgid "traversed %lu commits\n" msgstr "已遍历 %lu 个提交\n" #: builtin/describe.c #, c-format msgid "" "more than %i tags found; listed %i most recent\n" "gave up search at %s\n" msgstr "" "发现多于 %i 个标签，列出最近的 %i 个\n" "在 %s 放弃搜索\n" #: builtin/describe.c #, c-format msgid "describe %s\n" msgstr "描述 %s\n" #: builtin/describe.c #, c-format msgid "Not a valid object name %s" msgstr "不是一个有效的对象名 %s" #: builtin/describe.c #, c-format msgid "%s is neither a commit nor blob" msgstr "%s 既不是提交也不是数据对象" #: builtin/describe.c msgid "find the tag that comes after the commit" msgstr "寻找该提交之后的标签" #: builtin/describe.c msgid "debug search strategy on stderr" msgstr "在标准错误上调试搜索策略" #: builtin/describe.c msgid "use any ref" msgstr "使用任意引用" #: builtin/describe.c msgid "use any tag, even unannotated" msgstr "使用任意标签，即使未附带注释" #: builtin/describe.c msgid "always use long format" msgstr "始终使用长提交号格式" #: builtin/describe.c msgid "only follow first parent" msgstr "只跟随第一个父提交" #: builtin/describe.c msgid "only output exact matches" msgstr "只输出精确匹配" #: builtin/describe.c msgid "consider most recent tags (default: 10)" msgstr "考虑最近 个标签（默认：10）" #: builtin/describe.c msgid "only consider tags matching " msgstr "只考虑匹配 <模式> 的标签" #: builtin/describe.c msgid "do not consider tags matching " msgstr "不考虑匹配 <模式> 的标签" #: builtin/describe.c builtin/name-rev.c msgid "show abbreviated commit object as fallback" msgstr "显示简写的提交号作为后备" #: builtin/describe.c msgid "mark" msgstr "标记" #: builtin/describe.c msgid "append on dirty working tree (default: \"-dirty\")" msgstr "对于脏工作区，追加 <标记>（默认：\"-dirty\"）" #: builtin/describe.c msgid "append on broken working tree (default: \"-broken\")" msgstr "对于损坏的工作区，追加 <标记>（默认：\"-broken\"）" #: builtin/describe.c msgid "No names found, cannot describe anything." msgstr "没有发现名称，无法描述任何东西。" #: builtin/describe.c #, c-format msgid "option '%s' and commit-ishes cannot be used together" msgstr "选项 '%s' 和提交号不能同时使用" #: builtin/diagnose.c msgid "" "git diagnose [(-o | --output-directory) ] [(-s | --suffix) ]\n" " [--mode=]" msgstr "" "git diagnose [(-o | --output-directory) <路径>] [(-s | --suffix) <格式>]\n" " [--mode=<模式>]" #: builtin/diagnose.c msgid "specify a destination for the diagnostics archive" msgstr "指定诊断归档包的目标位置" #: builtin/diagnose.c msgid "specify a strftime format suffix for the filename" msgstr "指定文件的 strftime 格式后缀" #: builtin/diagnose.c msgid "specify the content of the diagnostic archive" msgstr "指定诊断信息归档包的内容" #: builtin/diff-tree.c msgid "--merge-base only works with two commits" msgstr "--merge-base 仅适用于两个提交" #: builtin/diff.c #, c-format msgid "'%s': not a regular file or symlink" msgstr "'%s'：不是一个正规文件或符号链接" #: builtin/diff.c msgid "no merge given, only parents." msgstr "没有给出合并，只有父提交。" #: builtin/diff.c #, c-format msgid "invalid option: %s" msgstr "无效选项：%s" #: builtin/diff.c #, c-format msgid "%s...%s: no merge base" msgstr "%s...%s：无合并基线" #: builtin/diff.c msgid "Not a git repository" msgstr "不是 git 仓库" #: builtin/diff.c builtin/grep.c #, c-format msgid "invalid object '%s' given." msgstr "提供了无效对象 '%s'。" #: builtin/diff.c #, c-format msgid "more than two blobs given: '%s'" msgstr "提供了超过两个数据对象：'%s'" #: builtin/diff.c #, c-format msgid "unhandled object '%s' given." msgstr "无法处理的对象 '%s'。" #: builtin/diff.c #, c-format msgid "%s...%s: multiple merge bases, using %s" msgstr "%s...%s：多条合并基线，使用 %s" #: builtin/difftool.c msgid "git difftool [] [ []] [--] [...]" msgstr "git difftool [<选项>] [<提交> [<提交>]] [--] [<路径>...]" #: builtin/difftool.c #, c-format msgid "could not read symlink %s" msgstr "无法读取符号链接 %s" #: builtin/difftool.c #, c-format msgid "could not read symlink file %s" msgstr "无法读取符号链接文件 %s" #: builtin/difftool.c #, c-format msgid "could not read object %s for symlink %s" msgstr "无法读取符号链接 %2$s 指向的对象 %1$s" #: builtin/difftool.c msgid "" "combined diff formats ('-c' and '--cc') are not supported in\n" "directory diff mode ('-d' and '--dir-diff')." msgstr "" "不支持在目录比较模式（'-d' 和 '--dir-diff'）中采用组合差异格式（'-c' 和 '--" "cc'）。" #: builtin/difftool.c #, c-format msgid "both files modified: '%s' and '%s'." msgstr "两个文件都被修改：'%s' 和 '%s'。" #: builtin/difftool.c msgid "working tree file has been left." msgstr "工作区文件被留了下来。" #: builtin/difftool.c sequencer.c #, c-format msgid "could not copy '%s' to '%s'" msgstr "不能拷贝 '%s' 至 '%s'" #: builtin/difftool.c #, c-format msgid "temporary files exist in '%s'." msgstr "临时文件存在于 '%s'。" #: builtin/difftool.c msgid "you may want to cleanup or recover these." msgstr "您可能想要清理或者恢复它们。" #: builtin/difftool.c #, c-format msgid "failed: %d" msgstr "失败：%d" #: builtin/difftool.c msgid "use `diff.guitool` instead of `diff.tool`" msgstr "使用 `diff.guitool` 代替 `diff.tool`" #: builtin/difftool.c msgid "perform a full-directory diff" msgstr "执行一个全目录差异比较" #: builtin/difftool.c msgid "do not prompt before launching a diff tool" msgstr "启动差异比较工具之前不提示" #: builtin/difftool.c msgid "use symlinks in dir-diff mode" msgstr "在 dir-diff 模式中使用符号链接" #: builtin/difftool.c msgid "tool" msgstr "工具" #: builtin/difftool.c msgid "use the specified diff tool" msgstr "使用指定的差异比较工具" #: builtin/difftool.c msgid "print a list of diff tools that may be used with `--tool`" msgstr "显示可以用在 `--tool` 参数后的差异工具列表" #: builtin/difftool.c msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non-zero exit " "code" msgstr "当执行的 diff 工具返回非零退出码时，使 'git-difftool' 退出" #: builtin/difftool.c msgid "specify a custom command for viewing diffs" msgstr "指定一个用于查看差异的自定义命令" #: builtin/difftool.c msgid "passed to `diff`" msgstr "传递给 `diff`" #: builtin/difftool.c msgid "difftool requires worktree or --no-index" msgstr "difftool 要求工作区或者 --no-index" #: builtin/difftool.c msgid "no given for --tool=" msgstr "没有为 --tool=<工具> 参数提供 <工具>" #: builtin/difftool.c msgid "no given for --extcmd=" msgstr "没有为 --extcmd=<命令> 参数提供 <命令>" #: builtin/env--helper.c msgid "git env--helper --type=[bool|ulong] " msgstr "git env--helper --type=[bool|ulong] <选项> <环境变量>" #: builtin/env--helper.c msgid "default for git_env_*(...) to fall back on" msgstr "git_env_*(...) 的默认值" #: builtin/env--helper.c msgid "be quiet only use git_env_*() value as exit code" msgstr "安静模式，只使用 git_env_*() 的值作为退出码" #: builtin/env--helper.c #, c-format msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`" msgstr "选项 `--default' 和 `--type=bool` 期望一个布尔值，不是 `%s`" #: builtin/env--helper.c #, c-format msgid "" "option `--default' expects an unsigned long value with `--type=ulong`, not " "`%s`" msgstr "选项 `--default' 和 `--type=ulong` 期望一个无符号长整型，不是 `%s`" #: builtin/fast-export.c msgid "git fast-export []" msgstr "git fast-export []" #: builtin/fast-export.c msgid "Error: Cannot export nested tags unless --mark-tags is specified." msgstr "错误：除非指定 --mark-tags，否则无法导出嵌套标签。" #: builtin/fast-export.c msgid "--anonymize-map token cannot be empty" msgstr "--anonymize-map 取值不能为空" #: builtin/fast-export.c msgid "show progress after objects" msgstr "在 个对象之后显示进度" #: builtin/fast-export.c msgid "select handling of signed tags" msgstr "选择如何处理签名标签" #: builtin/fast-export.c msgid "select handling of tags that tag filtered objects" msgstr "选择当标签指向被过滤对象时该标签的处理方式" #: builtin/fast-export.c msgid "select handling of commit messages in an alternate encoding" msgstr "选择使用备用编码处理提交说明" #: builtin/fast-export.c msgid "dump marks to this file" msgstr "把标记存储到这个文件" #: builtin/fast-export.c msgid "import marks from this file" msgstr "从这个文件导入标记" #: builtin/fast-export.c msgid "import marks from this file if it exists" msgstr "如果文件存在，从该文件导入标记" #: builtin/fast-export.c msgid "fake a tagger when tags lack one" msgstr "当标签缺少标记人字段时，假装提供一个" #: builtin/fast-export.c msgid "output full tree for each commit" msgstr "每次提交都输出整个树" #: builtin/fast-export.c msgid "use the done feature to terminate the stream" msgstr "使用 done 功能来终止流" #: builtin/fast-export.c msgid "skip output of blob data" msgstr "跳过数据对象的输出" #: builtin/fast-export.c builtin/log.c msgid "refspec" msgstr "引用规格" #: builtin/fast-export.c msgid "apply refspec to exported refs" msgstr "对导出的引用应用引用规格" #: builtin/fast-export.c msgid "anonymize output" msgstr "匿名输出" #: builtin/fast-export.c msgid "from:to" msgstr "from:to" #: builtin/fast-export.c msgid "convert to in anonymized output" msgstr "在匿名输出中将 转换为 " #: builtin/fast-export.c msgid "reference parents which are not in fast-export stream by object id" msgstr "引用父对象 ID 不在 fast-export 流中" #: builtin/fast-export.c msgid "show original object ids of blobs/commits" msgstr "显示数据对象/提交的原始对象 ID" #: builtin/fast-export.c msgid "label tags with mark ids" msgstr "对带有标记 ID 的标签做标记" #: builtin/fast-import.c #, c-format msgid "Missing from marks for submodule '%s'" msgstr "子模组 '%s' 缺少 from 标记" #: builtin/fast-import.c #, c-format msgid "Missing to marks for submodule '%s'" msgstr "子模组 '%s' 缺少 to 标记" #: builtin/fast-import.c #, c-format msgid "Expected 'mark' command, got %s" msgstr "预期 'mark' 命令，得到 %s" #: builtin/fast-import.c #, c-format msgid "Expected 'to' command, got %s" msgstr "预期 'to' 命令，得到 %s" #: builtin/fast-import.c msgid "Expected format name:filename for submodule rewrite option" msgstr "子模组重写选项的预期格式为 name:filename" #: builtin/fast-import.c #, c-format msgid "feature '%s' forbidden in input without --allow-unsafe-features" msgstr "不带 --allow-unsafe-features 的输入中禁止使用功能 '%s'" #: builtin/fetch-pack.c #, c-format msgid "Lockfile created but not reported: %s" msgstr "Lockfile 已创建但未报告：%s" #: builtin/fetch.c msgid "git fetch [] [ [...]]" msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]" #: builtin/fetch.c msgid "git fetch [] " msgstr "git fetch [<选项>] <组>" #: builtin/fetch.c msgid "git fetch --multiple [] [( | )...]" msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]" #: builtin/fetch.c msgid "git fetch --all []" msgstr "git fetch --all [<选项>]" #: builtin/fetch.c msgid "fetch.parallel cannot be negative" msgstr "fetch.parallel 不能为负数" #: builtin/fetch.c builtin/pull.c msgid "fetch from all remotes" msgstr "从所有的远程抓取" #: builtin/fetch.c builtin/pull.c msgid "set upstream for git pull/fetch" msgstr "为 git pull/fetch 设置上游" #: builtin/fetch.c builtin/pull.c msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它" #: builtin/fetch.c msgid "use atomic transaction to update references" msgstr "使用原子事务更新引用" #: builtin/fetch.c builtin/pull.c msgid "path to upload pack on remote end" msgstr "上传包到远程的路径" #: builtin/fetch.c msgid "force overwrite of local reference" msgstr "强制覆盖本地引用" #: builtin/fetch.c msgid "fetch from multiple remotes" msgstr "从多个远程抓取" #: builtin/fetch.c builtin/pull.c msgid "fetch all tags and associated objects" msgstr "抓取所有的标签和关联对象" #: builtin/fetch.c msgid "do not fetch all tags (--no-tags)" msgstr "不抓取任何标签(--no-tags)" #: builtin/fetch.c msgid "number of submodules fetched in parallel" msgstr "子模组获取的并发数" #: builtin/fetch.c msgid "modify the refspec to place all refs within refs/prefetch/" msgstr "修改引用规格以将所有引用放入 refs/prefetch/" #: builtin/fetch.c builtin/pull.c msgid "prune remote-tracking branches no longer on remote" msgstr "清除远程已经不存在的分支的跟踪分支" #: builtin/fetch.c msgid "prune local tags no longer on remote and clobber changed tags" msgstr "清除远程不存在的本地标签，并且替换变更标签" # 译者：可选值，不能翻译 #: builtin/fetch.c builtin/pull.c msgid "on-demand" msgstr "on-demand" #: builtin/fetch.c msgid "control recursive fetching of submodules" msgstr "控制子模组的递归抓取" #: builtin/fetch.c msgid "write fetched references to the FETCH_HEAD file" msgstr "将获取到的引用写入 FETCH_HEAD 文件" #: builtin/fetch.c builtin/pull.c msgid "keep downloaded pack" msgstr "保持下载包" #: builtin/fetch.c msgid "allow updating of HEAD ref" msgstr "允许更新 HEAD 引用" #: builtin/fetch.c builtin/pull.c msgid "deepen history of shallow clone" msgstr "深化浅克隆的历史" #: builtin/fetch.c builtin/pull.c msgid "deepen history of shallow repository based on time" msgstr "基于时间来深化浅克隆的历史" #: builtin/fetch.c builtin/pull.c msgid "convert to a complete repository" msgstr "转换为一个完整的仓库" #: builtin/fetch.c msgid "re-fetch without negotiating common commits" msgstr "不协商共有提交重新获取" #: builtin/fetch.c msgid "prepend this to submodule path output" msgstr "在子模组路径输出的前面加上此目录" #: builtin/fetch.c msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" msgstr "递归获取子模组的缺省值（比配置文件优先级低）" #: builtin/fetch.c builtin/pull.c msgid "accept refs that update .git/shallow" msgstr "接受更新 .git/shallow 的引用" #: builtin/fetch.c builtin/pull.c msgid "refmap" msgstr "引用映射" #: builtin/fetch.c builtin/pull.c msgid "specify fetch refmap" msgstr "指定获取操作的引用映射" #: builtin/fetch.c builtin/pull.c msgid "report that we have only objects reachable from this object" msgstr "报告我们只拥有从该对象开始可达的对象" #: builtin/fetch.c msgid "do not fetch a packfile; instead, print ancestors of negotiation tips" msgstr "不获取包文件；而是打印协商的祖先提交" #: builtin/fetch.c msgid "run 'maintenance --auto' after fetching" msgstr "获取后执行 'maintenance --auto'" #: builtin/fetch.c builtin/pull.c msgid "check for forced-updates on all updated branches" msgstr "在所有更新分支上检查强制更新" #: builtin/fetch.c msgid "write the commit-graph after fetching" msgstr "抓取后写提交图" #: builtin/fetch.c msgid "accept refspecs from stdin" msgstr "从标准输入获取引用规格" #: builtin/fetch.c msgid "couldn't find remote ref HEAD" msgstr "无法发现远程 HEAD 引用" #: builtin/fetch.c #, c-format msgid "object %s not found" msgstr "对象 %s 未发现" #: builtin/fetch.c msgid "[up to date]" msgstr "[最新]" #: builtin/fetch.c msgid "[rejected]" msgstr "[已拒绝]" #: builtin/fetch.c msgid "can't fetch into checked-out branch" msgstr "无法获取到已检出的分支" #: builtin/fetch.c msgid "[tag update]" msgstr "[标签更新]" #: builtin/fetch.c msgid "unable to update local ref" msgstr "不能更新本地引用" #: builtin/fetch.c msgid "would clobber existing tag" msgstr "会破坏现有的标签" #: builtin/fetch.c msgid "[new tag]" msgstr "[新标签]" #: builtin/fetch.c msgid "[new branch]" msgstr "[新分支]" #: builtin/fetch.c msgid "[new ref]" msgstr "[新引用]" #: builtin/fetch.c msgid "forced update" msgstr "强制更新" #: builtin/fetch.c msgid "non-fast-forward" msgstr "非快进" #: builtin/fetch.c builtin/grep.c sequencer.c #, c-format msgid "cannot open '%s'" msgstr "不能打开 '%s'" #: builtin/fetch.c msgid "" "fetch normally indicates which branches had a forced update,\n" "but that check has been disabled; to re-enable, use '--show-forced-updates'\n" "flag or run 'git config fetch.showForcedUpdates true'" msgstr "" "获取操作通常显示哪些分支发生了强制更新，但该检查已被禁用；\n" "要重新启用，请使用 '--show-forced-updates' 选项或运行\n" "'git config fetch.showForcedUpdates true'" #: builtin/fetch.c #, c-format msgid "" "it took %.2f seconds to check forced updates; you can use\n" "'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates " "false'\n" "to avoid this check\n" msgstr "" "花了 %.2f 秒来检查强制更新；您可以使用 '--no-show-forced-updates'\n" "或运行 'git config fetch.showForcedUpdates false' 以避免此项检查\n" #: builtin/fetch.c #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s 未发送所有必需的对象\n" #: builtin/fetch.c #, c-format msgid "rejected %s because shallow roots are not allowed to be updated" msgstr "拒绝 %s 因为浅克隆的根不允许被更新" #: builtin/fetch.c #, c-format msgid "From %.*s\n" msgstr "来自 %.*s\n" #: builtin/fetch.c #, c-format msgid "" "some local refs could not be updated; try running\n" " 'git remote prune %s' to remove any old, conflicting branches" msgstr "" "一些本地引用不能被更新；尝试运行\n" " 'git remote prune %s' 来删除旧的、有冲突的分支" # 译者：注意保持前导空格 #: builtin/fetch.c #, c-format msgid " (%s will become dangling)" msgstr " （%s 将成为悬空状态）" # 译者：注意保持前导空格 #: builtin/fetch.c #, c-format msgid " (%s has become dangling)" msgstr " （%s 已成为悬空状态）" #: builtin/fetch.c msgid "[deleted]" msgstr "[已删除]" #: builtin/fetch.c builtin/remote.c msgid "(none)" msgstr "（无）" #: builtin/fetch.c #, c-format msgid "refusing to fetch into branch '%s' checked out at '%s'" msgstr "拒绝获取于 '%2$s' 检出的分支 '%1$s'" #: builtin/fetch.c #, c-format msgid "option \"%s\" value \"%s\" is not valid for %s" msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的" #: builtin/fetch.c #, c-format msgid "option \"%s\" is ignored for %s\n" msgstr "选项 \"%s\" 为 %s 所忽略\n" #: builtin/fetch.c object-file.c #, c-format msgid "%s is not a valid object" msgstr "%s 不是一个有效的对象" #: builtin/fetch.c #, c-format msgid "the object %s does not exist" msgstr "对象 '%s' 不存在" #: builtin/fetch.c msgid "multiple branches detected, incompatible with --set-upstream" msgstr "检测到多分支，和 --set-upstream 不兼容" #: builtin/fetch.c #, c-format msgid "" "could not set upstream of HEAD to '%s' from '%s' when it does not point to " "any branch." msgstr "无法在不指向任何分支时将 HEAD 的上游从 '%s' 设置为 '%s'。" #: builtin/fetch.c msgid "not setting upstream for a remote remote-tracking branch" msgstr "没有为一个远程跟踪分支设置上游" #: builtin/fetch.c msgid "not setting upstream for a remote tag" msgstr "没有为一个远程标签设置上游" #: builtin/fetch.c msgid "unknown branch type" msgstr "未知的分支类型" #: builtin/fetch.c msgid "" "no source branch found;\n" "you need to specify exactly one branch with the --set-upstream option" msgstr "" "未发现源分支；\n" "您需要使用 --set-upstream 选项指定一个分支" #: builtin/fetch.c #, c-format msgid "Fetching %s\n" msgstr "正在获取 %s\n" #: builtin/fetch.c #, c-format msgid "could not fetch %s" msgstr "不能获取 %s" #: builtin/fetch.c #, c-format msgid "could not fetch '%s' (exit code: %d)\n" msgstr "无法获取 '%s'（退出码：%d）\n" #: builtin/fetch.c msgid "" "no remote repository specified; please specify either a URL or a\n" "remote name from which new revisions should be fetched" msgstr "未指定远程仓库；请指定一个用于获取新版本的 URL 或远程仓库名" #: builtin/fetch.c msgid "you need to specify a tag name" msgstr "您需要指定一个标签名称" #: builtin/fetch.c msgid "--negotiate-only needs one or more --negotiation-tip=*" msgstr "--negotiate-only 需要一个或多个 --negotiation-tip=*" #: builtin/fetch.c msgid "negative depth in --deepen is not supported" msgstr "--deepen 不支持负数深度" #: builtin/fetch.c msgid "--unshallow on a complete repository does not make sense" msgstr "对于一个完整的仓库，参数 --unshallow 没有意义" #: builtin/fetch.c msgid "fetch --all does not take a repository argument" msgstr "fetch --all 不能带一个仓库参数" #: builtin/fetch.c msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all 带引用规格没有任何意义" #: builtin/fetch.c #, c-format msgid "no such remote or remote group: %s" msgstr "没有这样的远程或远程组：%s" #: builtin/fetch.c msgid "fetching a group and specifying refspecs does not make sense" msgstr "获取组并指定引用规格没有意义" #: builtin/fetch.c msgid "must supply remote when using --negotiate-only" msgstr "在使用 --negotiate-only 时必须提供远程仓库" #: builtin/fetch.c msgid "protocol does not support --negotiate-only, exiting" msgstr "协议不支持 --negotiate-only，退出" #: builtin/fetch.c msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" msgstr "只可以将 --filter 用于在 extensions.partialclone 中配置的远程仓库" #: builtin/fetch.c msgid "--atomic can only be used when fetching from one remote" msgstr "--atomic 仅在从一个远程仓库获取的时候可用" #: builtin/fetch.c msgid "--stdin can only be used when fetching from one remote" msgstr "--stdin 仅在从一个远程仓库获取的时候可用" #: builtin/fmt-merge-msg.c msgid "" "git fmt-merge-msg [-m ] [--log[=] | --no-log] [--file ]" msgstr "git fmt-merge-msg [-m <说明>] [--log[=] | --no-log] [--file <文件>]" #: builtin/fmt-merge-msg.c msgid "populate log with at most entries from shortlog" msgstr "向提交说明中最多复制指定条目（合并而来的提交）的简短说明" #: builtin/fmt-merge-msg.c msgid "alias for --log (deprecated)" msgstr "参数 --log 的别名（已弃用）" #: builtin/fmt-merge-msg.c msgid "text" msgstr "文本" #: builtin/fmt-merge-msg.c msgid "use as start of message" msgstr "使用 <文本> 作为提交说明的开始" #: builtin/fmt-merge-msg.c msgid "use instead of the real target branch" msgstr "使用 <名称> 而不是真正的目标分支" #: builtin/fmt-merge-msg.c msgid "file to read from" msgstr "从文件中读取" #: builtin/for-each-ref.c msgid "git for-each-ref [] []" msgstr "git for-each-ref [<选项>] [<模式>]" #: builtin/for-each-ref.c msgid "git for-each-ref [--points-at ]" msgstr "git for-each-ref [--points-at <对象>]" #: builtin/for-each-ref.c msgid "git for-each-ref [--merged []] [--no-merged []]" msgstr "git for-each-ref [--merged [<提交>]] [--no-merged [<提交>]]" #: builtin/for-each-ref.c msgid "git for-each-ref [--contains []] [--no-contains []]" msgstr "git for-each-ref [--contains [<提交>]] [--no-contains [<提交>]]" #: builtin/for-each-ref.c msgid "quote placeholders suitably for shells" msgstr "引用占位符适用于 shells" #: builtin/for-each-ref.c msgid "quote placeholders suitably for perl" msgstr "引用占位符适用于 perl" #: builtin/for-each-ref.c msgid "quote placeholders suitably for python" msgstr "引用占位符适用于 python" #: builtin/for-each-ref.c msgid "quote placeholders suitably for Tcl" msgstr "引用占位符适用于 Tcl" #: builtin/for-each-ref.c msgid "show only matched refs" msgstr "只显示 个匹配的引用" #: builtin/for-each-ref.c builtin/tag.c msgid "respect format colors" msgstr "遵照格式中的颜色输出" #: builtin/for-each-ref.c msgid "print only refs which points at the given object" msgstr "只打印指向给定对象的引用" #: builtin/for-each-ref.c msgid "print only refs that are merged" msgstr "只打印已经合并的引用" #: builtin/for-each-ref.c msgid "print only refs that are not merged" msgstr "只打印没有合并的引用" #: builtin/for-each-ref.c msgid "print only refs which contain the commit" msgstr "只打印包含该提交的引用" #: builtin/for-each-ref.c msgid "print only refs which don't contain the commit" msgstr "只打印不包含该提交的引用" #: builtin/for-each-repo.c msgid "git for-each-repo --config= [--] " msgstr "git for-each-repo --config=<配置> [--] <命令参数>" #: builtin/for-each-repo.c msgid "config" msgstr "配置" #: builtin/for-each-repo.c msgid "config key storing a list of repository paths" msgstr "存储着仓库路径列表的配置项键名" #: builtin/for-each-repo.c msgid "missing --config=" msgstr "缺少 --config=<配置>" #: builtin/fsck.c msgid "unknown" msgstr "未知" #. TRANSLATORS: e.g. error in tree 01bfda: #: builtin/fsck.c #, c-format msgid "error in %s %s: %s" msgstr "%s %s 错误：%s" #. TRANSLATORS: e.g. warning in tree 01bfda: #: builtin/fsck.c #, c-format msgid "warning in %s %s: %s" msgstr "%s %s 警告：%s" #: builtin/fsck.c #, c-format msgid "broken link from %7s %s" msgstr "来自 %7s %s 的损坏的链接" #: builtin/fsck.c msgid "wrong object type in link" msgstr "链接中错误的对象类型" #: builtin/fsck.c #, c-format msgid "" "broken link from %7s %s\n" " to %7s %s" msgstr "" "损坏的链接来自于 %7s %s\n" " 到 %7s %s" #: builtin/fsck.c builtin/prune.c connected.c msgid "Checking connectivity" msgstr "正在检查连通性" #: builtin/fsck.c #, c-format msgid "missing %s %s" msgstr "缺失 %s %s" #: builtin/fsck.c #, c-format msgid "unreachable %s %s" msgstr "不可达 %s %s" #: builtin/fsck.c #, c-format msgid "dangling %s %s" msgstr "悬空 %s %s" #: builtin/fsck.c msgid "could not create lost-found" msgstr "不能创建 lost-found" #: builtin/fsck.c builtin/gc.c builtin/rebase.c rebase-interactive.c rerere.c #: sequencer.c #, c-format msgid "could not write '%s'" msgstr "不能写入 '%s'" #: builtin/fsck.c #, c-format msgid "could not finish '%s'" msgstr "不能完成 '%s'" #: builtin/fsck.c #, c-format msgid "Checking %s" msgstr "正在检查 %s" #: builtin/fsck.c #, c-format msgid "Checking connectivity (%d objects)" msgstr "正在检查连通性（%d 个对象）" #: builtin/fsck.c #, c-format msgid "Checking %s %s" msgstr "正在检查 %s %s" #: builtin/fsck.c msgid "broken links" msgstr "损坏的链接" #: builtin/fsck.c #, c-format msgid "root %s" msgstr "根 %s" #: builtin/fsck.c #, c-format msgid "tagged %s %s (%s) in %s" msgstr "标记 %s %s (%s) 于 %s" #: builtin/fsck.c #, c-format msgid "%s: object corrupt or missing" msgstr "%s：对象损坏或丢失" #: builtin/fsck.c #, c-format msgid "%s: invalid reflog entry %s" msgstr "%s：无效的引用日志条目 %s" #: builtin/fsck.c #, c-format msgid "Checking reflog %s->%s" msgstr "正在检查引用日志 %s->%s" #: builtin/fsck.c #, c-format msgid "%s: invalid sha1 pointer %s" msgstr "%s：无效的 sha1 指针 %s" #: builtin/fsck.c #, c-format msgid "%s: not a commit" msgstr "%s：不是一个提交" #: builtin/fsck.c msgid "notice: No default references" msgstr "注意：无默认引用" #: builtin/fsck.c #, c-format msgid "%s: hash-path mismatch, found at: %s" msgstr "%s：哈希路径不匹配，发现于 %s" #: builtin/fsck.c #, c-format msgid "%s: object corrupt or missing: %s" msgstr "%s：对象损坏或丢失：%s" #: builtin/fsck.c #, c-format msgid "%s: object is of unknown type '%s': %s" msgstr "%s：对象有未知的类型 '%s': %s" #: builtin/fsck.c #, c-format msgid "%s: object could not be parsed: %s" msgstr "%s：不能解析对象：%s" #: builtin/fsck.c #, c-format msgid "bad sha1 file: %s" msgstr "坏的 sha1 文件：%s" #: builtin/fsck.c msgid "Checking object directory" msgstr "正在检查对象目录" #: builtin/fsck.c msgid "Checking object directories" msgstr "正在检查对象目录" #: builtin/fsck.c #, c-format msgid "Checking %s link" msgstr "正在检查 %s 链接" #: builtin/fsck.c builtin/index-pack.c #, c-format msgid "invalid %s" msgstr "无效的 %s" #: builtin/fsck.c #, c-format msgid "%s points to something strange (%s)" msgstr "%s 指向奇怪的东西（%s）" #: builtin/fsck.c #, c-format msgid "%s: detached HEAD points at nothing" msgstr "%s：分离头指针的指向不存在" #: builtin/fsck.c #, c-format msgid "notice: %s points to an unborn branch (%s)" msgstr "注意：%s 指向一个尚未诞生的分支（%s）" #: builtin/fsck.c msgid "Checking cache tree" msgstr "正在检查缓存树" #: builtin/fsck.c #, c-format msgid "%s: invalid sha1 pointer in cache-tree" msgstr "%s：cache-tree 中无效的 sha1 指针" #: builtin/fsck.c msgid "non-tree in cache-tree" msgstr "cache-tree 中非树对象" #: builtin/fsck.c #, c-format msgid "%s: invalid sha1 pointer in resolve-undo" msgstr "%s：resolve-undo 中无效的 sha1 指针" #: builtin/fsck.c msgid "" "git fsck [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]\n" " [--[no-]full] [--strict] [--verbose] [--lost-found]\n" " [--[no-]dangling] [--[no-]progress] [--connectivity-only]\n" " [--[no-]name-objects] [...]" msgstr "" "git fsck [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]\n" " [--[no-]full] [--strict] [--verbose] [--lost-found]\n" " [--[no-]dangling] [--[no-]progress] [--connectivity-only]\n" " [--[no-]name-objects] [<对象>...]" #: builtin/fsck.c msgid "show unreachable objects" msgstr "显示不可达的对象" #: builtin/fsck.c msgid "show dangling objects" msgstr "显示悬空的对象" #: builtin/fsck.c msgid "report tags" msgstr "报告标签" #: builtin/fsck.c msgid "report root nodes" msgstr "报告根节点" #: builtin/fsck.c msgid "make index objects head nodes" msgstr "将索引亦作为检查的头节点" #: builtin/fsck.c msgid "make reflogs head nodes (default)" msgstr "将引用日志作为检查的头节点（默认）" #: builtin/fsck.c msgid "also consider packs and alternate objects" msgstr "也考虑包和备用对象" #: builtin/fsck.c msgid "check only connectivity" msgstr "仅检查连通性" #: builtin/fsck.c builtin/mktag.c msgid "enable more strict checking" msgstr "启用更严格的检查" #: builtin/fsck.c msgid "write dangling objects in .git/lost-found" msgstr "将悬空对象写入 .git/lost-found 中" #: builtin/fsck.c builtin/prune.c msgid "show progress" msgstr "显示进度" #: builtin/fsck.c msgid "show verbose names for reachable objects" msgstr "显示可达对象的详细名称" #: builtin/fsck.c builtin/index-pack.c msgid "Checking objects" msgstr "正在检查对象" #: builtin/fsck.c #, c-format msgid "%s: object missing" msgstr "%s：对象缺失" #: builtin/fsck.c #, c-format msgid "invalid parameter: expected sha1, got '%s'" msgstr "无效的参数：期望 sha1，得到 '%s'" #: builtin/fsmonitor--daemon.c msgid "git fsmonitor--daemon start []" msgstr "git fsmonitor--daemon start [<选项>]" #: builtin/fsmonitor--daemon.c msgid "git fsmonitor--daemon run []" msgstr "git fsmonitor--daemon run [<选项>]" #: builtin/fsmonitor--daemon.c #, c-format msgid "value of '%s' out of range: %d" msgstr "'%s' 的值超出范围：%d" #: builtin/fsmonitor--daemon.c #, c-format msgid "value of '%s' not bool or int: %d" msgstr "'%s' 的值不是 bool 或 int：%d" #: builtin/fsmonitor--daemon.c #, c-format msgid "fsmonitor-daemon is watching '%s'\n" msgstr "fsmonitor-daemon 正在监视 '%s'\n" #: builtin/fsmonitor--daemon.c #, c-format msgid "fsmonitor-daemon is not watching '%s'\n" msgstr "fsmonitor-daemon 不在监视 '%s'\n" #: builtin/fsmonitor--daemon.c #, c-format msgid "could not create fsmonitor cookie '%s'" msgstr "无法创建 fsmonitor cookie '%s'" #: builtin/fsmonitor--daemon.c #, c-format msgid "fsmonitor: cookie_result '%d' != SEEN" msgstr "fsmonitor: cookie_result '%d' != SEEN" #: builtin/fsmonitor--daemon.c #, c-format msgid "could not start IPC thread pool on '%s'" msgstr "无法在 '%s' 启动 IPC 线程池" #: builtin/fsmonitor--daemon.c msgid "could not start fsmonitor listener thread" msgstr "无法启动 fsmonitor 监听线程" #: builtin/fsmonitor--daemon.c msgid "could not start fsmonitor health thread" msgstr "无法启动 fsmonitor 健康检查线程" #: builtin/fsmonitor--daemon.c msgid "could not initialize listener thread" msgstr "无法初始化监听线程" #: builtin/fsmonitor--daemon.c msgid "could not initialize health thread" msgstr "无法初始化健康检查线程" #: builtin/fsmonitor--daemon.c #, c-format msgid "could not cd home '%s'" msgstr "不能切换至家目录 '%s'" #: builtin/fsmonitor--daemon.c #, c-format msgid "fsmonitor--daemon is already running '%s'" msgstr "fsmonitor--daemon 已经在运行 '%s'" #: builtin/fsmonitor--daemon.c #, c-format msgid "running fsmonitor-daemon in '%s'\n" msgstr "在 '%s' 中运行 fsmonitor-daemon\n" #: builtin/fsmonitor--daemon.c #, c-format msgid "starting fsmonitor-daemon in '%s'\n" msgstr "在 '%s' 中启动 fsmonitor-daemon\n" #: builtin/fsmonitor--daemon.c msgid "daemon failed to start" msgstr "守护进程无法启动" #: builtin/fsmonitor--daemon.c msgid "daemon not online yet" msgstr "守护进程尚未在线" #: builtin/fsmonitor--daemon.c msgid "daemon terminated" msgstr "守护进程被终结" #: builtin/fsmonitor--daemon.c msgid "detach from console" msgstr "从控制台分离" #: builtin/fsmonitor--daemon.c msgid "use ipc worker threads" msgstr "使用 个 IPC 工作线程" #: builtin/fsmonitor--daemon.c msgid "max seconds to wait for background daemon startup" msgstr "等待守护进程启动的最大秒数" #: builtin/fsmonitor--daemon.c #, c-format msgid "invalid 'ipc-threads' value (%d)" msgstr "无效的 'ipc-threads' 值（%d）" #: builtin/fsmonitor--daemon.c t/helper/test-cache-tree.c #, c-format msgid "Unhandled subcommand '%s'" msgstr "未处理的子命令 '%s'" #: builtin/fsmonitor--daemon.c msgid "fsmonitor--daemon not supported on this platform" msgstr "fsmonitor--daemon 不支持本平台" #: builtin/gc.c msgid "git gc []" msgstr "git gc [<选项>]" #: builtin/gc.c #, c-format msgid "Failed to fstat %s: %s" msgstr "对 %s 调用 fstat 失败：%s" #: builtin/gc.c #, c-format msgid "failed to parse '%s' value '%s'" msgstr "无法解析 '%s' 值 '%s'" #: builtin/gc.c builtin/init-db.c #, c-format msgid "cannot stat '%s'" msgstr "不能对 '%s' 调用 stat" #: builtin/gc.c #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" "and remove %s\n" "Automatic cleanup will not be performed until the file is removed.\n" "\n" "%s" msgstr "" "最后一次 gc 操作报告如下信息。请检查原因并删除 %s\n" "在该文件被删除之前，自动清理将不会执行。\n" "\n" "%s" #: builtin/gc.c msgid "prune unreferenced objects" msgstr "清除未引用的对象" #: builtin/gc.c msgid "pack unreferenced objects separately" msgstr "分开打包未引用的对象" #: builtin/gc.c msgid "be more thorough (increased runtime)" msgstr "更彻底（增加运行时间）" #: builtin/gc.c msgid "enable auto-gc mode" msgstr "启用自动垃圾回收模式" #: builtin/gc.c msgid "force running gc even if there may be another gc running" msgstr "强制执行 gc 即使另外一个 gc 正在执行" #: builtin/gc.c msgid "repack all other packs except the largest pack" msgstr "除了最大的包之外，对所有其它包文件重新打包" #: builtin/gc.c #, c-format msgid "failed to parse gc.logExpiry value %s" msgstr "无法解析 gc.logExpiry 的值 %s" #: builtin/gc.c #, c-format msgid "failed to parse prune expiry value %s" msgstr "无法解析清除期限值 %s" #: builtin/gc.c #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "自动在后台执行仓库打包以求最佳性能。\n" #: builtin/gc.c #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "自动打包仓库以求最佳性能。\n" #: builtin/gc.c #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "手工维护参见 \"git help gc\"。\n" #: builtin/gc.c #, c-format msgid "" "gc is already running on machine '%s' pid % (use --force if not)" msgstr "" "已经有一个 gc 正运行在机器 '%s' pid %（如果不是，使用 --force）" #: builtin/gc.c msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "有太多不可达的松散对象，运行 'git prune' 删除它们。" #: builtin/gc.c msgid "" "git maintenance run [--auto] [--[no-]quiet] [--task=] [--schedule]" msgstr "" "git maintenance run [--auto] [--[no-]quiet] [--task=<任务>] [--schedule]" #: builtin/gc.c msgid "--no-schedule is not allowed" msgstr "--no-schedule 不被允许" #: builtin/gc.c #, c-format msgid "unrecognized --schedule argument '%s'" msgstr "无法识别的 --schedule 参数 '%s'" #: builtin/gc.c msgid "failed to write commit-graph" msgstr "无法写入提交图" #: builtin/gc.c msgid "failed to prefetch remotes" msgstr "无法预先获取远程仓库" #: builtin/gc.c msgid "failed to start 'git pack-objects' process" msgstr "无法启动 'git pack-objects' 进程" #: builtin/gc.c msgid "failed to finish 'git pack-objects' process" msgstr "无法完成 'git pack-objects' 进程" #: builtin/gc.c msgid "failed to write multi-pack-index" msgstr "无法写入多包索引" #: builtin/gc.c msgid "'git multi-pack-index expire' failed" msgstr "'git multi-pack-index expire' 失败" #: builtin/gc.c msgid "'git multi-pack-index repack' failed" msgstr "'git multi-pack-index repack' 失败" #: builtin/gc.c msgid "" "skipping incremental-repack task because core.multiPackIndex is disabled" msgstr "跳过增量重新打包任务，因为 core.multiPackIndex 被禁用" #: builtin/gc.c #, c-format msgid "lock file '%s' exists, skipping maintenance" msgstr "锁文件 '%s' 已存在，跳过维护" #: builtin/gc.c #, c-format msgid "task '%s' failed" msgstr "任务 '%s' 失败" #: builtin/gc.c #, c-format msgid "'%s' is not a valid task" msgstr "'%s' 不是一个有效的任务" #: builtin/gc.c #, c-format msgid "task '%s' cannot be selected multiple times" msgstr "任务 '%s' 不能被多次选择" #: builtin/gc.c msgid "run tasks based on the state of the repository" msgstr "基于仓库状态来运行任务" #: builtin/gc.c msgid "frequency" msgstr "频率" #: builtin/gc.c msgid "run tasks based on frequency" msgstr "基于频率运行任务" #: builtin/gc.c msgid "do not report progress or other information over stderr" msgstr "不通过标准错误报告进度或其它信息" #: builtin/gc.c msgid "task" msgstr "任务" #: builtin/gc.c msgid "run a specific task" msgstr "运行一个特定的任务" #: builtin/gc.c msgid "use at most one of --auto and --schedule=" msgstr "最多使用 --auto 和 --schedule=<频率> 其中之一" #: builtin/gc.c #, c-format msgid "unable to add '%s' value of '%s'" msgstr "无法添加 '%2$s' 的 '%1$s' 值" #: builtin/gc.c msgid "return success even if repository was not registered" msgstr "即便仓库非注册仍然返回成功" #: builtin/gc.c #, c-format msgid "unable to unset '%s' value of '%s'" msgstr "无法取消设置 '%2$s' 的 '%1$s' 值" #: builtin/gc.c #, c-format msgid "repository '%s' is not registered" msgstr "仓库 '%s' 未注册" #: builtin/gc.c #, c-format msgid "failed to expand path '%s'" msgstr "无法扩展路径 '%s'" #: builtin/gc.c msgid "failed to start launchctl" msgstr "无法启动 launchctl" #: builtin/gc.c #, c-format msgid "failed to create directories for '%s'" msgstr "无法为 '%s' 创建目录" #: builtin/gc.c #, c-format msgid "failed to bootstrap service %s" msgstr "无法引导服务 %s" #: builtin/gc.c msgid "failed to create temp xml file" msgstr "无法创建临时 XML 文件" #: builtin/gc.c msgid "failed to start schtasks" msgstr "无法启动计划任务" #: builtin/gc.c msgid "failed to run 'crontab -l'; your system might not support 'cron'" msgstr "无法执行 'crontab -l'，您的系统可能不支持 'cron'" #: builtin/gc.c msgid "failed to create crontab temporary file" msgstr "无法创建 crontab 临时文件" #: builtin/gc.c msgid "failed to open temporary file" msgstr "无法打开临时文件" #: builtin/gc.c msgid "failed to run 'crontab'; your system might not support 'cron'" msgstr "无法运行 'crontab'，您的系统可能不支持 'cron'" #: builtin/gc.c msgid "'crontab' died" msgstr "'crontab' 终止" #: builtin/gc.c msgid "failed to start systemctl" msgstr "无法启动 systemctl" #: builtin/gc.c msgid "failed to run systemctl" msgstr "无法运行 systemctl" #: builtin/gc.c builtin/worktree.c #, c-format msgid "failed to delete '%s'" msgstr "无法删除 '%s'" #: builtin/gc.c rerere.c #, c-format msgid "failed to flush '%s'" msgstr "无法刷新 '%s'" #: builtin/gc.c #, c-format msgid "unrecognized --scheduler argument '%s'" msgstr "无法识别的 --scheduler 参数 '%s'" #: builtin/gc.c msgid "neither systemd timers nor crontab are available" msgstr "systemd 和 crontab 的定时器都不可用" #: builtin/gc.c #, c-format msgid "%s scheduler is not available" msgstr "%s 调度器不可用" #: builtin/gc.c msgid "another process is scheduling background maintenance" msgstr "另外一个进程正运行于后台维护" #: builtin/gc.c msgid "git maintenance start [--scheduler=]" msgstr "git maintenance start [--scheduler=<调度器>]" #: builtin/gc.c msgid "scheduler" msgstr "调度器" #: builtin/gc.c msgid "scheduler to trigger git maintenance run" msgstr "触发 git maintenance 执行的调度器" #: builtin/gc.c msgid "failed to add repo to global config" msgstr "无法将仓库添加到全局配置" #: builtin/gc.c msgid "git maintenance []" msgstr "git maintenance <子命令> [<选项>]" #: builtin/grep.c msgid "git grep [] [-e] [...] [[--] ...]" msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]" #: builtin/grep.c #, c-format msgid "grep: failed to create thread: %s" msgstr "grep：无法创建线程：%s" #: builtin/grep.c #, c-format msgid "invalid number of threads specified (%d) for %s" msgstr "为 %2$s 设定的线程数 (%1$d) 无效" #. #-#-#-#-# grep.c.po #-#-#-#-# #. TRANSLATORS: %s is the configuration #. variable for tweaking threads, currently #. grep.threads #. #: builtin/grep.c builtin/index-pack.c builtin/pack-objects.c #, c-format msgid "no threads support, ignoring %s" msgstr "没有线程支持，忽略 %s" #: builtin/grep.c #, c-format msgid "unable to read tree (%s)" msgstr "无法读取树（%s）" #: builtin/grep.c #, c-format msgid "unable to grep from object of type %s" msgstr "无法抓取来自于 %s 类型的对象" #: builtin/grep.c #, c-format msgid "switch `%c' expects a numerical value" msgstr "开关 `%c' 期望一个数字值" #: builtin/grep.c msgid "search in index instead of in the work tree" msgstr "在索引区搜索而不是在工作区" #: builtin/grep.c msgid "find in contents not managed by git" msgstr "在未被 git 管理的内容中查找" #: builtin/grep.c msgid "search in both tracked and untracked files" msgstr "在跟踪和未跟踪的文件中搜索" #: builtin/grep.c msgid "ignore files specified via '.gitignore'" msgstr "忽略 '.gitignore' 包含的文件" #: builtin/grep.c msgid "recursively search in each submodule" msgstr "在每一个子模组中递归搜索" #: builtin/grep.c msgid "show non-matching lines" msgstr "显示未匹配的行" #: builtin/grep.c msgid "case insensitive matching" msgstr "不区分大小写匹配" #: builtin/grep.c msgid "match patterns only at word boundaries" msgstr "只在单词边界匹配模式" #: builtin/grep.c msgid "process binary files as text" msgstr "把二进制文件当做文本处理" #: builtin/grep.c msgid "don't match patterns in binary files" msgstr "不在二进制文件中匹配模式" #: builtin/grep.c msgid "process binary files with textconv filters" msgstr "用 textconv 过滤器处理二进制文件" #: builtin/grep.c msgid "search in subdirectories (default)" msgstr "在子目录中寻找（默认）" #: builtin/grep.c msgid "descend at most levels" msgstr "最多以指定的深度向下寻找" #: builtin/grep.c msgid "use extended POSIX regular expressions" msgstr "使用扩展的 POSIX 正则表达式" #: builtin/grep.c msgid "use basic POSIX regular expressions (default)" msgstr "使用基本的 POSIX 正则表达式（默认）" #: builtin/grep.c msgid "interpret patterns as fixed strings" msgstr "把模式解析为固定的字符串" #: builtin/grep.c msgid "use Perl-compatible regular expressions" msgstr "使用 Perl 兼容的正则表达式" #: builtin/grep.c msgid "show line numbers" msgstr "显示行号" #: builtin/grep.c msgid "show column number of first match" msgstr "显示第一个匹配的列号" #: builtin/grep.c msgid "don't show filenames" msgstr "不显示文件名" #: builtin/grep.c msgid "show filenames" msgstr "显示文件名" #: builtin/grep.c msgid "show filenames relative to top directory" msgstr "显示相对于顶级目录的文件名" #: builtin/grep.c msgid "show only filenames instead of matching lines" msgstr "只显示文件名而不显示匹配的行" #: builtin/grep.c msgid "synonym for --files-with-matches" msgstr "和 --files-with-matches 同义" #: builtin/grep.c msgid "show only the names of files without match" msgstr "只显示未匹配的文件名" #: builtin/grep.c msgid "print NUL after filenames" msgstr "在文件名后输出 NUL 字符" #: builtin/grep.c msgid "show only matching parts of a line" msgstr "只显示行中的匹配的部分" #: builtin/grep.c msgid "show the number of matches instead of matching lines" msgstr "显示总匹配行数，而不显示匹配的行" #: builtin/grep.c msgid "highlight matches" msgstr "高亮显示匹配项" #: builtin/grep.c msgid "print empty line between matches from different files" msgstr "在不同文件的匹配项之间打印空行" #: builtin/grep.c msgid "show filename only once above matches from same file" msgstr "只在同一文件的匹配项的上面显示一次文件名" #: builtin/grep.c msgid "show context lines before and after matches" msgstr "显示匹配项前后的 行上下文" #: builtin/grep.c msgid "show context lines before matches" msgstr "显示匹配项前 行上下文" #: builtin/grep.c msgid "show context lines after matches" msgstr "显示匹配项后 行上下文" #: builtin/grep.c msgid "use worker threads" msgstr "使用 个工作线程" #: builtin/grep.c msgid "shortcut for -C NUM" msgstr "快捷键 -C 数字" #: builtin/grep.c msgid "show a line with the function name before matches" msgstr "在匹配的前面显示一行函数名" #: builtin/grep.c msgid "show the surrounding function" msgstr "显示所在函数的前后内容" #: builtin/grep.c msgid "read patterns from file" msgstr "从文件读取模式" #: builtin/grep.c msgid "match " msgstr "匹配 <模式>" #: builtin/grep.c msgid "combine patterns specified with -e" msgstr "组合用 -e 参数设定的模式" #: builtin/grep.c msgid "indicate hit with exit status without output" msgstr "不输出，而用退出码标识命中状态" #: builtin/grep.c msgid "show only matches from files that match all patterns" msgstr "只显示匹配所有模式的文件中的匹配" #: builtin/grep.c msgid "pager" msgstr "分页" #: builtin/grep.c msgid "show matching files in the pager" msgstr "分页显示匹配的文件" #: builtin/grep.c msgid "allow calling of grep(1) (ignored by this build)" msgstr "允许调用 grep(1)（本次构建忽略）" #: builtin/grep.c msgid "maximum number of results per file" msgstr "每个文件的最大结果数量" #: builtin/grep.c msgid "no pattern given" msgstr "未提供匹配模式" #: builtin/grep.c msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index 或 --untracked 不能和版本同时使用" #: builtin/grep.c #, c-format msgid "unable to resolve revision: %s" msgstr "不能解析版本：%s" #: builtin/grep.c msgid "--untracked not supported with --recurse-submodules" msgstr "--untracked 不支持和 --recurse-submodules 共用" #: builtin/grep.c msgid "invalid option combination, ignoring --threads" msgstr "无效的选项组合，忽略 --threads" #: builtin/grep.c builtin/pack-objects.c msgid "no threads support, ignoring --threads" msgstr "没有线程支持，忽略 --threads" #: builtin/grep.c builtin/index-pack.c builtin/pack-objects.c #, c-format msgid "invalid number of threads specified (%d)" msgstr "指定的线程数无效（%d）" #: builtin/grep.c msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager 仅用于工作区" #: builtin/grep.c msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "--[no-]exclude-standard 不能用于已跟踪内容" #: builtin/grep.c msgid "both --cached and trees are given" msgstr "同时给出了 --cached 和树对象" #: builtin/hash-object.c msgid "" "git hash-object [-t ] [-w] [--path= | --no-filters]\n" " [--stdin [--literally]] [--] ..." msgstr "" "git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters]\n" " [--stdin [--literally]] [--] <文件>..." #: builtin/hash-object.c msgid "git hash-object [-t ] [-w] --stdin-paths [--no-filters]" msgstr "git hash-object [-t <类型>] [-w] --stdin-paths [--no-filters]" #: builtin/hash-object.c msgid "object type" msgstr "对象类型" #: builtin/hash-object.c msgid "write the object into the object database" msgstr "将对象写入对象数据库" #: builtin/hash-object.c msgid "read the object from stdin" msgstr "从标准输入读取对象" #: builtin/hash-object.c msgid "store file as is without filters" msgstr "原样存储文件不使用过滤器" #: builtin/hash-object.c msgid "" "just hash any random garbage to create corrupt objects for debugging Git" msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git" #: builtin/hash-object.c msgid "process file as it were from this path" msgstr "处理文件并假设其来自于此路径" #: builtin/help.c msgid "print all available commands" msgstr "打印所有可用的命令" #: builtin/help.c msgid "show external commands in --all" msgstr "在 --all 中显示外部命令" #: builtin/help.c msgid "show aliases in --all" msgstr "在 --all 中显示别名" #: builtin/help.c msgid "exclude guides" msgstr "排除向导" #: builtin/help.c msgid "show man page" msgstr "显示 man 手册" #: builtin/help.c msgid "show manual in web browser" msgstr "在 web 浏览器中显示手册" #: builtin/help.c msgid "show info page" msgstr "显示 info 手册" #: builtin/help.c msgid "print command description" msgstr "打印命令描述" #: builtin/help.c msgid "print list of useful guides" msgstr "显示有用的指南列表" #: builtin/help.c msgid "print list of user-facing repository, command and file interfaces" msgstr "打印面向用户的仓库、命令和文件接口列表" #: builtin/help.c msgid "print list of file formats, protocols and other developer interfaces" msgstr "打印文件格式、协议和其他开发者接口列表" #: builtin/help.c msgid "print all configuration variable names" msgstr "打印所有配置变量名称" #: builtin/help.c msgid "git help [[-i|--info] [-m|--man] [-w|--web]] [|]" msgstr "git help [[-i|--info] [-m|--man] [-w|--web]] [<命令>|<文档>]" #: builtin/help.c #, c-format msgid "unrecognized help format '%s'" msgstr "未能识别的帮助格式 '%s'" #: builtin/help.c msgid "Failed to start emacsclient." msgstr "无法启动 emacsclient。" #: builtin/help.c msgid "Failed to parse emacsclient version." msgstr "无法解析 emacsclient 版本。" #: builtin/help.c #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "emacsclient 版本 '%d' 太老（< 22）。" #: builtin/help.c #, c-format msgid "failed to exec '%s'" msgstr "无法执行 '%s'" #: builtin/help.c #, c-format msgid "" "'%s': path for unsupported man viewer.\n" "Please consider using 'man..cmd' instead." msgstr "" "'%s'：不支持的 man 手册查看器的路径。\n" "请使用 'man.<工具>.cmd'。" #: builtin/help.c #, c-format msgid "" "'%s': cmd for supported man viewer.\n" "Please consider using 'man..path' instead." msgstr "" "'%s': 支持的 man 手册查看器命令。\n" "请使用 'man.<工具>.path'。" #: builtin/help.c #, c-format msgid "'%s': unknown man viewer." msgstr "'%s'：未知的 man 查看器。" #: builtin/help.c msgid "no man viewer handled the request" msgstr "没有 man 查看器处理此请求" #: builtin/help.c msgid "no info viewer handled the request" msgstr "没有 info 查看器处理此请求" #: builtin/help.c git.c #, c-format msgid "'%s' is aliased to '%s'" msgstr "'%s' 是 '%s' 的别名" #: builtin/help.c git.c #, c-format msgid "bad alias.%s string: %s" msgstr "坏的 alias.%s 字符串：%s" #: builtin/help.c #, c-format msgid "the '%s' option doesn't take any non-option arguments" msgstr "'%s' 选项不带任何非选项参数" #: builtin/help.c msgid "" "the '--no-[external-commands|aliases]' options can only be used with '--all'" msgstr "'--no-[external-commands|aliases]' 选项只能和 '--all' 一起使用" #: builtin/help.c #, c-format msgid "usage: %s%s" msgstr "用法：%s%s" #: builtin/help.c msgid "'git help config' for more information" msgstr "'git help config' 获取更多信息" #: builtin/hook.c msgid "git hook run [--ignore-missing] [-- ]" msgstr "git hook run [--ignore-missing] <钩子名称> [-- <钩子参数>]" #: builtin/hook.c msgid "silently ignore missing requested " msgstr "静默地忽略缺失的 <钩子名称>" #: builtin/index-pack.c #, c-format msgid "object type mismatch at %s" msgstr "%s 的对象类型不匹配" #: builtin/index-pack.c #, c-format msgid "did not receive expected object %s" msgstr "未能获取预期的对象 %s" #: builtin/index-pack.c #, c-format msgid "object %s: expected type %s, found %s" msgstr "对象 %s：应为类型 %s，却是 %s" #: builtin/index-pack.c #, c-format msgid "cannot fill %d byte" msgid_plural "cannot fill %d bytes" msgstr[0] "无法填充 %d 字节" msgstr[1] "无法填充 %d 字节" #: builtin/index-pack.c msgid "early EOF" msgstr "过早的文件结束符（EOF）" #: builtin/index-pack.c msgid "read error on input" msgstr "输入上的读错误" #: builtin/index-pack.c msgid "used more bytes than were available" msgstr "用掉了超过可用的字节" #: builtin/index-pack.c builtin/pack-objects.c msgid "pack too large for current definition of off_t" msgstr "包太大超过了当前 off_t 的定义" #: builtin/index-pack.c #, c-format msgid "pack exceeds maximum allowed size (%s)" msgstr "包超过了最大允许大小（%s）" #: builtin/index-pack.c msgid "pack signature mismatch" msgstr "包签名不匹配" #: builtin/index-pack.c #, c-format msgid "pack version % unsupported" msgstr "不支持包版本 %" #: builtin/index-pack.c #, c-format msgid "pack has bad object at offset %: %s" msgstr "包中有错误的对象位于偏移量 %：%s" #: builtin/index-pack.c #, c-format msgid "inflate returned %d" msgstr "解压缩返回 %d" #: builtin/index-pack.c msgid "offset value overflow for delta base object" msgstr "偏移值覆盖了 delta 基准对象" #: builtin/index-pack.c msgid "delta base offset is out of bound" msgstr "delta 基准偏移越界" #: builtin/index-pack.c #, c-format msgid "unknown object type %d" msgstr "未知对象类型 %d" #: builtin/index-pack.c msgid "cannot pread pack file" msgstr "无法读取包文件" #: builtin/index-pack.c #, c-format msgid "premature end of pack file, % byte missing" msgid_plural "premature end of pack file, % bytes missing" msgstr[0] "包文件过早结束，缺少 % 字节" msgstr[1] "包文件过早结束，缺少 % 字节" #: builtin/index-pack.c msgid "serious inflate inconsistency" msgstr "解压缩严重的不一致" #: builtin/index-pack.c #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "发现 %s 出现 SHA1 冲突！" #: builtin/index-pack.c builtin/pack-objects.c #, c-format msgid "unable to read %s" msgstr "不能读 %s" #: builtin/index-pack.c #, c-format msgid "cannot read existing object info %s" msgstr "不能读取现存对象信息 %s" #: builtin/index-pack.c #, c-format msgid "cannot read existing object %s" msgstr "不能读取现存对象 %s" #: builtin/index-pack.c #, c-format msgid "invalid blob object %s" msgstr "无效的数据对象 %s" #: builtin/index-pack.c msgid "fsck error in packed object" msgstr "对打包对象 fsck 检查出错" #: builtin/index-pack.c #, c-format msgid "Not all child objects of %s are reachable" msgstr "%s 的所有子对象并非都可达" #: builtin/index-pack.c msgid "failed to apply delta" msgstr "无法应用 delta" #: builtin/index-pack.c msgid "Receiving objects" msgstr "接收对象中" #: builtin/index-pack.c msgid "Indexing objects" msgstr "索引对象中" #: builtin/index-pack.c msgid "pack is corrupted (SHA1 mismatch)" msgstr "包冲突（SHA1 不匹配）" #: builtin/index-pack.c msgid "cannot fstat packfile" msgstr "不能对包文件调用 fstat" #: builtin/index-pack.c msgid "pack has junk at the end" msgstr "包的结尾有垃圾数据" #: builtin/index-pack.c msgid "confusion beyond insanity in parse_pack_objects()" msgstr "parse_pack_objects() 中遇到不可理喻的问题" #: builtin/index-pack.c msgid "Resolving deltas" msgstr "处理 delta 中" #: builtin/index-pack.c builtin/pack-objects.c #, c-format msgid "unable to create thread: %s" msgstr "不能创建线程：%s" #: builtin/index-pack.c msgid "confusion beyond insanity" msgstr "不可理喻" #: builtin/index-pack.c #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "完成 %d 个本地对象" msgstr[1] "完成 %d 个本地对象" #: builtin/index-pack.c #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "对 %s 的尾部校验出现意外（磁盘损坏？）" #: builtin/index-pack.c #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "包有 %d 个未解决的 delta" msgstr[1] "包有 %d 个未解决的 delta" #: builtin/index-pack.c #, c-format msgid "unable to deflate appended object (%d)" msgstr "不能压缩附加对象（%d）" #: builtin/index-pack.c #, c-format msgid "local object %s is corrupt" msgstr "本地对象 %s 已损坏" #: builtin/index-pack.c #, c-format msgid "packfile name '%s' does not end with '.%s'" msgstr "包文件名 '%s' 没有以 '.%s' 结尾" #: builtin/index-pack.c #, c-format msgid "cannot write %s file '%s'" msgstr "无法写入 %s 文件 '%s'" #: builtin/index-pack.c #, c-format msgid "cannot close written %s file '%s'" msgstr "无法关闭已写入的 %s 文件 '%s'" #: builtin/index-pack.c #, c-format msgid "unable to rename temporary '*.%s' file to '%s'" msgstr "不能重命名临时文件 '*.%s' 为 '%s'" #: builtin/index-pack.c msgid "error while closing pack file" msgstr "关闭包文件时出错" #: builtin/index-pack.c builtin/pack-objects.c #, c-format msgid "bad pack.indexVersion=%" msgstr "坏的 pack.indexVersion=%" #: builtin/index-pack.c #, c-format msgid "Cannot open existing pack file '%s'" msgstr "无法打开现存包文件 '%s'" #: builtin/index-pack.c #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "无法为 %s 打开包索引文件" #: builtin/index-pack.c #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "非 delta：%d 个对象" msgstr[1] "非 delta：%d 个对象" #: builtin/index-pack.c #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "链长 = %d: %lu 对象" msgstr[1] "链长 = %d: %lu 对象" #: builtin/index-pack.c msgid "Cannot come back to cwd" msgstr "无法返回当前工作目录" #: builtin/index-pack.c #, c-format msgid "bad %s" msgstr "错误选项 %s" #: builtin/index-pack.c builtin/init-db.c #, c-format msgid "unknown hash algorithm '%s'" msgstr "未知的哈希算法 '%s'" #: builtin/index-pack.c msgid "--stdin requires a git repository" msgstr "--stdin 需要 git 仓库" #: builtin/index-pack.c msgid "--verify with no packfile name given" msgstr "--verify 没有提供包文件名参数" #: builtin/index-pack.c builtin/unpack-objects.c msgid "fsck error in pack objects" msgstr "在打包对象中 fsck 检查出错" #: builtin/init-db.c #, c-format msgid "cannot stat template '%s'" msgstr "不能对模版 '%s' 调用 stat" #: builtin/init-db.c #, c-format msgid "cannot opendir '%s'" msgstr "不能打开目录 '%s'" #: builtin/init-db.c #, c-format msgid "cannot readlink '%s'" msgstr "不能读取链接 '%s'" #: builtin/init-db.c #, c-format msgid "cannot symlink '%s' '%s'" msgstr "不能自 '%s' 到 '%s' 创建符号链接" #: builtin/init-db.c #, c-format msgid "cannot copy '%s' to '%s'" msgstr "不能拷贝 '%s' 至 '%s'" #: builtin/init-db.c #, c-format msgid "ignoring template %s" msgstr "忽略模版 %s" #: builtin/init-db.c #, c-format msgid "templates not found in %s" msgstr "没有在 %s 中找到模版" #: builtin/init-db.c #, c-format msgid "not copying templates from '%s': %s" msgstr "没有从 '%s' 复制模版：%s" #: builtin/init-db.c #, c-format msgid "invalid initial branch name: '%s'" msgstr "无效的初始分支名：'%s'" #: builtin/init-db.c #, c-format msgid "unable to handle file type %d" msgstr "不能处理 %d 类型的文件" #: builtin/init-db.c #, c-format msgid "unable to move %s to %s" msgstr "不能移动 %s 至 %s" #: builtin/init-db.c msgid "attempt to reinitialize repository with different hash" msgstr "尝试用不同的哈希算法重新初始化仓库" #: builtin/init-db.c #, c-format msgid "%s already exists" msgstr "%s 已经存在" #: builtin/init-db.c #, c-format msgid "re-init: ignored --initial-branch=%s" msgstr "re-init：已忽略 --initial-branch=%s" #: builtin/init-db.c #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "重新初始化已存在的共享 Git 仓库于 %s%s\n" #: builtin/init-db.c #, c-format msgid "Reinitialized existing Git repository in %s%s\n" msgstr "已重新初始化已存在的 Git 仓库于 %s%s\n" #: builtin/init-db.c #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "已初始化空的共享 Git 仓库于 %s%s\n" #: builtin/init-db.c #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "已初始化空的 Git 仓库于 %s%s\n" #: builtin/init-db.c msgid "" "git init [-q | --quiet] [--bare] [--template=]\n" " [--separate-git-dir ] [--object-format=]\n" " [-b | --initial-branch=]\n" " [--shared[=]] []" msgstr "" "git init [-q | --quiet] [--bare] [--template=<模板目录>]\n" " [--separate-git-dir ] [--object-format=<格式>]\n" " [-b <分支名> | --initial-branch=<分支名>]\n" " [--shared[=<权限>]] [<目录>]" #: builtin/init-db.c msgid "permissions" msgstr "权限" #: builtin/init-db.c msgid "specify that the git repository is to be shared amongst several users" msgstr "指定 git 仓库是多个用户之间共享的" #: builtin/init-db.c msgid "override the name of the initial branch" msgstr "覆盖初始分支名称" #: builtin/init-db.c builtin/verify-pack.c msgid "hash" msgstr "hash" #: builtin/init-db.c builtin/show-index.c builtin/verify-pack.c msgid "specify the hash algorithm to use" msgstr "指定要使用的哈希算法" #: builtin/init-db.c #, c-format msgid "cannot mkdir %s" msgstr "不能创建目录 %s" #: builtin/init-db.c #, c-format msgid "cannot chdir to %s" msgstr "不能切换目录到 %s" #: builtin/init-db.c #, c-format msgid "" "%s (or --work-tree=) not allowed without specifying %s (or --git-" "dir=)" msgstr "不允许 %s（或 --work-tree=<目录>）而没有指定 %s（或 --git-dir=<目录>）" #: builtin/init-db.c #, c-format msgid "Cannot access work tree '%s'" msgstr "不能访问工作区 '%s'" #: builtin/init-db.c msgid "--separate-git-dir incompatible with bare repository" msgstr "--separate-git-dir 不能用于纯仓库" #: builtin/interpret-trailers.c msgid "" "git interpret-trailers [--in-place] [--trim-empty]\n" " [(--trailer [(=|:)])...]\n" " [--parse] [...]" msgstr "" "git interpret-trailers [--in-place] [--trim-empty]\n" " [(--trailer <键>[(=|:)<值>])...]\n" " [--parse] [<文件>...]" #: builtin/interpret-trailers.c msgid "edit files in place" msgstr "在原位编辑文件" #: builtin/interpret-trailers.c msgid "trim empty trailers" msgstr "删除空的尾注" #: builtin/interpret-trailers.c msgid "where to place the new trailer" msgstr "在哪里放置新的尾注" #: builtin/interpret-trailers.c msgid "action if trailer already exists" msgstr "当尾注已经存在时所采取的动作" #: builtin/interpret-trailers.c msgid "action if trailer is missing" msgstr "当尾注缺失时所采取的动作" #: builtin/interpret-trailers.c msgid "output only the trailers" msgstr "只输出尾注" #: builtin/interpret-trailers.c msgid "do not apply config rules" msgstr "不要应用配置规则" #: builtin/interpret-trailers.c msgid "join whitespace-continued values" msgstr "连接空白折行的值" #: builtin/interpret-trailers.c msgid "set parsing options" msgstr "设置解析选项" #: builtin/interpret-trailers.c msgid "do not treat --- specially" msgstr "不要对 --- 特殊处理" #: builtin/interpret-trailers.c msgid "trailer(s) to add" msgstr "要添加的尾注" #: builtin/interpret-trailers.c msgid "--trailer with --only-input does not make sense" msgstr "--trailer 和 --only-input 同时使用没有意义" #: builtin/interpret-trailers.c msgid "no input file given for in-place editing" msgstr "没有给出要原位编辑的文件" #: builtin/log.c msgid "git log [] [] [[--] ...]" msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]" #: builtin/log.c msgid "git show [] ..." msgstr "git show [<选项>] <对象>..." #: builtin/log.c #, c-format msgid "invalid --decorate option: %s" msgstr "无效的 --decorate 选项：%s" #: builtin/log.c diff.c msgid "suppress diff output" msgstr "不显示差异输出" #: builtin/log.c msgid "show source" msgstr "显示源" #: builtin/log.c msgid "clear all previously-defined decoration filters" msgstr "清除所有之前定义的修饰过滤器" #: builtin/log.c msgid "only decorate refs that match " msgstr "只修饰与 <模式> 匹配的引用" #: builtin/log.c msgid "do not decorate refs that match " msgstr "不修饰和 <模式> 匹配的引用" #: builtin/log.c msgid "decorate options" msgstr "修饰选项" #: builtin/log.c msgid "" "trace the evolution of line range , or function : in " "" msgstr "跟踪 <文件> 中 <开始>,<结束> 范围内的行或函数 :<函数名> 的演变" #: builtin/log.c builtin/shortlog.c bundle.c #, c-format msgid "unrecognized argument: %s" msgstr "未能识别的参数：%s" #: builtin/log.c msgid "-L: cannot be used with pathspec" msgstr "-L<范围>:<文件> 不能和路径表达式共用" #: builtin/log.c #, c-format msgid "Final output: %d %s\n" msgstr "最终输出：%d %s\n" #: builtin/log.c msgid "unable to create temporary object directory" msgstr "无法创建临时对象目录" #: builtin/log.c #, c-format msgid "git show %s: bad file" msgstr "git show %s: 损坏的文件" #: builtin/log.c #, c-format msgid "could not read object %s" msgstr "不能读取对象 %s" #: builtin/log.c #, c-format msgid "unknown type: %d" msgstr "未知类型：%d" #: builtin/log.c #, c-format msgid "%s: invalid cover from description mode" msgstr "%s：从描述生成附函的模式无效" #: builtin/log.c msgid "format.headers without value" msgstr "format.headers 没有值" #: builtin/log.c #, c-format msgid "cannot open patch file %s" msgstr "无法打开补丁文件 %s" #: builtin/log.c msgid "need exactly one range" msgstr "只需要一个范围" #: builtin/log.c msgid "not a range" msgstr "不是一个范围" #: builtin/log.c msgid "cover letter needs email format" msgstr "附函需要邮件地址格式" #: builtin/log.c msgid "failed to create cover-letter file" msgstr "无法创建附函文件" #: builtin/log.c #, c-format msgid "insane in-reply-to: %s" msgstr "不正常的 in-reply-to：%s" #: builtin/log.c msgid "git format-patch [] [ | ]" msgstr "git format-patch [<选项>] [<从> | <版本范围>]" #: builtin/log.c msgid "two output directories?" msgstr "两个输出目录？" #: builtin/log.c #, c-format msgid "unknown commit %s" msgstr "未知提交 %s" #: builtin/log.c builtin/replace.c #, c-format msgid "failed to resolve '%s' as a valid ref" msgstr "无法将 '%s' 解析为一个有效引用" #: builtin/log.c msgid "could not find exact merge base" msgstr "不能找到准确的合并基线" #: builtin/log.c msgid "" "failed to get upstream, if you want to record base commit automatically,\n" "please use git branch --set-upstream-to to track a remote branch.\n" "Or you could specify base commit by --base= manually" msgstr "" "无法得到上游地址，如果您想自动记录基线提交，请使用命令\n" "git branch --set-upstream-to 来跟踪一个远程分支。或者您可以通过\n" "参数 --base=<基线提交> 手动指定一个基线提交" #: builtin/log.c msgid "failed to find exact merge base" msgstr "无法找到准确的合并基线" #: builtin/log.c msgid "base commit should be the ancestor of revision list" msgstr "基线提交应该是版本列表的祖先" #: builtin/log.c msgid "base commit shouldn't be in revision list" msgstr "基线提交不应该出现在版本列表中" #: builtin/log.c msgid "cannot get patch id" msgstr "无法得到补丁 id" #: builtin/log.c msgid "failed to infer range-diff origin of current series" msgstr "无法推断当前系列的 range-diff 起始" #: builtin/log.c #, c-format msgid "using '%s' as range-diff origin of current series" msgstr "使用 '%s' 作为当前系列的 range-diff 源" #: builtin/log.c msgid "use [PATCH n/m] even with a single patch" msgstr "使用 [PATCH n/m]，即使只有一个补丁" #: builtin/log.c msgid "use [PATCH] even with multiple patches" msgstr "使用 [PATCH]，即使有多个补丁" #: builtin/log.c msgid "print patches to standard out" msgstr "打印补丁到标准输出" #: builtin/log.c msgid "generate a cover letter" msgstr "生成一封附函" #: builtin/log.c msgid "use simple number sequence for output file names" msgstr "使用简单的数字序列作为输出文件名" #: builtin/log.c msgid "sfx" msgstr "后缀" #: builtin/log.c msgid "use instead of '.patch'" msgstr "使用 <后缀> 代替 '.patch'" #: builtin/log.c msgid "start numbering patches at instead of 1" msgstr "补丁以 开始编号，而不是1" #: builtin/log.c msgid "reroll-count" msgstr "重制-计数" #: builtin/log.c msgid "mark the series as Nth re-roll" msgstr "标记补丁系列是第几次重制" #: builtin/log.c msgid "max length of output filename" msgstr "输出文件名的最大长度" #: builtin/log.c msgid "use [RFC PATCH] instead of [PATCH]" msgstr "使用 [RFC PATCH] 代替 [PATCH]" #: builtin/log.c msgid "cover-from-description-mode" msgstr "从分支描述获取附函的模式" #: builtin/log.c msgid "generate parts of a cover letter based on a branch's description" msgstr "基于一个分支描述生成部分附函" #: builtin/log.c msgid "use [] instead of [PATCH]" msgstr "使用 [<前缀>] 代替 [PATCH]" #: builtin/log.c msgid "store resulting files in " msgstr "把结果文件存储在 <目录>" #: builtin/log.c msgid "don't strip/add [PATCH]" msgstr "不删除/添加 [PATCH]" #: builtin/log.c msgid "don't output binary diffs" msgstr "不输出二进制差异" #: builtin/log.c msgid "output all-zero hash in From header" msgstr "在 From 头信息中输出全为零的哈希值" #: builtin/log.c msgid "don't include a patch matching a commit upstream" msgstr "不包含已在上游提交中的补丁" #: builtin/log.c msgid "show patch format instead of default (patch + stat)" msgstr "显示纯补丁格式而非默认的（补丁+状态）" #: builtin/log.c msgid "Messaging" msgstr "邮件发送" #: builtin/log.c msgid "header" msgstr "header" #: builtin/log.c msgid "add email header" msgstr "添加邮件头" #: builtin/log.c msgid "email" msgstr "邮件地址" #: builtin/log.c msgid "add To: header" msgstr "添加收件人" #: builtin/log.c msgid "add Cc: header" msgstr "添加抄送" #: builtin/log.c msgid "ident" msgstr "标识" #: builtin/log.c msgid "set From address to (or committer ident if absent)" msgstr "将 From 地址设置为 <标识>（如若不提供，则用提交者 ID 做为地址）" #: builtin/log.c msgid "message-id" msgstr "邮件标识" #: builtin/log.c msgid "make first mail a reply to " msgstr "使第一封邮件作为对 <邮件标识> 的回复" #: builtin/log.c msgid "boundary" msgstr "边界" #: builtin/log.c msgid "attach the patch" msgstr "附件方式添加补丁" #: builtin/log.c msgid "inline the patch" msgstr "内联显示补丁" #: builtin/log.c msgid "enable message threading, styles: shallow, deep" msgstr "启用邮件线索，风格：浅，深" #: builtin/log.c msgid "signature" msgstr "签名" #: builtin/log.c msgid "add a signature" msgstr "添加一个签名" #: builtin/log.c msgid "base-commit" msgstr "基线提交" #: builtin/log.c msgid "add prerequisite tree info to the patch series" msgstr "为补丁列表添加前置树信息" #: builtin/log.c msgid "add a signature from a file" msgstr "从文件添加一个签名" #: builtin/log.c msgid "don't print the patch filenames" msgstr "不要打印补丁文件名" #: builtin/log.c msgid "show progress while generating patches" msgstr "在生成补丁时显示进度" #: builtin/log.c msgid "show changes against in cover letter or single patch" msgstr "在附函或单个补丁中显示和 <版本> 的差异" #: builtin/log.c msgid "show changes against in cover letter or single patch" msgstr "在附函或单个补丁中显示和 <引用规格> 的差异" #: builtin/log.c builtin/range-diff.c msgid "percentage by which creation is weighted" msgstr "创建权重的百分比" #: builtin/log.c msgid "show in-body From: even if identical to the e-mail header" msgstr "显示正文内的 From:，即使其与电子邮件头中一致" #: builtin/log.c #, c-format msgid "invalid ident line: %s" msgstr "包含无效的身份标识：%s" #: builtin/log.c msgid "--name-only does not make sense" msgstr "--name-only 无意义" #: builtin/log.c msgid "--name-status does not make sense" msgstr "--name-status 无意义" #: builtin/log.c msgid "--check does not make sense" msgstr "--check 无意义" #: builtin/log.c msgid "--remerge-diff does not make sense" msgstr "--remerge-diff 无意义" #: builtin/log.c builtin/submodule--helper.c rerere.c submodule.c #, c-format msgid "could not create directory '%s'" msgstr "不能创建目录 '%s'" #: builtin/log.c msgid "--interdiff requires --cover-letter or single patch" msgstr "--interdiff 需要 --cover-letter 或单一补丁" #: builtin/log.c msgid "Interdiff:" msgstr "版本间差异：" #: builtin/log.c #, c-format msgid "Interdiff against v%d:" msgstr "对 v%d 的版本差异：" #: builtin/log.c msgid "--range-diff requires --cover-letter or single patch" msgstr "--range-diff 需要 --cover-letter 或单一补丁" #: builtin/log.c msgid "Range-diff:" msgstr "范围差异：" #: builtin/log.c #, c-format msgid "Range-diff against v%d:" msgstr "对 v%d 的范围差异：" #: builtin/log.c #, c-format msgid "unable to read signature file '%s'" msgstr "无法读取签名文件 '%s'" #: builtin/log.c msgid "Generating patches" msgstr "生成补丁" #: builtin/log.c msgid "failed to create output files" msgstr "无法创建输出文件" #: builtin/log.c msgid "git cherry [-v] [ [ []]]" msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]" #: builtin/log.c #, c-format msgid "" "Could not find a tracked remote branch, please specify manually.\n" msgstr "不能找到跟踪的远程分支，请手工指定 <上游>。\n" #: builtin/ls-files.c #, c-format msgid "bad ls-files format: element '%s' does not start with '('" msgstr "坏的 ls-files 格式：元素 '%s' 没有以 '(' 开头" #: builtin/ls-files.c #, c-format msgid "bad ls-files format: element '%s' does not end in ')'" msgstr "坏的 ls-files 格式：元素 '%s' 没有以 ')' 结尾" #: builtin/ls-files.c #, c-format msgid "bad ls-files format: %%%.*s" msgstr "坏的 ls-files 格式: %%%.*s" #: builtin/ls-files.c msgid "git ls-files [] [...]" msgstr "git ls-files [<选项>] [<文件>...]" #: builtin/ls-files.c builtin/merge-tree.c msgid "separate paths with the NUL character" msgstr "用 NUL 字符分隔路径" #: builtin/ls-files.c msgid "identify the file status with tags" msgstr "用标签标识文件的状态" #: builtin/ls-files.c msgid "use lowercase letters for 'assume unchanged' files" msgstr "使用小写字母表示 '假设未改变的' 文件" #: builtin/ls-files.c msgid "use lowercase letters for 'fsmonitor clean' files" msgstr "使用小写字母表示 'fsmonitor clean' 文件" #: builtin/ls-files.c msgid "show cached files in the output (default)" msgstr "显示缓存的文件（默认）" #: builtin/ls-files.c msgid "show deleted files in the output" msgstr "显示已删除的文件" #: builtin/ls-files.c msgid "show modified files in the output" msgstr "显示已修改的文件" #: builtin/ls-files.c msgid "show other files in the output" msgstr "显示其它文件" #: builtin/ls-files.c msgid "show ignored files in the output" msgstr "显示忽略的文件" #: builtin/ls-files.c msgid "show staged contents' object name in the output" msgstr "显示暂存区内容的对象名称" #: builtin/ls-files.c msgid "show files on the filesystem that need to be removed" msgstr "显示文件系统需要删除的文件" #: builtin/ls-files.c msgid "show 'other' directories' names only" msgstr "只显示“其他”目录的名称" #: builtin/ls-files.c msgid "show line endings of files" msgstr "显示文件换行符格式" #: builtin/ls-files.c msgid "don't show empty directories" msgstr "不显示空目录" #: builtin/ls-files.c msgid "show unmerged files in the output" msgstr "显示未合并的文件" #: builtin/ls-files.c msgid "show resolve-undo information" msgstr "显示 resolve-undo 信息" #: builtin/ls-files.c msgid "skip files matching pattern" msgstr "跳过和模式匹配的文件" #: builtin/ls-files.c msgid "read exclude patterns from " msgstr "从 <文件> 读取排除模式" #: builtin/ls-files.c msgid "read additional per-directory exclude patterns in " msgstr "从 <文件> 读取额外的每个目录的排除模式" #: builtin/ls-files.c msgid "add the standard git exclusions" msgstr "添加标准的 git 排除" #: builtin/ls-files.c msgid "make the output relative to the project top directory" msgstr "显示相对于顶级目录的文件名" #: builtin/ls-files.c msgid "if any is not in the index, treat this as an error" msgstr "如果任何 <文件> 都不在索引区，视为错误" #: builtin/ls-files.c msgid "tree-ish" msgstr "树对象" #: builtin/ls-files.c msgid "pretend that paths removed since are still present" msgstr "假装自从 <树对象> 之后删除的路径仍然存在" #: builtin/ls-files.c msgid "show debugging data" msgstr "显示调试数据" #: builtin/ls-files.c msgid "suppress duplicate entries" msgstr "抑制重复条目" #: builtin/ls-files.c msgid "show sparse directories in the presence of a sparse index" msgstr "在稀疏索引存在时显示稀疏目录" #: builtin/ls-files.c msgid "" "--format cannot be used with -s, -o, -k, -t, --resolve-undo, --deduplicate, " "--eol" msgstr "" "--format 不能和 -s、-o、-k、-t、--resolve-undo、--deduplicate 和 --eol 同时使" "用" #: builtin/ls-remote.c msgid "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=]\n" " [-q | --quiet] [--exit-code] [--get-url] [--sort=]\n" " [--symref] [ [...]]" msgstr "" "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<可执行文件>]\n" " [-q | --quiet] [--exit-code] [--get-url] [--sort=<键>]\n" " [--symref] [<仓库> [<引用>...]]" #: builtin/ls-remote.c msgid "do not print remote URL" msgstr "不打印远程 URL" #: builtin/ls-remote.c builtin/rebase.c msgid "exec" msgstr "exec" #: builtin/ls-remote.c msgid "path of git-upload-pack on the remote host" msgstr "远程主机上的 git-upload-pack 路径" #: builtin/ls-remote.c msgid "limit to tags" msgstr "仅限于标签" #: builtin/ls-remote.c msgid "limit to heads" msgstr "仅限于分支" #: builtin/ls-remote.c msgid "do not show peeled tags" msgstr "不显示已解析的标签" #: builtin/ls-remote.c msgid "take url..insteadOf into account" msgstr "参考 url..insteadOf 设置" #: builtin/ls-remote.c msgid "exit with exit code 2 if no matching refs are found" msgstr "若未找到匹配的引用则以退出码2退出" #: builtin/ls-remote.c msgid "show underlying ref in addition to the object pointed by it" msgstr "除了显示指向的对象外，显示指向的引用名" #: builtin/ls-tree.c msgid "git ls-tree [] [...]" msgstr "git ls-tree [<选项>] <树对象> [<路径>...]" #: builtin/ls-tree.c #, c-format msgid "could not get object info about '%s'" msgstr "无法获得关于 '%s' 的对象信息" #: builtin/ls-tree.c #, c-format msgid "bad ls-tree format: element '%s' does not start with '('" msgstr "坏的 ls-tree 格式：元素 '%s' 没有以 '(' 开头" #: builtin/ls-tree.c #, c-format msgid "bad ls-tree format: element '%s' does not end in ')'" msgstr "坏的 ls-tree 格式：元素 '%s' 没有以 ')' 结尾" #: builtin/ls-tree.c #, c-format msgid "bad ls-tree format: %%%.*s" msgstr "坏的 ls-tree 格式: %%%.*s" #: builtin/ls-tree.c msgid "only show trees" msgstr "只显示树" #: builtin/ls-tree.c msgid "recurse into subtrees" msgstr "递归到子树" #: builtin/ls-tree.c msgid "show trees when recursing" msgstr "当递归时显示树" #: builtin/ls-tree.c msgid "terminate entries with NUL byte" msgstr "条目以 NUL 字符终止" #: builtin/ls-tree.c msgid "include object size" msgstr "包括对象大小" #: builtin/ls-tree.c msgid "list only filenames" msgstr "只列出文件名" #: builtin/ls-tree.c msgid "list only objects" msgstr "只列出对象" #: builtin/ls-tree.c msgid "use full path names" msgstr "使用文件的全路径" #: builtin/ls-tree.c msgid "list entire tree; not just current directory (implies --full-name)" msgstr "列出整个树；不仅仅当前目录（隐含 --full-name）" #: builtin/ls-tree.c msgid "--format can't be combined with other format-altering options" msgstr "--format 不能和改变格式的选项同时使用" #. TRANSLATORS: keep <> in "<" mail ">" info. #: builtin/mailinfo.c msgid "git mailinfo [] < mail >info" msgstr "git mailinfo [<选项>] <消息> <补丁> < mail >info" #: builtin/mailinfo.c msgid "keep subject" msgstr "保持主题" #: builtin/mailinfo.c msgid "keep non patch brackets in subject" msgstr "在主题中保持无补丁括号标注" #: builtin/mailinfo.c msgid "copy Message-ID to the end of commit message" msgstr "拷贝 Message-ID 至提交说明结尾" #: builtin/mailinfo.c msgid "re-code metadata to i18n.commitEncoding" msgstr "将元数据重新编码为 i18n.commitEncoding" #: builtin/mailinfo.c msgid "disable charset re-coding of metadata" msgstr "禁用元数据的字符集重新编码" #: builtin/mailinfo.c msgid "encoding" msgstr "编码" #: builtin/mailinfo.c msgid "re-code metadata to this encoding" msgstr "将元数据用此编码重新编码" #: builtin/mailinfo.c msgid "use scissors" msgstr "使用剪刀标记" #: builtin/mailinfo.c msgid "" msgstr "<动作>" #: builtin/mailinfo.c msgid "action when quoted CR is found" msgstr "找到引号中的 CR 时的操作" #: builtin/mailinfo.c msgid "use headers in message's body" msgstr "在消息正文中使用标头" #: builtin/mailsplit.c msgid "reading patches from stdin/tty..." msgstr "从标准输入或tty读取补丁……" #: builtin/mailsplit.c #, c-format msgid "empty mbox: '%s'" msgstr "空的 mbox：'%s'" #: builtin/merge-base.c msgid "git merge-base [-a | --all] ..." msgstr "git merge-base [-a | --all] <提交> <提交>..." #: builtin/merge-base.c msgid "git merge-base [-a | --all] --octopus ..." msgstr "git merge-base [-a | --all] --octopus <提交>..." #: builtin/merge-base.c msgid "git merge-base --is-ancestor " msgstr "git merge-base --is-ancestor <提交> <提交>" #: builtin/merge-base.c msgid "git merge-base --independent ..." msgstr "git merge-base --independent <提交>..." #: builtin/merge-base.c msgid "git merge-base --fork-point []" msgstr "git merge-base --fork-point <引用> [<提交>]" #: builtin/merge-base.c msgid "output all common ancestors" msgstr "输出所有共同的祖先" #: builtin/merge-base.c msgid "find ancestors for a single n-way merge" msgstr "查找一个多路合并的祖先提交" #: builtin/merge-base.c msgid "list revs not reachable from others" msgstr "显示不能被其他访问到的版本" #: builtin/merge-base.c msgid "is the first one ancestor of the other?" msgstr "第一个是其他的祖先提交么？" #: builtin/merge-base.c msgid "find where forked from reflog of " msgstr "根据 <引用> 的引用日志查找 <提交> 的分叉点" #: builtin/merge-file.c msgid "" "git merge-file [] [-L [-L [-L ]]] " " " msgstr "" "git merge-file [<选项>] [-L <名字1> [-L <初始名字> [-L <名字2>]]] <文件1> <初" "始文件> <文件2>" #: builtin/merge-file.c msgid "send results to standard output" msgstr "将结果发送到标准输出" #: builtin/merge-file.c msgid "use a diff3 based merge" msgstr "使用基于 diff3 的合并" #: builtin/merge-file.c msgid "use a zealous diff3 based merge" msgstr "使用基于狂热 diff3（zealous diff3）的合并" #: builtin/merge-file.c msgid "for conflicts, use our version" msgstr "如果冲突，使用我们的版本" #: builtin/merge-file.c msgid "for conflicts, use their version" msgstr "如果冲突，使用他们的版本" #: builtin/merge-file.c msgid "for conflicts, use a union version" msgstr "如果冲突，使用联合版本" #: builtin/merge-file.c msgid "for conflicts, use this marker size" msgstr "如果冲突，使用指定长度的标记" #: builtin/merge-file.c msgid "do not warn about conflicts" msgstr "不要警告冲突" #: builtin/merge-file.c msgid "set labels for file1/orig-file/file2" msgstr "为 文件1/初始文件/文件2 设置标签" #: builtin/merge-recursive.c #, c-format msgid "unknown option %s" msgstr "未知选项 %s" #: builtin/merge-recursive.c #, c-format msgid "could not parse object '%s'" msgstr "不能解析对象 '%s'" #: builtin/merge-recursive.c #, c-format msgid "cannot handle more than %d base. Ignoring %s." msgid_plural "cannot handle more than %d bases. Ignoring %s." msgstr[0] "无法处理 %d 条以上的基线。忽略 %s。" msgstr[1] "无法处理 %d 条以上的基线。忽略 %s。" #: builtin/merge-recursive.c msgid "not handling anything other than two heads merge." msgstr "不能处理两个头合并之外的任何操作。" #: builtin/merge-recursive.c #, c-format msgid "could not resolve ref '%s'" msgstr "无法解析引用 '%s'" #: builtin/merge-recursive.c #, c-format msgid "Merging %s with %s\n" msgstr "合并 %s 和 %s\n" #: builtin/merge-tree.c builtin/merge.c msgid "not something we can merge" msgstr "不是可以合并的东西" #: builtin/merge-tree.c builtin/merge.c msgid "refusing to merge unrelated histories" msgstr "拒绝合并无关的历史" #: builtin/merge-tree.c msgid "failure to merge" msgstr "合并失败" #: builtin/merge-tree.c msgid "git merge-tree [--write-tree] [] " msgstr "git merge-tree [--write-tree] [<选项>] <分支1> <分支2>" #: builtin/merge-tree.c msgid "git merge-tree [--trivial-merge] " msgstr "git merge-tree [--trivial-merge] <基准树> <分支1> <分支2>" #: builtin/merge-tree.c msgid "do a real merge instead of a trivial merge" msgstr "进行真正的合并而不是简单的合并" #: builtin/merge-tree.c msgid "do a trivial merge only" msgstr "只进行简单的合并" #: builtin/merge-tree.c msgid "also show informational/conflict messages" msgstr "同时显示额外信息/冲突消息" #: builtin/merge-tree.c msgid "list filenames without modes/oids/stages" msgstr "列出没有模式/对象 ID/暂存的文件名" #: builtin/merge-tree.c builtin/merge.c builtin/pull.c msgid "allow merging unrelated histories" msgstr "允许合并不相关的历史" #: builtin/merge-tree.c msgid "perform multiple merges, one per line of input" msgstr "实施多个合并，每输入行一个" #: builtin/merge-tree.c msgid "--trivial-merge is incompatible with all other options" msgstr "--trivial-merge 与其他所有选项不兼容" #: builtin/merge-tree.c builtin/notes.c #, c-format msgid "malformed input line: '%s'." msgstr "格式错误的输入行：'%s'。" #: builtin/merge-tree.c #, c-format msgid "merging cannot continue; got unclean result of %d" msgstr "合并无法继续；得到不干净的结果 %d" #: builtin/merge.c msgid "git merge [] [...]" msgstr "git merge [<选项>] [<提交>...]" #: builtin/merge.c msgid "switch `m' requires a value" msgstr "开关 `m' 需要一个值" #: builtin/merge.c #, c-format msgid "option `%s' requires a value" msgstr "选项 `%s' 需要一个值" #: builtin/merge.c #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "不能找到合并策略 '%s'。\n" #: builtin/merge.c #, c-format msgid "Available strategies are:" msgstr "可用的策略有：" #: builtin/merge.c #, c-format msgid "Available custom strategies are:" msgstr "可用的自定义策略有：" #: builtin/merge.c builtin/pull.c msgid "do not show a diffstat at the end of the merge" msgstr "在合并的最后不显示差异统计" #: builtin/merge.c builtin/pull.c msgid "show a diffstat at the end of the merge" msgstr "在合并的最后显示差异统计" #: builtin/merge.c builtin/pull.c msgid "(synonym to --stat)" msgstr "（和 --stat 同义）" #: builtin/merge.c builtin/pull.c msgid "add (at most ) entries from shortlog to merge commit message" msgstr "在合并提交信息中添加（最多 条）精简提交记录" #: builtin/merge.c builtin/pull.c msgid "create a single commit instead of doing a merge" msgstr "创建一个单独的提交而不是做一次合并" #: builtin/merge.c builtin/pull.c msgid "perform a commit if the merge succeeds (default)" msgstr "如果合并成功，执行一次提交（默认）" #: builtin/merge.c builtin/pull.c msgid "edit message before committing" msgstr "在提交前编辑提交说明" #: builtin/merge.c msgid "allow fast-forward (default)" msgstr "允许快进（默认）" #: builtin/merge.c builtin/pull.c msgid "abort if fast-forward is not possible" msgstr "如果不能快进就放弃合并" #: builtin/merge.c builtin/pull.c msgid "verify that the named commit has a valid GPG signature" msgstr "验证指定的提交是否包含一个有效的 GPG 签名" #: builtin/merge.c builtin/notes.c builtin/pull.c builtin/rebase.c #: builtin/revert.c msgid "strategy" msgstr "策略" #: builtin/merge.c builtin/pull.c msgid "merge strategy to use" msgstr "要使用的合并策略" #: builtin/merge.c builtin/pull.c msgid "option=value" msgstr "option=value" #: builtin/merge.c builtin/pull.c msgid "option for selected merge strategy" msgstr "所选的合并策略的选项" #: builtin/merge.c msgid "merge commit message (for a non-fast-forward merge)" msgstr "合并的提交说明（针对非快进式合并）" #: builtin/merge.c msgid "use instead of the real target" msgstr "使用 <名称> 而不是真正的目标" #: builtin/merge.c msgid "abort the current in-progress merge" msgstr "放弃当前正在进行的合并" # #: builtin/merge.c msgid "--abort but leave index and working tree alone" msgstr "--abort，但是保留索引和工作区" #: builtin/merge.c msgid "continue the current in-progress merge" msgstr "继续当前正在进行的合并" #: builtin/merge.c msgid "bypass pre-merge-commit and commit-msg hooks" msgstr "绕过 pre-merge-commit 和 commit-msg 钩子" #: builtin/merge.c msgid "could not run stash." msgstr "不能运行贮藏。" #: builtin/merge.c msgid "stash failed" msgstr "贮藏失败" #: builtin/merge.c #, c-format msgid "not a valid object: %s" msgstr "不是一个有效对象：%s" #: builtin/merge.c msgid "read-tree failed" msgstr "读取树失败" #: builtin/merge.c msgid "Already up to date. (nothing to squash)" msgstr "已经是最新的。（无可挤压）" #: builtin/merge.c merge-ort-wrappers.c merge-recursive.c msgid "Already up to date." msgstr "已经是最新的。" #: builtin/merge.c #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "挤压提交 -- 未更新 HEAD\n" #: builtin/merge.c #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "无合并信息 -- 未更新 HEAD\n" #: builtin/merge.c #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' 没有指向一个提交" #: builtin/merge.c #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "坏的 branch.%s.mergeoptions 字符串：%s" #: builtin/merge.c builtin/stash.c merge-recursive.c msgid "Unable to write index." msgstr "不能写入索引。" #: builtin/merge.c msgid "Not handling anything other than two heads merge." msgstr "未处理两个头合并之外的任何操作。" #: builtin/merge.c #, c-format msgid "unknown strategy option: -X%s" msgstr "未知的策略选项：-X%s" #: builtin/merge.c t/helper/test-fast-rebase.c #, c-format msgid "unable to write %s" msgstr "不能写 %s" #: builtin/merge.c #, c-format msgid "Could not read from '%s'" msgstr "不能从 '%s' 读取" #: builtin/merge.c #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "未提交合并，使用 'git commit' 完成此次合并。\n" #: builtin/merge.c msgid "" "Please enter a commit message to explain why this merge is necessary,\n" "especially if it merges an updated upstream into a topic branch.\n" "\n" msgstr "" "请输入一个提交信息以解释此合并的必要性，尤其是将一个更新后的上游分支\n" "合并到主题分支。\n" "\n" #: builtin/merge.c msgid "An empty message aborts the commit.\n" msgstr "空的提交说明会终止提交。\n" #: builtin/merge.c #, c-format msgid "" "Lines starting with '%c' will be ignored, and an empty message aborts\n" "the commit.\n" msgstr "以 '%c' 开始的行将被忽略，而空的提交说明将终止提交。\n" #: builtin/merge.c msgid "Empty commit message." msgstr "空提交信息。" #: builtin/merge.c #, c-format msgid "Wonderful.\n" msgstr "太棒了。\n" #: builtin/merge.c #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "自动合并失败，修正冲突然后提交修正的结果。\n" #: builtin/merge.c msgid "No current branch." msgstr "没有当前分支。" #: builtin/merge.c msgid "No remote for the current branch." msgstr "当前分支没有对应的远程仓库。" #: builtin/merge.c msgid "No default upstream defined for the current branch." msgstr "当前分支没有定义默认的上游分支。" #: builtin/merge.c #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "对于 %s 没有来自 %s 的远程跟踪分支" #: builtin/merge.c #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'" #: builtin/merge.c read-cache.c strbuf.c wrapper.c #, c-format msgid "could not close '%s'" msgstr "不能关闭 '%s'" #: builtin/merge.c #, c-format msgid "not something we can merge in %s: %s" msgstr "不能在 %s 中合并：%s" #: builtin/merge.c msgid "--abort expects no arguments" msgstr "--abort 不带参数" #: builtin/merge.c msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "没有要终止的合并（MERGE_HEAD 丢失）。" #: builtin/merge.c msgid "--quit expects no arguments" msgstr "--quit 不带参数" #: builtin/merge.c msgid "--continue expects no arguments" msgstr "--continue 不带参数" #: builtin/merge.c msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "没有进行中的合并（MERGE_HEAD 丢失）。" #: builtin/merge.c msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" "您尚未结束您的合并（存在 MERGE_HEAD）。\n" "请在合并前先提交您的修改。" #: builtin/merge.c msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." msgstr "" "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。\n" "请在合并前先提交您的修改。" #: builtin/merge.c msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。" #: builtin/merge.c msgid "No commit specified and merge.defaultToUpstream not set." msgstr "未指定提交并且 merge.defaultToUpstream 未设置。" #: builtin/merge.c msgid "Squash commit into empty head not supported yet" msgstr "尚不支持到空分支的压缩提交" #: builtin/merge.c msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "到空分支的非快进式提交没有意义" #: builtin/merge.c #, c-format msgid "%s - not something we can merge" msgstr "%s - 不能被合并" #: builtin/merge.c msgid "Can merge only exactly one commit into empty head" msgstr "只能将一个提交合并到空分支上" #: builtin/merge.c #, c-format msgid "Updating %s..%s\n" msgstr "更新 %s..%s\n" #: builtin/merge.c merge-ort-wrappers.c merge-recursive.c #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" " %s" msgstr "" "您对下列文件的本地修改将被合并操作覆盖：\n" " %s" #: builtin/merge.c #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "尝试非常小的索引内合并...\n" #: builtin/merge.c #, c-format msgid "Nope.\n" msgstr "无。\n" #: builtin/merge.c #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "将树回滚至原始状态...\n" #: builtin/merge.c #, c-format msgid "Trying merge strategy %s...\n" msgstr "尝试合并策略 %s...\n" #: builtin/merge.c #, c-format msgid "No merge strategy handled the merge.\n" msgstr "没有合并策略处理此合并。\n" #: builtin/merge.c #, c-format msgid "Merge with strategy %s failed.\n" msgstr "使用策略 %s 合并失败。\n" #: builtin/merge.c #, c-format msgid "Using the %s strategy to prepare resolving by hand.\n" msgstr "使用 %s 策略以准备手工解决。\n" #: builtin/merge.c #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "自动合并进展顺利，按要求在提交前停止\n" #: builtin/merge.c #, c-format msgid "When finished, apply stashed changes with `git stash pop`\n" msgstr "在完成后，使用 `git stash pop` 应用贮藏的变更\n" #: builtin/mktag.c #, c-format msgid "warning: tag input does not pass fsck: %s" msgstr "警告：标签输入未通过 fsck：%s" #: builtin/mktag.c #, c-format msgid "error: tag input does not pass fsck: %s" msgstr "错误：标签输入未通过 fsck：%s" #: builtin/mktag.c #, c-format msgid "%d (FSCK_IGNORE?) should never trigger this callback" msgstr "%d (FSCK_IGNORE?) 永远不应该触发这个回调" #: builtin/mktag.c #, c-format msgid "could not read tagged object '%s'" msgstr "不能读取被标记的对象 '%s'" #: builtin/mktag.c #, c-format msgid "object '%s' tagged as '%s', but is a '%s' type" msgstr "对象 '%s' 被标记为 '%s'，然而是一个 '%s' 类型" #: builtin/mktag.c imap-send.c trailer.c msgid "could not read from stdin" msgstr "不能自标准输入读取" #: builtin/mktag.c msgid "tag on stdin did not pass our strict fsck check" msgstr "标准输入上的标签未通过我们严格的 fsck 检查" #: builtin/mktag.c msgid "tag on stdin did not refer to a valid object" msgstr "标准输入上的标签未指向一个有效的对象" #: builtin/mktag.c builtin/tag.c msgid "unable to write tag file" msgstr "无法写标签文件" #: builtin/mktree.c msgid "input is NUL terminated" msgstr "输入以 NUL 字符终止" #: builtin/mktree.c builtin/write-tree.c msgid "allow missing objects" msgstr "允许丢失的对象" #: builtin/mktree.c msgid "allow creation of more than one tree" msgstr "允许创建一个以上的树" #: builtin/multi-pack-index.c msgid "" "git multi-pack-index [] write [--preferred-pack=][--refs-" "snapshot=]" msgstr "" "git multi-pack-index [<选项>] write [--preferred-pack=<包>][--refs-snapshot=<" "路径>]" #: builtin/multi-pack-index.c msgid "git multi-pack-index [] verify" msgstr "git multi-pack-index [<选项>] verify" #: builtin/multi-pack-index.c msgid "git multi-pack-index [] expire" msgstr "git multi-pack-index [<选项>] expire" #: builtin/multi-pack-index.c msgid "git multi-pack-index [] repack [--batch-size=]" msgstr "git multi-pack-index [<选项>] repack [--batch-size=<尺寸>]" #: builtin/multi-pack-index.c msgid "directory" msgstr "目录" #: builtin/multi-pack-index.c msgid "object directory containing set of packfile and pack-index pairs" msgstr "包含成对包文件和包索引的对象目录" #: builtin/multi-pack-index.c msgid "preferred-pack" msgstr "首选包" #: builtin/multi-pack-index.c msgid "pack for reuse when computing a multi-pack bitmap" msgstr "在计算多包位图时打包以供重用" #: builtin/multi-pack-index.c msgid "write multi-pack bitmap" msgstr "写入多包位图" #: builtin/multi-pack-index.c msgid "write multi-pack index containing only given indexes" msgstr "写入只包括给定索引的多包索引" #: builtin/multi-pack-index.c msgid "refs snapshot for selecting bitmap commits" msgstr "用于选择位图提交的引用快照" #: builtin/multi-pack-index.c msgid "" "during repack, collect pack-files of smaller size into a batch that is " "larger than this size" msgstr "在 repack 期间，将较小尺寸的包文件收集到大于此大小的批次中" #: builtin/mv.c msgid "git mv [] ... " msgstr "git mv [<选项>] <源>... <目标>" #: builtin/mv.c #, c-format msgid "Directory %s is in index and no submodule?" msgstr "目录 %s 在索引中并且不是子模组？" #: builtin/mv.c msgid "Please stage your changes to .gitmodules or stash them to proceed" msgstr "请将您的修改暂存到 .gitmodules 中或贮藏后再继续" #: builtin/mv.c #, c-format msgid "%.*s is in index" msgstr "%.*s 在索引中" #: builtin/mv.c msgid "force move/rename even if target exists" msgstr "强制移动/重命令，即使目标存在" #: builtin/mv.c msgid "skip move/rename errors" msgstr "跳过移动/重命名错误" #: builtin/mv.c #, c-format msgid "destination '%s' is not a directory" msgstr "目标 '%s' 不是一个目录" #: builtin/mv.c #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "检查 '%s' 到 '%s' 的重命名\n" #: builtin/mv.c msgid "bad source" msgstr "坏的源" #: builtin/mv.c msgid "destination exists" msgstr "目标已存在" #: builtin/mv.c msgid "can not move directory into itself" msgstr "不能将目录移动到自身" #: builtin/mv.c msgid "cannot move directory over file" msgstr "不能将目录移动到文件" #: builtin/mv.c msgid "source directory is empty" msgstr "源目录为空" #: builtin/mv.c msgid "not under version control" msgstr "不在版本控制之下" #: builtin/mv.c msgid "conflicted" msgstr "冲突" #: builtin/mv.c #, c-format msgid "overwriting '%s'" msgstr "覆盖 '%s'" #: builtin/mv.c msgid "Cannot overwrite" msgstr "不能覆盖" #: builtin/mv.c msgid "multiple sources for the same target" msgstr "同一目标具有多个源" #: builtin/mv.c msgid "destination directory does not exist" msgstr "目标目录不存在" #: builtin/mv.c msgid "destination exists in the index" msgstr "目标在索引中已存在" #: builtin/mv.c #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s，源=%s，目标=%s" #: builtin/mv.c #, c-format msgid "Renaming %s to %s\n" msgstr "重命名 %s 至 %s\n" #: builtin/mv.c builtin/remote.c #, c-format msgid "renaming '%s' failed" msgstr "重命名 '%s' 失败" #: builtin/name-rev.c msgid "git name-rev [] ..." msgstr "git name-rev [<选项>] <提交>..." #: builtin/name-rev.c msgid "git name-rev [] --all" msgstr "git name-rev [<选项>] --all" #: builtin/name-rev.c msgid "git name-rev [] --annotate-stdin" msgstr "git name-rev [<选项>] --annotate-stdin" #: builtin/name-rev.c msgid "print only ref-based names (no object names)" msgstr "只打印基于引用的名称（非对象名）" #: builtin/name-rev.c msgid "only use tags to name the commits" msgstr "只使用标签来命名提交" #: builtin/name-rev.c msgid "only use refs matching " msgstr "只使用和 <模式> 相匹配的引用" #: builtin/name-rev.c msgid "ignore refs matching " msgstr "忽略和 <模式> 相匹配的引用" #: builtin/name-rev.c msgid "list all commits reachable from all refs" msgstr "列出可以从所有引用访问的提交" #: builtin/name-rev.c msgid "deprecated: use --annotate-stdin instead" msgstr "已弃用：取而代之使用 --annotate-stdin" #: builtin/name-rev.c msgid "annotate text from stdin" msgstr "标注标准输入的文字" #: builtin/name-rev.c msgid "allow to print `undefined` names (default)" msgstr "允许打印 `未定义` 的名称（默认）" #: builtin/name-rev.c msgid "dereference tags in the input (internal use)" msgstr "反向解析输入中的标签（内部使用）" #: builtin/notes.c msgid "git notes [--ref ] [list []]" msgstr "git notes [--ref <注解引用>] [list [<对象>]]" #: builtin/notes.c msgid "" "git notes [--ref ] add [-f] [--allow-empty] [-m | -F " "| (-c | -C) ] []" msgstr "" "git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> " "| (-c | -C) <对象>] [<对象>]" #: builtin/notes.c msgid "git notes [--ref ] copy [-f] " msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>" #: builtin/notes.c msgid "" "git notes [--ref ] append [--allow-empty] [-m | -F | " "(-c | -C) ] []" msgstr "" "git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | " "(-c | -C) <对象>] [<对象>]" #: builtin/notes.c msgid "git notes [--ref ] edit [--allow-empty] []" msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]" #: builtin/notes.c msgid "git notes [--ref ] show []" msgstr "git notes [--ref <注解引用>] show [<对象>]" #: builtin/notes.c msgid "" "git notes [--ref ] merge [-v | -q] [-s ] " msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>" #: builtin/notes.c msgid "git notes [--ref ] remove [...]" msgstr "git notes [--ref <注解引用>] remove [<对象>...]" #: builtin/notes.c msgid "git notes [--ref ] prune [-n] [-v]" msgstr "git notes [--ref <注解引用>] prune [-n] [-v]" #: builtin/notes.c msgid "git notes [--ref ] get-ref" msgstr "git notes [--ref <注解引用>] get-ref" #: builtin/notes.c msgid "git notes [list []]" msgstr "git notes [list [<对象>]]" #: builtin/notes.c msgid "git notes add [] []" msgstr "git notes add [<选项>] [<对象>]" #: builtin/notes.c msgid "git notes copy [] " msgstr "git notes copy [<选项>] <源对象> <目标对象>" #: builtin/notes.c msgid "git notes copy --stdin [ ]..." msgstr "git notes copy --stdin [<源对象> <目标对象>]..." #: builtin/notes.c msgid "git notes append [] []" msgstr "git notes append [<选项>] [<对象>]" #: builtin/notes.c msgid "git notes edit []" msgstr "git notes edit [<对象>]" #: builtin/notes.c msgid "git notes show []" msgstr "git notes show [<对象>]" #: builtin/notes.c msgid "git notes merge [] " msgstr "git notes merge [<选项>] <注解引用>" #: builtin/notes.c msgid "git notes merge --commit []" msgstr "git notes merge --commit [<选项>]" #: builtin/notes.c msgid "git notes merge --abort []" msgstr "git notes merge --abort [<选项>]" #: builtin/notes.c msgid "git notes remove []" msgstr "git notes remove [<对象>]" #: builtin/notes.c msgid "git notes prune []" msgstr "git notes prune [<选项>]" #: builtin/notes.c msgid "Write/edit the notes for the following object:" msgstr "为下面的对象写/编辑说明：" #: builtin/notes.c #, c-format msgid "unable to start 'show' for object '%s'" msgstr "不能为对象 '%s' 开始 'show'" #: builtin/notes.c msgid "could not read 'show' output" msgstr "不能读取 'show' 的输出" #: builtin/notes.c #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "无法为对象 '%s' 完成 'show'" #: builtin/notes.c msgid "please supply the note contents using either -m or -F option" msgstr "请通过 -m 或 -F 选项为注解提供内容" #: builtin/notes.c msgid "unable to write note object" msgstr "不能写注解对象" #: builtin/notes.c #, c-format msgid "the note contents have been left in %s" msgstr "注解内容被留在 %s 中" #: builtin/notes.c builtin/tag.c #, c-format msgid "could not open or read '%s'" msgstr "不能打开或读取 '%s'" #: builtin/notes.c #, c-format msgid "failed to resolve '%s' as a valid ref." msgstr "无法解析 '%s' 为一个有效引用。" #: builtin/notes.c #, c-format msgid "failed to read object '%s'." msgstr "无法读取对象 '%s'。" #: builtin/notes.c #, c-format msgid "cannot read note data from non-blob object '%s'." msgstr "不能从非数据对象 '%s' 中读取注解数据。" #: builtin/notes.c #, c-format msgid "failed to copy notes from '%s' to '%s'" msgstr "无法把注解从 '%s' 拷贝到 '%s'" #. TRANSLATORS: the first %s will be replaced by a git #. notes command: 'add', 'merge', 'remove', etc. #. #: builtin/notes.c #, c-format msgid "refusing to %s notes in %s (outside of refs/notes/)" msgstr "拒绝向 %2$s（在 refs/notes/ 之外）%1$s注解" #: builtin/notes.c #, c-format msgid "no note found for object %s." msgstr "未发现对象 %s 的注解。" #: builtin/notes.c msgid "note contents as a string" msgstr "注解内容作为一个字符串" #: builtin/notes.c msgid "note contents in a file" msgstr "注解内容到一个文件中" #: builtin/notes.c msgid "reuse and edit specified note object" msgstr "重用和编辑指定的注解对象" #: builtin/notes.c msgid "reuse specified note object" msgstr "重用指定的注解对象" #: builtin/notes.c msgid "allow storing empty note" msgstr "允许保存空白注释" #: builtin/notes.c msgid "replace existing notes" msgstr "替换已存在的注解" #: builtin/notes.c #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" #: builtin/notes.c #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "覆盖对象 %s 现存注解\n" #: builtin/notes.c #, c-format msgid "Removing note for object %s\n" msgstr "删除对象 %s 的注解\n" #: builtin/notes.c msgid "read objects from stdin" msgstr "从标准输入读取对象" #: builtin/notes.c msgid "load rewriting config for (implies --stdin)" msgstr "重新加载 <命令> 的配置（隐含 --stdin）" #: builtin/notes.c msgid "too few arguments" msgstr "参数太少" #: builtin/notes.c #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" #: builtin/notes.c #, c-format msgid "missing notes on source object %s. Cannot copy." msgstr "源对象 %s 缺少注解。不能拷贝。" #: builtin/notes.c #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" "Please use 'git notes add -f -m/-F/-c/-C' instead.\n" msgstr "" "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n" "请换用 'git notes add -f -m/-F/-c/-C'。\n" #: builtin/notes.c msgid "failed to delete ref NOTES_MERGE_PARTIAL" msgstr "无法删除引用 NOTES_MERGE_PARTIAL" #: builtin/notes.c msgid "failed to delete ref NOTES_MERGE_REF" msgstr "无法删除引用 NOTES_MERGE_REF" #: builtin/notes.c msgid "failed to remove 'git notes merge' worktree" msgstr "无法删除 'git notes merge' 工作区" #: builtin/notes.c msgid "failed to read ref NOTES_MERGE_PARTIAL" msgstr "无法读取引用 NOTES_MERGE_PARTIAL" #: builtin/notes.c msgid "could not find commit from NOTES_MERGE_PARTIAL." msgstr "无法从 NOTES_MERGE_PARTIAL 中找到提交。" #: builtin/notes.c msgid "could not parse commit from NOTES_MERGE_PARTIAL." msgstr "无法从 NOTES_MERGE_PARTIAL 中解析提交。" #: builtin/notes.c msgid "failed to resolve NOTES_MERGE_REF" msgstr "无法解析 NOTES_MERGE_REF" #: builtin/notes.c msgid "failed to finalize notes merge" msgstr "无法完成注解合并" #: builtin/notes.c #, c-format msgid "unknown notes merge strategy %s" msgstr "未知的注解合并策略 %s" #: builtin/notes.c msgid "General options" msgstr "通用选项" #: builtin/notes.c msgid "Merge options" msgstr "合并选项" #: builtin/notes.c msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)" #: builtin/notes.c msgid "Committing unmerged notes" msgstr "提交未合并的注解" #: builtin/notes.c msgid "finalize notes merge by committing unmerged notes" msgstr "通过提交未合并的注解来完成注解合并" #: builtin/notes.c msgid "Aborting notes merge resolution" msgstr "中止注解合并的方案" #: builtin/notes.c msgid "abort notes merge" msgstr "中止注解合并" #: builtin/notes.c msgid "cannot mix --commit, --abort or -s/--strategy" msgstr "不能混用 --commit、--abort 或 -s/--strategy" #: builtin/notes.c msgid "must specify a notes ref to merge" msgstr "必须指定一个注解引用来合并" #: builtin/notes.c #, c-format msgid "unknown -s/--strategy: %s" msgstr "未知的 -s/--strategy：%s" #: builtin/notes.c #, c-format msgid "a notes merge into %s is already in-progress at %s" msgstr "位于 %2$s 的一个到 %1$s 中的注解合并正在执行中" #: builtin/notes.c #, c-format msgid "failed to store link to current notes ref (%s)" msgstr "无法存储链接到当前的注解引用（%s）" #: builtin/notes.c #, c-format msgid "" "Automatic notes merge failed. Fix conflicts in %s and commit the result with " "'git notes merge --commit', or abort the merge with 'git notes merge --" "abort'.\n" msgstr "" "自动合并说明失败。修改 %s 中的冲突并且使用命令 'git notes merge --commit' 提" "交结果，或者使用命令 'git notes merge --abort' 终止合并。\n" #: builtin/notes.c builtin/tag.c #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "无法解析 '%s' 为一个有效引用。" #: builtin/notes.c #, c-format msgid "Object %s has no note\n" msgstr "对象 %s 没有注解\n" #: builtin/notes.c msgid "attempt to remove non-existent note is not an error" msgstr "尝试删除不存在的注解不是一个错误" #: builtin/notes.c msgid "read object names from the standard input" msgstr "从标准输入读取对象名称" #: builtin/notes.c builtin/prune.c builtin/worktree.c msgid "do not remove, show only" msgstr "不删除，只显示" #: builtin/notes.c msgid "report pruned notes" msgstr "报告清除的注解" #: builtin/notes.c msgid "notes-ref" msgstr "注解引用" #: builtin/notes.c msgid "use notes from " msgstr "从 <注解引用> 使用注解" #: builtin/notes.c builtin/remote.c parse-options.c #, c-format msgid "unknown subcommand: `%s'" msgstr "未知子命令：`%s'" #: builtin/pack-objects.c msgid "git pack-objects --stdout [] [< | < ]" msgstr "git pack-objects --stdout [<选项>] [< <引用列表> | < <对象列表>]" #: builtin/pack-objects.c msgid "" "git pack-objects [] [< | < ]" msgstr "git pack-objects [<选项>] <前缀名称> [< <引用列表> | < <对象列表>]" #: builtin/pack-objects.c #, c-format msgid "" "write_reuse_object: could not locate %s, expected at offset % in " "pack %s" msgstr "" "write_reuse_object：无法定位 %1$s，预期在包 %3$s 中的偏移量 %2$ 上" #: builtin/pack-objects.c #, c-format msgid "bad packed object CRC for %s" msgstr "%s 错的包对象 CRC" #: builtin/pack-objects.c #, c-format msgid "corrupt packed object for %s" msgstr "%s 损坏的包对象" #: builtin/pack-objects.c #, c-format msgid "recursive delta detected for object %s" msgstr "发现对象 %s 递归 delta" #: builtin/pack-objects.c #, c-format msgid "ordered %u objects, expected %" msgstr "排序了 %u 个对象，预期 % 个" #: builtin/pack-objects.c #, c-format msgid "expected object at offset % in pack %s" msgstr "预期对象在包文件 %2$s 的偏移量 %1$ 上" #: builtin/pack-objects.c msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "禁用 bitmap 写入，因为 pack.packSizeLimit 设置使得包被切分为多个" #: builtin/pack-objects.c msgid "Writing objects" msgstr "写入对象中" #: builtin/pack-objects.c builtin/update-index.c #, c-format msgid "failed to stat %s" msgstr "无法对 %s 调用 stat" #: builtin/pack-objects.c object-file.c #, c-format msgid "failed utime() on %s" msgstr "在 %s 上调用 utime() 失败" #: builtin/pack-objects.c msgid "failed to write bitmap index" msgstr "无法写入位图索引" #: builtin/pack-objects.c #, c-format msgid "wrote % objects while expecting %" msgstr "写入 % 个对象而预期 % 个" #: builtin/pack-objects.c msgid "disabling bitmap writing, as some objects are not being packed" msgstr "禁用 bitmap 写入，因为一些对象将不会被打包" #: builtin/pack-objects.c #, c-format msgid "delta base offset overflow in pack for %s" msgstr "%s 压缩中 delta 基准偏移越界" #: builtin/pack-objects.c #, c-format msgid "delta base offset out of bound for %s" msgstr "%s 的 delta 基准偏移越界" #: builtin/pack-objects.c msgid "Counting objects" msgstr "对象计数中" #: builtin/pack-objects.c pack-bitmap.c #, c-format msgid "unable to get size of %s" msgstr "无法得到 %s 的大小" #: builtin/pack-objects.c #, c-format msgid "unable to parse object header of %s" msgstr "无法解析对象 %s 头信息" #: builtin/pack-objects.c #, c-format msgid "object %s cannot be read" msgstr "对象 %s 无法读取" #: builtin/pack-objects.c #, c-format msgid "object %s inconsistent object length (% vs %)" msgstr "对象 %s 不一致的对象长度（% vs %）" #: builtin/pack-objects.c msgid "suboptimal pack - out of memory" msgstr "次优（suboptimal）打包 - 内存不足" #: builtin/pack-objects.c #, c-format msgid "Delta compression using up to %d threads" msgstr "使用 %d 个线程进行压缩" #: builtin/pack-objects.c #, c-format msgid "unable to pack objects reachable from tag %s" msgstr "无法为标签 %s 压缩对象" #: builtin/pack-objects.c commit-graph.c #, c-format msgid "unable to get type of object %s" msgstr "无法获得对象 %s 类型" #: builtin/pack-objects.c msgid "Compressing objects" msgstr "压缩对象中" #: builtin/pack-objects.c msgid "inconsistency with delta count" msgstr "不一致的差异计数" #: builtin/pack-objects.c #, c-format msgid "" "value of uploadpack.blobpackfileuri must be of the form ' ' (got '%s')" msgstr "" "uploadpack.blobpackfileuri 的取值必须是 ' ' 格" "式（得到 '%s'）" #: builtin/pack-objects.c #, c-format msgid "" "object already configured in another uploadpack.blobpackfileuri (got '%s')" msgstr "对象已经在另外的 uploadpack.blobpackfileuri 中配置（得到 '%s'）" #: builtin/pack-objects.c #, c-format msgid "could not get type of object %s in pack %s" msgstr "无法获得包 %2$s 中对象 %1$s 的类型" #: builtin/pack-objects.c #, c-format msgid "could not find pack '%s'" msgstr "不能找到包 '%s'" #: builtin/pack-objects.c #, c-format msgid "packfile %s cannot be accessed" msgstr "无法访问包文件 %s" #: builtin/pack-objects.c msgid "Enumerating cruft objects" msgstr "枚举废弃对象中" #: builtin/pack-objects.c msgid "unable to add cruft objects" msgstr "无法添加废弃对象" #: builtin/pack-objects.c msgid "Traversing cruft objects" msgstr "遍历废弃对象中" #: builtin/pack-objects.c #, c-format msgid "" "expected edge object ID, got garbage:\n" " %s" msgstr "" "预期边界对象（edge object）ID，却得到垃圾数据：\n" " %s" #: builtin/pack-objects.c #, c-format msgid "" "expected object ID, got garbage:\n" " %s" msgstr "" "预期对象 ID，却得到垃圾数据：\n" " %s" #: builtin/pack-objects.c reachable.c msgid "could not load cruft pack .mtimes" msgstr "不能载入废弃包 .mtimes" #: builtin/pack-objects.c msgid "cannot open pack index" msgstr "无法打开包文件索引" #: builtin/pack-objects.c #, c-format msgid "loose object at %s could not be examined" msgstr "无法检查 %s 处的松散对象" #: builtin/pack-objects.c msgid "unable to force loose object" msgstr "无法强制松散对象" #: builtin/pack-objects.c #, c-format msgid "not a rev '%s'" msgstr "不是一个版本 '%s'" #: builtin/pack-objects.c builtin/rev-parse.c #, c-format msgid "bad revision '%s'" msgstr "坏的版本 '%s'" #: builtin/pack-objects.c msgid "unable to add recent objects" msgstr "无法添加最近的对象" #: builtin/pack-objects.c #, c-format msgid "unsupported index version %s" msgstr "不支持的索引版本 %s" #: builtin/pack-objects.c #, c-format msgid "bad index version '%s'" msgstr "坏的索引版本 '%s'" #: builtin/pack-objects.c msgid "[,]" msgstr "<版本>[,<偏移>]" #: builtin/pack-objects.c msgid "write the pack index file in the specified idx format version" msgstr "用指定的 idx 格式版本来写包索引文件" #: builtin/pack-objects.c msgid "maximum size of each output pack file" msgstr "每个输出包的最大尺寸" #: builtin/pack-objects.c msgid "ignore borrowed objects from alternate object store" msgstr "忽略从备用对象存储里借用对象" #: builtin/pack-objects.c msgid "ignore packed objects" msgstr "忽略包对象" #: builtin/pack-objects.c msgid "limit pack window by objects" msgstr "限制打包窗口的对象数" #: builtin/pack-objects.c msgid "limit pack window by memory in addition to object limit" msgstr "除对象数量限制外设置打包窗口的内存限制" #: builtin/pack-objects.c msgid "maximum length of delta chain allowed in the resulting pack" msgstr "打包允许的 delta 链的最大长度" #: builtin/pack-objects.c msgid "reuse existing deltas" msgstr "重用已存在的 deltas" #: builtin/pack-objects.c msgid "reuse existing objects" msgstr "重用已存在的对象" #: builtin/pack-objects.c msgid "use OFS_DELTA objects" msgstr "使用 OFS_DELTA 对象" #: builtin/pack-objects.c msgid "use threads when searching for best delta matches" msgstr "使用线程查询最佳 delta 匹配" #: builtin/pack-objects.c msgid "do not create an empty pack output" msgstr "不创建空的包输出" #: builtin/pack-objects.c msgid "read revision arguments from standard input" msgstr "从标准输入读取版本号参数" #: builtin/pack-objects.c msgid "limit the objects to those that are not yet packed" msgstr "限制那些尚未打包的对象" #: builtin/pack-objects.c msgid "include objects reachable from any reference" msgstr "包括可以从任何引用访问到的对象" #: builtin/pack-objects.c msgid "include objects referred by reflog entries" msgstr "包括被引用日志引用到的对象" #: builtin/pack-objects.c msgid "include objects referred to by the index" msgstr "包括被索引引用到的对象" #: builtin/pack-objects.c msgid "read packs from stdin" msgstr "从标准输入读取包" #: builtin/pack-objects.c msgid "output pack to stdout" msgstr "输出包到标准输出" #: builtin/pack-objects.c msgid "include tag objects that refer to objects to be packed" msgstr "包括那些引用了待打包对象的标签对象" #: builtin/pack-objects.c msgid "keep unreachable objects" msgstr "维持不可达的对象" #: builtin/pack-objects.c msgid "pack loose unreachable objects" msgstr "打包松散的不可达对象" #: builtin/pack-objects.c msgid "unpack unreachable objects newer than