2012-02-13 07:41:59 +01:00
|
|
|
|
# Chinese translations for Git package
|
|
|
|
|
# Git 软件包的简体中文翻译.
|
2013-01-30 10:23:08 +01:00
|
|
|
|
# Copyright (C) 2012,2013 Jiang Xin <worldhello.net AT gmail.com>
|
2012-02-13 07:41:59 +01:00
|
|
|
|
# This file is distributed under the same license as the Git package.
|
2015-02-16 14:34:19 +01:00
|
|
|
|
# Contributors:
|
2012-02-13 07:41:59 +01:00
|
|
|
|
# - Jiang Xin <worldhello.net AT gmail.com>
|
2015-08-03 18:33:16 +02:00
|
|
|
|
# - Lian Cheng <rhythm.mail AT gmail.com>
|
|
|
|
|
# - Ray Chen <oldsharp AT gmail.com>
|
2012-02-13 07:41:59 +01:00
|
|
|
|
# - Riku <lu.riku AT gmail.com>
|
2015-08-03 18:33:16 +02:00
|
|
|
|
# - Thynson <lanxingcan AT gmail.com>
|
|
|
|
|
# - ws3389 <willsmith3389 AT gmail.com>
|
|
|
|
|
# - Wang Sheng <wangsheng2008love AT 163.com>
|
|
|
|
|
# - Yichao Yu <yyc1992 AT gmail.com>
|
2012-02-13 07:41:59 +01:00
|
|
|
|
# - Zhuang Ya <zhuangya AT me.com>
|
|
|
|
|
#
|
2015-08-02 15:47:30 +02:00
|
|
|
|
# Git glossary for Chinese translators
|
|
|
|
|
#
|
|
|
|
|
# English | Chinese
|
|
|
|
|
# ---------------------------------+--------------------------------------
|
|
|
|
|
# 3-way merge | 三方合并
|
|
|
|
|
# abbreviate | 简写(的 SHA-1 值)
|
|
|
|
|
# alternate object database | 备用对象库
|
|
|
|
|
# amend | 修补
|
|
|
|
|
# ancestor | 祖先,祖先提交
|
|
|
|
|
# annotated tag | 附注标签
|
|
|
|
|
# bare repository | 纯仓库
|
|
|
|
|
# bisect | 二分查找
|
|
|
|
|
# blob object | 数据对象
|
|
|
|
|
# branch | 分支
|
|
|
|
|
# bundle | 包
|
|
|
|
|
# bypass | 绕过
|
|
|
|
|
# cache | 索引(的别称)
|
|
|
|
|
# chain | (提交)链
|
|
|
|
|
# changeset | 变更集
|
|
|
|
|
# checkout | 检出
|
|
|
|
|
# checksum | 校验,校验和
|
|
|
|
|
# cherry-picking | 拣选
|
|
|
|
|
# clean | 干净(的工作区)
|
|
|
|
|
# clone | 克隆
|
|
|
|
|
# commit | 提交
|
2015-08-25 03:47:50 +02:00
|
|
|
|
# commit message | 提交说明
|
2015-08-02 15:47:30 +02:00
|
|
|
|
# commit object | 提交对象
|
|
|
|
|
# commit-ish (also committish) | 提交号
|
|
|
|
|
# conflict | 冲突
|
|
|
|
|
# core Git | 核心 Git 工具
|
|
|
|
|
# DAG | 有向无环图
|
|
|
|
|
# dangling object | 摇摆对象
|
|
|
|
|
# detached HEAD | 分离头指针
|
|
|
|
|
# directory | 目录
|
|
|
|
|
# dirty | 脏(的工作区)
|
2015-08-20 03:39:17 +02:00
|
|
|
|
# dumb HTTP protocol | 哑 HTTP 协议
|
2015-08-02 15:47:30 +02:00
|
|
|
|
# evil merge | 坏合并(合并引入了父提交没有的修改)
|
|
|
|
|
# fast-forward | 快进
|
|
|
|
|
# fetch | 获取
|
|
|
|
|
# file system | 文件系统
|
l10n: zh_CN: Update Git Glossary: fork
Remove "复刻" from translation option list of "fork", keeping "派生"
as the only one.
In Git context, by talking about the term "fork", one usually mean the
procedure that divides a branch into two or more history lines. That
is quite like the "fork" concept in programming, which split a process
into two or more independent processes.
On the other hand, "复刻" by itself means "copy" or "mirror". It is
considered more suitable for describing the procedure like
"fork a repository", which is common on public repository hosting
services, such as GitHub. However, this is beyond the scope of
core-Git. As a l10n work for core-Git, "复刻" should be removed here.
There used to be another option - "分岔". Its a good idea to
translate "fork point" as "分岔点". However, "派生点" is as good,
too. So this option is finally discarded.
Also fix a relevant translation issue which was introduced in
`160fb2b`.
Signed-off-by: Ray Chen <oldsharp@gmail.com>
2015-08-20 05:01:34 +02:00
|
|
|
|
# fork | 派生
|
2015-08-02 15:47:30 +02:00
|
|
|
|
# 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 | 模式
|
2015-08-20 09:24:01 +02:00
|
|
|
|
# pickaxe | 挖掘
|
2015-08-02 15:47:30 +02:00
|
|
|
|
# plumbing | 管件(Git 底层核心命令的别称)
|
|
|
|
|
# porcelain | 瓷件(Git 上层封装命令的别称)
|
2015-11-16 00:02:11 +01:00
|
|
|
|
# precious-objects repo | 珍品仓库
|
2015-08-02 15:47:30 +02:00
|
|
|
|
# prune | 清除
|
|
|
|
|
# pull | 拉,拉取
|
|
|
|
|
# push | 推,推送
|
|
|
|
|
# reachable | 可达
|
|
|
|
|
# rebase | 变基
|
|
|
|
|
# ref | 引用
|
|
|
|
|
# reflog | 引用日志
|
|
|
|
|
# refspec | 引用规格
|
|
|
|
|
# remote | 远程,远程仓库
|
|
|
|
|
# remote-tracking branch | 远程跟踪分支
|
|
|
|
|
# replay | 重放
|
|
|
|
|
# repo | 仓库
|
|
|
|
|
# repository | 仓库
|
|
|
|
|
# resolve | (冲突)解决
|
|
|
|
|
# revert | 还原
|
|
|
|
|
# revision | 版本
|
|
|
|
|
# rewind | 回退
|
|
|
|
|
# SCM | 源代码管理(工具)
|
2015-08-20 03:17:09 +02:00
|
|
|
|
# SHA-1 | SHA-1(安全哈希算法1)
|
2015-08-02 15:47:30 +02:00
|
|
|
|
# shallow repository | 浅(克隆)仓库
|
|
|
|
|
# signed tag | 签名标签
|
2015-08-20 03:39:17 +02:00
|
|
|
|
# smart HTTP protocol | 智能 HTTP 协议
|
2015-08-02 15:47:30 +02:00
|
|
|
|
# squash | 压缩
|
|
|
|
|
# stage | n. 暂存区(即索引); v. 暂存
|
|
|
|
|
# stash | n. 进度保存; v. 保存进度
|
|
|
|
|
# submodule | 子模组
|
|
|
|
|
# symref | 符号引用
|
2015-08-20 04:22:43 +02:00
|
|
|
|
# tag | n. 标签; v. 打标签
|
2015-08-02 15:47:30 +02:00
|
|
|
|
# tag object | 标签对象
|
|
|
|
|
# tagger | 打标签者
|
|
|
|
|
# topic branch | 主题分支
|
|
|
|
|
# track | 跟踪
|
|
|
|
|
# tree | 树(工作区或树对象)
|
|
|
|
|
# tree object | 树对象
|
|
|
|
|
# tree-ish (also treeish) | 树对象(或可以解析为一树对象)
|
|
|
|
|
# unmerged index | 未合并索引
|
|
|
|
|
# unpack | 解包
|
|
|
|
|
# unreachable object | 不可达对象
|
|
|
|
|
# unstage | 取消暂存
|
|
|
|
|
# upstream | 上游
|
|
|
|
|
# upstream branch | 上游分支
|
|
|
|
|
# working tree | 工作区
|
|
|
|
|
#
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid ""
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Project-Id-Version: Git\n"
|
|
|
|
|
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
|
2016-11-20 13:26:17 +01:00
|
|
|
|
"POT-Creation-Date: 2016-11-25 22:50+0800\n"
|
|
|
|
|
"PO-Revision-Date: 2016-11-25 22:54+0800\n"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
|
2015-05-31 02:42:31 +02:00
|
|
|
|
"Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
"Language: zh_CN\n"
|
|
|
|
|
"MIME-Version: 1.0\n"
|
|
|
|
|
"Content-Type: text/plain; charset=UTF-8\n"
|
|
|
|
|
"Content-Transfer-Encoding: 8bit\n"
|
l10n: Set nplurals of zh_CN.po from 1 to 2
In most cases, plural-forms are unnecessary for Chinese. For example,
"apple" and "apples" are the same in Chinese, they are both translated
as "苹果". While there are exceptions, e.g., the plural form of "he",
"she" and "it" is "they" in English. In Chinese, "他(he)", "她(she)",
and "它(it)" have plural forms too, they are "他们", "她们", and "它们".
But what makes 'nplurals=1' hard to work right for Chinese is:
#: bundle.c:192
#, c-format
msgid "The bundle requires this ref"
msgid_plural "The bundle requires these %d refs"
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-05-31 11:35:59 +02:00
|
|
|
|
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2014-03-13 05:41:34 +01:00
|
|
|
|
#: advice.c:55
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "hint: %.*s\n"
|
|
|
|
|
msgstr "提示:%.*s\n"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: advice.c:83
|
|
|
|
|
msgid "Cherry-picking is not possible because you have unmerged files."
|
|
|
|
|
msgstr "无法拣选,因为您有未合并的文件。"
|
|
|
|
|
|
|
|
|
|
#: advice.c:85
|
|
|
|
|
msgid "Committing is not possible because you have unmerged files."
|
|
|
|
|
msgstr "无法提交,因为您有未合并的文件。"
|
|
|
|
|
|
|
|
|
|
#: advice.c:87
|
|
|
|
|
msgid "Merging is not possible because you have unmerged files."
|
|
|
|
|
msgstr "无法合并,因为您有未合并的文件。"
|
|
|
|
|
|
|
|
|
|
#: advice.c:89
|
|
|
|
|
msgid "Pulling is not possible because you have unmerged files."
|
|
|
|
|
msgstr "无法拉取,因为您有未合并的文件。"
|
|
|
|
|
|
|
|
|
|
#: advice.c:91
|
|
|
|
|
msgid "Reverting is not possible because you have unmerged files."
|
|
|
|
|
msgstr "无法回退,因为您有未合并的文件。"
|
|
|
|
|
|
|
|
|
|
#: advice.c:93
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "It is not possible to %s because you have unmerged files."
|
|
|
|
|
msgstr "无法 %s,因为您有未合并的文件。"
|
|
|
|
|
|
|
|
|
|
#: advice.c:101
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid ""
|
2014-08-04 10:23:15 +02:00
|
|
|
|
"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
|
2014-10-08 04:55:14 +02:00
|
|
|
|
"as appropriate to mark resolution and make a commit."
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgstr ""
|
2015-01-18 13:37:57 +01:00
|
|
|
|
"请在工作区改正文件,然后酌情使用 'git add/rm <文件>' 命令标记\n"
|
2014-10-08 04:55:14 +02:00
|
|
|
|
"解决方案并提交。"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: advice.c:109
|
|
|
|
|
msgid "Exiting because of an unresolved conflict."
|
|
|
|
|
msgstr "因为存在未解决的冲突而退出。"
|
|
|
|
|
|
|
|
|
|
#: advice.c:114 builtin/merge.c:1181
|
2015-08-23 09:23:21 +02:00
|
|
|
|
msgid "You have not concluded your merge (MERGE_HEAD exists)."
|
|
|
|
|
msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: advice.c:116
|
2015-11-16 00:02:11 +01:00
|
|
|
|
msgid "Please, commit your changes before merging."
|
2015-08-23 09:23:21 +02:00
|
|
|
|
msgstr "请在合并前先提交您的修改。"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: advice.c:117
|
2015-08-23 09:23:21 +02:00
|
|
|
|
msgid "Exiting because of unfinished merge."
|
|
|
|
|
msgstr "因为存在未完成的合并而退出。"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: advice.c:123
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Note: checking out '%s'.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"You are in 'detached HEAD' state. You can look around, make experimental\n"
|
|
|
|
|
"changes and commit them, and you can discard any commits you make in this\n"
|
|
|
|
|
"state without impacting any branches by performing another checkout.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"If you want to create a new branch to retain commits you create, you may\n"
|
|
|
|
|
"do so (now or later) by using -b with the checkout command again. Example:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git checkout -b <new-branch-name>\n"
|
|
|
|
|
"\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"注意:正在检出 '%s'。\n"
|
|
|
|
|
"\n"
|
2016-10-27 15:53:37 +02:00
|
|
|
|
"您正处于分离头指针状态。您可以查看、做试验性的修改及提交,并且您可以通过另"
|
|
|
|
|
"外\n"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
"的检出分支操作丢弃在这个状态下所做的任何提交。\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"如果您想要通过创建分支来保留在此状态下所做的提交,您可以通过在检出命令添加\n"
|
|
|
|
|
"参数 -b 来实现(现在或稍后)。例如:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git checkout -b <new-branch-name>\n"
|
|
|
|
|
"\n"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:57
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unrecognized whitespace option '%s'"
|
|
|
|
|
msgstr "未能识别的空白字符选项 '%s'"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:73
|
2013-09-17 17:37:05 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "unrecognized whitespace ignore option '%s'"
|
|
|
|
|
msgstr "未能识别的空白字符忽略选项 '%s'"
|
2013-09-17 17:37:05 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:125
|
|
|
|
|
msgid "--reject and --3way cannot be used together."
|
|
|
|
|
msgstr "--reject 和 --3say 不能同时使用。"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:127
|
|
|
|
|
msgid "--cached and --3way cannot be used together."
|
|
|
|
|
msgstr "--cached 和 --3way 不能同时使用。"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:130
|
|
|
|
|
msgid "--3way outside a repository"
|
|
|
|
|
msgstr "--3way 在一个仓库之外"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:141
|
|
|
|
|
msgid "--index outside a repository"
|
|
|
|
|
msgstr "--index 在一个仓库之外"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:144
|
|
|
|
|
msgid "--cached outside a repository"
|
|
|
|
|
msgstr "--cached 在一个仓库之外"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:845
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Cannot prepare timestamp regexp %s"
|
|
|
|
|
msgstr "无法准备时间戳正则表达式 %s"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:854
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "regexec returned %d for input: %s"
|
|
|
|
|
msgstr "regexec 返回 %d,输入为:%s"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:938
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to find filename in patch at line %d"
|
|
|
|
|
msgstr "不能在补丁的第 %d 行找到文件名"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:977
|
|
|
|
|
#, 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"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:983
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
|
|
|
|
|
msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:984
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
|
|
|
|
|
msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:990
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "git apply: bad git-diff - expected /dev/null on line %d"
|
|
|
|
|
msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:1488
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "recount: unexpected line: %.*s"
|
|
|
|
|
msgstr "recount:意外的行:%.*s"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:1557
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "patch fragment without header at line %d: %.*s"
|
|
|
|
|
msgstr "第 %d 行的补丁片段没有头信息:%.*s"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:1577
|
|
|
|
|
#, 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 行)"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:1589
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "git diff header lacks filename information (line %d)"
|
|
|
|
|
msgstr "git diff 的头信息中缺乏文件名信息(第 %d 行)"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:1759
|
|
|
|
|
msgid "new file depends on old contents"
|
|
|
|
|
msgstr "新文件依赖旧内容"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:1761
|
|
|
|
|
msgid "deleted file still has contents"
|
|
|
|
|
msgstr "删除的文件仍有内容"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:1795
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "corrupt patch at line %d"
|
|
|
|
|
msgstr "补丁在第 %d 行损坏"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:1832
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "new file %s depends on old contents"
|
|
|
|
|
msgstr "新文件 %s 依赖旧内容"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:1834
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "deleted file %s still has contents"
|
|
|
|
|
msgstr "删除的文件 %s 仍有内容"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:1837
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "** warning: file %s becomes empty but is not deleted"
|
|
|
|
|
msgstr "** 警告:文件 %s 成为空文件但并未删除"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:1984
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "corrupt binary patch at line %d: %.*s"
|
|
|
|
|
msgstr "二进制补丁在第 %d 行损坏:%.*s"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:2021
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "unrecognized binary patch at line %d"
|
|
|
|
|
msgstr "未能识别的二进制补丁位于第 %d 行"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:2182
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "patch with only garbage at line %d"
|
|
|
|
|
msgstr "补丁文件的第 %d 行只有垃圾数据"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:2274
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "unable to read symlink %s"
|
|
|
|
|
msgstr "无法读取符号链接 %s"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:2278
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "unable to open or read %s"
|
|
|
|
|
msgstr "不能打开或读取 %s"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:2931
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "invalid start of line: '%c'"
|
|
|
|
|
msgstr "无效的行首字符:'%c'"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:3050
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
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 行)"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:3062
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
|
|
|
|
|
msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:3068
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
2016-10-27 15:53:37 +02:00
|
|
|
|
"while searching for:\n"
|
|
|
|
|
"%.*s"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
msgstr ""
|
2016-10-27 15:53:37 +02:00
|
|
|
|
"当查询:\n"
|
|
|
|
|
"%.*s"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:3090
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "missing binary patch data for '%s'"
|
|
|
|
|
msgstr "缺失 '%s' 的二进制补丁数据"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:3098
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
|
|
|
|
|
msgstr "不能反向应用一个没有至 '%s' 的反向数据块的二进制补丁"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:3144
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "cannot apply binary patch to '%s' without full index line"
|
|
|
|
|
msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:3154
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"the patch applies to '%s' (%s), which does not match the current contents."
|
|
|
|
|
msgstr "补丁引用到 '%s' (%s),但是和当前内容不匹配。"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:3162
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "the patch applies to an empty '%s' but it is not empty"
|
|
|
|
|
msgstr "补丁应用到空文件 '%s',但是它并不空"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:3180
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "the necessary postimage %s for '%s' cannot be read"
|
|
|
|
|
msgstr "无法读取 '%2$s' 必须的目标文件 %1$s"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:3193
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "binary patch does not apply to '%s'"
|
|
|
|
|
msgstr "二进制补丁未应用到 '%s'"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:3199
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
|
|
|
|
|
msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:3220
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "patch failed: %s:%ld"
|
|
|
|
|
msgstr "打补丁失败:%s:%ld"
|
2016-02-28 13:35:55 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:3342
|
2013-04-13 04:02:43 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "cannot checkout %s"
|
|
|
|
|
msgstr "不能检出 %s"
|
2013-04-13 04:02:43 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:3390 apply.c:3401 apply.c:3447 setup.c:248
|
2013-04-13 04:02:43 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "failed to read %s"
|
|
|
|
|
msgstr "无法读取 %s"
|
2013-04-13 04:02:43 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:3398
|
2013-04-13 04:02:43 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "reading from '%s' beyond a symbolic link"
|
|
|
|
|
msgstr "读取位于符号链接中的 '%s'"
|
2013-04-13 04:02:43 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:3427 apply.c:3667
|
2013-04-13 04:02:43 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "path %s has been renamed/deleted"
|
|
|
|
|
msgstr "路径 %s 已经被重命名/删除"
|
2013-04-13 04:02:43 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:3510 apply.c:3681
|
2013-04-13 04:02:43 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "%s: does not exist in index"
|
|
|
|
|
msgstr "%s:不存在于索引中"
|
2013-04-13 04:02:43 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:3519 apply.c:3689
|
2013-04-13 04:02:43 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "%s: does not match index"
|
|
|
|
|
msgstr "%s:和索引不匹配"
|
2013-04-13 04:02:43 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:3554
|
|
|
|
|
msgid "repository lacks the necessary blob to fall back on 3-way merge."
|
|
|
|
|
msgstr "仓库缺乏必要的数据对象以进行三方合并。"
|
2013-04-13 04:02:43 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:3557
|
2013-04-13 04:02:43 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "Falling back to three-way merge...\n"
|
|
|
|
|
msgstr "回落到三方合并...\n"
|
2013-04-13 04:02:43 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:3573 apply.c:3577
|
2013-04-13 04:02:43 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "cannot read the current contents of '%s'"
|
|
|
|
|
msgstr "无法读取 '%s' 的当前内容"
|
2016-02-28 13:35:55 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:3589
|
2013-04-13 04:02:43 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "Failed to fall back on three-way merge...\n"
|
|
|
|
|
msgstr "无法回落到三方合并...\n"
|
2013-04-13 04:02:43 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:3603
|
2013-04-13 04:02:43 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "Applied patch to '%s' with conflicts.\n"
|
|
|
|
|
msgstr "应用补丁到 '%s' 存在冲突。\n"
|
2013-04-13 04:02:43 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:3608
|
2013-04-13 04:02:43 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "Applied patch to '%s' cleanly.\n"
|
|
|
|
|
msgstr "成功应用补丁到 '%s'。\n"
|
2013-04-13 04:02:43 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:3634
|
|
|
|
|
msgid "removal patch leaves file contents"
|
|
|
|
|
msgstr "移除补丁仍留下了文件内容"
|
2013-04-13 04:02:43 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:3706
|
2013-04-11 11:55:09 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "%s: wrong type"
|
|
|
|
|
msgstr "%s:错误类型"
|
2013-04-11 11:55:09 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:3708
|
2013-04-11 11:55:09 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "%s has type %o, expected %o"
|
|
|
|
|
msgstr "%s 的类型是 %o,应为 %o"
|
2013-04-11 11:55:09 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:3859 apply.c:3861
|
2013-04-13 04:02:43 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "invalid path '%s'"
|
|
|
|
|
msgstr "无效路径 '%s'"
|
2013-04-13 04:02:43 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:3917
|
2013-04-13 04:02:43 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "%s: already exists in index"
|
|
|
|
|
msgstr "%s:已经存在于索引中"
|
2013-04-13 04:02:43 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:3920
|
2013-04-13 04:02:43 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "%s: already exists in working directory"
|
|
|
|
|
msgstr "%s:已经存在于工作区中"
|
2013-04-13 04:02:43 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:3940
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "new mode (%o) of %s does not match old mode (%o)"
|
|
|
|
|
msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:3945
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
|
|
|
|
|
msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
|
2016-05-29 14:40:35 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:3965
|
2012-05-21 03:35:47 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "affected file '%s' is beyond a symbolic link"
|
|
|
|
|
msgstr "受影响的文件 '%s' 位于符号链接中"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:3969
|
2012-05-30 06:19:47 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "%s: patch does not apply"
|
|
|
|
|
msgstr "%s:补丁未应用"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:3984
|
2012-05-21 03:35:47 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "Checking patch %s..."
|
|
|
|
|
msgstr "检查补丁 %s..."
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:4075
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "sha1 information is lacking or useless for submodule %s"
|
|
|
|
|
msgstr "子模组 %s 的 sha1 信息缺失或无效"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:4082
|
2012-05-21 03:35:47 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "mode change for %s, which is not in current HEAD"
|
|
|
|
|
msgstr "%s 的属性改变,但它不再当前 HEAD 中"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:4085
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "sha1 information is lacking or useless (%s)."
|
|
|
|
|
msgstr "sha1 信息缺失或无效(%s)。"
|
2012-07-04 11:20:34 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:4090 builtin/checkout.c:233 builtin/reset.c:135
|
2012-05-21 03:35:47 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "make_cache_entry failed for path '%s'"
|
|
|
|
|
msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:4094
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "could not add %s to temporary index"
|
|
|
|
|
msgstr "不能在临时索引中添加 %s"
|
2014-11-20 03:53:48 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:4104
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "could not write temporary index to %s"
|
|
|
|
|
msgstr "不能把临时索引写入到 %s"
|
2014-11-20 03:53:48 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:4242
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to remove %s from index"
|
|
|
|
|
msgstr "不能从索引中移除 %s"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:4277
|
2012-05-21 03:35:47 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "corrupt patch for submodule %s"
|
|
|
|
|
msgstr "子模组 %s 损坏的补丁"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:4283
|
2014-11-20 03:53:48 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "unable to stat newly created file '%s'"
|
|
|
|
|
msgstr "不能枚举新建文件 '%s' 的状态"
|
2014-11-20 03:53:48 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:4291
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to create backing store for newly created file %s"
|
|
|
|
|
msgstr "不能为新建文件 %s 创建后端存储"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:4297 apply.c:4441
|
2012-05-30 06:19:47 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "unable to add cache entry for %s"
|
|
|
|
|
msgstr "无法为 %s 添加缓存条目"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:4338
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to write to '%s'"
|
|
|
|
|
msgstr "无法写入 '%s'"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:4342
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "closing file '%s'"
|
|
|
|
|
msgstr "关闭文件 '%s'"
|
2014-10-08 04:55:14 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:4412
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "unable to write file '%s' mode %o"
|
|
|
|
|
msgstr "不能写文件 '%s' 权限 %o"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:4510
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "Applied patch %s cleanly."
|
|
|
|
|
msgstr "成功应用补丁 %s。"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:4518
|
|
|
|
|
msgid "internal error"
|
|
|
|
|
msgstr "内部错误"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:4521
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "Applying patch %%s with %d reject..."
|
|
|
|
|
msgid_plural "Applying patch %%s with %d rejects..."
|
|
|
|
|
msgstr[0] "应用 %%s 个补丁,其中 %d 个被拒绝..."
|
|
|
|
|
msgstr[1] "应用 %%s 个补丁,其中 %d 个被拒绝..."
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:4532
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "truncating .rej filename to %.*s.rej"
|
|
|
|
|
msgstr "截短 .rej 文件名为 %.*s.rej"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:4540 builtin/fetch.c:740 builtin/fetch.c:989
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "cannot open %s"
|
|
|
|
|
msgstr "不能打开 %s"
|
2014-10-08 04:55:14 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:4554
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "Hunk #%d applied cleanly."
|
|
|
|
|
msgstr "第 #%d 个片段成功应用。"
|
2014-10-08 04:55:14 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:4558
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "Rejected hunk #%d."
|
|
|
|
|
msgstr "拒绝第 #%d 个片段。"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:4668
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "Skipped patch '%s'."
|
|
|
|
|
msgstr "略过补丁 '%s'。"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:4676
|
|
|
|
|
msgid "unrecognized input"
|
|
|
|
|
msgstr "未能识别的输入"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:4695
|
|
|
|
|
msgid "unable to read index file"
|
|
|
|
|
msgstr "无法读取索引文件"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:4833
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "can't open patch '%s': %s"
|
|
|
|
|
msgstr "不能打开补丁 '%s':%s"
|
2014-10-08 04:55:14 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:4858
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "squelched %d whitespace error"
|
|
|
|
|
msgid_plural "squelched %d whitespace errors"
|
|
|
|
|
msgstr[0] "抑制下仍有 %d 个空白字符误用"
|
|
|
|
|
msgstr[1] "抑制下仍有 %d 个空白字符误用"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:4864 apply.c:4879
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "%d line adds whitespace errors."
|
|
|
|
|
msgid_plural "%d lines add whitespace errors."
|
|
|
|
|
msgstr[0] "%d 行有空白字符误用。"
|
|
|
|
|
msgstr[1] "%d 行有空白字符误用。"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:4872
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "%d line applied after fixing whitespace errors."
|
|
|
|
|
msgid_plural "%d lines applied after fixing whitespace errors."
|
|
|
|
|
msgstr[0] "修复空白错误后,应用了 %d 行。"
|
|
|
|
|
msgstr[1] "修复空白错误后,应用了 %d 行。"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:4888 builtin/add.c:463 builtin/mv.c:286 builtin/rm.c:431
|
|
|
|
|
msgid "Unable to write new index file"
|
|
|
|
|
msgstr "无法写入新索引文件"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:4919 apply.c:4922 builtin/am.c:2277 builtin/am.c:2280
|
|
|
|
|
#: builtin/clone.c:95 builtin/fetch.c:98 builtin/pull.c:180
|
|
|
|
|
#: builtin/submodule--helper.c:281 builtin/submodule--helper.c:407
|
|
|
|
|
#: builtin/submodule--helper.c:589 builtin/submodule--helper.c:592
|
|
|
|
|
#: builtin/submodule--helper.c:944 builtin/submodule--helper.c:947
|
|
|
|
|
msgid "path"
|
|
|
|
|
msgstr "路径"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:4920
|
|
|
|
|
msgid "don't apply changes matching the given path"
|
|
|
|
|
msgstr "不要应用与给出路径向匹配的变更"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:4923
|
|
|
|
|
msgid "apply changes matching the given path"
|
|
|
|
|
msgstr "应用与给出路径向匹配的变更"
|
2014-10-08 04:55:14 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:4925 builtin/am.c:2286
|
|
|
|
|
msgid "num"
|
|
|
|
|
msgstr "数字"
|
2014-10-08 04:55:14 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:4926
|
|
|
|
|
msgid "remove <num> leading slashes from traditional diff paths"
|
|
|
|
|
msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
|
2014-10-08 04:55:14 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:4929
|
|
|
|
|
msgid "ignore additions made by the patch"
|
|
|
|
|
msgstr "忽略补丁中的添加的文件"
|
2014-10-08 04:55:14 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:4931
|
|
|
|
|
msgid "instead of applying the patch, output diffstat for the input"
|
|
|
|
|
msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
|
2014-10-08 04:55:14 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:4935
|
|
|
|
|
msgid "show number of added and deleted lines in decimal notation"
|
|
|
|
|
msgstr "以十进制数显示添加和删除的行数"
|
2014-10-08 04:55:14 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:4937
|
|
|
|
|
msgid "instead of applying the patch, output a summary for the input"
|
|
|
|
|
msgstr "不应用补丁,而是显示输入的概要"
|
2014-10-08 04:55:14 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:4939
|
|
|
|
|
msgid "instead of applying the patch, see if the patch is applicable"
|
|
|
|
|
msgstr "不应用补丁,而是查看补丁是否可应用"
|
2014-10-08 04:55:14 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:4941
|
|
|
|
|
msgid "make sure the patch is applicable to the current index"
|
|
|
|
|
msgstr "确认补丁可以应用到当前索引"
|
2016-02-28 13:35:55 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:4943
|
|
|
|
|
msgid "apply a patch without touching the working tree"
|
|
|
|
|
msgstr "应用补丁而不修改工作区"
|
2016-05-29 14:40:35 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:4945
|
|
|
|
|
msgid "accept a patch that touches outside the working area"
|
|
|
|
|
msgstr "接受修改工作区之外文件的补丁"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:4947
|
|
|
|
|
msgid "also apply the patch (use with --stat/--summary/--check)"
|
|
|
|
|
msgstr "还应用此补丁(与 --stat/--summary/--check 选项同时使用)"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:4949
|
|
|
|
|
msgid "attempt three-way merge if a patch does not apply"
|
|
|
|
|
msgstr "如果一个补丁不能应用则尝试三方合并"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:4951
|
|
|
|
|
msgid "build a temporary index based on embedded index information"
|
|
|
|
|
msgstr "创建一个临时索引基于嵌入的索引信息"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:4954 builtin/checkout-index.c:169 builtin/ls-files.c:505
|
|
|
|
|
msgid "paths are separated with NUL character"
|
|
|
|
|
msgstr "路径以 NUL 字符分隔"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:4956
|
|
|
|
|
msgid "ensure at least <n> lines of context match"
|
|
|
|
|
msgstr "确保至少匹配 <n> 行上下文"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:4957 builtin/am.c:2265
|
|
|
|
|
msgid "action"
|
|
|
|
|
msgstr "动作"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:4958
|
|
|
|
|
msgid "detect new or modified lines that have whitespace errors"
|
|
|
|
|
msgstr "检查新增和修改的行中间的空白字符滥用"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:4961 apply.c:4964
|
|
|
|
|
msgid "ignore changes in whitespace when finding context"
|
|
|
|
|
msgstr "查找上下文时忽略空白字符的变更"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:4967
|
|
|
|
|
msgid "apply the patch in reverse"
|
|
|
|
|
msgstr "反向应用补丁"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:4969
|
|
|
|
|
msgid "don't expect at least one line of context"
|
|
|
|
|
msgstr "无需至少一行上下文"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:4971
|
|
|
|
|
msgid "leave the rejected hunks in corresponding *.rej files"
|
|
|
|
|
msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:4973
|
|
|
|
|
msgid "allow overlapping hunks"
|
|
|
|
|
msgstr "允许重叠的补丁片段"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:4974 builtin/add.c:267 builtin/check-ignore.c:19
|
|
|
|
|
#: builtin/commit.c:1339 builtin/count-objects.c:94 builtin/fsck.c:593
|
|
|
|
|
#: builtin/log.c:1860 builtin/mv.c:110 builtin/read-tree.c:114
|
|
|
|
|
msgid "be verbose"
|
|
|
|
|
msgstr "冗长输出"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:4976
|
|
|
|
|
msgid "tolerate incorrectly detected missing new-line at the end of file"
|
|
|
|
|
msgstr "允许不正确的文件末尾换行符"
|
2014-01-18 04:04:21 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:4979
|
|
|
|
|
msgid "do not trust the line counts in the hunk headers"
|
|
|
|
|
msgstr "不信任补丁片段的头信息中的行号"
|
2014-03-13 05:41:34 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:4981 builtin/am.c:2274
|
|
|
|
|
msgid "root"
|
|
|
|
|
msgstr "根目录"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: apply.c:4982
|
|
|
|
|
msgid "prepend <root> to all filenames"
|
|
|
|
|
msgstr "为所有文件名前添加 <根目录>"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: archive.c:12
|
|
|
|
|
msgid "git archive [<options>] <tree-ish> [<path>...]"
|
|
|
|
|
msgstr "git archive [<选项>] <树或提交> [<路径>...]"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: archive.c:13
|
|
|
|
|
msgid "git archive --list"
|
|
|
|
|
msgstr "git archive --list"
|
|
|
|
|
|
|
|
|
|
#: archive.c:14
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid ""
|
2016-10-27 15:53:37 +02:00
|
|
|
|
"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgstr ""
|
2016-10-27 15:53:37 +02:00
|
|
|
|
"git archive --remote <仓库> [--exec <命令>] [<选项>] <树或提交> [<路径>...]"
|
2014-08-04 10:23:15 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: archive.c:15
|
|
|
|
|
msgid "git archive --remote <repo> [--exec <cmd>] --list"
|
|
|
|
|
msgstr "git archive --remote <仓库> [--exec <命令>] --list"
|
2014-08-04 10:23:15 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:327
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "pathspec '%s' did not match any files"
|
|
|
|
|
msgstr "路径规格 '%s' 未匹配任何文件"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: archive.c:429
|
|
|
|
|
msgid "fmt"
|
|
|
|
|
msgstr "格式"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: archive.c:429
|
|
|
|
|
msgid "archive format"
|
|
|
|
|
msgstr "归档格式"
|
2015-05-31 02:42:31 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: archive.c:430 builtin/log.c:1429
|
|
|
|
|
msgid "prefix"
|
|
|
|
|
msgstr "前缀"
|
2015-05-31 02:42:31 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: archive.c:431
|
|
|
|
|
msgid "prepend prefix to each pathname in the archive"
|
|
|
|
|
msgstr "为归档中每个路径名加上前缀"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2603
|
|
|
|
|
#: builtin/blame.c:2604 builtin/config.c:59 builtin/fast-export.c:987
|
|
|
|
|
#: builtin/fast-export.c:989 builtin/grep.c:723 builtin/hash-object.c:101
|
|
|
|
|
#: builtin/ls-files.c:539 builtin/ls-files.c:542 builtin/notes.c:401
|
|
|
|
|
#: builtin/notes.c:564 builtin/read-tree.c:109 parse-options.h:153
|
|
|
|
|
msgid "file"
|
|
|
|
|
msgstr "文件"
|
2013-02-14 10:47:45 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: archive.c:433 builtin/archive.c:89
|
|
|
|
|
msgid "write the archive to this file"
|
|
|
|
|
msgstr "归档写入此文件"
|
2013-02-14 10:47:45 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: archive.c:435
|
|
|
|
|
msgid "read .gitattributes in working directory"
|
|
|
|
|
msgstr "读取工作区中的 .gitattributes"
|
2012-02-28 05:24:54 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: archive.c:436
|
|
|
|
|
msgid "report archived files on stderr"
|
|
|
|
|
msgstr "在标准错误上报告归档文件"
|
2012-02-28 05:24:54 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: archive.c:437
|
|
|
|
|
msgid "store only"
|
|
|
|
|
msgstr "只存储"
|
2012-02-28 05:24:54 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: archive.c:438
|
|
|
|
|
msgid "compress faster"
|
|
|
|
|
msgstr "压缩速度更快"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: archive.c:446
|
|
|
|
|
msgid "compress better"
|
|
|
|
|
msgstr "压缩效果更好"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: archive.c:449
|
|
|
|
|
msgid "list supported archive formats"
|
|
|
|
|
msgstr "列出支持的归档格式"
|
2013-02-14 10:47:45 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: archive.c:451 builtin/archive.c:90 builtin/clone.c:85 builtin/clone.c:88
|
|
|
|
|
#: builtin/submodule--helper.c:601 builtin/submodule--helper.c:953
|
|
|
|
|
msgid "repo"
|
|
|
|
|
msgstr "仓库"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: archive.c:452 builtin/archive.c:91
|
|
|
|
|
msgid "retrieve the archive from remote repository <repo>"
|
|
|
|
|
msgstr "从远程仓库(<仓库>)提取归档文件"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: archive.c:453 builtin/archive.c:92 builtin/notes.c:485
|
|
|
|
|
msgid "command"
|
|
|
|
|
msgstr "命令"
|
|
|
|
|
|
|
|
|
|
#: archive.c:454 builtin/archive.c:93
|
|
|
|
|
msgid "path to the remote git-upload-archive command"
|
|
|
|
|
msgstr "远程 git-upload-archive 命令的路径"
|
|
|
|
|
|
|
|
|
|
#: archive.c:461
|
|
|
|
|
msgid "Unexpected option --remote"
|
|
|
|
|
msgstr "未知参数 --remote"
|
|
|
|
|
|
|
|
|
|
#: archive.c:463
|
|
|
|
|
msgid "Option --exec can only be used together with --remote"
|
|
|
|
|
msgstr "选项 --exec 只能和 --remote 同时使用"
|
|
|
|
|
|
|
|
|
|
#: archive.c:465
|
|
|
|
|
msgid "Unexpected option --output"
|
|
|
|
|
msgstr "未知参数 --output"
|
|
|
|
|
|
|
|
|
|
#: archive.c:487
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Unknown archive format '%s'"
|
|
|
|
|
msgstr "未知归档格式 '%s'"
|
|
|
|
|
|
|
|
|
|
#: archive.c:494
|
2012-05-21 03:35:47 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "Argument not supported for format '%s': -%d"
|
|
|
|
|
msgstr "参数不支持此格式 '%s':-%d"
|
|
|
|
|
|
|
|
|
|
#: attr.c:263
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid ""
|
2016-10-27 15:53:37 +02:00
|
|
|
|
"Negative patterns are ignored in git attributes\n"
|
|
|
|
|
"Use '\\!' for literal leading exclamation."
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgstr ""
|
2016-10-27 15:53:37 +02:00
|
|
|
|
"负值模版在 git attributes 中被忽略\n"
|
|
|
|
|
"当字符串确实要以感叹号开始时,使用 '\\!'。"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: bisect.c:441
|
2012-05-21 03:35:47 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "Could not open file '%s'"
|
|
|
|
|
msgstr "不能打开文件 '%s'"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: bisect.c:446
|
2012-05-21 03:35:47 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "Badly quoted content in file '%s': %s"
|
|
|
|
|
msgstr "文件 '%s' 包含错误的引用格式:%s"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: bisect.c:655
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "We cannot bisect more!\n"
|
|
|
|
|
msgstr "我们无法进行更多的二分查找!\n"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: bisect.c:708
|
2013-07-26 08:00:02 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "Not a valid commit name %s"
|
|
|
|
|
msgstr "不是一个有效的提交名 %s"
|
2013-07-26 08:00:02 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: bisect.c:732
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
2016-10-27 15:53:37 +02:00
|
|
|
|
"The merge base %s is bad.\n"
|
|
|
|
|
"This means the bug has been fixed between %s and [%s].\n"
|
2016-05-29 14:40:35 +02:00
|
|
|
|
msgstr ""
|
2016-10-27 15:53:37 +02:00
|
|
|
|
"合并基线 %s 是坏的。\n"
|
|
|
|
|
"这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n"
|
2016-05-29 14:40:35 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: bisect.c:737
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"The merge base %s is new.\n"
|
|
|
|
|
"The property has changed between %s and [%s].\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"合并基线 %s 是新的。\n"
|
|
|
|
|
"介于 %s 和 [%s] 之间的属性已经被修改。\n"
|
2016-05-29 14:40:35 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: bisect.c:742
|
|
|
|
|
#, 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"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: bisect.c:750
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Some %s revs are not ancestor 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"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: bisect.c:763
|
|
|
|
|
#, 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"
|
|
|
|
|
"我们仍旧继续。"
|
2012-08-02 05:50:59 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: bisect.c:798
|
2012-08-02 05:50:59 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "Bisecting: a merge base must be tested\n"
|
|
|
|
|
msgstr "二分查找中:合并基线必须是经过测试的\n"
|
2012-08-02 05:50:59 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: bisect.c:849
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "a %s revision is needed"
|
|
|
|
|
msgstr "需要一个 %s 版本"
|
2012-08-02 05:50:59 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:248
|
2012-08-02 05:50:59 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "could not create file '%s'"
|
|
|
|
|
msgstr "不能创建文件 '%s'"
|
2012-08-02 05:50:59 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: bisect.c:917
|
2012-08-02 05:50:59 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "could not read file '%s'"
|
|
|
|
|
msgstr "不能读取文件 '%s'"
|
2012-08-02 05:50:59 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: bisect.c:947
|
|
|
|
|
msgid "reading bisect refs failed"
|
|
|
|
|
msgstr "读取二分查找引用失败"
|
2012-08-02 05:50:59 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: bisect.c:967
|
2012-08-02 05:50:59 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "%s was both %s and %s\n"
|
|
|
|
|
msgstr "%s 同时为 %s 和 %s\n"
|
2012-08-02 05:50:59 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: bisect.c:975
|
2012-08-02 05:50:59 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"No testable commit found.\n"
|
|
|
|
|
"Maybe you started with bad path parameters?\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"没有发现可测试的提交。\n"
|
|
|
|
|
"可能您在运行时使用了错误的路径参数?\n"
|
2012-08-02 05:50:59 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: bisect.c:994
|
2012-08-02 05:50:59 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "(roughly %d step)"
|
|
|
|
|
msgid_plural "(roughly %d steps)"
|
|
|
|
|
msgstr[0] "(大概 %d 步)"
|
|
|
|
|
msgstr[1] "(大概 %d 步)"
|
2012-08-02 05:50:59 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#. TRANSLATORS: the last %s will be replaced with
|
|
|
|
|
#. "(roughly %d steps)" translation
|
|
|
|
|
#: bisect.c:998
|
2012-08-02 05:50:59 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
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"
|
2012-08-02 05:50:59 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: branch.c:53
|
2012-08-02 05:50:59 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"\n"
|
|
|
|
|
"After fixing the error cause you may try to fix up\n"
|
|
|
|
|
"the remote tracking information by invoking\n"
|
|
|
|
|
"\"git branch --set-upstream-to=%s%s%s\"."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"\n"
|
|
|
|
|
"在修复错误后,您可以尝试修改远程跟踪分支,通过执行命令\n"
|
|
|
|
|
"\"git branch --set-upstream-to=%s%s%s\" 。"
|
2012-08-02 05:50:59 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: branch.c:67
|
2012-08-02 05:50:59 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "Not setting branch %s as its own upstream."
|
|
|
|
|
msgstr "未设置分支 %s 作为它自己的上游。"
|
2012-08-02 05:50:59 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: branch.c:93
|
2012-08-02 05:50:59 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "Branch %s set up to track remote branch %s from %s by rebasing."
|
|
|
|
|
msgstr "分支 %1$s 设置为使用变基来跟踪来自 %3$s 的远程分支 %2$s。"
|
2012-08-02 05:50:59 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: branch.c:94
|
2012-08-02 05:50:59 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "Branch %s set up to track remote branch %s from %s."
|
|
|
|
|
msgstr "分支 %1$s 设置为跟踪来自 %3$s 的远程分支 %2$s。"
|
2012-08-02 05:50:59 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: branch.c:98
|
2012-08-02 05:50:59 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "Branch %s set up to track local branch %s by rebasing."
|
|
|
|
|
msgstr "分支 %s 设置为使用变基来跟踪本地分支 %s。"
|
2012-08-02 05:50:59 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: branch.c:99
|
2012-08-02 05:50:59 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "Branch %s set up to track local branch %s."
|
|
|
|
|
msgstr "分支 %s 设置为跟踪本地分支 %s。"
|
2012-08-02 05:50:59 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: branch.c:104
|
2012-08-02 05:50:59 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "Branch %s set up to track remote ref %s by rebasing."
|
|
|
|
|
msgstr "分支 %s 设置为使用变基来跟踪远程引用 %s。"
|
2012-08-02 05:50:59 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: branch.c:105
|
2012-08-02 05:50:59 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "Branch %s set up to track remote ref %s."
|
|
|
|
|
msgstr "分支 %s 设置为跟踪远程引用 %s。"
|
2012-08-02 05:50:59 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: branch.c:109
|
2012-08-02 05:50:59 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "Branch %s set up to track local ref %s by rebasing."
|
|
|
|
|
msgstr "分支 %s 设置为使用变基来跟踪本地引用 %s。"
|
2012-08-02 05:50:59 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: branch.c:110
|
2012-08-02 05:50:59 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "Branch %s set up to track local ref %s."
|
|
|
|
|
msgstr "分支 %s 设置为跟踪本地引用 %s。"
|
2012-08-02 05:50:59 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: branch.c:119
|
|
|
|
|
msgid "Unable to write upstream branch configuration"
|
|
|
|
|
msgstr "无法写入上游分支配置"
|
2012-08-02 05:50:59 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: branch.c:156
|
2012-08-02 05:50:59 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "Not tracking: ambiguous information for ref %s"
|
|
|
|
|
msgstr "未跟踪:引用 %s 有歧义"
|
2012-08-02 05:50:59 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: branch.c:185
|
2012-08-02 05:50:59 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "'%s' is not a valid branch name."
|
|
|
|
|
msgstr "'%s' 不是一个有效的分支名称。"
|
2012-08-02 05:50:59 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: branch.c:190
|
2012-08-02 05:50:59 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "A branch named '%s' already exists."
|
|
|
|
|
msgstr "一个分支名 '%s' 已经存在。"
|
2012-08-02 05:50:59 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: branch.c:198
|
|
|
|
|
msgid "Cannot force update the current branch."
|
|
|
|
|
msgstr "无法强制更新当前分支。"
|
2012-08-02 05:50:59 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: branch.c:218
|
2012-08-02 05:50:59 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "Cannot setup tracking information; starting point '%s' is not a branch."
|
|
|
|
|
msgstr "无法设置跟踪信息;起始点 '%s' 不是一个分支。"
|
2012-08-02 05:50:59 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: branch.c:220
|
2012-08-02 05:50:59 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "the requested upstream branch '%s' does not exist"
|
|
|
|
|
msgstr "请求的上游分支 '%s' 不存在"
|
2012-08-02 05:50:59 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: branch.c:222
|
|
|
|
|
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\" 推送分支并配置和上游的关联。"
|
2012-08-02 05:50:59 +02:00
|
|
|
|
|
2016-11-22 15:24:59 +01:00
|
|
|
|
#: branch.c:265
|
2012-08-02 05:50:59 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "Not a valid object name: '%s'."
|
|
|
|
|
msgstr "不是一个有效的对象名:'%s'。"
|
2012-08-02 05:50:59 +02:00
|
|
|
|
|
2016-11-22 15:24:59 +01:00
|
|
|
|
#: branch.c:285
|
2012-08-02 05:50:59 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "Ambiguous object name: '%s'."
|
|
|
|
|
msgstr "歧义的对象名:'%s'。"
|
2012-08-02 05:50:59 +02:00
|
|
|
|
|
2016-11-22 15:24:59 +01:00
|
|
|
|
#: branch.c:290
|
2012-08-02 05:50:59 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "Not a valid branch point: '%s'."
|
|
|
|
|
msgstr "无效的分支点:'%s'。"
|
2012-08-02 05:50:59 +02:00
|
|
|
|
|
2016-11-22 15:24:59 +01:00
|
|
|
|
#: branch.c:344
|
2012-08-02 05:50:59 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "'%s' is already checked out at '%s'"
|
|
|
|
|
msgstr "'%s' 已经检出到 '%s'"
|
2012-08-02 05:50:59 +02:00
|
|
|
|
|
2016-11-22 15:24:59 +01:00
|
|
|
|
#: branch.c:363
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "HEAD of working tree %s is not updated"
|
|
|
|
|
msgstr "工作区 %s 的 HEAD 指向没有被更新"
|
2012-08-02 05:50:59 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: bundle.c:34
|
2012-08-02 05:50:59 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "'%s' does not look like a v2 bundle file"
|
|
|
|
|
msgstr "'%s' 不像是一个 v2 版本的包文件"
|
2012-08-02 05:50:59 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: bundle.c:61
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unrecognized header: %s%s (%d)"
|
|
|
|
|
msgstr "未能识别的包头:%s%s (%d)"
|
2012-08-02 05:50:59 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: bundle.c:87 sequencer.c:963 builtin/commit.c:777
|
2012-08-02 05:50:59 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "could not open '%s'"
|
|
|
|
|
msgstr "不能打开 '%s'"
|
2012-08-02 05:50:59 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: bundle.c:139
|
|
|
|
|
msgid "Repository lacks these prerequisite commits:"
|
|
|
|
|
msgstr "仓库中缺少这些必备的提交:"
|
2012-08-02 05:50:59 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: bundle.c:163 ref-filter.c:1462 sequencer.c:830 sequencer.c:1374
|
|
|
|
|
#: builtin/blame.c:2814 builtin/commit.c:1061 builtin/log.c:348
|
|
|
|
|
#: builtin/log.c:890 builtin/log.c:1340 builtin/log.c:1666 builtin/log.c:1909
|
|
|
|
|
#: builtin/merge.c:356 builtin/shortlog.c:170
|
|
|
|
|
msgid "revision walk setup failed"
|
|
|
|
|
msgstr "版本遍历设置失败"
|
2013-07-26 08:00:02 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: bundle.c:185
|
2013-07-26 08:00:02 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "The bundle contains this ref:"
|
|
|
|
|
msgid_plural "The bundle contains these %d refs:"
|
|
|
|
|
msgstr[0] "这个包中含有这个引用:"
|
|
|
|
|
msgstr[1] "这个包中含有 %d 个引用:"
|
2013-07-26 08:00:02 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: bundle.c:192
|
|
|
|
|
msgid "The bundle records a complete history."
|
|
|
|
|
msgstr "这个包记录一个完整历史。"
|
2013-07-26 08:00:02 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: bundle.c:194
|
2013-07-26 08:00:02 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "The bundle requires this ref:"
|
|
|
|
|
msgid_plural "The bundle requires these %d refs:"
|
|
|
|
|
msgstr[0] "这个包需要这个引用:"
|
|
|
|
|
msgstr[1] "这个包需要 %d 个引用:"
|
2013-07-26 08:00:02 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: bundle.c:253
|
|
|
|
|
msgid "Could not spawn pack-objects"
|
|
|
|
|
msgstr "不能生成 pack-objects 进程"
|
2013-04-11 11:55:09 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: bundle.c:264
|
|
|
|
|
msgid "pack-objects died"
|
|
|
|
|
msgstr "pack-objects 终止"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: bundle.c:304
|
|
|
|
|
msgid "rev-list died"
|
|
|
|
|
msgstr "rev-list 终止"
|
|
|
|
|
|
|
|
|
|
#: bundle.c:353
|
2012-05-30 06:19:47 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "ref '%s' is excluded by the rev-list options"
|
|
|
|
|
msgstr "引用 '%s' 被 rev-list 选项排除"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: bundle.c:443 builtin/log.c:165 builtin/log.c:1572 builtin/shortlog.c:273
|
2012-05-30 06:19:47 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "unrecognized argument: %s"
|
|
|
|
|
msgstr "未能识别的参数:%s"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: bundle.c:451
|
|
|
|
|
msgid "Refusing to create empty bundle."
|
|
|
|
|
msgstr "不能创建空包。"
|
|
|
|
|
|
|
|
|
|
#: bundle.c:463
|
2012-05-30 06:19:47 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "cannot create '%s'"
|
|
|
|
|
msgstr "不能创建 '%s'"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: bundle.c:491
|
|
|
|
|
msgid "index-pack died"
|
|
|
|
|
msgstr "index-pack 终止"
|
2013-02-19 07:52:24 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: color.c:290
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "invalid color value: %.*s"
|
|
|
|
|
msgstr "无效的颜色值:%.*s"
|
2015-11-16 00:02:11 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: commit.c:40 builtin/am.c:421 builtin/am.c:457 builtin/am.c:1493
|
|
|
|
|
#: builtin/am.c:2127
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "could not parse %s"
|
|
|
|
|
msgstr "不能解析 %s"
|
2015-11-16 00:02:11 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: commit.c:42
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "%s %s is not a commit!"
|
|
|
|
|
msgstr "%s %s 不是一个提交!"
|
2013-09-17 17:37:05 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: commit.c:1514
|
2013-09-17 17:37:05 +02:00
|
|
|
|
msgid ""
|
2016-10-27 15:53:37 +02:00
|
|
|
|
"Warning: commit message did not conform to UTF-8.\n"
|
|
|
|
|
"You may want to amend it after fixing the message, or set the config\n"
|
|
|
|
|
"variable i18n.commitencoding to the encoding your project uses.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"警告:提交说明不符合 UTF-8 字符集。\n"
|
|
|
|
|
"您可以通过修补提交来改正提交说明,或者将配置变量 i18n.commitencoding\n"
|
|
|
|
|
"设置为您项目所用的字符集。\n"
|
2013-09-17 17:37:05 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: compat/obstack.c:406 compat/obstack.c:408
|
|
|
|
|
msgid "memory exhausted"
|
|
|
|
|
msgstr "内存耗尽"
|
2013-09-17 17:37:05 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: config.c:516
|
2013-09-17 17:37:05 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "bad config line %d in blob %s"
|
|
|
|
|
msgstr "数据对象 %2$s 中错误的配置行 %1$d"
|
2013-09-17 17:37:05 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: config.c:520
|
2013-02-14 10:47:45 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "bad config line %d in file %s"
|
|
|
|
|
msgstr "文件 %2$s 中错误的配置行 %1$d"
|
2013-02-14 10:47:45 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: config.c:524
|
2013-02-14 10:47:45 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "bad config line %d in standard input"
|
|
|
|
|
msgstr "标准输入中错误的配置行 %d"
|
2013-02-14 10:47:45 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: config.c:528
|
2013-09-17 17:37:05 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "bad config line %d in submodule-blob %s"
|
|
|
|
|
msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d"
|
2013-09-17 17:37:05 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: config.c:532
|
2013-09-17 17:37:05 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "bad config line %d in command line %s"
|
|
|
|
|
msgstr "命令行 %2$s 中错误的配置行 %1$d"
|
2013-09-17 17:37:05 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: config.c:536
|
2013-09-17 17:37:05 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "bad config line %d in %s"
|
|
|
|
|
msgstr "在 %2$s 中错误的配置行 %1$d"
|
2014-10-08 04:55:14 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: config.c:655
|
|
|
|
|
msgid "out of range"
|
|
|
|
|
msgstr "超出范围"
|
2014-03-13 05:41:34 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: config.c:655
|
|
|
|
|
msgid "invalid unit"
|
|
|
|
|
msgstr "无效的单位"
|
2014-03-13 05:41:34 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: config.c:661
|
2014-03-13 05:41:34 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "bad numeric config value '%s' for '%s': %s"
|
|
|
|
|
msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误:%3$s"
|
2014-03-13 05:41:34 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: config.c:666
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
|
|
|
|
|
msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: config.c:669
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
|
|
|
|
|
msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: config.c:672
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
|
|
|
|
|
msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s':%3$s"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: config.c:675
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
|
|
|
|
|
msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: config.c:678
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
|
|
|
|
|
msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
|
2016-02-28 13:35:55 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: config.c:681
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "bad numeric config value '%s' for '%s' in %s: %s"
|
|
|
|
|
msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s':%4$s"
|
2016-02-28 13:35:55 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: config.c:768
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "failed to expand user dir in: '%s'"
|
|
|
|
|
msgstr "无法扩展 '%s' 中的用户目录"
|
2015-11-16 00:02:11 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: config.c:852 config.c:863
|
2016-03-12 15:09:24 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "bad zlib compression level %d"
|
|
|
|
|
msgstr "错误的 zlib 压缩级别 %d"
|
2016-03-12 15:09:24 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: config.c:978
|
2016-03-12 15:09:24 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "invalid mode for object creation: %s"
|
|
|
|
|
msgstr "无效的对象创建模式:%s"
|
2016-03-12 15:09:24 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: config.c:1312
|
|
|
|
|
msgid "unable to parse command-line config"
|
|
|
|
|
msgstr "无法解析命令行中的配置"
|
2015-11-16 00:02:11 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: config.c:1362
|
|
|
|
|
msgid "unknown error occurred while reading the configuration files"
|
|
|
|
|
msgstr "在读取配置文件时遇到未知错误"
|
2015-11-16 00:02:11 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: config.c:1716
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "unable to parse '%s' from command-line config"
|
|
|
|
|
msgstr "无法解析命令行配置中的 '%s'"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: config.c:1718
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "bad config variable '%s' in file '%s' at line %d"
|
|
|
|
|
msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
|
2015-11-16 00:02:11 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: config.c:1777
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "%s has multiple values"
|
|
|
|
|
msgstr "%s 有多个取值"
|
2016-02-28 13:35:55 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: config.c:2311
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "could not set '%s' to '%s'"
|
|
|
|
|
msgstr "不能设置 '%s' 为 '%s'"
|
2015-11-16 00:02:11 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: config.c:2313
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "could not unset '%s'"
|
|
|
|
|
msgstr "不能取消设置 '%s'"
|
2016-02-28 13:35:55 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: connect.c:49
|
|
|
|
|
msgid "The remote end hung up upon initial contact"
|
|
|
|
|
msgstr "远端在初始连接时即挂断"
|
2015-11-16 00:02:11 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: connect.c:51
|
|
|
|
|
msgid ""
|
|
|
|
|
"Could not read from remote repository.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Please make sure you have the correct access rights\n"
|
|
|
|
|
"and the repository exists."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"无法读取远程仓库。\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"请确认您有正确的访问权限并且仓库存在。"
|
|
|
|
|
|
|
|
|
|
#: connected.c:63 builtin/fsck.c:173 builtin/prune.c:140
|
|
|
|
|
msgid "Checking connectivity"
|
|
|
|
|
msgstr "检查连接中"
|
|
|
|
|
|
|
|
|
|
#: connected.c:75
|
|
|
|
|
msgid "Could not run 'git rev-list'"
|
|
|
|
|
msgstr "不能执行 'git rev-list'"
|
|
|
|
|
|
|
|
|
|
#: connected.c:95
|
|
|
|
|
msgid "failed write to rev-list"
|
|
|
|
|
msgstr "无法写入 rev-list"
|
|
|
|
|
|
|
|
|
|
#: connected.c:102
|
|
|
|
|
msgid "failed to close rev-list's stdin"
|
|
|
|
|
msgstr "无法关闭 rev-list 的标准输入"
|
|
|
|
|
|
|
|
|
|
#: convert.c:201
|
2016-03-12 15:09:24 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"CRLF will be replaced by LF in %s.\n"
|
|
|
|
|
"The file will have its original line endings in your working directory."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"文件 %s 中的 CRLF 将被 LF 替换。\n"
|
|
|
|
|
"在工作区中该文件仍保持原有的换行符。"
|
2016-03-12 15:09:24 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: convert.c:205
|
2016-03-12 15:09:24 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "CRLF would be replaced by LF in %s."
|
|
|
|
|
msgstr "文件 %s 中的 CRLF 将被 LF 替换。"
|
2016-03-12 15:09:24 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: convert.c:211
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"LF will be replaced by CRLF in %s.\n"
|
|
|
|
|
"The file will have its original line endings in your working directory."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"文件 %s 中的 LF 将被 CRLF 替换。\n"
|
|
|
|
|
"在工作区中该文件仍保持原有的换行符。"
|
2016-02-28 13:35:55 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: convert.c:215
|
2016-03-12 15:09:24 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "LF would be replaced by CRLF in %s"
|
|
|
|
|
msgstr "文件 %s 中的 LF 将被 CRLF 替换"
|
2016-03-12 15:09:24 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: date.c:97
|
|
|
|
|
msgid "in the future"
|
|
|
|
|
msgstr "在将来"
|
2016-03-12 15:09:24 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: date.c:103
|
2016-03-12 15:09:24 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "%lu second ago"
|
|
|
|
|
msgid_plural "%lu seconds ago"
|
|
|
|
|
msgstr[0] "%lu 秒钟前"
|
|
|
|
|
msgstr[1] "%lu 秒钟前"
|
2016-03-12 15:09:24 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: date.c:110
|
2016-03-12 15:09:24 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "%lu minute ago"
|
|
|
|
|
msgid_plural "%lu minutes ago"
|
|
|
|
|
msgstr[0] "%lu 分钟前"
|
|
|
|
|
msgstr[1] "%lu 分钟前"
|
2016-03-12 15:09:24 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: date.c:117
|
2016-03-12 15:09:24 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "%lu hour ago"
|
|
|
|
|
msgid_plural "%lu hours ago"
|
|
|
|
|
msgstr[0] "%lu 小时前"
|
|
|
|
|
msgstr[1] "%lu 小时前"
|
2016-03-12 15:09:24 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: date.c:124
|
2016-03-12 15:09:24 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "%lu day ago"
|
|
|
|
|
msgid_plural "%lu days ago"
|
|
|
|
|
msgstr[0] "%lu 天前"
|
|
|
|
|
msgstr[1] "%lu 天前"
|
2016-03-12 15:09:24 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: date.c:130
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "%lu week ago"
|
|
|
|
|
msgid_plural "%lu weeks ago"
|
|
|
|
|
msgstr[0] "%lu 周前"
|
|
|
|
|
msgstr[1] "%lu 周前"
|
2015-11-16 00:02:11 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: date.c:137
|
2016-03-12 15:09:24 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "%lu month ago"
|
|
|
|
|
msgid_plural "%lu months ago"
|
|
|
|
|
msgstr[0] "%lu 个月前"
|
|
|
|
|
msgstr[1] "%lu 个月前"
|
2016-03-12 15:09:24 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: date.c:148
|
2016-03-12 15:09:24 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "%lu year"
|
|
|
|
|
msgid_plural "%lu years"
|
|
|
|
|
msgstr[0] "%lu 年"
|
|
|
|
|
msgstr[1] "%lu 年"
|
2016-03-12 15:09:24 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#. TRANSLATORS: "%s" is "<n> years"
|
|
|
|
|
#: date.c:151
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "%s, %lu month ago"
|
|
|
|
|
msgid_plural "%s, %lu months ago"
|
|
|
|
|
msgstr[0] "%s %lu 个月前"
|
|
|
|
|
msgstr[1] "%s %lu 个月前"
|
2015-11-16 00:02:11 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: date.c:156 date.c:161
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "%lu year ago"
|
|
|
|
|
msgid_plural "%lu years ago"
|
|
|
|
|
msgstr[0] "%lu 年前"
|
|
|
|
|
msgstr[1] "%lu 年前"
|
2015-11-16 00:02:11 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: diffcore-order.c:24
|
2014-01-18 04:04:21 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "failed to read orderfile '%s'"
|
|
|
|
|
msgstr "无法读取排序文件 '%s'"
|
2014-01-18 04:04:21 +01:00
|
|
|
|
|
2016-11-22 15:24:59 +01:00
|
|
|
|
#: diffcore-rename.c:536
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "Performing inexact rename detection"
|
|
|
|
|
msgstr "正在进行非精确的重命名检测"
|
2014-01-18 04:04:21 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: diff.c:62
|
2014-01-18 04:04:21 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "option '%s' requires a value"
|
|
|
|
|
msgstr "选项 '%s' 需要一个值"
|
2014-01-18 04:04:21 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
# 译者:注意保持前导空格
|
|
|
|
|
#: diff.c:124
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
|
|
|
|
|
msgstr " 无法解析 dirstat 截止(cut-off)百分比 '%s'\n"
|
2014-01-18 04:04:21 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
# 译者:注意保持前导空格
|
|
|
|
|
#: diff.c:129
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid " Unknown dirstat parameter '%s'\n"
|
|
|
|
|
msgstr " 未知的 dirstat 参数 '%s'\n"
|
2015-05-31 02:42:31 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: diff.c:283
|
2015-05-31 02:42:31 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
|
|
|
|
|
msgstr "配置变量 'diff.submodule' 未知的取值:'%s'"
|
2015-05-31 02:42:31 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: diff.c:346
|
2015-05-31 02:42:31 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"Found errors in 'diff.dirstat' config variable:\n"
|
|
|
|
|
"%s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"发现配置变量 'diff.dirstat' 中的错误:\n"
|
|
|
|
|
"%s"
|
2015-05-31 02:42:31 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: diff.c:3087
|
2015-05-31 02:42:31 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "external diff died, stopping at %s"
|
|
|
|
|
msgstr "外部 diff 退出,停止在 %s"
|
2015-05-31 02:42:31 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: diff.c:3412
|
|
|
|
|
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
|
|
|
|
|
msgstr "--name-only、--name-status、--check 和 -s 是互斥的"
|
|
|
|
|
|
|
|
|
|
#: diff.c:3502
|
|
|
|
|
msgid "--follow requires exactly one pathspec"
|
|
|
|
|
msgstr "--follow 明确要求只跟一个路径规格"
|
|
|
|
|
|
|
|
|
|
#: diff.c:3665
|
2015-05-31 02:42:31 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"Failed to parse --dirstat/-X option parameter:\n"
|
|
|
|
|
"%s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"无法解析 --dirstat/-X 选项的参数:\n"
|
|
|
|
|
"%s"
|
2015-05-31 02:42:31 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: diff.c:3679
|
2015-05-31 02:42:31 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "Failed to parse --submodule option parameter: '%s'"
|
|
|
|
|
msgstr "无法解析 --submodule 选项的参数:'%s'"
|
2015-05-31 02:42:31 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: diff.c:4700
|
|
|
|
|
msgid "inexact rename detection was skipped due to too many files."
|
|
|
|
|
msgstr "因为文件太多,略过不严格的重命名检查。"
|
|
|
|
|
|
|
|
|
|
#: diff.c:4703
|
|
|
|
|
msgid "only found copies from modified paths due to too many files."
|
|
|
|
|
msgstr "因为文件太多,只在修改的路径中查找拷贝。"
|
|
|
|
|
|
|
|
|
|
#: diff.c:4706
|
2015-05-31 02:42:31 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"you may want to set your %s variable to at least %d and retry the command."
|
|
|
|
|
msgstr "您可能想要将您的 %s 变量至少设置为 %d 并重复此命令。"
|
2015-05-31 02:42:31 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: dir.c:1866
|
|
|
|
|
msgid "failed to get kernel name and information"
|
|
|
|
|
msgstr "无法获得内核名称和信息"
|
2015-05-31 02:42:31 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: dir.c:1985
|
|
|
|
|
msgid "Untracked cache is disabled on this system or location."
|
|
|
|
|
msgstr "缓存未跟踪文件在本系统或位置中被禁用。"
|
2015-05-31 02:42:31 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: fetch-pack.c:213
|
|
|
|
|
msgid "git fetch-pack: expected shallow list"
|
|
|
|
|
msgstr "git fetch-pack:应为 shallow 列表"
|
|
|
|
|
|
|
|
|
|
#: fetch-pack.c:225
|
|
|
|
|
msgid "git fetch-pack: expected ACK/NAK, got EOF"
|
|
|
|
|
msgstr "git fetch-pack:应为 ACK/NAK,却得到 EOF"
|
|
|
|
|
|
|
|
|
|
#: fetch-pack.c:243
|
2013-09-17 17:37:05 +02:00
|
|
|
|
#, c-format
|
2016-11-22 15:24:59 +01:00
|
|
|
|
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgstr "git fetch-pack:应为 ACK/NAK,却得到 '%s'"
|
2013-09-17 17:37:05 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: fetch-pack.c:295
|
|
|
|
|
msgid "--stateless-rpc requires multi_ack_detailed"
|
|
|
|
|
msgstr "--stateless-rpc 需要 multi_ack_detailed"
|
2013-09-17 17:37:05 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: fetch-pack.c:381
|
2013-09-17 17:37:05 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "invalid shallow line: %s"
|
|
|
|
|
msgstr "无效的 shallow 信息:%s"
|
2013-09-17 17:37:05 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: fetch-pack.c:387
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "invalid unshallow line: %s"
|
|
|
|
|
msgstr "无效的 unshallow 信息:%s"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: fetch-pack.c:389
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "object not found: %s"
|
|
|
|
|
msgstr "对象未找到:%s"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: fetch-pack.c:392
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "error in object: %s"
|
|
|
|
|
msgstr "对象中出错:%s"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: fetch-pack.c:394
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "no shallow found: %s"
|
|
|
|
|
msgstr "未发现 shallow:%s"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: fetch-pack.c:397
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "expected shallow/unshallow, got %s"
|
|
|
|
|
msgstr "应为 shallow/unshallow,却得到 %s"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: fetch-pack.c:436
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "got %s %d %s"
|
|
|
|
|
msgstr "得到 %s %d %s"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: fetch-pack.c:450
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "invalid commit %s"
|
|
|
|
|
msgstr "无效提交 %s"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: fetch-pack.c:483
|
|
|
|
|
msgid "giving up"
|
|
|
|
|
msgstr "放弃"
|
2015-02-16 14:34:19 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: fetch-pack.c:493 progress.c:235
|
|
|
|
|
msgid "done"
|
|
|
|
|
msgstr "完成"
|
2013-07-26 08:00:02 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: fetch-pack.c:505
|
2013-07-26 08:00:02 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "got %s (%d) %s"
|
|
|
|
|
msgstr "得到 %s (%d) %s"
|
2013-07-26 08:00:02 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: fetch-pack.c:551
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Marking %s as complete"
|
|
|
|
|
msgstr "标记 %s 为完成"
|
2014-10-08 04:55:14 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: fetch-pack.c:697
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "already have %s (%s)"
|
|
|
|
|
msgstr "已经有 %s (%s)"
|
2014-10-08 04:55:14 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: fetch-pack.c:735
|
|
|
|
|
msgid "fetch-pack: unable to fork off sideband demultiplexer"
|
|
|
|
|
msgstr "fetch-pack:无法派生 sideband 多路输出"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: fetch-pack.c:743
|
|
|
|
|
msgid "protocol error: bad pack header"
|
|
|
|
|
msgstr "协议错误:坏的包头"
|
2015-02-16 14:34:19 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: fetch-pack.c:799
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "fetch-pack: unable to fork off %s"
|
|
|
|
|
msgstr "fetch-pack:无法派生进程 %s"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: fetch-pack.c:815
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "%s failed"
|
|
|
|
|
msgstr "%s 失败"
|
2012-03-08 05:06:53 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: fetch-pack.c:817
|
|
|
|
|
msgid "error in sideband demultiplexer"
|
|
|
|
|
msgstr "sideband 多路输出出错"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: fetch-pack.c:844
|
|
|
|
|
msgid "Server does not support shallow clients"
|
|
|
|
|
msgstr "服务器不支持 shalllow 客户端"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: fetch-pack.c:848
|
|
|
|
|
msgid "Server supports multi_ack_detailed"
|
|
|
|
|
msgstr "服务器支持 multi_ack_detailed"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: fetch-pack.c:851
|
|
|
|
|
msgid "Server supports no-done"
|
|
|
|
|
msgstr "服务器支持 no-done"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: fetch-pack.c:857
|
|
|
|
|
msgid "Server supports multi_ack"
|
|
|
|
|
msgstr "服务器支持 multi_ack"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: fetch-pack.c:861
|
|
|
|
|
msgid "Server supports side-band-64k"
|
|
|
|
|
msgstr "服务器支持 side-band-64k"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: fetch-pack.c:865
|
|
|
|
|
msgid "Server supports side-band"
|
|
|
|
|
msgstr "服务器支持 side-band"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: fetch-pack.c:869
|
|
|
|
|
msgid "Server supports allow-tip-sha1-in-want"
|
|
|
|
|
msgstr "服务器支持 allow-tip-sha1-in-want"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: fetch-pack.c:873
|
|
|
|
|
msgid "Server supports allow-reachable-sha1-in-want"
|
|
|
|
|
msgstr "服务器支持 allow-reachable-sha1-in-want"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: fetch-pack.c:883
|
|
|
|
|
msgid "Server supports ofs-delta"
|
|
|
|
|
msgstr "服务器支持 ofs-delta"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: fetch-pack.c:890
|
2012-05-30 06:19:47 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "Server version is %.*s"
|
|
|
|
|
msgstr "服务器版本 %.*s"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: fetch-pack.c:896
|
|
|
|
|
msgid "Server does not support --shallow-since"
|
|
|
|
|
msgstr "服务器不支持 --shallow-since"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: fetch-pack.c:900
|
|
|
|
|
msgid "Server does not support --shallow-exclude"
|
|
|
|
|
msgstr "服务器不支持 --shallow-exclude"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: fetch-pack.c:902
|
|
|
|
|
msgid "Server does not support --deepen"
|
|
|
|
|
msgstr "服务器不支持 --deepen"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: fetch-pack.c:913
|
|
|
|
|
msgid "no common commits"
|
|
|
|
|
msgstr "没有共同的提交"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: fetch-pack.c:925
|
|
|
|
|
msgid "git fetch-pack: fetch failed."
|
|
|
|
|
msgstr "git fetch-pack:获取失败。"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: fetch-pack.c:1087
|
|
|
|
|
msgid "no matching remote head"
|
|
|
|
|
msgstr "没有匹配的远程分支"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: gpg-interface.c:185
|
|
|
|
|
msgid "gpg failed to sign the data"
|
|
|
|
|
msgstr "gpg 无法为数据签名"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: gpg-interface.c:215
|
|
|
|
|
msgid "could not create temporary file"
|
|
|
|
|
msgstr "不能创建临时文件"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: gpg-interface.c:217
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "failed writing detached signature to '%s'"
|
|
|
|
|
msgstr "无法将分离式签名写入 '%s'"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: grep.c:1782
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "'%s': unable to read %s"
|
|
|
|
|
msgstr "'%s':无法读取 %s"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: grep.c:1799 builtin/clone.c:381 builtin/diff.c:84 builtin/rm.c:155
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "failed to stat '%s'"
|
|
|
|
|
msgstr "无法枚举 '%s' 状态"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: grep.c:1810
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "'%s': short read"
|
|
|
|
|
msgstr "'%s':读取不完整"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: help.c:203
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "available git commands in '%s'"
|
|
|
|
|
msgstr "在 '%s' 下可用的 git 命令"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: help.c:210
|
|
|
|
|
msgid "git commands available from elsewhere on your $PATH"
|
|
|
|
|
msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: help.c:241
|
|
|
|
|
msgid "These are common Git commands used in various situations:"
|
|
|
|
|
msgstr "这些是各种场合常见的 Git 命令:"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: help.c:306
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"'%s' appears to be a git command, but we were not\n"
|
|
|
|
|
"able to execute it. Maybe git-%s is broken?"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"'%s' 像是一个 git 命令,但却无法运行。\n"
|
|
|
|
|
"可能是 git-%s 受损?"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: help.c:361
|
|
|
|
|
msgid "Uh oh. Your system reports no Git commands at all."
|
|
|
|
|
msgstr "唉呀,您的系统中未发现 Git 命令。"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: help.c:383
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"WARNING: You called a Git command named '%s', which does not exist.\n"
|
|
|
|
|
"Continuing under the assumption that you meant '%s'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"警告:您运行一个不存在的 Git 命令 '%s'。继续执行假定您要运行的\n"
|
|
|
|
|
"是 '%s'"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: help.c:388
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "in %0.1f seconds automatically..."
|
|
|
|
|
msgstr "在 %0.1f 秒钟后自动运行..."
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: help.c:395
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "git: '%s' is not a git command. See 'git --help'."
|
|
|
|
|
msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: help.c:399 help.c:465
|
|
|
|
|
msgid ""
|
|
|
|
|
"\n"
|
|
|
|
|
"Did you mean this?"
|
|
|
|
|
msgid_plural ""
|
|
|
|
|
"\n"
|
|
|
|
|
"Did you mean one of these?"
|
|
|
|
|
msgstr[0] ""
|
|
|
|
|
"\n"
|
|
|
|
|
"您指的是这个么?"
|
|
|
|
|
msgstr[1] ""
|
|
|
|
|
"\n"
|
|
|
|
|
"您指的是这其中的某一个么?"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: help.c:461
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "%s: %s - %s"
|
|
|
|
|
msgstr "%s:%s - %s"
|
|
|
|
|
|
|
|
|
|
#: ident.c:334
|
|
|
|
|
msgid ""
|
|
|
|
|
"\n"
|
|
|
|
|
"*** Please tell me who you are.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Run\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git config --global user.email \"you@example.com\"\n"
|
|
|
|
|
" git config --global user.name \"Your Name\"\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"to set your account's default identity.\n"
|
|
|
|
|
"Omit --global to set the identity only in this repository.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"\n"
|
|
|
|
|
"*** 请告诉我你是谁。\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"运行\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git config --global user.email \"you@example.com\"\n"
|
|
|
|
|
" git config --global user.name \"Your Name\"\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"来设置您账号的缺省身份标识。\n"
|
|
|
|
|
"如果仅在本仓库设置身份标识,则省略 --global 参数。\n"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: lockfile.c:152
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"Unable to create '%s.lock': %s.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Another git process seems to be running in this repository, e.g.\n"
|
|
|
|
|
"an editor opened by 'git commit'. Please make sure all processes\n"
|
|
|
|
|
"are terminated then try again. If it still fails, a git process\n"
|
|
|
|
|
"may have crashed in this repository earlier:\n"
|
|
|
|
|
"remove the file manually to continue."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"无法创建 '%s.lock':%s。\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"似乎另外一个 git 进程在这个仓库中运行,例如:'git commit' 命令打\n"
|
|
|
|
|
"开了一个编辑器。请确认所有进程都已经关闭然后重试。如果仍然报错,\n"
|
|
|
|
|
"可能之前有一个 git 进程在这个仓库中异常退出:\n"
|
|
|
|
|
"手动删除这个文件再继续。"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: lockfile.c:160
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Unable to create '%s.lock': %s"
|
|
|
|
|
msgstr "不能创建 '%s.lock':%s"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: merge.c:41
|
|
|
|
|
msgid "failed to read the cache"
|
|
|
|
|
msgstr "无法读取缓存"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: merge.c:96 builtin/am.c:2000 builtin/am.c:2035 builtin/checkout.c:374
|
|
|
|
|
#: builtin/checkout.c:588 builtin/clone.c:731
|
|
|
|
|
msgid "unable to write new index file"
|
|
|
|
|
msgstr "无法写新的索引文件"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: merge-recursive.c:209
|
|
|
|
|
msgid "(bad commit)\n"
|
|
|
|
|
msgstr "(坏提交)\n"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: merge-recursive.c:231
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "addinfo_cache failed for path '%s'"
|
|
|
|
|
msgstr "为路径 '%s' addinfo_cache 失败"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: merge-recursive.c:301
|
|
|
|
|
msgid "error building trees"
|
|
|
|
|
msgstr "无法创建树"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: merge-recursive.c:720
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "failed to create path '%s'%s"
|
|
|
|
|
msgstr "无法创建路径 '%s'%s"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: merge-recursive.c:731
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "Removing %s to make room for subdirectory\n"
|
|
|
|
|
msgstr "删除 %s 以便为子目录留出空间\n"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: merge-recursive.c:745 merge-recursive.c:764
|
|
|
|
|
msgid ": perhaps a D/F conflict?"
|
|
|
|
|
msgstr ":可能是一个目录/文件冲突?"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: merge-recursive.c:754
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "refusing to lose untracked file at '%s'"
|
|
|
|
|
msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: merge-recursive.c:796 builtin/cat-file.c:34
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "cannot read object %s '%s'"
|
|
|
|
|
msgstr "不能读取对象 %s '%s'"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: merge-recursive.c:798
|
2013-04-13 04:02:43 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "blob expected for %s '%s'"
|
|
|
|
|
msgstr "%s '%s' 应为数据对象"
|
2013-04-13 04:02:43 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: merge-recursive.c:822
|
2013-04-13 04:02:43 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "failed to open '%s': %s"
|
|
|
|
|
msgstr "无法打开 '%s':%s"
|
2013-04-13 04:02:43 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: merge-recursive.c:833
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to symlink '%s': %s"
|
|
|
|
|
msgstr "无法创建符号链接 '%s':%s"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: merge-recursive.c:838
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "do not know what to do with %06o %s '%s'"
|
|
|
|
|
msgstr "不知道如何处理 %06o %s '%s'"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: merge-recursive.c:978
|
|
|
|
|
msgid "Failed to execute internal merge"
|
|
|
|
|
msgstr "无法执行内部合并"
|
|
|
|
|
|
|
|
|
|
#: merge-recursive.c:982
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "Unable to add %s to database"
|
|
|
|
|
msgstr "不能添加 %s 至对象库"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: merge-recursive.c:1081 merge-recursive.c:1095
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
2016-10-27 15:53:37 +02:00
|
|
|
|
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
|
|
|
|
|
"in tree."
|
2016-08-28 04:18:12 +02:00
|
|
|
|
msgstr ""
|
2016-10-27 15:53:37 +02:00
|
|
|
|
"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
|
|
|
|
|
"的版本被保留。"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: merge-recursive.c:1087 merge-recursive.c:1100
|
2015-05-31 02:42:31 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
|
|
|
|
|
"in tree at %s."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
|
|
|
|
|
"的版本保留于 %8$s 中。"
|
2015-05-31 02:42:31 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: merge-recursive.c:1143
|
|
|
|
|
msgid "rename"
|
|
|
|
|
msgstr "重命名"
|
2016-05-29 14:40:35 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: merge-recursive.c:1143
|
|
|
|
|
msgid "renamed"
|
|
|
|
|
msgstr "重命名"
|
2016-05-29 14:40:35 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: merge-recursive.c:1200
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "%s is a directory in %s adding as %s instead"
|
|
|
|
|
msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: merge-recursive.c:1225
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
2016-10-27 15:53:37 +02:00
|
|
|
|
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
|
|
|
|
|
"\"->\"%s\" in \"%s\"%s"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
msgstr ""
|
2016-10-27 15:53:37 +02:00
|
|
|
|
"冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 "
|
|
|
|
|
"\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: merge-recursive.c:1230
|
|
|
|
|
msgid " (left unresolved)"
|
|
|
|
|
msgstr "(留下未解决)"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: merge-recursive.c:1292
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
msgstr ""
|
2016-10-27 15:53:37 +02:00
|
|
|
|
"冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->"
|
|
|
|
|
"%5$s"
|
2016-03-12 15:09:24 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: merge-recursive.c:1325
|
2016-03-12 15:09:24 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "Renaming %s to %s and %s to %s instead"
|
|
|
|
|
msgstr "而是重命名 %s 至 %s,以及 %s 至 %s"
|
2016-03-12 15:09:24 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: merge-recursive.c:1531
|
2016-03-12 15:09:24 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
|
|
|
|
|
msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
|
2013-07-26 08:00:02 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: merge-recursive.c:1546
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Adding merged %s"
|
|
|
|
|
msgstr "添加合并后的 %s"
|
2013-09-17 17:37:05 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: merge-recursive.c:1553 merge-recursive.c:1766
|
2013-09-17 17:37:05 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "Adding as %s instead"
|
|
|
|
|
msgstr "而是以 %s 为名添加"
|
2013-09-17 17:37:05 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: merge-recursive.c:1610
|
2013-09-17 17:37:05 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "cannot read object %s"
|
|
|
|
|
msgstr "不能读取对象 %s"
|
2013-09-17 17:37:05 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: merge-recursive.c:1613
|
2013-09-17 17:37:05 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "object %s is not a blob"
|
|
|
|
|
msgstr "对象 %s 不是一个数据对象"
|
2013-09-17 17:37:05 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: merge-recursive.c:1666
|
|
|
|
|
msgid "modify"
|
|
|
|
|
msgstr "修改"
|
2013-09-17 17:37:05 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: merge-recursive.c:1666
|
|
|
|
|
msgid "modified"
|
|
|
|
|
msgstr "修改"
|
2016-05-29 14:40:35 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: merge-recursive.c:1676
|
|
|
|
|
msgid "content"
|
|
|
|
|
msgstr "内容"
|
2016-05-29 14:40:35 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: merge-recursive.c:1683
|
|
|
|
|
msgid "add/add"
|
|
|
|
|
msgstr "添加/添加"
|
2016-03-12 15:09:24 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: merge-recursive.c:1718
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "Skipped %s (merged same as existing)"
|
|
|
|
|
msgstr "略过 %s(已经做过相同合并)"
|
2014-10-08 04:55:14 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: merge-recursive.c:1732
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "Auto-merging %s"
|
|
|
|
|
msgstr "自动合并 %s"
|
2014-10-08 04:55:14 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: merge-recursive.c:1736 git-submodule.sh:924
|
|
|
|
|
msgid "submodule"
|
|
|
|
|
msgstr "子模组"
|
|
|
|
|
|
|
|
|
|
#: merge-recursive.c:1737
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "CONFLICT (%s): Merge conflict in %s"
|
|
|
|
|
msgstr "冲突(%s):合并冲突于 %s"
|
2014-10-08 04:55:14 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: merge-recursive.c:1831
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "Removing %s"
|
|
|
|
|
msgstr "删除 %s"
|
2014-10-08 04:55:14 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: merge-recursive.c:1857
|
|
|
|
|
msgid "file/directory"
|
|
|
|
|
msgstr "文件/目录"
|
2014-10-08 04:55:14 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: merge-recursive.c:1863
|
|
|
|
|
msgid "directory/file"
|
|
|
|
|
msgstr "目录/文件"
|
2016-02-28 13:35:55 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: merge-recursive.c:1868
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
|
|
|
|
|
msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
|
2016-02-28 13:35:55 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: merge-recursive.c:1877
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "Adding %s"
|
|
|
|
|
msgstr "添加 %s"
|
2016-02-28 13:35:55 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: merge-recursive.c:1914
|
|
|
|
|
msgid "Already up-to-date!"
|
|
|
|
|
msgstr "已经是最新的!"
|
2016-02-28 13:35:55 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: merge-recursive.c:1923
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "merging of trees %s and %s failed"
|
|
|
|
|
msgstr "无法合并树 %s 和 %s"
|
2016-02-28 13:35:55 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: merge-recursive.c:2006
|
|
|
|
|
msgid "Merging:"
|
|
|
|
|
msgstr "合并:"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: merge-recursive.c:2019
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "found %u common ancestor:"
|
|
|
|
|
msgid_plural "found %u common ancestors:"
|
|
|
|
|
msgstr[0] "发现 %u 个共同祖先:"
|
|
|
|
|
msgstr[1] "发现 %u 个共同祖先:"
|
|
|
|
|
|
|
|
|
|
#: merge-recursive.c:2058
|
|
|
|
|
msgid "merge returned no commit"
|
|
|
|
|
msgstr "合并未返回提交"
|
|
|
|
|
|
|
|
|
|
#: merge-recursive.c:2121
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "Could not parse object '%s'"
|
|
|
|
|
msgstr "不能解析对象 '%s'"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: merge-recursive.c:2135 builtin/merge.c:641 builtin/merge.c:788
|
|
|
|
|
msgid "Unable to write index."
|
|
|
|
|
msgstr "不能写入索引。"
|
|
|
|
|
|
|
|
|
|
#: notes-merge.c:273
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
2016-10-27 15:53:37 +02:00
|
|
|
|
"You have not concluded your previous notes merge (%s exists).\n"
|
|
|
|
|
"Please, use 'git notes merge --commit' or 'git notes merge --abort' to "
|
|
|
|
|
"commit/abort the previous merge before you start a new notes merge."
|
2016-08-28 04:18:12 +02:00
|
|
|
|
msgstr ""
|
2016-10-27 15:53:37 +02:00
|
|
|
|
"您尚未结束您前一次注释合并(存在 %s)。\n"
|
2016-11-22 15:24:59 +01:00
|
|
|
|
"请您在开始一个新的注释合并之前,使用 'git notes merge --commit' 或者 'git "
|
|
|
|
|
"notes merge --abort' 来提交/终止前一次合并。"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: notes-merge.c:280
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "You have not concluded your notes merge (%s exists)."
|
|
|
|
|
msgstr "您尚未结束注释合并(存在 %s)。"
|
|
|
|
|
|
|
|
|
|
#: notes-utils.c:41
|
|
|
|
|
msgid "Cannot commit uninitialized/unreferenced notes tree"
|
|
|
|
|
msgstr "不能提交未初始化/未引用的注解树"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: notes-utils.c:100
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "Bad notes.rewriteMode value: '%s'"
|
|
|
|
|
msgstr "坏的 notes.rewriteMode 值:'%s'"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: notes-utils.c:110
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
|
|
|
|
|
msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
|
2016-05-29 14:40:35 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#. TRANSLATORS: The first %s is the name of the
|
|
|
|
|
#. environment variable, the second %s is its value
|
|
|
|
|
#: notes-utils.c:137
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "Bad %s value: '%s'"
|
|
|
|
|
msgstr "坏的 %s 值:'%s'"
|
2016-05-29 14:40:35 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: object.c:242
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "unable to parse object: %s"
|
|
|
|
|
msgstr "不能解析对象:%s"
|
2016-05-29 14:40:35 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: parse-options.c:572
|
|
|
|
|
msgid "..."
|
|
|
|
|
msgstr "..."
|
|
|
|
|
|
|
|
|
|
#: parse-options.c:590
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "usage: %s"
|
|
|
|
|
msgstr "用法:%s"
|
2016-05-29 14:40:35 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#. TRANSLATORS: the colon here should align with the
|
|
|
|
|
#. one in "usage: %s" translation
|
|
|
|
|
#: parse-options.c:594
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid " or: %s"
|
|
|
|
|
msgstr " 或:%s"
|
2016-05-29 14:40:35 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
# 译者:为保证在输出中对齐,注意调整句中空格!
|
|
|
|
|
#: parse-options.c:597
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid " %s"
|
|
|
|
|
msgstr " %s"
|
2016-05-29 14:40:35 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: parse-options.c:631
|
|
|
|
|
msgid "-NUM"
|
|
|
|
|
msgstr "-数字"
|
|
|
|
|
|
|
|
|
|
#: parse-options-cb.c:108
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "malformed object name '%s'"
|
|
|
|
|
msgstr "非法的对象名 '%s'"
|
2016-05-29 14:40:35 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: path.c:826
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "Could not make %s writable by group"
|
|
|
|
|
msgstr "不能设置 %s 为组可写"
|
|
|
|
|
|
|
|
|
|
#: pathspec.c:133
|
|
|
|
|
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
|
|
|
|
|
msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容"
|
|
|
|
|
|
|
|
|
|
#: pathspec.c:143
|
2016-05-29 14:40:35 +02:00
|
|
|
|
msgid ""
|
2016-10-27 15:53:37 +02:00
|
|
|
|
"global 'literal' pathspec setting is incompatible with all other global "
|
|
|
|
|
"pathspec settings"
|
|
|
|
|
msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容"
|
2016-05-29 14:40:35 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: pathspec.c:177
|
|
|
|
|
msgid "invalid parameter for pathspec magic 'prefix'"
|
|
|
|
|
msgstr "路径规格包含无效的神奇前缀"
|
|
|
|
|
|
|
|
|
|
#: pathspec.c:183
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "Invalid pathspec magic '%.*s' in '%s'"
|
|
|
|
|
msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
|
2016-05-29 14:40:35 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: pathspec.c:187
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "Missing ')' at the end of pathspec magic in '%s'"
|
|
|
|
|
msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'"
|
2016-05-29 14:40:35 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: pathspec.c:205
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "Unimplemented pathspec magic '%c' in '%s'"
|
|
|
|
|
msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
|
2016-05-29 14:40:35 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: pathspec.c:230
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "%s: 'literal' and 'glob' are incompatible"
|
|
|
|
|
msgstr "%s:'literal' 和 'glob' 不兼容"
|
2016-05-29 14:40:35 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: pathspec.c:241
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "%s: '%s' is outside repository"
|
|
|
|
|
msgstr "%s:'%s' 在仓库之外"
|
2016-05-29 14:40:35 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: pathspec.c:291
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "Pathspec '%s' is in submodule '%.*s'"
|
|
|
|
|
msgstr "路径规格 '%s' 在子模组 '%.*s' 中"
|
2016-05-29 14:40:35 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: pathspec.c:353
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "%s: pathspec magic not supported by this command: %s"
|
|
|
|
|
msgstr "%s:路径规格神奇前缀不被此命令支持:%s"
|
|
|
|
|
|
|
|
|
|
#: pathspec.c:408
|
2016-05-29 14:40:35 +02:00
|
|
|
|
msgid ""
|
2016-10-27 15:53:37 +02:00
|
|
|
|
"empty strings as pathspecs will be made invalid in upcoming releases. please "
|
|
|
|
|
"use . instead if you meant to match all paths"
|
2016-05-29 14:40:35 +02:00
|
|
|
|
msgstr ""
|
2016-10-27 15:53:37 +02:00
|
|
|
|
"在即将到来的版本,不能再使用空字符串作为路径表达式。如果要匹配所有路径,\n"
|
|
|
|
|
"请代之以 ."
|
2016-05-29 14:40:35 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: pathspec.c:440
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "pathspec '%s' is beyond a symbolic link"
|
|
|
|
|
msgstr "路径规格 '%s' 位于符号链接中"
|
|
|
|
|
|
|
|
|
|
#: pathspec.c:449
|
2016-05-29 14:40:35 +02:00
|
|
|
|
msgid ""
|
2016-10-27 15:53:37 +02:00
|
|
|
|
"There is nothing to exclude from by :(exclude) patterns.\n"
|
|
|
|
|
"Perhaps you forgot to add either ':/' or '.' ?"
|
2016-05-29 14:40:35 +02:00
|
|
|
|
msgstr ""
|
2016-10-27 15:53:37 +02:00
|
|
|
|
"没有为 :(exclude) 模式提供要忽略的内容。也许您忘记了\n"
|
|
|
|
|
"添加 ':/' 或 '.' ?"
|
2016-05-29 14:40:35 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: pretty.c:971
|
|
|
|
|
msgid "unable to parse --pretty format"
|
|
|
|
|
msgstr "不能解析 --pretty 格式"
|
|
|
|
|
|
|
|
|
|
#: read-cache.c:1315
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
2016-10-27 15:53:37 +02:00
|
|
|
|
"index.version set, but the value is invalid.\n"
|
|
|
|
|
"Using version %i"
|
2016-05-29 14:40:35 +02:00
|
|
|
|
msgstr ""
|
2016-10-27 15:53:37 +02:00
|
|
|
|
"设置了 index.version,但是取值无效。\n"
|
|
|
|
|
"使用版本 %i"
|
2016-05-29 14:40:35 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: read-cache.c:1325
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
2016-10-27 15:53:37 +02:00
|
|
|
|
"GIT_INDEX_VERSION set, but the value is invalid.\n"
|
|
|
|
|
"Using version %i"
|
2016-05-29 14:40:35 +02:00
|
|
|
|
msgstr ""
|
2016-10-27 15:53:37 +02:00
|
|
|
|
"设置了 GIT_INDEX_VERSION,但是取值无效。\n"
|
|
|
|
|
"使用版本 %i"
|
2016-05-29 14:40:35 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: refs.c:576 builtin/merge.c:840
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "Could not open '%s' for writing"
|
|
|
|
|
msgstr "无法打开 '%s' 进行写入"
|
2016-05-29 14:40:35 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: refs/files-backend.c:2481
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "could not delete reference %s: %s"
|
|
|
|
|
msgstr "无法删除引用 %s:%s"
|
2016-05-29 14:40:35 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: refs/files-backend.c:2484
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "could not delete references: %s"
|
|
|
|
|
msgstr "无法删除引用:%s"
|
2016-05-29 14:40:35 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: refs/files-backend.c:2493
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "could not remove reference %s"
|
|
|
|
|
msgstr "无法删除引用 %s"
|
2016-05-29 14:40:35 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: ref-filter.c:55
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "expected format: %%(color:<color>)"
|
|
|
|
|
msgstr "期望的格式:%%(color:<color>)"
|
2016-05-29 14:40:35 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: ref-filter.c:57
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "unrecognized color: %%(color:%s)"
|
|
|
|
|
msgstr "未能识别的颜色:%%(color:%s)"
|
2014-03-13 05:41:34 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: ref-filter.c:71
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unrecognized format: %%(%s)"
|
|
|
|
|
msgstr "未能识别的格式:%%(%s)"
|
2013-09-17 17:37:05 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: ref-filter.c:77
|
2013-09-17 17:37:05 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "%%(body) does not take arguments"
|
|
|
|
|
msgstr "%%(body) 不带参数"
|
2013-09-17 17:37:05 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: ref-filter.c:84
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "%%(subject) does not take arguments"
|
|
|
|
|
msgstr "%%(subject) 不带参数"
|
2013-09-17 17:37:05 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: ref-filter.c:101
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "positive value expected contents:lines=%s"
|
|
|
|
|
msgstr "要为 contents:lines=%s 提供一个正数"
|
2013-09-17 17:37:05 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: ref-filter.c:103
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unrecognized %%(contents) argument: %s"
|
|
|
|
|
msgstr "未能识别的 %%(contents) 参数:%s"
|
2013-09-17 17:37:05 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: ref-filter.c:113
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unrecognized %%(objectname) argument: %s"
|
|
|
|
|
msgstr "未能识别的 %%(objectname) 参数:%s"
|
2013-09-17 17:37:05 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: ref-filter.c:135
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "expected format: %%(align:<width>,<position>)"
|
|
|
|
|
msgstr "期望的格式:%%(align:<width>,<position>)"
|
2013-09-17 17:37:05 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: ref-filter.c:147
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "unrecognized position:%s"
|
|
|
|
|
msgstr "未能识别的位置:%s"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: ref-filter.c:151
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "unrecognized width:%s"
|
|
|
|
|
msgstr "未能识别的宽度:%s"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: ref-filter.c:157
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "unrecognized %%(align) argument: %s"
|
|
|
|
|
msgstr "未能识别的 %%(align) 参数:%s"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: ref-filter.c:161
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "positive width expected with the %%(align) atom"
|
|
|
|
|
msgstr "元素 %%(align) 需要一个正数的宽度"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: ref-filter.c:244
|
2013-01-30 10:23:08 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "malformed field name: %.*s"
|
|
|
|
|
msgstr "非法的字段名:%.*s"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: ref-filter.c:270
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unknown field name: %.*s"
|
|
|
|
|
msgstr "未知的字段名:%.*s"
|
2014-10-08 04:55:14 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: ref-filter.c:372
|
2015-05-31 02:42:31 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "format: %%(end) atom used without corresponding atom"
|
|
|
|
|
msgstr "格式:使用了 %%(end) 元素却没有它的对应元素"
|
2015-05-31 02:42:31 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: ref-filter.c:424
|
2015-05-31 02:42:31 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "malformed format string %s"
|
|
|
|
|
msgstr "非法的格式化字符串 %s"
|
2015-05-31 02:42:31 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: ref-filter.c:878
|
|
|
|
|
msgid ":strip= requires a positive integer argument"
|
|
|
|
|
msgstr ":strip= 需要一个正整型参数"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: ref-filter.c:883
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "ref '%s' does not have %ld components to :strip"
|
|
|
|
|
msgstr "引用 '%s' 未提供用于 :strip 的 %ld 个组件"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: ref-filter.c:1046
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unknown %.*s format %s"
|
|
|
|
|
msgstr "未知的 %.*s 格式 %s"
|
2012-07-04 11:20:34 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: ref-filter.c:1066 ref-filter.c:1097
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "missing object %s for %s"
|
|
|
|
|
msgstr "缺失 %2$s 的对象 %1$s"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: ref-filter.c:1069 ref-filter.c:1100
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "parse_object_buffer failed on %s for %s"
|
|
|
|
|
msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"
|
2012-07-04 11:20:34 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: ref-filter.c:1311
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "malformed object at '%s'"
|
|
|
|
|
msgstr "非法的对象于 '%s'"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: ref-filter.c:1373
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "ignoring ref with broken name %s"
|
|
|
|
|
msgstr "忽略带有错误名称 %s 的引用"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: ref-filter.c:1378
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "ignoring broken ref %s"
|
|
|
|
|
msgstr "忽略损坏的引用 %s"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: ref-filter.c:1633
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "format: %%(end) atom missing"
|
|
|
|
|
msgstr "格式:缺少 %%(end) 元素"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: ref-filter.c:1687
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "malformed object name %s"
|
|
|
|
|
msgstr "非法的对象名 %s"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: remote.c:746
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Cannot fetch both %s and %s to %s"
|
|
|
|
|
msgstr "不能同时获取 %s 和 %s 至 %s"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: remote.c:750
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "%s usually tracks %s, not %s"
|
|
|
|
|
msgstr "%s 通常跟踪 %s,而非 %s"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: remote.c:754
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "%s tracks both %s and %s"
|
|
|
|
|
msgstr "%s 同时跟踪 %s 和 %s"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: remote.c:762
|
|
|
|
|
msgid "Internal error"
|
|
|
|
|
msgstr "内部错误"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: remote.c:1677 remote.c:1720
|
|
|
|
|
msgid "HEAD does not point to a branch"
|
|
|
|
|
msgstr "HEAD 没有指向一个分支"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: remote.c:1686
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "no such branch: '%s'"
|
|
|
|
|
msgstr "没有此分支:'%s'"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: remote.c:1689
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "no upstream configured for branch '%s'"
|
|
|
|
|
msgstr "尚未给分支 '%s' 设置上游"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: remote.c:1695
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "upstream branch '%s' not stored as a remote-tracking branch"
|
|
|
|
|
msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: remote.c:1710
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "push destination '%s' on remote '%s' has no local tracking branch"
|
|
|
|
|
msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: remote.c:1725
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "branch '%s' has no remote for pushing"
|
|
|
|
|
msgstr "分支 '%s' 没有设置要推送的远程服务器"
|
2014-01-18 04:04:21 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: remote.c:1736
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "push refspecs for '%s' do not include '%s'"
|
|
|
|
|
msgstr "向 '%s' 推送引用规格未包含 '%s'"
|
2014-01-18 04:04:21 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: remote.c:1749
|
|
|
|
|
msgid "push has no destination (push.default is 'nothing')"
|
|
|
|
|
msgstr "推送无目标(push.default 是 'nothing')"
|
2014-01-18 04:04:21 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: remote.c:1771
|
|
|
|
|
msgid "cannot resolve 'simple' push to a single destination"
|
|
|
|
|
msgstr "无法解析 'simple' 推送至一个单独的目标"
|
2014-03-13 05:41:34 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: remote.c:2073
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Your branch is based on '%s', but the upstream is gone.\n"
|
|
|
|
|
msgstr "您的分支基于 '%s',但此上游分支已经不存在。\n"
|
2014-03-13 05:41:34 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: remote.c:2077
|
|
|
|
|
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
|
|
|
|
|
msgstr " (使用 \"git branch --unset-upstream\" 来修复)\n"
|
2014-03-13 05:41:34 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: remote.c:2080
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Your branch is up-to-date with '%s'.\n"
|
|
|
|
|
msgstr "您的分支与上游分支 '%s' 一致。\n"
|
2014-01-18 04:04:21 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: remote.c:2084
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Your branch is ahead of '%s' by %d commit.\n"
|
|
|
|
|
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
|
|
|
|
|
msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
|
|
|
|
|
msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
|
2014-01-18 04:04:21 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: remote.c:2090
|
|
|
|
|
msgid " (use \"git push\" to publish your local commits)\n"
|
|
|
|
|
msgstr " (使用 \"git push\" 来发布您的本地提交)\n"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: remote.c:2093
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
|
|
|
|
|
msgid_plural ""
|
|
|
|
|
"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
|
|
|
|
|
msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
|
|
|
|
|
msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
# 译者:注意保持前导空格
|
|
|
|
|
#: remote.c:2101
|
|
|
|
|
msgid " (use \"git pull\" to update your local branch)\n"
|
|
|
|
|
msgstr " (使用 \"git pull\" 来更新您的本地分支)\n"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: remote.c:2104
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Your branch and '%s' have diverged,\n"
|
|
|
|
|
"and have %d and %d different commit each, respectively.\n"
|
|
|
|
|
msgid_plural ""
|
|
|
|
|
"Your branch and '%s' have diverged,\n"
|
|
|
|
|
"and have %d and %d different commits each, respectively.\n"
|
|
|
|
|
msgstr[0] ""
|
|
|
|
|
"您的分支和 '%s' 出现了偏离,\n"
|
|
|
|
|
"并且分别有 %d 和 %d 处不同的提交。\n"
|
|
|
|
|
msgstr[1] ""
|
|
|
|
|
"您的分支和 '%s' 出现了偏离,\n"
|
|
|
|
|
"并且分别有 %d 和 %d 处不同的提交。\n"
|
2013-09-17 17:37:05 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
# 译者:注意保持前导空格
|
|
|
|
|
#: remote.c:2114
|
|
|
|
|
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
|
|
|
|
|
msgstr " (使用 \"git pull\" 来合并远程分支)\n"
|
2013-09-17 17:37:05 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: revision.c:2158
|
|
|
|
|
msgid "your current branch appears to be broken"
|
|
|
|
|
msgstr "您的当前分支好像被损坏"
|
2014-01-18 04:04:21 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: revision.c:2161
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "your current branch '%s' does not have any commits yet"
|
|
|
|
|
msgstr "您的当前分支 '%s' 尚无任何提交"
|
2012-07-04 11:20:34 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: revision.c:2355
|
|
|
|
|
msgid "--first-parent is incompatible with --bisect"
|
|
|
|
|
msgstr "--first-parent 与 --bisect 不兼容"
|
2012-07-04 11:20:34 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: run-command.c:106
|
|
|
|
|
msgid "open /dev/null failed"
|
|
|
|
|
msgstr "不能打开 /dev/null"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: run-command.c:108
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "dup2(%d,%d) failed"
|
|
|
|
|
msgstr "不能调用 dup2(%d,%d)"
|
2012-07-04 11:20:34 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: send-pack.c:297
|
|
|
|
|
msgid "failed to sign the push certificate"
|
|
|
|
|
msgstr "无法为推送证书签名"
|
2012-07-04 11:20:34 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: send-pack.c:410
|
|
|
|
|
msgid "the receiving end does not support --signed push"
|
|
|
|
|
msgstr "接收端不支持签名推送"
|
2012-07-04 11:20:34 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: send-pack.c:412
|
|
|
|
|
msgid ""
|
|
|
|
|
"not sending a push certificate since the receiving end does not support --"
|
|
|
|
|
"signed push"
|
|
|
|
|
msgstr "未发送推送证书,因为接收端不支持签名推送"
|
2012-07-04 11:20:34 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: send-pack.c:424
|
|
|
|
|
msgid "the receiving end does not support --atomic push"
|
|
|
|
|
msgstr "接收端不支持原子推送"
|
2012-07-04 11:20:34 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: send-pack.c:429
|
|
|
|
|
msgid "the receiving end does not support push options"
|
|
|
|
|
msgstr "接收端不支持推送选项"
|
2012-07-04 11:20:34 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: sequencer.c:171
|
|
|
|
|
msgid "revert"
|
|
|
|
|
msgstr "还原"
|
2012-07-04 11:20:34 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: sequencer.c:171
|
|
|
|
|
msgid "cherry-pick"
|
|
|
|
|
msgstr "拣选"
|
|
|
|
|
|
|
|
|
|
#: sequencer.c:228
|
|
|
|
|
msgid ""
|
|
|
|
|
"after resolving the conflicts, mark the corrected paths\n"
|
|
|
|
|
"with 'git add <paths>' or 'git rm <paths>'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
|
|
|
|
|
"命令标记修正后的文件"
|
|
|
|
|
|
|
|
|
|
#: sequencer.c:231
|
|
|
|
|
msgid ""
|
|
|
|
|
"after resolving the conflicts, mark the corrected paths\n"
|
|
|
|
|
"with 'git add <paths>' or 'git rm <paths>'\n"
|
|
|
|
|
"and commit the result with 'git commit'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"冲突解决完毕后,用 'git add <路径>' 或 'git rm <路径>'\n"
|
|
|
|
|
"对修正后的文件做标记,然后用 'git commit' 提交"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: sequencer.c:244 sequencer.c:1209
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "could not lock '%s'"
|
|
|
|
|
msgstr "不能锁定 '%s'"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: sequencer.c:247 sequencer.c:1125 sequencer.c:1214
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "could not write to '%s'"
|
|
|
|
|
msgstr "不能写入 '%s'"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: sequencer.c:251
|
|
|
|
|
#, c-format
|
2016-11-20 13:26:17 +01:00
|
|
|
|
msgid "could not write eol to '%s'"
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgstr "不能将换行符写入 '%s'"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: sequencer.c:255 sequencer.c:1130 sequencer.c:1216
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "failed to finalize '%s'."
|
|
|
|
|
msgstr "无法完成 '%s'。"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: sequencer.c:279 builtin/am.c:259 builtin/commit.c:749 builtin/merge.c:1032
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "could not read '%s'"
|
|
|
|
|
msgstr "不能读取 '%s'"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: sequencer.c:305
|
2013-02-19 07:52:24 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "your local changes would be overwritten by %s."
|
|
|
|
|
msgstr "您的本地修改将被%s覆盖。"
|
2013-02-19 07:52:24 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: sequencer.c:309
|
|
|
|
|
msgid "commit your changes or stash them to proceed."
|
|
|
|
|
msgstr "提交您的修改或保存进度后再继续。"
|
2012-07-04 11:20:34 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: sequencer.c:324
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "%s: fast-forward"
|
|
|
|
|
msgstr "%s:快进"
|
2012-07-04 11:20:34 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#. TRANSLATORS: %s will be "revert" or "cherry-pick"
|
|
|
|
|
#: sequencer.c:399
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "%s: Unable to write new index file"
|
|
|
|
|
msgstr "%s:无法写入新索引文件"
|
2012-07-04 11:20:34 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: sequencer.c:418
|
|
|
|
|
msgid "could not resolve HEAD commit\n"
|
|
|
|
|
msgstr "不能解析 HEAD 提交\n"
|
2012-07-04 11:20:34 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: sequencer.c:438
|
|
|
|
|
msgid "unable to update cache tree\n"
|
|
|
|
|
msgstr "不能更新缓存\n"
|
2012-07-04 11:20:34 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: sequencer.c:483
|
2013-02-19 07:52:24 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
2016-10-27 15:53:37 +02:00
|
|
|
|
"you have staged changes in your working tree\n"
|
|
|
|
|
"If these changes are meant to be squashed into the previous commit, run:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git commit --amend %s\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"If they are meant to go into a new commit, run:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git commit %s\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"In both cases, once you're done, continue with:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git rebase --continue\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"您已暂存了工作区的修改。如果这些修改要压缩到前一个提交,执行:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git commit --amend %s\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"如果这些变更要形成一个新提交,执行:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git commit %s\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"无论哪种情况,当您完成提交,继续执行:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git rebase --continue\n"
|
2012-07-04 11:20:34 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: sequencer.c:567
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "could not parse commit %s\n"
|
|
|
|
|
msgstr "不能解析提交 %s\n"
|
2012-07-04 11:20:34 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: sequencer.c:572
|
2013-02-19 07:52:24 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "could not parse parent commit %s\n"
|
|
|
|
|
msgstr "不能解析父提交 %s\n"
|
2013-02-19 07:52:24 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: sequencer.c:656
|
|
|
|
|
msgid "your index file is unmerged."
|
|
|
|
|
msgstr "您的索引文件未完成合并。"
|
2012-07-04 11:20:34 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: sequencer.c:675
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "commit %s is a merge but no -m option was given."
|
|
|
|
|
msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
|
2012-07-04 11:20:34 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: sequencer.c:683
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "commit %s does not have parent %d"
|
|
|
|
|
msgstr "提交 %s 没有第 %d 个父提交"
|
|
|
|
|
|
|
|
|
|
#: sequencer.c:687
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "mainline was specified but commit %s is not a merge."
|
|
|
|
|
msgstr "指定了主线,但是提交 %s 不是一个合并提交。"
|
|
|
|
|
|
|
|
|
|
#. TRANSLATORS: The first %s will be a "todo" command like
|
|
|
|
|
#. "revert" or "pick", the second %s a SHA1.
|
|
|
|
|
#: sequencer.c:700
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "%s: cannot parse parent commit %s"
|
|
|
|
|
msgstr "%s:不能解析父提交 %s"
|
|
|
|
|
|
|
|
|
|
#: sequencer.c:705
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot get commit message for %s"
|
|
|
|
|
msgstr "不能得到 %s 的提交说明"
|
|
|
|
|
|
|
|
|
|
#: sequencer.c:797
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "could not revert %s... %s"
|
|
|
|
|
msgstr "不能还原 %s... %s"
|
|
|
|
|
|
|
|
|
|
#: sequencer.c:798
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "could not apply %s... %s"
|
|
|
|
|
msgstr "不能应用 %s... %s"
|
|
|
|
|
|
|
|
|
|
#: sequencer.c:833
|
|
|
|
|
msgid "empty commit set passed"
|
|
|
|
|
msgstr "提供了空的提交集"
|
|
|
|
|
|
|
|
|
|
#: sequencer.c:843
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "git %s: failed to read the index"
|
|
|
|
|
msgstr "git %s:无法读取索引"
|
|
|
|
|
|
|
|
|
|
#: sequencer.c:850
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "git %s: failed to refresh the index"
|
|
|
|
|
msgstr "git %s:无法刷新索引"
|
|
|
|
|
|
|
|
|
|
#: sequencer.c:944
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "invalid line %d: %.*s"
|
|
|
|
|
msgstr "无效行 %d:%.*s"
|
|
|
|
|
|
|
|
|
|
#: sequencer.c:950
|
|
|
|
|
msgid "no commits parsed."
|
|
|
|
|
msgstr "没有解析提交。"
|
|
|
|
|
|
|
|
|
|
#: sequencer.c:966
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "could not read '%s'."
|
|
|
|
|
msgstr "不能读取 '%s'。"
|
|
|
|
|
|
|
|
|
|
#: sequencer.c:972
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unusable instruction sheet: '%s'"
|
|
|
|
|
msgstr "无用的指令清单:'%s'"
|
|
|
|
|
|
|
|
|
|
#: sequencer.c:983
|
|
|
|
|
msgid "cannot cherry-pick during a revert."
|
|
|
|
|
msgstr "不能在回退中执行拣选。"
|
|
|
|
|
|
|
|
|
|
#: sequencer.c:985
|
|
|
|
|
msgid "cannot revert during a cherry-pick."
|
|
|
|
|
msgstr "不能在拣选中执行回退。"
|
|
|
|
|
|
|
|
|
|
#: sequencer.c:1028
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "invalid key: %s"
|
|
|
|
|
msgstr "无效键名:%s"
|
|
|
|
|
|
|
|
|
|
#: sequencer.c:1031
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "invalid value for %s: %s"
|
|
|
|
|
msgstr "%s 的值无效:%s"
|
|
|
|
|
|
|
|
|
|
#: sequencer.c:1063
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "malformed options sheet: '%s'"
|
|
|
|
|
msgstr "非法的选项清单:'%s'"
|
|
|
|
|
|
|
|
|
|
#: sequencer.c:1101
|
|
|
|
|
msgid "a cherry-pick or revert is already in progress"
|
|
|
|
|
msgstr "一个拣选或还原操作已在进行"
|
|
|
|
|
|
|
|
|
|
#: sequencer.c:1102
|
|
|
|
|
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
|
|
|
|
|
msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
|
|
|
|
|
|
|
|
|
|
#: sequencer.c:1106
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "could not create sequencer directory '%s'"
|
|
|
|
|
msgstr "不能创建序列目录 '%s'"
|
|
|
|
|
|
|
|
|
|
#: sequencer.c:1120
|
|
|
|
|
msgid "could not lock HEAD"
|
|
|
|
|
msgstr "不能锁定 HEAD"
|
|
|
|
|
|
|
|
|
|
#: sequencer.c:1151 sequencer.c:1289
|
|
|
|
|
msgid "no cherry-pick or revert in progress"
|
|
|
|
|
msgstr "拣选或还原操作并未进行"
|
|
|
|
|
|
|
|
|
|
#: sequencer.c:1153
|
|
|
|
|
msgid "cannot resolve HEAD"
|
|
|
|
|
msgstr "不能解析 HEAD"
|
|
|
|
|
|
|
|
|
|
#: sequencer.c:1155 sequencer.c:1189
|
|
|
|
|
msgid "cannot abort from a branch yet to be born"
|
|
|
|
|
msgstr "不能从尚未建立的分支终止"
|
|
|
|
|
|
|
|
|
|
#: sequencer.c:1175 builtin/grep.c:578
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot open '%s'"
|
|
|
|
|
msgstr "不能打开 '%s'"
|
|
|
|
|
|
|
|
|
|
#: sequencer.c:1177
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot read '%s': %s"
|
|
|
|
|
msgstr "不能读取 '%s':%s"
|
|
|
|
|
|
|
|
|
|
#: sequencer.c:1178
|
|
|
|
|
msgid "unexpected end of file"
|
|
|
|
|
msgstr "意外的文件结束"
|
|
|
|
|
|
|
|
|
|
#: sequencer.c:1184
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
|
|
|
|
|
msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
|
|
|
|
|
|
|
|
|
|
#: sequencer.c:1354
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "%s: can't cherry-pick a %s"
|
|
|
|
|
msgstr "%s:不能拣选一个%s"
|
|
|
|
|
|
|
|
|
|
#: sequencer.c:1358
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "%s: bad revision"
|
|
|
|
|
msgstr "%s:错误的版本"
|
|
|
|
|
|
|
|
|
|
#: sequencer.c:1391
|
|
|
|
|
msgid "can't revert as initial commit"
|
|
|
|
|
msgstr "不能作为初始提交回退"
|
|
|
|
|
|
|
|
|
|
#: setup.c:160
|
|
|
|
|
#, c-format
|
2012-07-04 11:20:34 +02:00
|
|
|
|
msgid ""
|
2016-10-27 15:53:37 +02:00
|
|
|
|
"%s: no such path in the working tree.\n"
|
|
|
|
|
"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"%s:工作区中无此路径。\n"
|
|
|
|
|
"使用命令 'git <command> -- <path>...' 来指定本地不存在的路径。"
|
2012-07-04 11:20:34 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: setup.c:173
|
2013-09-17 17:37:05 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
|
|
|
|
|
"Use '--' to separate paths from revisions, like this:\n"
|
|
|
|
|
"'git <command> [<revision>...] -- [<file>...]'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"有歧义的参数 '%s':未知的版本或路径不存在于工作区中。\n"
|
|
|
|
|
"使用 '--' 来分隔版本和路径,例如:\n"
|
|
|
|
|
"'git <command> [<revision>...] -- [<file>...]'"
|
2012-07-04 11:20:34 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: setup.c:223
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"ambiguous argument '%s': both revision and filename\n"
|
|
|
|
|
"Use '--' to separate paths from revisions, like this:\n"
|
|
|
|
|
"'git <command> [<revision>...] -- [<file>...]'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"有歧义的参数 '%s':可同时是版本和文件\n"
|
|
|
|
|
"使用 '--' 来分隔版本和路径,例如:\n"
|
|
|
|
|
"'git <command> [<revision>...] -- [<file>...]'"
|
2013-07-26 08:00:02 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: setup.c:468
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Expected git repo version <= %d, found %d"
|
|
|
|
|
msgstr "期望 git 仓库版本 <= %d,却得到 %d"
|
2012-07-04 11:20:34 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: setup.c:476
|
|
|
|
|
msgid "unknown repository extensions found:"
|
|
|
|
|
msgstr "发现未知的仓库扩展:"
|
2013-07-26 08:00:02 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: setup.c:762
|
2013-04-11 11:55:09 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "Not a git repository (or any of the parent directories): %s"
|
|
|
|
|
msgstr "不是一个 git 仓库(或者任何父目录):%s"
|
2013-04-11 11:55:09 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: setup.c:764 setup.c:915 builtin/index-pack.c:1641
|
|
|
|
|
msgid "Cannot come back to cwd"
|
|
|
|
|
msgstr "无法返回当前工作目录"
|
2013-04-11 11:55:09 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: setup.c:845
|
|
|
|
|
msgid "Unable to read current working directory"
|
|
|
|
|
msgstr "不能读取当前工作目录"
|
2013-04-11 11:55:09 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: setup.c:920
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Not a git repository (or any parent up to mount point %s)\n"
|
|
|
|
|
"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"不是一个 git 仓库(或者向上递归至挂载点 %s 的任何祖先目录)\n"
|
|
|
|
|
"停止在文件系统边界(未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM)。"
|
2013-04-11 11:55:09 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: setup.c:927
|
2013-02-19 07:52:24 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "Cannot change to '%s/..'"
|
|
|
|
|
msgstr "不能切换到 '%s/..'"
|
2013-02-19 07:52:24 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: setup.c:989
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Problem with core.sharedRepository filemode value (0%.3o).\n"
|
|
|
|
|
"The owner of files must always have read and write permissions."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"参数 core.sharedRepository 的文件权限值有错(0%.3o)。\n"
|
|
|
|
|
"文件属主必须始终拥有读写权限。"
|
2012-07-04 11:20:34 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: sha1_file.c:473
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "path '%s' does not exist"
|
|
|
|
|
msgstr "路径 '%s' 不存在"
|
|
|
|
|
|
|
|
|
|
#: sha1_file.c:499
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "reference repository '%s' as a linked checkout is not supported yet."
|
|
|
|
|
msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"
|
|
|
|
|
|
|
|
|
|
#: sha1_file.c:505
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "reference repository '%s' is not a local repository."
|
|
|
|
|
msgstr "参考仓库 '%s' 不是一个本地仓库。"
|
|
|
|
|
|
|
|
|
|
#: sha1_file.c:511
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "reference repository '%s' is shallow"
|
|
|
|
|
msgstr "参考仓库 '%s' 是一个浅克隆"
|
|
|
|
|
|
|
|
|
|
#: sha1_file.c:519
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "reference repository '%s' is grafted"
|
|
|
|
|
msgstr "参考仓库 '%s' 已被嫁接"
|
|
|
|
|
|
|
|
|
|
#: sha1_file.c:1159
|
|
|
|
|
msgid "offset before end of packfile (broken .idx?)"
|
|
|
|
|
msgstr "偏移量在包文件结束之前(损坏的 .idx?)"
|
|
|
|
|
|
|
|
|
|
#: sha1_file.c:2592
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "offset before start of pack index for %s (corrupt index?)"
|
|
|
|
|
msgstr "偏移量在 %s 的包索引开始之前(损坏的索引?)"
|
|
|
|
|
|
|
|
|
|
#: sha1_file.c:2596
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "offset beyond end of pack index for %s (truncated index?)"
|
|
|
|
|
msgstr "偏移量越过了 %s 的包索引的结尾(被截断的索引?)"
|
|
|
|
|
|
|
|
|
|
#: sha1_name.c:407
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "short SHA1 %s is ambiguous"
|
|
|
|
|
msgstr "歧义的短 SHA1 %s"
|
|
|
|
|
|
|
|
|
|
#: sha1_name.c:418
|
|
|
|
|
msgid "The candidates are:"
|
|
|
|
|
msgstr "候选者有:"
|
|
|
|
|
|
2016-11-22 15:24:59 +01:00
|
|
|
|
#: sha1_name.c:578
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"Git normally never creates a ref that ends with 40 hex characters\n"
|
|
|
|
|
"because it will be ignored when you just specify 40-hex. These refs\n"
|
|
|
|
|
"may be created by mistake. For example,\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git checkout -b $br $(git rev-parse ...)\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
|
|
|
|
|
"examine these refs and maybe delete them. Turn this message off by\n"
|
|
|
|
|
"running \"git config advice.objectNameWarning false\""
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Git 通常不会创建一个以40位十六进制字符命名的引用,因为当你提供40位\n"
|
|
|
|
|
"十六进制字符时将被忽略。不过这些引用也可能被错误地创建。例如:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git checkout -b $br $(git rev-parse ...)\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"当 \"$br\" 空白时一个40位十六进制的引用将被创建。请检查这些引用,\n"
|
|
|
|
|
"可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"
|
|
|
|
|
"命令关闭本消息通知。"
|
|
|
|
|
|
|
|
|
|
#: submodule.c:64 submodule.c:98
|
|
|
|
|
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
|
|
|
|
|
msgstr "无法修改未合并的 .gitmodules,先解决合并冲突"
|
|
|
|
|
|
|
|
|
|
#: submodule.c:68 submodule.c:102
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Could not find section in .gitmodules where path=%s"
|
|
|
|
|
msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
|
|
|
|
|
|
|
|
|
|
#: submodule.c:76
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Could not update .gitmodules entry %s"
|
|
|
|
|
msgstr "不能更新 .gitmodules 条目 %s"
|
|
|
|
|
|
|
|
|
|
#: submodule.c:109
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Could not remove .gitmodules entry for %s"
|
|
|
|
|
msgstr "无法移除 %s 的 .gitmodules 条目"
|
|
|
|
|
|
|
|
|
|
#: submodule.c:120
|
|
|
|
|
msgid "staging updated .gitmodules failed"
|
|
|
|
|
msgstr "将更新后 .gitmodules 添加暂存区失败"
|
|
|
|
|
|
|
|
|
|
#: submodule.c:158
|
|
|
|
|
msgid "negative values not allowed for submodule.fetchJobs"
|
|
|
|
|
msgstr "submodule.fetchJobs 不允许为负值"
|
|
|
|
|
|
|
|
|
|
#: submodule-config.c:358
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "invalid value for %s"
|
|
|
|
|
msgstr "%s 的值无效"
|
|
|
|
|
|
|
|
|
|
#: trailer.c:238
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "running trailer command '%s' failed"
|
|
|
|
|
msgstr "执行 trailer 命令 '%s' 失败"
|
|
|
|
|
|
|
|
|
|
#: trailer.c:471 trailer.c:475 trailer.c:479 trailer.c:533 trailer.c:537
|
|
|
|
|
#: trailer.c:541
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unknown value '%s' for key '%s'"
|
|
|
|
|
msgstr "键 '%2$s' 的未知取值 '%1$s'"
|
|
|
|
|
|
|
|
|
|
#: trailer.c:523 trailer.c:528 builtin/remote.c:289
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "more than one %s"
|
|
|
|
|
msgstr "多于一个 %s"
|
|
|
|
|
|
|
|
|
|
#: trailer.c:672
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "empty trailer token in trailer '%.*s'"
|
|
|
|
|
msgstr "签名 '%.*s' 的键为空"
|
|
|
|
|
|
|
|
|
|
#: trailer.c:695
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "could not read input file '%s'"
|
|
|
|
|
msgstr "不能读取输入文件 '%s'"
|
|
|
|
|
|
|
|
|
|
#: trailer.c:698
|
|
|
|
|
msgid "could not read from stdin"
|
|
|
|
|
msgstr "不能自标准输入读取"
|
|
|
|
|
|
|
|
|
|
#: trailer.c:929 builtin/am.c:44
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "could not stat %s"
|
|
|
|
|
msgstr "不能获取 %s 的文件状态"
|
|
|
|
|
|
|
|
|
|
#: trailer.c:931
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "file %s is not a regular file"
|
|
|
|
|
msgstr "文件 %s 不是一个正规文件"
|
|
|
|
|
|
|
|
|
|
#: trailer.c:933
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "file %s is not writable by user"
|
|
|
|
|
msgstr "文件 %s 用户不可写"
|
|
|
|
|
|
|
|
|
|
#: trailer.c:945
|
|
|
|
|
msgid "could not open temporary file"
|
|
|
|
|
msgstr "不能打开临时文件"
|
|
|
|
|
|
|
|
|
|
#: trailer.c:983
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "could not rename temporary file to %s"
|
|
|
|
|
msgstr "不能重命名临时文件为 %s"
|
|
|
|
|
|
|
|
|
|
#: transport.c:62
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Would set upstream of '%s' to '%s' of '%s'\n"
|
|
|
|
|
msgstr "将要设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n"
|
|
|
|
|
|
|
|
|
|
#: transport.c:151
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "transport: invalid depth option '%s'"
|
|
|
|
|
msgstr "传输:无效的深度选项 '%s'"
|
|
|
|
|
|
|
|
|
|
#: transport.c:817
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"The following submodule paths contain changes that can\n"
|
|
|
|
|
"not be found on any remote:\n"
|
|
|
|
|
msgstr "下列子模组路径所包含的修改在任何远程源中都找不到:\n"
|
|
|
|
|
|
|
|
|
|
#: transport.c:821
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"\n"
|
|
|
|
|
"Please try\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"\tgit push --recurse-submodules=on-demand\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"or cd to the path and use\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"\tgit push\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"to push them to a remote.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"\n"
|
|
|
|
|
"请尝试\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"\tgit push --recurse-submodules=on-demand\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"或者进入到子目录执行\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"\tgit push\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"以推送至远程。\n"
|
|
|
|
|
"\n"
|
|
|
|
|
|
|
|
|
|
#: transport.c:829
|
|
|
|
|
msgid "Aborting."
|
|
|
|
|
msgstr "正在终止。"
|
|
|
|
|
|
|
|
|
|
#: transport-helper.c:1075
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Could not read ref %s"
|
|
|
|
|
msgstr "不能读取引用 %s"
|
|
|
|
|
|
|
|
|
|
#: tree-walk.c:31
|
|
|
|
|
msgid "too-short tree object"
|
|
|
|
|
msgstr "太短的树对象"
|
|
|
|
|
|
|
|
|
|
#: tree-walk.c:37
|
|
|
|
|
msgid "malformed mode in tree entry"
|
|
|
|
|
msgstr "树对象中的条目属性错误"
|
|
|
|
|
|
|
|
|
|
#: tree-walk.c:41
|
|
|
|
|
msgid "empty filename in tree entry"
|
|
|
|
|
msgstr "树对象条目中空的文件名"
|
|
|
|
|
|
|
|
|
|
#: tree-walk.c:113
|
|
|
|
|
msgid "too-short tree file"
|
|
|
|
|
msgstr "太短的树文件"
|
|
|
|
|
|
|
|
|
|
#: unpack-trees.c:64
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Your local changes to the following files would be overwritten by checkout:\n"
|
|
|
|
|
"%%sPlease commit your changes or stash them before you switch branches."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"您对下列文件的本地修改将被检出操作覆盖:\n"
|
|
|
|
|
"%%s请在切换分支前提交您的修改或者保存进度。"
|
|
|
|
|
|
|
|
|
|
#: unpack-trees.c:66
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Your local changes to the following files would be overwritten by checkout:\n"
|
|
|
|
|
"%%s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"您对下列文件的本地修改将被检出操作覆盖:\n"
|
|
|
|
|
"%%s"
|
|
|
|
|
|
|
|
|
|
#: unpack-trees.c:69
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Your local changes to the following files would be overwritten by merge:\n"
|
|
|
|
|
"%%sPlease commit your changes or stash them before you merge."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"您对下列文件的本地修改将被合并操作覆盖:\n"
|
|
|
|
|
"%%s请在合并前提交您的修改或者保存进度。"
|
|
|
|
|
|
|
|
|
|
#: unpack-trees.c:71
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Your local changes to the following files would be overwritten by merge:\n"
|
|
|
|
|
"%%s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"您对下列文件的本地修改将被合并操作覆盖:\n"
|
|
|
|
|
"%%s"
|
|
|
|
|
|
|
|
|
|
#: unpack-trees.c:74
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Your local changes to the following files would be overwritten by %s:\n"
|
|
|
|
|
"%%sPlease commit your changes or stash them before you %s."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"您对下列文件的本地修改将被 %s 覆盖:\n"
|
|
|
|
|
"%%s请在 %s 之前提交您的修改或者保存进度。"
|
2012-07-04 11:20:34 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: unpack-trees.c:76
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Your local changes to the following files would be overwritten by %s:\n"
|
|
|
|
|
"%%s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"您对下列文件的本地修改将被 %s 覆盖:\n"
|
|
|
|
|
"%%s"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: unpack-trees.c:81
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Updating the following directories would lose untracked files in it:\n"
|
|
|
|
|
"%s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"更新如下目录将会丢失其中未跟踪的文件:\n"
|
|
|
|
|
"%s"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: unpack-trees.c:85
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"The following untracked working tree files would be removed by checkout:\n"
|
|
|
|
|
"%%sPlease move or remove them before you switch branches."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"工作区中下列未跟踪的文件将会因为检出操作而被删除:\n"
|
|
|
|
|
"%%s请在切换分支之前移动或删除。"
|
2013-07-26 08:00:02 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: unpack-trees.c:87
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"The following untracked working tree files would be removed by checkout:\n"
|
|
|
|
|
"%%s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"工作区中下列未跟踪的文件将会因为检出操作而被删除:\n"
|
|
|
|
|
"%%s"
|
2013-04-11 11:55:09 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: unpack-trees.c:90
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"The following untracked working tree files would be removed by merge:\n"
|
|
|
|
|
"%%sPlease move or remove them before you merge."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"工作区中下列未跟踪的文件将会因为合并操作而被删除:\n"
|
|
|
|
|
"%%s请在合并前移动或删除。"
|
2013-04-11 11:55:09 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: unpack-trees.c:92
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"The following untracked working tree files would be removed by merge:\n"
|
|
|
|
|
"%%s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"工作区中下列未跟踪的文件将会因为合并操作而被删除:\n"
|
|
|
|
|
"%%s"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: unpack-trees.c:95
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"The following untracked working tree files would be removed by %s:\n"
|
|
|
|
|
"%%sPlease move or remove them before you %s."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n"
|
|
|
|
|
"%%s请在 %s 前移动或删除。"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: unpack-trees.c:97
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"The following untracked working tree files would be removed by %s:\n"
|
|
|
|
|
"%%s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"工作区中下列未跟踪的文件将会因为 %s 操作而被删除:\n"
|
|
|
|
|
"%%s"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: unpack-trees.c:102
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"The following untracked working tree files would be overwritten by "
|
|
|
|
|
"checkout:\n"
|
|
|
|
|
"%%sPlease move or remove them before you switch branches."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n"
|
|
|
|
|
"%%s请在切换分支前移动或删除。"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: unpack-trees.c:104
|
2013-04-11 11:55:09 +02:00
|
|
|
|
#, c-format
|
2013-04-13 04:02:43 +02:00
|
|
|
|
msgid ""
|
2016-10-27 15:53:37 +02:00
|
|
|
|
"The following untracked working tree files would be overwritten by "
|
|
|
|
|
"checkout:\n"
|
|
|
|
|
"%%s"
|
2013-04-13 04:02:43 +02:00
|
|
|
|
msgstr ""
|
2016-10-27 15:53:37 +02:00
|
|
|
|
"工作区中下列未跟踪的文件将会因为检出操作而被覆盖:\n"
|
|
|
|
|
"%%s"
|
2013-04-11 11:55:09 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: unpack-trees.c:107
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"The following untracked working tree files would be overwritten by merge:\n"
|
|
|
|
|
"%%sPlease move or remove them before you merge."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n"
|
|
|
|
|
"%%s请在合并前移动或删除。"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: unpack-trees.c:109
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"The following untracked working tree files would be overwritten by merge:\n"
|
|
|
|
|
"%%s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"工作区中下列未跟踪的文件将会因为合并操作而被覆盖:\n"
|
|
|
|
|
"%%s"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: unpack-trees.c:112
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"The following untracked working tree files would be overwritten by %s:\n"
|
|
|
|
|
"%%sPlease move or remove them before you %s."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n"
|
|
|
|
|
"%%s请在 %s 前移动或删除。"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: unpack-trees.c:114
|
2013-01-30 10:23:08 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"The following untracked working tree files would be overwritten by %s:\n"
|
|
|
|
|
"%%s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖:\n"
|
|
|
|
|
"%%s"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: unpack-trees.c:121
|
2013-01-30 10:23:08 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
|
|
|
|
|
msgstr "条目 '%s' 和 '%s' 重叠。无法合并。"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: unpack-trees.c:124
|
2013-01-30 10:23:08 +01:00
|
|
|
|
#, c-format
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid ""
|
2016-10-27 15:53:37 +02:00
|
|
|
|
"Cannot update sparse checkout: the following entries are not up-to-date:\n"
|
|
|
|
|
"%s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"无法更新稀疏检出:如下条目不是最新:\n"
|
|
|
|
|
"%s"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: unpack-trees.c:126
|
2013-01-30 10:23:08 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"The following working tree files would be overwritten by sparse checkout "
|
|
|
|
|
"update:\n"
|
|
|
|
|
"%s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"工作区中下列文件将被稀疏检出更新所覆盖:\n"
|
|
|
|
|
"%s"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: unpack-trees.c:128
|
2013-01-30 10:23:08 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"The following working tree files would be removed by sparse checkout "
|
|
|
|
|
"update:\n"
|
|
|
|
|
"%s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"工作区中下列文件将被稀疏检出更新所删除:\n"
|
|
|
|
|
"%s"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: unpack-trees.c:205
|
2013-01-30 10:23:08 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "Aborting\n"
|
|
|
|
|
msgstr "终止中\n"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: unpack-trees.c:237
|
|
|
|
|
msgid "Checking out files"
|
|
|
|
|
msgstr "正在检出文件"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: urlmatch.c:120
|
|
|
|
|
msgid "invalid URL scheme name or missing '://' suffix"
|
|
|
|
|
msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
|
|
|
|
|
|
|
|
|
|
#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356
|
2013-01-30 10:23:08 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "invalid %XX escape sequence"
|
|
|
|
|
msgstr "无效的 %XX 转义序列"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: urlmatch.c:172
|
|
|
|
|
msgid "missing host and scheme is not 'file:'"
|
|
|
|
|
msgstr "缺失主机名且 URL 方案不是 'file:'"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: urlmatch.c:189
|
|
|
|
|
msgid "a 'file:' URL may not have a port number"
|
|
|
|
|
msgstr "一个 'file:' URL 不应该包含端口号"
|
2015-11-16 00:02:11 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: urlmatch.c:199
|
|
|
|
|
msgid "invalid characters in host name"
|
|
|
|
|
msgstr "主机名中包含无效的字符"
|
2013-09-17 17:37:05 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: urlmatch.c:244 urlmatch.c:255
|
|
|
|
|
msgid "invalid port number"
|
|
|
|
|
msgstr "无效的端口号"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: urlmatch.c:322
|
|
|
|
|
msgid "invalid '..' path segment"
|
|
|
|
|
msgstr "无效的 '..' 路径片段"
|
2016-03-15 17:27:40 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: worktree.c:282
|
2013-02-14 10:47:45 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "failed to read '%s'"
|
|
|
|
|
msgstr "无法读取 '%s'"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: wrapper.c:222 wrapper.c:392
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "could not open '%s' for reading and writing"
|
|
|
|
|
msgstr "无法打开 '%s' 进行读写"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: wrapper.c:224 wrapper.c:394 builtin/am.c:766
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "could not open '%s' for writing"
|
|
|
|
|
msgstr "无法打开 '%s' 进行写入"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759
|
|
|
|
|
#: builtin/am.c:847 builtin/commit.c:1705 builtin/merge.c:1029
|
|
|
|
|
#: builtin/pull.c:341
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "could not open '%s' for reading"
|
|
|
|
|
msgstr "无法打开 '%s' 进行读取"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: wrapper.c:605 wrapper.c:626
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to access '%s'"
|
|
|
|
|
msgstr "不能访问 '%s'"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: wrapper.c:634
|
|
|
|
|
msgid "unable to get current working directory"
|
|
|
|
|
msgstr "不能获取当前工作目录"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: wrapper.c:658
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "could not write to %s"
|
|
|
|
|
msgstr "不能写入 %s"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: wrapper.c:660
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "could not close %s"
|
|
|
|
|
msgstr "不能关闭 %s"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: wt-status.c:151
|
|
|
|
|
msgid "Unmerged paths:"
|
|
|
|
|
msgstr "未合并的路径:"
|
2015-05-31 02:42:31 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
# 译者:注意保持前导空格
|
|
|
|
|
#: wt-status.c:178 wt-status.c:205
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid " (use \"git reset %s <file>...\" to unstage)"
|
|
|
|
|
msgstr " (使用 \"git reset %s <文件>...\" 以取消暂存)"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
# 译者:注意保持前导空格
|
|
|
|
|
#: wt-status.c:180 wt-status.c:207
|
|
|
|
|
msgid " (use \"git rm --cached <file>...\" to unstage)"
|
|
|
|
|
msgstr " (使用 \"git rm --cached <文件>...\" 以取消暂存)"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
# 译者:注意保持前导空格
|
|
|
|
|
#: wt-status.c:184
|
|
|
|
|
msgid " (use \"git add <file>...\" to mark resolution)"
|
|
|
|
|
msgstr " (使用 \"git add <文件>...\" 标记解决方案)"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
# 译者:注意保持前导空格
|
|
|
|
|
#: wt-status.c:186 wt-status.c:190
|
|
|
|
|
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
|
|
|
|
|
msgstr " (酌情使用 \"git add/rm <文件>...\" 标记解决方案)"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
# 译者:注意保持前导空格
|
|
|
|
|
#: wt-status.c:188
|
|
|
|
|
msgid " (use \"git rm <file>...\" to mark resolution)"
|
|
|
|
|
msgstr " (使用 \"git rm <文件>...\" 标记解决方案)"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: wt-status.c:199 wt-status.c:945
|
|
|
|
|
msgid "Changes to be committed:"
|
|
|
|
|
msgstr "要提交的变更:"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: wt-status.c:217 wt-status.c:954
|
|
|
|
|
msgid "Changes not staged for commit:"
|
|
|
|
|
msgstr "尚未暂存以备提交的变更:"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
# 译者:注意保持前导空格
|
|
|
|
|
#: wt-status.c:221
|
|
|
|
|
msgid " (use \"git add <file>...\" to update what will be committed)"
|
|
|
|
|
msgstr " (使用 \"git add <文件>...\" 更新要提交的内容)"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
# 译者:注意保持前导空格
|
|
|
|
|
#: wt-status.c:223
|
|
|
|
|
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
|
|
|
|
|
msgstr " (使用 \"git add/rm <文件>...\" 更新要提交的内容)"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
# 译者:注意保持前导空格
|
|
|
|
|
#: wt-status.c:224
|
|
|
|
|
msgid ""
|
|
|
|
|
" (use \"git checkout -- <file>...\" to discard changes in working directory)"
|
|
|
|
|
msgstr " (使用 \"git checkout -- <文件>...\" 丢弃工作区的改动)"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
# 译者:注意保持前导空格
|
|
|
|
|
#: wt-status.c:226
|
|
|
|
|
msgid " (commit or discard the untracked or modified content in submodules)"
|
|
|
|
|
msgstr " (提交或丢弃子模组中未跟踪或修改的内容)"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
# 译者:注意保持前导空格
|
|
|
|
|
#: wt-status.c:238
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid " (use \"git %s <file>...\" to include in what will be committed)"
|
|
|
|
|
msgstr " (使用 \"git %s <文件>...\" 以包含要提交的内容)"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: wt-status.c:253
|
|
|
|
|
msgid "both deleted:"
|
|
|
|
|
msgstr "双方删除:"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: wt-status.c:255
|
|
|
|
|
msgid "added by us:"
|
|
|
|
|
msgstr "由我们添加:"
|
2013-04-13 04:02:43 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: wt-status.c:257
|
|
|
|
|
msgid "deleted by them:"
|
|
|
|
|
msgstr "由他们删除:"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: wt-status.c:259
|
|
|
|
|
msgid "added by them:"
|
|
|
|
|
msgstr "由他们添加:"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: wt-status.c:261
|
|
|
|
|
msgid "deleted by us:"
|
|
|
|
|
msgstr "由我们删除:"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: wt-status.c:263
|
|
|
|
|
msgid "both added:"
|
|
|
|
|
msgstr "双方添加:"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: wt-status.c:265
|
|
|
|
|
msgid "both modified:"
|
|
|
|
|
msgstr "双方修改:"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: wt-status.c:275
|
|
|
|
|
msgid "new file:"
|
|
|
|
|
msgstr "新文件:"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: wt-status.c:277
|
|
|
|
|
msgid "copied:"
|
|
|
|
|
msgstr "拷贝:"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: wt-status.c:279
|
|
|
|
|
msgid "deleted:"
|
|
|
|
|
msgstr "删除:"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: wt-status.c:281
|
|
|
|
|
msgid "modified:"
|
|
|
|
|
msgstr "修改:"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: wt-status.c:283
|
|
|
|
|
msgid "renamed:"
|
|
|
|
|
msgstr "重命名:"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: wt-status.c:285
|
|
|
|
|
msgid "typechange:"
|
|
|
|
|
msgstr "类型变更:"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: wt-status.c:287
|
|
|
|
|
msgid "unknown:"
|
|
|
|
|
msgstr "未知:"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: wt-status.c:289
|
|
|
|
|
msgid "unmerged:"
|
|
|
|
|
msgstr "未合并:"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
|
|
|
|
|
#: wt-status.c:371
|
|
|
|
|
msgid "new commits, "
|
|
|
|
|
msgstr "新提交, "
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
|
|
|
|
|
#: wt-status.c:373
|
|
|
|
|
msgid "modified content, "
|
|
|
|
|
msgstr "修改的内容, "
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
|
|
|
|
|
#: wt-status.c:375
|
|
|
|
|
msgid "untracked content, "
|
|
|
|
|
msgstr "未跟踪的内容, "
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: wt-status.c:818
|
|
|
|
|
msgid "Submodules changed but not updated:"
|
|
|
|
|
msgstr "子模组已修改但尚未更新:"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: wt-status.c:820
|
|
|
|
|
msgid "Submodule changes to be committed:"
|
|
|
|
|
msgstr "要提交的子模组变更:"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: wt-status.c:901
|
|
|
|
|
msgid ""
|
|
|
|
|
"Do not touch the line above.\n"
|
|
|
|
|
"Everything below will be removed."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"不要改动上面的一行。\n"
|
|
|
|
|
"下面的所有内容均将被删除。"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: wt-status.c:1013
|
|
|
|
|
msgid "You have unmerged paths."
|
|
|
|
|
msgstr "您有尚未合并的路径。"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
# 译者:注意保持前导空格
|
|
|
|
|
#: wt-status.c:1016
|
|
|
|
|
msgid " (fix conflicts and run \"git commit\")"
|
|
|
|
|
msgstr " (解决冲突并运行 \"git commit\")"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
# 译者:注意保持前导空格
|
|
|
|
|
#: wt-status.c:1018
|
|
|
|
|
msgid " (use \"git merge --abort\" to abort the merge)"
|
|
|
|
|
msgstr " (使用 \"git merge --abort\" 终止合并)"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: wt-status.c:1023
|
|
|
|
|
msgid "All conflicts fixed but you are still merging."
|
|
|
|
|
msgstr "所有冲突已解决但您仍处于合并中。"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
# 译者:注意保持前导空格
|
|
|
|
|
#: wt-status.c:1026
|
|
|
|
|
msgid " (use \"git commit\" to conclude merge)"
|
|
|
|
|
msgstr " (使用 \"git commit\" 结束合并)"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: wt-status.c:1036
|
|
|
|
|
msgid "You are in the middle of an am session."
|
|
|
|
|
msgstr "您正处于 am 操作过程中。"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: wt-status.c:1039
|
|
|
|
|
msgid "The current patch is empty."
|
|
|
|
|
msgstr "当前的补丁为空。"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
# 译者:注意保持前导空格
|
|
|
|
|
#: wt-status.c:1043
|
|
|
|
|
msgid " (fix conflicts and then run \"git am --continue\")"
|
|
|
|
|
msgstr " (解决冲突,然后运行 \"git am --continue\")"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
# 译者:注意保持前导空格
|
|
|
|
|
#: wt-status.c:1045
|
|
|
|
|
msgid " (use \"git am --skip\" to skip this patch)"
|
|
|
|
|
msgstr " (使用 \"git am --skip\" 跳过此补丁)"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
# 译者:注意保持前导空格
|
|
|
|
|
#: wt-status.c:1047
|
|
|
|
|
msgid " (use \"git am --abort\" to restore the original branch)"
|
|
|
|
|
msgstr " (使用 \"git am --abort\" 恢复原有分支)"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: wt-status.c:1172
|
|
|
|
|
msgid "No commands done."
|
|
|
|
|
msgstr "没有命令被执行。"
|
|
|
|
|
|
|
|
|
|
#: wt-status.c:1175
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "Last command done (%d command done):"
|
|
|
|
|
msgid_plural "Last commands done (%d commands done):"
|
|
|
|
|
msgstr[0] "最后一条命令已完成(%d 条命令被执行):"
|
|
|
|
|
msgstr[1] "最后的命令已完成(%d 条命令被执行):"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: wt-status.c:1186
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid " (see more in file %s)"
|
|
|
|
|
msgstr " (更多参见文件 %s)"
|
|
|
|
|
|
|
|
|
|
#: wt-status.c:1191
|
|
|
|
|
msgid "No commands remaining."
|
|
|
|
|
msgstr "未剩下任何命令。"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: wt-status.c:1194
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "Next command to do (%d remaining command):"
|
|
|
|
|
msgid_plural "Next commands to do (%d remaining commands):"
|
|
|
|
|
msgstr[0] "接下来要执行的命令(剩余 %d 条命令):"
|
|
|
|
|
msgstr[1] "接下来要执行的命令(剩余 %d 条命令):"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
# 译者:注意保持前导空格
|
|
|
|
|
#: wt-status.c:1202
|
|
|
|
|
msgid " (use \"git rebase --edit-todo\" to view and edit)"
|
|
|
|
|
msgstr " (使用 \"git rebase --edit-todo\" 来查看和编辑)"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: wt-status.c:1215
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "You are currently rebasing branch '%s' on '%s'."
|
|
|
|
|
msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: wt-status.c:1220
|
|
|
|
|
msgid "You are currently rebasing."
|
|
|
|
|
msgstr "您在执行变基操作。"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
# 译者:注意保持前导空格
|
|
|
|
|
#: wt-status.c:1234
|
|
|
|
|
msgid " (fix conflicts and then run \"git rebase --continue\")"
|
|
|
|
|
msgstr " (解决冲突,然后运行 \"git rebase --continue\")"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
# 译者:注意保持前导空格
|
|
|
|
|
#: wt-status.c:1236
|
|
|
|
|
msgid " (use \"git rebase --skip\" to skip this patch)"
|
|
|
|
|
msgstr " (使用 \"git rebase --skip\" 跳过此补丁)"
|
|
|
|
|
|
|
|
|
|
# 译者:注意保持前导空格
|
|
|
|
|
#: wt-status.c:1238
|
|
|
|
|
msgid " (use \"git rebase --abort\" to check out the original branch)"
|
|
|
|
|
msgstr " (使用 \"git rebase --abort\" 以检出原有分支)"
|
|
|
|
|
|
|
|
|
|
# 译者:注意保持前导空格
|
|
|
|
|
#: wt-status.c:1244
|
|
|
|
|
msgid " (all conflicts fixed: run \"git rebase --continue\")"
|
|
|
|
|
msgstr " (所有冲突已解决:运行 \"git rebase --continue\")"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: wt-status.c:1248
|
|
|
|
|
#, c-format
|
2015-08-23 09:23:21 +02:00
|
|
|
|
msgid ""
|
2016-10-27 15:53:37 +02:00
|
|
|
|
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
|
|
|
|
|
msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: wt-status.c:1253
|
|
|
|
|
msgid "You are currently splitting a commit during a rebase."
|
|
|
|
|
msgstr "您在执行变基操作时拆分提交。"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
# 译者:注意保持前导空格
|
|
|
|
|
#: wt-status.c:1256
|
|
|
|
|
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
|
|
|
|
|
msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: wt-status.c:1260
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
|
|
|
|
|
msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: wt-status.c:1265
|
|
|
|
|
msgid "You are currently editing a commit during a rebase."
|
|
|
|
|
msgstr "您在执行变基操作时编辑提交。"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
# 译者:注意保持前导空格
|
|
|
|
|
#: wt-status.c:1268
|
|
|
|
|
msgid " (use \"git commit --amend\" to amend the current commit)"
|
|
|
|
|
msgstr " (使用 \"git commit --amend\" 修补当前提交)"
|
|
|
|
|
|
|
|
|
|
# 译者:注意保持前导空格
|
|
|
|
|
#: wt-status.c:1270
|
|
|
|
|
msgid ""
|
|
|
|
|
" (use \"git rebase --continue\" once you are satisfied with your changes)"
|
|
|
|
|
msgstr " (当您对您的修改满意后执行 \"git rebase --continue\")"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: wt-status.c:1280
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "You are currently cherry-picking commit %s."
|
|
|
|
|
msgstr "您在执行拣选提交 %s 的操作。"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
# 译者:注意保持前导空格
|
|
|
|
|
#: wt-status.c:1285
|
|
|
|
|
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
|
|
|
|
|
msgstr " (解决冲突并运行 \"git cherry-pick --continue\")"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
# 译者:注意保持前导空格
|
|
|
|
|
#: wt-status.c:1288
|
|
|
|
|
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
|
|
|
|
|
msgstr " (所有冲突已解决:运行 \"git cherry-pick --continue\")"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
# 译者:注意保持前导空格
|
|
|
|
|
#: wt-status.c:1290
|
|
|
|
|
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
|
|
|
|
|
msgstr " (使用 \"git cherry-pick --abort\" 以取消拣选操作)"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: wt-status.c:1299
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "You are currently reverting commit %s."
|
|
|
|
|
msgstr "您在执行反转提交 %s 的操作。"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
# 译者:注意保持前导空格
|
|
|
|
|
#: wt-status.c:1304
|
|
|
|
|
msgid " (fix conflicts and run \"git revert --continue\")"
|
|
|
|
|
msgstr " (解决冲突并运行 \"git revert --continue\")"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
# 译者:注意保持前导空格
|
|
|
|
|
#: wt-status.c:1307
|
|
|
|
|
msgid " (all conflicts fixed: run \"git revert --continue\")"
|
|
|
|
|
msgstr " (所有冲突已解决:运行 \"git revert --continue\")"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
# 译者:注意保持前导空格
|
|
|
|
|
#: wt-status.c:1309
|
|
|
|
|
msgid " (use \"git revert --abort\" to cancel the revert operation)"
|
|
|
|
|
msgstr " (使用 \"git revert --abort\" 以取消反转提交操作)"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: wt-status.c:1320
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "You are currently bisecting, started from branch '%s'."
|
|
|
|
|
msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: wt-status.c:1324
|
|
|
|
|
msgid "You are currently bisecting."
|
|
|
|
|
msgstr "您在执行二分查找操作。"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
# 译者:注意保持前导空格
|
|
|
|
|
#: wt-status.c:1327
|
|
|
|
|
msgid " (use \"git bisect reset\" to get back to the original branch)"
|
|
|
|
|
msgstr " (使用 \"git bisect reset\" 以回到原有分支)"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: wt-status.c:1524
|
|
|
|
|
msgid "On branch "
|
|
|
|
|
msgstr "位于分支 "
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: wt-status.c:1530
|
|
|
|
|
msgid "interactive rebase in progress; onto "
|
|
|
|
|
msgstr "交互式变基操作正在进行中;至 "
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: wt-status.c:1532
|
|
|
|
|
msgid "rebase in progress; onto "
|
|
|
|
|
msgstr "变基操作正在进行中;至 "
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: wt-status.c:1537
|
|
|
|
|
msgid "HEAD detached at "
|
|
|
|
|
msgstr "头指针分离于 "
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: wt-status.c:1539
|
|
|
|
|
msgid "HEAD detached from "
|
|
|
|
|
msgstr "头指针分离自 "
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: wt-status.c:1542
|
|
|
|
|
msgid "Not currently on any branch."
|
|
|
|
|
msgstr "当前不在任何分支上。"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: wt-status.c:1560
|
|
|
|
|
msgid "Initial commit"
|
|
|
|
|
msgstr "初始提交"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: wt-status.c:1574
|
|
|
|
|
msgid "Untracked files"
|
|
|
|
|
msgstr "未跟踪的文件"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: wt-status.c:1576
|
|
|
|
|
msgid "Ignored files"
|
|
|
|
|
msgstr "忽略的文件"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: wt-status.c:1580
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
|
|
|
|
|
"may speed it up, but you have to be careful not to forget to add\n"
|
|
|
|
|
"new files yourself (see 'git help status')."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度,\n"
|
|
|
|
|
"但您需要小心不要忘了添加新文件(参见 'git help status')。"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: wt-status.c:1586
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Untracked files not listed%s"
|
|
|
|
|
msgstr "未跟踪的文件没有列出%s"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
# 译者:中文字符串拼接,可删除前导空格
|
|
|
|
|
#: wt-status.c:1588
|
|
|
|
|
msgid " (use -u option to show untracked files)"
|
|
|
|
|
msgstr "(使用 -u 参数显示未跟踪的文件)"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: wt-status.c:1594
|
|
|
|
|
msgid "No changes"
|
|
|
|
|
msgstr "没有修改"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: wt-status.c:1599
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
|
|
|
|
|
msgstr "修改尚未加入提交(使用 \"git add\" 和/或 \"git commit -a\")\n"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: wt-status.c:1602
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "no changes added to commit\n"
|
|
|
|
|
msgstr "修改尚未加入提交\n"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: wt-status.c:1605
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"nothing added to commit but untracked files present (use \"git add\" to "
|
|
|
|
|
"track)\n"
|
|
|
|
|
msgstr "提交为空,但是存在尚未跟踪的文件(使用 \"git add\" 建立跟踪)\n"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: wt-status.c:1608
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "nothing added to commit but untracked files present\n"
|
|
|
|
|
msgstr "提交为空,但是存在尚未跟踪的文件\n"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
# 译者:中文字符串拼接,可删除前导空格
|
|
|
|
|
#: wt-status.c:1611
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
|
|
|
|
|
msgstr "无文件要提交(创建/拷贝文件并使用 \"git add\" 建立跟踪)\n"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: wt-status.c:1614 wt-status.c:1619
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "nothing to commit\n"
|
|
|
|
|
msgstr "无文件要提交\n"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
# 译者:中文字符串拼接,可删除前导空格
|
|
|
|
|
#: wt-status.c:1617
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "nothing to commit (use -u to show untracked files)\n"
|
|
|
|
|
msgstr "无文件要提交(使用 -u 显示未跟踪的文件)\n"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
# 译者:中文字符串拼接,可删除前导空格
|
|
|
|
|
#: wt-status.c:1621
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "nothing to commit, working tree clean\n"
|
|
|
|
|
msgstr "无文件要提交,干净的工作区\n"
|
|
|
|
|
|
|
|
|
|
# 译者:注意保持句尾空格
|
|
|
|
|
#: wt-status.c:1728
|
|
|
|
|
msgid "Initial commit on "
|
|
|
|
|
msgstr "初始提交于 "
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: wt-status.c:1732
|
|
|
|
|
msgid "HEAD (no branch)"
|
|
|
|
|
msgstr "HEAD(非分支)"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: wt-status.c:1761
|
|
|
|
|
msgid "gone"
|
|
|
|
|
msgstr "丢失"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
# 译者:注意保持句尾空格
|
|
|
|
|
#: wt-status.c:1763 wt-status.c:1771
|
|
|
|
|
msgid "behind "
|
|
|
|
|
msgstr "落后 "
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: wt-status.c:1766 wt-status.c:1769
|
|
|
|
|
msgid "ahead "
|
|
|
|
|
msgstr "领先 "
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#. TRANSLATORS: the action is e.g. "pull with rebase"
|
|
|
|
|
#: wt-status.c:2270
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot %s: You have unstaged changes."
|
|
|
|
|
msgstr "不能%s:您有未暂存的变更。"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: wt-status.c:2276
|
|
|
|
|
msgid "additionally, your index contains uncommitted changes."
|
|
|
|
|
msgstr "而且您的索引中包含未提交的变更。"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: wt-status.c:2278
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot %s: Your index contains uncommitted changes."
|
|
|
|
|
msgstr "不能%s:您的索引中包含未提交的变更。"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: compat/precompose_utf8.c:57 builtin/clone.c:414
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to unlink '%s'"
|
|
|
|
|
msgstr "无法删除 '%s'"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/add.c:22
|
|
|
|
|
msgid "git add [<options>] [--] <pathspec>..."
|
|
|
|
|
msgstr "git add [<选项>] [--] <路径规格>..."
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/add.c:80
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unexpected diff status %c"
|
|
|
|
|
msgstr "意外的差异状态 %c"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/add.c:85 builtin/commit.c:291
|
|
|
|
|
msgid "updating files failed"
|
|
|
|
|
msgstr "更新文件失败"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/add.c:95
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "remove '%s'\n"
|
|
|
|
|
msgstr "删除 '%s'\n"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/add.c:149
|
|
|
|
|
msgid "Unstaged changes after refreshing the index:"
|
|
|
|
|
msgstr "刷新索引之后尚未被暂存的变更:"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/add.c:209 builtin/rev-parse.c:840
|
|
|
|
|
msgid "Could not read the index"
|
|
|
|
|
msgstr "不能读取索引"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/add.c:220
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Could not open '%s' for writing."
|
|
|
|
|
msgstr "无法打开 '%s' 进行写入。"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/add.c:224
|
|
|
|
|
msgid "Could not write patch"
|
|
|
|
|
msgstr "不能生成补丁"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/add.c:227
|
|
|
|
|
msgid "editing patch failed"
|
|
|
|
|
msgstr "编辑补丁失败"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/add.c:230
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "Could not stat '%s'"
|
|
|
|
|
msgstr "不能查看文件状态 '%s'"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/add.c:232
|
|
|
|
|
msgid "Empty patch. Aborted."
|
|
|
|
|
msgstr "空补丁。异常终止。"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/add.c:237
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Could not apply '%s'"
|
|
|
|
|
msgstr "不能应用 '%s'"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/add.c:247
|
|
|
|
|
msgid "The following paths are ignored by one of your .gitignore files:\n"
|
|
|
|
|
msgstr "下列路径根据您的一个 .gitignore 文件而被忽略:\n"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/add.c:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:111
|
|
|
|
|
#: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:521
|
|
|
|
|
#: builtin/remote.c:1326 builtin/rm.c:268 builtin/send-pack.c:162
|
|
|
|
|
msgid "dry run"
|
|
|
|
|
msgstr "演习"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/add.c:269
|
|
|
|
|
msgid "interactive picking"
|
|
|
|
|
msgstr "交互式拣选"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/add.c:270 builtin/checkout.c:1156 builtin/reset.c:286
|
|
|
|
|
msgid "select hunks interactively"
|
|
|
|
|
msgstr "交互式挑选数据块"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/add.c:271
|
|
|
|
|
msgid "edit current diff and apply"
|
|
|
|
|
msgstr "编辑当前差异并应用"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/add.c:272
|
|
|
|
|
msgid "allow adding otherwise ignored files"
|
|
|
|
|
msgstr "允许添加忽略的文件"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/add.c:273
|
|
|
|
|
msgid "update tracked files"
|
|
|
|
|
msgstr "更新已跟踪的文件"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/add.c:274
|
|
|
|
|
msgid "record only the fact that the path will be added later"
|
|
|
|
|
msgstr "只记录,该路径稍后再添加"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/add.c:275
|
|
|
|
|
msgid "add changes from all tracked and untracked files"
|
|
|
|
|
msgstr "添加所有改变的已跟踪文件和未跟踪文件"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/add.c:278
|
|
|
|
|
msgid "ignore paths removed in the working tree (same as --no-all)"
|
|
|
|
|
msgstr "忽略工作区中移除的路径(和 --no-all 相同)"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/add.c:280
|
|
|
|
|
msgid "don't add, only refresh the index"
|
|
|
|
|
msgstr "不添加,只刷新索引"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/add.c:281
|
|
|
|
|
msgid "just skip files which cannot be added because of errors"
|
|
|
|
|
msgstr "跳过因出错不能添加的文件"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/add.c:282
|
|
|
|
|
msgid "check if - even missing - files are ignored in dry run"
|
|
|
|
|
msgstr "检查在演习模式下文件(即使不存在)是否被忽略"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/add.c:283 builtin/update-index.c:947
|
|
|
|
|
msgid "(+/-)x"
|
|
|
|
|
msgstr "(+/-)x"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/add.c:283 builtin/update-index.c:948
|
|
|
|
|
msgid "override the executable bit of the listed files"
|
|
|
|
|
msgstr "覆盖列表里文件的可执行位"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/add.c:305
|
2012-05-21 03:35:47 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "Use -f if you really want to add them.\n"
|
|
|
|
|
msgstr "使用 -f 参数如果您确实要添加它们。\n"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/add.c:312
|
|
|
|
|
msgid "adding files failed"
|
|
|
|
|
msgstr "添加文件失败"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/add.c:348
|
|
|
|
|
msgid "-A and -u are mutually incompatible"
|
|
|
|
|
msgstr "-A 和 -u 选项互斥"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/add.c:355
|
|
|
|
|
msgid "Option --ignore-missing can only be used together with --dry-run"
|
|
|
|
|
msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/add.c:359
|
2012-05-21 03:35:47 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "--chmod param '%s' must be either -x or +x"
|
|
|
|
|
msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/add.c:374
|
2012-05-21 03:35:47 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "Nothing specified, nothing added.\n"
|
|
|
|
|
msgstr "没有指定文件,也没有文件被添加。\n"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/add.c:375
|
2012-05-21 03:35:47 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "Maybe you wanted to say 'git add .'?\n"
|
|
|
|
|
msgstr "也许您想要执行 'git add .'?\n"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:279
|
|
|
|
|
#: builtin/checkout.c:472 builtin/clean.c:914 builtin/commit.c:350
|
|
|
|
|
#: builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298
|
|
|
|
|
#: builtin/submodule--helper.c:244
|
|
|
|
|
msgid "index file corrupt"
|
|
|
|
|
msgstr "索引文件损坏"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/am.c:414
|
|
|
|
|
msgid "could not parse author script"
|
|
|
|
|
msgstr "不能解析作者脚本"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/am.c:491
|
2012-05-30 06:19:47 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "'%s' was deleted by the applypatch-msg hook"
|
|
|
|
|
msgstr "'%s' 被 applypatch-msg 钩子删除"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/am.c:532
|
2012-05-21 03:35:47 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "Malformed input line: '%s'."
|
|
|
|
|
msgstr "非法的输入行:'%s'。"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/am.c:569
|
2012-05-21 03:35:47 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "Failed to copy notes from '%s' to '%s'"
|
|
|
|
|
msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/am.c:595
|
|
|
|
|
msgid "fseek failed"
|
|
|
|
|
msgstr "fseek 失败"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/am.c:775
|
2012-05-21 03:35:47 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "could not parse patch '%s'"
|
|
|
|
|
msgstr "无法解析补丁 '%s'"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/am.c:840
|
|
|
|
|
msgid "Only one StGIT patch series can be applied at once"
|
|
|
|
|
msgstr "一次只能有一个 StGIT 补丁队列被应用"
|
|
|
|
|
|
|
|
|
|
#: builtin/am.c:887
|
|
|
|
|
msgid "invalid timestamp"
|
|
|
|
|
msgstr "无效的时间戳"
|
|
|
|
|
|
|
|
|
|
#: builtin/am.c:890 builtin/am.c:898
|
|
|
|
|
msgid "invalid Date line"
|
|
|
|
|
msgstr "无效的日期行"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/am.c:895
|
|
|
|
|
msgid "invalid timezone offset"
|
|
|
|
|
msgstr "无效的时区偏移值"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/am.c:984
|
|
|
|
|
msgid "Patch format detection failed."
|
|
|
|
|
msgstr "补丁格式检测失败。"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/am.c:989 builtin/clone.c:379
|
2012-05-21 03:35:47 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "failed to create directory '%s'"
|
|
|
|
|
msgstr "无法创建目录 '%s'"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/am.c:993
|
|
|
|
|
msgid "Failed to split patches."
|
|
|
|
|
msgstr "无法拆分补丁。"
|
2015-02-16 14:34:19 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/am.c:1125 builtin/commit.c:376
|
|
|
|
|
msgid "unable to write index file"
|
|
|
|
|
msgstr "无法写入索引文件"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/am.c:1176
|
2012-05-21 03:35:47 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "When you have resolved this problem, run \"%s --continue\"."
|
|
|
|
|
msgstr "当您解决这一问题,执行 \"%s --continue\"。"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/am.c:1177
|
2012-05-30 06:19:47 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
|
|
|
|
|
msgstr "如果您想要跳过这一补丁,则执行 \"%s --skip\"。"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/am.c:1178
|
2012-05-30 06:19:47 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
|
|
|
|
|
msgstr "若要复原至原始分支并停止补丁操作,执行 \"%s --abort\"。"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/am.c:1316
|
|
|
|
|
msgid "Patch is empty. Was it split wrong?"
|
|
|
|
|
msgstr "补丁为空。是不是切分错误?"
|
2012-07-31 00:45:33 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/am.c:1390 builtin/log.c:1550
|
2012-05-21 03:35:47 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "invalid ident line: %s"
|
|
|
|
|
msgstr "包含无效的身份标识:%s"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/am.c:1417
|
2012-05-21 03:35:47 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "unable to parse commit %s"
|
|
|
|
|
msgstr "不能解析提交 %s"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/am.c:1610
|
|
|
|
|
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
|
|
|
|
|
msgstr "仓库缺乏必要的数据对象以进行三方合并。"
|
2015-02-16 14:34:19 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/am.c:1612
|
|
|
|
|
msgid "Using index info to reconstruct a base tree..."
|
|
|
|
|
msgstr "使用索引来重建一个(三方合并的)基础目录树..."
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/am.c:1631
|
|
|
|
|
msgid ""
|
|
|
|
|
"Did you hand edit your patch?\n"
|
|
|
|
|
"It does not apply to blobs recorded in its index."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"您是否曾手动编辑过您的补丁?\n"
|
|
|
|
|
"无法应用补丁到索引中的数据对象上。"
|
2012-07-31 00:45:33 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/am.c:1637
|
|
|
|
|
msgid "Falling back to patching base and 3-way merge..."
|
|
|
|
|
msgstr "回落到基础版本上打补丁及进行三方合并..."
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/am.c:1662
|
|
|
|
|
msgid "Failed to merge in the changes."
|
|
|
|
|
msgstr "无法合并变更。"
|
2012-06-02 11:12:59 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/am.c:1686 builtin/merge.c:628
|
|
|
|
|
msgid "git write-tree failed to write a tree"
|
|
|
|
|
msgstr "git write-tree 无法写入一树对象"
|
2015-02-16 14:34:19 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/am.c:1693
|
|
|
|
|
msgid "applying to an empty history"
|
|
|
|
|
msgstr "正应用到一个空历史上"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/am.c:1706 builtin/commit.c:1769 builtin/merge.c:798
|
|
|
|
|
#: builtin/merge.c:823
|
|
|
|
|
msgid "failed to write commit object"
|
|
|
|
|
msgstr "无法写提交对象"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/am.c:1739 builtin/am.c:1743
|
2012-05-21 03:35:47 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "cannot resume: %s does not exist."
|
|
|
|
|
msgstr "无法继续:%s 不存在。"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/am.c:1759
|
|
|
|
|
msgid "cannot be interactive without stdin connected to a terminal."
|
|
|
|
|
msgstr "标准输入没有和终端关联,不能进行交互式操作。"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/am.c:1764
|
|
|
|
|
msgid "Commit Body is:"
|
|
|
|
|
msgstr "提交内容为:"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
# 译者:注意保持句尾空格
|
|
|
|
|
#. 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:1774
|
|
|
|
|
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
|
|
|
|
|
msgstr "应用?是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]:"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/am.c:1824
|
2012-05-21 03:35:47 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "Dirty index: cannot apply patches (dirty: %s)"
|
|
|
|
|
msgstr "脏索引:不能应用补丁(脏文件:%s)"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/am.c:1861 builtin/am.c:1933
|
2012-05-30 06:19:47 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "Applying: %.*s"
|
|
|
|
|
msgstr "应用:%.*s"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/am.c:1877
|
|
|
|
|
msgid "No changes -- Patch already applied."
|
|
|
|
|
msgstr "没有变更 —— 补丁已经应用过。"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/am.c:1885
|
2012-05-30 06:19:47 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "Patch failed at %s %.*s"
|
|
|
|
|
msgstr "打补丁失败于 %s %.*s"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/am.c:1891
|
2012-05-21 03:35:47 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "The copy of the patch that failed is found in: %s"
|
|
|
|
|
msgstr "失败的补丁文件副本位于:%s"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/am.c:1936
|
|
|
|
|
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"
|
|
|
|
|
"您也许想要跳过这个补丁。"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/am.c:1943
|
|
|
|
|
msgid ""
|
|
|
|
|
"You still have unmerged paths in your index.\n"
|
|
|
|
|
"Did you forget to use 'git add'?"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"您的索引中仍有未合并的路径。\n"
|
|
|
|
|
"您是否忘了执行 'git add'?"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/am.c:2051 builtin/am.c:2055 builtin/am.c:2067 builtin/reset.c:308
|
|
|
|
|
#: builtin/reset.c:316
|
2012-05-21 03:35:47 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "Could not parse object '%s'."
|
|
|
|
|
msgstr "不能解析对象 '%s'。"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/am.c:2103
|
|
|
|
|
msgid "failed to clean index"
|
|
|
|
|
msgstr "无法清空索引"
|
2016-05-29 14:40:35 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/am.c:2137
|
|
|
|
|
msgid ""
|
|
|
|
|
"You seem to have moved HEAD since the last 'am' failure.\n"
|
|
|
|
|
"Not rewinding to ORIG_HEAD"
|
|
|
|
|
msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/am.c:2200
|
2012-05-21 03:35:47 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "Invalid value for --patch-format: %s"
|
|
|
|
|
msgstr "无效的 --patch-format 值:%s"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/am.c:2233
|
|
|
|
|
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
|
|
|
|
|
msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]"
|
2016-05-29 14:40:35 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/am.c:2234
|
|
|
|
|
msgid "git am [<options>] (--continue | --skip | --abort)"
|
|
|
|
|
msgstr "git am [<选项>] (--continue | --skip | --abort)"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/am.c:2240
|
|
|
|
|
msgid "run interactively"
|
|
|
|
|
msgstr "以交互式方式运行"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/am.c:2242
|
|
|
|
|
msgid "historical option -- no-op"
|
|
|
|
|
msgstr "老的参数 —— 无作用"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/am.c:2244
|
|
|
|
|
msgid "allow fall back on 3way merging if needed"
|
|
|
|
|
msgstr "如果必要,允许使用三方合并。"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/am.c:2245 builtin/init-db.c:483 builtin/prune-packed.c:57
|
|
|
|
|
#: builtin/repack.c:172
|
|
|
|
|
msgid "be quiet"
|
|
|
|
|
msgstr "静默模式"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/am.c:2247
|
|
|
|
|
msgid "add a Signed-off-by line to the commit message"
|
|
|
|
|
msgstr "在提交说明中添加一个 Signed-off-by 签名"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/am.c:2250
|
|
|
|
|
msgid "recode into utf8 (default)"
|
|
|
|
|
msgstr "使用 utf8 字符集(默认)"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/am.c:2252
|
|
|
|
|
msgid "pass -k flag to git-mailinfo"
|
|
|
|
|
msgstr "向 git-mailinfo 传递 -k 参数"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/am.c:2254
|
|
|
|
|
msgid "pass -b flag to git-mailinfo"
|
|
|
|
|
msgstr "向 git-mailinfo 传递 -b 参数"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/am.c:2256
|
|
|
|
|
msgid "pass -m flag to git-mailinfo"
|
|
|
|
|
msgstr "向 git-mailinfo 传递 -m 参数"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/am.c:2258
|
|
|
|
|
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
|
|
|
|
|
msgstr "针对 mbox 格式,向 git-mailsplit 传递 --keep-cr 参数"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/am.c:2261
|
|
|
|
|
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
|
|
|
|
|
msgstr "不向 git-mailsplit 传递 --keep-cr 参数,覆盖 am.keepcr 的设置"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/am.c:2264
|
|
|
|
|
msgid "strip everything before a scissors line"
|
|
|
|
|
msgstr "丢弃裁切线前的所有内容"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275
|
|
|
|
|
#: builtin/am.c:2278 builtin/am.c:2281 builtin/am.c:2284 builtin/am.c:2287
|
|
|
|
|
#: builtin/am.c:2293
|
|
|
|
|
msgid "pass it through git-apply"
|
|
|
|
|
msgstr "传递给 git-apply"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665
|
|
|
|
|
#: builtin/grep.c:707 builtin/merge.c:200 builtin/pull.c:135
|
|
|
|
|
#: builtin/pull.c:194 builtin/repack.c:181 builtin/repack.c:185
|
|
|
|
|
#: builtin/show-branch.c:644 builtin/show-ref.c:175 builtin/tag.c:340
|
|
|
|
|
#: parse-options.h:132 parse-options.h:134 parse-options.h:245
|
|
|
|
|
msgid "n"
|
|
|
|
|
msgstr "n"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/am.c:2289 builtin/for-each-ref.c:37 builtin/replace.c:438
|
|
|
|
|
#: builtin/tag.c:372
|
|
|
|
|
msgid "format"
|
|
|
|
|
msgstr "格式"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/am.c:2290
|
|
|
|
|
msgid "format the patch(es) are in"
|
|
|
|
|
msgstr "补丁的格式"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/am.c:2296
|
|
|
|
|
msgid "override error message when patch failure occurs"
|
|
|
|
|
msgstr "打补丁失败时显示的错误信息"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/am.c:2298
|
|
|
|
|
msgid "continue applying patches after resolving a conflict"
|
|
|
|
|
msgstr "冲突解决后继续应用补丁"
|
2015-02-16 14:34:19 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/am.c:2301
|
|
|
|
|
msgid "synonyms for --continue"
|
|
|
|
|
msgstr "和 --continue 同义"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/am.c:2304
|
|
|
|
|
msgid "skip the current patch"
|
|
|
|
|
msgstr "跳过当前补丁"
|
2012-07-31 00:45:33 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/am.c:2307
|
|
|
|
|
msgid "restore the original branch and abort the patching operation."
|
|
|
|
|
msgstr "恢复原始分支并终止打补丁操作。"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/am.c:2311
|
|
|
|
|
msgid "lie about committer date"
|
|
|
|
|
msgstr "将作者日期作为提交日期"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/am.c:2313
|
|
|
|
|
msgid "use current timestamp for author date"
|
|
|
|
|
msgstr "用当前时间作为作者日期"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/am.c:2315 builtin/commit.c:1605 builtin/merge.c:229
|
|
|
|
|
#: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:355
|
|
|
|
|
msgid "key-id"
|
|
|
|
|
msgstr "key-id"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/am.c:2316
|
|
|
|
|
msgid "GPG-sign commits"
|
|
|
|
|
msgstr "使用 GPG 签名提交"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/am.c:2319
|
|
|
|
|
msgid "(internal use for git-rebase)"
|
|
|
|
|
msgstr "(内部使用,用于 git-rebase)"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/am.c:2334
|
|
|
|
|
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"
|
|
|
|
|
"请不要再使用它了。"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/am.c:2341
|
|
|
|
|
msgid "failed to read the index"
|
|
|
|
|
msgstr "无法读取索引"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/am.c:2356
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "previous rebase directory %s still exists but mbox given."
|
|
|
|
|
msgstr "之前的变基目录 %s 仍然存在,但却提供了 mbox。"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/am.c:2380
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Stray %s directory found.\n"
|
|
|
|
|
"Use \"git am --abort\" to remove it."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"发现了错误的 %s 目录。\n"
|
|
|
|
|
"使用 \"git am --abort\" 删除它。"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/am.c:2386
|
|
|
|
|
msgid "Resolve operation not in progress, we are not resuming."
|
|
|
|
|
msgstr "解决操作未进行,我们不会继续。"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/apply.c:8
|
|
|
|
|
msgid "git apply [<options>] [<patch>...]"
|
|
|
|
|
msgstr "git apply [<选项>] [<补丁>...]"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
|
|
|
|
#: builtin/archive.c:17
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "could not create archive file '%s'"
|
2012-03-27 08:46:11 +02:00
|
|
|
|
msgstr "不能创建归档文件 '%s'"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
|
|
|
|
#: builtin/archive.c:20
|
|
|
|
|
msgid "could not redirect output"
|
2012-08-07 11:39:30 +02:00
|
|
|
|
msgstr "不能重定向输出"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
|
|
|
|
#: builtin/archive.c:37
|
|
|
|
|
msgid "git archive: Remote with no URL"
|
2015-08-10 12:03:29 +02:00
|
|
|
|
msgstr "git archive:未提供远程 URL"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
|
|
|
|
#: builtin/archive.c:58
|
|
|
|
|
msgid "git archive: expected ACK/NAK, got EOF"
|
2015-08-10 12:03:29 +02:00
|
|
|
|
msgstr "git archive:应为 ACK/NACK,却得到 EOF"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2013-04-11 11:55:09 +02:00
|
|
|
|
#: builtin/archive.c:61
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "git archive: NACK %s"
|
2012-03-27 08:46:11 +02:00
|
|
|
|
msgstr "git archive:NACK %s"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2013-04-11 11:55:09 +02:00
|
|
|
|
#: builtin/archive.c:63
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "remote error: %s"
|
|
|
|
|
msgstr "远程错误:%s"
|
|
|
|
|
|
2013-04-11 11:55:09 +02:00
|
|
|
|
#: builtin/archive.c:64
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "git archive: protocol error"
|
2012-03-27 08:46:11 +02:00
|
|
|
|
msgstr "git archive:协议错误"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2013-04-11 11:55:09 +02:00
|
|
|
|
#: builtin/archive.c:68
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "git archive: expected a flush"
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgstr "git archive:应有一个 flush 刷新"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2012-09-15 05:17:00 +02:00
|
|
|
|
#: builtin/bisect--helper.c:7
|
|
|
|
|
msgid "git bisect--helper --next-all [--no-checkout]"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "git bisect--helper --next-all [--no-checkout]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
|
|
|
|
#: builtin/bisect--helper.c:17
|
|
|
|
|
msgid "perform 'git bisect next'"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "执行 'git bisect next'"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
|
|
|
|
#: builtin/bisect--helper.c:19
|
|
|
|
|
msgid "update BISECT_HEAD instead of checking out the current commit"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "更新 BISECT_HEAD 而非检出当前提交"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/blame.c:33
|
2015-05-31 02:42:31 +02:00
|
|
|
|
msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
|
|
|
|
|
msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/blame.c:38
|
2015-02-16 14:34:19 +01:00
|
|
|
|
msgid "<rev-opts> are documented in git-rev-list(1)"
|
|
|
|
|
msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/blame.c:1781
|
2016-02-28 13:35:55 +01:00
|
|
|
|
msgid "Blaming lines"
|
|
|
|
|
msgstr "追踪代码行"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/blame.c:2577
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "Show blame entries as we find them, incrementally"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "增量式地显示发现的 blame 条目"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/blame.c:2578
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "Show blank SHA-1 for boundary commits (Default: off)"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "边界提交显示空的 SHA-1(默认:关闭)"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/blame.c:2579
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "Do not treat root commits as boundaries (Default: off)"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "不把根提交作为边界(默认:关闭)"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/blame.c:2580
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "Show work cost statistics"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "显示命令消耗统计"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/blame.c:2581
|
2016-02-28 13:35:55 +01:00
|
|
|
|
msgid "Force progress reporting"
|
|
|
|
|
msgstr "强制进度显示"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/blame.c:2582
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "Show output score for blame entries"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "显示判断 blame 条目位移的得分诊断信息"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/blame.c:2583
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "Show original filename (Default: auto)"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "显示原始文件名(默认:自动)"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/blame.c:2584
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "Show original linenumber (Default: off)"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "显示原始的行号(默认:关闭)"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/blame.c:2585
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "Show in a format designed for machine consumption"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "显示为一个适合机器读取的格式"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/blame.c:2586
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "Show porcelain format with per-line commit information"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "为每一行显示机器适用的提交信息"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/blame.c:2587
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "Use the same output mode as git-annotate (Default: off)"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "使用和 git-annotate 相同的输出模式(默认:关闭)"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/blame.c:2588
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "Show raw timestamp (Default: off)"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "显示原始时间戳(默认:关闭)"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/blame.c:2589
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "Show long commit SHA1 (Default: off)"
|
2015-08-10 12:03:29 +02:00
|
|
|
|
msgstr "显示长的 SHA1 提交号(默认:关闭)"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/blame.c:2590
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "Suppress author name and timestamp (Default: off)"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "隐藏作者名字和时间戳(默认:关闭)"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/blame.c:2591
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "Show author email instead of name (Default: off)"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "显示作者的邮箱而不是名字(默认:关闭)"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/blame.c:2592
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "Ignore whitespace differences"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "忽略空白差异"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/blame.c:2599
|
|
|
|
|
msgid "Use an experimental indent-based heuristic to improve diffs"
|
|
|
|
|
msgstr "使用一个试验性的基于缩进的启发式算法改进差异显示"
|
|
|
|
|
|
|
|
|
|
#: builtin/blame.c:2600
|
|
|
|
|
msgid "Use an experimental blank-line-based heuristic to improve diffs"
|
|
|
|
|
msgstr "使用一个试验性的基于空行的启发式算法改进差异显示"
|
|
|
|
|
|
|
|
|
|
#: builtin/blame.c:2602
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "Spend extra cycles to find better match"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "花费额外的循环来找到更好的匹配"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/blame.c:2603
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "Use revisions from <file> instead of calling git-rev-list"
|
2015-01-18 13:37:57 +01:00
|
|
|
|
msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/blame.c:2604
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "Use <file>'s contents as the final image"
|
2015-01-18 13:37:57 +01:00
|
|
|
|
msgstr "使用 <文件> 的内容作为最终的图片"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/blame.c:2605 builtin/blame.c:2606
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "score"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "得分"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/blame.c:2605
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "Find line copies within and across files"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "找到文件内及跨文件的行拷贝"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/blame.c:2606
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "Find line movements within and across files"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "找到文件内及跨文件的行移动"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/blame.c:2607
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "n,m"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "n,m"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/blame.c:2607
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "Process only line range n,m, counting from 1"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "只处理行范围在 n 和 m 之间的,从 1 开始"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/blame.c:2654
|
|
|
|
|
msgid "--progress can't be used with --incremental or porcelain formats"
|
|
|
|
|
msgstr "--progress 不能和 --incremental 或 --porcelain 同时使用"
|
|
|
|
|
|
2014-03-13 05:41:34 +01:00
|
|
|
|
#. 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.
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/blame.c:2700
|
2014-03-13 05:41:34 +01:00
|
|
|
|
msgid "4 years, 11 months ago"
|
|
|
|
|
msgstr "4 年 11 个月前"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/blame.c:2780
|
|
|
|
|
msgid "--contents and --reverse do not blend well."
|
|
|
|
|
msgstr "--contents 和 --reverse 不能混用。"
|
|
|
|
|
|
|
|
|
|
#: builtin/blame.c:2800
|
|
|
|
|
msgid "cannot use --contents with final commit object name"
|
|
|
|
|
msgstr "不能将 --contents 和最终的提交对象名共用"
|
|
|
|
|
|
|
|
|
|
#: builtin/blame.c:2805
|
|
|
|
|
msgid "--reverse and --first-parent together require specified latest commit"
|
|
|
|
|
msgstr "--reverse 和 --first-parent 共用,需要指定最新的提交"
|
|
|
|
|
|
|
|
|
|
#: builtin/blame.c:2832
|
|
|
|
|
msgid ""
|
|
|
|
|
"--reverse --first-parent together require range along first-parent chain"
|
|
|
|
|
msgstr "--reverse 和 --first-parent 共用,需要第一祖先链上的提交范围"
|
|
|
|
|
|
|
|
|
|
#: builtin/blame.c:2843
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "no such path %s in %s"
|
|
|
|
|
msgstr "在 %2$s 中无此路径 %1$s"
|
|
|
|
|
|
|
|
|
|
#: builtin/blame.c:2854
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot read blob %s for path %s"
|
|
|
|
|
msgstr "不能为路径 %2$s 读取对象 %1$s"
|
|
|
|
|
|
|
|
|
|
#: builtin/blame.c:2873
|
|
|
|
|
#, 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 行"
|
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/branch.c:26
|
2015-02-16 14:34:19 +01:00
|
|
|
|
msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
|
|
|
|
|
msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/branch.c:27
|
2015-02-16 14:34:19 +01:00
|
|
|
|
msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
|
|
|
|
|
msgstr "git branch [<选项>] [-l] [-f] <分支名> [<起始点>]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/branch.c:28
|
2015-02-16 14:34:19 +01:00
|
|
|
|
msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
|
|
|
|
|
msgstr "git branch [<选项>] [-r] (-d | -D) <分支名>..."
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/branch.c:29
|
2015-02-16 14:34:19 +01:00
|
|
|
|
msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
|
|
|
|
|
msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/branch.c:30
|
2015-11-16 00:02:11 +01:00
|
|
|
|
msgid "git branch [<options>] [-r | -a] [--points-at]"
|
|
|
|
|
msgstr "git branch [<选项>] [-r | -a] [--points-at]"
|
|
|
|
|
|
2012-03-27 08:46:11 +02:00
|
|
|
|
# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/branch.c:143
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"deleting branch '%s' that has been merged to\n"
|
|
|
|
|
" '%s', but not yet merged to HEAD."
|
|
|
|
|
msgstr ""
|
2012-02-28 18:58:30 +01:00
|
|
|
|
"将要删除的分支 '%s' 已经被合并到\n"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
" '%s',但未合并到 HEAD。"
|
|
|
|
|
|
2012-03-27 08:46:11 +02:00
|
|
|
|
# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/branch.c:147
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"not deleting branch '%s' that is not yet merged to\n"
|
|
|
|
|
" '%s', even though it is merged to HEAD."
|
|
|
|
|
msgstr ""
|
2012-02-28 18:58:30 +01:00
|
|
|
|
"并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
|
|
|
|
|
" 然而却尚未被合并到分支 '%s' 。"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/branch.c:161
|
2013-01-30 10:23:08 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Couldn't look up commit object for '%s'"
|
|
|
|
|
msgstr "无法查询 '%s' 指向的提交对象"
|
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/branch.c:165
|
2013-01-30 10:23:08 +01:00
|
|
|
|
#, 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'。"
|
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/branch.c:178
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgid "Update of config-file failed"
|
|
|
|
|
msgstr "无法更新 config 文件"
|
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/branch.c:206
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "cannot use -a with -d"
|
2012-08-02 05:50:59 +02:00
|
|
|
|
msgstr "不能将 -a 和 -d 同时使用"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/branch.c:212
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "Couldn't look up commit object for HEAD"
|
|
|
|
|
msgstr "无法查询 HEAD 指向的提交对象"
|
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/branch.c:226
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
2016-05-29 14:40:35 +02:00
|
|
|
|
msgid "Cannot delete branch '%s' checked out at '%s'"
|
|
|
|
|
msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/branch.c:241
|
l10n: Set nplurals of zh_CN.po from 1 to 2
In most cases, plural-forms are unnecessary for Chinese. For example,
"apple" and "apples" are the same in Chinese, they are both translated
as "苹果". While there are exceptions, e.g., the plural form of "he",
"she" and "it" is "they" in English. In Chinese, "他(he)", "她(she)",
and "它(it)" have plural forms too, they are "他们", "她们", and "它们".
But what makes 'nplurals=1' hard to work right for Chinese is:
#: bundle.c:192
#, c-format
msgid "The bundle requires this ref"
msgid_plural "The bundle requires these %d refs"
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-05-31 11:35:59 +02:00
|
|
|
|
#, c-format
|
2015-05-31 02:42:31 +02:00
|
|
|
|
msgid "remote-tracking branch '%s' not found."
|
|
|
|
|
msgstr "未能找到远程跟踪分支 '%s'。"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/branch.c:242
|
2012-05-30 06:19:47 +02:00
|
|
|
|
#, c-format
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "branch '%s' not found."
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "分支 '%s' 未发现。"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/branch.c:257
|
2012-05-30 06:19:47 +02:00
|
|
|
|
#, c-format
|
2015-05-31 02:42:31 +02:00
|
|
|
|
msgid "Error deleting remote-tracking branch '%s'"
|
|
|
|
|
msgstr "无法删除远程跟踪分支 '%s'"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/branch.c:258
|
2012-05-30 06:19:47 +02:00
|
|
|
|
#, c-format
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "Error deleting branch '%s'"
|
2015-05-31 02:42:31 +02:00
|
|
|
|
msgstr "无法删除分支 '%s'"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/branch.c:265
|
2012-05-30 06:19:47 +02:00
|
|
|
|
#, c-format
|
2015-05-31 02:42:31 +02:00
|
|
|
|
msgid "Deleted remote-tracking branch %s (was %s).\n"
|
|
|
|
|
msgstr "已删除远程跟踪分支 %s(曾为 %s)。\n"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/branch.c:266
|
2012-05-30 06:19:47 +02:00
|
|
|
|
#, c-format
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "Deleted branch %s (was %s).\n"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "已删除分支 %s(曾为 %s)。\n"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/branch.c:312
|
2012-05-30 06:19:47 +02:00
|
|
|
|
#, c-format
|
2013-09-17 17:37:05 +02:00
|
|
|
|
msgid "[%s: gone]"
|
|
|
|
|
msgstr "[%s: 丢失]"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/branch.c:317
|
2013-09-17 17:37:05 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "[%s]"
|
|
|
|
|
msgstr "[%s]"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/branch.c:322
|
2013-09-17 17:37:05 +02:00
|
|
|
|
#, c-format
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "[%s: behind %d]"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "[%s:落后 %d]"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/branch.c:324
|
2012-05-30 06:19:47 +02:00
|
|
|
|
#, c-format
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "[behind %d]"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "[落后 %d]"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/branch.c:328
|
2012-05-30 06:19:47 +02:00
|
|
|
|
#, c-format
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "[%s: ahead %d]"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "[%s:领先 %d]"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/branch.c:330
|
2012-05-30 06:19:47 +02:00
|
|
|
|
#, c-format
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "[ahead %d]"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "[领先 %d]"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/branch.c:333
|
2012-05-30 06:19:47 +02:00
|
|
|
|
#, c-format
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "[%s: ahead %d, behind %d]"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "[%s:领先 %d,落后 %d]"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/branch.c:336
|
2012-05-30 06:19:47 +02:00
|
|
|
|
#, c-format
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "[ahead %d, behind %d]"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "[领先 %d,落后 %d]"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/branch.c:349
|
2013-02-14 10:47:45 +01:00
|
|
|
|
msgid " **** invalid ref ****"
|
|
|
|
|
msgstr " **** 无效引用 ****"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/branch.c:375
|
2013-04-11 11:55:09 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "(no branch, rebasing %s)"
|
|
|
|
|
msgstr "(非分支,正变基 %s)"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/branch.c:378
|
2013-04-11 11:55:09 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "(no branch, bisect started on %s)"
|
|
|
|
|
msgstr "(非分支,二分查找开始于 %s)"
|
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#. TRANSLATORS: make sure this matches
|
|
|
|
|
#. "HEAD detached at " in wt-status.c
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/branch.c:384
|
2013-04-11 11:55:09 +02:00
|
|
|
|
#, c-format
|
2015-02-16 14:34:19 +01:00
|
|
|
|
msgid "(HEAD detached at %s)"
|
|
|
|
|
msgstr "(头指针分离于 %s)"
|
2013-04-11 11:55:09 +02:00
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#. TRANSLATORS: make sure this matches
|
|
|
|
|
#. "HEAD detached from " in wt-status.c
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/branch.c:389
|
2015-02-16 14:34:19 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "(HEAD detached from %s)"
|
|
|
|
|
msgstr "(头指针分离自 %s)"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/branch.c:393
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "(no branch)"
|
|
|
|
|
msgstr "(非分支)"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/branch.c:544
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Branch %s is being rebased at %s"
|
|
|
|
|
msgstr "分支 %s 正被变基到 %s"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/branch.c:548
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Branch %s is being bisected at %s"
|
|
|
|
|
msgstr "分支 %s 正被二分查找于 %s"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/branch.c:563
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "cannot rename the current branch while not on any."
|
2012-03-27 08:46:11 +02:00
|
|
|
|
msgstr "无法重命名当前分支因为不处于任何分支上。"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/branch.c:573
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Invalid branch name: '%s'"
|
|
|
|
|
msgstr "无效的分支名:'%s'"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/branch.c:590
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "Branch rename failed"
|
|
|
|
|
msgstr "分支重命名失败"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/branch.c:594
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Renamed a misnamed branch '%s' away"
|
|
|
|
|
msgstr "重命名掉一个错误命名的旧分支 '%s'"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/branch.c:597
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Branch renamed to %s, but HEAD is not updated!"
|
|
|
|
|
msgstr "分支重命名为 %s,但 HEAD 没有更新!"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/branch.c:604
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "Branch is renamed, but update of config-file failed"
|
|
|
|
|
msgstr "分支被重命名,但更新 config 文件失败"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/branch.c:620
|
|
|
|
|
#, 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"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/branch.c:651
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "Generic options"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "通用选项"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/branch.c:653
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "show hash and subject, give twice for upstream branch"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "显示哈希值和主题,若参数出现两次则显示上游分支"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/branch.c:654
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "suppress informational messages"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "不显示信息"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/branch.c:655
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "set up tracking mode (see git-pull(1))"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "设置跟踪模式(参见 git-pull(1))"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/branch.c:657
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "change upstream info"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "改变上游信息"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/branch.c:659
|
|
|
|
|
msgid "upstream"
|
|
|
|
|
msgstr "上游"
|
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:659
|
|
|
|
|
msgid "change the upstream info"
|
|
|
|
|
msgstr "改变上游信息"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/branch.c:660
|
|
|
|
|
msgid "Unset the upstream info"
|
|
|
|
|
msgstr "取消上游信息的设置"
|
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/branch.c:661
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "use colored output"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "使用彩色输出"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/branch.c:662
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "act on remote-tracking branches"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "作用于远程跟踪分支"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/branch.c:664 builtin/branch.c:665
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "print only branches that contain the commit"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "只打印包含该提交的分支"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/branch.c:668
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "Specific git-branch actions:"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "具体的 git-branch 动作:"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/branch.c:669
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "list both remote-tracking and local branches"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "列出远程跟踪及本地分支"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/branch.c:671
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "delete fully merged branch"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "删除完全合并的分支"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/branch.c:672
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "delete branch (even if not merged)"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "删除分支(即使没有合并)"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/branch.c:673
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "move/rename a branch and its reflog"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "移动/重命名一个分支,以及它的引用日志"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/branch.c:674
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "move/rename a branch, even if target exists"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "移动/重命名一个分支,即使目标已存在"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/branch.c:675
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "list branch names"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "列出分支名"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/branch.c:676
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "create the branch's reflog"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "创建分支的引用日志"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/branch.c:678
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "edit the description for the branch"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "标记分支的描述"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/branch.c:679
|
2015-01-04 05:27:38 +01:00
|
|
|
|
msgid "force creation, move/rename, deletion"
|
|
|
|
|
msgstr "强制创建、移动/重命名、删除"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/branch.c:680
|
2015-11-16 00:02:11 +01:00
|
|
|
|
msgid "print only branches that are merged"
|
|
|
|
|
msgstr "只打印已经合并的分支"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/branch.c:681
|
2015-11-16 00:02:11 +01:00
|
|
|
|
msgid "print only branches that are not merged"
|
|
|
|
|
msgstr "只打印尚未合并的分支"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/branch.c:682
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "list branches in columns"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "以列的方式显示分支"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/branch.c:683 builtin/for-each-ref.c:38 builtin/tag.c:366
|
2015-11-16 00:02:11 +01:00
|
|
|
|
msgid "key"
|
|
|
|
|
msgstr "key"
|
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/branch.c:684 builtin/for-each-ref.c:39 builtin/tag.c:367
|
2015-11-16 00:02:11 +01:00
|
|
|
|
msgid "field name to sort on"
|
|
|
|
|
msgstr "排序的字段名"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:404
|
|
|
|
|
#: builtin/notes.c:407 builtin/notes.c:567 builtin/notes.c:570
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/tag.c:369
|
|
|
|
|
msgid "object"
|
|
|
|
|
msgstr "对象"
|
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/branch.c:687
|
2015-11-16 00:02:11 +01:00
|
|
|
|
msgid "print only branches of the object"
|
|
|
|
|
msgstr "只打印指向该对象的分支"
|
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/branch.c:705
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "Failed to resolve HEAD as a valid ref."
|
|
|
|
|
msgstr "无法将 HEAD 解析为有效引用。"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/branch.c:709 builtin/clone.c:706
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "HEAD not found below refs/heads!"
|
2012-03-27 08:46:11 +02:00
|
|
|
|
msgstr "HEAD 没有位于 /refs/heads 之下!"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/branch.c:729
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "--column and --verbose are incompatible"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "--column 和 --verbose 不兼容"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/branch.c:740 builtin/branch.c:782
|
2013-02-14 10:47:45 +01:00
|
|
|
|
msgid "branch name required"
|
|
|
|
|
msgstr "必须提供分支名"
|
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/branch.c:758
|
2013-02-14 10:47:45 +01:00
|
|
|
|
msgid "Cannot give description to detached HEAD"
|
|
|
|
|
msgstr "不能向分离头指针提供描述"
|
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/branch.c:763
|
2013-02-14 10:47:45 +01:00
|
|
|
|
msgid "cannot edit description of more than one branch"
|
|
|
|
|
msgstr "不能为一个以上的分支编辑描述"
|
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/branch.c:770
|
2013-02-14 10:47:45 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "No commit on branch '%s' yet."
|
|
|
|
|
msgstr "分支 '%s' 尚无提交。"
|
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/branch.c:773
|
2013-02-14 10:47:45 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "No branch named '%s'."
|
|
|
|
|
msgstr "没有分支 '%s'。"
|
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/branch.c:788
|
2013-02-14 10:47:45 +01:00
|
|
|
|
msgid "too many branches for a rename operation"
|
|
|
|
|
msgstr "为重命名操作提供了太多的分支名"
|
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/branch.c:793
|
2013-04-11 11:55:09 +02:00
|
|
|
|
msgid "too many branches to set new upstream"
|
|
|
|
|
msgstr "为设置新上游提供了太多的分支名"
|
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/branch.c:797
|
2013-04-11 11:55:09 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"could not set upstream of HEAD to %s when it does not point to any branch."
|
|
|
|
|
msgstr "无法设置 HEAD 的上游为 %s,因为 HEAD 没有指向任何分支。"
|
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/branch.c:800 builtin/branch.c:822 builtin/branch.c:843
|
2013-04-11 11:55:09 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "no such branch '%s'"
|
|
|
|
|
msgstr "没有此分支 '%s'"
|
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/branch.c:804
|
2013-01-30 10:23:08 +01:00
|
|
|
|
#, c-format
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "branch '%s' does not exist"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "分支 '%s' 不存在"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/branch.c:816
|
2013-04-11 11:55:09 +02:00
|
|
|
|
msgid "too many branches to unset upstream"
|
|
|
|
|
msgstr "为取消上游设置操作提供了太多的分支名"
|
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/branch.c:820
|
2013-04-11 11:55:09 +02:00
|
|
|
|
msgid "could not unset upstream of HEAD when it does not point to any branch."
|
|
|
|
|
msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
|
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/branch.c:826
|
2012-09-15 05:17:00 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Branch '%s' has no upstream information"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "分支 '%s' 没有上游信息"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/branch.c:840
|
2013-04-11 11:55:09 +02:00
|
|
|
|
msgid "it does not make sense to create 'HEAD' manually"
|
|
|
|
|
msgstr "手工创建 'HEAD' 没有意义"
|
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/branch.c:846
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
|
|
|
|
|
msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
|
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/branch.c:849
|
2012-09-15 05:17:00 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"The --set-upstream flag is deprecated and will be removed. Consider using --"
|
|
|
|
|
"track or --set-upstream-to\n"
|
|
|
|
|
msgstr ""
|
2013-01-30 10:23:08 +01:00
|
|
|
|
"选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/branch.c:866
|
2012-09-15 05:17:00 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"\n"
|
|
|
|
|
"If you wanted to make '%s' track '%s', do this:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
msgstr ""
|
2013-01-30 10:23:08 +01:00
|
|
|
|
"\n"
|
|
|
|
|
"如果你想用 '%s' 跟踪 '%s', 这么做:\n"
|
|
|
|
|
"\n"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-05-31 02:42:31 +02:00
|
|
|
|
#: builtin/bundle.c:51
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "%s is okay\n"
|
|
|
|
|
msgstr "%s 可以\n"
|
|
|
|
|
|
2015-05-31 02:42:31 +02:00
|
|
|
|
#: builtin/bundle.c:64
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "Need a repository to create a bundle."
|
2015-08-02 15:47:30 +02:00
|
|
|
|
msgstr "需要一个仓库来创建包。"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2015-05-31 02:42:31 +02:00
|
|
|
|
#: builtin/bundle.c:68
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "Need a repository to unbundle."
|
2015-08-02 15:47:30 +02:00
|
|
|
|
msgstr "需要一个仓库来解包。"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/cat-file.c:513
|
2015-05-31 02:42:31 +02:00
|
|
|
|
msgid ""
|
2016-10-27 15:53:37 +02:00
|
|
|
|
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
|
|
|
|
|
"p | <type> | --textconv | --filters) [--path=<path>] <object>"
|
2016-11-22 15:24:59 +01:00
|
|
|
|
msgstr ""
|
|
|
|
|
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
|
|
|
|
|
"p | <类型> | --textconv | --filters) [--path=<路径>] <对象>"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/cat-file.c:514
|
|
|
|
|
msgid ""
|
|
|
|
|
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
|
|
|
|
|
"filters]"
|
2016-11-22 15:24:59 +01:00
|
|
|
|
msgstr ""
|
|
|
|
|
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
|
|
|
|
|
"filters]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/cat-file.c:551
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "<type> can be one of: blob, tree, commit, tag"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "<类型> 可以是其中之一:blob、tree、commit、tag"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/cat-file.c:552
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "show object type"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "显示对象类型"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/cat-file.c:553
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "show object size"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "显示对象大小"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/cat-file.c:555
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "exit with zero when there's no error"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "当没有错误时退出并返回零"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/cat-file.c:556
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "pretty-print object's content"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "美观地打印对象的内容"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/cat-file.c:558
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "for blob objects, run textconv on object's content"
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgstr "对于数据对象,对其内容做文本转换"
|
|
|
|
|
|
|
|
|
|
#: builtin/cat-file.c:560
|
|
|
|
|
msgid "for blob objects, run filters on object's content"
|
|
|
|
|
msgstr "对于数据对象,对其内容做过滤"
|
|
|
|
|
|
|
|
|
|
#: builtin/cat-file.c:561 git-submodule.sh:923
|
|
|
|
|
msgid "blob"
|
|
|
|
|
msgstr "数据对象"
|
|
|
|
|
|
|
|
|
|
#: builtin/cat-file.c:562
|
|
|
|
|
msgid "use a specific path for --textconv/--filters"
|
|
|
|
|
msgstr "对于 --textconv/--filters 使用一个特定的路径"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/cat-file.c:564
|
2015-05-31 02:42:31 +02:00
|
|
|
|
msgid "allow -s and -t to work with broken/corrupt objects"
|
|
|
|
|
msgstr "允许 -s 和 -t 对损坏的对象生效"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/cat-file.c:565
|
2015-08-23 09:23:21 +02:00
|
|
|
|
msgid "buffer --batch output"
|
|
|
|
|
msgstr "缓冲 --batch 的输出"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/cat-file.c:567
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "show info and content of objects fed from the standard input"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "显示从标准输入提供的对象的信息和内容"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/cat-file.c:570
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "show info about objects fed from the standard input"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "显示从标准输入提供的对象的信息"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/cat-file.c:573
|
2015-05-31 02:42:31 +02:00
|
|
|
|
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
|
|
|
|
|
msgstr "跟随树内符号链接(和 --batch 或 --batch-check 共用)"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/cat-file.c:575
|
2015-08-23 09:23:21 +02:00
|
|
|
|
msgid "show all objects with --batch or --batch-check"
|
|
|
|
|
msgstr "使用 --batch 或 --batch-check 参数显示所有对象"
|
|
|
|
|
|
2012-09-15 05:17:00 +02:00
|
|
|
|
#: builtin/check-attr.c:11
|
2015-02-16 14:34:19 +01:00
|
|
|
|
msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
|
|
|
|
|
msgstr "git check-attr [-a | --all | <属性>...] [--] <路径名>..."
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
|
|
|
|
#: builtin/check-attr.c:12
|
2015-11-16 00:02:11 +01:00
|
|
|
|
msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
|
|
|
|
|
msgstr "git check-attr --stdin [-z] [-a | --all | <属性>...]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
|
|
|
|
#: builtin/check-attr.c:19
|
|
|
|
|
msgid "report all attributes set on file"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "报告设置在文件上的所有属性"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
|
|
|
|
#: builtin/check-attr.c:20
|
|
|
|
|
msgid "use .gitattributes only from the index"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "只使用索引中的 .gitattributes"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "read file names from stdin"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "从标准输入读出文件名"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2013-02-14 10:47:45 +01:00
|
|
|
|
#: builtin/check-attr.c:23 builtin/check-ignore.c:24
|
2013-09-17 17:37:05 +02:00
|
|
|
|
msgid "terminate input and output records by a NUL character"
|
|
|
|
|
msgstr "输入和输出的记录使用 NUL 字符终结"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/check-ignore.c:18 builtin/checkout.c:1137 builtin/gc.c:325
|
2013-02-14 10:47:45 +01:00
|
|
|
|
msgid "suppress progress reporting"
|
|
|
|
|
msgstr "不显示进度报告"
|
|
|
|
|
|
2013-07-26 08:00:02 +02:00
|
|
|
|
#: builtin/check-ignore.c:26
|
|
|
|
|
msgid "show non-matching input paths"
|
|
|
|
|
msgstr "显示未匹配的输入路径"
|
|
|
|
|
|
2013-09-17 17:37:05 +02:00
|
|
|
|
#: builtin/check-ignore.c:28
|
|
|
|
|
msgid "ignore index when checking"
|
|
|
|
|
msgstr "检查时忽略索引"
|
|
|
|
|
|
|
|
|
|
#: builtin/check-ignore.c:154
|
2013-02-14 10:47:45 +01:00
|
|
|
|
msgid "cannot specify pathnames with --stdin"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
msgstr "不能同时指定路径及 --stdin 参数"
|
2013-02-14 10:47:45 +01:00
|
|
|
|
|
2013-09-17 17:37:05 +02:00
|
|
|
|
#: builtin/check-ignore.c:157
|
2013-02-14 10:47:45 +01:00
|
|
|
|
msgid "-z only makes sense with --stdin"
|
|
|
|
|
msgstr "-z 需要和 --stdin 参数共用才有意义"
|
|
|
|
|
|
2013-09-17 17:37:05 +02:00
|
|
|
|
#: builtin/check-ignore.c:159
|
2013-02-14 10:47:45 +01:00
|
|
|
|
msgid "no path specified"
|
|
|
|
|
msgstr "未指定路径"
|
|
|
|
|
|
2013-09-17 17:37:05 +02:00
|
|
|
|
#: builtin/check-ignore.c:163
|
2013-02-14 10:47:45 +01:00
|
|
|
|
msgid "--quiet is only valid with a single pathname"
|
|
|
|
|
msgstr "参数 --quiet 只在提供一个路径名时有效"
|
|
|
|
|
|
2013-09-17 17:37:05 +02:00
|
|
|
|
#: builtin/check-ignore.c:165
|
2013-02-14 10:47:45 +01:00
|
|
|
|
msgid "cannot have both --quiet and --verbose"
|
|
|
|
|
msgstr "不能同时提供 --quiet 和 --verbose 参数"
|
|
|
|
|
|
2013-09-17 17:37:05 +02:00
|
|
|
|
#: builtin/check-ignore.c:168
|
2013-07-26 08:00:02 +02:00
|
|
|
|
msgid "--non-matching is only valid with --verbose"
|
|
|
|
|
msgstr "--non-matching 选项只在使用 --verbose 时有效"
|
|
|
|
|
|
|
|
|
|
#: builtin/check-mailmap.c:8
|
2015-02-16 14:34:19 +01:00
|
|
|
|
msgid "git check-mailmap [<options>] <contact>..."
|
|
|
|
|
msgstr "git check-mailmap [<选项>] <联系地址>..."
|
2013-07-26 08:00:02 +02:00
|
|
|
|
|
|
|
|
|
#: builtin/check-mailmap.c:13
|
|
|
|
|
msgid "also read contacts from stdin"
|
|
|
|
|
msgstr "还从标准输入读取联系地址"
|
|
|
|
|
|
|
|
|
|
#: builtin/check-mailmap.c:24
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to parse contact: %s"
|
|
|
|
|
msgstr "不能解析联系地址:%s"
|
|
|
|
|
|
|
|
|
|
#: builtin/check-mailmap.c:47
|
|
|
|
|
msgid "no contacts specified"
|
|
|
|
|
msgstr "未指定联系地址"
|
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/checkout-index.c:127
|
2015-02-16 14:34:19 +01:00
|
|
|
|
msgid "git checkout-index [<options>] [--] [<file>...]"
|
|
|
|
|
msgstr "git checkout-index [<选项>] [--] [<文件>...]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/checkout-index.c:144
|
|
|
|
|
msgid "stage should be between 1 and 3 or all"
|
|
|
|
|
msgstr "索引值应该取值 1 到 3 或者 all"
|
|
|
|
|
|
|
|
|
|
#: builtin/checkout-index.c:160
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "check out all files in the index"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "检出索引区的所有文件"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/checkout-index.c:161
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "force overwrite of existing files"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "强制覆盖现有的文件"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/checkout-index.c:163
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "no warning for existing files and files not in index"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "存在或不在索引中的文件都没有警告"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/checkout-index.c:165
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "don't checkout new files"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "不检出新文件"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/checkout-index.c:167
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "update stat information in the index file"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "更新索引中文件的状态信息"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/checkout-index.c:171
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "read list of paths from the standard input"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "从标准输入读取路径列表"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/checkout-index.c:173
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "write the content to temporary files"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "将内容写入临时文件"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/checkout-index.c:174 builtin/column.c:30
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/submodule--helper.c:595 builtin/submodule--helper.c:598
|
|
|
|
|
#: builtin/submodule--helper.c:604 builtin/submodule--helper.c:951
|
|
|
|
|
#: builtin/worktree.c:469
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "string"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "字符串"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/checkout-index.c:175
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "when creating files, prepend <string>"
|
2015-08-10 12:03:29 +02:00
|
|
|
|
msgstr "在创建文件时,在前面加上 <字符串>"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/checkout-index.c:177
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "copy out the files from named stage"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "从指定暂存区中拷出文件"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: builtin/checkout.c:25
|
2015-02-16 14:34:19 +01:00
|
|
|
|
msgid "git checkout [<options>] <branch>"
|
|
|
|
|
msgstr "git checkout [<选项>] <分支>"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: builtin/checkout.c:26
|
2015-02-16 14:34:19 +01:00
|
|
|
|
msgid "git checkout [<options>] [<branch>] -- <file>..."
|
|
|
|
|
msgstr "git checkout [<选项>] [<分支>] -- <文件>..."
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/checkout.c:134 builtin/checkout.c:167
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "path '%s' does not have our version"
|
|
|
|
|
msgstr "路径 '%s' 没有我们的版本"
|
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/checkout.c:136 builtin/checkout.c:169
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "path '%s' does not have their version"
|
|
|
|
|
msgstr "路径 '%s' 没有他们的版本"
|
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/checkout.c:152
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "path '%s' does not have all necessary versions"
|
|
|
|
|
msgstr "路径 '%s' 没有全部必须的版本"
|
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/checkout.c:196
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "path '%s' does not have necessary versions"
|
|
|
|
|
msgstr "路径 '%s' 没有必须的版本"
|
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/checkout.c:213
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "path '%s': cannot merge"
|
2012-03-27 08:46:11 +02:00
|
|
|
|
msgstr "path '%s':无法合并"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/checkout.c:230
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Unable to add merge result for '%s'"
|
|
|
|
|
msgstr "无法为 '%s' 添加合并结果"
|
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256
|
|
|
|
|
#: builtin/checkout.c:259
|
2013-01-30 10:23:08 +01:00
|
|
|
|
#, c-format
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "'%s' cannot be used with updating paths"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "'%s' 不能在更新路径时使用"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/checkout.c:262 builtin/checkout.c:265
|
2013-01-30 10:23:08 +01:00
|
|
|
|
#, c-format
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "'%s' cannot be used with %s"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "'%s' 不能和 %s 同时使用"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/checkout.c:268
|
2012-09-15 05:17:00 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Cannot update paths and switch to branch '%s' at the same time."
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "不能同时更新路径并切换到分支'%s'。"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/checkout.c:339 builtin/checkout.c:346
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "path '%s' is unmerged"
|
|
|
|
|
msgstr "路径 '%s' 未合并"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/checkout.c:494
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "you need to resolve your current index first"
|
2012-03-27 08:46:11 +02:00
|
|
|
|
msgstr "您需要先解决当前索引的冲突"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/checkout.c:624
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
2015-08-23 09:23:21 +02:00
|
|
|
|
msgid "Can not do reflog for '%s': %s\n"
|
|
|
|
|
msgstr "不能对 '%s' 执行 reflog 操作:%s\n"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/checkout.c:663
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "HEAD is now at"
|
|
|
|
|
msgstr "HEAD 目前位于"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/checkout.c:667 builtin/clone.c:660
|
2016-03-12 15:09:24 +01:00
|
|
|
|
msgid "unable to update HEAD"
|
|
|
|
|
msgstr "不能更新 HEAD"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/checkout.c:671
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Reset branch '%s'\n"
|
|
|
|
|
msgstr "重置分支 '%s'\n"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/checkout.c:674
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Already on '%s'\n"
|
|
|
|
|
msgstr "已经位于 '%s'\n"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/checkout.c:678
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Switched to and reset branch '%s'\n"
|
|
|
|
|
msgstr "切换并重置分支 '%s'\n"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/checkout.c:680 builtin/checkout.c:1069
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Switched to a new branch '%s'\n"
|
|
|
|
|
msgstr "切换到一个新分支 '%s'\n"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/checkout.c:682
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Switched to branch '%s'\n"
|
|
|
|
|
msgstr "切换到分支 '%s'\n"
|
|
|
|
|
|
2012-03-27 08:46:11 +02:00
|
|
|
|
# 译者:注意保持前导空格
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/checkout.c:733
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid " ... and %d more.\n"
|
2012-03-27 08:46:11 +02:00
|
|
|
|
msgstr " ... 及其它 %d 个。\n"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/checkout.c:739
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, 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"
|
l10n: Set nplurals of zh_CN.po from 1 to 2
In most cases, plural-forms are unnecessary for Chinese. For example,
"apple" and "apples" are the same in Chinese, they are both translated
as "苹果". While there are exceptions, e.g., the plural form of "he",
"she" and "it" is "they" in English. In Chinese, "他(he)", "她(she)",
and "它(it)" have plural forms too, they are "他们", "她们", and "它们".
But what makes 'nplurals=1' hard to work right for Chinese is:
#: bundle.c:192
#, c-format
msgid "The bundle requires this ref"
msgid_plural "The bundle requires these %d refs"
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-05-31 11:35:59 +02:00
|
|
|
|
msgstr[1] ""
|
|
|
|
|
"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"%s\n"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/checkout.c:758
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
2015-05-31 02:42:31 +02:00
|
|
|
|
"If you want to keep it by creating a new branch, this may be a good time\n"
|
|
|
|
|
"to do so with:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git branch <new-branch-name> %s\n"
|
|
|
|
|
"\n"
|
|
|
|
|
msgid_plural ""
|
2012-02-13 07:41:59 +01:00
|
|
|
|
"If you want to keep them by creating a new branch, this may be a good time\n"
|
|
|
|
|
"to do so with:\n"
|
|
|
|
|
"\n"
|
2015-02-16 14:34:19 +01:00
|
|
|
|
" git branch <new-branch-name> %s\n"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
"\n"
|
2015-05-31 02:42:31 +02:00
|
|
|
|
msgstr[0] ""
|
|
|
|
|
"如果您想要通过创建新分支保存它,这可能是一个好时候。\n"
|
|
|
|
|
"如下操作:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git branch <新分支名> %s\n"
|
|
|
|
|
"\n"
|
|
|
|
|
msgstr[1] ""
|
|
|
|
|
"如果您想要通过创建新分支保存它们,这可能是一个好时候。\n"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
"如下操作:\n"
|
|
|
|
|
"\n"
|
2015-02-16 14:34:19 +01:00
|
|
|
|
" git branch <新分支名> %s\n"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
"\n"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/checkout.c:794
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "internal error in revision walk"
|
|
|
|
|
msgstr "在版本遍历时遇到内部错误"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/checkout.c:798
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "Previous HEAD position was"
|
|
|
|
|
msgstr "之前的 HEAD 位置是"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/checkout.c:825 builtin/checkout.c:1064
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "You are on a branch yet to be born"
|
2012-03-27 08:46:11 +02:00
|
|
|
|
msgstr "您位于一个尚未初始化的分支"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/checkout.c:970
|
2013-09-17 17:37:05 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "only one reference expected, %d given."
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgstr "应只有一个引用,却给出了 %d 个"
|
2013-09-17 17:37:05 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/checkout.c:1010 builtin/worktree.c:214
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "invalid reference: %s"
|
|
|
|
|
msgstr "无效引用:%s"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/checkout.c:1039
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "reference is not a tree: %s"
|
|
|
|
|
msgstr "引用不是一个树:%s"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/checkout.c:1078
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "paths cannot be used with switching branches"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "路径不能和切换分支同时使用"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/checkout.c:1081 builtin/checkout.c:1085
|
2013-01-30 10:23:08 +01:00
|
|
|
|
#, c-format
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "'%s' cannot be used with switching branches"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "'%s' 不能和切换分支同时使用"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/checkout.c:1089 builtin/checkout.c:1092 builtin/checkout.c:1097
|
|
|
|
|
#: builtin/checkout.c:1100
|
2013-01-30 10:23:08 +01:00
|
|
|
|
#, c-format
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "'%s' cannot be used with '%s'"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "'%s' 不能和 '%s' 同时使用"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/checkout.c:1105
|
2013-01-30 10:23:08 +01:00
|
|
|
|
#, c-format
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "Cannot switch branch to a non-commit '%s'"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "不能切换分支到一个非提交 '%s'"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/checkout.c:1138 builtin/checkout.c:1140 builtin/clone.c:93
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324
|
|
|
|
|
#: builtin/worktree.c:326
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "branch"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "分支"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/checkout.c:1139
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "create and checkout a new branch"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "创建并检出一个新的分支"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/checkout.c:1141
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "create/reset and checkout a branch"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "创建/重置并检出一个分支"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/checkout.c:1142
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "create reflog for new branch"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "为新的分支创建引用日志"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/checkout.c:1143 builtin/worktree.c:328
|
2016-08-28 04:18:12 +02:00
|
|
|
|
msgid "detach HEAD at named commit"
|
|
|
|
|
msgstr "HEAD 从指定的提交分离"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/checkout.c:1144
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "set upstream info for new branch"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "为新的分支设置上游信息"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/checkout.c:1146
|
2014-03-13 05:41:34 +01:00
|
|
|
|
msgid "new-branch"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "新分支"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/checkout.c:1146
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "new unparented branch"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "新的没有父提交的分支"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/checkout.c:1147
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "checkout our version for unmerged files"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "对尚未合并的文件检出我们的版本"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/checkout.c:1149
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "checkout their version for unmerged files"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "对尚未合并的文件检出他们的版本"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/checkout.c:1151
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "force checkout (throw away local modifications)"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "强制检出(丢弃本地修改)"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/checkout.c:1152
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "perform a 3-way merge with the new branch"
|
2015-08-02 15:47:30 +02:00
|
|
|
|
msgstr "和新的分支执行三方合并"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/checkout.c:1153 builtin/merge.c:231
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "update ignored files (default)"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "更新忽略的文件(默认)"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/checkout.c:1154 builtin/log.c:1466 parse-options.h:251
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "style"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "风格"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/checkout.c:1155
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "conflict style (merge or diff3)"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "冲突输出风格(merge 或 diff3)"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/checkout.c:1158
|
2013-04-13 04:02:43 +02:00
|
|
|
|
msgid "do not limit pathspecs to sparse entries only"
|
|
|
|
|
msgstr "对路径不做稀疏检出的限制"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/checkout.c:1160
|
2015-02-16 14:34:19 +01:00
|
|
|
|
msgid "second guess 'git checkout <no-such-branch>'"
|
|
|
|
|
msgstr "二次猜测'git checkout <无此分支>'"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/checkout.c:1162
|
2015-05-31 02:42:31 +02:00
|
|
|
|
msgid "do not check if another worktree is holding the given ref"
|
|
|
|
|
msgstr "不检查指定的引用是否被其他工作区所占用"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/checkout.c:1163 builtin/clone.c:63 builtin/fetch.c:119
|
|
|
|
|
#: builtin/merge.c:228 builtin/pull.c:117 builtin/push.c:536
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/send-pack.c:168
|
|
|
|
|
msgid "force progress reporting"
|
|
|
|
|
msgstr "强制显示进度报告"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/checkout.c:1194
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "-b, -B and --orphan are mutually exclusive"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "-b、-B 和 --orphan 是互斥的"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/checkout.c:1211
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "--track needs a branch name"
|
|
|
|
|
msgstr "--track 需要一个分支名"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/checkout.c:1216
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "Missing branch name; try -b"
|
|
|
|
|
msgstr "缺少分支名;尝试 -b"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/checkout.c:1252
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "invalid path specification"
|
2012-03-27 08:46:11 +02:00
|
|
|
|
msgstr "无效的路径规格"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/checkout.c:1259
|
2013-01-30 10:23:08 +01:00
|
|
|
|
#, c-format
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid ""
|
2012-09-15 05:17:00 +02:00
|
|
|
|
"Cannot update paths and switch to branch '%s' at the same time.\n"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
"Did you intend to checkout '%s' which can not be resolved as commit?"
|
|
|
|
|
msgstr ""
|
2013-01-30 10:23:08 +01:00
|
|
|
|
"不能同时更新路径并切换到分支'%s'。\n"
|
|
|
|
|
"您是想要检出 '%s' 但其未能解析为提交么?"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/checkout.c:1264
|
2013-01-30 10:23:08 +01:00
|
|
|
|
#, c-format
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "git checkout: --detach does not take a path argument '%s'"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "git checkout:--detach 不能接收路径参数 '%s'"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/checkout.c:1268
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid ""
|
|
|
|
|
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
|
|
|
|
|
"checking out of the index."
|
|
|
|
|
msgstr ""
|
2012-03-27 08:46:11 +02:00
|
|
|
|
"git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: builtin/clean.c:25
|
2013-07-26 08:00:02 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: builtin/clean.c:29
|
2013-01-30 10:23:08 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Removing %s\n"
|
|
|
|
|
msgstr "正删除 %s\n"
|
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: builtin/clean.c:30
|
2013-01-30 10:23:08 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Would remove %s\n"
|
|
|
|
|
msgstr "将删除 %s\n"
|
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: builtin/clean.c:31
|
2013-01-30 10:23:08 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Skipping repository %s\n"
|
2015-08-02 15:47:30 +02:00
|
|
|
|
msgstr "忽略仓库 %s\n"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: builtin/clean.c:32
|
2013-01-30 10:23:08 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Would skip repository %s\n"
|
2015-08-02 15:47:30 +02:00
|
|
|
|
msgstr "将忽略仓库 %s\n"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: builtin/clean.c:33
|
2013-01-30 10:23:08 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to remove %s"
|
|
|
|
|
msgstr "无法删除 %s"
|
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/clean.c:291
|
2013-07-26 08:00:02 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"Prompt help:\n"
|
|
|
|
|
"1 - select a numbered item\n"
|
|
|
|
|
"foo - select item based on unique prefix\n"
|
|
|
|
|
" - (empty) select nothing"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"帮助:\n"
|
|
|
|
|
"1 - 通过编号选择一个选项\n"
|
|
|
|
|
"foo - 通过标题选择一个选项\n"
|
|
|
|
|
" - (空)什么也不选择"
|
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/clean.c:295
|
2013-07-26 08:00:02 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"Prompt help:\n"
|
|
|
|
|
"1 - select a single item\n"
|
|
|
|
|
"3-5 - select a range of items\n"
|
|
|
|
|
"2-3,6-9 - select multiple ranges\n"
|
|
|
|
|
"foo - select item based on unique prefix\n"
|
|
|
|
|
"-... - unselect specified items\n"
|
|
|
|
|
"* - choose all items\n"
|
|
|
|
|
" - (empty) finish selecting"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"帮助:\n"
|
|
|
|
|
"1 - 选择一个选项\n"
|
|
|
|
|
"3-5 - 选择一个范围内的所有选项\n"
|
|
|
|
|
"2-3,6-9 - 选择多个范围内的所有选项\n"
|
|
|
|
|
"foo - 通过标题选择一个选项\n"
|
|
|
|
|
"-... - 反选特定的选项\n"
|
|
|
|
|
"* - 选择所有选项\n"
|
|
|
|
|
" - (空)结束选择"
|
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/clean.c:511
|
2013-07-26 08:00:02 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Huh (%s)?"
|
|
|
|
|
msgstr "嗯(%s)?"
|
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/clean.c:653
|
2013-07-26 08:00:02 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Input ignore patterns>> "
|
|
|
|
|
msgstr "输入模版以排除条目>> "
|
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/clean.c:690
|
2013-07-26 08:00:02 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "WARNING: Cannot find items matched by: %s"
|
|
|
|
|
msgstr "警告:无法找到和 %s 匹配的条目"
|
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/clean.c:711
|
2013-07-26 08:00:02 +02:00
|
|
|
|
msgid "Select items to delete"
|
|
|
|
|
msgstr "选择要删除的条目"
|
|
|
|
|
|
2015-02-16 14:34:19 +01:00
|
|
|
|
#. TRANSLATORS: Make sure to keep [y/N] as is
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/clean.c:752
|
2013-07-26 08:00:02 +02:00
|
|
|
|
#, c-format
|
2015-02-16 14:34:19 +01:00
|
|
|
|
msgid "Remove %s [y/N]? "
|
|
|
|
|
msgstr "删除 %s [y/N]?"
|
2013-07-26 08:00:02 +02:00
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/clean.c:777
|
2013-07-26 08:00:02 +02:00
|
|
|
|
msgid "Bye."
|
|
|
|
|
msgstr "再见。"
|
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/clean.c:785
|
2013-07-26 08:00:02 +02:00
|
|
|
|
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"
|
|
|
|
|
"? - 显示如何在提示符下选择的帮助"
|
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/clean.c:812
|
2013-07-26 08:00:02 +02:00
|
|
|
|
msgid "*** Commands ***"
|
|
|
|
|
msgstr "*** 命令 ***"
|
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/clean.c:813
|
2013-07-26 08:00:02 +02:00
|
|
|
|
msgid "What now"
|
|
|
|
|
msgstr "请选择"
|
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/clean.c:821
|
2013-07-26 08:00:02 +02:00
|
|
|
|
msgid "Would remove the following item:"
|
|
|
|
|
msgid_plural "Would remove the following items:"
|
|
|
|
|
msgstr[0] "将删除如下条目:"
|
|
|
|
|
msgstr[1] "将删除如下条目:"
|
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/clean.c:838
|
2013-07-26 08:00:02 +02:00
|
|
|
|
msgid "No more files to clean, exiting."
|
|
|
|
|
msgstr "没有要清理的文件,退出。"
|
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/clean.c:869
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "do not print names of files removed"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "不打印删除文件的名称"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/clean.c:871
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "force"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "强制"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/clean.c:872
|
2013-07-26 08:00:02 +02:00
|
|
|
|
msgid "interactive cleaning"
|
|
|
|
|
msgstr "交互式清除"
|
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/clean.c:874
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "remove whole directories"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "删除整个目录"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:725
|
|
|
|
|
#: builtin/ls-files.c:536 builtin/name-rev.c:313 builtin/show-ref.c:182
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "pattern"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "模式"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/clean.c:876
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "add <pattern> to ignore rules"
|
2015-08-10 12:03:29 +02:00
|
|
|
|
msgstr "添加 <模式> 到忽略规则"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/clean.c:877
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "remove ignored files, too"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "也删除忽略的文件"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/clean.c:879
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "remove only ignored files"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "只删除忽略的文件"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/clean.c:897
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "-x and -X cannot be used together"
|
2012-08-02 05:50:59 +02:00
|
|
|
|
msgstr "-x 和 -X 不能同时使用"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/clean.c:901
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid ""
|
2014-03-13 05:41:34 +01:00
|
|
|
|
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
|
2013-07-26 08:00:02 +02:00
|
|
|
|
"clean"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgstr ""
|
2013-07-26 08:00:02 +02:00
|
|
|
|
"clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/clean.c:904
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid ""
|
2014-03-13 05:41:34 +01:00
|
|
|
|
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
|
2013-07-26 08:00:02 +02:00
|
|
|
|
"refusing to clean"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgstr ""
|
2013-07-26 08:00:02 +02:00
|
|
|
|
"clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项,拒绝执行清理动作"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/clone.c:37
|
2015-02-16 14:34:19 +01:00
|
|
|
|
msgid "git clone [<options>] [--] <repo> [<dir>]"
|
2015-08-02 15:47:30 +02:00
|
|
|
|
msgstr "git clone [<选项>] [--] <仓库> [<路径>]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/clone.c:65
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "don't create a checkout"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "不创建一个检出"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/clone.c:66 builtin/clone.c:68 builtin/init-db.c:478
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "create a bare repository"
|
2015-08-02 15:47:30 +02:00
|
|
|
|
msgstr "创建一个纯仓库"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/clone.c:70
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "create a mirror repository (implies bare)"
|
2015-08-02 15:47:30 +02:00
|
|
|
|
msgstr "创建一个镜像仓库(也是纯仓库)"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/clone.c:72
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "to clone from a local repository"
|
2015-08-02 15:47:30 +02:00
|
|
|
|
msgstr "从本地仓库克隆"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/clone.c:74
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "don't use local hardlinks, always copy"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "不使用本地硬链接,始终复制"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/clone.c:76
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "setup as shared repository"
|
2015-08-02 15:47:30 +02:00
|
|
|
|
msgstr "设置为共享仓库"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/clone.c:78 builtin/clone.c:80
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "initialize submodules in the clone"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "在克隆时初始化子模组"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/clone.c:82
|
2016-05-29 14:40:35 +02:00
|
|
|
|
msgid "number of submodules cloned in parallel"
|
|
|
|
|
msgstr "并发克隆的子模组的数量"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/clone.c:83 builtin/init-db.c:475
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "template-directory"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "模板目录"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/clone.c:84 builtin/init-db.c:476
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "directory from which templates will be used"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "模板目录将被使用"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/clone.c:86 builtin/clone.c:88 builtin/submodule--helper.c:602
|
|
|
|
|
#: builtin/submodule--helper.c:954
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "reference repository"
|
2015-08-02 15:47:30 +02:00
|
|
|
|
msgstr "参考仓库"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/clone.c:90
|
2015-05-31 02:42:31 +02:00
|
|
|
|
msgid "use --reference only while cloning"
|
2015-08-02 15:47:30 +02:00
|
|
|
|
msgstr "仅在克隆时参考 --reference 指向的本地仓库"
|
2015-05-31 02:42:31 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/clone.c:91 builtin/column.c:26 builtin/merge-file.c:44
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "name"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "名称"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/clone.c:92
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "use <name> instead of 'origin' to track upstream"
|
2015-08-10 12:03:29 +02:00
|
|
|
|
msgstr "使用 <名称> 而不是 'origin' 去跟踪上游"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/clone.c:94
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "checkout <branch> instead of the remote's HEAD"
|
2015-08-10 12:03:29 +02:00
|
|
|
|
msgstr "检出 <分支> 而不是远程 HEAD"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/clone.c:96
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "path to git-upload-pack on the remote"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "远程 git-upload-pack 路径"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:668
|
|
|
|
|
#: builtin/pull.c:202
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "depth"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "深度"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/clone.c:98
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "create a shallow clone of that depth"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "创建一个指定深度的浅克隆"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2848
|
|
|
|
|
#: parse-options.h:142
|
|
|
|
|
msgid "time"
|
|
|
|
|
msgstr "时间"
|
|
|
|
|
|
|
|
|
|
#: builtin/clone.c:100
|
|
|
|
|
msgid "create a shallow clone since a specific time"
|
|
|
|
|
msgstr "从一个特定时间创建一个浅克隆"
|
|
|
|
|
|
|
|
|
|
#: builtin/clone.c:101 builtin/fetch.c:124
|
|
|
|
|
msgid "revision"
|
|
|
|
|
msgstr "版本"
|
|
|
|
|
|
|
|
|
|
#: builtin/clone.c:102 builtin/fetch.c:125
|
|
|
|
|
msgid "deepen history of shallow clone by excluding rev"
|
|
|
|
|
msgstr "通过排除版本来深化浅克隆的历史"
|
|
|
|
|
|
|
|
|
|
#: builtin/clone.c:104
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "clone only one branch, HEAD or --branch"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "只克隆一个分支、HEAD 或 --branch"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/clone.c:106
|
2016-05-29 14:40:35 +02:00
|
|
|
|
msgid "any cloned submodules will be shallow"
|
|
|
|
|
msgstr "子模组将以浅下载模式克隆"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/clone.c:107 builtin/init-db.c:484
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "gitdir"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "git目录"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/clone.c:108 builtin/init-db.c:485
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "separate git dir from working tree"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "git目录和工作区分离"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/clone.c:109
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "key=value"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "key=value"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/clone.c:110
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "set config inside the new repository"
|
2015-08-02 15:47:30 +02:00
|
|
|
|
msgstr "在新仓库中设置配置信息"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/clone.c:111 builtin/fetch.c:140 builtin/push.c:547
|
2016-02-28 13:35:55 +01:00
|
|
|
|
msgid "use IPv4 addresses only"
|
|
|
|
|
msgstr "只使用 IPv4 地址"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:549
|
2016-02-28 13:35:55 +01:00
|
|
|
|
msgid "use IPv6 addresses only"
|
|
|
|
|
msgstr "只使用 IPv6 地址"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/clone.c:250
|
2016-03-12 15:09:24 +01:00
|
|
|
|
msgid ""
|
|
|
|
|
"No directory name could be guessed.\n"
|
|
|
|
|
"Please specify a directory on the command line"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"无法猜到目录名。\n"
|
2016-03-16 04:44:44 +01:00
|
|
|
|
"请在命令行指定一个目录"
|
2016-03-12 15:09:24 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/clone.c:303
|
2014-01-18 04:04:21 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "info: Could not add alternate for '%s': %s\n"
|
|
|
|
|
msgstr "info: 不能为 '%s' 添加一个备用:%s\n"
|
2014-01-18 04:04:21 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/clone.c:375
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to open '%s'"
|
|
|
|
|
msgstr "无法打开 '%s'"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/clone.c:383
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "%s exists and is not a directory"
|
|
|
|
|
msgstr "%s 存在且不是一个目录"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/clone.c:397
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to stat %s\n"
|
2012-03-27 08:46:11 +02:00
|
|
|
|
msgstr "无法枚举 %s 状态\n"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/clone.c:419
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to create link '%s'"
|
2012-03-27 08:46:11 +02:00
|
|
|
|
msgstr "无法创建链接 '%s'"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/clone.c:423
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to copy file to '%s'"
|
2012-03-27 08:46:11 +02:00
|
|
|
|
msgstr "无法拷贝文件至 '%s'"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/clone.c:448
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "done.\n"
|
|
|
|
|
msgstr "完成。\n"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/clone.c:460
|
2013-04-11 11:55:09 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"Clone succeeded, but checkout failed.\n"
|
|
|
|
|
"You can inspect what was checked out with 'git status'\n"
|
|
|
|
|
"and retry the checkout with 'git checkout -f HEAD'\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"克隆成功,但是检出失败。\n"
|
|
|
|
|
"您可以通过 'git status' 检查哪些已被检出,然后使用命令\n"
|
|
|
|
|
"'git checkout -f HEAD' 重试\n"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/clone.c:537
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Could not find remote branch %s to clone."
|
2012-03-27 08:46:11 +02:00
|
|
|
|
msgstr "不能发现要克隆的远程分支 %s。"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/clone.c:632
|
2013-04-11 11:55:09 +02:00
|
|
|
|
msgid "remote did not send all necessary objects"
|
|
|
|
|
msgstr "远程没有发送所有必须的对象"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/clone.c:648
|
2016-03-12 15:09:24 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to update %s"
|
|
|
|
|
msgstr "不能更新 %s"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/clone.c:697
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
|
|
|
|
|
msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/clone.c:728
|
2013-04-11 11:55:09 +02:00
|
|
|
|
msgid "unable to checkout working tree"
|
|
|
|
|
msgstr "不能检出工作区"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/clone.c:768
|
2016-03-12 15:09:24 +01:00
|
|
|
|
msgid "unable to write parameters to config file"
|
|
|
|
|
msgstr "无法将参数写入配置文件"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/clone.c:831
|
2015-01-04 05:27:38 +01:00
|
|
|
|
msgid "cannot repack to clean up"
|
|
|
|
|
msgstr "无法执行 repack 来清理"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/clone.c:833
|
2015-01-04 05:27:38 +01:00
|
|
|
|
msgid "cannot unlink temporary alternates file"
|
|
|
|
|
msgstr "无法删除临时的 alternates 文件"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/clone.c:866 builtin/receive-pack.c:1895
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "Too many arguments."
|
|
|
|
|
msgstr "太多参数。"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/clone.c:870
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "You must specify a repository to clone."
|
2015-08-02 15:47:30 +02:00
|
|
|
|
msgstr "您必须指定一个仓库来克隆。"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/clone.c:883
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "--bare and --origin %s options are incompatible."
|
|
|
|
|
msgstr "--bare 和 --origin %s 选项不兼容。"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/clone.c:886
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgid "--bare and --separate-git-dir are incompatible."
|
|
|
|
|
msgstr "--bare 和 --separate-git-dir 选项不兼容。"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/clone.c:899
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "repository '%s' does not exist"
|
2015-08-02 15:47:30 +02:00
|
|
|
|
msgstr "仓库 '%s' 不存在"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/clone.c:905 builtin/fetch.c:1338
|
2014-01-18 04:04:21 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "depth %s is not a positive number"
|
|
|
|
|
msgstr "深度 %s 不是一个正数"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/clone.c:915
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "destination path '%s' already exists and is not an empty directory."
|
2012-03-27 08:46:11 +02:00
|
|
|
|
msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/clone.c:925
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "working tree '%s' already exists."
|
|
|
|
|
msgstr "工作区 '%s' 已经存在。"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/clone.c:940 builtin/clone.c:951 builtin/submodule--helper.c:657
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/worktree.c:222 builtin/worktree.c:249
|
2015-07-14 01:33:09 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "could not create leading directories of '%s'"
|
|
|
|
|
msgstr "不能为 '%s' 创建先导目录"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/clone.c:943
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
2015-02-16 14:34:19 +01:00
|
|
|
|
msgid "could not create work tree dir '%s'"
|
|
|
|
|
msgstr "不能创建工作区目录 '%s'"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/clone.c:955
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Cloning into bare repository '%s'...\n"
|
2015-08-02 15:47:30 +02:00
|
|
|
|
msgstr "克隆到纯仓库 '%s'...\n"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/clone.c:957
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Cloning into '%s'...\n"
|
|
|
|
|
msgstr "正克隆到 '%s'...\n"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/clone.c:963
|
|
|
|
|
msgid ""
|
|
|
|
|
"clone --recursive is not compatible with both --reference and --reference-if-"
|
|
|
|
|
"able"
|
|
|
|
|
msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不兼容"
|
|
|
|
|
|
|
|
|
|
#: builtin/clone.c:1019
|
2014-08-04 10:23:15 +02:00
|
|
|
|
msgid "--depth is ignored in local clones; use file:// instead."
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgstr "--depth 在本地克隆时被忽略,请改用 file:// 协议。"
|
|
|
|
|
|
|
|
|
|
#: builtin/clone.c:1021
|
|
|
|
|
msgid "--shallow-since is ignored in local clones; use file:// instead."
|
|
|
|
|
msgstr "--shallow-since 在本地克隆时被忽略,请改用 file:// 协议。"
|
2014-08-04 10:23:15 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/clone.c:1023
|
|
|
|
|
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
|
|
|
|
|
msgstr "--shallow-exclude 在本地克隆时被忽略,请改用 file:// 协议。"
|
|
|
|
|
|
|
|
|
|
#: builtin/clone.c:1026
|
2014-08-04 10:23:15 +02:00
|
|
|
|
msgid "source repository is shallow, ignoring --local"
|
2015-08-02 15:47:30 +02:00
|
|
|
|
msgstr "源仓库是浅克隆,忽略 --local"
|
2014-08-04 10:23:15 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/clone.c:1031
|
2014-08-04 10:23:15 +02:00
|
|
|
|
msgid "--local is ignored"
|
|
|
|
|
msgstr "--local 被忽略"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/clone.c:1035
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Don't know how to clone %s"
|
|
|
|
|
msgstr "不知道如何克隆 %s"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/clone.c:1090 builtin/clone.c:1098
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Remote branch %s not found in upstream %s"
|
|
|
|
|
msgstr "远程分支 %s 在上游 %s 未发现"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/clone.c:1101
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "You appear to have cloned an empty repository."
|
2015-08-02 15:47:30 +02:00
|
|
|
|
msgstr "您似乎克隆了一个空仓库。"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2012-09-15 05:17:00 +02:00
|
|
|
|
#: builtin/column.c:9
|
2015-02-16 14:34:19 +01:00
|
|
|
|
msgid "git column [<options>]"
|
|
|
|
|
msgstr "git column [<选项>]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
|
|
|
|
#: builtin/column.c:26
|
|
|
|
|
msgid "lookup config vars"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "查找配置变量"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
|
|
|
|
#: builtin/column.c:27 builtin/column.c:28
|
|
|
|
|
msgid "layout to use"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "要使用的布局"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
|
|
|
|
#: builtin/column.c:29
|
|
|
|
|
msgid "Maximum width"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "最大宽度"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
|
|
|
|
#: builtin/column.c:30
|
|
|
|
|
msgid "Padding space on left border"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "左边框的填充空间"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
|
|
|
|
#: builtin/column.c:31
|
|
|
|
|
msgid "Padding space on right border"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "右边框的填充空间"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
|
|
|
|
#: builtin/column.c:32
|
|
|
|
|
msgid "Padding space between columns"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "两列之间的填充空间"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2012-05-21 03:35:47 +02:00
|
|
|
|
#: builtin/column.c:51
|
|
|
|
|
msgid "--command must be the first argument"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "--command 必须是第一个参数"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/commit.c:38
|
2015-02-16 14:34:19 +01:00
|
|
|
|
msgid "git commit [<options>] [--] <pathspec>..."
|
2015-08-02 15:47:30 +02:00
|
|
|
|
msgstr "git commit [<选项>] [--] <路径规格>..."
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/commit.c:43
|
2015-02-16 14:34:19 +01:00
|
|
|
|
msgid "git status [<options>] [--] <pathspec>..."
|
2015-08-02 15:47:30 +02:00
|
|
|
|
msgstr "git status [<选项>] [--] <路径规格>..."
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/commit.c:48
|
2014-10-08 04:55:14 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"Your name and email address were configured automatically based\n"
|
|
|
|
|
"on your username and hostname. Please check that they are accurate.\n"
|
|
|
|
|
"You can suppress this message by setting them explicitly. Run the\n"
|
|
|
|
|
"following command and follow the instructions in your editor to edit\n"
|
|
|
|
|
"your configuration file:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git config --global --edit\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"After doing this, you may fix the identity used for this commit with:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git commit --amend --reset-author\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
|
|
|
|
|
"与否。您可以对其进行设置以免再出现本提示信息。运行如下命令在编辑器\n"
|
|
|
|
|
"中编辑您的配置文件:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git config --global --edit\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git commit --amend --reset-author\n"
|
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/commit.c:61
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid ""
|
|
|
|
|
"Your name and email address were configured automatically based\n"
|
|
|
|
|
"on your username and hostname. Please check that they are accurate.\n"
|
|
|
|
|
"You can suppress this message by setting them explicitly:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git config --global user.name \"Your Name\"\n"
|
|
|
|
|
" git config --global user.email you@example.com\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"After doing this, you may fix the identity used for this commit with:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git commit --amend --reset-author\n"
|
|
|
|
|
msgstr ""
|
2012-03-27 08:46:11 +02:00
|
|
|
|
"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
|
2014-10-08 04:55:14 +02:00
|
|
|
|
"与否。您可以对其进行设置以免再出现本提示信息:\n"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
"\n"
|
|
|
|
|
" git config --global user.name \"Your Name\"\n"
|
|
|
|
|
" git config --global user.email you@example.com\n"
|
|
|
|
|
"\n"
|
2012-03-27 08:46:11 +02:00
|
|
|
|
"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
"\n"
|
|
|
|
|
" git commit --amend --reset-author\n"
|
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/commit.c:73
|
2012-02-13 07:41:59 +01:00
|
|
|
|
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 ""
|
2012-02-28 19:08:22 +01:00
|
|
|
|
"您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
|
|
|
|
|
"--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/commit.c:78
|
2012-02-13 07:41:59 +01:00
|
|
|
|
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 ""
|
2012-02-28 19:03:39 +01:00
|
|
|
|
"之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
|
|
|
|
|
"也要提交,使用命令:\n"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
"\n"
|
|
|
|
|
" git commit --allow-empty\n"
|
|
|
|
|
"\n"
|
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/commit.c:85
|
2013-08-06 08:49:18 +02:00
|
|
|
|
msgid "Otherwise, please use 'git reset'\n"
|
|
|
|
|
msgstr "否则,请使用命令 'git reset'\n"
|
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/commit.c:88
|
2013-08-06 08:49:18 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"If you wish to skip this commit, use:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git reset\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
|
|
|
|
|
"the remaining commits.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"如果您想跳过这个提交,使用命令:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git reset\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"
|
|
|
|
|
"操作。\n"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:318
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "failed to unpack HEAD tree object"
|
2012-03-27 08:46:11 +02:00
|
|
|
|
msgstr "无法解包 HEAD 树对象"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:359
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "unable to create temporary index"
|
2012-03-27 08:46:11 +02:00
|
|
|
|
msgstr "不能创建临时索引"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:365
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "interactive add failed"
|
|
|
|
|
msgstr "交互式添加失败"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:378
|
2014-10-08 04:55:14 +02:00
|
|
|
|
msgid "unable to update temporary index"
|
|
|
|
|
msgstr "无法更新临时索引"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:380
|
2014-10-08 04:55:14 +02:00
|
|
|
|
msgid "Failed to update main cache tree"
|
|
|
|
|
msgstr "不能更新树的主缓存"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:404 builtin/commit.c:427 builtin/commit.c:476
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "unable to write new_index file"
|
2012-03-27 08:46:11 +02:00
|
|
|
|
msgstr "无法写 new_index 文件"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:458
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "cannot do a partial commit during a merge."
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "在合并过程中不能做部分提交。"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:460
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "cannot do a partial commit during a cherry-pick."
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "在拣选过程中不能做部分提交。"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:469
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "cannot read the index"
|
2012-03-27 08:46:11 +02:00
|
|
|
|
msgstr "无法读取索引"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:488
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "unable to write temporary index file"
|
2012-03-27 08:46:11 +02:00
|
|
|
|
msgstr "无法写临时索引文件"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:582
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "commit '%s' lacks author header"
|
|
|
|
|
msgstr "提交 '%s' 缺少作者信息"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:584
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
2014-10-08 04:55:14 +02:00
|
|
|
|
msgid "commit '%s' has malformed author line"
|
|
|
|
|
msgstr "提交 '%s' 有非法的作者信息"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:603
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "malformed --author parameter"
|
|
|
|
|
msgstr "非法的 --author 参数"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:611
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
2014-08-04 10:23:15 +02:00
|
|
|
|
msgid "invalid date format: %s"
|
|
|
|
|
msgstr "无效的日期格式:%s"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:655
|
2014-08-04 10:23:15 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"unable to select a comment character that is not used\n"
|
|
|
|
|
"in the current commit message"
|
|
|
|
|
msgstr "无法选择一个未被当前提交说明使用的注释字符"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1096
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "could not lookup commit %s"
|
|
|
|
|
msgstr "不能查询提交 %s"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:704 builtin/shortlog.c:286
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "(reading log message from standard input)\n"
|
2012-03-27 08:46:11 +02:00
|
|
|
|
msgstr "(正从标准输入中读取日志信息)\n"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:706
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "could not read log from standard input"
|
2012-03-27 08:46:11 +02:00
|
|
|
|
msgstr "不能从标准输入中读取日志信息"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:710
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "could not read log file '%s'"
|
2012-03-27 08:46:11 +02:00
|
|
|
|
msgstr "不能读取日志文件 '%s'"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:737 builtin/commit.c:745
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "could not read SQUASH_MSG"
|
2012-03-27 08:46:11 +02:00
|
|
|
|
msgstr "不能读取 SQUASH_MSG"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:742
|
2016-05-29 14:40:35 +02:00
|
|
|
|
msgid "could not read MERGE_MSG"
|
|
|
|
|
msgstr "不能读取 MERGE_MSG"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:796
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "could not write commit template"
|
2012-03-27 08:46:11 +02:00
|
|
|
|
msgstr "不能写提交模版"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:814
|
2012-05-30 06:19:47 +02:00
|
|
|
|
#, c-format
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid ""
|
|
|
|
|
"\n"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
"It looks like you may be committing a merge.\n"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
"If this is not correct, please remove the file\n"
|
|
|
|
|
"\t%s\n"
|
|
|
|
|
"and try again.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"\n"
|
2012-08-02 05:50:59 +02:00
|
|
|
|
"似乎您正在做一个合并提交。如果不对,请删除文件\n"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
"\t%s\n"
|
|
|
|
|
"然后重试。\n"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:819
|
2012-05-30 06:19:47 +02:00
|
|
|
|
#, c-format
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"\n"
|
|
|
|
|
"It looks like you may be committing a cherry-pick.\n"
|
|
|
|
|
"If this is not correct, please remove the file\n"
|
|
|
|
|
"\t%s\n"
|
|
|
|
|
"and try again.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"\n"
|
2012-08-02 05:50:59 +02:00
|
|
|
|
"似乎您正在做一个拣选提交。如果不对,请删除文件\n"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
"\t%s\n"
|
|
|
|
|
"然后重试。\n"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:832
|
2013-02-14 10:47:45 +01:00
|
|
|
|
#, c-format
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid ""
|
2012-05-21 03:35:47 +02:00
|
|
|
|
"Please enter the commit message for your changes. Lines starting\n"
|
2013-02-14 10:47:45 +01:00
|
|
|
|
"with '%c' will be ignored, and an empty message aborts the commit.\n"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgstr ""
|
2013-02-14 10:47:45 +01:00
|
|
|
|
"请为您的变更输入提交说明。以 '%c' 开始的行将被忽略,而一个空的提交\n"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
"说明将会终止提交。\n"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:839
|
2013-02-14 10:47:45 +01:00
|
|
|
|
#, c-format
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid ""
|
2012-05-21 03:35:47 +02:00
|
|
|
|
"Please enter the commit message for your changes. Lines starting\n"
|
2013-02-14 10:47:45 +01:00
|
|
|
|
"with '%c' will be kept; you may remove them yourself if you want to.\n"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
"An empty message aborts the commit.\n"
|
|
|
|
|
msgstr ""
|
2013-02-14 10:47:45 +01:00
|
|
|
|
"请为您的变更输入提交说明。以 '%c' 开始的行将被保留,如果您原意\n"
|
|
|
|
|
"也可以删除它们。一个空的提交说明将会终止提交。\n"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2012-03-27 08:46:11 +02:00
|
|
|
|
# 译者:为保证在输出中对齐,注意调整句中空格!
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:859
|
2014-08-04 10:23:15 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "%sAuthor: %.*s <%.*s>"
|
|
|
|
|
msgstr "%s作者: %.*s <%.*s>"
|
|
|
|
|
|
|
|
|
|
# 译者:为保证在输出中对齐,注意调整句中空格!
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:867
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
2014-08-04 10:23:15 +02:00
|
|
|
|
msgid "%sDate: %s"
|
|
|
|
|
msgstr "%s日期: %s"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2012-03-27 08:46:11 +02:00
|
|
|
|
# 译者:为保证在输出中对齐,注意调整句中空格!
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:874
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
2014-08-04 10:23:15 +02:00
|
|
|
|
msgid "%sCommitter: %.*s <%.*s>"
|
|
|
|
|
msgstr "%s提交者:%.*s <%.*s>"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:892
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "Cannot read index"
|
2012-03-27 08:46:11 +02:00
|
|
|
|
msgstr "无法读取索引"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:954
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "Error building trees"
|
|
|
|
|
msgstr "无法创建树对象"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:969 builtin/tag.c:266
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Please supply the message using either -m or -F option.\n"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1071
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
2015-02-16 14:34:19 +01:00
|
|
|
|
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
|
|
|
|
|
msgstr "--author '%s' 不是 'Name <email>' 格式,且未能在现有作者中找到匹配"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1086 builtin/commit.c:1327
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Invalid untracked files mode '%s'"
|
2012-03-27 08:46:11 +02:00
|
|
|
|
msgstr "无效的未追踪文件参数 '%s'"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1124
|
2013-07-26 08:00:02 +02:00
|
|
|
|
msgid "--long and -z are incompatible"
|
|
|
|
|
msgstr "--long 和 -z 选项不兼容"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1154
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "Using both --reset-author and --author does not make sense"
|
|
|
|
|
msgstr "同时使用 --reset-author 和 --author 没有意义"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1163
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "You have nothing to amend."
|
2012-03-27 08:46:11 +02:00
|
|
|
|
msgstr "您没有可修补的提交。"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1166
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "You are in the middle of a merge -- cannot amend."
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "您正处于一个合并过程中 -- 无法修补提交。"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1168
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "You are in the middle of a cherry-pick -- cannot amend."
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1171
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "Options --squash and --fixup cannot be used together"
|
2012-08-02 05:50:59 +02:00
|
|
|
|
msgstr "选项 --squash 和 --fixup 不能同时使用"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1181
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "Only one of -c/-C/-F/--fixup can be used."
|
|
|
|
|
msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1183
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
|
2012-08-02 05:50:59 +02:00
|
|
|
|
msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1191
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "--reset-author can be used only with -C, -c or --amend."
|
2012-08-02 05:50:59 +02:00
|
|
|
|
msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1208
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
|
|
|
|
|
msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1210
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "No paths with --include/--only does not make sense."
|
|
|
|
|
msgstr "参数 --include/--only 不跟路径没有意义。"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1212
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "Clever... amending the last one with dirty index."
|
2015-08-02 15:47:30 +02:00
|
|
|
|
msgstr "聪明... 用脏索引修补最后一个提交。"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1214
|
2014-03-13 05:41:34 +01:00
|
|
|
|
msgid "Explicit paths specified without -i or -o; assuming --only paths..."
|
|
|
|
|
msgstr "指定了明确的路径而没有使用 -i 或 -o 选项,认为是 --only paths..."
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1226 builtin/tag.c:474
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Invalid cleanup mode %s"
|
|
|
|
|
msgstr "无效的清理模式 %s"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1231
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "Paths with -a does not make sense."
|
2012-08-02 05:50:59 +02:00
|
|
|
|
msgstr "路径和 -a 选项同时使用没有意义。"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1341 builtin/commit.c:1617
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "show status concisely"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "以简洁的格式显示状态"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1343 builtin/commit.c:1619
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "show branch information"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "显示分支信息"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1345
|
|
|
|
|
msgid "version"
|
|
|
|
|
msgstr "版本"
|
|
|
|
|
|
|
|
|
|
#: builtin/commit.c:1345 builtin/commit.c:1621 builtin/push.c:522
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/worktree.c:440
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "machine-readable output"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "机器可读的输出"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1348 builtin/commit.c:1623
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgid "show status in long format (default)"
|
|
|
|
|
msgstr "以长格式显示状态(默认)"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1351 builtin/commit.c:1626
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "terminate entries with NUL"
|
2015-08-10 12:03:29 +02:00
|
|
|
|
msgstr "条目以 NUL 字符结尾"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1353 builtin/commit.c:1629 builtin/fast-export.c:981
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/fast-export.c:984 builtin/tag.c:353
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "mode"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "模式"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1354 builtin/commit.c:1629
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "显示未跟踪的文件,“模式”的可选参数:all、normal、no。(默认:all)"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1357
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "show ignored files"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "显示忽略的文件"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1358 parse-options.h:155
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "when"
|
|
|
|
|
msgstr "何时"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1359
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"ignore changes to submodules, optional when: all, dirty, untracked. "
|
|
|
|
|
"(Default: all)"
|
|
|
|
|
msgstr ""
|
2013-01-30 10:23:08 +01:00
|
|
|
|
"忽略子模组的更改,“何时”的可选参数:all、dirty、untracked。(默认:all)"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1361
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "list untracked files in columns"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "以列的方式显示未跟踪的文件"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1437
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "couldn't look up newly created commit"
|
|
|
|
|
msgstr "无法找到新创建的提交"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1439
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "could not parse newly created commit"
|
2012-03-27 08:46:11 +02:00
|
|
|
|
msgstr "不能解析新创建的提交"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1484
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "detached HEAD"
|
|
|
|
|
msgstr "分离头指针"
|
|
|
|
|
|
2012-03-30 04:55:34 +02:00
|
|
|
|
# 译者:中文字符串拼接,可删除前导空格
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1487
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid " (root-commit)"
|
2012-03-30 04:55:34 +02:00
|
|
|
|
msgstr "(根提交)"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1587
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "suppress summary after successful commit"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "提交成功后不显示概述信息"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1588
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "show diff in commit message template"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "在提交说明模板里显示差异"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1590
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "Commit message options"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "提交说明选项"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1591 builtin/tag.c:351
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "read message from file"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "从文件中读取提交说明"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1592
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "author"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "作者"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1592
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "override author for commit"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "提交时覆盖作者"
|
2012-04-28 16:42:41 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1593 builtin/gc.c:326
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "date"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "日期"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1593
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "override date for commit"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "提交时覆盖日期"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1594 builtin/merge.c:220 builtin/notes.c:398
|
|
|
|
|
#: builtin/notes.c:561 builtin/tag.c:349
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "message"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "说明"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1594
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "commit message"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "提交说明"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597
|
|
|
|
|
#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:79
|
2015-11-16 00:02:11 +01:00
|
|
|
|
msgid "commit"
|
|
|
|
|
msgstr "提交"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1595
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "reuse and edit message from specified commit"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "重用并编辑指定提交的提交说明"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1596
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "reuse message from specified commit"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "重用指定提交的提交说明"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1597
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "use autosquash formatted message to fixup specified commit"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1598
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "use autosquash formatted message to squash specified commit"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1599
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "the commit is authored by me now (used with -C/-c/--amend)"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "现在将该提交的作者改为我(和 -C/-c/--amend 参数共用)"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1600 builtin/log.c:1413 builtin/revert.c:86
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "add Signed-off-by:"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "添加 Signed-off-by: 签名"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1601
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "use specified template file"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "使用指定的模板文件"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1602
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "force edit of commit"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "强制编辑提交"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2013-01-30 10:23:08 +01:00
|
|
|
|
# 译者:可选值,不能翻译(或是原文中笔误,应为 mode)
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1603
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "default"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "default"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1603 builtin/tag.c:354
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "how to strip spaces and #comments from message"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "设置如何删除提交说明里的空格和#注释"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1604
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "include status in commit message template"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "在提交说明模板里包含状态信息"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1606 builtin/merge.c:230 builtin/pull.c:166
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: builtin/revert.c:93
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "GPG sign commit"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "GPG 提交签名"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1609
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "Commit contents options"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "提交内容选项"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1610
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "commit all changed files"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "提交所有改动的文件"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1611
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "add specified files to index for commit"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "添加指定的文件到索引区等待提交"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1612
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "interactively add files"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "交互式添加文件"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1613
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "interactively add changes"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "交互式添加变更"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1614
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "commit only specified files"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "只提交指定的文件"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1615
|
2016-08-28 04:18:12 +02:00
|
|
|
|
msgid "bypass pre-commit and commit-msg hooks"
|
|
|
|
|
msgstr "绕过 pre-commit 和 commit-msg 钩子"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1616
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "show what would be committed"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "显示将要提交的内容"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1627
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "amend previous commit"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "修改先前的提交"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1628
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "bypass post-rewrite hook"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "绕过 post-rewrite 钩子"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1633
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "ok to record an empty change"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "允许一个空提交"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1635
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "ok to record a change with an empty message"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "允许空的提交说明"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1664
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "could not parse HEAD commit"
|
2012-03-27 08:46:11 +02:00
|
|
|
|
msgstr "不能解析 HEAD 提交"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1712
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Corrupt MERGE_HEAD file (%s)"
|
2012-03-27 08:46:11 +02:00
|
|
|
|
msgstr "损坏的 MERGE_HEAD 文件(%s)"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1719
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "could not read MERGE_MODE"
|
2012-03-27 08:46:11 +02:00
|
|
|
|
msgstr "不能读取 MERGE_MODE"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1738
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "could not read commit message: %s"
|
2012-03-27 08:46:11 +02:00
|
|
|
|
msgstr "不能读取提交说明:%s"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1749
|
2012-04-28 16:42:41 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Aborting commit; you did not edit the message.\n"
|
|
|
|
|
msgstr "终止提交;您未更改来自模版的提交说明。\n"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1754
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Aborting commit due to empty commit message.\n"
|
|
|
|
|
msgstr "终止提交因为提交说明为空。\n"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/commit.c:1802
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid ""
|
|
|
|
|
"Repository has been updated, but unable to write\n"
|
2014-10-08 04:55:14 +02:00
|
|
|
|
"new_index file. Check that disk is not full and quota is\n"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
"not exceeded, and then \"git reset HEAD\" to recover."
|
|
|
|
|
msgstr ""
|
2015-08-02 15:47:30 +02:00
|
|
|
|
"仓库已更新,但无法写 new_index 文件。检查是否磁盘已满\n"
|
2012-03-27 08:46:11 +02:00
|
|
|
|
"或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/config.c:9
|
2015-02-16 14:34:19 +01:00
|
|
|
|
msgid "git config [<options>]"
|
|
|
|
|
msgstr "git config [<选项>]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/config.c:55
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "Config file location"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "配置文件位置"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/config.c:56
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "use global config file"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "使用全局配置文件"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/config.c:57
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "use system config file"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "使用系统级配置文件"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/config.c:58
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "use repository config file"
|
2015-08-02 15:47:30 +02:00
|
|
|
|
msgstr "使用仓库级配置文件"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/config.c:59
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "use given config file"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "使用指定的配置文件"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/config.c:60
|
2013-07-26 08:00:02 +02:00
|
|
|
|
msgid "blob-id"
|
2015-08-10 12:03:29 +02:00
|
|
|
|
msgstr "数据对象 ID"
|
2013-07-26 08:00:02 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/config.c:60
|
2013-07-26 08:00:02 +02:00
|
|
|
|
msgid "read config from given blob object"
|
|
|
|
|
msgstr "从给定的数据对象读取配置"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/config.c:61
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "Action"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "操作"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/config.c:62
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "get value: name [value-regex]"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "获取值:name [value-regex]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/config.c:63
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "get all values: key [value-regex]"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "获得所有的值:key [value-regex]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/config.c:64
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "get values for regexp: name-regex [value-regex]"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "根据正则表达式获得值:name-regex [value-regex]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/config.c:65
|
2013-09-17 17:37:05 +02:00
|
|
|
|
msgid "get value specific for the URL: section[.var] URL"
|
|
|
|
|
msgstr "获得 URL 取值:section[.var] URL"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/config.c:66
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "replace all matching variables: name value [value_regex]"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "替换所有匹配的变量:name value [value_regex]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/config.c:67
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "add a new variable: name value"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "添加一个新的变量:name value"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/config.c:68
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "remove a variable: name [value-regex]"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "删除一个变量:name [value-regex]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/config.c:69
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "remove all matches: name [value-regex]"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "删除所有匹配项:name [value-regex]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/config.c:70
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "rename section: old-name new-name"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "重命名小节:old-name new-name"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/config.c:71
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "remove a section: name"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "删除一个小节:name"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/config.c:72
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "list all"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "列出所有"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/config.c:73
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "open an editor"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "打开一个编辑器"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/config.c:74
|
2015-01-04 05:27:38 +01:00
|
|
|
|
msgid "find the color configured: slot [default]"
|
|
|
|
|
msgstr "获得配置的颜色:配置 [默认]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/config.c:75
|
2015-01-04 05:27:38 +01:00
|
|
|
|
msgid "find the color setting: slot [stdout-is-tty]"
|
|
|
|
|
msgstr "获得颜色设置:配置 [stdout-is-tty]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/config.c:76
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "Type"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "类型"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/config.c:77
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "value is \"true\" or \"false\""
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "值是 \"true\" 或 \"false\""
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/config.c:78
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "value is decimal number"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "值是十进制数"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/config.c:79
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "value is --bool or --int"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "值是 --bool or --int"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/config.c:80
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "value is a path (file or directory name)"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "值是一个路径(文件或目录名)"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/config.c:81
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "Other"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "其它"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/config.c:82
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "terminate values with NUL byte"
|
2015-08-10 12:03:29 +02:00
|
|
|
|
msgstr "终止值是 NUL 字节"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/config.c:83
|
2015-08-23 09:23:21 +02:00
|
|
|
|
msgid "show variable names only"
|
|
|
|
|
msgstr "只显示变量名"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/config.c:84
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "respect include directives on lookup"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "查询时参照 include 指令递归查找"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/config.c:85
|
2016-02-28 13:35:55 +01:00
|
|
|
|
msgid "show origin of config (file, standard input, blob, command line)"
|
|
|
|
|
msgstr "显示配置的来源(文件、标准输入、数据对象,或命令行)"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/config.c:327
|
2014-10-08 04:55:14 +02:00
|
|
|
|
msgid "unable to parse default color value"
|
2015-08-02 15:47:30 +02:00
|
|
|
|
msgstr "不能解析默认颜色值"
|
2014-10-08 04:55:14 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/config.c:471
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"# This is Git's per-user configuration file.\n"
|
2015-05-31 02:42:31 +02:00
|
|
|
|
"[user]\n"
|
2014-10-08 04:55:14 +02:00
|
|
|
|
"# Please adapt and uncomment the following lines:\n"
|
2015-05-31 02:42:31 +02:00
|
|
|
|
"#\tname = %s\n"
|
2014-10-08 04:55:14 +02:00
|
|
|
|
"#\temail = %s\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"# This is Git's per-user configuration file.\n"
|
2015-05-31 02:42:31 +02:00
|
|
|
|
"[user]\n"
|
2014-10-08 04:55:14 +02:00
|
|
|
|
"# Please adapt and uncomment the following lines:\n"
|
2015-05-31 02:42:31 +02:00
|
|
|
|
"#\tname = %s\n"
|
2014-10-08 04:55:14 +02:00
|
|
|
|
"#\temail = %s\n"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/config.c:613
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot create configuration file %s"
|
|
|
|
|
msgstr "不能创建配置文件 %s"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/config.c:625
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"cannot overwrite multiple values with a single value\n"
|
|
|
|
|
" Use a regexp, --add or --replace-all to change %s."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"无法用一个值覆盖多个值\n"
|
|
|
|
|
" 使用一个正则表达式、--add 或 --replace-all 来修改 %s。"
|
|
|
|
|
|
|
|
|
|
#: builtin/count-objects.c:86
|
2013-04-13 04:02:43 +02:00
|
|
|
|
msgid "git count-objects [-v] [-H | --human-readable]"
|
|
|
|
|
msgstr "git count-objects [-v] [-H | --human-readable]"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/count-objects.c:96
|
2013-04-13 04:02:43 +02:00
|
|
|
|
msgid "print sizes in human readable format"
|
|
|
|
|
msgstr "以用户可读的格式显示大小"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/describe.c:17
|
2015-02-16 14:34:19 +01:00
|
|
|
|
msgid "git describe [<options>] [<commit-ish>...]"
|
|
|
|
|
msgstr "git describe [<选项>] [<提交号>...]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/describe.c:18
|
2015-02-16 14:34:19 +01:00
|
|
|
|
msgid "git describe [<options>] --dirty"
|
|
|
|
|
msgstr "git describe [<选项>] --dirty"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/describe.c:217
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "annotated tag %s not available"
|
2015-07-28 06:52:28 +02:00
|
|
|
|
msgstr "附注标签 %s 无效"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/describe.c:221
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "annotated tag %s has no embedded name"
|
2015-07-28 06:52:28 +02:00
|
|
|
|
msgstr "附注标签 %s 没有嵌入名称"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/describe.c:223
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "tag '%s' is really '%s' here"
|
2015-07-28 06:52:28 +02:00
|
|
|
|
msgstr "标签 '%s' 的确是在 '%s'"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/describe.c:250 builtin/log.c:480
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Not a valid object name %s"
|
|
|
|
|
msgstr "不是一个有效的对象名 %s"
|
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/describe.c:253
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "%s is not a valid '%s' object"
|
|
|
|
|
msgstr "%s 不是一个有效的 '%s' 对象"
|
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/describe.c:270
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "no tag exactly matches '%s'"
|
2015-07-28 06:52:28 +02:00
|
|
|
|
msgstr "没有标签准确匹配 '%s'"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/describe.c:272
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "searching to describe %s\n"
|
|
|
|
|
msgstr "搜索描述 %s\n"
|
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/describe.c:319
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "finished search at %s\n"
|
|
|
|
|
msgstr "完成搜索 %s\n"
|
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/describe.c:346
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"No annotated tags can describe '%s'.\n"
|
|
|
|
|
"However, there were unannotated tags: try --tags."
|
|
|
|
|
msgstr ""
|
2015-07-28 06:52:28 +02:00
|
|
|
|
"没有附注标签能描述 '%s'。\n"
|
|
|
|
|
"然而,存在未附注标签:尝试 --tags。"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/describe.c:350
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"No tags can describe '%s'.\n"
|
|
|
|
|
"Try --always, or create some tags."
|
|
|
|
|
msgstr ""
|
2015-07-28 06:52:28 +02:00
|
|
|
|
"没有标签能描述 '%s'。\n"
|
|
|
|
|
"尝试 --always,或者创建一些标签。"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/describe.c:371
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "traversed %lu commits\n"
|
|
|
|
|
msgstr "已遍历 %lu 个提交\n"
|
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/describe.c:374
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"more than %i tags found; listed %i most recent\n"
|
|
|
|
|
"gave up search at %s\n"
|
|
|
|
|
msgstr ""
|
2015-07-28 06:52:28 +02:00
|
|
|
|
"发现多于 %i 个标签,列出最近的 %i 个\n"
|
2012-03-27 08:46:11 +02:00
|
|
|
|
"在 %s 放弃搜索\n"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/describe.c:396
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "find the tag that comes after the commit"
|
2015-07-28 06:52:28 +02:00
|
|
|
|
msgstr "寻找该提交之后的标签"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/describe.c:397
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "debug search strategy on stderr"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "在标准错误上调试搜索策略"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/describe.c:398
|
2013-04-11 11:55:09 +02:00
|
|
|
|
msgid "use any ref"
|
|
|
|
|
msgstr "使用任意引用"
|
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/describe.c:399
|
2013-04-11 11:55:09 +02:00
|
|
|
|
msgid "use any tag, even unannotated"
|
2015-07-28 06:52:28 +02:00
|
|
|
|
msgstr "使用任意标签,即使未附带注释"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/describe.c:400
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "always use long format"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "始终使用长提交号格式"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/describe.c:401
|
2013-07-26 08:00:02 +02:00
|
|
|
|
msgid "only follow first parent"
|
|
|
|
|
msgstr "只跟随第一个父提交"
|
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/describe.c:404
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "only output exact matches"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "只输出精确匹配"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/describe.c:406
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "consider <n> most recent tags (default: 10)"
|
2015-07-28 06:52:28 +02:00
|
|
|
|
msgstr "考虑最近 <n> 个标签(默认:10)"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/describe.c:408
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "only consider tags matching <pattern>"
|
2015-07-28 06:52:28 +02:00
|
|
|
|
msgstr "只考虑匹配 <模式> 的标签"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/describe.c:410 builtin/name-rev.c:320
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "show abbreviated commit object as fallback"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "显示简写的提交号作为后备"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/describe.c:411
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "mark"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "标记"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/describe.c:412
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "append <mark> on dirty working tree (default: \"-dirty\")"
|
2015-08-02 15:47:30 +02:00
|
|
|
|
msgstr "对于脏工作区,追加 <标记>(默认:\"-dirty\")"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/describe.c:430
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "--long is incompatible with --abbrev=0"
|
|
|
|
|
msgstr "--long 与 --abbrev=0 不兼容"
|
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/describe.c:456
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "No names found, cannot describe anything."
|
2012-03-27 08:46:11 +02:00
|
|
|
|
msgstr "没有发现名称,无法描述任何东西。"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/describe.c:476
|
2013-09-04 21:04:31 +02:00
|
|
|
|
msgid "--dirty is incompatible with commit-ishes"
|
2012-08-02 05:50:59 +02:00
|
|
|
|
msgstr "--dirty 不能与提交同时使用"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/diff.c:86
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "'%s': not a regular file or symlink"
|
|
|
|
|
msgstr "'%s':不是一个正规文件或符号链接"
|
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/diff.c:237
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "invalid option: %s"
|
|
|
|
|
msgstr "无效选项:%s"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/diff.c:361
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "Not a git repository"
|
2015-08-02 15:47:30 +02:00
|
|
|
|
msgstr "不是一个 git 仓库"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/diff.c:404
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "invalid object '%s' given."
|
|
|
|
|
msgstr "提供了无效对象 '%s'。"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/diff.c:413
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "more than two blobs given: '%s'"
|
2015-08-02 15:47:30 +02:00
|
|
|
|
msgstr "提供了超过两个数据对象:'%s'"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/diff.c:420
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unhandled object '%s' given."
|
2014-03-13 05:41:34 +01:00
|
|
|
|
msgstr "无法处理的对象 '%s'。"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: builtin/fast-export.c:25
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "git fast-export [rev-list-opts]"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "git fast-export [rev-list-opts]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: builtin/fast-export.c:980
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "show progress after <n> objects"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "在 <n> 个对象之后显示进度"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: builtin/fast-export.c:982
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "select handling of signed tags"
|
2015-07-28 06:52:28 +02:00
|
|
|
|
msgstr "选择如何处理签名标签"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: builtin/fast-export.c:985
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "select handling of tags that tag filtered objects"
|
2015-07-28 06:52:28 +02:00
|
|
|
|
msgstr "选择当标签指向被过滤对象时该标签的处理方式"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: builtin/fast-export.c:988
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "Dump marks to this file"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "把标记存储到这个文件"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: builtin/fast-export.c:990
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "Import marks from this file"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "从这个文件导入标记"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: builtin/fast-export.c:992
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "Fake a tagger when tags lack one"
|
2015-07-28 06:52:28 +02:00
|
|
|
|
msgstr "当标签缺少标记者字段时,假装提供一个"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: builtin/fast-export.c:994
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "Output full tree for each commit"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "每次提交都输出整个树"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: builtin/fast-export.c:996
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "Use the done feature to terminate the stream"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "使用 done 功能来终止流"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: builtin/fast-export.c:997
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "Skip output of blob data"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "跳过数据对象的输出"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: builtin/fast-export.c:998
|
2014-08-04 10:23:15 +02:00
|
|
|
|
msgid "refspec"
|
2015-08-02 15:47:30 +02:00
|
|
|
|
msgstr "引用规格"
|
2014-08-04 10:23:15 +02:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: builtin/fast-export.c:999
|
2014-08-04 10:23:15 +02:00
|
|
|
|
msgid "Apply refspec to exported refs"
|
2015-08-02 15:47:30 +02:00
|
|
|
|
msgstr "对导出的引用应用引用规格"
|
2014-08-04 10:23:15 +02:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: builtin/fast-export.c:1000
|
2014-10-08 04:55:14 +02:00
|
|
|
|
msgid "anonymize output"
|
|
|
|
|
msgstr "匿名输出"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/fetch.c:21
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
|
2015-08-02 15:47:30 +02:00
|
|
|
|
msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/fetch.c:22
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "git fetch [<options>] <group>"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "git fetch [<选项>] <组>"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/fetch.c:23
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
|
2015-08-02 15:47:30 +02:00
|
|
|
|
msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/fetch.c:24
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "git fetch --all [<options>]"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "git fetch --all [<选项>]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/fetch.c:95 builtin/pull.c:175
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "fetch from all remotes"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "从所有的远程抓取"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/fetch.c:97 builtin/pull.c:178
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "append to .git/FETCH_HEAD instead of overwriting"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/fetch.c:99 builtin/pull.c:181
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "path to upload pack on remote end"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "上传包到远程的路径"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/fetch.c:100 builtin/pull.c:183
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "force overwrite of local branch"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "强制覆盖本地分支"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/fetch.c:102
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "fetch from multiple remotes"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "从多个远程抓取"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/fetch.c:104 builtin/pull.c:185
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "fetch all tags and associated objects"
|
2015-07-28 06:52:28 +02:00
|
|
|
|
msgstr "抓取所有的标签和关联对象"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/fetch.c:106
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "do not fetch all tags (--no-tags)"
|
2015-07-28 06:52:28 +02:00
|
|
|
|
msgstr "不抓取任何标签(--no-tags)"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/fetch.c:108
|
2016-02-28 13:35:55 +01:00
|
|
|
|
msgid "number of submodules fetched in parallel"
|
|
|
|
|
msgstr "子模组获取的并发数"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/fetch.c:110 builtin/pull.c:188
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "prune remote-tracking branches no longer on remote"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "清除远程已经不存在的分支的跟踪分支"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2013-01-30 10:23:08 +01:00
|
|
|
|
# 译者:可选值,不能翻译
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/fetch.c:111 builtin/pull.c:191
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "on-demand"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "on-demand"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/fetch.c:112 builtin/pull.c:192
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "control recursive fetching of submodules"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "控制子模组的递归抓取"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/fetch.c:116 builtin/pull.c:200
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "keep downloaded pack"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "保持下载包"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/fetch.c:118
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "allow updating of HEAD ref"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "允许更新 HEAD 引用"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/fetch.c:121 builtin/fetch.c:127 builtin/pull.c:203
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "deepen history of shallow clone"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "深化浅克隆的历史"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/fetch.c:123
|
|
|
|
|
msgid "deepen history of shallow repository based on time"
|
|
|
|
|
msgstr "基于时间来深化浅克隆的历史"
|
|
|
|
|
|
|
|
|
|
#: builtin/fetch.c:129 builtin/pull.c:206
|
2013-02-14 10:47:45 +01:00
|
|
|
|
msgid "convert to a complete repository"
|
2015-08-02 15:47:30 +02:00
|
|
|
|
msgstr "转换为一个完整的仓库"
|
2013-02-14 10:47:45 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/fetch.c:131 builtin/log.c:1433
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "dir"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "目录"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/fetch.c:132
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "prepend this to submodule path output"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "在子模组路径输出的前面加上此目录"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/fetch.c:135
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "default mode for recursion"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "递归的默认模式"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/fetch.c:137 builtin/pull.c:209
|
2014-01-18 04:04:21 +01:00
|
|
|
|
msgid "accept refs that update .git/shallow"
|
|
|
|
|
msgstr "接受更新 .git/shallow 的引用"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/fetch.c:138 builtin/pull.c:211
|
2014-08-04 10:23:15 +02:00
|
|
|
|
msgid "refmap"
|
|
|
|
|
msgstr "引用映射"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/fetch.c:139 builtin/pull.c:212
|
2014-08-04 10:23:15 +02:00
|
|
|
|
msgid "specify fetch refmap"
|
|
|
|
|
msgstr "指定获取操作的引用映射"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/fetch.c:398
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "Couldn't find remote ref HEAD"
|
|
|
|
|
msgstr "无法发现远程 HEAD 引用"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/fetch.c:514
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "configuration fetch.output contains invalid value %s"
|
|
|
|
|
msgstr "配置变量 fetch.output 包含无效值 %s"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/fetch.c:607
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "object %s not found"
|
|
|
|
|
msgstr "对象 %s 未发现"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/fetch.c:611
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "[up to date]"
|
|
|
|
|
msgstr "[最新]"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/fetch.c:624 builtin/fetch.c:704
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "[rejected]"
|
|
|
|
|
msgstr "[已拒绝]"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/fetch.c:625
|
2016-08-28 04:18:12 +02:00
|
|
|
|
msgid "can't fetch in current branch"
|
2016-09-07 12:03:04 +02:00
|
|
|
|
msgstr "当前分支下不能执行获取操作"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/fetch.c:634
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "[tag update]"
|
2015-07-28 06:52:28 +02:00
|
|
|
|
msgstr "[标签更新]"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/fetch.c:635 builtin/fetch.c:668 builtin/fetch.c:684
|
|
|
|
|
#: builtin/fetch.c:699
|
2016-08-28 04:18:12 +02:00
|
|
|
|
msgid "unable to update local ref"
|
|
|
|
|
msgstr "不能更新本地引用"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/fetch.c:654
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "[new tag]"
|
2015-07-28 06:52:28 +02:00
|
|
|
|
msgstr "[新标签]"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/fetch.c:657
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "[new branch]"
|
|
|
|
|
msgstr "[新分支]"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/fetch.c:660
|
2012-04-29 18:06:55 +02:00
|
|
|
|
msgid "[new ref]"
|
|
|
|
|
msgstr "[新引用]"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/fetch.c:699
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "forced update"
|
|
|
|
|
msgstr "强制更新"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/fetch.c:704
|
2016-08-28 04:18:12 +02:00
|
|
|
|
msgid "non-fast-forward"
|
|
|
|
|
msgstr "非快进"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/fetch.c:749
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "%s did not send all necessary objects\n"
|
|
|
|
|
msgstr "%s 未发送所有必须的对象\n"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/fetch.c:769
|
2014-01-18 04:04:21 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "reject %s because shallow roots are not allowed to be updated"
|
|
|
|
|
msgstr "拒绝 %s 因为浅克隆不允许被更新"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/fetch.c:856 builtin/fetch.c:952
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "From %.*s\n"
|
|
|
|
|
msgstr "来自 %.*s\n"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/fetch.c:867
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, 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' 来删除旧的、有冲突的分支"
|
|
|
|
|
|
2012-03-27 08:46:11 +02:00
|
|
|
|
# 译者:注意保持前导空格
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/fetch.c:922
|
2012-05-30 06:19:47 +02:00
|
|
|
|
#, c-format
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid " (%s will become dangling)"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr " (%s 将成为摇摆状态)"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2012-03-27 08:46:11 +02:00
|
|
|
|
# 译者:注意保持前导空格
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/fetch.c:923
|
2012-05-30 06:19:47 +02:00
|
|
|
|
#, c-format
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid " (%s has become dangling)"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr " (%s 已成为摇摆状态)"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/fetch.c:955
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "[deleted]"
|
|
|
|
|
msgstr "[已删除]"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/fetch.c:956 builtin/remote.c:1020
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "(none)"
|
|
|
|
|
msgstr "(无)"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/fetch.c:979
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Refusing to fetch into current branch %s of non-bare repository"
|
2015-08-02 15:47:30 +02:00
|
|
|
|
msgstr "拒绝获取到非纯仓库的当前分支 %s"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/fetch.c:998
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Option \"%s\" value \"%s\" is not valid for %s"
|
|
|
|
|
msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/fetch.c:1001
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Option \"%s\" is ignored for %s\n"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "选项 \"%s\" 为 %s 所忽略\n"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/fetch.c:1077
|
2013-09-17 17:37:05 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Don't know how to fetch from %s"
|
|
|
|
|
msgstr "不知道如何从 %s 获取"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/fetch.c:1237
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Fetching %s\n"
|
2012-02-02 09:40:12 +01:00
|
|
|
|
msgstr "正在获取 %s\n"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/fetch.c:1239 builtin/remote.c:96
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Could not fetch %s"
|
|
|
|
|
msgstr "不能获取 %s"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/fetch.c:1257
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid ""
|
|
|
|
|
"No remote repository specified. Please, specify either a URL or a\n"
|
|
|
|
|
"remote name from which new revisions should be fetched."
|
2015-08-10 12:03:29 +02:00
|
|
|
|
msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定,用以获取新提交。"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/fetch.c:1280
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "You need to specify a tag name."
|
2015-07-28 06:52:28 +02:00
|
|
|
|
msgstr "您需要指定一个标签名称。"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/fetch.c:1322
|
|
|
|
|
msgid "Negative depth in --deepen is not supported"
|
|
|
|
|
msgstr "--deepen 不支持负数深度"
|
|
|
|
|
|
|
|
|
|
#: builtin/fetch.c:1324
|
|
|
|
|
msgid "--deepen and --depth are mutually exclusive"
|
|
|
|
|
msgstr "--deepen 和 --depth 是互斥的"
|
|
|
|
|
|
|
|
|
|
#: builtin/fetch.c:1329
|
2013-02-14 10:47:45 +01:00
|
|
|
|
msgid "--depth and --unshallow cannot be used together"
|
|
|
|
|
msgstr "--depth 和 --unshallow 不能同时使用"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/fetch.c:1331
|
2013-02-14 10:47:45 +01:00
|
|
|
|
msgid "--unshallow on a complete repository does not make sense"
|
2015-08-02 15:47:30 +02:00
|
|
|
|
msgstr "对于一个完整的仓库,参数 --unshallow 没有意义"
|
2013-02-14 10:47:45 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/fetch.c:1353
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "fetch --all does not take a repository argument"
|
2015-08-02 15:47:30 +02:00
|
|
|
|
msgstr "fetch --all 不能带一个仓库参数"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/fetch.c:1355
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "fetch --all does not make sense with refspecs"
|
2015-08-02 15:47:30 +02:00
|
|
|
|
msgstr "fetch --all 带引用规格没有任何意义"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/fetch.c:1366
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "No such remote or remote group: %s"
|
|
|
|
|
msgstr "没有这样的远程或远程组:%s"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/fetch.c:1374
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "Fetching a group and specifying refspecs does not make sense"
|
2015-08-02 15:47:30 +02:00
|
|
|
|
msgstr "获取组并指定引用规格没有意义"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: builtin/fmt-merge-msg.c:14
|
2015-02-16 14:34:19 +01:00
|
|
|
|
msgid ""
|
|
|
|
|
"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
|
|
|
|
|
msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/fmt-merge-msg.c:663
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "populate log with at most <n> entries from shortlog"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "向提交说明中最多复制指定条目(合并而来的提交)的简短说明"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/fmt-merge-msg.c:666
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "alias for --log (deprecated)"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "参数 --log 的别名(已弃用)"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/fmt-merge-msg.c:669
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "text"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "文本"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/fmt-merge-msg.c:670
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "use <text> as start of message"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "使用 <文本> 作为提交说明的开始"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/fmt-merge-msg.c:671
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "file to read from"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "从文件中读取"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: builtin/for-each-ref.c:9
|
2015-02-16 14:34:19 +01:00
|
|
|
|
msgid "git for-each-ref [<options>] [<pattern>]"
|
|
|
|
|
msgstr "git for-each-ref [<选项>] [<模式>]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/for-each-ref.c:10
|
|
|
|
|
msgid "git for-each-ref [--points-at <object>]"
|
|
|
|
|
msgstr "git for-each-ref [--points-at <对象>]"
|
|
|
|
|
|
|
|
|
|
#: builtin/for-each-ref.c:11
|
|
|
|
|
msgid "git for-each-ref [(--merged | --no-merged) [<object>]]"
|
|
|
|
|
msgstr "git for-each-ref [(--merged | --no-merged) [<对象>]]"
|
|
|
|
|
|
|
|
|
|
#: builtin/for-each-ref.c:12
|
|
|
|
|
msgid "git for-each-ref [--contains [<object>]]"
|
|
|
|
|
msgstr "git for-each-ref [--contains [<对象>]]"
|
|
|
|
|
|
|
|
|
|
#: builtin/for-each-ref.c:27
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "quote placeholders suitably for shells"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "引用占位符适用于 shells"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/for-each-ref.c:29
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "quote placeholders suitably for perl"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "引用占位符适用于 perl"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/for-each-ref.c:31
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "quote placeholders suitably for python"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "引用占位符适用于 python"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/for-each-ref.c:33
|
2015-01-04 05:27:38 +01:00
|
|
|
|
msgid "quote placeholders suitably for Tcl"
|
|
|
|
|
msgstr "引用占位符适用于 Tcl"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/for-each-ref.c:36
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "show only <n> matched refs"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "只显示 <n> 个匹配的引用"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/for-each-ref.c:37 builtin/tag.c:372
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "format to use for the output"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "输出格式"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/for-each-ref.c:41
|
|
|
|
|
msgid "print only refs which points at the given object"
|
|
|
|
|
msgstr "只打印指向给定对象的引用"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/for-each-ref.c:43
|
|
|
|
|
msgid "print only refs that are merged"
|
|
|
|
|
msgstr "只打印已经合并的引用"
|
|
|
|
|
|
|
|
|
|
#: builtin/for-each-ref.c:44
|
|
|
|
|
msgid "print only refs that are not merged"
|
|
|
|
|
msgstr "只打印没有合并的引用"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/for-each-ref.c:45
|
|
|
|
|
msgid "print only refs which contain the commit"
|
|
|
|
|
msgstr "只打印包含该提交的引用"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/fsck.c:519
|
2014-03-13 05:41:34 +01:00
|
|
|
|
msgid "Checking object directories"
|
|
|
|
|
msgstr "检查对象目录中"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/fsck.c:588
|
2015-02-16 14:34:19 +01:00
|
|
|
|
msgid "git fsck [<options>] [<object>...]"
|
|
|
|
|
msgstr "git fsck [<选项>] [<对象>...]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/fsck.c:594
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "show unreachable objects"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "显示不可达的对象"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/fsck.c:595
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "show dangling objects"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "显示摇摆的对象"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/fsck.c:596
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "report tags"
|
2015-07-28 06:52:28 +02:00
|
|
|
|
msgstr "报告标签"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/fsck.c:597
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "report root nodes"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "报告根节点"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/fsck.c:598
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "make index objects head nodes"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "将索引亦作为检查的头节点"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/fsck.c:599
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "make reflogs head nodes (default)"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "将引用日志作为检查的头节点(默认)"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/fsck.c:600
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "also consider packs and alternate objects"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "也考虑包和备用对象"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/fsck.c:601
|
2015-08-23 09:23:21 +02:00
|
|
|
|
msgid "check only connectivity"
|
|
|
|
|
msgstr "仅检查连通性"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/fsck.c:602
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "enable more strict checking"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "启用更严格的检查"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/fsck.c:604
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "write dangling objects in .git/lost-found"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "将摇摆对象写入 .git/lost-found 中"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/fsck.c:605 builtin/prune.c:107
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "show progress"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "显示进度"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/fsck.c:606
|
|
|
|
|
msgid "show verbose names for reachable objects"
|
|
|
|
|
msgstr "显示可达对象的详细名称"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/fsck.c:665
|
2014-03-13 05:41:34 +01:00
|
|
|
|
msgid "Checking objects"
|
|
|
|
|
msgstr "检查对象中"
|
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: builtin/gc.c:25
|
2015-02-16 14:34:19 +01:00
|
|
|
|
msgid "git gc [<options>]"
|
|
|
|
|
msgstr "git gc [<选项>]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/gc.c:72
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
2015-05-31 02:42:31 +02:00
|
|
|
|
msgid "Invalid %s: '%s'"
|
|
|
|
|
msgstr "无效 %s:'%s'"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/gc.c:139
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "insanely long object directory %.*s"
|
|
|
|
|
msgstr "不正常的长对象目录 %.*s"
|
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/gc.c:290
|
|
|
|
|
#, 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:327
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "prune unreferenced objects"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "清除未引用的对象"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/gc.c:329
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "be more thorough (increased runtime)"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "更彻底(增加运行时间)"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/gc.c:330
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "enable auto-gc mode"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "启用自动垃圾回收模式"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/gc.c:331
|
2013-09-17 17:37:05 +02:00
|
|
|
|
msgid "force running gc even if there may be another gc running"
|
|
|
|
|
msgstr "强制执行 gc 即使另外一个 gc 正在执行"
|
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/gc.c:373
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
2014-03-13 05:41:34 +01:00
|
|
|
|
msgid "Auto packing the repository in background for optimum performance.\n"
|
2015-08-02 15:47:30 +02:00
|
|
|
|
msgstr "自动在后台执行仓库打包以求最佳性能。\n"
|
2014-03-13 05:41:34 +01:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/gc.c:375
|
2014-03-13 05:41:34 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Auto packing the repository for optimum performance.\n"
|
2015-08-02 15:47:30 +02:00
|
|
|
|
msgstr "自动打包仓库以求最佳性能。\n"
|
2014-03-13 05:41:34 +01:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/gc.c:376
|
2014-03-13 05:41:34 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "See \"git help gc\" for manual housekeeping.\n"
|
|
|
|
|
msgstr "手工维护参见 \"git help gc\"。\n"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/gc.c:397
|
2013-09-17 17:37:05 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX> (如果不是,使用 --force)"
|
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/gc.c:441
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid ""
|
|
|
|
|
"There are too many unreachable loose objects; run 'git prune' to remove them."
|
2012-03-27 08:46:11 +02:00
|
|
|
|
msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2013-09-17 17:37:05 +02:00
|
|
|
|
#: builtin/grep.c:23
|
2015-02-16 14:34:19 +01:00
|
|
|
|
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
|
|
|
|
|
msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/grep.c:219
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "grep: failed to create thread: %s"
|
2012-03-27 08:46:11 +02:00
|
|
|
|
msgstr "grep:无法创建线程:%s"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/grep.c:277
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "invalid number of threads specified (%d) for %s"
|
|
|
|
|
msgstr "为 %2$s 设定的线程数 (%1$d) 无效"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/grep.c:453 builtin/grep.c:488
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to read tree (%s)"
|
2012-03-27 08:46:11 +02:00
|
|
|
|
msgstr "无法读取树(%s)"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/grep.c:503
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to grep from object of type %s"
|
|
|
|
|
msgstr "无法抓取来自于 %s 类型的对象"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/grep.c:561
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "switch `%c' expects a numerical value"
|
|
|
|
|
msgstr "开关 `%c' 期望一个数字值"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/grep.c:647
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "search in index instead of in the work tree"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "在索引区搜索而不是在工作区"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/grep.c:649
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "find in contents not managed by git"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "在未被 git 管理的内容中查找"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
|
|
|
|
# 译者:中文字符串拼接,可删除前导空格
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/grep.c:651
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "search in both tracked and untracked files"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "在跟踪和未跟踪的文件中搜索"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/grep.c:653
|
2015-02-16 14:34:19 +01:00
|
|
|
|
msgid "ignore files specified via '.gitignore'"
|
|
|
|
|
msgstr "忽略 '.gitignore' 包含的文件"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/grep.c:656
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "show non-matching lines"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "显示未匹配的行"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/grep.c:658
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "case insensitive matching"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "不区分大小写匹配"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/grep.c:660
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "match patterns only at word boundaries"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "只在单词边界匹配模式"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/grep.c:662
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "process binary files as text"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "把二进制文件当做文本处理"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/grep.c:664
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "don't match patterns in binary files"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "不在二进制文件中匹配模式"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/grep.c:667
|
2013-09-17 17:37:05 +02:00
|
|
|
|
msgid "process binary files with textconv filters"
|
|
|
|
|
msgstr "用 textconv 过滤器处理二进制文件"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/grep.c:669
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "descend at most <depth> levels"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "最多以指定的深度向下寻找"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/grep.c:673
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "use extended POSIX regular expressions"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "使用扩展的 POSIX 正则表达式"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/grep.c:676
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "use basic POSIX regular expressions (default)"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "使用基本的 POSIX 正则表达式(默认)"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/grep.c:679
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "interpret patterns as fixed strings"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "把模式解析为固定的字符串"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/grep.c:682
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "use Perl-compatible regular expressions"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "使用 Perl 兼容的正则表达式"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/grep.c:685
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "show line numbers"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "显示行号"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/grep.c:686
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "don't show filenames"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "不显示文件名"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/grep.c:687
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "show filenames"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "显示文件名"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/grep.c:689
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "show filenames relative to top directory"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "显示相对于顶级目录的文件名"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/grep.c:691
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "show only filenames instead of matching lines"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "只显示文件名而不显示匹配的行"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/grep.c:693
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "synonym for --files-with-matches"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "和 --files-with-matches 同义"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/grep.c:696
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "show only the names of files without match"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "只显示未匹配的文件名"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/grep.c:698
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "print NUL after filenames"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "在文件名后输出 NUL 字符"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/grep.c:700
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "show the number of matches instead of matching lines"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "显示总匹配行数,而不显示匹配的行"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/grep.c:701
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "highlight matches"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "高亮显示匹配项"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/grep.c:703
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "print empty line between matches from different files"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "在不同文件的匹配项之间打印空行"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/grep.c:705
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "show filename only once above matches from same file"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "只在同一文件的匹配项的上面显示一次文件名"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/grep.c:708
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "show <n> context lines before and after matches"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "显示匹配项前后的 <n> 行上下文"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/grep.c:711
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "show <n> context lines before matches"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "显示匹配项前 <n> 行上下文"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/grep.c:713
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "show <n> context lines after matches"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "显示匹配项后 <n> 行上下文"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/grep.c:715
|
2016-02-28 13:35:55 +01:00
|
|
|
|
msgid "use <n> worker threads"
|
|
|
|
|
msgstr "使用 <n> 个工作线程"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/grep.c:716
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "shortcut for -C NUM"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "快捷键 -C 数字"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/grep.c:719
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "show a line with the function name before matches"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "在匹配的前面显示一行函数名"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/grep.c:721
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "show the surrounding function"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "显示所在函数的前后内容"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/grep.c:724
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "read patterns from file"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "从文件读取模式"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/grep.c:726
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "match <pattern>"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "匹配 <模式>"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/grep.c:728
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "combine patterns specified with -e"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "组合用 -e 参数设定的模式"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/grep.c:740
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "indicate hit with exit status without output"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "不输出,而用退出码标识命中状态"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/grep.c:742
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "show only matches from files that match all patterns"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "只显示匹配所有模式的文件中的匹配"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/grep.c:744
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgid "show parse tree for grep expression"
|
|
|
|
|
msgstr "显示 grep 表达式的解析树"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/grep.c:748
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "pager"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "分页"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/grep.c:748
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "show matching files in the pager"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "分页显示匹配的文件"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/grep.c:751
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "allow calling of grep(1) (ignored by this build)"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "允许调用 grep(1)(本次构建忽略)"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/grep.c:814
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "no pattern given."
|
|
|
|
|
msgstr "未提供模式匹配。"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/grep.c:846 builtin/index-pack.c:1480
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "invalid number of threads specified (%d)"
|
|
|
|
|
msgstr "指定的线程数无效(%d)"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/grep.c:876
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "--open-files-in-pager only works on the worktree"
|
|
|
|
|
msgstr "--open-files-in-pager 仅用于工作区"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/grep.c:902
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "--cached or --untracked cannot be used with --no-index."
|
2012-08-02 05:50:59 +02:00
|
|
|
|
msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/grep.c:907
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "--no-index or --untracked cannot be used with revs."
|
2012-08-02 05:50:59 +02:00
|
|
|
|
msgstr "--no-index 或 --untracked 不能和版本同时使用。"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/grep.c:910
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "--[no-]exclude-standard cannot be used for tracked contents."
|
2012-03-27 08:46:11 +02:00
|
|
|
|
msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/grep.c:918
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "both --cached and trees are given."
|
|
|
|
|
msgstr "同时给出了 --cached 和树对象。"
|
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/hash-object.c:81
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid ""
|
2015-02-16 14:34:19 +01:00
|
|
|
|
"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
|
|
|
|
|
"[--] <file>..."
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgstr ""
|
2015-02-16 14:34:19 +01:00
|
|
|
|
"git hash-object [-t <类型>] [-w] [--path=<文件> | --no-filters] [--stdin] "
|
|
|
|
|
"[--] <文件>..."
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/hash-object.c:82
|
2015-11-16 00:02:11 +01:00
|
|
|
|
msgid "git hash-object --stdin-paths"
|
|
|
|
|
msgstr "git hash-object --stdin-paths"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/hash-object.c:94
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "type"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "类型"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/hash-object.c:94
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "object type"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "对象类型"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/hash-object.c:95
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "write the object into the object database"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "将对象写入对象数据库"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/hash-object.c:97
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "read the object from stdin"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "从标准输入读取对象"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/hash-object.c:99
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "store file as is without filters"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "原样存储文件不使用过滤器"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/hash-object.c:100
|
2014-10-08 04:55:14 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"just hash any random garbage to create corrupt objects for debugging Git"
|
|
|
|
|
msgstr "允许对任意随机垃圾数据做散列来创建损坏的对象以便调试 Git"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/hash-object.c:101
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "process file as it were from this path"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "处理文件并假设其来自于此路径"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/help.c:42
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "print all available commands"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "打印所有可用的命令"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/help.c:43
|
|
|
|
|
msgid "exclude guides"
|
|
|
|
|
msgstr "排除向导"
|
|
|
|
|
|
|
|
|
|
#: builtin/help.c:44
|
2013-04-13 04:02:43 +02:00
|
|
|
|
msgid "print list of useful guides"
|
|
|
|
|
msgstr "显示有用的指南列表"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/help.c:45
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "show man page"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "显示 man 手册"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/help.c:46
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "show manual in web browser"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "在 web 浏览器中显示手册"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/help.c:48
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "show info page"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "显示 info 手册"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/help.c:54
|
2015-02-16 14:34:19 +01:00
|
|
|
|
msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
|
|
|
|
|
msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/help.c:66
|
2012-05-30 06:19:47 +02:00
|
|
|
|
#, c-format
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "unrecognized help format '%s'"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "未能识别的帮助格式 '%s'"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/help.c:93
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "Failed to start emacsclient."
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "无法启动 emacsclient。"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/help.c:106
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "Failed to parse emacsclient version."
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "无法解析 emacsclient 版本。"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/help.c:114
|
2012-05-21 03:35:47 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "emacsclient version '%d' too old (< 22)."
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "emacsclient 版本 '%d' 太老(< 22)。"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/help.c:132 builtin/help.c:153 builtin/help.c:162 builtin/help.c:170
|
2012-05-30 06:19:47 +02:00
|
|
|
|
#, c-format
|
2016-05-29 14:40:35 +02:00
|
|
|
|
msgid "failed to exec '%s'"
|
|
|
|
|
msgstr "无法执行 '%s'"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/help.c:207
|
2012-05-21 03:35:47 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"'%s': path for unsupported man viewer.\n"
|
|
|
|
|
"Please consider using 'man.<tool>.cmd' instead."
|
|
|
|
|
msgstr ""
|
2012-05-30 06:19:47 +02:00
|
|
|
|
"'%s':不支持的 man 手册查看器的路径。\n"
|
2015-01-18 13:37:57 +01:00
|
|
|
|
"请使用 'man.<工具>.cmd'。"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/help.c:219
|
2012-05-21 03:35:47 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"'%s': cmd for supported man viewer.\n"
|
|
|
|
|
"Please consider using 'man.<tool>.path' instead."
|
|
|
|
|
msgstr ""
|
2012-05-30 06:19:47 +02:00
|
|
|
|
"'%s': 支持的 man 手册查看器命令。\n"
|
2015-01-18 13:37:57 +01:00
|
|
|
|
"请使用 'man.<工具>.path'。"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/help.c:336
|
2012-05-21 03:35:47 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "'%s': unknown man viewer."
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "'%s':未知的 man 查看器。"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/help.c:353
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "no man viewer handled the request"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "没有 man 查看器处理此请求"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/help.c:361
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "no info viewer handled the request"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "没有 info 查看器处理此请求"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/help.c:403
|
2013-04-13 04:02:43 +02:00
|
|
|
|
msgid "Defining attributes per path"
|
|
|
|
|
msgstr "定义路径的属性"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/help.c:404
|
2014-10-08 04:55:14 +02:00
|
|
|
|
msgid "Everyday Git With 20 Commands Or So"
|
|
|
|
|
msgstr "每一天 Git 常用的约 20 条命令"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/help.c:405
|
2013-04-13 04:02:43 +02:00
|
|
|
|
msgid "A Git glossary"
|
|
|
|
|
msgstr "Git 词汇表"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/help.c:406
|
2013-04-13 04:02:43 +02:00
|
|
|
|
msgid "Specifies intentionally untracked files to ignore"
|
|
|
|
|
msgstr "忽略指定的未跟踪文件"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/help.c:407
|
2013-04-13 04:02:43 +02:00
|
|
|
|
msgid "Defining submodule properties"
|
|
|
|
|
msgstr "定义子模组属性"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/help.c:408
|
2013-04-13 04:02:43 +02:00
|
|
|
|
msgid "Specifying revisions and ranges for Git"
|
|
|
|
|
msgstr "指定 Git 的版本和版本范围"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/help.c:409
|
2013-04-13 04:02:43 +02:00
|
|
|
|
msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
|
|
|
|
|
msgstr "一个 Git 教程(针对 1.5.1 或更新版本)"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/help.c:410
|
2013-04-13 04:02:43 +02:00
|
|
|
|
msgid "An overview of recommended workflows with Git"
|
|
|
|
|
msgstr "Git 推荐的工作流概览"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/help.c:422
|
2013-04-13 04:02:43 +02:00
|
|
|
|
msgid "The common Git guides are:\n"
|
|
|
|
|
msgstr "最常用的 Git 向导有:\n"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/help.c:440
|
2012-05-21 03:35:47 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "`git %s' is aliased to `%s'"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "`git %s' 是 `%s' 的别名"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/help.c:462 builtin/help.c:479
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "usage: %s%s"
|
|
|
|
|
msgstr "用法:%s%s"
|
|
|
|
|
|
|
|
|
|
#: builtin/index-pack.c:154
|
2014-08-04 10:23:15 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to open %s"
|
|
|
|
|
msgstr "不能打开 %s"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/index-pack.c:204
|
2012-05-21 03:35:47 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "object type mismatch at %s"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "%s 的对象类型不匹配"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/index-pack.c:224
|
2014-08-04 10:23:15 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "did not receive expected object %s"
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgstr "未能获取预期的对象 %s"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/index-pack.c:227
|
2014-08-04 10:23:15 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "object %s: expected type %s, found %s"
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgstr "对象 %s:应为类型 %s,却是 %s"
|
2014-08-04 10:23:15 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/index-pack.c:269
|
2012-05-30 06:19:47 +02:00
|
|
|
|
#, c-format
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "cannot fill %d byte"
|
|
|
|
|
msgid_plural "cannot fill %d bytes"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr[0] "无法填充 %d 字节"
|
l10n: Set nplurals of zh_CN.po from 1 to 2
In most cases, plural-forms are unnecessary for Chinese. For example,
"apple" and "apples" are the same in Chinese, they are both translated
as "苹果". While there are exceptions, e.g., the plural form of "he",
"she" and "it" is "they" in English. In Chinese, "他(he)", "她(she)",
and "它(it)" have plural forms too, they are "他们", "她们", and "它们".
But what makes 'nplurals=1' hard to work right for Chinese is:
#: bundle.c:192
#, c-format
msgid "The bundle requires this ref"
msgid_plural "The bundle requires these %d refs"
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-05-31 11:35:59 +02:00
|
|
|
|
msgstr[1] "无法填充 %d 字节"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/index-pack.c:279
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "early EOF"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "过早的文件结束符(EOF)"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/index-pack.c:280
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "read error on input"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "输入上的读错误"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/index-pack.c:292
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "used more bytes than were available"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "用掉了超过可用的字节"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/index-pack.c:299
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "pack too large for current definition of off_t"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "包太大超过了当前 off_t 的定义"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/index-pack.c:302 builtin/unpack-objects.c:92
|
|
|
|
|
msgid "pack exceeds maximum allowed size"
|
|
|
|
|
msgstr "包超过了最大允许值"
|
|
|
|
|
|
|
|
|
|
#: builtin/index-pack.c:317
|
2012-05-30 06:19:47 +02:00
|
|
|
|
#, c-format
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "unable to create '%s'"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "不能创建 '%s'"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/index-pack.c:322
|
2012-05-30 06:19:47 +02:00
|
|
|
|
#, c-format
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "cannot open packfile '%s'"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "无法打开包文件 '%s'"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/index-pack.c:336
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "pack signature mismatch"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "包签名不匹配"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/index-pack.c:338
|
2012-09-15 05:17:00 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "pack version %<PRIu32> unsupported"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "不支持包版本 %<PRIu32>"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/index-pack.c:356
|
2012-05-21 03:35:47 +02:00
|
|
|
|
#, c-format
|
2016-08-28 04:18:12 +02:00
|
|
|
|
msgid "pack has bad object at offset %<PRIuMAX>: %s"
|
|
|
|
|
msgstr "包中有错误的对象位于偏移量 %<PRIuMAX>:%s"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/index-pack.c:478
|
2012-05-21 03:35:47 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "inflate returned %d"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "解压缩返回 %d"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/index-pack.c:527
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "offset value overflow for delta base object"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "偏移值覆盖了 delta 基准对象"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/index-pack.c:535
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "delta base offset is out of bound"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "delta 基准偏移越界"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/index-pack.c:543
|
2012-05-30 06:19:47 +02:00
|
|
|
|
#, c-format
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "unknown object type %d"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "未知对象类型 %d"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/index-pack.c:574
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "cannot pread pack file"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "无法读取包文件"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/index-pack.c:576
|
2012-05-21 03:35:47 +02:00
|
|
|
|
#, c-format
|
2016-08-28 04:18:12 +02:00
|
|
|
|
msgid "premature end of pack file, %<PRIuMAX> byte missing"
|
|
|
|
|
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
|
|
|
|
|
msgstr[0] "包文件过早结束,缺少 %<PRIuMAX> 字节"
|
|
|
|
|
msgstr[1] "包文件过早结束,缺少 %<PRIuMAX> 字节"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/index-pack.c:602
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "serious inflate inconsistency"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "解压缩严重的不一致"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777
|
|
|
|
|
#: builtin/index-pack.c:811 builtin/index-pack.c:820
|
2012-05-21 03:35:47 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "SHA1 COLLISION FOUND WITH %s !"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "发现 %s 出现 SHA1 冲突!"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/index-pack.c:751 builtin/pack-objects.c:166
|
|
|
|
|
#: builtin/pack-objects.c:258
|
2012-07-04 11:20:34 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to read %s"
|
|
|
|
|
msgstr "不能读 %s"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/index-pack.c:817
|
2012-07-04 11:20:34 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot read existing object %s"
|
|
|
|
|
msgstr "不能读取现存对象 %s"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/index-pack.c:831
|
2012-05-30 06:19:47 +02:00
|
|
|
|
#, c-format
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "invalid blob object %s"
|
2015-08-02 15:47:30 +02:00
|
|
|
|
msgstr "无效的数据对象 %s"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/index-pack.c:845
|
2012-05-30 06:19:47 +02:00
|
|
|
|
#, c-format
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "invalid %s"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "无效的 %s"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/index-pack.c:848
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "Error in object"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "对象中出错"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/index-pack.c:850
|
2012-05-21 03:35:47 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Not all child objects of %s are reachable"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "%s 的所有子对象并非都可达"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/index-pack.c:922 builtin/index-pack.c:953
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "failed to apply delta"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "无法应用 delta"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/index-pack.c:1123
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "Receiving objects"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "接收对象中"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/index-pack.c:1123
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "Indexing objects"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "索引对象中"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/index-pack.c:1155
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "pack is corrupted (SHA1 mismatch)"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "包冲突(SHA1 不匹配)"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/index-pack.c:1160
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "cannot fstat packfile"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "不能枚举包文件状态"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/index-pack.c:1163
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "pack has junk at the end"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "包的结尾有垃圾数据"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/index-pack.c:1174
|
2012-07-04 11:20:34 +02:00
|
|
|
|
msgid "confusion beyond insanity in parse_pack_objects()"
|
|
|
|
|
msgstr "parse_pack_objects() 中遇到不可理喻的问题"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/index-pack.c:1197
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "Resolving deltas"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "处理 delta 中"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/index-pack.c:1208
|
2013-01-30 10:23:08 +01:00
|
|
|
|
#, c-format
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "unable to create thread: %s"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "不能创建线程:%s"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/index-pack.c:1250
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "confusion beyond insanity"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "不可理喻"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/index-pack.c:1256
|
2012-09-15 05:17:00 +02:00
|
|
|
|
#, c-format
|
2016-05-29 14:40:35 +02:00
|
|
|
|
msgid "completed with %d local object"
|
|
|
|
|
msgid_plural "completed with %d local objects"
|
|
|
|
|
msgstr[0] "完成 %d 个本地对象"
|
|
|
|
|
msgstr[1] "完成 %d 个本地对象"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/index-pack.c:1268
|
2012-09-15 05:17:00 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Unexpected tail checksum for %s (disk corruption?)"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "对 %s 的尾部校验出现意外(磁盘损坏?)"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/index-pack.c:1272
|
2012-05-21 03:35:47 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "pack has %d unresolved delta"
|
|
|
|
|
msgid_plural "pack has %d unresolved deltas"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr[0] "包有 %d 个未解决的 delta"
|
l10n: Set nplurals of zh_CN.po from 1 to 2
In most cases, plural-forms are unnecessary for Chinese. For example,
"apple" and "apples" are the same in Chinese, they are both translated
as "苹果". While there are exceptions, e.g., the plural form of "he",
"she" and "it" is "they" in English. In Chinese, "他(he)", "她(she)",
and "它(it)" have plural forms too, they are "他们", "她们", and "它们".
But what makes 'nplurals=1' hard to work right for Chinese is:
#: bundle.c:192
#, c-format
msgid "The bundle requires this ref"
msgid_plural "The bundle requires these %d refs"
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-05-31 11:35:59 +02:00
|
|
|
|
msgstr[1] "包有 %d 个未解决的 delta"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/index-pack.c:1296
|
2012-05-30 06:19:47 +02:00
|
|
|
|
#, c-format
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "unable to deflate appended object (%d)"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "不能压缩附加对象(%d)"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/index-pack.c:1372
|
2012-05-21 03:35:47 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "local object %s is corrupt"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "本地对象 %s 已损坏"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/index-pack.c:1396
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "error while closing pack file"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "关闭包文件时出错"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/index-pack.c:1409
|
2012-05-30 06:19:47 +02:00
|
|
|
|
#, c-format
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "cannot write keep file '%s'"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "无法写保留文件 '%s'"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/index-pack.c:1417
|
2012-05-30 06:19:47 +02:00
|
|
|
|
#, c-format
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "cannot close written keep file '%s'"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "无法关闭保留文件 '%s'"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/index-pack.c:1430
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "cannot store pack file"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "无法存储包文件"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/index-pack.c:1441
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "cannot store index file"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "无法存储索引文件"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/index-pack.c:1474
|
2013-01-30 10:23:08 +01:00
|
|
|
|
#, c-format
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "bad pack.indexversion=%<PRIu32>"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "坏的 pack.indexversion=%<PRIu32>"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/index-pack.c:1484 builtin/index-pack.c:1681
|
2012-09-15 05:17:00 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "no threads support, ignoring %s"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "没有线程支持,忽略 %s"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/index-pack.c:1542
|
2012-05-30 06:19:47 +02:00
|
|
|
|
#, c-format
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "Cannot open existing pack file '%s'"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "无法打开现存包文件 '%s'"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/index-pack.c:1544
|
2012-05-30 06:19:47 +02:00
|
|
|
|
#, c-format
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "Cannot open existing pack idx file for '%s'"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "无法为 %s 打开包索引文件"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/index-pack.c:1591
|
2012-05-30 06:19:47 +02:00
|
|
|
|
#, c-format
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "non delta: %d object"
|
|
|
|
|
msgid_plural "non delta: %d objects"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr[0] "非 delta:%d 个对象"
|
l10n: Set nplurals of zh_CN.po from 1 to 2
In most cases, plural-forms are unnecessary for Chinese. For example,
"apple" and "apples" are the same in Chinese, they are both translated
as "苹果". While there are exceptions, e.g., the plural form of "he",
"she" and "it" is "they" in English. In Chinese, "他(he)", "她(she)",
and "它(it)" have plural forms too, they are "他们", "她们", and "它们".
But what makes 'nplurals=1' hard to work right for Chinese is:
#: bundle.c:192
#, c-format
msgid "The bundle requires this ref"
msgid_plural "The bundle requires these %d refs"
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-05-31 11:35:59 +02:00
|
|
|
|
msgstr[1] "非 delta:%d 个对象"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/index-pack.c:1598
|
2012-05-21 03:35:47 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "chain length = %d: %lu object"
|
|
|
|
|
msgid_plural "chain length = %d: %lu objects"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr[0] "链长 = %d: %lu 对象"
|
l10n: Set nplurals of zh_CN.po from 1 to 2
In most cases, plural-forms are unnecessary for Chinese. For example,
"apple" and "apples" are the same in Chinese, they are both translated
as "苹果". While there are exceptions, e.g., the plural form of "he",
"she" and "it" is "they" in English. In Chinese, "他(he)", "她(she)",
and "它(it)" have plural forms too, they are "他们", "她们", and "它们".
But what makes 'nplurals=1' hard to work right for Chinese is:
#: bundle.c:192
#, c-format
msgid "The bundle requires this ref"
msgid_plural "The bundle requires these %d refs"
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-05-31 11:35:59 +02:00
|
|
|
|
msgstr[1] "链长 = %d: %lu 对象"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/index-pack.c:1611
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "packfile name '%s' does not end with '.pack'"
|
|
|
|
|
msgstr "包文件名 '%s' 没有以 '.pack' 结尾"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/index-pack.c:1693 builtin/index-pack.c:1696
|
|
|
|
|
#: builtin/index-pack.c:1712 builtin/index-pack.c:1716
|
2012-05-30 06:19:47 +02:00
|
|
|
|
#, c-format
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "bad %s"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "错误选项 %s"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/index-pack.c:1732
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "--fix-thin cannot be used without --stdin"
|
2012-08-02 05:50:59 +02:00
|
|
|
|
msgstr "--fix-thin 不能和 --stdin 同时使用"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/index-pack.c:1740
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "--verify with no packfile name given"
|
2015-07-28 07:26:41 +02:00
|
|
|
|
msgstr "--verify 没有提供包文件名参数"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/init-db.c:54
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot stat '%s'"
|
|
|
|
|
msgstr "不能枚举 '%s' 状态"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/init-db.c:60
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot stat template '%s'"
|
|
|
|
|
msgstr "不能枚举模版 '%s' 状态"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/init-db.c:65
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot opendir '%s'"
|
|
|
|
|
msgstr "不能打开目录 '%s'"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/init-db.c:76
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot readlink '%s'"
|
|
|
|
|
msgstr "不能读取链接 '%s'"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/init-db.c:78
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot symlink '%s' '%s'"
|
2012-03-27 08:46:11 +02:00
|
|
|
|
msgstr "不能自 '%s' 到 '%s' 创建符号链接"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/init-db.c:84
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot copy '%s' to '%s'"
|
|
|
|
|
msgstr "不能拷贝 '%s' 至 '%s'"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/init-db.c:88
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "ignoring template %s"
|
|
|
|
|
msgstr "忽略模版 %s"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/init-db.c:119
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "templates not found %s"
|
|
|
|
|
msgstr "模版未找到 %s"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/init-db.c:134
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
2016-05-29 14:40:35 +02:00
|
|
|
|
msgid "not copying templates from '%s': %s"
|
|
|
|
|
msgstr "没有从 '%s' 复制模版:%s"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/init-db.c:327
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to handle file type %d"
|
|
|
|
|
msgstr "不能处理 %d 类型的文件"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/init-db.c:330
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to move %s to %s"
|
|
|
|
|
msgstr "不能移动 %s 至 %s"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/init-db.c:347 builtin/init-db.c:350
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "%s already exists"
|
|
|
|
|
msgstr "%s 已经存在"
|
|
|
|
|
|
|
|
|
|
#: builtin/init-db.c:403
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
2016-08-28 04:18:12 +02:00
|
|
|
|
msgid "Reinitialized existing shared Git repository in %s%s\n"
|
|
|
|
|
msgstr "重新初始化已存在的共享 Git 仓库于 %s%s\n"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/init-db.c:404
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Reinitialized existing Git repository in %s%s\n"
|
|
|
|
|
msgstr "重新初始化已存在的 Git 仓库于 %s%s\n"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/init-db.c:408
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Initialized empty shared Git repository in %s%s\n"
|
2016-09-07 12:03:04 +02:00
|
|
|
|
msgstr "已初始化空的共享 Git 仓库于 %s%s\n"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/init-db.c:409
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Initialized empty Git repository in %s%s\n"
|
2016-09-07 12:03:04 +02:00
|
|
|
|
msgstr "已初始化空的 Git 仓库于 %s%s\n"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/init-db.c:457
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid ""
|
2013-02-14 10:47:45 +01:00
|
|
|
|
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
|
2015-02-16 14:34:19 +01:00
|
|
|
|
"shared[=<permissions>]] [<directory>]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgstr ""
|
2013-01-30 10:23:08 +01:00
|
|
|
|
"git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
|
2015-02-16 14:34:19 +01:00
|
|
|
|
"[<目录>]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/init-db.c:480
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "permissions"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "权限"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/init-db.c:481
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "specify that the git repository is to be shared amongst several users"
|
2015-08-02 15:47:30 +02:00
|
|
|
|
msgstr "指定 git 仓库是多个用户之间共享的"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/init-db.c:515 builtin/init-db.c:520
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot mkdir %s"
|
|
|
|
|
msgstr "不能创建目录 %s"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/init-db.c:524
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot chdir to %s"
|
|
|
|
|
msgstr "不能切换目录到 %s"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/init-db.c:545
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
|
|
|
|
|
"dir=<directory>)"
|
2015-01-21 08:05:03 +01:00
|
|
|
|
msgstr "不允许 %s(或 --work-tree=<目录>)而没有指定 %s(或 --git-dir=<目录>)"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/init-db.c:573
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Cannot access work tree '%s'"
|
|
|
|
|
msgstr "不能访问工作区 '%s'"
|
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/interpret-trailers.c:15
|
|
|
|
|
msgid ""
|
2016-02-28 13:35:55 +01:00
|
|
|
|
"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
|
|
|
|
|
"<token>[(=|:)<value>])...] [<file>...]"
|
2016-03-12 15:09:24 +01:00
|
|
|
|
msgstr ""
|
|
|
|
|
"git interpret-trailers [--in-place] [--trim-empty] [(--trailer <键>[(=|:)<值"
|
|
|
|
|
">])...] [<文件>...]"
|
2016-02-28 13:35:55 +01:00
|
|
|
|
|
|
|
|
|
#: builtin/interpret-trailers.c:26
|
|
|
|
|
msgid "edit files in place"
|
|
|
|
|
msgstr "在原位编辑文件"
|
2014-10-08 04:55:14 +02:00
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/interpret-trailers.c:27
|
2014-10-08 04:55:14 +02:00
|
|
|
|
msgid "trim empty trailers"
|
|
|
|
|
msgstr "删除空签名"
|
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/interpret-trailers.c:28
|
2014-10-08 04:55:14 +02:00
|
|
|
|
msgid "trailer"
|
|
|
|
|
msgstr "签名"
|
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/interpret-trailers.c:29
|
2014-10-08 04:55:14 +02:00
|
|
|
|
msgid "trailer(s) to add"
|
|
|
|
|
msgstr "要添加的签名"
|
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/interpret-trailers.c:42
|
|
|
|
|
msgid "no input file given for in-place editing"
|
|
|
|
|
msgstr "没有给出要原位编辑的文件"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/log.c:44
|
2015-05-31 02:42:31 +02:00
|
|
|
|
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
|
2015-01-18 13:37:57 +01:00
|
|
|
|
msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/log.c:45
|
2015-02-16 14:34:19 +01:00
|
|
|
|
msgid "git show [<options>] <object>..."
|
|
|
|
|
msgstr "git show [<选项>] <对象>..."
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/log.c:84
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "invalid --decorate option: %s"
|
|
|
|
|
msgstr "无效的 --decorate 选项:%s"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/log.c:139
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "suppress diff output"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "不显示差异输出"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/log.c:140
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "show source"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "显示源"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/log.c:141
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgid "Use mail map file"
|
|
|
|
|
msgstr "使用邮件映射文件"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/log.c:142
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "decorate options"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "修饰选项"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/log.c:145
|
2014-10-08 04:55:14 +02:00
|
|
|
|
msgid "Process line range n,m in file, counting from 1"
|
|
|
|
|
msgstr "处理文件中第 n 到 m 之间的行,从 1 开始"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/log.c:241
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Final output: %d %s\n"
|
|
|
|
|
msgstr "最终输出:%d %s\n"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/log.c:486
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "git show %s: bad file"
|
|
|
|
|
msgstr "git show %s: 损坏的文件"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/log.c:500 builtin/log.c:594
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Could not read object %s"
|
2012-03-27 08:46:11 +02:00
|
|
|
|
msgstr "不能读取对象 %s"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/log.c:618
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Unknown type: %d"
|
|
|
|
|
msgstr "未知类型:%d"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/log.c:739
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "format.headers without value"
|
|
|
|
|
msgstr "format.headers 没有值"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/log.c:839
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "name of output directory is too long"
|
|
|
|
|
msgstr "输出目录名太长"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/log.c:854
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Cannot open patch file %s"
|
|
|
|
|
msgstr "无法打开补丁文件 %s"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/log.c:868
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "Need exactly one range."
|
|
|
|
|
msgstr "只需要一个范围。"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/log.c:878
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "Not a range."
|
|
|
|
|
msgstr "不是一个范围。"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/log.c:984
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "Cover letter needs email format"
|
|
|
|
|
msgstr "信封需要邮件地址格式"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/log.c:1063
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "insane in-reply-to: %s"
|
|
|
|
|
msgstr "不正常的 in-reply-to:%s"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/log.c:1091
|
2015-02-16 14:34:19 +01:00
|
|
|
|
msgid "git format-patch [<options>] [<since> | <revision-range>]"
|
|
|
|
|
msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/log.c:1141
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "Two output directories?"
|
|
|
|
|
msgstr "两个输出目录?"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/log.c:1248 builtin/log.c:1891 builtin/log.c:1893 builtin/log.c:1905
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Unknown commit %s"
|
|
|
|
|
msgstr "未知提交 %s"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/log.c:1258 builtin/notes.c:884 builtin/tag.c:455
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Failed to resolve '%s' as a valid ref."
|
|
|
|
|
msgstr "无法解析 '%s' 为一个有效引用。"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/log.c:1263
|
2016-05-29 14:40:35 +02:00
|
|
|
|
msgid "Could not find exact merge base."
|
|
|
|
|
msgstr "不能找到准确的合并基线。"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/log.c:1267
|
2016-05-29 14:40:35 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"Failed to get upstream, if you want to record base commit automatically,\n"
|
|
|
|
|
"please use git branch --set-upstream-to to track a remote branch.\n"
|
|
|
|
|
"Or you could specify base commit by --base=<base-commit-id> manually."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"无法得到上游地址,如果你想自动记录基线提交,请使用命令\n"
|
2016-06-05 18:06:17 +02:00
|
|
|
|
"git branch --set-upstream-to 来跟踪一个远程分支。或者你可以通过\n"
|
2016-05-29 14:40:35 +02:00
|
|
|
|
"参数 --base=<base-commit-id> 手动指定一个基线提交。"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/log.c:1287
|
2016-05-29 14:40:35 +02:00
|
|
|
|
msgid "Failed to find exact merge base"
|
|
|
|
|
msgstr "无法找到准确的合并基线"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/log.c:1298
|
2016-05-29 14:40:35 +02:00
|
|
|
|
msgid "base commit should be the ancestor of revision list"
|
|
|
|
|
msgstr "基线提交应该是版本列表的祖先"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/log.c:1302
|
2016-05-29 14:40:35 +02:00
|
|
|
|
msgid "base commit shouldn't be in revision list"
|
|
|
|
|
msgstr "基线提交不应该出现在版本列表中"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/log.c:1351
|
2016-05-29 14:40:35 +02:00
|
|
|
|
msgid "cannot get patch id"
|
2016-06-05 18:06:17 +02:00
|
|
|
|
msgstr "无法得到补丁 id"
|
2016-05-29 14:40:35 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/log.c:1408
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "use [PATCH n/m] even with a single patch"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "使用 [PATCH n/m],即使只有一个补丁"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/log.c:1411
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "use [PATCH] even with multiple patches"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "使用 [PATCH],即使有多个补丁"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/log.c:1415
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "print patches to standard out"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "打印补丁到标准输出"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/log.c:1417
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "generate a cover letter"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "生成一封附信"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/log.c:1419
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "use simple number sequence for output file names"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "使用简单的数字序列作为输出文件名"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/log.c:1420
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "sfx"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "后缀"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/log.c:1421
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "use <sfx> instead of '.patch'"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "使用 <后缀> 代替 '.patch'"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/log.c:1423
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "start numbering patches at <n> instead of 1"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "补丁以 <n> 开始编号,而不是1"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/log.c:1425
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgid "mark the series as Nth re-roll"
|
|
|
|
|
msgstr "标记补丁系列是第几次重制"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/log.c:1427
|
|
|
|
|
msgid "Use [RFC PATCH] instead of [PATCH]"
|
|
|
|
|
msgstr "使用 [RFC PATCH] 代替 [PATCH]"
|
|
|
|
|
|
|
|
|
|
#: builtin/log.c:1430
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "Use [<prefix>] instead of [PATCH]"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "使用 [<前缀>] 代替 [PATCH]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/log.c:1433
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "store resulting files in <dir>"
|
2015-01-18 13:37:57 +01:00
|
|
|
|
msgstr "把结果文件存储在 <目录>"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/log.c:1436
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "don't strip/add [PATCH]"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "不删除/添加 [PATCH]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/log.c:1439
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "don't output binary diffs"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "不输出二进制差异"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/log.c:1441
|
2015-12-22 16:06:59 +01:00
|
|
|
|
msgid "output all-zero hash in From header"
|
|
|
|
|
msgstr "在 From 头信息中输出全为零的哈希值"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/log.c:1443
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "don't include a patch matching a commit upstream"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "不包含已在上游提交中的补丁"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/log.c:1445
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "show patch format instead of default (patch + stat)"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "显示纯补丁格式而非默认的(补丁+状态)"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/log.c:1447
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "Messaging"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "邮件发送"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/log.c:1448
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "header"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "header"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/log.c:1449
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "add email header"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "添加邮件头"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/log.c:1450 builtin/log.c:1452
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "email"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "邮件地址"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/log.c:1450
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "add To: header"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "添加收件人"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/log.c:1452
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "add Cc: header"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "添加抄送"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/log.c:1454
|
2013-07-26 08:00:02 +02:00
|
|
|
|
msgid "ident"
|
2015-01-18 13:37:57 +01:00
|
|
|
|
msgstr "标识"
|
2013-07-26 08:00:02 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/log.c:1455
|
2013-07-26 08:00:02 +02:00
|
|
|
|
msgid "set From address to <ident> (or committer ident if absent)"
|
2015-08-10 12:03:29 +02:00
|
|
|
|
msgstr "将 From 地址设置为 <标识>(如若不提供,则用提交者 ID 做为地址)"
|
2013-07-26 08:00:02 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/log.c:1457
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "message-id"
|
2015-01-18 13:37:57 +01:00
|
|
|
|
msgstr "邮件标识"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/log.c:1458
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "make first mail a reply to <message-id>"
|
2015-01-18 13:37:57 +01:00
|
|
|
|
msgstr "使第一封邮件作为对 <邮件标识> 的回复"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/log.c:1459 builtin/log.c:1462
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "boundary"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "边界"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/log.c:1460
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "attach the patch"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "附件方式添加补丁"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/log.c:1463
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "inline the patch"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "内联显示补丁"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/log.c:1467
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "enable message threading, styles: shallow, deep"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "启用邮件线索,风格:浅,深"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/log.c:1469
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "signature"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "签名"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/log.c:1470
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "add a signature"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "添加一个签名"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/log.c:1471
|
2016-05-29 14:40:35 +02:00
|
|
|
|
msgid "base-commit"
|
|
|
|
|
msgstr "基线提交"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/log.c:1472
|
2016-05-29 14:40:35 +02:00
|
|
|
|
msgid "add prerequisite tree info to the patch series"
|
|
|
|
|
msgstr "为补丁列表添加前置树信息"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/log.c:1474
|
2014-08-04 10:23:15 +02:00
|
|
|
|
msgid "add a signature from a file"
|
|
|
|
|
msgstr "从文件添加一个签名"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/log.c:1475
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "don't print the patch filenames"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "不要打印补丁文件名"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/log.c:1565
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "-n and -k are mutually exclusive."
|
|
|
|
|
msgstr "-n 和 -k 互斥。"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/log.c:1567
|
|
|
|
|
msgid "--subject-prefix/--rfc and -k are mutually exclusive."
|
|
|
|
|
msgstr "--subject-prefix/--rfc 和 -k 互斥。"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/log.c:1575
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "--name-only does not make sense"
|
|
|
|
|
msgstr "--name-only 无意义"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/log.c:1577
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "--name-status does not make sense"
|
|
|
|
|
msgstr "--name-status 无意义"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/log.c:1579
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "--check does not make sense"
|
|
|
|
|
msgstr "--check 无意义"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/log.c:1609
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "standard output, or directory, which one?"
|
|
|
|
|
msgstr "标准输出或目录,哪一个?"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/log.c:1611
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Could not create directory '%s'"
|
2012-03-27 08:46:11 +02:00
|
|
|
|
msgstr "不能创建目录 '%s'"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/log.c:1705
|
2014-08-04 10:23:15 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to read signature file '%s'"
|
|
|
|
|
msgstr "无法读取签名文件 '%s'"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/log.c:1777
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "Failed to create output files"
|
|
|
|
|
msgstr "无法创建输出文件"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/log.c:1826
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/log.c:1880
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
|
2015-01-18 13:37:57 +01:00
|
|
|
|
msgstr "不能找到跟踪的远程分支,请手工指定 <上游>。\n"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/ls-files.c:458
|
2015-02-16 14:34:19 +01:00
|
|
|
|
msgid "git ls-files [<options>] [<file>...]"
|
|
|
|
|
msgstr "git ls-files [<选项>] [<文件>...]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/ls-files.c:507
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "identify the file status with tags"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "用标签标识文件的状态"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/ls-files.c:509
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "use lowercase letters for 'assume unchanged' files"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "使用小写字母表示 '假设未改变的' 文件"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/ls-files.c:511
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "show cached files in the output (default)"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "显示缓存的文件(默认)"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/ls-files.c:513
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "show deleted files in the output"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "显示已删除的文件"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/ls-files.c:515
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "show modified files in the output"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "显示已修改的文件"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/ls-files.c:517
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "show other files in the output"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "显示其它文件"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/ls-files.c:519
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "show ignored files in the output"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "显示忽略的文件"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/ls-files.c:522
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "show staged contents' object name in the output"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "显示暂存区内容的对象名称"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/ls-files.c:524
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "show files on the filesystem that need to be removed"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "显示文件系统需要删除的文件"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/ls-files.c:526
|
2014-10-08 04:55:14 +02:00
|
|
|
|
msgid "show 'other' directories' names only"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "只显示“其他”目录的名称"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/ls-files.c:528
|
2016-02-28 13:35:55 +01:00
|
|
|
|
msgid "show line endings of files"
|
|
|
|
|
msgstr "显示文件换行符格式"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/ls-files.c:530
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "don't show empty directories"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "不显示空目录"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/ls-files.c:533
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "show unmerged files in the output"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "显示未合并的文件"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/ls-files.c:535
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "show resolve-undo information"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "显示 resolve-undo 信息"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/ls-files.c:537
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "skip files matching pattern"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "匹配排除文件的模式"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/ls-files.c:540
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "exclude patterns are read from <file>"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "从 <文件> 中读取排除模式"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/ls-files.c:543
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "read additional per-directory exclude patterns in <file>"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "从 <文件> 读取额外的每个目录的排除模式"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/ls-files.c:545
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "add the standard git exclusions"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "添加标准的 git 排除"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/ls-files.c:548
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "make the output relative to the project top directory"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "显示相对于顶级目录的文件名"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/ls-files.c:551
|
|
|
|
|
msgid "recurse through submodules"
|
|
|
|
|
msgstr "在子模组中递归"
|
|
|
|
|
|
|
|
|
|
#: builtin/ls-files.c:553
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "if any <file> is not in the index, treat this as an error"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "如果任何 <文件> 都不在索引区,视为错误"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/ls-files.c:554
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "tree-ish"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "树或提交"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/ls-files.c:555
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "pretend that paths removed since <tree-ish> are still present"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/ls-files.c:557
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "show debugging data"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "显示调试数据"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/ls-remote.c:7
|
|
|
|
|
msgid ""
|
|
|
|
|
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
|
|
|
|
|
" [-q | --quiet] [--exit-code] [--get-url]\n"
|
|
|
|
|
" [--symref] [<repository> [<refs>...]]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
|
|
|
|
|
" [-q | --quiet] [--exit-code] [--get-url]\n"
|
|
|
|
|
" [--symref] [<仓库> [<引用>...]]"
|
|
|
|
|
|
|
|
|
|
#: builtin/ls-remote.c:50
|
|
|
|
|
msgid "do not print remote URL"
|
|
|
|
|
msgstr "不打印远程 URL"
|
|
|
|
|
|
|
|
|
|
#: builtin/ls-remote.c:51 builtin/ls-remote.c:53
|
|
|
|
|
msgid "exec"
|
|
|
|
|
msgstr "exec"
|
|
|
|
|
|
|
|
|
|
#: builtin/ls-remote.c:52 builtin/ls-remote.c:54
|
|
|
|
|
msgid "path of git-upload-pack on the remote host"
|
|
|
|
|
msgstr "远程主机上的 git-upload-pack 路径"
|
|
|
|
|
|
|
|
|
|
#: builtin/ls-remote.c:56
|
|
|
|
|
msgid "limit to tags"
|
|
|
|
|
msgstr "仅限于标签"
|
|
|
|
|
|
|
|
|
|
#: builtin/ls-remote.c:57
|
|
|
|
|
msgid "limit to heads"
|
|
|
|
|
msgstr "仅限于分支"
|
|
|
|
|
|
|
|
|
|
#: builtin/ls-remote.c:58
|
|
|
|
|
msgid "do not show peeled tags"
|
|
|
|
|
msgstr "不显示已解析的标签"
|
|
|
|
|
|
|
|
|
|
#: builtin/ls-remote.c:60
|
|
|
|
|
msgid "take url.<base>.insteadOf into account"
|
|
|
|
|
msgstr "参考 url.<base>.insteadOf 设置"
|
|
|
|
|
|
|
|
|
|
#: builtin/ls-remote.c:62
|
|
|
|
|
msgid "exit with exit code 2 if no matching refs are found"
|
|
|
|
|
msgstr "若未找到匹配的引用则以退出码2退出"
|
|
|
|
|
|
|
|
|
|
#: builtin/ls-remote.c:64
|
|
|
|
|
msgid "show underlying ref in addition to the object pointed by it"
|
|
|
|
|
msgstr "除了显示指向的对象外,显示指向的引用名"
|
|
|
|
|
|
2013-09-17 17:37:05 +02:00
|
|
|
|
#: builtin/ls-tree.c:28
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/ls-tree.c:128
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "only show trees"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "只显示树"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/ls-tree.c:130
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "recurse into subtrees"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "递归到子树"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/ls-tree.c:132
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "show trees when recursing"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "当递归时显示树"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/ls-tree.c:135
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "terminate entries with NUL byte"
|
2015-08-10 12:03:29 +02:00
|
|
|
|
msgstr "条目以 NUL 字符终止"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/ls-tree.c:136
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "include object size"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "包括对象大小"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "list only filenames"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "只列出文件名"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/ls-tree.c:143
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "use full path names"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "使用文件的全路径"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/ls-tree.c:145
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "list entire tree; not just current directory (implies --full-name)"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "列出整个树;不仅仅当前目录(隐含 --full-name)"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/merge.c:46
|
2015-02-16 14:34:19 +01:00
|
|
|
|
msgid "git merge [<options>] [<commit>...]"
|
|
|
|
|
msgstr "git merge [<选项>] [<提交>...]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/merge.c:47
|
2015-02-16 14:34:19 +01:00
|
|
|
|
msgid "git merge [<options>] <msg> HEAD <commit>"
|
|
|
|
|
msgstr "git merge [<选项>] <说明> HEAD <提交>"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/merge.c:48
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "git merge --abort"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "git merge --abort"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/merge.c:102
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "switch `m' requires a value"
|
|
|
|
|
msgstr "开关 `m' 需要一个值"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/merge.c:139
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Could not find merge strategy '%s'.\n"
|
2012-03-27 08:46:11 +02:00
|
|
|
|
msgstr "不能找到合并策略 '%s'。\n"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/merge.c:140
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Available strategies are:"
|
|
|
|
|
msgstr "可用的策略有:"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/merge.c:145
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Available custom strategies are:"
|
|
|
|
|
msgstr "可用的自定义策略有:"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/merge.c:195 builtin/pull.c:127
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "do not show a diffstat at the end of the merge"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "在合并的最后不显示差异统计"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/merge.c:198 builtin/pull.c:130
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "show a diffstat at the end of the merge"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "在合并的最后显示差异统计"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/merge.c:199 builtin/pull.c:133
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "(synonym to --stat)"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "(和 --stat 同义)"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/merge.c:201 builtin/pull.c:136
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "add (at most <n>) entries from shortlog to merge commit message"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "在合并提交信息中添加(最多 <n> 条)精简提交记录"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/merge.c:204 builtin/pull.c:139
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "create a single commit instead of doing a merge"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "创建一个单独的提交而不是做一次合并"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/merge.c:206 builtin/pull.c:142
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "perform a commit if the merge succeeds (default)"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "如果合并成功,执行一次提交(默认)"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/merge.c:208 builtin/pull.c:145
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "edit message before committing"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "在提交前编辑提交说明"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/merge.c:209
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "allow fast-forward (default)"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "允许快进(默认)"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/merge.c:211 builtin/pull.c:151
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "abort if fast-forward is not possible"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "如果不能快进就放弃合并"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/merge.c:215 builtin/pull.c:154
|
2016-08-28 04:18:12 +02:00
|
|
|
|
msgid "verify that the named commit has a valid GPG signature"
|
2013-04-11 11:55:09 +02:00
|
|
|
|
msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/merge.c:216 builtin/notes.c:774 builtin/pull.c:158
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: builtin/revert.c:89
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "strategy"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "策略"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/merge.c:217 builtin/pull.c:159
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "merge strategy to use"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "要使用的合并策略"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/merge.c:218 builtin/pull.c:162
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "option=value"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "option=value"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/merge.c:219 builtin/pull.c:163
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "option for selected merge strategy"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "所选的合并策略的选项"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/merge.c:221
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "merge commit message (for a non-fast-forward merge)"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "合并的提交说明(针对非快进式合并)"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/merge.c:225
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "abort the current in-progress merge"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "放弃当前正在进行的合并"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/merge.c:227 builtin/pull.c:170
|
2016-05-29 14:40:35 +02:00
|
|
|
|
msgid "allow merging unrelated histories"
|
|
|
|
|
msgstr "允许合并不相关的历史"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/merge.c:255
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "could not run stash."
|
|
|
|
|
msgstr "不能进行进度保存。"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/merge.c:260
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "stash failed"
|
|
|
|
|
msgstr "进度保存失败"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/merge.c:265
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "not a valid object: %s"
|
|
|
|
|
msgstr "不是一个有效对象:%s"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/merge.c:284 builtin/merge.c:301
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "read-tree failed"
|
|
|
|
|
msgstr "读取树失败"
|
|
|
|
|
|
2012-03-27 08:46:11 +02:00
|
|
|
|
# 译者:注意保持前导空格
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/merge.c:331
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid " (nothing to squash)"
|
|
|
|
|
msgstr " (无可压缩)"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/merge.c:342
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Squash commit -- not updating HEAD\n"
|
|
|
|
|
msgstr "压缩提交 -- 未更新 HEAD\n"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/merge.c:392
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "No merge message -- not updating HEAD\n"
|
|
|
|
|
msgstr "无合并信息 -- 未更新 HEAD\n"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/merge.c:443
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "'%s' does not point to a commit"
|
|
|
|
|
msgstr "'%s' 没有指向一个提交"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/merge.c:533
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Bad branch.%s.mergeoptions string: %s"
|
2012-03-27 08:46:11 +02:00
|
|
|
|
msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/merge.c:652
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "Not handling anything other than two heads merge."
|
|
|
|
|
msgstr "不能处理两个头合并之外的任何操作。"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/merge.c:666
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Unknown option for merge-recursive: -X%s"
|
|
|
|
|
msgstr "merge-recursive 的未知选项:-X%s"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/merge.c:681
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to write %s"
|
|
|
|
|
msgstr "不能写 %s"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/merge.c:733
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Could not read from '%s'"
|
|
|
|
|
msgstr "不能从 '%s' 读取"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/merge.c:742
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
|
|
|
|
|
msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/merge.c:748
|
2013-02-14 10:47:45 +01:00
|
|
|
|
#, c-format
|
2012-02-13 07:41:59 +01:00
|
|
|
|
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"
|
2013-02-14 10:47:45 +01:00
|
|
|
|
"Lines starting with '%c' will be ignored, and an empty message aborts\n"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
"the commit.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
|
|
|
|
|
"合并到主题分支。\n"
|
|
|
|
|
"\n"
|
2013-02-14 10:47:45 +01:00
|
|
|
|
"以 '%c' 开头的行将被忽略,而且空提交说明将会终止提交。\n"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/merge.c:772
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "Empty commit message."
|
|
|
|
|
msgstr "空提交信息。"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/merge.c:792
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Wonderful.\n"
|
|
|
|
|
msgstr "太棒了。\n"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/merge.c:847
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
|
|
|
|
|
msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/merge.c:863
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "'%s' is not a commit"
|
|
|
|
|
msgstr "'%s' 不是一个提交"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/merge.c:904
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "No current branch."
|
2012-03-27 08:46:11 +02:00
|
|
|
|
msgstr "没有当前分支。"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/merge.c:906
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "No remote for the current branch."
|
2015-08-02 15:47:30 +02:00
|
|
|
|
msgstr "当前分支没有对应的远程仓库。"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/merge.c:908
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "No default upstream defined for the current branch."
|
2012-03-27 08:46:11 +02:00
|
|
|
|
msgstr "当前分支没有定义默认的上游分支。"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/merge.c:913
|
2012-04-29 18:06:55 +02:00
|
|
|
|
#, c-format
|
2013-07-26 08:00:02 +02:00
|
|
|
|
msgid "No remote-tracking branch for %s from %s"
|
|
|
|
|
msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
|
2012-04-29 18:06:55 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/merge.c:960
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Bad value '%s' in environment '%s'"
|
2016-09-07 12:03:04 +02:00
|
|
|
|
msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
|
|
|
|
#: builtin/merge.c:1034
|
2015-05-31 02:42:31 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "could not close '%s'"
|
|
|
|
|
msgstr "不能关闭 '%s'"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/merge.c:1061
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "not something we can merge in %s: %s"
|
|
|
|
|
msgstr "不能在 %s 中合并:%s"
|
|
|
|
|
|
|
|
|
|
#: builtin/merge.c:1095
|
|
|
|
|
msgid "not something we can merge"
|
|
|
|
|
msgstr "不能合并"
|
|
|
|
|
|
|
|
|
|
#: builtin/merge.c:1162
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "There is no merge to abort (MERGE_HEAD missing)."
|
2012-03-27 08:46:11 +02:00
|
|
|
|
msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/merge.c:1178
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid ""
|
|
|
|
|
"You have not concluded your merge (MERGE_HEAD exists).\n"
|
2014-10-08 04:55:14 +02:00
|
|
|
|
"Please, commit your changes before you merge."
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgstr ""
|
|
|
|
|
"您尚未结束您的合并(存在 MERGE_HEAD)。\n"
|
2012-03-27 08:46:11 +02:00
|
|
|
|
"请在合并前先提交您的修改。"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/merge.c:1185
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid ""
|
|
|
|
|
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
|
2014-10-08 04:55:14 +02:00
|
|
|
|
"Please, commit your changes before you merge."
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgstr ""
|
|
|
|
|
"您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
|
2012-03-27 08:46:11 +02:00
|
|
|
|
"请在合并前先提交您的修改。"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/merge.c:1188
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
|
|
|
|
|
msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/merge.c:1197
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "You cannot combine --squash with --no-ff."
|
2012-08-02 05:50:59 +02:00
|
|
|
|
msgstr "您不能将 --squash 与 --no-ff 同时使用。"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/merge.c:1205
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "No commit specified and merge.defaultToUpstream not set."
|
2012-03-27 08:46:11 +02:00
|
|
|
|
msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/merge.c:1222
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "Squash commit into empty head not supported yet"
|
|
|
|
|
msgstr "尚不支持到空分支的压缩提交"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/merge.c:1224
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "Non-fast-forward commit does not make sense into an empty head"
|
|
|
|
|
msgstr "到空分支的非快进式提交没有意义"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/merge.c:1229
|
2013-07-26 08:00:02 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "%s - not something we can merge"
|
|
|
|
|
msgstr "%s - 不能被合并"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/merge.c:1231
|
2015-05-31 02:42:31 +02:00
|
|
|
|
msgid "Can merge only exactly one commit into empty head"
|
|
|
|
|
msgstr "只能将一个提交合并到空分支上"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/merge.c:1287
|
2013-04-11 11:55:09 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
|
|
|
|
|
msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/merge.c:1290
|
2013-04-11 11:55:09 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Commit %s has a bad GPG signature allegedly by %s."
|
|
|
|
|
msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/merge.c:1293
|
2013-04-11 11:55:09 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Commit %s does not have a GPG signature."
|
|
|
|
|
msgstr "提交 %s 没有一个 GPG 签名。"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/merge.c:1296
|
2013-04-11 11:55:09 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Commit %s has a good GPG signature by %s\n"
|
|
|
|
|
msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/merge.c:1358
|
2016-05-29 14:40:35 +02:00
|
|
|
|
msgid "refusing to merge unrelated histories"
|
|
|
|
|
msgstr "拒绝合并无关的历史"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/merge.c:1367
|
|
|
|
|
msgid "Already up-to-date."
|
|
|
|
|
msgstr "已经是最新的。"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/merge.c:1377
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Updating %s..%s\n"
|
|
|
|
|
msgstr "更新 %s..%s\n"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/merge.c:1418
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Trying really trivial in-index merge...\n"
|
2012-03-27 08:46:11 +02:00
|
|
|
|
msgstr "尝试非常小的索引内合并...\n"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/merge.c:1425
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Nope.\n"
|
|
|
|
|
msgstr "无。\n"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/merge.c:1450
|
2016-08-28 04:18:12 +02:00
|
|
|
|
msgid "Already up-to-date. Yeeah!"
|
|
|
|
|
msgstr "已经是最新的。耶!"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/merge.c:1456
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "Not possible to fast-forward, aborting."
|
2012-03-03 01:34:28 +01:00
|
|
|
|
msgstr "无法快进,终止。"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/merge.c:1479 builtin/merge.c:1558
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Rewinding the tree to pristine...\n"
|
|
|
|
|
msgstr "将树回滚至原始状态...\n"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/merge.c:1483
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Trying merge strategy %s...\n"
|
|
|
|
|
msgstr "尝试合并策略 %s...\n"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/merge.c:1549
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "No merge strategy handled the merge.\n"
|
|
|
|
|
msgstr "没有合并策略处理此合并。\n"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/merge.c:1551
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Merge with strategy %s failed.\n"
|
|
|
|
|
msgstr "使用策略 %s 合并失败。\n"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/merge.c:1560
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Using the %s to prepare resolving by hand.\n"
|
|
|
|
|
msgstr "使用 %s 以准备手工解决。\n"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/merge.c:1572
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Automatic merge went well; stopped before committing as requested\n"
|
|
|
|
|
msgstr "自动合并进展顺利,按要求在提交前停止\n"
|
|
|
|
|
|
2014-01-18 04:04:21 +01:00
|
|
|
|
#: builtin/merge-base.c:29
|
2015-02-16 14:34:19 +01:00
|
|
|
|
msgid "git merge-base [-a | --all] <commit> <commit>..."
|
|
|
|
|
msgstr "git merge-base [-a | --all] <提交> <提交>..."
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2014-01-18 04:04:21 +01:00
|
|
|
|
#: builtin/merge-base.c:30
|
2015-02-16 14:34:19 +01:00
|
|
|
|
msgid "git merge-base [-a | --all] --octopus <commit>..."
|
|
|
|
|
msgstr "git merge-base [-a | --all] --octopus <提交>..."
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2014-01-18 04:04:21 +01:00
|
|
|
|
#: builtin/merge-base.c:31
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "git merge-base --independent <commit>..."
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "git merge-base --independent <提交>..."
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2014-01-18 04:04:21 +01:00
|
|
|
|
#: builtin/merge-base.c:32
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "git merge-base --is-ancestor <commit> <commit>"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "git merge-base --is-ancestor <提交> <提交>"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2014-01-18 04:04:21 +01:00
|
|
|
|
#: builtin/merge-base.c:33
|
|
|
|
|
msgid "git merge-base --fork-point <ref> [<commit>]"
|
2015-01-18 13:37:57 +01:00
|
|
|
|
msgstr "git merge-base --fork-point <引用> [<提交>]"
|
2014-01-18 04:04:21 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/merge-base.c:217
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "output all common ancestors"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "输出所有共同的祖先"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/merge-base.c:219
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "find ancestors for a single n-way merge"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "查找一个多路合并的祖先提交"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/merge-base.c:221
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "list revs not reachable from others"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "显示不能被其他访问到的版本"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/merge-base.c:223
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "is the first one ancestor of the other?"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "第一个是其他的祖先提交么?"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/merge-base.c:225
|
2014-01-18 04:04:21 +01:00
|
|
|
|
msgid "find where <commit> forked from reflog of <ref>"
|
l10n: zh_CN: Update Git Glossary: fork
Remove "复刻" from translation option list of "fork", keeping "派生"
as the only one.
In Git context, by talking about the term "fork", one usually mean the
procedure that divides a branch into two or more history lines. That
is quite like the "fork" concept in programming, which split a process
into two or more independent processes.
On the other hand, "复刻" by itself means "copy" or "mirror". It is
considered more suitable for describing the procedure like
"fork a repository", which is common on public repository hosting
services, such as GitHub. However, this is beyond the scope of
core-Git. As a l10n work for core-Git, "复刻" should be removed here.
There used to be another option - "分岔". Its a good idea to
translate "fork point" as "分岔点". However, "派生点" is as good,
too. So this option is finally discarded.
Also fix a relevant translation issue which was introduced in
`160fb2b`.
Signed-off-by: Ray Chen <oldsharp@gmail.com>
2015-08-20 05:01:34 +02:00
|
|
|
|
msgstr "根据 <引用> 的引用日志查找 <提交> 的派生处"
|
2014-01-18 04:04:21 +01:00
|
|
|
|
|
2012-09-15 05:17:00 +02:00
|
|
|
|
#: builtin/merge-file.c:8
|
|
|
|
|
msgid ""
|
2015-02-16 14:34:19 +01:00
|
|
|
|
"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
|
|
|
|
|
"<orig-file> <file2>"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgstr ""
|
2015-02-16 14:34:19 +01:00
|
|
|
|
"git merge-file [<选项>] [-L <文件1> [-L <初始> [-L <名字2>]]] <文件1> <初始文"
|
|
|
|
|
"件> <文件2>"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
|
|
|
|
#: builtin/merge-file.c:33
|
|
|
|
|
msgid "send results to standard output"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "将结果发送到标准输出"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
|
|
|
|
#: builtin/merge-file.c:34
|
|
|
|
|
msgid "use a diff3 based merge"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "使用基于 diff3 的合并"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
|
|
|
|
#: builtin/merge-file.c:35
|
|
|
|
|
msgid "for conflicts, use our version"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "如果冲突,使用我们的版本"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
|
|
|
|
#: builtin/merge-file.c:37
|
|
|
|
|
msgid "for conflicts, use their version"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "如果冲突,使用他们的版本"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
|
|
|
|
#: builtin/merge-file.c:39
|
|
|
|
|
msgid "for conflicts, use a union version"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "如果冲突,使用联合版本"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
|
|
|
|
#: builtin/merge-file.c:42
|
|
|
|
|
msgid "for conflicts, use this marker size"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "如果冲突,使用指定长度的标记"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
|
|
|
|
#: builtin/merge-file.c:43
|
|
|
|
|
msgid "do not warn about conflicts"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "不要警告冲突"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
|
|
|
|
#: builtin/merge-file.c:45
|
2015-02-16 14:34:19 +01:00
|
|
|
|
msgid "set labels for file1/orig-file/file2"
|
|
|
|
|
msgstr "为 文件1/初始文件/文件2 设置标签"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/merge-recursive.c:45
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unknown option %s"
|
|
|
|
|
msgstr "未知选项 %s"
|
|
|
|
|
|
|
|
|
|
#: builtin/merge-recursive.c:51
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "could not parse object '%s'"
|
|
|
|
|
msgstr "不能解析对象 '%s'"
|
|
|
|
|
|
|
|
|
|
#: builtin/merge-recursive.c:55
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot handle more than %d base. Ignoring %s."
|
|
|
|
|
msgid_plural "cannot handle more than %d bases. Ignoring %s."
|
|
|
|
|
msgstr[0] "无法处理 %d 条以上的基线。忽略 %s。"
|
|
|
|
|
msgstr[1] "无法处理 %d 条以上的基线。忽略 %s。"
|
|
|
|
|
|
|
|
|
|
#: builtin/merge-recursive.c:63
|
|
|
|
|
msgid "not handling anything other than two heads merge."
|
|
|
|
|
msgstr "不能处理两个头合并之外的任何操作。"
|
|
|
|
|
|
|
|
|
|
#: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "could not resolve ref '%s'"
|
|
|
|
|
msgstr "无法解析引用 '%s'"
|
|
|
|
|
|
|
|
|
|
#: builtin/merge-recursive.c:77
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Merging %s with %s\n"
|
|
|
|
|
msgstr "合并 %s 和 %s\n"
|
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/mktree.c:65
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "git mktree [-z] [--missing] [--batch]"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "git mktree [-z] [--missing] [--batch]"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/mktree.c:152
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "input is NUL terminated"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "输入以 NUL 字符终止"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/mktree.c:153 builtin/write-tree.c:24
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "allow missing objects"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "允许丢失的对象"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/mktree.c:154
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "allow creation of more than one tree"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "允许创建一个以上的树"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2013-09-17 17:37:05 +02:00
|
|
|
|
#: builtin/mv.c:15
|
2015-02-16 14:34:19 +01:00
|
|
|
|
msgid "git mv [<options>] <source>... <destination>"
|
|
|
|
|
msgstr "git mv [<选项>] <源>... <目标>"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/mv.c:70
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Directory %s is in index and no submodule?"
|
|
|
|
|
msgstr "目录 %s 在索引中并且不是子模组?"
|
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/mv.c:72 builtin/rm.c:317
|
2014-10-08 04:55:14 +02:00
|
|
|
|
msgid "Please stage your changes to .gitmodules or stash them to proceed"
|
2015-08-02 15:47:30 +02:00
|
|
|
|
msgstr "请将您的修改暂存到 .gitmodules 中或保存进度后再继续"
|
2014-10-08 04:55:14 +02:00
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/mv.c:90
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "%.*s is in index"
|
|
|
|
|
msgstr "%.*s 在索引中"
|
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/mv.c:112
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "force move/rename even if target exists"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "强制移动/重命令,即使目标存在"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/mv.c:113
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "skip move/rename errors"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "跳过移动/重命名错误"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/mv.c:155
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "destination '%s' is not a directory"
|
|
|
|
|
msgstr "目标 '%s' 不是一个目录"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/mv.c:166
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Checking rename of '%s' to '%s'\n"
|
|
|
|
|
msgstr "检查 '%s' 到 '%s' 的重命名\n"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/mv.c:170
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "bad source"
|
|
|
|
|
msgstr "坏的源"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/mv.c:173
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "can not move directory into itself"
|
|
|
|
|
msgstr "不能将目录移动到自身"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/mv.c:176
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "cannot move directory over file"
|
|
|
|
|
msgstr "不能将目录移动到文件"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/mv.c:185
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "source directory is empty"
|
|
|
|
|
msgstr "源目录为空"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/mv.c:210
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "not under version control"
|
|
|
|
|
msgstr "不在版本控制之下"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/mv.c:213
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "destination exists"
|
|
|
|
|
msgstr "目标已存在"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/mv.c:221
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "overwriting '%s'"
|
|
|
|
|
msgstr "覆盖 '%s'"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/mv.c:224
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "Cannot overwrite"
|
|
|
|
|
msgstr "不能覆盖"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/mv.c:227
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "multiple sources for the same target"
|
|
|
|
|
msgstr "同一目标具有多个源"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/mv.c:229
|
2014-01-18 04:04:21 +01:00
|
|
|
|
msgid "destination directory does not exist"
|
|
|
|
|
msgstr "目标目录不存在"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/mv.c:236
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "%s, source=%s, destination=%s"
|
|
|
|
|
msgstr "%s,源=%s,目标=%s"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/mv.c:257
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Renaming %s to %s\n"
|
|
|
|
|
msgstr "重命名 %s 至 %s\n"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/mv.c:263 builtin/remote.c:710 builtin/repack.c:375
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "renaming '%s' failed"
|
|
|
|
|
msgstr "重命名 '%s' 失败"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/name-rev.c:257
|
2015-02-16 14:34:19 +01:00
|
|
|
|
msgid "git name-rev [<options>] <commit>..."
|
|
|
|
|
msgstr "git name-rev [<选项>] <提交>..."
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/name-rev.c:258
|
2015-02-16 14:34:19 +01:00
|
|
|
|
msgid "git name-rev [<options>] --all"
|
|
|
|
|
msgstr "git name-rev [<选项>] --all"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/name-rev.c:259
|
2015-02-16 14:34:19 +01:00
|
|
|
|
msgid "git name-rev [<options>] --stdin"
|
|
|
|
|
msgstr "git name-rev [<选项>] --stdin"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/name-rev.c:311
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "print only names (no SHA-1)"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "只打印名称(无 SHA-1)"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/name-rev.c:312
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "only use tags to name the commits"
|
2015-07-28 06:52:28 +02:00
|
|
|
|
msgstr "只使用标签来命名提交"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/name-rev.c:314
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "only use refs matching <pattern>"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "只使用和 <模式> 相匹配的引用"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/name-rev.c:316
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "list all commits reachable from all refs"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "列出可以从所有引用访问的提交"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/name-rev.c:317
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "read from stdin"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "从标准输入读取"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/name-rev.c:318
|
2013-09-17 17:37:05 +02:00
|
|
|
|
msgid "allow to print `undefined` names (default)"
|
|
|
|
|
msgstr "允许打印 `未定义` 的名称(默认)"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/name-rev.c:324
|
2013-07-26 08:00:02 +02:00
|
|
|
|
msgid "dereference tags in the input (internal use)"
|
2015-07-28 06:52:28 +02:00
|
|
|
|
msgstr "反向解析输入中的标签(内部使用)"
|
2013-07-26 08:00:02 +02:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: builtin/notes.c:25
|
2015-02-16 14:34:19 +01:00
|
|
|
|
msgid "git notes [--ref <notes-ref>] [list [<object>]]"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: builtin/notes.c:26
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid ""
|
2015-02-16 14:34:19 +01:00
|
|
|
|
"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
|
2015-01-04 05:27:38 +01:00
|
|
|
|
"| (-c | -C) <object>] [<object>]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgstr ""
|
2015-01-04 05:27:38 +01:00
|
|
|
|
"git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> "
|
|
|
|
|
"| (-c | -C) <对象>] [<对象>]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: builtin/notes.c:27
|
2015-02-16 14:34:19 +01:00
|
|
|
|
msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: builtin/notes.c:28
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid ""
|
2015-02-16 14:34:19 +01:00
|
|
|
|
"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
|
2015-01-04 05:27:38 +01:00
|
|
|
|
"(-c | -C) <object>] [<object>]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgstr ""
|
2015-01-04 05:27:38 +01:00
|
|
|
|
"git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | "
|
|
|
|
|
"(-c | -C) <对象>] [<对象>]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: builtin/notes.c:29
|
2015-02-16 14:34:19 +01:00
|
|
|
|
msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
|
2015-01-04 05:27:38 +01:00
|
|
|
|
msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: builtin/notes.c:30
|
2015-02-16 14:34:19 +01:00
|
|
|
|
msgid "git notes [--ref <notes-ref>] show [<object>]"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "git notes [--ref <注解引用>] show [<对象>]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: builtin/notes.c:31
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid ""
|
2015-02-16 14:34:19 +01:00
|
|
|
|
"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: builtin/notes.c:32
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "git notes merge --commit [-v | -q]"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "git notes merge --commit [-v | -q]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: builtin/notes.c:33
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "git notes merge --abort [-v | -q]"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "git notes merge --abort [-v | -q]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: builtin/notes.c:34
|
2015-02-16 14:34:19 +01:00
|
|
|
|
msgid "git notes [--ref <notes-ref>] remove [<object>...]"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: builtin/notes.c:35
|
2015-02-16 14:34:19 +01:00
|
|
|
|
msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "git notes [--ref <注解引用>] prune [-n | -v]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: builtin/notes.c:36
|
2015-02-16 14:34:19 +01:00
|
|
|
|
msgid "git notes [--ref <notes-ref>] get-ref"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "git notes [--ref <注解引用>] get-ref"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: builtin/notes.c:41
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "git notes [list [<object>]]"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "git notes [list [<对象>]]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: builtin/notes.c:46
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "git notes add [<options>] [<object>]"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "git notes add [<选项>] [<对象>]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: builtin/notes.c:51
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "git notes copy [<options>] <from-object> <to-object>"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "git notes copy [<选项>] <源对象> <目标对象>"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: builtin/notes.c:52
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "git notes copy --stdin [<from-object> <to-object>]..."
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "git notes copy --stdin [<源对象> <目标对象>]..."
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: builtin/notes.c:57
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "git notes append [<options>] [<object>]"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "git notes append [<选项>] [<对象>]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: builtin/notes.c:62
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "git notes edit [<object>]"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "git notes edit [<对象>]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: builtin/notes.c:67
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "git notes show [<object>]"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "git notes show [<对象>]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: builtin/notes.c:72
|
2015-02-16 14:34:19 +01:00
|
|
|
|
msgid "git notes merge [<options>] <notes-ref>"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "git notes merge [<选项>] <注解引用>"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: builtin/notes.c:73
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "git notes merge --commit [<options>]"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "git notes merge --commit [<选项>]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: builtin/notes.c:74
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "git notes merge --abort [<options>]"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "git notes merge --abort [<选项>]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: builtin/notes.c:79
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "git notes remove [<object>]"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "git notes remove [<对象>]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: builtin/notes.c:84
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "git notes prune [<options>]"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "git notes prune [<选项>]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: builtin/notes.c:89
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "git notes get-ref"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "git notes get-ref"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/notes.c:94
|
|
|
|
|
msgid "Write/edit the notes for the following object:"
|
|
|
|
|
msgstr "为下面的对象写/编辑说明:"
|
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: builtin/notes.c:147
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to start 'show' for object '%s'"
|
|
|
|
|
msgstr "不能为对象 '%s' 开始 'show'"
|
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: builtin/notes.c:151
|
2013-02-14 10:47:45 +01:00
|
|
|
|
msgid "could not read 'show' output"
|
|
|
|
|
msgstr "不能读取 'show' 的输出"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: builtin/notes.c:159
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to finish 'show' for object '%s'"
|
|
|
|
|
msgstr "无法为对象 '%s' 完成 'show'"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/notes.c:194
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "please supply the note contents using either -m or -F option"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgstr "请通过 -m 或 -F 选项为注解提供内容"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/notes.c:203
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "unable to write note object"
|
|
|
|
|
msgstr "不能写注解对象"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/notes.c:205
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "the note contents have been left in %s"
|
2014-10-08 04:55:14 +02:00
|
|
|
|
msgstr "注解内容被留在 %s 中"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/notes.c:233 builtin/tag.c:439
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot read '%s'"
|
|
|
|
|
msgstr "不能读取 '%s'"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/notes.c:235 builtin/tag.c:442
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "could not open or read '%s'"
|
|
|
|
|
msgstr "不能打开或读取 '%s'"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/notes.c:254 builtin/notes.c:305 builtin/notes.c:307
|
|
|
|
|
#: builtin/notes.c:372 builtin/notes.c:427 builtin/notes.c:513
|
|
|
|
|
#: builtin/notes.c:518 builtin/notes.c:596 builtin/notes.c:659
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to resolve '%s' as a valid ref."
|
|
|
|
|
msgstr "无法解析 '%s' 为一个有效引用。"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/notes.c:257
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "failed to read object '%s'."
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgstr "无法读取对象 '%s'。"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/notes.c:261
|
2014-03-13 05:41:34 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "cannot read note data from non-blob object '%s'."
|
|
|
|
|
msgstr "不能从非数据对象 '%s' 中读取注解数据。"
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:301
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "malformed input line: '%s'."
|
|
|
|
|
msgstr "非法的输入行:'%s'。"
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:316
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to copy notes from '%s' to '%s'"
|
|
|
|
|
msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
|
2014-03-13 05:41:34 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#. TRANSLATORS: the first %s will be replaced by a
|
|
|
|
|
#. git notes command: 'add', 'merge', 'remove', etc.
|
|
|
|
|
#: builtin/notes.c:345
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "refusing to %s notes in %s (outside of refs/notes/)"
|
|
|
|
|
msgstr "拒绝向 %2$s(在 refs/notes/ 之外)%1$s注解"
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:496
|
|
|
|
|
#: builtin/notes.c:508 builtin/notes.c:584 builtin/notes.c:652
|
|
|
|
|
#: builtin/notes.c:802 builtin/notes.c:949 builtin/notes.c:970
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "too many parameters"
|
|
|
|
|
msgstr "参数太多"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/notes.c:378 builtin/notes.c:665
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "no note found for object %s."
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgstr "未发现对象 %s 的注解。"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/notes.c:399 builtin/notes.c:562
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "note contents as a string"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "注解内容作为一个字符串"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/notes.c:402 builtin/notes.c:565
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "note contents in a file"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "注解内容到一个文件中"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/notes.c:405 builtin/notes.c:568
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "reuse and edit specified note object"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "重用和编辑指定的注解对象"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/notes.c:408 builtin/notes.c:571
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "reuse specified note object"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "重用指定的注解对象"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/notes.c:411 builtin/notes.c:574
|
2015-01-04 05:27:38 +01:00
|
|
|
|
msgid "allow storing empty note"
|
|
|
|
|
msgstr "允许保存空白注释"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/notes.c:412 builtin/notes.c:483
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "replace existing notes"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "替换已存在的注解"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/notes.c:437
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
|
|
|
|
|
"existing notes"
|
|
|
|
|
msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/notes.c:452 builtin/notes.c:531
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Overwriting existing notes for object %s\n"
|
|
|
|
|
msgstr "覆盖对象 %s 现存注解\n"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/notes.c:463 builtin/notes.c:624 builtin/notes.c:889
|
2015-01-04 05:27:38 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Removing note for object %s\n"
|
|
|
|
|
msgstr "删除对象 %s 的注解\n"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/notes.c:484
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "read objects from stdin"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "从标准输入读取对象"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/notes.c:486
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "load rewriting config for <command> (implies --stdin)"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "重新加载 <命令> 的配置(隐含 --stdin)"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/notes.c:504
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "too few parameters"
|
|
|
|
|
msgstr "参数太少"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/notes.c:525
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
|
|
|
|
|
"existing notes"
|
|
|
|
|
msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/notes.c:537
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "missing notes on source object %s. Cannot copy."
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgstr "源对象 %s 缺少注解。不能拷贝。"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/notes.c:589
|
2012-09-15 05:17:00 +02:00
|
|
|
|
#, 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"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/notes.c:685
|
|
|
|
|
msgid "failed to delete ref NOTES_MERGE_PARTIAL"
|
|
|
|
|
msgstr "无法删除引用 NOTES_MERGE_PARTIAL"
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:687
|
|
|
|
|
msgid "failed to delete ref NOTES_MERGE_REF"
|
|
|
|
|
msgstr "无法删除引用 NOTES_MERGE_REF"
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:689
|
|
|
|
|
msgid "failed to remove 'git notes merge' worktree"
|
|
|
|
|
msgstr "无法删除 'git notes merge' 工作区"
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:709
|
|
|
|
|
msgid "failed to read ref NOTES_MERGE_PARTIAL"
|
|
|
|
|
msgstr "无法读取引用 NOTES_MERGE_PARTIAL"
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:711
|
|
|
|
|
msgid "could not find commit from NOTES_MERGE_PARTIAL."
|
|
|
|
|
msgstr "无法从 NOTES_MERGE_PARTIAL 中找到提交。"
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:713
|
|
|
|
|
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
|
|
|
|
|
msgstr "无法从 NOTES_MERGE_PARTIAL 中解析提交。"
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:726
|
|
|
|
|
msgid "failed to resolve NOTES_MERGE_REF"
|
|
|
|
|
msgstr "无法解析 NOTES_MERGE_REF"
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:729
|
|
|
|
|
msgid "failed to finalize notes merge"
|
|
|
|
|
msgstr "无法完成注解合并"
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:755
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unknown notes merge strategy %s"
|
|
|
|
|
msgstr "未知的注解合并策略 %s"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/notes.c:771
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "General options"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "通用选项"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/notes.c:773
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "Merge options"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "合并选项"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/notes.c:775
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
|
|
|
|
|
"cat_sort_uniq)"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/notes.c:777
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "Committing unmerged notes"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "提交未合并的注解"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/notes.c:779
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "finalize notes merge by committing unmerged notes"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "通过提交未合并的注解来完成注解合并"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/notes.c:781
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "Aborting notes merge resolution"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "中止注解合并的方案"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/notes.c:783
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "abort notes merge"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "中止注解合并"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/notes.c:794
|
2016-08-28 04:18:12 +02:00
|
|
|
|
msgid "cannot mix --commit, --abort or -s/--strategy"
|
|
|
|
|
msgstr "不能混用 --commit、--abort 或 -s/--strategy"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/notes.c:799
|
|
|
|
|
msgid "must specify a notes ref to merge"
|
2016-09-07 12:03:04 +02:00
|
|
|
|
msgstr "必须指定一个注解引用来合并"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/notes.c:823
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "unknown -s/--strategy: %s"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
msgstr "未知的 -s/--strategy:%s"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/notes.c:860
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "a notes merge into %s is already in-progress at %s"
|
|
|
|
|
msgstr "位于 %2$s 的一个到 %1$s 中的注解合并正在执行中"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/notes.c:863
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "failed to store link to current notes ref (%s)"
|
|
|
|
|
msgstr "无法存储链接到当前的注解引用(%s)"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/notes.c:865
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#, 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"
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgstr ""
|
|
|
|
|
"自动合并说明失败。修改 %s 中的冲突并且使用命令 'git notes merge --commit' 提"
|
|
|
|
|
"交结果,或者使用命令 'git notes merge --abort' 终止合并。\n"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/notes.c:887
|
2012-09-15 05:17:00 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Object %s has no note\n"
|
|
|
|
|
msgstr "对象 %s 没有注解\n"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/notes.c:899
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "attempt to remove non-existent note is not an error"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "尝试删除不存在的注解不是一个错误"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/notes.c:902
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "read object names from the standard input"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "从标准输入读取对象名称"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/notes.c:940 builtin/prune.c:105 builtin/worktree.c:127
|
2016-08-28 04:18:12 +02:00
|
|
|
|
msgid "do not remove, show only"
|
|
|
|
|
msgstr "不删除,只显示"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/notes.c:941
|
2016-08-28 04:18:12 +02:00
|
|
|
|
msgid "report pruned notes"
|
|
|
|
|
msgstr "报告清除的注解"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/notes.c:983
|
2014-03-13 05:41:34 +01:00
|
|
|
|
msgid "notes-ref"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "注解引用"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/notes.c:984
|
2015-02-16 14:34:19 +01:00
|
|
|
|
msgid "use notes from <notes-ref>"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "从 <注解引用> 使用注解"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/notes.c:1019
|
2012-09-15 05:17:00 +02:00
|
|
|
|
#, c-format
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "unknown subcommand: %s"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgstr "未知子命令:%s"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/pack-objects.c:29
|
2015-08-23 09:23:21 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
|
|
|
|
|
msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/pack-objects.c:30
|
2015-08-23 09:23:21 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
|
|
|
|
|
msgstr "git pack-objects [<选项>...] <base-name> [< <引用列表> | < <对象列表>]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/pack-objects.c:179 builtin/pack-objects.c:182
|
2012-09-15 05:17:00 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "deflate error (%d)"
|
|
|
|
|
msgstr "压缩错误 (%d)"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/pack-objects.c:768
|
2016-05-29 14:40:35 +02:00
|
|
|
|
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
|
|
|
|
|
msgstr "禁用 bitmap 写入,因为 pack.packSizeLimit 设置使得包被切分为多个"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/pack-objects.c:781
|
2014-03-13 05:41:34 +01:00
|
|
|
|
msgid "Writing objects"
|
|
|
|
|
msgstr "写入对象中"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/pack-objects.c:1070
|
2014-03-13 05:41:34 +01:00
|
|
|
|
msgid "disabling bitmap writing, as some objects are not being packed"
|
|
|
|
|
msgstr "禁用 bitmap 写入,因为一些对象将不会被打包"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/pack-objects.c:2346
|
2014-03-13 05:41:34 +01:00
|
|
|
|
msgid "Compressing objects"
|
|
|
|
|
msgstr "压缩对象中"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/pack-objects.c:2759
|
2012-09-15 05:17:00 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unsupported index version %s"
|
|
|
|
|
msgstr "不支持的索引版本 %s"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/pack-objects.c:2763
|
2012-09-15 05:17:00 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "bad index version '%s'"
|
|
|
|
|
msgstr "坏的索引版本 '%s'"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/pack-objects.c:2793
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "do not show progress meter"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "不显示进度表"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/pack-objects.c:2795
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "show progress meter"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "显示进度表"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/pack-objects.c:2797
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "show progress meter during object writing phase"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "在对象写入阶段显示进度表"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/pack-objects.c:2800
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "similar to --all-progress when progress meter is shown"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "当进度表显示时类似于 --all-progress"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/pack-objects.c:2801
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "version[,offset]"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "版本[,偏移]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/pack-objects.c:2802
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "write the pack index file in the specified idx format version"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "用指定的 idx 格式版本来写包索引文件"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/pack-objects.c:2805
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "maximum size of each output pack file"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "每个输出包的最大尺寸"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/pack-objects.c:2807
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "ignore borrowed objects from alternate object store"
|
2015-08-02 15:47:30 +02:00
|
|
|
|
msgstr "忽略从备用对象存储里借用对象"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/pack-objects.c:2809
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "ignore packed objects"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "忽略包对象"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/pack-objects.c:2811
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "limit pack window by objects"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "限制打包窗口的对象数"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/pack-objects.c:2813
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "limit pack window by memory in addition to object limit"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "除对象数量限制外设置打包窗口的内存限制"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/pack-objects.c:2815
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "maximum length of delta chain allowed in the resulting pack"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "打包允许的 delta 链的最大长度"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/pack-objects.c:2817
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "reuse existing deltas"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "重用已存在的 deltas"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/pack-objects.c:2819
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "reuse existing objects"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "重用已存在的对象"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/pack-objects.c:2821
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "use OFS_DELTA objects"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "使用 OFS_DELTA 对象"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/pack-objects.c:2823
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "use threads when searching for best delta matches"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "使用线程查询最佳 delta 匹配"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/pack-objects.c:2825
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "do not create an empty pack output"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "不创建空的包输出"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/pack-objects.c:2827
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "read revision arguments from standard input"
|
2015-01-18 13:37:57 +01:00
|
|
|
|
msgstr "从标准输入读取版本号参数"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/pack-objects.c:2829
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "limit the objects to those that are not yet packed"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "限制那些尚未打包的对象"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/pack-objects.c:2832
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "include objects reachable from any reference"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "包括可以从任何引用访问到的对象"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/pack-objects.c:2835
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "include objects referred by reflog entries"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "包括被引用日志引用到的对象"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/pack-objects.c:2838
|
2014-10-08 04:55:14 +02:00
|
|
|
|
msgid "include objects referred to by the index"
|
|
|
|
|
msgstr "包括被索引引用到的对象"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/pack-objects.c:2841
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "output pack to stdout"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "输出包到标准输出"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/pack-objects.c:2843
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "include tag objects that refer to objects to be packed"
|
2015-07-27 08:55:00 +02:00
|
|
|
|
msgstr "包括那些引用了待打包对象的标签对象"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/pack-objects.c:2845
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "keep unreachable objects"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "维持不可达的对象"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/pack-objects.c:2847
|
2016-08-28 04:18:12 +02:00
|
|
|
|
msgid "pack loose unreachable objects"
|
|
|
|
|
msgstr "打包松散的不可达对象"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/pack-objects.c:2849
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "unpack unreachable objects newer than <time>"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "将比给定 <时间> 新的无法访问的对象解包"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/pack-objects.c:2852
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "create thin packs"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "创建精简包"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/pack-objects.c:2854
|
2015-01-04 05:27:38 +01:00
|
|
|
|
msgid "create packs suitable for shallow fetches"
|
2015-08-02 15:47:30 +02:00
|
|
|
|
msgstr "创建适合浅克隆仓库获取的包"
|
2015-01-04 05:27:38 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/pack-objects.c:2856
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "ignore packs that have companion .keep file"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "忽略配有 .keep 文件的包"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/pack-objects.c:2858
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "pack compression level"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "打包压缩级别"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/pack-objects.c:2860
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "do not hide commits by grafts"
|
2014-01-18 04:04:21 +01:00
|
|
|
|
msgstr "显示被嫁接隐藏的提交"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/pack-objects.c:2862
|
2014-03-13 05:41:34 +01:00
|
|
|
|
msgid "use a bitmap index if available to speed up counting objects"
|
|
|
|
|
msgstr "使用 bitmap 索引(如果有的话)以提高对象计数时的速度"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/pack-objects.c:2864
|
2014-03-13 05:41:34 +01:00
|
|
|
|
msgid "write a bitmap index together with the pack index"
|
|
|
|
|
msgstr "在建立包索引的同时创建 bitmap 索引"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/pack-objects.c:2993
|
2014-03-13 05:41:34 +01:00
|
|
|
|
msgid "Counting objects"
|
|
|
|
|
msgstr "对象计数中"
|
|
|
|
|
|
2012-09-15 05:17:00 +02:00
|
|
|
|
#: builtin/pack-refs.c:6
|
2015-02-16 14:34:19 +01:00
|
|
|
|
msgid "git pack-refs [<options>]"
|
|
|
|
|
msgstr "git pack-refs [<选项>]"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2012-09-15 05:17:00 +02:00
|
|
|
|
#: builtin/pack-refs.c:14
|
|
|
|
|
msgid "pack everything"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "打包一切"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2012-09-15 05:17:00 +02:00
|
|
|
|
#: builtin/pack-refs.c:15
|
|
|
|
|
msgid "prune loose refs (default)"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "清除松散的引用(默认)"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2012-09-15 05:17:00 +02:00
|
|
|
|
#: builtin/prune-packed.c:7
|
2015-02-16 14:34:19 +01:00
|
|
|
|
msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
|
|
|
|
|
msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
|
2012-07-04 11:20:34 +02:00
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/prune-packed.c:40
|
2014-03-13 05:41:34 +01:00
|
|
|
|
msgid "Removing duplicate objects"
|
|
|
|
|
msgstr "正在删除重复对象"
|
|
|
|
|
|
2015-07-14 01:33:09 +02:00
|
|
|
|
#: builtin/prune.c:11
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]"
|
2012-02-28 05:24:54 +01:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/prune.c:106 builtin/worktree.c:128
|
2015-08-23 09:23:21 +02:00
|
|
|
|
msgid "report pruned objects"
|
|
|
|
|
msgstr "报告清除的对象"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/prune.c:109 builtin/worktree.c:130
|
2015-08-23 09:23:21 +02:00
|
|
|
|
msgid "expire objects older than <time>"
|
|
|
|
|
msgstr "使早于给定时间的对象过期"
|
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/prune.c:123
|
|
|
|
|
msgid "cannot prune in a precious-objects repo"
|
|
|
|
|
msgstr "不能在珍品仓库中执行清理操作"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/pull.c:51 builtin/pull.c:53
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Invalid value for %s: %s"
|
|
|
|
|
msgstr "%s 的值无效:%s"
|
|
|
|
|
|
|
|
|
|
#: builtin/pull.c:73
|
2015-11-16 00:02:11 +01:00
|
|
|
|
msgid "git pull [<options>] [<repository> [<refspec>...]]"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/pull.c:121
|
2015-08-23 09:23:21 +02:00
|
|
|
|
msgid "Options related to merging"
|
|
|
|
|
msgstr "和合并相关的选项"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/pull.c:124
|
2015-08-23 09:23:21 +02:00
|
|
|
|
msgid "incorporate changes by rebasing rather than merging"
|
|
|
|
|
msgstr "使用变基操作取代合并操作以合入修改"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/pull.c:148 builtin/revert.c:101
|
2015-08-23 09:23:21 +02:00
|
|
|
|
msgid "allow fast-forward"
|
|
|
|
|
msgstr "允许快进式"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/pull.c:157
|
2016-05-29 14:40:35 +02:00
|
|
|
|
msgid "automatically stash/stash pop before and after rebase"
|
|
|
|
|
msgstr "自动在变基操作前后执行 stash/stash pop"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/pull.c:173
|
2015-08-23 09:23:21 +02:00
|
|
|
|
msgid "Options related to fetching"
|
|
|
|
|
msgstr "和获取相关的参数"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/pull.c:195
|
2016-02-28 13:35:55 +01:00
|
|
|
|
msgid "number of submodules pulled in parallel"
|
|
|
|
|
msgstr "并发拉取的子模组的数量"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/pull.c:284
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Invalid value for pull.ff: %s"
|
|
|
|
|
msgstr "pull.ff 的取值无效:%s"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/pull.c:397
|
2015-08-23 09:23:21 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"There is no candidate for rebasing against among the refs that you just "
|
|
|
|
|
"fetched."
|
|
|
|
|
msgstr "在您刚刚获取到的引用中没有变基操作的候选。"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/pull.c:399
|
2015-08-23 09:23:21 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"There are no candidates for merging among the refs that you just fetched."
|
|
|
|
|
msgstr "在您刚刚获取到的引用中没有合并操作的候选。"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/pull.c:400
|
2015-08-23 09:23:21 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"Generally this means that you provided a wildcard refspec which had no\n"
|
|
|
|
|
"matches on the remote end."
|
|
|
|
|
msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/pull.c:403
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"You asked to pull from the remote '%s', but did not specify\n"
|
|
|
|
|
"a branch. Because this is not the default configured remote\n"
|
|
|
|
|
"for your current branch, you must specify a branch on the command line."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"您要求从远程 '%s' 拉取,但是未指定一个分支。因为这不是当前\n"
|
|
|
|
|
"分支默认的远程仓库,您必须在命令行中指定一个分支名。"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/pull.c:408 git-parse-remote.sh:73
|
2015-08-23 09:23:21 +02:00
|
|
|
|
msgid "You are not currently on a branch."
|
|
|
|
|
msgstr "您当前不在一个分支上。"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/pull.c:410 builtin/pull.c:425 git-parse-remote.sh:79
|
2015-08-23 09:23:21 +02:00
|
|
|
|
msgid "Please specify which branch you want to rebase against."
|
|
|
|
|
msgstr "请指定您要变基到哪一个分支。"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:82
|
2015-08-23 09:23:21 +02:00
|
|
|
|
msgid "Please specify which branch you want to merge with."
|
|
|
|
|
msgstr "请指定您要合并哪一个分支。"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/pull.c:413 builtin/pull.c:428
|
2015-08-23 09:23:21 +02:00
|
|
|
|
msgid "See git-pull(1) for details."
|
|
|
|
|
msgstr "详见 git-pull(1)。"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/pull.c:415 builtin/pull.c:421 builtin/pull.c:430
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: git-parse-remote.sh:64
|
|
|
|
|
msgid "<remote>"
|
|
|
|
|
msgstr "<远程>"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:451
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: git-parse-remote.sh:65
|
|
|
|
|
msgid "<branch>"
|
|
|
|
|
msgstr "<分支>"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/pull.c:423 git-parse-remote.sh:75
|
2015-08-23 09:23:21 +02:00
|
|
|
|
msgid "There is no tracking information for the current branch."
|
|
|
|
|
msgstr "当前分支没有跟踪信息。"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/pull.c:432 git-parse-remote.sh:95
|
2015-08-23 09:23:21 +02:00
|
|
|
|
msgid ""
|
2016-05-29 14:40:35 +02:00
|
|
|
|
"If you wish to set tracking information for this branch you can do so with:"
|
|
|
|
|
msgstr "如果您想要为此分支创建跟踪信息,您可以执行:"
|
2012-02-28 05:24:54 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/pull.c:437
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Your configuration specifies to merge with the ref '%s'\n"
|
|
|
|
|
"from the remote, but no such ref was fetched."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"您的配置中指定要合并远程的引用 '%s',\n"
|
|
|
|
|
"但是没有获取到这个引用。"
|
2012-02-28 05:24:54 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/pull.c:754
|
2016-08-28 04:18:12 +02:00
|
|
|
|
msgid "ignoring --verify-signatures for rebase"
|
|
|
|
|
msgstr "为变基操作忽略 --verify-signatures"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/pull.c:801
|
2016-05-29 14:40:35 +02:00
|
|
|
|
msgid "--[no-]autostash option is only valid with --rebase."
|
|
|
|
|
msgstr "--[no-]autostash 选项只在使用 --rebase 时有效。"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/pull.c:809
|
2015-08-23 09:23:21 +02:00
|
|
|
|
msgid "Updating an unborn branch with changes added to the index."
|
|
|
|
|
msgstr "更新尚未诞生的分支,变更添加至索引。"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/pull.c:812
|
|
|
|
|
msgid "pull with rebase"
|
|
|
|
|
msgstr "变基式拉取"
|
|
|
|
|
|
|
|
|
|
#: builtin/pull.c:813
|
|
|
|
|
msgid "please commit or stash them."
|
|
|
|
|
msgstr "请提交或为它们保存进度。"
|
|
|
|
|
|
|
|
|
|
#: builtin/pull.c:838
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"fetch updated the current branch head.\n"
|
|
|
|
|
"fast-forwarding your working tree from\n"
|
|
|
|
|
"commit %s."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"fetch 更新了当前的分支。快进您的工作区\n"
|
|
|
|
|
"至提交 %s。"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/pull.c:843
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Cannot fast-forward your working tree.\n"
|
|
|
|
|
"After making sure that you saved anything precious from\n"
|
|
|
|
|
"$ git diff %s\n"
|
|
|
|
|
"output, run\n"
|
|
|
|
|
"$ git reset --hard\n"
|
|
|
|
|
"to recover."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"您当前的工作区无法执行快进操作。\n"
|
|
|
|
|
"首先执行如下命令:\n"
|
|
|
|
|
"$ git diff %s\n"
|
|
|
|
|
"以确认所有有用的数据均已保存。然后执行下面的命令\n"
|
|
|
|
|
"$ git reset --hard\n"
|
|
|
|
|
"恢复之前的状态。"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/pull.c:858
|
2015-08-23 09:23:21 +02:00
|
|
|
|
msgid "Cannot merge multiple branches into empty head."
|
|
|
|
|
msgstr "无法将多个分支合并到空分支。"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/pull.c:862
|
2015-08-23 09:23:21 +02:00
|
|
|
|
msgid "Cannot rebase onto multiple branches."
|
|
|
|
|
msgstr "无法变基到多个分支。"
|
|
|
|
|
|
2015-12-22 16:06:59 +01:00
|
|
|
|
#: builtin/push.c:16
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "git push [<options>] [<repository> [<refspec>...]]"
|
2015-08-02 15:47:30 +02:00
|
|
|
|
msgstr "git push [<选项>] [<仓库> [<引用规格>...]]"
|
2012-02-28 05:24:54 +01:00
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/push.c:89
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "tag shorthand without <tag>"
|
2015-07-28 06:52:28 +02:00
|
|
|
|
msgstr "标签后面未提供 <标签> 参数"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/push.c:99
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "--delete only accepts plain target ref names"
|
2012-03-27 08:46:11 +02:00
|
|
|
|
msgstr "--delete 只接受简单的目标引用名"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/push.c:143
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"\n"
|
|
|
|
|
"To choose either option permanently, see push.default in 'git help config'."
|
|
|
|
|
msgstr ""
|
2012-05-30 06:19:47 +02:00
|
|
|
|
"\n"
|
|
|
|
|
"为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/push.c:146
|
2012-05-21 03:35:47 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"The upstream branch of your current branch does not match\n"
|
|
|
|
|
"the name of your current branch. To push to the upstream branch\n"
|
|
|
|
|
"on the remote, use\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git push %s HEAD:%s\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"To push to the branch of the same name on the remote, use\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git push %s %s\n"
|
|
|
|
|
"%s"
|
|
|
|
|
msgstr ""
|
2012-05-30 06:19:47 +02:00
|
|
|
|
"如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n"
|
|
|
|
|
"上游分支,使用\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git push %s HEAD:%s\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"为推送至远程同名分支,使用\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git push %s %s\n"
|
|
|
|
|
"%s"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/push.c:161
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"You are not currently on a branch.\n"
|
|
|
|
|
"To push the history leading to the current (detached HEAD)\n"
|
|
|
|
|
"state now, use\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git push %s HEAD:<name-of-remote-branch>\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"您当前不在一个分支上。\n"
|
2012-03-27 08:46:11 +02:00
|
|
|
|
"现在为推送当前(分离头指针)的历史,使用\n"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
"\n"
|
2015-01-18 13:37:57 +01:00
|
|
|
|
" git push %s HEAD:<远程分支名字>\n"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/push.c:175
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"The current branch %s has no upstream branch.\n"
|
|
|
|
|
"To push the current branch and set the remote as upstream, use\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git push --set-upstream %s %s\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"当前分支 %s 没有对应的上游分支。\n"
|
|
|
|
|
"为推送当前分支并建立与远程上游的跟踪,使用\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git push --set-upstream %s %s\n"
|
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/push.c:183
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "The current branch %s has multiple upstream branches, refusing to push."
|
|
|
|
|
msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
|
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/push.c:186
|
2012-04-28 16:42:41 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"You are pushing to remote '%s', which is not the upstream of\n"
|
|
|
|
|
"your current branch '%s', without telling me what to push\n"
|
|
|
|
|
"to update which remote branch."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"您正推送至远程 '%s'(其并非当前分支 '%s' 的上游),\n"
|
|
|
|
|
"而没有告诉我要推送什么、更新哪个远程分支。"
|
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/push.c:242
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid ""
|
|
|
|
|
"You didn't specify any refspecs to push, and push.default is \"nothing\"."
|
2015-08-02 15:47:30 +02:00
|
|
|
|
msgstr "您没有为推送指定任何引用规格,并且 push.default 为 \"nothing\"。"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/push.c:249
|
2012-04-29 18:06:55 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"Updates were rejected because the tip of your current branch is behind\n"
|
2013-07-26 08:00:02 +02:00
|
|
|
|
"its remote counterpart. Integrate the remote changes (e.g.\n"
|
|
|
|
|
"'git pull ...') before pushing again.\n"
|
2012-04-29 18:06:55 +02:00
|
|
|
|
"See the 'Note about fast-forwards' in 'git push --help' for details."
|
|
|
|
|
msgstr ""
|
2012-05-15 05:53:26 +02:00
|
|
|
|
"更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
|
2013-07-26 08:00:02 +02:00
|
|
|
|
"再次推送前,先与远程变更合并(如 'git pull ...')。详见\n"
|
2012-05-15 05:53:26 +02:00
|
|
|
|
"'git push --help' 中的 'Note about fast-forwards' 小节。"
|
2012-04-29 18:06:55 +02:00
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/push.c:255
|
2012-04-29 18:06:55 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"Updates were rejected because a pushed branch tip is behind its remote\n"
|
2013-07-26 08:00:02 +02:00
|
|
|
|
"counterpart. Check out this branch and integrate the remote changes\n"
|
|
|
|
|
"(e.g. 'git pull ...') before pushing again.\n"
|
2012-04-29 18:06:55 +02:00
|
|
|
|
"See the 'Note about fast-forwards' in 'git push --help' for details."
|
|
|
|
|
msgstr ""
|
2012-05-15 05:53:26 +02:00
|
|
|
|
"更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
|
2013-07-26 08:00:02 +02:00
|
|
|
|
"检出该分支并整合远程变更(如 'git pull ...'),然后再推送。详见\n"
|
2012-05-15 05:53:26 +02:00
|
|
|
|
"'git push --help' 中的 'Note about fast-forwards' 小节。"
|
2012-04-29 18:06:55 +02:00
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/push.c:261
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgid ""
|
2013-02-14 10:47:45 +01:00
|
|
|
|
"Updates were rejected because the remote contains work that you do\n"
|
|
|
|
|
"not have locally. This is usually caused by another repository pushing\n"
|
2013-07-26 08:00:02 +02:00
|
|
|
|
"to the same ref. You may want to first integrate the remote changes\n"
|
|
|
|
|
"(e.g., 'git pull ...') before pushing again.\n"
|
2013-02-14 10:47:45 +01:00
|
|
|
|
"See the 'Note about fast-forwards' in 'git push --help' for details."
|
|
|
|
|
msgstr ""
|
2015-08-02 15:47:30 +02:00
|
|
|
|
"更新被拒绝,因为远程仓库包含您本地尚不存在的提交。这通常是因为另外\n"
|
|
|
|
|
"一个仓库已向该引用进行了推送。再次推送前,您可能需要先整合远程变更\n"
|
2013-07-26 08:00:02 +02:00
|
|
|
|
"(如 'git pull ...')。\n"
|
2013-02-14 10:47:45 +01:00
|
|
|
|
"详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
|
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/push.c:268
|
2013-02-14 10:47:45 +01:00
|
|
|
|
msgid "Updates were rejected because the tag already exists in the remote."
|
2015-07-28 06:52:28 +02:00
|
|
|
|
msgstr "更新被拒绝,因为该标签在远程已经存在。"
|
2013-02-14 10:47:45 +01:00
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/push.c:271
|
2013-02-14 10:47:45 +01:00
|
|
|
|
msgid ""
|
|
|
|
|
"You cannot update a remote ref that points at a non-commit object,\n"
|
|
|
|
|
"or update a remote ref to make it point at a non-commit object,\n"
|
|
|
|
|
"without using the '--force' option.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"如果不使用 '--force' 参数,您不能更新一个指向非提交对象的远程引用,\n"
|
|
|
|
|
"也不能更新远程引用让其指向一个非提交对象。\n"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/push.c:331
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Pushing to %s\n"
|
|
|
|
|
msgstr "推送到 %s\n"
|
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/push.c:335
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to push some refs to '%s'"
|
|
|
|
|
msgstr "无法推送一些引用到 '%s'"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/push.c:366
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "bad repository '%s'"
|
2015-08-02 15:47:30 +02:00
|
|
|
|
msgstr "坏的仓库 '%s'"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/push.c:367
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid ""
|
|
|
|
|
"No configured push destination.\n"
|
|
|
|
|
"Either specify the URL from the command-line or configure a remote "
|
|
|
|
|
"repository using\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git remote add <name> <url>\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"and then push using the remote name\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git push <name>\n"
|
|
|
|
|
msgstr ""
|
2012-03-27 08:46:11 +02:00
|
|
|
|
"没有配置推送目标。\n"
|
2015-08-10 12:03:29 +02:00
|
|
|
|
"或通过命令行指定 URL,或用下面命令配置一个远程仓库\n"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
"\n"
|
2015-01-18 13:37:57 +01:00
|
|
|
|
" git remote add <名称> <地址>\n"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
"\n"
|
2015-08-02 15:47:30 +02:00
|
|
|
|
"然后使用该远程仓库名执行推送\n"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
"\n"
|
2015-01-18 13:37:57 +01:00
|
|
|
|
" git push <名称>\n"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/push.c:385
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "--all and --tags are incompatible"
|
|
|
|
|
msgstr "--all 和 --tags 不兼容"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/push.c:386
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "--all can't be combined with refspecs"
|
2015-08-02 15:47:30 +02:00
|
|
|
|
msgstr "--all 不能和引用规格同时使用"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/push.c:391
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "--mirror and --tags are incompatible"
|
|
|
|
|
msgstr "--mirror 和 --tags 不兼容"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/push.c:392
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "--mirror can't be combined with refspecs"
|
2015-08-02 15:47:30 +02:00
|
|
|
|
msgstr "--mirror 不能和引用规格同时使用"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/push.c:397
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "--all and --mirror are incompatible"
|
|
|
|
|
msgstr "--all 和 --mirror 不兼容"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/push.c:515
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "repository"
|
2015-08-02 15:47:30 +02:00
|
|
|
|
msgstr "仓库"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/push.c:516 builtin/send-pack.c:161
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "push all refs"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "推送所有引用"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/push.c:517 builtin/send-pack.c:163
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "mirror all refs"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "镜像所有引用"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/push.c:519
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "delete refs"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "删除引用"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/push.c:520
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "push tags (can't be used with --all or --mirror)"
|
2015-07-28 06:52:28 +02:00
|
|
|
|
msgstr "推送标签(不能使用 --all or --mirror)"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/push.c:523 builtin/send-pack.c:164
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "force updates"
|
|
|
|
|
msgstr "强制更新"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/push.c:525 builtin/send-pack.c:175
|
2013-09-17 17:37:05 +02:00
|
|
|
|
msgid "refname>:<expect"
|
|
|
|
|
msgstr "引用名>:<期望值"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/push.c:526 builtin/send-pack.c:176
|
2013-09-17 17:37:05 +02:00
|
|
|
|
msgid "require old value of ref to be at this value"
|
|
|
|
|
msgstr "要求引用旧的取值为设定值"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/push.c:529
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "control recursive pushing of submodules"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "控制子模组的递归推送"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/push.c:531 builtin/send-pack.c:169
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "use thin pack"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "使用精简打包"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/push.c:532 builtin/push.c:533 builtin/send-pack.c:158
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: builtin/send-pack.c:159
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "receive pack program"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "接收包程序"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/push.c:534
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "set upstream for git pull/status"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "设置 git pull/status 的上游"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/push.c:537
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "prune locally removed refs"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "清除本地删除的引用"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/push.c:539
|
2013-02-14 10:47:45 +01:00
|
|
|
|
msgid "bypass pre-push hook"
|
|
|
|
|
msgstr "绕过 pre-push 钩子"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/push.c:540
|
2013-04-11 11:55:09 +02:00
|
|
|
|
msgid "push missing but relevant tags"
|
2015-07-28 06:52:28 +02:00
|
|
|
|
msgstr "推送缺失但有关的标签"
|
2013-04-11 11:55:09 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/push.c:543 builtin/send-pack.c:166
|
2014-10-08 04:55:14 +02:00
|
|
|
|
msgid "GPG sign the push"
|
|
|
|
|
msgstr "用 GPG 为推送签名"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/push.c:545 builtin/send-pack.c:170
|
2015-02-16 14:34:19 +01:00
|
|
|
|
msgid "request atomic transaction on remote side"
|
|
|
|
|
msgstr "需要远端支持原子事务"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/push.c:546
|
|
|
|
|
msgid "server-specific"
|
|
|
|
|
msgstr "server-specific"
|
|
|
|
|
|
|
|
|
|
#: builtin/push.c:546
|
|
|
|
|
msgid "option to transmit"
|
2016-09-07 12:03:04 +02:00
|
|
|
|
msgstr "传输选项"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
|
|
|
|
#: builtin/push.c:560
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "--delete is incompatible with --all, --mirror and --tags"
|
|
|
|
|
msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/push.c:562
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "--delete doesn't make sense without any refs"
|
|
|
|
|
msgstr "--delete 未接任何引用没有意义"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/push.c:579
|
|
|
|
|
msgid "push options must not have new line characters"
|
|
|
|
|
msgstr "推送选项不能有换行符"
|
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/read-tree.c:37
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid ""
|
2015-08-23 09:23:21 +02:00
|
|
|
|
"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
|
2012-09-15 05:17:00 +02:00
|
|
|
|
"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
|
|
|
|
|
"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
|
|
|
|
|
msgstr ""
|
2015-08-23 09:23:21 +02:00
|
|
|
|
"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>) [-"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
"u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
"index-output=<文件>] (--empty | <树对象1> [<树对象2> [<树对象3>]])"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/read-tree.c:110
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "write resulting index to <file>"
|
2015-01-18 13:37:57 +01:00
|
|
|
|
msgstr "将索引结果写入 <文件>"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/read-tree.c:113
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "only empty the index"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "只是清空索引"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/read-tree.c:115
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "Merging"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "合并"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/read-tree.c:117
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "perform a merge in addition to a read"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "读取之余再执行一个合并"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/read-tree.c:119
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "3-way merge if no file level merging required"
|
2015-08-02 15:47:30 +02:00
|
|
|
|
msgstr "如果没有文件级合并需要,执行三方合并"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/read-tree.c:121
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "3-way merge in presence of adds and removes"
|
2015-08-02 15:47:30 +02:00
|
|
|
|
msgstr "存在添加和删除时,也执行三方合并"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/read-tree.c:123
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "same as -m, but discard unmerged entries"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "类似于 -m,但丢弃未合并的条目"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/read-tree.c:124
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "<subdirectory>/"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "<子目录>/"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/read-tree.c:125
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "read the tree into the index under <subdirectory>/"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "读取树对象到索引的 <子目录>/ 下"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/read-tree.c:128
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "update working tree with merge result"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "用合并的结果更新工作区"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/read-tree.c:130
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "gitignore"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "gitignore"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/read-tree.c:131
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "allow explicitly ignored files to be overwritten"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "允许忽略文件中设定的文件可以被覆盖"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/read-tree.c:134
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "don't check the working tree after merging"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "合并后不检查工作区"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/read-tree.c:135
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "don't update the index or the work tree"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "不更新索引区和工作区"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/read-tree.c:137
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "skip applying sparse checkout filter"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "跳过应用稀疏检出过滤器"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/read-tree.c:139
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "debug unpack-trees"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "调试 unpack-trees"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/receive-pack.c:26
|
2016-05-29 14:40:35 +02:00
|
|
|
|
msgid "git receive-pack <git-dir>"
|
|
|
|
|
msgstr "git receive-pack <git-dir>"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/receive-pack.c:793
|
|
|
|
|
msgid ""
|
|
|
|
|
"By default, updating the current branch in a non-bare repository\n"
|
|
|
|
|
"is denied, because it will make the index and work tree inconsistent\n"
|
|
|
|
|
"with what you pushed, and will require 'git reset --hard' to match\n"
|
|
|
|
|
"the work tree to HEAD.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"You can set 'receive.denyCurrentBranch' configuration variable to\n"
|
|
|
|
|
"'ignore' or 'warn' in the remote repository to allow pushing into\n"
|
|
|
|
|
"its current branch; however, this is not recommended unless you\n"
|
|
|
|
|
"arranged to update its work tree to match what you pushed in some\n"
|
|
|
|
|
"other way.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"To squelch this message and still keep the default behaviour, set\n"
|
|
|
|
|
"'receive.denyCurrentBranch' configuration variable to 'refuse'."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"默认禁止更新非纯仓库的当前分支,因为您推送的内容将导致索引和工作区\n"
|
|
|
|
|
"不一致,并且将需要执行 'git reset --hard' 将工作区匹配到 HEAD。\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"您可以在远程仓库中设置 'receive.denyCurrentBranch' 配置变量为\n"
|
|
|
|
|
"'ignore' 或 'warn' 以允许推送到当前分支。然而不推荐这么做,除非您\n"
|
|
|
|
|
"用某种方式将其工作区更新至您推送的状态。\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"若要屏蔽此信息且保持默认行为,设置 'receive.denyCurrentBranch'\n"
|
|
|
|
|
"配置变量为 'refuse'。"
|
|
|
|
|
|
|
|
|
|
#: builtin/receive-pack.c:813
|
|
|
|
|
msgid ""
|
|
|
|
|
"By default, deleting the current branch is denied, because the next\n"
|
|
|
|
|
"'git clone' won't result in any file checked out, causing confusion.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"You can set 'receive.denyDeleteCurrent' configuration variable to\n"
|
|
|
|
|
"'warn' or 'ignore' in the remote repository to allow deleting the\n"
|
|
|
|
|
"current branch, with or without a warning message.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"To squelch this message, you can set it to 'refuse'."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"默认禁止删除当前分支,因为下一次 'git clone' 将不会检出任何文件,\n"
|
|
|
|
|
"导致混淆。\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"您可以在远程仓库中设置 'receive.denyDeleteCurrent' 配置变量为\n"
|
|
|
|
|
"'warn' 或 'ignore' 以允许删除当前分支,显示或者不显示警告。\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"若要屏蔽此信息,您可以设置它为 'refuse'。"
|
|
|
|
|
|
|
|
|
|
#: builtin/receive-pack.c:1883
|
2016-05-29 14:40:35 +02:00
|
|
|
|
msgid "quiet"
|
|
|
|
|
msgstr "静默模式"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/receive-pack.c:1897
|
2016-05-29 14:40:35 +02:00
|
|
|
|
msgid "You must specify a directory."
|
|
|
|
|
msgstr "您必须指定一个目录。"
|
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/reflog.c:423
|
2013-07-26 08:00:02 +02:00
|
|
|
|
#, c-format
|
2015-08-23 09:23:21 +02:00
|
|
|
|
msgid "'%s' for '%s' is not a valid timestamp"
|
2013-07-26 08:00:02 +02:00
|
|
|
|
msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
|
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/reflog.c:540 builtin/reflog.c:545
|
2013-07-26 08:00:02 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "'%s' is not a valid timestamp"
|
|
|
|
|
msgstr "'%s' 不是一个有效的时间戳"
|
|
|
|
|
|
2014-01-18 04:04:21 +01:00
|
|
|
|
#: builtin/remote.c:12
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "git remote [-v | --verbose]"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "git remote [-v | --verbose]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2014-01-18 04:04:21 +01:00
|
|
|
|
#: builtin/remote.c:13
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid ""
|
2015-02-16 14:34:19 +01:00
|
|
|
|
"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
"mirror=<fetch|push>] <name> <url>"
|
|
|
|
|
msgstr ""
|
2015-02-16 14:34:19 +01:00
|
|
|
|
"git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--"
|
2015-01-18 13:37:57 +01:00
|
|
|
|
"mirror=<fetch|push>] <名称> <地址>"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/remote.c:14 builtin/remote.c:34
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "git remote rename <old> <new>"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "git remote rename <旧名称> <新名称>"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/remote.c:15 builtin/remote.c:39
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "git remote remove <name>"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "git remote remove <名称>"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/remote.c:16 builtin/remote.c:44
|
2015-02-16 14:34:19 +01:00
|
|
|
|
msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
|
|
|
|
|
msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2014-01-18 04:04:21 +01:00
|
|
|
|
#: builtin/remote.c:17
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "git remote [-v | --verbose] show [-n] <name>"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "git remote [-v | --verbose] show [-n] <名称>"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2014-01-18 04:04:21 +01:00
|
|
|
|
#: builtin/remote.c:18
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "git remote prune [-n | --dry-run] <name>"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "git remote prune [-n | --dry-run] <名称>"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2014-01-18 04:04:21 +01:00
|
|
|
|
#: builtin/remote.c:19
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2014-01-18 04:04:21 +01:00
|
|
|
|
#: builtin/remote.c:20
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "git remote set-branches [--add] <name> <branch>..."
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "git remote set-branches [--add] <名称> <分支>..."
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/remote.c:21 builtin/remote.c:70
|
|
|
|
|
msgid "git remote get-url [--push] [--all] <name>"
|
|
|
|
|
msgstr "git remote get-url [--push] [--all] <名称>"
|
|
|
|
|
|
|
|
|
|
#: builtin/remote.c:22 builtin/remote.c:75
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/remote.c:23 builtin/remote.c:76
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "git remote set-url --add <name> <newurl>"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "git remote set-url --add <名称> <新的地址>"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/remote.c:24 builtin/remote.c:77
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "git remote set-url --delete <name> <url>"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "git remote set-url --delete <名称> <地址>"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/remote.c:29
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "git remote add [<options>] <name> <url>"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "git remote add [<选项>] <名称> <地址>"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/remote.c:49
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "git remote set-branches <name> <branch>..."
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "git remote set-branches <名称> <分支>..."
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/remote.c:50
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "git remote set-branches --add <name> <branch>..."
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "git remote set-branches --add <名称> <分支>..."
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/remote.c:55
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "git remote show [<options>] <name>"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "git remote show [<选项>] <名称>"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/remote.c:60
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "git remote prune [<options>] <name>"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "git remote prune [<选项>] <名称>"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/remote.c:65
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "git remote update [<options>] [<group> | <remote>]..."
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "git remote update [<选项>] [<组> | <远程>]..."
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/remote.c:94
|
2012-05-30 06:19:47 +02:00
|
|
|
|
#, c-format
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "Updating %s"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "更新 %s 中"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/remote.c:126
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"--mirror is dangerous and deprecated; please\n"
|
|
|
|
|
"\t use --mirror=fetch or --mirror=push instead"
|
|
|
|
|
msgstr ""
|
2012-05-30 06:19:47 +02:00
|
|
|
|
"--mirror 选项危险且过时,请使用 --mirror=fetch\n"
|
|
|
|
|
"\t 或 --mirror=push"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/remote.c:143
|
2012-05-30 06:19:47 +02:00
|
|
|
|
#, c-format
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "unknown mirror argument: %s"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "未知的镜像参数:%s"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/remote.c:159
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "fetch the remote branches"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "抓取远程的分支"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/remote.c:161
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "import all tags and associated objects when fetching"
|
2015-07-28 06:52:28 +02:00
|
|
|
|
msgstr "抓取时导入所有的标签和关联对象"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/remote.c:164
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "or do not fetch any tag at all (--no-tags)"
|
2015-07-28 06:52:28 +02:00
|
|
|
|
msgstr "或不抓取任何标签(--no-tags)"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/remote.c:166
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "branch(es) to track"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "跟踪的分支"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/remote.c:167
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "master branch"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "主线分支"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/remote.c:168
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "push|fetch"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "push|fetch"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/remote.c:169
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "set up remote as a mirror to push to or fetch from"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "把远程设置为用以推送或抓取的镜像"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/remote.c:181
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "specifying a master branch makes no sense with --mirror"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/remote.c:183
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "specifying branches to track makes sense only with fetch mirrors"
|
2012-08-02 05:50:59 +02:00
|
|
|
|
msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/remote.c:190 builtin/remote.c:629
|
2012-05-30 06:19:47 +02:00
|
|
|
|
#, c-format
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "remote %s already exists."
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "远程 %s 已经存在。"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/remote.c:194 builtin/remote.c:633
|
2012-05-30 06:19:47 +02:00
|
|
|
|
#, c-format
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "'%s' is not a valid remote name"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "'%s' 不是一个有效的远程名称"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/remote.c:234
|
2012-05-30 06:19:47 +02:00
|
|
|
|
#, c-format
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "Could not setup master '%s'"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "无法设置 master '%s'"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/remote.c:336
|
2012-05-30 06:19:47 +02:00
|
|
|
|
#, c-format
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "Could not get fetch map for refspec %s"
|
2015-08-02 15:47:30 +02:00
|
|
|
|
msgstr "无法得到引用规格 %s 的获取列表"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/remote.c:437 builtin/remote.c:445
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "(matching)"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "(匹配)"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/remote.c:449
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "(delete)"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "(删除)"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:854
|
2012-05-30 06:19:47 +02:00
|
|
|
|
#, c-format
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "No such remote: %s"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "没有这样的远程:%s"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/remote.c:639
|
2012-05-30 06:19:47 +02:00
|
|
|
|
#, c-format
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "Could not rename config section '%s' to '%s'"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "不能重命名配置小节 '%s' 到 '%s'"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/remote.c:659
|
2012-05-21 03:35:47 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
2012-06-02 11:12:59 +02:00
|
|
|
|
"Not updating non-default fetch refspec\n"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
"\t%s\n"
|
|
|
|
|
"\tPlease update the configuration manually if necessary."
|
|
|
|
|
msgstr ""
|
2015-08-02 15:47:30 +02:00
|
|
|
|
"没有更新非默认的获取引用规格\n"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
"\t%s\n"
|
|
|
|
|
"\t如果必要请手动更新配置。"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/remote.c:695
|
2012-05-30 06:19:47 +02:00
|
|
|
|
#, c-format
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "deleting '%s' failed"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "删除 '%s' 失败"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/remote.c:729
|
2012-05-30 06:19:47 +02:00
|
|
|
|
#, c-format
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "creating '%s' failed"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "创建 '%s' 失败"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/remote.c:792
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
|
|
|
|
|
"to delete it, use:"
|
|
|
|
|
msgid_plural ""
|
|
|
|
|
"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
|
|
|
|
|
"to delete them, use:"
|
l10n: Set nplurals of zh_CN.po from 1 to 2
In most cases, plural-forms are unnecessary for Chinese. For example,
"apple" and "apples" are the same in Chinese, they are both translated
as "苹果". While there are exceptions, e.g., the plural form of "he",
"she" and "it" is "they" in English. In Chinese, "他(he)", "她(she)",
and "它(it)" have plural forms too, they are "他们", "她们", and "它们".
But what makes 'nplurals=1' hard to work right for Chinese is:
#: bundle.c:192
#, c-format
msgid "The bundle requires this ref"
msgid_plural "The bundle requires these %d refs"
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-05-31 11:35:59 +02:00
|
|
|
|
msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
|
|
|
|
|
msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/remote.c:806
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Could not remove config section '%s'"
|
|
|
|
|
msgstr "不能移除配置小节 '%s'"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/remote.c:907
|
2012-05-21 03:35:47 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid " new (next fetch will store in remotes/%s)"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr " 新的(下一次获取将存储于 remotes/%s)"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/remote.c:910
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid " tracked"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr " 已跟踪"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/remote.c:912
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid " stale (use 'git remote prune' to remove)"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr " 过时(使用 'git remote prune' 来移除)"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/remote.c:914
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid " ???"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr " ???"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/remote.c:955
|
2012-05-21 03:35:47 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/remote.c:963
|
2012-05-30 06:19:47 +02:00
|
|
|
|
#, c-format
|
2016-02-28 13:35:55 +01:00
|
|
|
|
msgid "rebases interactively onto remote %s"
|
|
|
|
|
msgstr "交互式变基到远程 %s"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/remote.c:964
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "rebases onto remote %s"
|
|
|
|
|
msgstr "变基到远程 %s"
|
|
|
|
|
|
|
|
|
|
#: builtin/remote.c:967
|
2012-05-30 06:19:47 +02:00
|
|
|
|
#, c-format
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid " merges with remote %s"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr " 与远程 %s 合并"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/remote.c:970
|
2012-05-30 06:19:47 +02:00
|
|
|
|
#, c-format
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "merges with remote %s"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "与远程 %s 合并"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/remote.c:973
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "%-*s and with remote %s\n"
|
|
|
|
|
msgstr "%-*s 以及和远程 %s\n"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/remote.c:1016
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "create"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "创建"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/remote.c:1019
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "delete"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "删除"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/remote.c:1023
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "up to date"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "最新"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/remote.c:1026
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "fast-forwardable"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "可快进"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/remote.c:1029
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "local out of date"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "本地已过时"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/remote.c:1036
|
2012-05-21 03:35:47 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid " %-*s forces to %-*s (%s)"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr " %-*s 强制推送至 %-*s (%s)"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/remote.c:1039
|
2012-05-21 03:35:47 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid " %-*s pushes to %-*s (%s)"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr " %-*s 推送至 %-*s (%s)"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/remote.c:1043
|
2012-05-21 03:35:47 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid " %-*s forces to %s"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr " %-*s 强制推送至 %s"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/remote.c:1046
|
2012-05-21 03:35:47 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid " %-*s pushes to %s"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr " %-*s 推送至 %s"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/remote.c:1114
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "do not query remotes"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "不查询远程"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/remote.c:1141
|
2012-05-30 06:19:47 +02:00
|
|
|
|
#, c-format
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "* remote %s"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "* 远程 %s"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/remote.c:1142
|
2012-05-21 03:35:47 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid " Fetch URL: %s"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr " 获取地址:%s"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/remote.c:1143 builtin/remote.c:1156 builtin/remote.c:1295
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "(no URL)"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "(无 URL)"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#. TRANSLATORS: the colon ':' should align with
|
|
|
|
|
#. the one in " Fetch URL: %s" translation
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/remote.c:1154 builtin/remote.c:1156
|
2012-05-21 03:35:47 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid " Push URL: %s"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr " 推送地址:%s"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/remote.c:1158 builtin/remote.c:1160 builtin/remote.c:1162
|
2012-05-30 06:19:47 +02:00
|
|
|
|
#, c-format
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid " HEAD branch: %s"
|
2015-08-10 12:03:29 +02:00
|
|
|
|
msgstr " HEAD 分支:%s"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
# 译者:中文字符串拼接,可删除前导空格
|
|
|
|
|
#: builtin/remote.c:1158
|
|
|
|
|
msgid "(not queried)"
|
|
|
|
|
msgstr "(未查询)"
|
|
|
|
|
|
|
|
|
|
#: builtin/remote.c:1160
|
|
|
|
|
msgid "(unknown)"
|
|
|
|
|
msgstr "(未知)"
|
|
|
|
|
|
|
|
|
|
#: builtin/remote.c:1164
|
2012-05-21 03:35:47 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
|
l10n: Set nplurals of zh_CN.po from 1 to 2
In most cases, plural-forms are unnecessary for Chinese. For example,
"apple" and "apples" are the same in Chinese, they are both translated
as "苹果". While there are exceptions, e.g., the plural form of "he",
"she" and "it" is "they" in English. In Chinese, "他(he)", "她(she)",
and "它(it)" have plural forms too, they are "他们", "她们", and "它们".
But what makes 'nplurals=1' hard to work right for Chinese is:
#: bundle.c:192
#, c-format
msgid "The bundle requires this ref"
msgid_plural "The bundle requires these %d refs"
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-05-31 11:35:59 +02:00
|
|
|
|
msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/remote.c:1176
|
2012-05-30 06:19:47 +02:00
|
|
|
|
#, c-format
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid " Remote branch:%s"
|
|
|
|
|
msgid_plural " Remote branches:%s"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr[0] " 远程分支:%s"
|
l10n: Set nplurals of zh_CN.po from 1 to 2
In most cases, plural-forms are unnecessary for Chinese. For example,
"apple" and "apples" are the same in Chinese, they are both translated
as "苹果". While there are exceptions, e.g., the plural form of "he",
"she" and "it" is "they" in English. In Chinese, "他(he)", "她(she)",
and "它(it)" have plural forms too, they are "他们", "她们", and "它们".
But what makes 'nplurals=1' hard to work right for Chinese is:
#: bundle.c:192
#, c-format
msgid "The bundle requires this ref"
msgid_plural "The bundle requires these %d refs"
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-05-31 11:35:59 +02:00
|
|
|
|
msgstr[1] " 远程分支:%s"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2012-05-30 06:19:47 +02:00
|
|
|
|
# 译者:中文字符串拼接,可删除前导空格
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/remote.c:1179 builtin/remote.c:1205
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid " (status not queried)"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "(状态未查询)"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/remote.c:1188
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid " Local branch configured for 'git pull':"
|
|
|
|
|
msgid_plural " Local branches configured for 'git pull':"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr[0] " 为 'git pull' 配置的本地分支:"
|
l10n: Set nplurals of zh_CN.po from 1 to 2
In most cases, plural-forms are unnecessary for Chinese. For example,
"apple" and "apples" are the same in Chinese, they are both translated
as "苹果". While there are exceptions, e.g., the plural form of "he",
"she" and "it" is "they" in English. In Chinese, "他(he)", "她(she)",
and "它(it)" have plural forms too, they are "他们", "她们", and "它们".
But what makes 'nplurals=1' hard to work right for Chinese is:
#: bundle.c:192
#, c-format
msgid "The bundle requires this ref"
msgid_plural "The bundle requires these %d refs"
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-05-31 11:35:59 +02:00
|
|
|
|
msgstr[1] " 为 'git pull' 配置的本地分支:"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/remote.c:1196
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid " Local refs will be mirrored by 'git push'"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr " 本地引用将在 'git push' 时被镜像"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/remote.c:1202
|
2012-05-30 06:19:47 +02:00
|
|
|
|
#, c-format
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid " Local ref configured for 'git push'%s:"
|
|
|
|
|
msgid_plural " Local refs configured for 'git push'%s:"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr[0] " 为 'git push' 配置的本地引用%s:"
|
l10n: Set nplurals of zh_CN.po from 1 to 2
In most cases, plural-forms are unnecessary for Chinese. For example,
"apple" and "apples" are the same in Chinese, they are both translated
as "苹果". While there are exceptions, e.g., the plural form of "he",
"she" and "it" is "they" in English. In Chinese, "他(he)", "她(she)",
and "它(it)" have plural forms too, they are "他们", "她们", and "它们".
But what makes 'nplurals=1' hard to work right for Chinese is:
#: bundle.c:192
#, c-format
msgid "The bundle requires this ref"
msgid_plural "The bundle requires these %d refs"
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2012-05-31 11:35:59 +02:00
|
|
|
|
msgstr[1] " 为 'git push' 配置的本地引用%s:"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/remote.c:1223
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "set refs/remotes/<name>/HEAD according to remote"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/remote.c:1225
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "delete refs/remotes/<name>/HEAD"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "删除 refs/remotes/<名称>/HEAD"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/remote.c:1240
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "Cannot determine remote HEAD"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "无法确定远程 HEAD"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/remote.c:1242
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/remote.c:1252
|
2012-05-30 06:19:47 +02:00
|
|
|
|
#, c-format
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "Could not delete %s"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "无法删除 %s"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/remote.c:1260
|
2012-05-30 06:19:47 +02:00
|
|
|
|
#, c-format
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "Not a valid ref: %s"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "不是一个有效引用:%s"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/remote.c:1262
|
2012-05-30 06:19:47 +02:00
|
|
|
|
#, c-format
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "Could not setup %s"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "不能设置 %s"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
|
|
|
|
# 译者:注意保持前导空格
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/remote.c:1280
|
2012-05-30 06:19:47 +02:00
|
|
|
|
#, c-format
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid " %s will become dangling!"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr " %s 将成为摇摆状态!"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
|
|
|
|
# 译者:注意保持前导空格
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/remote.c:1281
|
2012-05-30 06:19:47 +02:00
|
|
|
|
#, c-format
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid " %s has become dangling!"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr " %s 已成为摇摆状态!"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/remote.c:1291
|
2012-05-30 06:19:47 +02:00
|
|
|
|
#, c-format
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "Pruning %s"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "修剪 %s"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/remote.c:1292
|
2012-05-21 03:35:47 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "URL: %s"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "URL:%s"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/remote.c:1308
|
2012-05-21 03:35:47 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid " * [would prune] %s"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr " * [将删除] %s"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/remote.c:1311
|
2012-05-21 03:35:47 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid " * [pruned] %s"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr " * [已删除] %s"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/remote.c:1356
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "prune remotes after fetching"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "抓取后清除远程"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/remote.c:1419 builtin/remote.c:1473 builtin/remote.c:1541
|
2012-05-30 06:19:47 +02:00
|
|
|
|
#, c-format
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "No such remote '%s'"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "没有此远程 '%s'"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/remote.c:1435
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "add branch"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "添加分支"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/remote.c:1442
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "no remote specified"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "未指定远程"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/remote.c:1459
|
2015-11-16 00:02:11 +01:00
|
|
|
|
msgid "query push URLs rather than fetch URLs"
|
|
|
|
|
msgstr "查询推送 URL 地址,而非获取 URL 地址"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/remote.c:1461
|
2015-11-16 00:02:11 +01:00
|
|
|
|
msgid "return all URLs"
|
|
|
|
|
msgstr "返回所有 URL 地址"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/remote.c:1489
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "no URLs configured for remote '%s'"
|
|
|
|
|
msgstr "没有给远程仓库 '%s' 设定 URL"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/remote.c:1515
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "manipulate push URLs"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "操作推送 URLS"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/remote.c:1517
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "add URL"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "添加 URL"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/remote.c:1519
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "delete URLs"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "删除 URLS"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/remote.c:1526
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "--add --delete doesn't make sense"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "--add --delete 无意义"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/remote.c:1567
|
2012-05-30 06:19:47 +02:00
|
|
|
|
#, c-format
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "Invalid old URL pattern: %s"
|
2015-08-10 12:03:29 +02:00
|
|
|
|
msgstr "无效的旧 URL 匹配模版:%s"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/remote.c:1575
|
2012-05-30 06:19:47 +02:00
|
|
|
|
#, c-format
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "No such URL found: %s"
|
2015-08-10 12:03:29 +02:00
|
|
|
|
msgstr "未找到此 URL:%s"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/remote.c:1577
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "Will not delete all non-push URLs"
|
2015-08-10 12:03:29 +02:00
|
|
|
|
msgstr "将不会删除所有非推送 URL 地址"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/remote.c:1591
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "be verbose; must be placed before a subcommand"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "冗长输出;必须置于子命令之前"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/remote.c:1622
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Unknown subcommand: %s"
|
|
|
|
|
msgstr "未知子命令:%s"
|
|
|
|
|
|
2014-08-04 10:23:15 +02:00
|
|
|
|
#: builtin/repack.c:17
|
2015-02-16 14:34:19 +01:00
|
|
|
|
msgid "git repack [<options>]"
|
|
|
|
|
msgstr "git repack [<选项>]"
|
2013-09-17 17:37:05 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/repack.c:160
|
2013-09-17 17:37:05 +02:00
|
|
|
|
msgid "pack everything in a single pack"
|
|
|
|
|
msgstr "所有内容打包到一个包文件中"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/repack.c:162
|
2013-09-17 17:37:05 +02:00
|
|
|
|
msgid "same as -a, and turn unreachable objects loose"
|
|
|
|
|
msgstr "和 -a 相同,并将不可达的对象设为松散对象"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/repack.c:165
|
2013-09-17 17:37:05 +02:00
|
|
|
|
msgid "remove redundant packs, and run git-prune-packed"
|
|
|
|
|
msgstr "删除多余的包,运行 git-prune-packed"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/repack.c:167
|
2013-09-17 17:37:05 +02:00
|
|
|
|
msgid "pass --no-reuse-delta to git-pack-objects"
|
|
|
|
|
msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/repack.c:169
|
2013-09-17 17:37:05 +02:00
|
|
|
|
msgid "pass --no-reuse-object to git-pack-objects"
|
|
|
|
|
msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/repack.c:171
|
2013-09-17 17:37:05 +02:00
|
|
|
|
msgid "do not run git-update-server-info"
|
|
|
|
|
msgstr "不运行 git-update-server-info"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/repack.c:174
|
2013-09-17 17:37:05 +02:00
|
|
|
|
msgid "pass --local to git-pack-objects"
|
|
|
|
|
msgstr "向 git-pack-objects 传递参数 --local"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/repack.c:176
|
2014-03-13 05:41:34 +01:00
|
|
|
|
msgid "write bitmap index"
|
|
|
|
|
msgstr "写 bitmap 索引"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/repack.c:177
|
2013-09-17 17:37:05 +02:00
|
|
|
|
msgid "approxidate"
|
|
|
|
|
msgstr "近似日期"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/repack.c:178
|
2013-09-17 17:37:05 +02:00
|
|
|
|
msgid "with -A, do not loosen objects older than this"
|
|
|
|
|
msgstr "使用 -A,不要将早于给定时间的对象过期"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/repack.c:180
|
|
|
|
|
msgid "with -a, repack unreachable objects"
|
|
|
|
|
msgstr "使用 -a ,重新对不可达对象打包"
|
|
|
|
|
|
|
|
|
|
#: builtin/repack.c:182
|
2013-09-17 17:37:05 +02:00
|
|
|
|
msgid "size of the window used for delta compression"
|
|
|
|
|
msgstr "用于增量压缩的窗口值"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/repack.c:183 builtin/repack.c:187
|
2014-02-02 13:46:58 +01:00
|
|
|
|
msgid "bytes"
|
|
|
|
|
msgstr "字节"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/repack.c:184
|
2013-09-17 17:37:05 +02:00
|
|
|
|
msgid "same as the above, but limit memory size instead of entries count"
|
|
|
|
|
msgstr "和上面的相似,但限制内存大小而非条目数"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/repack.c:186
|
2013-09-17 17:37:05 +02:00
|
|
|
|
msgid "limits the maximum delta depth"
|
|
|
|
|
msgstr "限制最大增量深度"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/repack.c:188
|
2013-09-17 17:37:05 +02:00
|
|
|
|
msgid "maximum size of each packfile"
|
2015-07-28 07:26:41 +02:00
|
|
|
|
msgstr "每个包文件的最大尺寸"
|
2013-09-17 17:37:05 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/repack.c:190
|
2014-03-13 05:41:34 +01:00
|
|
|
|
msgid "repack objects in packs marked with .keep"
|
|
|
|
|
msgstr "对标记为 .keep 的包中的对象重新打包"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/repack.c:200
|
2015-11-16 00:02:11 +01:00
|
|
|
|
msgid "cannot delete packs in a precious-objects repo"
|
|
|
|
|
msgstr "不能删除珍品仓库中的打包文件"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/repack.c:204
|
|
|
|
|
msgid "--keep-unreachable and -A are incompatible"
|
|
|
|
|
msgstr "--keep-unreachable 和 -A 不兼容"
|
|
|
|
|
|
|
|
|
|
#: builtin/repack.c:391 builtin/worktree.c:115
|
2013-09-17 17:37:05 +02:00
|
|
|
|
#, c-format
|
2016-08-28 04:18:12 +02:00
|
|
|
|
msgid "failed to remove '%s'"
|
|
|
|
|
msgstr "无法删除 '%s'"
|
2013-09-17 17:37:05 +02:00
|
|
|
|
|
2014-08-04 10:23:15 +02:00
|
|
|
|
#: builtin/replace.c:19
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "git replace [-f] <object> <replacement>"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "git replace [-f] <对象> <替换物>"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2014-08-04 10:23:15 +02:00
|
|
|
|
#: builtin/replace.c:20
|
|
|
|
|
msgid "git replace [-f] --edit <object>"
|
|
|
|
|
msgstr "git replace [-f] --edit <对象>"
|
|
|
|
|
|
|
|
|
|
#: builtin/replace.c:21
|
|
|
|
|
msgid "git replace [-f] --graft <commit> [<parent>...]"
|
|
|
|
|
msgstr "git replace [-f] --graft <提交> [<父提交>...]"
|
|
|
|
|
|
|
|
|
|
#: builtin/replace.c:22
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "git replace -d <object>..."
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "git replace -d <对象>..."
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2014-08-04 10:23:15 +02:00
|
|
|
|
#: builtin/replace.c:23
|
2014-01-18 04:04:21 +01:00
|
|
|
|
msgid "git replace [--format=<format>] [-l [<pattern>]]"
|
|
|
|
|
msgstr "git replace [--format=<格式>] [-l [<模式>]]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391
|
2014-08-04 10:23:15 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Not a valid object name: '%s'"
|
|
|
|
|
msgstr "不是一个有效的对象名:'%s'"
|
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/replace.c:355
|
2014-08-04 10:23:15 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "bad mergetag in commit '%s'"
|
2015-07-28 06:52:28 +02:00
|
|
|
|
msgstr "提交 '%s' 中含有损坏的合并标签"
|
2014-08-04 10:23:15 +02:00
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/replace.c:357
|
2014-08-04 10:23:15 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "malformed mergetag in commit '%s'"
|
2015-07-28 06:52:28 +02:00
|
|
|
|
msgstr "提交 '%s' 中含有非法的合并标签"
|
2014-08-04 10:23:15 +02:00
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/replace.c:368
|
2014-08-04 10:23:15 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
|
|
|
|
|
"instead of --graft"
|
2015-07-28 06:52:28 +02:00
|
|
|
|
msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s',使用 --edit 代替 --graft"
|
2014-08-04 10:23:15 +02:00
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/replace.c:401
|
2014-08-04 10:23:15 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "the original commit '%s' has a gpg signature."
|
|
|
|
|
msgstr "原始提交 '%s' 中包含一个 GPG 签名"
|
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/replace.c:402
|
2014-08-04 10:23:15 +02:00
|
|
|
|
msgid "the signature will be removed in the replacement commit!"
|
|
|
|
|
msgstr "在替换的提交中签名将被移除!"
|
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/replace.c:408
|
2014-08-04 10:23:15 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "could not write replacement commit for: '%s'"
|
|
|
|
|
msgstr "不能为 '%s' 写替换提交"
|
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/replace.c:432
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "list replace refs"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "列出替换的引用"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/replace.c:433
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "delete replace refs"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "删除替换的引用"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/replace.c:434
|
2014-08-04 10:23:15 +02:00
|
|
|
|
msgid "edit existing object"
|
|
|
|
|
msgstr "编辑现存的对象"
|
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/replace.c:435
|
2014-08-04 10:23:15 +02:00
|
|
|
|
msgid "change a commit's parents"
|
|
|
|
|
msgstr "修改一个提交的父提交"
|
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/replace.c:436
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "replace the ref if it exists"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "如果存在则替换引用"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/replace.c:437
|
2014-08-04 10:23:15 +02:00
|
|
|
|
msgid "do not pretty-print contents for --edit"
|
|
|
|
|
msgstr "不要为 --edit 操作美观显示内容"
|
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/replace.c:438
|
2014-01-18 04:04:21 +01:00
|
|
|
|
msgid "use this format"
|
|
|
|
|
msgstr "使用此格式"
|
|
|
|
|
|
2013-09-17 17:37:05 +02:00
|
|
|
|
#: builtin/rerere.c:12
|
2015-02-16 14:34:19 +01:00
|
|
|
|
msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
|
|
|
|
|
msgstr "git rerere [clear | forget <路径>... | status | remaining | diff | gc]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/rerere.c:58
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "register clean resolutions in index"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "在索引中注册干净的解决方案"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/reset.c:26
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/reset.c:27
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
|
|
|
|
|
msgstr "git reset [-q] [<树或提交>] [--] <路径>..."
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/reset.c:28
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
|
|
|
|
|
msgstr "git reset --patch [<树或提交>] [--] [<路径>...]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/reset.c:34
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "mixed"
|
|
|
|
|
msgstr "混杂"
|
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/reset.c:34
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "soft"
|
|
|
|
|
msgstr "软性"
|
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/reset.c:34
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "hard"
|
|
|
|
|
msgstr "硬性"
|
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/reset.c:34
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "merge"
|
|
|
|
|
msgstr "合并"
|
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/reset.c:34
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "keep"
|
|
|
|
|
msgstr "保持"
|
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/reset.c:74
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "You do not have a valid HEAD."
|
|
|
|
|
msgstr "您没有一个有效的 HEAD。"
|
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/reset.c:76
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "Failed to find tree of HEAD."
|
|
|
|
|
msgstr "无法找到 HEAD 指向的树。"
|
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/reset.c:82
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Failed to find tree of %s."
|
|
|
|
|
msgstr "无法找到 %s 指向的树。"
|
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/reset.c:100
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "HEAD is now at %s"
|
|
|
|
|
msgstr "HEAD 现在位于 %s"
|
|
|
|
|
|
2012-03-27 08:46:11 +02:00
|
|
|
|
# 译者:汉字之间无空格,故删除%s前后空格
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/reset.c:183
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Cannot do a %s reset in the middle of a merge."
|
|
|
|
|
msgstr "在合并过程中不能做%s重置操作。"
|
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/reset.c:276
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "be quiet, only report errors"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "安静模式,只报告错误"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/reset.c:278
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "reset HEAD and index"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "重置 HEAD 和索引"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/reset.c:279
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "reset only HEAD"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "只重置 HEAD"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/reset.c:281 builtin/reset.c:283
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "reset HEAD, index and working tree"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "重置 HEAD、索引和工作区"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/reset.c:285
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "reset HEAD but keep local changes"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "重置 HEAD 但保存本地变更"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/reset.c:288
|
2014-03-13 05:41:34 +01:00
|
|
|
|
msgid "record only the fact that removed paths will be added later"
|
|
|
|
|
msgstr "将删除的路径标记为稍后添加"
|
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/reset.c:305
|
2013-01-30 10:23:08 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Failed to resolve '%s' as a valid revision."
|
|
|
|
|
msgstr "无法将 '%s' 解析为一个有效的版本。"
|
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/reset.c:313
|
2013-01-30 10:23:08 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Failed to resolve '%s' as a valid tree."
|
|
|
|
|
msgstr "无法将 '%s' 解析为一个有效的树对象。"
|
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/reset.c:322
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "--patch is incompatible with --{hard,mixed,soft}"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/reset.c:331
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
|
2015-01-18 13:37:57 +01:00
|
|
|
|
msgstr "--mixed 带路径已弃用,而是用 'git reset -- <路径>'。"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2012-03-27 08:46:11 +02:00
|
|
|
|
# 译者:汉字之间无空格,故删除%s前后空格
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/reset.c:333
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Cannot do %s reset with paths."
|
|
|
|
|
msgstr "不能带路径进行%s重置。"
|
|
|
|
|
|
2012-03-27 08:46:11 +02:00
|
|
|
|
# 译者:汉字之间无空格,故删除%s前后空格
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/reset.c:343
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "%s reset is not allowed in a bare repository"
|
2015-08-02 15:47:30 +02:00
|
|
|
|
msgstr "不能对纯仓库进行%s重置"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/reset.c:347
|
2014-03-13 05:41:34 +01:00
|
|
|
|
msgid "-N can only be used with --mixed"
|
|
|
|
|
msgstr "-N 只能和 --mixed 同时使用"
|
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/reset.c:364
|
2013-09-17 17:37:05 +02:00
|
|
|
|
msgid "Unstaged changes after reset:"
|
2015-08-02 15:47:30 +02:00
|
|
|
|
msgstr "重置后取消暂存的变更:"
|
2013-09-17 17:37:05 +02:00
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/reset.c:370
|
2012-09-15 05:17:00 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Could not reset index file to revision '%s'."
|
|
|
|
|
msgstr "不能重置索引文件至版本 '%s'。"
|
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/reset.c:374
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgid "Could not write new index file."
|
|
|
|
|
msgstr "不能写入新的索引文件。"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/rev-list.c:354
|
2015-08-23 09:23:21 +02:00
|
|
|
|
msgid "rev-list does not support display of notes"
|
|
|
|
|
msgstr "rev-list 不支持显示注解"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/rev-parse.c:386
|
2015-02-16 14:34:19 +01:00
|
|
|
|
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
|
|
|
|
|
msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/rev-parse.c:391
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "keep the `--` passed as an arg"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "保持 `--` 作为一个参数传递"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/rev-parse.c:393
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "stop parsing after the first non-option argument"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "遇到第一个非选项参数后停止解析"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/rev-parse.c:396
|
2014-01-18 04:04:21 +01:00
|
|
|
|
msgid "output in stuck long form"
|
|
|
|
|
msgstr "以固定长格式输出"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/rev-parse.c:527
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid ""
|
2015-02-16 14:34:19 +01:00
|
|
|
|
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
" or: git rev-parse --sq-quote [<arg>...]\n"
|
2015-02-16 14:34:19 +01:00
|
|
|
|
" or: git rev-parse [<options>] [<arg>...]\n"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
"\n"
|
|
|
|
|
"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
|
|
|
|
|
msgstr ""
|
2015-02-16 14:34:19 +01:00
|
|
|
|
"git rev-parse --parseopt [<选项>] -- [<参数>...]\n"
|
2013-09-17 17:37:05 +02:00
|
|
|
|
" 或者:git rev-parse --sq-quote [<参数>...]\n"
|
2015-02-16 14:34:19 +01:00
|
|
|
|
" 或者:git rev-parse [<选项>] [<参数>...]\n"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
"\n"
|
|
|
|
|
"初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
|
|
|
|
#: builtin/revert.c:22
|
2015-02-16 14:34:19 +01:00
|
|
|
|
msgid "git revert [<options>] <commit-ish>..."
|
|
|
|
|
msgstr "git revert [<选项>] <提交号>..."
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
|
|
|
|
#: builtin/revert.c:23
|
|
|
|
|
msgid "git revert <subcommand>"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "git revert <子命令>"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
|
|
|
|
#: builtin/revert.c:28
|
2015-02-16 14:34:19 +01:00
|
|
|
|
msgid "git cherry-pick [<options>] <commit-ish>..."
|
|
|
|
|
msgstr "git cherry-pick [<选项>] <提交号>..."
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
|
|
|
|
#: builtin/revert.c:29
|
|
|
|
|
msgid "git cherry-pick <subcommand>"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "git cherry-pick <子命令>"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2013-09-17 17:37:05 +02:00
|
|
|
|
#: builtin/revert.c:71
|
2012-09-15 05:17:00 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "%s: %s cannot be used with %s"
|
|
|
|
|
msgstr "%s:%s 不能和 %s 同时使用"
|
|
|
|
|
|
2013-09-17 17:37:05 +02:00
|
|
|
|
#: builtin/revert.c:80
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "end revert or cherry-pick sequence"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "终止反转或拣选操作"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2013-09-17 17:37:05 +02:00
|
|
|
|
#: builtin/revert.c:81
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "resume revert or cherry-pick sequence"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "继续反转或拣选操作"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2013-09-17 17:37:05 +02:00
|
|
|
|
#: builtin/revert.c:82
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "cancel revert or cherry-pick sequence"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "取消反转或拣选操作"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2013-09-17 17:37:05 +02:00
|
|
|
|
#: builtin/revert.c:83
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "don't automatically commit"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "不要自动提交"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2013-09-17 17:37:05 +02:00
|
|
|
|
#: builtin/revert.c:84
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "edit the commit message"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "编辑提交说明"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2013-09-17 17:37:05 +02:00
|
|
|
|
#: builtin/revert.c:87
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "parent number"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "父编号"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2013-09-17 17:37:05 +02:00
|
|
|
|
#: builtin/revert.c:89
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "merge strategy"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "合并策略"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2013-09-17 17:37:05 +02:00
|
|
|
|
#: builtin/revert.c:90
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "option"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "选项"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2013-09-17 17:37:05 +02:00
|
|
|
|
#: builtin/revert.c:91
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "option for merge strategy"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "合并策略的选项"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/revert.c:100
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "append commit name"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "追加提交名称"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/revert.c:102
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "preserve initially empty commits"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "保留初始化的空提交"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/revert.c:103
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "allow commits with empty messages"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "允许提交说明为空"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/revert.c:104
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "keep redundant, empty commits"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "保持多余的、空的提交"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/revert.c:192
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "revert failed"
|
|
|
|
|
msgstr "还原失败"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/revert.c:205
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "cherry-pick failed"
|
|
|
|
|
msgstr "拣选失败"
|
|
|
|
|
|
2013-09-17 17:37:05 +02:00
|
|
|
|
#: builtin/rm.c:17
|
2015-02-16 14:34:19 +01:00
|
|
|
|
msgid "git rm [<options>] [--] <file>..."
|
|
|
|
|
msgstr "git rm [<选项>] [--] <文件>..."
|
2013-01-30 10:23:08 +01:00
|
|
|
|
|
2013-09-17 17:37:05 +02:00
|
|
|
|
#: builtin/rm.c:65
|
2013-07-26 08:00:02 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"the following submodule (or one of its nested submodules)\n"
|
|
|
|
|
"uses a .git directory:"
|
|
|
|
|
msgid_plural ""
|
2014-10-08 04:55:14 +02:00
|
|
|
|
"the following submodules (or one of their nested submodules)\n"
|
2013-07-26 08:00:02 +02:00
|
|
|
|
"use a .git directory:"
|
2014-10-08 04:55:14 +02:00
|
|
|
|
msgstr[0] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
|
|
|
|
|
msgstr[1] "以下子模组(或一个其嵌套子模组)使用了一个 .git 目录:"
|
2013-07-26 08:00:02 +02:00
|
|
|
|
|
2013-09-17 17:37:05 +02:00
|
|
|
|
#: builtin/rm.c:71
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgid ""
|
2013-07-26 08:00:02 +02:00
|
|
|
|
"\n"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
"(use 'rm -rf' if you really want to remove it including all of its history)"
|
|
|
|
|
msgstr ""
|
2013-07-26 08:00:02 +02:00
|
|
|
|
"\n"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
"(使用 'rm -rf' 命令如果您真的想删除它及其全部历史)"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-05-31 02:42:31 +02:00
|
|
|
|
#: builtin/rm.c:230
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid ""
|
2013-07-26 08:00:02 +02:00
|
|
|
|
"the following file has staged content different from both the\n"
|
|
|
|
|
"file and the HEAD:"
|
|
|
|
|
msgid_plural ""
|
|
|
|
|
"the following files have staged content different from both the\n"
|
|
|
|
|
"file and the HEAD:"
|
|
|
|
|
msgstr[0] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
|
|
|
|
|
msgstr[1] "如下文件其暂存的内容和工作区及 HEAD 中的都不一样:"
|
|
|
|
|
|
2015-05-31 02:42:31 +02:00
|
|
|
|
#: builtin/rm.c:235
|
2013-07-26 08:00:02 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"\n"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
"(use -f to force removal)"
|
|
|
|
|
msgstr ""
|
2013-07-26 08:00:02 +02:00
|
|
|
|
"\n"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
"(使用 -f 强制删除)"
|
|
|
|
|
|
2015-05-31 02:42:31 +02:00
|
|
|
|
#: builtin/rm.c:239
|
2013-07-26 08:00:02 +02:00
|
|
|
|
msgid "the following file has changes staged in the index:"
|
|
|
|
|
msgid_plural "the following files have changes staged in the index:"
|
2015-08-02 15:47:30 +02:00
|
|
|
|
msgstr[0] "下列文件索引中有变更"
|
|
|
|
|
msgstr[1] "下列文件索引中有变更"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2015-05-31 02:42:31 +02:00
|
|
|
|
#: builtin/rm.c:243 builtin/rm.c:254
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid ""
|
2013-07-26 08:00:02 +02:00
|
|
|
|
"\n"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
"(use --cached to keep the file, or -f to force removal)"
|
|
|
|
|
msgstr ""
|
2013-07-26 08:00:02 +02:00
|
|
|
|
"\n"
|
|
|
|
|
"(使用 --cached 保留本地文件,或用 -f 强制删除)"
|
|
|
|
|
|
2015-05-31 02:42:31 +02:00
|
|
|
|
#: builtin/rm.c:251
|
2013-07-26 08:00:02 +02:00
|
|
|
|
msgid "the following file has local modifications:"
|
|
|
|
|
msgid_plural "the following files have local modifications:"
|
|
|
|
|
msgstr[0] "如下文件有本地修改:"
|
|
|
|
|
msgstr[1] "如下文件有本地修改:"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2015-05-31 02:42:31 +02:00
|
|
|
|
#: builtin/rm.c:269
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "do not list removed files"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "不列出删除的文件"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-05-31 02:42:31 +02:00
|
|
|
|
#: builtin/rm.c:270
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "only remove from the index"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "只从索引区删除"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-05-31 02:42:31 +02:00
|
|
|
|
#: builtin/rm.c:271
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "override the up-to-date check"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "忽略文件更新状态检查"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-05-31 02:42:31 +02:00
|
|
|
|
#: builtin/rm.c:272
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "allow recursive removal"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "允许递归删除"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-05-31 02:42:31 +02:00
|
|
|
|
#: builtin/rm.c:274
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "exit with a zero status even if nothing matched"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "即使没有匹配,也以零状态退出"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-05-31 02:42:31 +02:00
|
|
|
|
#: builtin/rm.c:335
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "not removing '%s' recursively without -r"
|
|
|
|
|
msgstr "未提供 -r 选项不会递归删除 '%s'"
|
|
|
|
|
|
2015-05-31 02:42:31 +02:00
|
|
|
|
#: builtin/rm.c:374
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "git rm: unable to remove %s"
|
|
|
|
|
msgstr "git rm:不能删除 %s"
|
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: builtin/send-pack.c:18
|
|
|
|
|
msgid ""
|
|
|
|
|
"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
|
|
|
|
|
"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
|
|
|
|
|
"[<ref>...]\n"
|
|
|
|
|
" --all and explicit <ref> specification are mutually exclusive."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
|
|
|
|
|
"receive-pack>] [--verbose] [--thin] [--atomic] [<主机>:]<目录> [<引用>...]\n"
|
|
|
|
|
" --all 和明确的 <引用> 互斥。"
|
|
|
|
|
|
|
|
|
|
#: builtin/send-pack.c:160
|
|
|
|
|
msgid "remote name"
|
|
|
|
|
msgstr "远程名称"
|
|
|
|
|
|
|
|
|
|
#: builtin/send-pack.c:171
|
|
|
|
|
msgid "use stateless RPC protocol"
|
|
|
|
|
msgstr "使用无状态的 RPC 协议"
|
|
|
|
|
|
|
|
|
|
#: builtin/send-pack.c:172
|
|
|
|
|
msgid "read refs from stdin"
|
|
|
|
|
msgstr "从标准输入读取引用"
|
|
|
|
|
|
|
|
|
|
#: builtin/send-pack.c:173
|
|
|
|
|
msgid "print status from remote helper"
|
|
|
|
|
msgstr "打印来自远程 helper 的状态"
|
|
|
|
|
|
2012-09-15 05:17:00 +02:00
|
|
|
|
#: builtin/shortlog.c:13
|
2015-02-16 14:34:19 +01:00
|
|
|
|
msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
|
2013-04-13 04:02:43 +02:00
|
|
|
|
msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/shortlog.c:242
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "sort output according to the number of commits per author"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "根据每个作者的提交数量排序"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/shortlog.c:244
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "Suppress commit descriptions, only provides commit count"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "隐藏提交说明,只提供提交数量"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/shortlog.c:246
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "Show the email address of each author"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "显示每个作者的电子邮件地址"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/shortlog.c:247
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "w[,i1[,i2]]"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "w[,i1[,i2]]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/shortlog.c:248
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "Linewrap output"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "折行输出"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/show-branch.c:10
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid ""
|
2015-02-16 14:34:19 +01:00
|
|
|
|
"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
|
2015-01-21 08:05:03 +01:00
|
|
|
|
"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
|
|
|
|
|
"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
|
|
|
|
|
"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgstr ""
|
2015-02-16 14:34:19 +01:00
|
|
|
|
"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
|
2015-01-21 08:05:03 +01:00
|
|
|
|
"\t\t[--current] [--color[=<何时>] | --no-color] [--sparse]\n"
|
|
|
|
|
"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
|
|
|
|
|
"\t\t[--no-name | --sha1-name] [--topics] [(<版本> | <通配符>)...]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/show-branch.c:14
|
2015-02-16 14:34:19 +01:00
|
|
|
|
msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
|
|
|
|
|
msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<引用>]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/show-branch.c:375
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "ignoring %s; cannot handle more than %d ref"
|
|
|
|
|
msgid_plural "ignoring %s; cannot handle more than %d refs"
|
|
|
|
|
msgstr[0] "忽略 %s,无法处理 %d 个以上的引用"
|
|
|
|
|
msgstr[1] "忽略 %s,无法处理 %d 个以上的引用"
|
|
|
|
|
|
|
|
|
|
#: builtin/show-branch.c:541
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "no matching refs with %s"
|
|
|
|
|
msgstr "没有和 %s 匹配的引用"
|
|
|
|
|
|
|
|
|
|
#: builtin/show-branch.c:639
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "show remote-tracking and local branches"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "显示远程跟踪的和本地的分支"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/show-branch.c:641
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "show remote-tracking branches"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "显示远程跟踪的分支"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/show-branch.c:643
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "color '*!+-' corresponding to the branch"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "着色 '*!+-' 到相应的分支"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/show-branch.c:645
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "show <n> more commits after the common ancestor"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "显示共同祖先后的 <n> 个提交"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/show-branch.c:647
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "synonym to more=-1"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "和 more=-1 同义"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/show-branch.c:648
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "suppress naming strings"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "不显示字符串命名"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/show-branch.c:650
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "include the current branch"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "包括当前分支"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/show-branch.c:652
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "name commits with their object names"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "以对象名字命名提交"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/show-branch.c:654
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "show possible merge bases"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "显示可能合并的基线"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/show-branch.c:656
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "show refs unreachable from any other ref"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "显示没有任何引用的的引用"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/show-branch.c:658
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "show commits in topological order"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "以拓扑顺序显示提交"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/show-branch.c:661
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "show only commits not on the first branch"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "只显示不在第一个分支上的提交"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/show-branch.c:663
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "show merges reachable from only one tip"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "显示仅一个分支可访问的合并提交"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/show-branch.c:665
|
2013-07-26 08:00:02 +02:00
|
|
|
|
msgid "topologically sort, maintaining date order where possible"
|
|
|
|
|
msgstr "拓扑方式排序,并尽可能地保持日期顺序"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/show-branch.c:668
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "<n>[,<base>]"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "<n>[,<base>]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/show-branch.c:669
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "show <n> most recent ref-log entries starting at base"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "显示从 base 开始的 <n> 条最近的引用日志记录"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/show-branch.c:703
|
|
|
|
|
msgid ""
|
|
|
|
|
"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
|
|
|
|
|
msgstr "--reflog 和 --all、--remotes、--independent 或 --merge-base 不兼容"
|
|
|
|
|
|
|
|
|
|
#: builtin/show-branch.c:727
|
|
|
|
|
msgid "no branches given, and HEAD is not valid"
|
|
|
|
|
msgstr "未提供分支,且 HEAD 无效"
|
|
|
|
|
|
|
|
|
|
#: builtin/show-branch.c:730
|
|
|
|
|
msgid "--reflog option needs one branch name"
|
|
|
|
|
msgstr "选项 --reflog 需要一个分支名"
|
|
|
|
|
|
|
|
|
|
#: builtin/show-branch.c:733
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "only %d entry can be shown at one time."
|
|
|
|
|
msgid_plural "only %d entries can be shown at one time."
|
|
|
|
|
msgstr[0] "一次只能显示 %d 个条目。"
|
|
|
|
|
msgstr[1] "一次只能显示 %d 个条目。"
|
|
|
|
|
|
|
|
|
|
#: builtin/show-branch.c:737
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "no such ref %s"
|
|
|
|
|
msgstr "无此引用 %s"
|
|
|
|
|
|
|
|
|
|
#: builtin/show-branch.c:829
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot handle more than %d rev."
|
|
|
|
|
msgid_plural "cannot handle more than %d revs."
|
|
|
|
|
msgstr[0] "不能处理 %d 个以上的版本。"
|
|
|
|
|
msgstr[1] "不能处理 %d 个以上的版本。"
|
|
|
|
|
|
|
|
|
|
#: builtin/show-branch.c:833
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "'%s' is not a valid ref."
|
|
|
|
|
msgstr "'%s' 不是一个有效的引用。"
|
|
|
|
|
|
|
|
|
|
#: builtin/show-branch.c:836
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot find commit %s (%s)"
|
|
|
|
|
msgstr "不能找到提交 %s (%s)"
|
|
|
|
|
|
2012-09-15 05:17:00 +02:00
|
|
|
|
#: builtin/show-ref.c:10
|
|
|
|
|
msgid ""
|
2015-02-16 14:34:19 +01:00
|
|
|
|
"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
|
|
|
|
|
"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgstr ""
|
2015-02-16 14:34:19 +01:00
|
|
|
|
"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
|
|
|
|
|
"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<模式>...]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
|
|
|
|
#: builtin/show-ref.c:11
|
2015-11-16 00:02:11 +01:00
|
|
|
|
msgid "git show-ref --exclude-existing[=<pattern>]"
|
|
|
|
|
msgstr "git show-ref --exclude-existing[=<模式>]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/show-ref.c:165
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "only show tags (can be combined with heads)"
|
2015-07-28 06:52:28 +02:00
|
|
|
|
msgstr "只显示标签(可以和头共用)"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/show-ref.c:166
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "only show heads (can be combined with tags)"
|
2015-07-28 06:52:28 +02:00
|
|
|
|
msgstr "只显示头(可以和标签共用)"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/show-ref.c:167
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "stricter reference checking, requires exact ref path"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "更严格的引用检测,需要精确的引用路径"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/show-ref.c:170 builtin/show-ref.c:172
|
2013-07-26 08:00:02 +02:00
|
|
|
|
msgid "show the HEAD reference, even if it would be filtered out"
|
|
|
|
|
msgstr "显示 HEAD 引用,即使被过滤掉"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/show-ref.c:174
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "dereference tags into object IDs"
|
2015-08-10 12:03:29 +02:00
|
|
|
|
msgstr "转换标签到对象 ID"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/show-ref.c:176
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "only show SHA1 hash using <n> digits"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "只显示使用 <n> 个数字的 SHA1 哈希"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/show-ref.c:180
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "do not print results to stdout (useful with --verify)"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "不打印结果到标准输出(例如与 --verify 参数共用)"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/show-ref.c:182
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "show refs from stdin that aren't in local repository"
|
2015-08-02 15:47:30 +02:00
|
|
|
|
msgstr "显示从标准输入中读入的不在本地仓库中的引用"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/stripspace.c:17
|
|
|
|
|
msgid "git stripspace [-s | --strip-comments]"
|
|
|
|
|
msgstr "git stripspace [-s | --strip-comments]"
|
|
|
|
|
|
|
|
|
|
#: builtin/stripspace.c:18
|
|
|
|
|
msgid "git stripspace [-c | --comment-lines]"
|
|
|
|
|
msgstr "git stripspace [-c | --comment-lines]"
|
|
|
|
|
|
|
|
|
|
#: builtin/stripspace.c:35
|
|
|
|
|
msgid "skip and remove all lines starting with comment character"
|
|
|
|
|
msgstr "跳过和移除所有的注释行"
|
|
|
|
|
|
|
|
|
|
#: builtin/stripspace.c:38
|
2016-02-28 13:35:55 +01:00
|
|
|
|
msgid "prepend comment character and space to each line"
|
2015-11-16 00:02:11 +01:00
|
|
|
|
msgstr "为每一行的行首添加注释符和空格"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1046
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "No such ref: %s"
|
|
|
|
|
msgstr "没有这样的引用:%s"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1055
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Expecting a full ref name, got %s"
|
|
|
|
|
msgstr "期望一个完整的引用名称,却得到 %s"
|
|
|
|
|
|
|
|
|
|
#: builtin/submodule--helper.c:71
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot strip one component off url '%s'"
|
|
|
|
|
msgstr "无法从 url '%s' 剥离一个组件"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/submodule--helper.c:282 builtin/submodule--helper.c:408
|
|
|
|
|
#: builtin/submodule--helper.c:590
|
2015-11-16 00:02:11 +01:00
|
|
|
|
msgid "alternative anchor for relative paths"
|
|
|
|
|
msgstr "相对路径的替代锚记(anchor)"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/submodule--helper.c:287
|
2015-11-16 00:02:11 +01:00
|
|
|
|
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
|
|
|
|
|
msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/submodule--helper.c:329 builtin/submodule--helper.c:343
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "No url found for submodule path '%s' in .gitmodules"
|
|
|
|
|
msgstr "在 .gitmodules 中未找到子模组 '%s' 的 url"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/submodule--helper.c:369
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Failed to register url for submodule path '%s'"
|
|
|
|
|
msgstr "无法为子模组 '%s' 注册 url"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/submodule--helper.c:373
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Submodule '%s' (%s) registered for path '%s'\n"
|
2016-06-05 18:06:17 +02:00
|
|
|
|
msgstr "子模组 '%s'(%s)未对路径 '%s' 注册\n"
|
2016-05-29 14:40:35 +02:00
|
|
|
|
|
|
|
|
|
#
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/submodule--helper.c:383
|
2016-06-05 18:06:17 +02:00
|
|
|
|
#, c-format
|
2016-05-29 14:40:35 +02:00
|
|
|
|
msgid "warning: command update mode suggested for submodule '%s'\n"
|
2016-06-05 18:06:17 +02:00
|
|
|
|
msgstr "警告:建议子模组 '%s' 使用命令更新模式\n"
|
2016-05-29 14:40:35 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/submodule--helper.c:390
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Failed to register update mode for submodule path '%s'"
|
|
|
|
|
msgstr "无法为子模组 '%s' 注册更新模式"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/submodule--helper.c:409
|
2016-05-29 14:40:35 +02:00
|
|
|
|
msgid "Suppress output for initializing a submodule"
|
|
|
|
|
msgstr "初始化子模组时抑制输出"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/submodule--helper.c:414
|
2016-05-29 14:40:35 +02:00
|
|
|
|
msgid "git submodule--helper init [<path>]"
|
|
|
|
|
msgstr "git submodule--helper init [<路径>]"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/submodule--helper.c:435
|
2015-11-16 00:02:11 +01:00
|
|
|
|
msgid "git submodule--helper name <path>"
|
|
|
|
|
msgstr "git submodule--helper name <路径>"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/submodule--helper.c:441
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "no submodule mapping found in .gitmodules for path '%s'"
|
|
|
|
|
msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/submodule--helper.c:524 builtin/submodule--helper.c:527
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "submodule '%s' cannot add alternate: %s"
|
|
|
|
|
msgstr "子模组 '%s' 不能添加仓库备选:%s"
|
|
|
|
|
|
|
|
|
|
#: builtin/submodule--helper.c:563
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
|
|
|
|
|
msgstr "不能识别 submodule.alternateErrorStrategy 的取值 '%s'"
|
|
|
|
|
|
|
|
|
|
#: builtin/submodule--helper.c:570
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Value '%s' for submodule.alternateLocation is not recognized"
|
|
|
|
|
msgstr "不能识别 submodule.alternateLocaion 的取值 '%s'"
|
|
|
|
|
|
|
|
|
|
#: builtin/submodule--helper.c:593
|
2015-11-16 00:02:11 +01:00
|
|
|
|
msgid "where the new submodule will be cloned to"
|
|
|
|
|
msgstr "新的子模组将要克隆的路径"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/submodule--helper.c:596
|
2015-11-16 00:02:11 +01:00
|
|
|
|
msgid "name of the new submodule"
|
|
|
|
|
msgstr "新子模组的名称"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/submodule--helper.c:599
|
2015-11-16 00:02:11 +01:00
|
|
|
|
msgid "url where to clone the submodule from"
|
|
|
|
|
msgstr "克隆子模组的 url 地址"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/submodule--helper.c:605
|
2015-11-16 00:02:11 +01:00
|
|
|
|
msgid "depth for shallow clones"
|
|
|
|
|
msgstr "浅克隆的深度"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/submodule--helper.c:608 builtin/submodule--helper.c:964
|
|
|
|
|
msgid "force cloning progress"
|
|
|
|
|
msgstr "显示克隆进度"
|
|
|
|
|
|
|
|
|
|
#: builtin/submodule--helper.c:613
|
2015-11-16 00:02:11 +01:00
|
|
|
|
msgid ""
|
|
|
|
|
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
|
2016-05-29 14:40:35 +02:00
|
|
|
|
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
msgstr ""
|
|
|
|
|
"git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] "
|
|
|
|
|
"[--name <名字>] [--depth <深度>] --url <url> --path <路径>"
|
2015-11-16 00:02:11 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/submodule--helper.c:638 builtin/submodule--helper.c:648
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "could not create directory '%s'"
|
|
|
|
|
msgstr "不能创建目录 '%s'"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/submodule--helper.c:644
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "clone of '%s' into submodule path '%s' failed"
|
|
|
|
|
msgstr "无法克隆 '%s' 到子模组路径 '%s'"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/submodule--helper.c:660
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot open file '%s'"
|
|
|
|
|
msgstr "无法打开文件 '%s'"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/submodule--helper.c:665
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "could not close file %s"
|
|
|
|
|
msgstr "无法关闭文件 %s"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/submodule--helper.c:672
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "could not get submodule directory for '%s'"
|
|
|
|
|
msgstr "无法得到 '%s' 的子模组目录"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/submodule--helper.c:726
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Submodule path '%s' not initialized"
|
|
|
|
|
msgstr "子模组 '%s' 尚未初始化"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/submodule--helper.c:730
|
2016-05-29 14:40:35 +02:00
|
|
|
|
msgid "Maybe you want to use 'update --init'?"
|
|
|
|
|
msgstr "也许您想要执行 'update --init'?"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/submodule--helper.c:756
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Skipping unmerged submodule %s"
|
|
|
|
|
msgstr "略过未合并的子模组 %s"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/submodule--helper.c:777
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Skipping submodule '%s'"
|
|
|
|
|
msgstr "略过子模组 '%s'"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/submodule--helper.c:913
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Failed to clone '%s'. Retry scheduled"
|
|
|
|
|
msgstr "克隆 '%s' 失败。按计划重试"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/submodule--helper.c:924
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Failed to clone '%s' a second time, aborting"
|
|
|
|
|
msgstr "第二次尝试克隆 '%s' 失败,退出"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/submodule--helper.c:945
|
2016-05-29 14:40:35 +02:00
|
|
|
|
msgid "path into the working tree"
|
|
|
|
|
msgstr "到工作区的路径"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/submodule--helper.c:948
|
2016-05-29 14:40:35 +02:00
|
|
|
|
msgid "path into the working tree, across nested submodule boundaries"
|
|
|
|
|
msgstr "工作区中的路径,递归嵌套子模组"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/submodule--helper.c:952
|
2016-05-29 14:40:35 +02:00
|
|
|
|
msgid "rebase, merge, checkout or none"
|
|
|
|
|
msgstr "rebase、merge、checkout 或 none"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/submodule--helper.c:956
|
2016-05-29 14:40:35 +02:00
|
|
|
|
msgid "Create a shallow clone truncated to the specified number of revisions"
|
|
|
|
|
msgstr "创建一个指定深度的浅克隆"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/submodule--helper.c:959
|
2016-05-29 14:40:35 +02:00
|
|
|
|
msgid "parallel jobs"
|
|
|
|
|
msgstr "并发任务"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/submodule--helper.c:961
|
2016-08-28 04:18:12 +02:00
|
|
|
|
msgid "whether the initial clone should follow the shallow recommendation"
|
2016-09-07 12:03:04 +02:00
|
|
|
|
msgstr "初始克隆是否应该遵守推荐的浅克隆选项"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/submodule--helper.c:962
|
2016-05-29 14:40:35 +02:00
|
|
|
|
msgid "don't print cloning progress"
|
|
|
|
|
msgstr "不要输出克隆进度"
|
2015-11-16 00:02:11 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/submodule--helper.c:969
|
2016-05-29 14:40:35 +02:00
|
|
|
|
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
|
|
|
|
|
msgstr "git submodule--helper update_clone [--prefix=<路径>] [<路径>...]"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/submodule--helper.c:979
|
2016-05-29 14:40:35 +02:00
|
|
|
|
msgid "bad value for update parameter"
|
|
|
|
|
msgstr "update 参数取值错误"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/submodule--helper.c:1050
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Submodule (%s) branch configured to inherit branch from superproject, but "
|
|
|
|
|
"the superproject is not on any branch"
|
|
|
|
|
msgstr "子模组(%s)的分支配置为继承上级项目的分支,但是上级项目不在任何分支上"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/submodule--helper.c:1100
|
2016-05-29 14:40:35 +02:00
|
|
|
|
msgid "submodule--helper subcommand must be called with a subcommand"
|
|
|
|
|
msgstr "submodule-helper 子命令必须由另外的子命令调用"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/submodule--helper.c:1107
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#, c-format
|
2016-05-29 14:40:35 +02:00
|
|
|
|
msgid "'%s' is not a valid submodule--helper subcommand"
|
|
|
|
|
msgstr "'%s' 不是一个有效的 submodule--helper 子命令"
|
2015-11-16 00:02:11 +01:00
|
|
|
|
|
2012-09-15 05:17:00 +02:00
|
|
|
|
#: builtin/symbolic-ref.c:7
|
2015-02-16 14:34:19 +01:00
|
|
|
|
msgid "git symbolic-ref [<options>] <name> [<ref>]"
|
|
|
|
|
msgstr "git symbolic-ref [<选项>] <名称> [<引用>]"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
|
|
|
|
|
#: builtin/symbolic-ref.c:8
|
2015-02-16 14:34:19 +01:00
|
|
|
|
msgid "git symbolic-ref -d [-q] <name>"
|
|
|
|
|
msgstr "git symbolic-ref -d [-q] <名称>"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2013-01-30 10:23:08 +01:00
|
|
|
|
#: builtin/symbolic-ref.c:40
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "suppress error message for non-symbolic (detached) refs"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "不显示非符号(分离的)引用的错误信息"
|
|
|
|
|
|
|
|
|
|
#: builtin/symbolic-ref.c:41
|
|
|
|
|
msgid "delete symbolic ref"
|
|
|
|
|
msgstr "删除符号引用"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2013-01-30 10:23:08 +01:00
|
|
|
|
#: builtin/symbolic-ref.c:42
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "shorten ref output"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "简短的引用输出"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "reason"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "原因"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "reason of the update"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "更新的原因"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/tag.c:23
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid ""
|
2015-02-16 14:34:19 +01:00
|
|
|
|
"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
|
|
|
|
|
"[<head>]"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"git tag [-a | -s | -u <key-id>] [-f] [-m <说明> | -F <文件>] <标签名> [<头>]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/tag.c:24
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "git tag -d <tagname>..."
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "git tag -d <标签名>..."
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/tag.c:25
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid ""
|
2015-02-16 14:34:19 +01:00
|
|
|
|
"git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>]\n"
|
2015-11-16 00:02:11 +01:00
|
|
|
|
"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgstr ""
|
2015-11-16 00:02:11 +01:00
|
|
|
|
"git tag -l [-n[<数字>]] [--contains <提交>] [--points-at <对象>]\n"
|
|
|
|
|
"\t\t[--format=<格式>] [--[no-]merged [<提交>]] [<模式>...]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/tag.c:27
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "git tag -v <tagname>..."
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "git tag -v <标签名>..."
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/tag.c:81
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "tag name too long: %.*s..."
|
2015-07-28 06:52:28 +02:00
|
|
|
|
msgstr "标签名称太长:%.*s..."
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/tag.c:86
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "tag '%s' not found."
|
2015-07-28 06:52:28 +02:00
|
|
|
|
msgstr "未发现标签 '%s'。"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/tag.c:101
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Deleted tag '%s' (was %s)\n"
|
2015-07-28 06:52:28 +02:00
|
|
|
|
msgstr "已删除标签 '%s'(曾为 %s)\n"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/tag.c:117
|
2013-02-14 10:47:45 +01:00
|
|
|
|
#, c-format
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid ""
|
|
|
|
|
"\n"
|
2014-08-04 10:23:15 +02:00
|
|
|
|
"Write a message for tag:\n"
|
|
|
|
|
" %s\n"
|
2013-02-14 10:47:45 +01:00
|
|
|
|
"Lines starting with '%c' will be ignored.\n"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgstr ""
|
|
|
|
|
"\n"
|
2015-07-28 06:52:28 +02:00
|
|
|
|
"输入一个标签说明:\n"
|
2014-08-04 10:23:15 +02:00
|
|
|
|
" %s\n"
|
2013-02-14 10:47:45 +01:00
|
|
|
|
"以 '%c' 开头的行将被忽略。\n"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/tag.c:121
|
2013-02-14 10:47:45 +01:00
|
|
|
|
#, c-format
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid ""
|
|
|
|
|
"\n"
|
2014-08-04 10:23:15 +02:00
|
|
|
|
"Write a message for tag:\n"
|
|
|
|
|
" %s\n"
|
2013-02-14 10:47:45 +01:00
|
|
|
|
"Lines starting with '%c' will be kept; you may remove them yourself if you "
|
2012-02-13 07:41:59 +01:00
|
|
|
|
"want to.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"\n"
|
2015-07-28 06:52:28 +02:00
|
|
|
|
"输入一个标签说明:\n"
|
2014-08-04 10:23:15 +02:00
|
|
|
|
" %s\n"
|
2013-02-14 10:47:45 +01:00
|
|
|
|
"以 '%c' 开头的行将被保留,如果您愿意也可以删除它们。\n"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/tag.c:199
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "unable to sign the tag"
|
2015-07-28 06:52:28 +02:00
|
|
|
|
msgstr "无法签署标签"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/tag.c:201
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "unable to write tag file"
|
2015-07-28 06:52:28 +02:00
|
|
|
|
msgstr "无法写标签文件"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/tag.c:226
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "bad object type."
|
2012-03-27 08:46:11 +02:00
|
|
|
|
msgstr "坏的对象类型。"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/tag.c:239
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "tag header too big."
|
2015-07-28 06:52:28 +02:00
|
|
|
|
msgstr "标签头信息太大。"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/tag.c:275
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "no tag message?"
|
2015-07-28 06:52:28 +02:00
|
|
|
|
msgstr "无标签说明?"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/tag.c:281
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "The tag message has been left in %s\n"
|
2015-07-28 06:52:28 +02:00
|
|
|
|
msgstr "标签说明被保留在 %s\n"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/tag.c:339
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "list tag names"
|
2015-07-28 06:52:28 +02:00
|
|
|
|
msgstr "列出标签名称"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/tag.c:341
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "print <n> lines of each tag message"
|
2015-07-28 06:52:28 +02:00
|
|
|
|
msgstr "每个标签信息打印 <n> 行"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/tag.c:343
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "delete tags"
|
2015-07-28 06:52:28 +02:00
|
|
|
|
msgstr "删除标签"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/tag.c:344
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "verify tags"
|
2015-07-28 06:52:28 +02:00
|
|
|
|
msgstr "验证标签"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/tag.c:346
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "Tag creation options"
|
2015-07-28 06:52:28 +02:00
|
|
|
|
msgstr "标签创建选项"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/tag.c:348
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "annotated tag, needs a message"
|
2015-07-28 06:52:28 +02:00
|
|
|
|
msgstr "附注标签,需要一个说明"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/tag.c:350
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "tag message"
|
2015-07-28 06:52:28 +02:00
|
|
|
|
msgstr "标签说明"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/tag.c:352
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "annotated and GPG-signed tag"
|
2015-07-28 06:52:28 +02:00
|
|
|
|
msgstr "附注并附加 GPG 签名的标签"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/tag.c:356
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "use another key to sign the tag"
|
2015-07-28 06:52:28 +02:00
|
|
|
|
msgstr "使用另外的私钥签名该标签"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/tag.c:357
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "replace the tag if exists"
|
2015-07-28 06:52:28 +02:00
|
|
|
|
msgstr "如果存在,替换现有的标签"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/tag.c:358 builtin/update-ref.c:368
|
2015-09-15 15:51:26 +02:00
|
|
|
|
msgid "create a reflog"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
msgstr "创建引用日志"
|
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/tag.c:360
|
2015-02-16 14:34:19 +01:00
|
|
|
|
msgid "Tag listing options"
|
2015-07-28 06:52:28 +02:00
|
|
|
|
msgstr "标签列表选项"
|
2015-02-16 14:34:19 +01:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/tag.c:361
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "show tag list in columns"
|
2015-07-28 06:52:28 +02:00
|
|
|
|
msgstr "以列的方式显示标签列表"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/tag.c:362 builtin/tag.c:363
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "print only tags that contain the commit"
|
2015-07-28 06:52:28 +02:00
|
|
|
|
msgstr "只打印包含提交的标签"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/tag.c:364
|
|
|
|
|
msgid "print only tags that are merged"
|
|
|
|
|
msgstr "只打印已经合并的标签"
|
|
|
|
|
|
|
|
|
|
#: builtin/tag.c:365
|
|
|
|
|
msgid "print only tags that are not merged"
|
|
|
|
|
msgstr "只打印尚未合并的标签"
|
|
|
|
|
|
|
|
|
|
#: builtin/tag.c:370
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "print only tags of the object"
|
2015-07-28 06:52:28 +02:00
|
|
|
|
msgstr "只打印对象的标签"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/tag.c:399
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "--column and -n are incompatible"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "--column 和 -n 不兼容"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/tag.c:419
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "-n option is only allowed with -l."
|
2012-08-02 05:50:59 +02:00
|
|
|
|
msgstr "-n 选项只允许和 -l 同时使用。"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/tag.c:421
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "--contains option is only allowed with -l."
|
2012-08-02 05:50:59 +02:00
|
|
|
|
msgstr "--contains 选项只允许和 -l 同时使用。"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/tag.c:423
|
2012-02-28 05:24:54 +01:00
|
|
|
|
msgid "--points-at option is only allowed with -l."
|
2012-08-02 05:50:59 +02:00
|
|
|
|
msgstr "--points-at 选项只允许和 -l 同时使用。"
|
2012-02-28 05:24:54 +01:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/tag.c:425
|
|
|
|
|
msgid "--merged and --no-merged option are only allowed with -l"
|
|
|
|
|
msgstr "选项 --merged 和 --no-merged 只能和 -l 共用"
|
|
|
|
|
|
|
|
|
|
#: builtin/tag.c:433
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "only one -F or -m option is allowed."
|
|
|
|
|
msgstr "只允许一个 -F 或 -m 选项。"
|
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/tag.c:452
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "too many params"
|
|
|
|
|
msgstr "太多参数"
|
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/tag.c:458
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "'%s' is not a valid tag name."
|
2015-07-28 06:52:28 +02:00
|
|
|
|
msgstr "'%s' 不是一个有效的标签名称。"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/tag.c:463
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "tag '%s' already exists"
|
2015-07-28 06:52:28 +02:00
|
|
|
|
msgstr "标签 '%s' 已存在"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/tag.c:491
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Updated tag '%s' (was %s)\n"
|
2015-07-28 06:52:28 +02:00
|
|
|
|
msgstr "已更新标签 '%s'(曾为 %s)\n"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/unpack-objects.c:493
|
2014-03-13 05:41:34 +01:00
|
|
|
|
msgid "Unpacking objects"
|
|
|
|
|
msgstr "展开对象中"
|
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/update-index.c:79
|
2015-05-31 02:42:31 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to create directory %s"
|
|
|
|
|
msgstr "无法创建目录 %s"
|
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/update-index.c:85
|
2015-05-31 02:42:31 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to stat %s"
|
|
|
|
|
msgstr "无法枚举 %s 状态"
|
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/update-index.c:95
|
2015-05-31 02:42:31 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to create file %s"
|
|
|
|
|
msgstr "无法创建文件 %s"
|
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/update-index.c:103
|
2015-05-31 02:42:31 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to delete file %s"
|
|
|
|
|
msgstr "无法删除文件 %s"
|
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/update-index.c:110 builtin/update-index.c:212
|
2015-05-31 02:42:31 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to delete directory %s"
|
|
|
|
|
msgstr "无法删除目录 %s"
|
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/update-index.c:133
|
2015-05-31 02:42:31 +02:00
|
|
|
|
#, c-format
|
2016-02-28 13:35:55 +01:00
|
|
|
|
msgid "Testing mtime in '%s' "
|
|
|
|
|
msgstr "在 '%s' 中测试 mtime "
|
2015-05-31 02:42:31 +02:00
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/update-index.c:145
|
2015-05-31 02:42:31 +02:00
|
|
|
|
msgid "directory stat info does not change after adding a new file"
|
|
|
|
|
msgstr "添加一个新文件后,目录的状态信息未改变"
|
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/update-index.c:158
|
2015-05-31 02:42:31 +02:00
|
|
|
|
msgid "directory stat info does not change after adding a new directory"
|
|
|
|
|
msgstr "添加一个新目录后,目录的状态信息未改变"
|
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/update-index.c:171
|
2015-05-31 02:42:31 +02:00
|
|
|
|
msgid "directory stat info changes after updating a file"
|
|
|
|
|
msgstr "更新一个文件后,目录的状态信息被修改"
|
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/update-index.c:182
|
2015-05-31 02:42:31 +02:00
|
|
|
|
msgid "directory stat info changes after adding a file inside subdirectory"
|
|
|
|
|
msgstr "在子目录中添加文件后,目录的状态信息被修改"
|
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/update-index.c:193
|
2015-05-31 02:42:31 +02:00
|
|
|
|
msgid "directory stat info does not change after deleting a file"
|
|
|
|
|
msgstr "删除一个文件后,目录的状态信息未改变"
|
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/update-index.c:206
|
2015-05-31 02:42:31 +02:00
|
|
|
|
msgid "directory stat info does not change after deleting a directory"
|
|
|
|
|
msgstr "删除一个目录后,目录的状态信息未改变"
|
|
|
|
|
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#: builtin/update-index.c:213
|
2015-05-31 02:42:31 +02:00
|
|
|
|
msgid " OK"
|
|
|
|
|
msgstr " OK"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/update-index.c:564
|
2015-02-16 14:34:19 +01:00
|
|
|
|
msgid "git update-index [<options>] [--] [<file>...]"
|
|
|
|
|
msgstr "git update-index [<选项>] [--] [<文件>...]"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/update-index.c:919
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "continue refresh even when index needs update"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "当索引需要更新时继续刷新"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/update-index.c:922
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "refresh: ignore submodules"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "刷新:忽略子模组"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/update-index.c:925
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "do not ignore new files"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "不忽略新的文件"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/update-index.c:927
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "let files replace directories and vice-versa"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "让文件替换目录(反之亦然)"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/update-index.c:929
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "notice files missing from worktree"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "通知文件从工作区丢失"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/update-index.c:931
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "refresh even if index contains unmerged entries"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "即使索引区包含未合并的条目也执行刷新"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/update-index.c:934
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "refresh stat information"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "刷新统计信息"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/update-index.c:938
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "like --refresh, but ignore assume-unchanged setting"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "类似于 --refresh,但是忽略 assume-unchanged 设置"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/update-index.c:942
|
2014-03-13 05:41:34 +01:00
|
|
|
|
msgid "<mode>,<object>,<path>"
|
2015-01-18 13:37:57 +01:00
|
|
|
|
msgstr "<存取模式>,<对象>,<路径>"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/update-index.c:943
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "add the specified entry to the index"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "添加指定的条目到索引区"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/update-index.c:952
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "mark files as \"not changing\""
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "把文件标记为 \"没有变更\""
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/update-index.c:955
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "clear assumed-unchanged bit"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "清除 assumed-unchanged 位"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/update-index.c:958
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "mark files as \"index-only\""
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "把文件标记为 \"仅索引\""
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/update-index.c:961
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "clear skip-worktree bit"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "清除 skip-worktree 位"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/update-index.c:964
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "add to index only; do not add content to object database"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "只添加到索引区;不添加对象到对象库"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/update-index.c:966
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "remove named paths even if present in worktree"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "即使存在工作区里,也删除路径"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/update-index.c:968
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "with --stdin: input lines are terminated by null bytes"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "携带 --stdin:输入的行以 null 字符终止"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/update-index.c:970
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "read list of paths to be updated from standard input"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "从标准输入中读取需要更新的路径列表"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/update-index.c:974
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "add entries from standard input to the index"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "从标准输入添加条目到索引区"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/update-index.c:978
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "repopulate stages #2 and #3 for the listed paths"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "为指定文件重新生成第2和第3暂存区"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/update-index.c:982
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "only update entries that differ from HEAD"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "只更新与 HEAD 不同的条目"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/update-index.c:986
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "ignore files missing from worktree"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "忽略工作区丢失的文件"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/update-index.c:989
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "report actions to standard output"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "在标准输出显示操作"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/update-index.c:991
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "(for porcelains) forget saved unresolved conflicts"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "(for porcelains) 忘记保存的未解决的冲突"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/update-index.c:995
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "write index in this format"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "以这种格式写入索引区"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/update-index.c:997
|
2014-08-04 10:23:15 +02:00
|
|
|
|
msgid "enable or disable split index"
|
|
|
|
|
msgstr "启用或禁用索引拆分"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/update-index.c:999
|
2015-05-31 02:42:31 +02:00
|
|
|
|
msgid "enable/disable untracked cache"
|
|
|
|
|
msgstr "启用/禁用对未跟踪文件的缓存"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/update-index.c:1001
|
2016-02-28 13:35:55 +01:00
|
|
|
|
msgid "test if the filesystem supports untracked cache"
|
|
|
|
|
msgstr "测试文件系统是否支持未跟踪文件缓存"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/update-index.c:1003
|
2015-05-31 02:42:31 +02:00
|
|
|
|
msgid "enable untracked cache without testing the filesystem"
|
|
|
|
|
msgstr "无需检测文件系统,启用对未跟踪文件的缓存"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/update-index.c:1119
|
|
|
|
|
msgid ""
|
|
|
|
|
"core.untrackedCache is set to true; remove or change it, if you really want "
|
|
|
|
|
"to disable the untracked cache"
|
2016-11-22 15:24:59 +01:00
|
|
|
|
msgstr ""
|
|
|
|
|
"core.untrackedCache 被设置为 true。如果您确实要禁用未跟踪文件缓存,请删除或修"
|
|
|
|
|
"改它。"
|
2016-10-27 15:53:37 +02:00
|
|
|
|
|
|
|
|
|
#: builtin/update-index.c:1123
|
2016-02-28 13:35:55 +01:00
|
|
|
|
msgid "Untracked cache disabled"
|
|
|
|
|
msgstr "缓存未跟踪文件被禁用"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: builtin/update-index.c:1131
|
|
|
|
|
msgid ""
|
|
|
|
|
"core.untrackedCache is set to false; remove or change it, if you really want "
|
|
|
|
|
"to enable the untracked cache"
|
2016-11-22 15:24:59 +01:00
|
|
|
|
msgstr ""
|
|
|
|
|
"core.untrackedCache 被设置为 false。如果您确实要启用未跟踪文件缓存,请删除或"
|
|
|
|
|
"修改它。"
|
2016-10-27 15:53:37 +02:00
|
|
|
|
|
|
|
|
|
#: builtin/update-index.c:1135
|
2016-02-28 13:35:55 +01:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Untracked cache enabled for '%s'"
|
|
|
|
|
msgstr "缓存未跟踪文件在 '%s' 启用"
|
|
|
|
|
|
2013-09-17 17:37:05 +02:00
|
|
|
|
#: builtin/update-ref.c:9
|
2015-02-16 14:34:19 +01:00
|
|
|
|
msgid "git update-ref [<options>] -d <refname> [<old-val>]"
|
|
|
|
|
msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2013-09-17 17:37:05 +02:00
|
|
|
|
#: builtin/update-ref.c:10
|
2015-02-16 14:34:19 +01:00
|
|
|
|
msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
|
|
|
|
|
msgstr "git update-ref [<选项>] <引用名> <新值> [<旧值>]"
|
2013-09-17 17:37:05 +02:00
|
|
|
|
|
|
|
|
|
#: builtin/update-ref.c:11
|
2015-02-16 14:34:19 +01:00
|
|
|
|
msgid "git update-ref [<options>] --stdin [-z]"
|
|
|
|
|
msgstr "git update-ref [<选项>] --stdin [-z]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: builtin/update-ref.c:363
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "delete the reference"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "删除引用"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: builtin/update-ref.c:365
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "update <refname> not the one it points to"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "更新 <引用名> 本身而不是它指向的引用"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: builtin/update-ref.c:366
|
2013-09-17 17:37:05 +02:00
|
|
|
|
msgid "stdin has NUL-terminated arguments"
|
|
|
|
|
msgstr "标准输入有以 NUL 字符终止的参数"
|
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: builtin/update-ref.c:367
|
2013-09-17 17:37:05 +02:00
|
|
|
|
msgid "read updates from stdin"
|
|
|
|
|
msgstr "从标准输入读取更新"
|
|
|
|
|
|
2012-09-15 05:17:00 +02:00
|
|
|
|
#: builtin/update-server-info.c:6
|
|
|
|
|
msgid "git update-server-info [--force]"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "git update-server-info [--force]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
|
|
|
|
#: builtin/update-server-info.c:14
|
|
|
|
|
msgid "update the info files from scratch"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "从头开始更新文件信息"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2014-08-04 10:23:15 +02:00
|
|
|
|
#: builtin/verify-commit.c:17
|
2015-02-16 14:34:19 +01:00
|
|
|
|
msgid "git verify-commit [-v | --verbose] <commit>..."
|
|
|
|
|
msgstr "git verify-commit [-v | --verbose] <提交>..."
|
2014-08-04 10:23:15 +02:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: builtin/verify-commit.c:72
|
2014-08-04 10:23:15 +02:00
|
|
|
|
msgid "print commit contents"
|
|
|
|
|
msgstr "打印提交内容"
|
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/verify-commit.c:73 builtin/verify-tag.c:35
|
2015-08-23 09:23:21 +02:00
|
|
|
|
msgid "print raw gpg status output"
|
|
|
|
|
msgstr "打印原始 gpg 状态输出"
|
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/verify-pack.c:54
|
2015-02-16 14:34:19 +01:00
|
|
|
|
msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
|
|
|
|
|
msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..."
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/verify-pack.c:64
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "verbose"
|
|
|
|
|
msgstr "冗长输出"
|
|
|
|
|
|
2014-10-08 04:55:14 +02:00
|
|
|
|
#: builtin/verify-pack.c:66
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "show statistics only"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "只显示统计"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
|
|
|
|
#: builtin/verify-tag.c:17
|
2015-02-16 14:34:19 +01:00
|
|
|
|
msgid "git verify-tag [-v | --verbose] <tag>..."
|
|
|
|
|
msgstr "git verify-tag [-v | --verbose] <标签>..."
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: builtin/verify-tag.c:34
|
2012-09-15 05:17:00 +02:00
|
|
|
|
msgid "print tag contents"
|
2015-07-28 06:52:28 +02:00
|
|
|
|
msgstr "打印标签内容"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/worktree.c:15
|
|
|
|
|
msgid "git worktree add [<options>] <path> [<branch>]"
|
|
|
|
|
msgstr "git worktree add [<选项>] <路径> [<分支>]"
|
2015-07-14 01:33:09 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: builtin/worktree.c:16
|
2016-08-28 04:18:12 +02:00
|
|
|
|
msgid "git worktree list [<options>]"
|
|
|
|
|
msgstr "git worktree list [<选项>]"
|
|
|
|
|
|
|
|
|
|
#: builtin/worktree.c:17
|
|
|
|
|
msgid "git worktree lock [<options>] <path>"
|
|
|
|
|
msgstr "git worktree lock [<选项>] <路径>"
|
|
|
|
|
|
|
|
|
|
#: builtin/worktree.c:18
|
2015-07-14 01:33:09 +02:00
|
|
|
|
msgid "git worktree prune [<options>]"
|
|
|
|
|
msgstr "git worktree prune [<选项>]"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/worktree.c:19
|
|
|
|
|
msgid "git worktree unlock <path>"
|
|
|
|
|
msgstr "git worktree unlock <路径>"
|
2015-11-16 00:02:11 +01:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/worktree.c:42
|
2015-07-14 01:33:09 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Removing worktrees/%s: not a valid directory"
|
|
|
|
|
msgstr "删除工作区/%s:不是一个有效的目录"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/worktree.c:48
|
2015-07-14 01:33:09 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Removing worktrees/%s: gitdir file does not exist"
|
|
|
|
|
msgstr "删除 worktrees/%s:gitdir 文件不存在"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/worktree.c:53
|
2015-07-14 01:33:09 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
|
|
|
|
|
msgstr "删除 worktrees/%s:无法读取 gitdir 文件 (%s)"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/worktree.c:64
|
2015-07-14 01:33:09 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Removing worktrees/%s: invalid gitdir file"
|
|
|
|
|
msgstr "删除 worktrees/%s:无效的 gitdir 文件"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/worktree.c:80
|
2015-07-14 01:33:09 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
|
|
|
|
|
msgstr "删除 worktrees/%s:gitdir 文件的指向不存在"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/worktree.c:204
|
2015-07-14 01:33:09 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "'%s' already exists"
|
|
|
|
|
msgstr "'%s' 已经存在"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/worktree.c:236
|
2015-07-14 01:33:09 +02:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "could not create directory of '%s'"
|
|
|
|
|
msgstr "不能创建目录 '%s'"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/worktree.c:272
|
2015-07-14 01:33:09 +02:00
|
|
|
|
#, c-format
|
2015-08-23 09:23:21 +02:00
|
|
|
|
msgid "Preparing %s (identifier %s)"
|
|
|
|
|
msgstr "准备 %s (标识符 %s)"
|
2015-07-14 01:33:09 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/worktree.c:323
|
2015-07-14 01:33:09 +02:00
|
|
|
|
msgid "checkout <branch> even if already checked out in other worktree"
|
|
|
|
|
msgstr "检出分支 <branch> 即使已经被检出到其它工作区"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/worktree.c:325
|
2015-07-14 01:33:09 +02:00
|
|
|
|
msgid "create a new branch"
|
|
|
|
|
msgstr "创建一个新分支"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/worktree.c:327
|
2015-07-14 01:33:09 +02:00
|
|
|
|
msgid "create or reset a branch"
|
|
|
|
|
msgstr "创建或重置一个分支"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/worktree.c:329
|
2016-05-29 14:40:35 +02:00
|
|
|
|
msgid "populate the new working tree"
|
|
|
|
|
msgstr "生成新的工作区"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/worktree.c:337
|
2015-08-23 09:23:21 +02:00
|
|
|
|
msgid "-b, -B, and --detach are mutually exclusive"
|
|
|
|
|
msgstr "-b、-B 和 --detach 是互斥的"
|
2015-07-14 01:33:09 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: builtin/worktree.c:470
|
|
|
|
|
msgid "reason for locking"
|
|
|
|
|
msgstr "锁定原因"
|
|
|
|
|
|
|
|
|
|
#: builtin/worktree.c:482 builtin/worktree.c:515
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "'%s' is not a working tree"
|
|
|
|
|
msgstr "'%s' 不是一个工作区"
|
|
|
|
|
|
|
|
|
|
#: builtin/worktree.c:484 builtin/worktree.c:517
|
|
|
|
|
msgid "The main working tree cannot be locked or unlocked"
|
|
|
|
|
msgstr "主工作区无法被加锁或解锁"
|
|
|
|
|
|
|
|
|
|
#: builtin/worktree.c:489
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "'%s' is already locked, reason: %s"
|
|
|
|
|
msgstr "'%s' 已被锁定,原因:%s"
|
|
|
|
|
|
|
|
|
|
#: builtin/worktree.c:491
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "'%s' is already locked"
|
|
|
|
|
msgstr "'%s' 已被锁定"
|
|
|
|
|
|
|
|
|
|
#: builtin/worktree.c:519
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "'%s' is not locked"
|
|
|
|
|
msgstr "'%s' 未被锁定"
|
|
|
|
|
|
2012-09-15 05:17:00 +02:00
|
|
|
|
#: builtin/write-tree.c:13
|
|
|
|
|
msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
|
|
|
|
#: builtin/write-tree.c:26
|
|
|
|
|
msgid "<prefix>/"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "<前缀>/"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
|
|
|
|
#: builtin/write-tree.c:27
|
|
|
|
|
msgid "write tree object for a subdirectory <prefix>"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "将 <前缀> 子目录内容写到一个树对象"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
|
|
|
|
#: builtin/write-tree.c:30
|
|
|
|
|
msgid "only useful for debugging"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgstr "只对调试有用"
|
2012-09-15 05:17:00 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: upload-pack.c:22
|
2016-08-28 04:18:12 +02:00
|
|
|
|
msgid "git upload-pack [<options>] <dir>"
|
|
|
|
|
msgstr "git upload-pack [<选项>] <目录>"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: upload-pack.c:1028
|
2016-08-28 04:18:12 +02:00
|
|
|
|
msgid "quit after a single request/response exchange"
|
|
|
|
|
msgstr "在一次单独的请求/响应(request/response)交换后退出"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: upload-pack.c:1030
|
2016-08-28 04:18:12 +02:00
|
|
|
|
msgid "exit immediately after initial ref advertisement"
|
|
|
|
|
msgstr "在初始的引用广告后立即退出"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: upload-pack.c:1032
|
2016-08-28 04:18:12 +02:00
|
|
|
|
msgid "do not try <directory>/.git/ if <directory> is no Git directory"
|
|
|
|
|
msgstr "不要尝试 <directory>/.git/ 如果 <directory> 不是一个 Git 目录"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: upload-pack.c:1034
|
2016-08-28 04:18:12 +02:00
|
|
|
|
msgid "interrupt transfer after <n> seconds of inactivity"
|
|
|
|
|
msgstr "不活动 <n> 秒钟后终止传输"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: credential-cache--daemon.c:223
|
|
|
|
|
#, 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"
|
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: credential-cache--daemon.c:271
|
2014-10-08 04:55:14 +02:00
|
|
|
|
msgid "print debugging messages to stderr"
|
|
|
|
|
msgstr "调试信息输出到标准错误"
|
|
|
|
|
|
2015-01-18 13:37:57 +01:00
|
|
|
|
#: git.c:14
|
2013-04-13 04:02:43 +02:00
|
|
|
|
msgid ""
|
2014-10-08 04:55:14 +02:00
|
|
|
|
"'git help -a' and 'git help -g' list available subcommands and some\n"
|
2013-04-13 04:02:43 +02:00
|
|
|
|
"concept guides. See 'git help <command>' or 'git help <concept>'\n"
|
|
|
|
|
"to read about a specific subcommand or concept."
|
|
|
|
|
msgstr ""
|
2014-10-08 04:55:14 +02:00
|
|
|
|
"命令 'git help -a' 和 'git help -g' 显示可用的子命令和一些概念帮助。\n"
|
|
|
|
|
"查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n"
|
|
|
|
|
"帮助。"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: http.c:342
|
|
|
|
|
msgid "Delegation control is not supported with cURL < 7.22.0"
|
|
|
|
|
msgstr "当 cURL < 7.22.0 时,不支持委托控制"
|
|
|
|
|
|
|
|
|
|
#: http.c:351
|
2016-02-28 13:35:55 +01:00
|
|
|
|
msgid "Public key pinning not supported with cURL < 7.44.0"
|
|
|
|
|
msgstr "不支持公钥文件锁定,因为 cURL < 7.44.0"
|
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: common-cmds.h:9
|
2015-05-31 02:42:31 +02:00
|
|
|
|
msgid "start a working area (see also: git help tutorial)"
|
|
|
|
|
msgstr "开始一个工作区(参见:git help tutorial)"
|
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: common-cmds.h:10
|
2015-05-31 02:42:31 +02:00
|
|
|
|
msgid "work on the current change (see also: git help everyday)"
|
|
|
|
|
msgstr "在当前变更上工作(参见:git help everyday)"
|
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: common-cmds.h:11
|
2015-05-31 02:42:31 +02:00
|
|
|
|
msgid "examine the history and state (see also: git help revisions)"
|
|
|
|
|
msgstr "检查历史和状态(参见:git help revisions)"
|
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: common-cmds.h:12
|
2015-05-31 02:42:31 +02:00
|
|
|
|
msgid "grow, mark and tweak your common history"
|
|
|
|
|
msgstr "扩展、标记和调校您的历史记录"
|
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: common-cmds.h:13
|
2015-05-31 02:42:31 +02:00
|
|
|
|
msgid "collaborate (see also: git help workflows)"
|
|
|
|
|
msgstr "协同(参见:git help workflows)"
|
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: common-cmds.h:17
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "Add file contents to the index"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "添加文件内容至索引"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: common-cmds.h:18
|
|
|
|
|
msgid "Use binary search to find the commit that introduced a bug"
|
|
|
|
|
msgstr "通过二分查找定位引入 bug 的提交"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: common-cmds.h:19
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "List, create, or delete branches"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "列出、创建或删除分支"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: common-cmds.h:20
|
2015-07-14 01:33:09 +02:00
|
|
|
|
msgid "Switch branches or restore working tree files"
|
|
|
|
|
msgstr "切换分支或恢复工作区文件"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: common-cmds.h:21
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "Clone a repository into a new directory"
|
2015-08-02 15:47:30 +02:00
|
|
|
|
msgstr "克隆一个仓库到一个新目录"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: common-cmds.h:22
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "Record changes to the repository"
|
2015-08-02 15:47:30 +02:00
|
|
|
|
msgstr "记录变更到仓库"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: common-cmds.h:23
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "Show changes between commits, commit and working tree, etc"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "显示提交之间、提交和工作区之间等的差异"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: common-cmds.h:24
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "Download objects and refs from another repository"
|
2015-08-02 15:47:30 +02:00
|
|
|
|
msgstr "从另外一个仓库下载对象和引用"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: common-cmds.h:25
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "Print lines matching a pattern"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "输出和模式匹配的行"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: common-cmds.h:26
|
2013-02-14 10:47:45 +01:00
|
|
|
|
msgid "Create an empty Git repository or reinitialize an existing one"
|
2015-08-02 15:47:30 +02:00
|
|
|
|
msgstr "创建一个空的 Git 仓库或重新初始化一个已存在的仓库"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: common-cmds.h:27
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "Show commit logs"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "显示提交日志"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: common-cmds.h:28
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "Join two or more development histories together"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "合并两个或更多开发历史"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: common-cmds.h:29
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "Move or rename a file, a directory, or a symlink"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "移动或重命名一个文件、目录或符号链接"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: common-cmds.h:30
|
2013-07-26 08:00:02 +02:00
|
|
|
|
msgid "Fetch from and integrate with another repository or a local branch"
|
2015-08-02 15:47:30 +02:00
|
|
|
|
msgstr "获取并整合另外的仓库或一个本地分支"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: common-cmds.h:31
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "Update remote refs along with associated objects"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "更新远程引用和相关的对象"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: common-cmds.h:32
|
2016-03-12 15:09:24 +01:00
|
|
|
|
msgid "Reapply commits on top of another base tip"
|
|
|
|
|
msgstr "在另一个分支上重新应用提交"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: common-cmds.h:33
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "Reset current HEAD to the specified state"
|
2015-08-10 12:03:29 +02:00
|
|
|
|
msgstr "重置当前 HEAD 到指定状态"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: common-cmds.h:34
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "Remove files from the working tree and from the index"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "从工作区和索引中删除文件"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: common-cmds.h:35
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "Show various types of objects"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "显示各种类型的对象"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: common-cmds.h:36
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "Show the working tree status"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "显示工作区状态"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: common-cmds.h:37
|
2012-05-21 03:35:47 +02:00
|
|
|
|
msgid "Create, list, delete or verify a tag object signed with GPG"
|
2015-08-10 12:03:29 +02:00
|
|
|
|
msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象"
|
2012-05-21 03:35:47 +02:00
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: parse-options.h:145
|
2014-10-08 04:55:14 +02:00
|
|
|
|
msgid "expiry-date"
|
|
|
|
|
msgstr "到期时间"
|
|
|
|
|
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#: parse-options.h:160
|
2014-10-08 04:55:14 +02:00
|
|
|
|
msgid "no-op (backward compatibility)"
|
|
|
|
|
msgstr "空操作(向后兼容)"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: parse-options.h:238
|
2014-10-08 04:55:14 +02:00
|
|
|
|
msgid "be more verbose"
|
|
|
|
|
msgstr "更加详细"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: parse-options.h:240
|
2014-10-08 04:55:14 +02:00
|
|
|
|
msgid "be more quiet"
|
|
|
|
|
msgstr "更加安静"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: parse-options.h:246
|
2014-10-08 04:55:14 +02:00
|
|
|
|
msgid "use <n> digits to display SHA-1s"
|
|
|
|
|
msgstr "用 <n> 位数字显示 SHA-1 哈希值"
|
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: rerere.h:40
|
2014-10-08 04:55:14 +02:00
|
|
|
|
msgid "update the index with reused conflict resolution if possible"
|
|
|
|
|
msgstr "如果可能,重用冲突解决更新索引"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: git-bisect.sh:54
|
2012-06-08 06:07:25 +02:00
|
|
|
|
msgid "You need to start by \"git bisect start\""
|
|
|
|
|
msgstr "您需要执行 \"git bisect start\" 来开始"
|
|
|
|
|
|
2012-03-27 08:46:11 +02:00
|
|
|
|
# 译者:注意保持句尾空格
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#. TRANSLATORS: Make sure to include [Y] and [n] in your
|
|
|
|
|
#. translation. The program will only accept English input
|
|
|
|
|
#. at this point.
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: git-bisect.sh:60
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "Do you want me to do it for you [Y/n]? "
|
|
|
|
|
msgstr "您想让我为您这样做么[Y/n]? "
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: git-bisect.sh:121
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "unrecognised option: '$arg'"
|
2012-05-30 06:19:47 +02:00
|
|
|
|
msgstr "未能识别的选项:'$arg'"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: git-bisect.sh:125
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "'$arg' does not appear to be a valid revision"
|
|
|
|
|
msgstr "'$arg' 看起来不像是一个有效的版本"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: git-bisect.sh:154
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "Bad HEAD - I need a HEAD"
|
|
|
|
|
msgstr "坏的 HEAD - 我需要一个 HEAD"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: git-bisect.sh:167
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, sh-format
|
|
|
|
|
msgid ""
|
2015-02-16 14:34:19 +01:00
|
|
|
|
"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
|
2015-01-18 13:37:57 +01:00
|
|
|
|
msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <有效分支>'。"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: git-bisect.sh:177
|
2014-01-18 04:04:21 +01:00
|
|
|
|
msgid "won't bisect on cg-seek'ed tree"
|
|
|
|
|
msgstr "不会在做了 cg-seek 的树上做二分查找"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: git-bisect.sh:181
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "Bad HEAD - strange symbolic ref"
|
2012-03-27 08:46:11 +02:00
|
|
|
|
msgstr "坏的 HEAD - 奇怪的符号引用"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: git-bisect.sh:233
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Bad bisect_write argument: $state"
|
2012-03-27 08:46:11 +02:00
|
|
|
|
msgstr "坏的 bisect_write 参数:$state"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: git-bisect.sh:262
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Bad rev input: $arg"
|
2016-09-07 12:03:04 +02:00
|
|
|
|
msgstr "坏的输入版本:$arg"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: git-bisect.sh:281
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Bad rev input: $bisected_head"
|
2016-09-07 12:03:04 +02:00
|
|
|
|
msgstr "坏的输入版本:$bisected_head"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: git-bisect.sh:290
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Bad rev input: $rev"
|
2016-09-07 12:03:04 +02:00
|
|
|
|
msgstr "坏的输入版本:$rev"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: git-bisect.sh:299
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "'git bisect $TERM_BAD' can take only one argument."
|
|
|
|
|
msgstr "'git bisect $TERM_BAD' 只能带一个参数。"
|
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: git-bisect.sh:322
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Warning: bisecting only with a $TERM_BAD commit."
|
|
|
|
|
msgstr "警告:在仅有一个坏($TERM_BAD)提交下进行二分查找。"
|
2012-06-08 06:07:25 +02:00
|
|
|
|
|
2012-03-27 08:46:11 +02:00
|
|
|
|
# 译者:注意保持句尾空格
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#. TRANSLATORS: Make sure to include [Y] and [n] in your
|
|
|
|
|
#. translation. The program will only accept English input
|
|
|
|
|
#. at this point.
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: git-bisect.sh:328
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "Are you sure [Y/n]? "
|
|
|
|
|
msgstr "您确认么[Y/n]? "
|
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: git-bisect.sh:340
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#, sh-format
|
2012-06-08 06:07:25 +02:00
|
|
|
|
msgid ""
|
2015-08-23 09:23:21 +02:00
|
|
|
|
"You need to give me at least one $bad_syn and one $good_syn revision.\n"
|
|
|
|
|
"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
|
2012-06-08 06:07:25 +02:00
|
|
|
|
msgstr ""
|
|
|
|
|
"您需要给我至少一个好版本和一个坏版本。\n"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
"(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)"
|
2012-06-08 06:07:25 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: git-bisect.sh:343
|
2015-08-23 09:23:21 +02:00
|
|
|
|
#, sh-format
|
2012-06-08 06:07:25 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"You need to start by \"git bisect start\".\n"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
"You then need to give me at least one $good_syn and one $bad_syn revision.\n"
|
|
|
|
|
"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
|
2012-06-08 06:07:25 +02:00
|
|
|
|
msgstr ""
|
|
|
|
|
"您需要执行 \"git bisect start\" 来开始。\n"
|
|
|
|
|
"然后需要提供我至少一个好版本和一个坏版本。\n"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
"(为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。)"
|
2012-06-08 06:07:25 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: git-bisect.sh:414 git-bisect.sh:546
|
2012-06-08 06:07:25 +02:00
|
|
|
|
msgid "We are not bisecting."
|
|
|
|
|
msgstr "我们没有在二分查找。"
|
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: git-bisect.sh:421
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "'$invalid' is not a valid commit"
|
|
|
|
|
msgstr "'$invalid' 不是一个有效的提交"
|
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: git-bisect.sh:430
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, sh-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Could not check out original HEAD '$branch'.\n"
|
|
|
|
|
"Try 'git bisect reset <commit>'."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"不能检出原始 HEAD '$branch'。\n"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
"尝试 'git bisect reset <提交>'。"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: git-bisect.sh:458
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "No logfile given"
|
|
|
|
|
msgstr "未提供日志文件"
|
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: git-bisect.sh:459
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "cannot read $file for replaying"
|
|
|
|
|
msgstr "不能读取 $file 来重放"
|
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: git-bisect.sh:480
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "?? what are you talking about?"
|
|
|
|
|
msgstr "?? 您在说什么?"
|
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: git-bisect.sh:492
|
2012-06-08 06:07:25 +02:00
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "running $command"
|
|
|
|
|
msgstr "运行 $command"
|
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: git-bisect.sh:499
|
2012-06-08 06:07:25 +02:00
|
|
|
|
#, sh-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"bisect run failed:\n"
|
|
|
|
|
"exit code $res from '$command' is < 0 or >= 128"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"二分查找运行失败:\n"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
"命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
|
2012-06-08 06:07:25 +02:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: git-bisect.sh:525
|
2012-06-08 06:07:25 +02:00
|
|
|
|
msgid "bisect run cannot continue any more"
|
|
|
|
|
msgstr "二分查找不能继续运行"
|
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: git-bisect.sh:531
|
2012-06-08 06:07:25 +02:00
|
|
|
|
#, sh-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"bisect run failed:\n"
|
|
|
|
|
"'bisect_state $state' exited with error code $res"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"二分查找运行失败:\n"
|
|
|
|
|
"'bisect_state $state' 退出码为 $res"
|
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: git-bisect.sh:538
|
2012-06-08 06:07:25 +02:00
|
|
|
|
msgid "bisect run success"
|
|
|
|
|
msgstr "二分查找运行成功"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: git-bisect.sh:565
|
|
|
|
|
msgid "please use two different terms"
|
|
|
|
|
msgstr "请使用两个不同的术语"
|
|
|
|
|
|
|
|
|
|
#: git-bisect.sh:575
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "'$term' is not a valid term"
|
|
|
|
|
msgstr "'$term' 不是一个有效的名称"
|
|
|
|
|
|
|
|
|
|
#: git-bisect.sh:578
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "can't use the builtin command '$term' as a term"
|
|
|
|
|
msgstr "不能使用内置命令 '$term' 作为术语"
|
|
|
|
|
|
|
|
|
|
#: git-bisect.sh:587 git-bisect.sh:593
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "can't change the meaning of term '$term'"
|
|
|
|
|
msgstr "不能修改术语 '$term' 的含义"
|
|
|
|
|
|
|
|
|
|
#: git-bisect.sh:606
|
2012-06-08 06:07:25 +02:00
|
|
|
|
#, sh-format
|
2015-08-23 09:23:21 +02:00
|
|
|
|
msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
|
|
|
|
|
msgstr "无效的命令:您当前正处于一个 $TERM_BAD/$TERM_GOOD 二分查找。"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2015-11-16 00:02:11 +01:00
|
|
|
|
#: git-bisect.sh:636
|
|
|
|
|
msgid "no terms defined"
|
|
|
|
|
msgstr "未定义术语"
|
|
|
|
|
|
|
|
|
|
#: git-bisect.sh:653
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"invalid argument $arg for 'git bisect terms'.\n"
|
|
|
|
|
"Supported options are: --term-good|--term-old and --term-bad|--term-new."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"参数 $arg 对命令 'git bisect terms' 无效。\n"
|
|
|
|
|
"支持的选项有:--term-good|--term-old 和 --term-bad|--term-new。"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: git-merge-octopus.sh:46
|
|
|
|
|
msgid ""
|
|
|
|
|
"Error: Your local changes to the following files would be overwritten by "
|
|
|
|
|
"merge"
|
|
|
|
|
msgstr "错误:您对下列文件的本地修改将被合并操作覆盖"
|
|
|
|
|
|
|
|
|
|
#: git-merge-octopus.sh:61
|
|
|
|
|
msgid "Automated merge did not work."
|
2016-09-07 12:03:04 +02:00
|
|
|
|
msgstr "自动合并未生效。"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
|
|
|
|
#: git-merge-octopus.sh:62
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid "Should not be doing an octopus."
|
2016-08-28 04:18:12 +02:00
|
|
|
|
msgstr "不应该执行章鱼式合并。"
|
|
|
|
|
|
|
|
|
|
#: git-merge-octopus.sh:73
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Unable to find common commit with $pretty_name"
|
|
|
|
|
msgstr "无法找到和 $pretty_name 的基线提交"
|
|
|
|
|
|
|
|
|
|
#: git-merge-octopus.sh:77
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Already up-to-date with $pretty_name"
|
|
|
|
|
msgstr "已经和 $pretty_name 保持一致"
|
|
|
|
|
|
|
|
|
|
#: git-merge-octopus.sh:89
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Fast-forwarding to: $pretty_name"
|
|
|
|
|
msgstr "快进至:$pretty_name"
|
|
|
|
|
|
|
|
|
|
#: git-merge-octopus.sh:97
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Trying simple merge with $pretty_name"
|
|
|
|
|
msgstr "尝试和 $pretty_name 的简单合并"
|
|
|
|
|
|
|
|
|
|
#: git-merge-octopus.sh:102
|
|
|
|
|
msgid "Simple merge did not work, trying automatic merge."
|
2016-09-07 12:03:04 +02:00
|
|
|
|
msgstr "简单合并未生效,尝试自动合并。"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
|
|
|
|
#: git-rebase.sh:56
|
2012-08-02 05:50:59 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"When you have resolved this problem, run \"git rebase --continue\".\n"
|
|
|
|
|
"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
|
|
|
|
|
"To check out the original branch and stop rebasing, run \"git rebase --abort"
|
|
|
|
|
"\"."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"当您解决了此问题后,执行 \"git rebase --continue\"。\n"
|
|
|
|
|
"如果您想跳过此补丁,则执行 \"git rebase --skip\"。\n"
|
|
|
|
|
"要恢复原分支并停止变基,执行 \"git rebase --abort\"。"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: git-rebase.sh:156 git-rebase.sh:395
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Could not move back to $head_name"
|
|
|
|
|
msgstr "无法移回 $head_name"
|
|
|
|
|
|
|
|
|
|
#: git-rebase.sh:167
|
2013-07-26 08:00:02 +02:00
|
|
|
|
msgid "Applied autostash."
|
|
|
|
|
msgstr "成功应用 autostash。"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: git-rebase.sh:170
|
2013-07-26 08:00:02 +02:00
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Cannot store $stash_sha1"
|
|
|
|
|
msgstr "无法保存 $stash_sha1"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: git-rebase.sh:171
|
2013-07-26 08:00:02 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"Applying autostash resulted in conflicts.\n"
|
|
|
|
|
"Your changes are safe in the stash.\n"
|
2013-08-06 08:49:18 +02:00
|
|
|
|
"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
|
2013-07-26 08:00:02 +02:00
|
|
|
|
msgstr ""
|
|
|
|
|
"应用 autostash 导致冲突。\n"
|
|
|
|
|
"您的修改安全地保存在 stash 中。\n"
|
|
|
|
|
"您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: git-rebase.sh:210
|
2012-08-02 05:50:59 +02:00
|
|
|
|
msgid "The pre-rebase hook refused to rebase."
|
2014-02-02 13:46:58 +01:00
|
|
|
|
msgstr "钩子 pre-rebase 拒绝变基操作。"
|
2012-08-02 05:50:59 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: git-rebase.sh:215
|
2012-08-02 05:50:59 +02:00
|
|
|
|
msgid "It looks like git-am is in progress. Cannot rebase."
|
|
|
|
|
msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: git-rebase.sh:356
|
2012-08-02 05:50:59 +02:00
|
|
|
|
msgid "No rebase in progress?"
|
|
|
|
|
msgstr "没有正在进行的变基?"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: git-rebase.sh:367
|
2013-01-30 10:23:08 +01:00
|
|
|
|
msgid "The --edit-todo action can only be used during interactive rebase."
|
|
|
|
|
msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: git-rebase.sh:374
|
2012-08-02 05:50:59 +02:00
|
|
|
|
msgid "Cannot read HEAD"
|
|
|
|
|
msgstr "不能读取 HEAD"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: git-rebase.sh:377
|
2012-08-02 05:50:59 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"You must edit all merge conflicts and then\n"
|
|
|
|
|
"mark them as resolved using git add"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"您必须编辑所有的合并冲突,然后通过 git add\n"
|
|
|
|
|
"命令将它们标记为已解决"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: git-rebase.sh:414
|
2012-08-02 05:50:59 +02:00
|
|
|
|
#, sh-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"It seems that there is already a $state_dir_base directory, and\n"
|
|
|
|
|
"I wonder if you are in the middle of another rebase. If that is the\n"
|
|
|
|
|
"case, please try\n"
|
|
|
|
|
"\t$cmd_live_rebase\n"
|
|
|
|
|
"If that is not the case, please\n"
|
|
|
|
|
"\t$cmd_clear_stale_rebase\n"
|
|
|
|
|
"and run me again. I am stopping in case you still have something\n"
|
|
|
|
|
"valuable there."
|
|
|
|
|
msgstr ""
|
2014-02-02 13:46:58 +01:00
|
|
|
|
"好像已有 $state_dir_base 目录,我怀疑您正处于另外一个变基操作\n"
|
|
|
|
|
"过程中。 如果是这样,请执行\n"
|
2012-08-02 05:50:59 +02:00
|
|
|
|
"\t$cmd_live_rebase\n"
|
|
|
|
|
"如果不是这样,请执行\n"
|
|
|
|
|
"\t$cmd_clear_stale_rebase\n"
|
2014-02-02 13:46:58 +01:00
|
|
|
|
"然后再重新执行变基操作。 为避免丢失重要数据,我已经停止当前操作。"
|
2012-08-02 05:50:59 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: git-rebase.sh:465
|
2012-08-02 05:50:59 +02:00
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "invalid upstream $upstream_name"
|
|
|
|
|
msgstr "无效的上游 $upstream_name"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: git-rebase.sh:489
|
2012-08-02 05:50:59 +02:00
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "$onto_name: there are more than one merge bases"
|
|
|
|
|
msgstr "$onto_name: 有一个以上的合并基准"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: git-rebase.sh:492 git-rebase.sh:496
|
2012-08-02 05:50:59 +02:00
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "$onto_name: there is no merge base"
|
|
|
|
|
msgstr "$onto_name: 没有合并基准"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: git-rebase.sh:501
|
2012-08-02 05:50:59 +02:00
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Does not point to a valid commit: $onto_name"
|
|
|
|
|
msgstr "没有指向一个有效的提交:$onto_name"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: git-rebase.sh:524
|
2012-08-02 05:50:59 +02:00
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "fatal: no such branch: $branch_name"
|
|
|
|
|
msgstr "严重错误:无此分支:$branch_name"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: git-rebase.sh:557
|
2013-07-26 08:00:02 +02:00
|
|
|
|
msgid "Cannot autostash"
|
|
|
|
|
msgstr "无法 autostash"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: git-rebase.sh:562
|
2013-07-26 08:00:02 +02:00
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Created autostash: $stash_abbrev"
|
|
|
|
|
msgstr "创建了 autostash: $stash_abbrev"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: git-rebase.sh:566
|
2012-08-02 05:50:59 +02:00
|
|
|
|
msgid "Please commit or stash them."
|
|
|
|
|
msgstr "请提交或为它们保存进度。"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: git-rebase.sh:586
|
2012-08-02 05:50:59 +02:00
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Current branch $branch_name is up to date."
|
|
|
|
|
msgstr "当前分支 $branch_name 是最新的。"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: git-rebase.sh:590
|
2012-08-02 05:50:59 +02:00
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Current branch $branch_name is up to date, rebase forced."
|
|
|
|
|
msgstr "当前分支 $branch_name 是最新的,强制变基。"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: git-rebase.sh:601
|
2012-08-02 05:50:59 +02:00
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Changes from $mb to $onto:"
|
|
|
|
|
msgstr "变更从 $mb 到 $onto:"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: git-rebase.sh:610
|
2012-08-02 05:50:59 +02:00
|
|
|
|
msgid "First, rewinding head to replay your work on top of it..."
|
2015-08-02 15:47:30 +02:00
|
|
|
|
msgstr "首先,回退分支以便在上面重放您的工作..."
|
2012-08-02 05:50:59 +02:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: git-rebase.sh:620
|
2012-08-02 05:50:59 +02:00
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Fast-forwarded $branch_name to $onto_name."
|
|
|
|
|
msgstr "快进 $branch_name 至 $onto_name。"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: git-stash.sh:50
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "git stash clear with parameters is unimplemented"
|
|
|
|
|
msgstr "git stash clear 不支持参数"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: git-stash.sh:73
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "You do not have the initial commit yet"
|
|
|
|
|
msgstr "您尚未建立初始提交"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: git-stash.sh:88
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "Cannot save the current index state"
|
2012-03-27 08:46:11 +02:00
|
|
|
|
msgstr "无法保存当前索引状态"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-stash.sh:103
|
|
|
|
|
msgid "Cannot save the untracked files"
|
|
|
|
|
msgstr "无法保存未跟踪文件"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: git-stash.sh:123 git-stash.sh:136
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "Cannot save the current worktree state"
|
|
|
|
|
msgstr "无法保存当前工作区状态"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: git-stash.sh:140
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "No changes selected"
|
2012-03-27 08:46:11 +02:00
|
|
|
|
msgstr "没有选择变更"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: git-stash.sh:143
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "Cannot remove temporary index (can't happen)"
|
2012-03-27 08:46:11 +02:00
|
|
|
|
msgstr "无法删除临时索引(不应发生)"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: git-stash.sh:156
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "Cannot record working tree state"
|
|
|
|
|
msgstr "不能记录工作区状态"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: git-stash.sh:188
|
2013-07-26 08:00:02 +02:00
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Cannot update $ref_stash with $w_commit"
|
|
|
|
|
msgstr "无法用 $w_commit 更新 $ref_stash"
|
|
|
|
|
|
2012-06-08 06:07:25 +02:00
|
|
|
|
#. TRANSLATORS: $option is an invalid option, like
|
|
|
|
|
#. `--blah-blah'. The 7 spaces at the beginning of the
|
|
|
|
|
#. second line correspond to "error: ". So you should line
|
|
|
|
|
#. up the second line with however many characters the
|
|
|
|
|
#. translation of "error: " takes in your language. E.g. in
|
|
|
|
|
#. English this is:
|
|
|
|
|
#.
|
|
|
|
|
#. $ git stash save --blah-blah 2>&1 | head -n 2
|
|
|
|
|
#. error: unknown option for 'stash save': --blah-blah
|
|
|
|
|
#. To provide a message, use git stash save -- '--blah-blah'
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: git-stash.sh:238
|
2012-06-08 06:07:25 +02:00
|
|
|
|
#, sh-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"error: unknown option for 'stash save': $option\n"
|
|
|
|
|
" To provide a message, use git stash save -- '$option'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"错误:'stash save' 的未知选项:$option\n"
|
|
|
|
|
" 要提供一个描述信息,使用 git stash save -- '$option'"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-stash.sh:251
|
|
|
|
|
msgid "Can't use --patch and --include-untracked or --all at the same time"
|
|
|
|
|
msgstr "不能同时使用参数 --patch 和 --include-untracked 或 --all"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: git-stash.sh:259
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "No local changes to save"
|
|
|
|
|
msgstr "没有要保存的本地修改"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: git-stash.sh:263
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "Cannot initialize stash"
|
2012-03-27 08:46:11 +02:00
|
|
|
|
msgstr "无法初始化 stash"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: git-stash.sh:267
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "Cannot save the current status"
|
|
|
|
|
msgstr "无法保存当前状态"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: git-stash.sh:268
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Saved working directory and index state $stash_msg"
|
|
|
|
|
msgstr "保存工作目录和索引状态 $stash_msg"
|
|
|
|
|
|
|
|
|
|
#: git-stash.sh:285
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "Cannot remove worktree changes"
|
|
|
|
|
msgstr "无法删除工作区变更"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-stash.sh:403
|
2015-05-31 02:42:31 +02:00
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "unknown option: $opt"
|
|
|
|
|
msgstr "未知选项: $opt"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-stash.sh:416
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "No stash found."
|
2012-03-27 08:46:11 +02:00
|
|
|
|
msgstr "未发现 stash。"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-stash.sh:423
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Too many revisions specified: $REV"
|
2012-03-27 08:46:11 +02:00
|
|
|
|
msgstr "指定了太多的版本:$REV"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-stash.sh:438
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, sh-format
|
2014-10-08 04:55:14 +02:00
|
|
|
|
msgid "$reference is not a valid reference"
|
|
|
|
|
msgstr "$reference 不是一个有效的引用"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-stash.sh:466
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "'$args' is not a stash-like commit"
|
2012-03-27 08:46:11 +02:00
|
|
|
|
msgstr "'$args' 不是 stash 样提交"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-stash.sh:477
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "'$args' is not a stash reference"
|
2012-03-27 08:46:11 +02:00
|
|
|
|
msgstr "'$args' 不是一个 stash 引用"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-stash.sh:485
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "unable to refresh index"
|
2012-03-27 08:46:11 +02:00
|
|
|
|
msgstr "无法刷新索引"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-stash.sh:489
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "Cannot apply a stash in the middle of a merge"
|
|
|
|
|
msgstr "无法在合并过程中恢复进度"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-stash.sh:497
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "Conflicts in index. Try without --index."
|
2012-03-27 08:46:11 +02:00
|
|
|
|
msgstr "索引中有冲突。尝试不使用 --index。"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-stash.sh:499
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "Could not save index tree"
|
2012-03-27 08:46:11 +02:00
|
|
|
|
msgstr "不能保存索引树"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-stash.sh:508
|
|
|
|
|
msgid "Could not restore untracked files from stash"
|
|
|
|
|
msgstr "无法从进度保存中恢复未跟踪文件"
|
|
|
|
|
|
|
|
|
|
#: git-stash.sh:533
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "Cannot unstage modified files"
|
2015-08-02 15:47:30 +02:00
|
|
|
|
msgstr "无法将修改的文件取消暂存"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-stash.sh:548
|
2012-06-08 06:07:25 +02:00
|
|
|
|
msgid "Index was not unstashed."
|
|
|
|
|
msgstr "索引的进度没有被恢复。"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-stash.sh:562
|
2016-08-28 04:18:12 +02:00
|
|
|
|
msgid "The stash is kept in case you need it again."
|
2016-09-07 12:03:04 +02:00
|
|
|
|
msgstr "暂存被保留以备您再次需要。"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-stash.sh:571
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Dropped ${REV} ($s)"
|
|
|
|
|
msgstr "丢弃了 ${REV} ($s)"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-stash.sh:572
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "${REV}: Could not drop stash entry"
|
2012-03-27 08:46:11 +02:00
|
|
|
|
msgstr "${REV}:不能丢弃进度条目"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-stash.sh:580
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "No branch name specified"
|
|
|
|
|
msgstr "未指定分支名"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-stash.sh:652
|
2012-02-13 07:41:59 +01:00
|
|
|
|
msgid "(To restore them type \"git stash apply\")"
|
|
|
|
|
msgstr "(为恢复数据输入 \"git stash apply\")"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-submodule.sh:184
|
2013-07-26 08:00:02 +02:00
|
|
|
|
msgid "Relative path can only be used from the toplevel of the working tree"
|
|
|
|
|
msgstr "只能在工作区的顶级目录中使用相对路径"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-submodule.sh:194
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
|
2015-08-10 12:03:29 +02:00
|
|
|
|
msgstr "仓库 URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-submodule.sh:211
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, sh-format
|
2012-04-29 18:06:55 +02:00
|
|
|
|
msgid "'$sm_path' already exists in the index"
|
|
|
|
|
msgstr "'$sm_path' 已经存在于索引中"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-submodule.sh:215
|
2012-06-08 06:07:25 +02:00
|
|
|
|
#, sh-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"The following path is ignored by one of your .gitignore files:\n"
|
|
|
|
|
"$sm_path\n"
|
|
|
|
|
"Use -f if you really want to add it."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"以下路径被您的一个 .gitignore 文件所忽略:\n"
|
|
|
|
|
"$sm_path\n"
|
|
|
|
|
"如果您确实想添加它,使用 -f 参数。"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-submodule.sh:233
|
2012-06-08 06:07:25 +02:00
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Adding existing repo at '$sm_path' to the index"
|
2015-08-02 15:47:30 +02:00
|
|
|
|
msgstr "添加位于 '$sm_path' 的现存仓库到索引"
|
2012-06-08 06:07:25 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-submodule.sh:235
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, sh-format
|
2012-04-29 18:06:55 +02:00
|
|
|
|
msgid "'$sm_path' already exists and is not a valid git repo"
|
2015-08-02 15:47:30 +02:00
|
|
|
|
msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-submodule.sh:243
|
2013-01-30 10:23:08 +01:00
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "A git directory for '$sm_name' is found locally with remote(s):"
|
2015-08-02 15:47:30 +02:00
|
|
|
|
msgstr "本地发现 '$sm_name' 的一个 git 目录,与其对应的远程仓库:"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-submodule.sh:245
|
2013-01-30 10:23:08 +01:00
|
|
|
|
#, sh-format
|
|
|
|
|
msgid ""
|
2016-08-28 04:18:12 +02:00
|
|
|
|
"If you want to reuse this local git directory instead of cloning again from\n"
|
|
|
|
|
" $realrepo\n"
|
|
|
|
|
"use the '--force' option. If the local git directory is not the correct "
|
|
|
|
|
"repo\n"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
"or you are unsure what this means choose another name with the '--name' "
|
|
|
|
|
"option."
|
2016-08-28 04:18:12 +02:00
|
|
|
|
msgstr ""
|
|
|
|
|
"如果您想要重用这个本地 git 目录而非重新克隆自\n"
|
|
|
|
|
" $realrepo\n"
|
|
|
|
|
"使用 '--force' 选项。如果本地 git 目录不是正确的仓库\n"
|
|
|
|
|
"或者您不确定这里的含义,使用 '--name' 选项选择另外的名称。"
|
2013-01-30 10:23:08 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-submodule.sh:251
|
2013-01-30 10:23:08 +01:00
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Reactivating local git directory for submodule '$sm_name'."
|
|
|
|
|
msgstr "激活本地 git 目录到子模组 '$sm_name'。"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-submodule.sh:263
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, sh-format
|
2012-04-29 18:06:55 +02:00
|
|
|
|
msgid "Unable to checkout submodule '$sm_path'"
|
|
|
|
|
msgstr "不能检出子模组 '$sm_path'"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-submodule.sh:268
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, sh-format
|
2012-04-29 18:06:55 +02:00
|
|
|
|
msgid "Failed to add submodule '$sm_path'"
|
|
|
|
|
msgstr "无法添加子模组 '$sm_path'"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-submodule.sh:277
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, sh-format
|
2012-04-29 18:06:55 +02:00
|
|
|
|
msgid "Failed to register submodule '$sm_path'"
|
|
|
|
|
msgstr "无法注册子模组 '$sm_path'"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-submodule.sh:324
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, sh-format
|
2016-05-29 14:40:35 +02:00
|
|
|
|
msgid "Entering '$displaypath'"
|
|
|
|
|
msgstr "正在进入 '$displaypath'"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-submodule.sh:344
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, sh-format
|
2016-05-29 14:40:35 +02:00
|
|
|
|
msgid "Stopping at '$displaypath'; script returned non-zero status."
|
2016-06-05 18:06:17 +02:00
|
|
|
|
msgstr "停止于 '$displaypath';脚本返回非零值。"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-submodule.sh:415
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, sh-format
|
2016-05-29 14:40:35 +02:00
|
|
|
|
msgid "pathspec and --all are incompatible"
|
|
|
|
|
msgstr "pathspec 和 --all 不兼容"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-submodule.sh:420
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, sh-format
|
2016-05-29 14:40:35 +02:00
|
|
|
|
msgid "Use '--all' if you really want to deinitialize all submodules"
|
2016-06-05 18:06:17 +02:00
|
|
|
|
msgstr "如果您确实想要对所有子模组执行取消初始化,请使用 '--all'"
|
2013-04-11 11:55:09 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-submodule.sh:440
|
2013-04-11 11:55:09 +02:00
|
|
|
|
#, sh-format
|
|
|
|
|
msgid ""
|
2016-08-28 04:18:12 +02:00
|
|
|
|
"Submodule work tree '$displaypath' contains a .git directory\n"
|
2013-04-11 11:55:09 +02:00
|
|
|
|
"(use 'rm -rf' if you really want to remove it including all of its history)"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
msgstr ""
|
|
|
|
|
"子模组工作区 '$displaypath' 包含一个 .git 目录\n"
|
2016-09-07 12:03:04 +02:00
|
|
|
|
"(如果您真的想删除它及其全部历史,使用 'rm -rf' 命令)"
|
2013-04-11 11:55:09 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-submodule.sh:448
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, sh-format
|
|
|
|
|
msgid ""
|
2013-07-26 08:00:02 +02:00
|
|
|
|
"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
|
2013-04-11 11:55:09 +02:00
|
|
|
|
"discard them"
|
2013-07-26 08:00:02 +02:00
|
|
|
|
msgstr "子模组工作区 '$displaypath' 包含本地修改;使用 '-f' 丢弃它们"
|
2013-04-11 11:55:09 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-submodule.sh:451
|
2013-04-11 11:55:09 +02:00
|
|
|
|
#, sh-format
|
2013-07-26 08:00:02 +02:00
|
|
|
|
msgid "Cleared directory '$displaypath'"
|
|
|
|
|
msgstr "已清除目录 '$displaypath'"
|
2013-04-11 11:55:09 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-submodule.sh:452
|
2013-04-11 11:55:09 +02:00
|
|
|
|
#, sh-format
|
2013-07-26 08:00:02 +02:00
|
|
|
|
msgid "Could not remove submodule work tree '$displaypath'"
|
|
|
|
|
msgstr "无法移除子模组工作区 '$displaypath'"
|
2013-04-11 11:55:09 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-submodule.sh:455
|
2013-04-11 11:55:09 +02:00
|
|
|
|
#, sh-format
|
2013-07-26 08:00:02 +02:00
|
|
|
|
msgid "Could not create empty submodule directory '$displaypath'"
|
|
|
|
|
msgstr "不能创建空的子模组目录 '$displaypath'"
|
2013-04-11 11:55:09 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-submodule.sh:464
|
2013-04-11 11:55:09 +02:00
|
|
|
|
#, sh-format
|
2013-07-26 08:00:02 +02:00
|
|
|
|
msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
|
|
|
|
|
msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
|
2013-04-11 11:55:09 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-submodule.sh:617
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, sh-format
|
2013-07-26 08:00:02 +02:00
|
|
|
|
msgid "Unable to find current revision in submodule path '$displaypath'"
|
|
|
|
|
msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-submodule.sh:627
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, sh-format
|
2012-04-29 18:06:55 +02:00
|
|
|
|
msgid "Unable to fetch in submodule path '$sm_path'"
|
|
|
|
|
msgstr "无法在子模组路径 '$sm_path' 中获取"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-submodule.sh:632
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#, sh-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Unable to find current ${remote_name}/${branch} revision in submodule path "
|
|
|
|
|
"'$sm_path'"
|
2016-09-07 12:03:04 +02:00
|
|
|
|
msgstr "无法在子模组路径 '$sm_path' 中找到当前版本 ${remote_name}/${branch}"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-submodule.sh:650
|
2013-07-26 08:00:02 +02:00
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Unable to fetch in submodule path '$displaypath'"
|
|
|
|
|
msgstr "无法在子模组路径 '$displaypath' 中获取"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-submodule.sh:656
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#, sh-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
|
|
|
|
|
"Direct fetching of that commit failed."
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgstr ""
|
|
|
|
|
"获取了子模组路径 '$displaypath',但是它没有包含 $sha1。直接获取该提交失败。"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-submodule.sh:663
|
2014-03-13 05:41:34 +01:00
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
|
|
|
|
|
msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-submodule.sh:664
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, sh-format
|
2014-03-13 05:41:34 +01:00
|
|
|
|
msgid "Submodule path '$displaypath': checked out '$sha1'"
|
|
|
|
|
msgstr "子模组路径 '$displaypath':检出 '$sha1'"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-submodule.sh:668
|
2014-03-13 05:41:34 +01:00
|
|
|
|
#, sh-format
|
2013-07-26 08:00:02 +02:00
|
|
|
|
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
|
|
|
|
|
msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-submodule.sh:669
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, sh-format
|
2013-07-26 08:00:02 +02:00
|
|
|
|
msgid "Submodule path '$displaypath': rebased into '$sha1'"
|
|
|
|
|
msgstr "子模组路径 '$displaypath':变基至 '$sha1'"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-submodule.sh:674
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, sh-format
|
2013-07-26 08:00:02 +02:00
|
|
|
|
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
|
|
|
|
|
msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-submodule.sh:675
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, sh-format
|
2013-07-26 08:00:02 +02:00
|
|
|
|
msgid "Submodule path '$displaypath': merged in '$sha1'"
|
|
|
|
|
msgstr "子模组路径 '$displaypath':已合并入 '$sha1'"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-submodule.sh:680
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, sh-format
|
2016-05-29 14:40:35 +02:00
|
|
|
|
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
|
|
|
|
|
msgstr "在子模组 '$displaypath' 中执行 '$command $sha1' 失败"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-submodule.sh:681
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, sh-format
|
2016-05-29 14:40:35 +02:00
|
|
|
|
msgid "Submodule path '$displaypath': '$command $sha1'"
|
2016-06-05 18:06:17 +02:00
|
|
|
|
msgstr "子模组 '$displaypath':'$command $sha1'"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-submodule.sh:712
|
2013-07-26 08:00:02 +02:00
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Failed to recurse into submodule path '$displaypath'"
|
|
|
|
|
msgstr "无法递归进子模组路径 '$displaypath'"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-submodule.sh:820
|
2012-08-02 05:50:59 +02:00
|
|
|
|
msgid "The --cached option cannot be used with the --files option"
|
|
|
|
|
msgstr "选项 --cached 不能和选项 --files 同时使用"
|
2012-06-08 06:07:25 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-submodule.sh:872
|
2012-06-08 06:07:25 +02:00
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "unexpected mode $mod_dst"
|
|
|
|
|
msgstr "意外的模式 $mod_dst"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2012-03-27 08:46:11 +02:00
|
|
|
|
# 译者:注意保持前导空格
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-submodule.sh:892
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, sh-format
|
2013-07-26 08:00:02 +02:00
|
|
|
|
msgid " Warn: $display_name doesn't contain commit $sha1_src"
|
|
|
|
|
msgstr " 警告:$display_name 未包含提交 $sha1_src"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2012-03-27 08:46:11 +02:00
|
|
|
|
# 译者:注意保持前导空格
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-submodule.sh:895
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, sh-format
|
2013-07-26 08:00:02 +02:00
|
|
|
|
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
|
|
|
|
|
msgstr " 警告:$display_name 未包含提交 $sha1_dst"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2012-03-27 08:46:11 +02:00
|
|
|
|
# 译者:注意保持前导空格
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-submodule.sh:898
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, sh-format
|
2013-07-26 08:00:02 +02:00
|
|
|
|
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
|
|
|
|
|
msgstr " 警告:$display_name 未包含提交 $sha1_src 和 $sha1_dst"
|
2012-02-13 07:41:59 +01:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-submodule.sh:1045
|
2013-04-11 11:55:09 +02:00
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Failed to recurse into submodule path '$sm_path'"
|
|
|
|
|
msgstr "无法递归进子模组路径 '$sm_path'"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-submodule.sh:1112
|
2012-02-13 07:41:59 +01:00
|
|
|
|
#, sh-format
|
2013-07-26 08:00:02 +02:00
|
|
|
|
msgid "Synchronizing submodule url for '$displaypath'"
|
|
|
|
|
msgstr "为 '$displaypath' 同步子模组 url"
|
2015-08-23 09:23:21 +02:00
|
|
|
|
|
2016-05-29 14:40:35 +02:00
|
|
|
|
#: git-parse-remote.sh:89
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "See git-${cmd}(1) for details."
|
|
|
|
|
msgstr "详见 git-${cmd}(1)。"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
|
|
|
|
#: git-rebase--interactive.sh:131
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Rebasing ($new_count/$total)"
|
|
|
|
|
msgstr "变基中($new_count/$total)"
|
|
|
|
|
|
|
|
|
|
#: git-rebase--interactive.sh:147
|
|
|
|
|
msgid ""
|
|
|
|
|
"\n"
|
|
|
|
|
"Commands:\n"
|
|
|
|
|
" p, pick = use commit\n"
|
|
|
|
|
" r, reword = use commit, but edit the commit message\n"
|
|
|
|
|
" e, edit = use commit, but stop for amending\n"
|
|
|
|
|
" s, squash = use commit, but meld into previous commit\n"
|
|
|
|
|
" f, fixup = like \"squash\", but discard this commit's log message\n"
|
|
|
|
|
" x, exec = run command (the rest of the line) using shell\n"
|
|
|
|
|
" d, drop = remove commit\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"These lines can be re-ordered; they are executed from top to bottom.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"\n"
|
|
|
|
|
"命令:\n"
|
|
|
|
|
" p, pick = 使用提交\n"
|
|
|
|
|
" r, reword = 使用提交,但修改提交说明\n"
|
|
|
|
|
" e, edit = 使用提交,但停止以便进行提交修补\n"
|
|
|
|
|
" s, squash = 使用提交,但和前一个版本融合\n"
|
|
|
|
|
" f, fixup = 类似于 \"squash\",但丢弃提交说明日志\n"
|
|
|
|
|
" x, exec = 使用 shell 运行命令(此行剩余部分)\n"
|
|
|
|
|
" d, drop = 删除提交\n"
|
|
|
|
|
"\n"
|
2016-09-07 12:03:04 +02:00
|
|
|
|
"这些行可以被重新排序;它们会被从上至下地执行。\n"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
"\n"
|
|
|
|
|
|
|
|
|
|
#: git-rebase--interactive.sh:162
|
|
|
|
|
msgid ""
|
|
|
|
|
"\n"
|
|
|
|
|
"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgstr ""
|
|
|
|
|
"\n"
|
|
|
|
|
"不要删除任意一行。使用 'drop' 显式地删除一个提交。\n"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
|
|
|
|
#: git-rebase--interactive.sh:166
|
|
|
|
|
msgid ""
|
|
|
|
|
"\n"
|
|
|
|
|
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgstr ""
|
|
|
|
|
"\n"
|
|
|
|
|
"如果您在这里删除一行,对应的提交将会丢失。\n"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
|
|
|
|
#: git-rebase--interactive.sh:202
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"You can amend the commit now, with\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"\tgit commit --amend $gpg_sign_opt_quoted\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Once you are satisfied with your changes, run\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"\tgit rebase --continue"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"您现在可以修补这个提交,使用\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"\tgit commit --amend $gpg_sign_opt_quoted\n"
|
|
|
|
|
"\n"
|
2016-09-07 12:03:04 +02:00
|
|
|
|
"当您对变更感到满意,执行\n"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
"\n"
|
|
|
|
|
"\tgit rebase --continue"
|
|
|
|
|
|
|
|
|
|
#: git-rebase--interactive.sh:227
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "$sha1: not a commit that can be picked"
|
|
|
|
|
msgstr "$sha1:不是一个可以被拣选的提交"
|
|
|
|
|
|
|
|
|
|
#: git-rebase--interactive.sh:266
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Invalid commit name: $sha1"
|
|
|
|
|
msgstr "无效的提交名:$sha1"
|
|
|
|
|
|
|
|
|
|
#: git-rebase--interactive.sh:308
|
|
|
|
|
msgid "Cannot write current commit's replacement sha1"
|
|
|
|
|
msgstr "不能写入当前提交的替代 sha1"
|
|
|
|
|
|
|
|
|
|
#: git-rebase--interactive.sh:360
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Fast-forward to $sha1"
|
|
|
|
|
msgstr "快进到 $sha1"
|
|
|
|
|
|
|
|
|
|
#: git-rebase--interactive.sh:362
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Cannot fast-forward to $sha1"
|
|
|
|
|
msgstr "不能快进到 $sha1"
|
|
|
|
|
|
|
|
|
|
#: git-rebase--interactive.sh:371
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Cannot move HEAD to $first_parent"
|
|
|
|
|
msgstr "不能移动 HEAD 到 $first_parent"
|
|
|
|
|
|
|
|
|
|
#: git-rebase--interactive.sh:376
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Refusing to squash a merge: $sha1"
|
|
|
|
|
msgstr "拒绝压缩一个合并:$sha1"
|
|
|
|
|
|
|
|
|
|
#: git-rebase--interactive.sh:390
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Error redoing merge $sha1"
|
|
|
|
|
msgstr "无法重做合并 $sha1"
|
|
|
|
|
|
|
|
|
|
#: git-rebase--interactive.sh:398
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Could not pick $sha1"
|
|
|
|
|
msgstr "不能拣选 $sha1"
|
|
|
|
|
|
|
|
|
|
#: git-rebase--interactive.sh:407
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "This is the commit message #${n}:"
|
2016-09-07 12:03:04 +02:00
|
|
|
|
msgstr "这是提交说明 #${n}:"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
|
|
|
|
#: git-rebase--interactive.sh:412
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "The commit message #${n} will be skipped:"
|
2016-09-07 12:03:04 +02:00
|
|
|
|
msgstr "提交说明 #${n} 将被跳过:"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
|
|
|
|
#: git-rebase--interactive.sh:423
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "This is a combination of $count commit."
|
|
|
|
|
msgid_plural "This is a combination of $count commits."
|
|
|
|
|
msgstr[0] "这是一个 $count 个提交的组合。"
|
|
|
|
|
msgstr[1] "这是一个 $count 个提交的组合。"
|
|
|
|
|
|
|
|
|
|
#: git-rebase--interactive.sh:431
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Cannot write $fixup_msg"
|
|
|
|
|
msgstr "不能写入 $fixup_msg"
|
|
|
|
|
|
|
|
|
|
#: git-rebase--interactive.sh:434
|
|
|
|
|
msgid "This is a combination of 2 commits."
|
|
|
|
|
msgstr "这是一个 2 个提交的组合。"
|
|
|
|
|
|
|
|
|
|
#: git-rebase--interactive.sh:435
|
|
|
|
|
msgid "This is the 1st commit message:"
|
|
|
|
|
msgstr "这是第一个提交说明:"
|
|
|
|
|
|
|
|
|
|
#: git-rebase--interactive.sh:475 git-rebase--interactive.sh:518
|
|
|
|
|
#: git-rebase--interactive.sh:521
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Could not apply $sha1... $rest"
|
|
|
|
|
msgstr "不能应用 $sha1... $rest"
|
|
|
|
|
|
|
|
|
|
#: git-rebase--interactive.sh:549
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Could not amend commit after successfully picking $sha1... $rest\n"
|
|
|
|
|
"This is most likely due to an empty commit message, or the pre-commit hook\n"
|
|
|
|
|
"failed. If the pre-commit hook failed, you may need to resolve the issue "
|
|
|
|
|
"before\n"
|
|
|
|
|
"you are able to reword the commit."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"不能在成功拣选 $sha1... $rest 之后修补提交\n"
|
|
|
|
|
"这通常是因为空的提交说明,或者 pre-commit 钩子执行失败。如果是 pre-commit\n"
|
|
|
|
|
"钩子执行失败,你可能需要在重写提交说明前解决这个问题。"
|
|
|
|
|
|
|
|
|
|
#: git-rebase--interactive.sh:564
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Stopped at $sha1_abbrev... $rest"
|
|
|
|
|
msgstr "停止在 $sha1_abbrev... $rest"
|
|
|
|
|
|
|
|
|
|
#: git-rebase--interactive.sh:579
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Cannot '$squash_style' without a previous commit"
|
2016-09-07 12:03:04 +02:00
|
|
|
|
msgstr "没有父提交的情况下不能 '$squash_style'"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
|
|
|
|
#: git-rebase--interactive.sh:621
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Executing: $rest"
|
|
|
|
|
msgstr "执行:$rest"
|
|
|
|
|
|
|
|
|
|
#: git-rebase--interactive.sh:629
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Execution failed: $rest"
|
|
|
|
|
msgstr "执行失败:$rest"
|
|
|
|
|
|
|
|
|
|
#: git-rebase--interactive.sh:631
|
|
|
|
|
msgid "and made changes to the index and/or the working tree"
|
|
|
|
|
msgstr "并且修改索引和/或工作区"
|
|
|
|
|
|
|
|
|
|
# 译者:注意保持前导空格
|
|
|
|
|
#: git-rebase--interactive.sh:633
|
|
|
|
|
msgid ""
|
|
|
|
|
"You can fix the problem, and then run\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"\tgit rebase --continue"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"您可以解决这个问题,然后运行\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"\tgit rebase --continue"
|
|
|
|
|
|
|
|
|
|
#. TRANSLATORS: after these lines is a command to be issued by the user
|
|
|
|
|
#: git-rebase--interactive.sh:646
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Execution succeeded: $rest\n"
|
|
|
|
|
"but left changes to the index and/or the working tree\n"
|
|
|
|
|
"Commit or stash your changes, and then run\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"\tgit rebase --continue"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"执行成功:$rest\n"
|
|
|
|
|
"但是在索引和/或工作区中存在变更。提交或暂存修改,然后运行\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"\tgit rebase --continue"
|
|
|
|
|
|
|
|
|
|
#: git-rebase--interactive.sh:657
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Unknown command: $command $sha1 $rest"
|
|
|
|
|
msgstr "未知命令:$command $sha1 $rest"
|
|
|
|
|
|
|
|
|
|
#: git-rebase--interactive.sh:658
|
|
|
|
|
msgid "Please fix this using 'git rebase --edit-todo'."
|
|
|
|
|
msgstr "要修改请使用命令 'git rebase --edit-todo'。"
|
|
|
|
|
|
|
|
|
|
#: git-rebase--interactive.sh:693
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Successfully rebased and updated $head_name."
|
2016-09-07 12:03:04 +02:00
|
|
|
|
msgstr "成功变基并更新 $head_name。"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
|
|
|
|
#: git-rebase--interactive.sh:740
|
|
|
|
|
msgid "Could not skip unnecessary pick commands"
|
|
|
|
|
msgstr "不能跳过不必要的拣选命令"
|
|
|
|
|
|
|
|
|
|
#: git-rebase--interactive.sh:898
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
|
|
|
|
|
" - $line"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"警告:缺失 SHA-1 或者在下面一行中不是一个提交:\n"
|
|
|
|
|
" - $line"
|
|
|
|
|
|
|
|
|
|
#: git-rebase--interactive.sh:931
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Warning: the command isn't recognized in the following line:\n"
|
|
|
|
|
" - $line"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"警告:下面一行中的命令未能被识别:\n"
|
|
|
|
|
" - $line"
|
|
|
|
|
|
|
|
|
|
#: git-rebase--interactive.sh:970
|
|
|
|
|
msgid "could not detach HEAD"
|
|
|
|
|
msgstr "不能检出为分离头指针"
|
|
|
|
|
|
|
|
|
|
#: git-rebase--interactive.sh:1008
|
|
|
|
|
msgid ""
|
|
|
|
|
"Warning: some commits may have been dropped accidentally.\n"
|
|
|
|
|
"Dropped commits (newer to older):"
|
|
|
|
|
msgstr "警告:一些提交可能被意外丢弃。丢弃的提交(从新到旧):"
|
|
|
|
|
|
|
|
|
|
#: git-rebase--interactive.sh:1016
|
|
|
|
|
msgid ""
|
|
|
|
|
"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Use 'git config rebase.missingCommitsCheck' to change the level of "
|
|
|
|
|
"warnings.\n"
|
|
|
|
|
"The possible behaviours are: ignore, warn, error."
|
|
|
|
|
msgstr ""
|
2016-09-07 12:03:04 +02:00
|
|
|
|
"为避免这条信息,使用 \"drop\" 指令显式地删除一个提交。\n"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
"\n"
|
2016-09-07 12:03:04 +02:00
|
|
|
|
"使用 'git config rebase.missingCommitsCheck' 来修改警告级别。\n"
|
|
|
|
|
"可选值有:ignore、warn、error。"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
|
|
|
|
#: git-rebase--interactive.sh:1027
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Unrecognized setting $check_level for option rebase.missingCommitsCheck. "
|
|
|
|
|
"Ignoring."
|
2016-09-07 12:03:04 +02:00
|
|
|
|
msgstr "选项 rebase.missingCommitsCheck 的值 $check_level 无法被识别。已忽略。"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
|
|
|
|
#: git-rebase--interactive.sh:1044
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
|
|
|
|
|
"continue'."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"您可以用命令 'git rebase --edit-todo' 修正然后执行命令 'git rebase --"
|
|
|
|
|
"continue'。"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
|
|
|
|
#: git-rebase--interactive.sh:1045
|
|
|
|
|
msgid "Or you can abort the rebase with 'git rebase --abort'."
|
|
|
|
|
msgstr "或者您可以使用 'git rebase --abort' 命令终止变基操作。"
|
|
|
|
|
|
|
|
|
|
#: git-rebase--interactive.sh:1069
|
|
|
|
|
msgid "Could not remove CHERRY_PICK_HEAD"
|
|
|
|
|
msgstr "不能删除 CHERRY_PICK_HEAD"
|
|
|
|
|
|
|
|
|
|
#: git-rebase--interactive.sh:1074
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"You have staged changes in your working tree.\n"
|
|
|
|
|
"If these changes are meant to be\n"
|
|
|
|
|
"squashed into the previous commit, run:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git commit --amend $gpg_sign_opt_quoted\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"If they are meant to go into a new commit, run:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git commit $gpg_sign_opt_quoted\n"
|
|
|
|
|
"\n"
|
2016-10-27 15:53:37 +02:00
|
|
|
|
"In both cases, once you're done, continue with:\n"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
"\n"
|
|
|
|
|
" git rebase --continue\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"您已暂存了工作区的修改。如果这些修改要压缩到前一个提交,执行:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git commit --amend $gpg_sign_opt_quoted\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"如果这些变更要形成一个新提交,执行:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git commit $gpg_sign_opt_quoted\n"
|
|
|
|
|
"\n"
|
2016-09-07 12:03:04 +02:00
|
|
|
|
"无论哪种情况,当您完成提交,继续执行:\n"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
"\n"
|
|
|
|
|
" git rebase --continue\n"
|
|
|
|
|
|
|
|
|
|
#: git-rebase--interactive.sh:1091
|
|
|
|
|
msgid "Error trying to find the author identity to amend commit"
|
2016-09-07 12:03:04 +02:00
|
|
|
|
msgstr "在修补提交中查找作者信息时遇到错误"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
|
|
|
|
#: git-rebase--interactive.sh:1096
|
|
|
|
|
msgid ""
|
|
|
|
|
"You have uncommitted changes in your working tree. Please commit them\n"
|
|
|
|
|
"first and then run 'git rebase --continue' again."
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgstr ""
|
|
|
|
|
"您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
|
|
|
|
#: git-rebase--interactive.sh:1101 git-rebase--interactive.sh:1105
|
|
|
|
|
msgid "Could not commit staged changes."
|
|
|
|
|
msgstr "不能提交暂存的修改。"
|
|
|
|
|
|
|
|
|
|
#: git-rebase--interactive.sh:1129
|
|
|
|
|
msgid ""
|
|
|
|
|
"\n"
|
|
|
|
|
"You are editing the todo file of an ongoing interactive rebase.\n"
|
|
|
|
|
"To continue rebase after editing, run:\n"
|
|
|
|
|
" git rebase --continue\n"
|
|
|
|
|
"\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"\n"
|
2016-09-07 12:03:04 +02:00
|
|
|
|
"您正在修改运行中的交互式变基的 todo 文件。若要在编辑结束后继续变基,\n"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
"请执行:\n"
|
|
|
|
|
" git rebase --continue\n"
|
|
|
|
|
"\n"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-rebase--interactive.sh:1137 git-rebase--interactive.sh:1295
|
2016-08-28 04:18:12 +02:00
|
|
|
|
msgid "Could not execute editor"
|
|
|
|
|
msgstr "无法运行编辑器"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-rebase--interactive.sh:1150
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Could not checkout $switch_to"
|
|
|
|
|
msgstr "不能检出 $switch_to"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-rebase--interactive.sh:1155
|
2016-08-28 04:18:12 +02:00
|
|
|
|
msgid "No HEAD?"
|
|
|
|
|
msgstr "没有 HEAD?"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-rebase--interactive.sh:1156
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Could not create temporary $state_dir"
|
|
|
|
|
msgstr "不能创建临时 $state_dir"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-rebase--interactive.sh:1158
|
2016-08-28 04:18:12 +02:00
|
|
|
|
msgid "Could not mark as interactive"
|
|
|
|
|
msgstr "不能标记为交互式"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-rebase--interactive.sh:1168 git-rebase--interactive.sh:1173
|
2016-08-28 04:18:12 +02:00
|
|
|
|
msgid "Could not init rewritten commits"
|
|
|
|
|
msgstr "不能对重写提交进行初始化"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-rebase--interactive.sh:1273
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
|
|
|
|
|
msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
|
|
|
|
|
msgstr[0] "变基 $shortrevisions 到 $shortonto($todocount 个提交)"
|
|
|
|
|
msgstr[1] "变基 $shortrevisions 到 $shortonto($todocount 个提交)"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-rebase--interactive.sh:1278
|
2016-08-28 04:18:12 +02:00
|
|
|
|
msgid ""
|
|
|
|
|
"\n"
|
|
|
|
|
"However, if you remove everything, the rebase will be aborted.\n"
|
|
|
|
|
"\n"
|
2016-10-27 15:53:37 +02:00
|
|
|
|
msgstr ""
|
|
|
|
|
"\n"
|
|
|
|
|
"然而,如果您删除全部内容,变基操作将会终止。\n"
|
|
|
|
|
"\n"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-rebase--interactive.sh:1285
|
2016-08-28 04:18:12 +02:00
|
|
|
|
msgid "Note that empty commits are commented out"
|
|
|
|
|
msgstr "注意空提交已被注释掉"
|
|
|
|
|
|
|
|
|
|
#: git-sh-setup.sh:89 git-sh-setup.sh:94
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "usage: $dashless $USAGE"
|
|
|
|
|
msgstr "用法:$dashless $USAGE"
|
|
|
|
|
|
|
|
|
|
#: git-sh-setup.sh:190
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Cannot chdir to $cdup, the toplevel of the working tree"
|
2016-09-07 12:03:04 +02:00
|
|
|
|
msgstr "不能切换目录到 $cdup,工作区的顶级目录"
|
2016-08-28 04:18:12 +02:00
|
|
|
|
|
|
|
|
|
#: git-sh-setup.sh:199 git-sh-setup.sh:206
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "fatal: $program_name cannot be used without a working tree."
|
|
|
|
|
msgstr "严重错误:$program_name 不能在没有工作区的情况下使用"
|
|
|
|
|
|
|
|
|
|
#: git-sh-setup.sh:220
|
|
|
|
|
msgid "Cannot rebase: You have unstaged changes."
|
|
|
|
|
msgstr "不能变基:您有未暂存的变更。"
|
|
|
|
|
|
|
|
|
|
#: git-sh-setup.sh:223
|
|
|
|
|
msgid "Cannot rewrite branches: You have unstaged changes."
|
|
|
|
|
msgstr "不能重写分支:您有未暂存的变更。"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-sh-setup.sh:226
|
|
|
|
|
msgid "Cannot pull with rebase: You have unstaged changes."
|
|
|
|
|
msgstr "无法通过变基方式拉取:您有未暂存的变更。"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: git-sh-setup.sh:229
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Cannot $action: You have unstaged changes."
|
|
|
|
|
msgstr "不能 $action:您有未暂存的变更。"
|
|
|
|
|
|
|
|
|
|
#: git-sh-setup.sh:242
|
|
|
|
|
msgid "Cannot rebase: Your index contains uncommitted changes."
|
|
|
|
|
msgstr "不能变基:您的索引中包含未提交的变更。"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-sh-setup.sh:245
|
|
|
|
|
msgid "Cannot pull with rebase: Your index contains uncommitted changes."
|
|
|
|
|
msgstr "无法通过变基方式拉取:您的索引中包含未提交的变更。"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: git-sh-setup.sh:248
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Cannot $action: Your index contains uncommitted changes."
|
|
|
|
|
msgstr "不能 $action:您的索引中包含未提交的变更。"
|
|
|
|
|
|
2016-10-27 15:53:37 +02:00
|
|
|
|
#: git-sh-setup.sh:252
|
|
|
|
|
msgid "Additionally, your index contains uncommitted changes."
|
|
|
|
|
msgstr "而且您的索引中包含未提交的变更。"
|
|
|
|
|
|
2016-08-28 04:18:12 +02:00
|
|
|
|
#: git-sh-setup.sh:372
|
|
|
|
|
msgid "You need to run this command from the toplevel of the working tree."
|
|
|
|
|
msgstr "您需要在工作区的顶级目录中运行这个命令。"
|
|
|
|
|
|
|
|
|
|
#: git-sh-setup.sh:377
|
|
|
|
|
msgid "Unable to determine absolute path of git directory"
|
|
|
|
|
msgstr "不能确定 git 目录的绝对路径"
|
2016-10-27 15:53:37 +02:00
|
|
|
|
|
|
|
|
|
#~ msgid "Could not write to %s"
|
|
|
|
|
#~ msgstr "不能写入 %s"
|
|
|
|
|
|
|
|
|
|
#~ msgid "Error wrapping up %s."
|
|
|
|
|
#~ msgstr "错误收尾 %s。"
|
|
|
|
|
|
|
|
|
|
#~ msgid "Your local changes would be overwritten by cherry-pick."
|
|
|
|
|
#~ msgstr "您的本地修改将被拣选操作覆盖。"
|
|
|
|
|
|
|
|
|
|
#~ msgid "Cannot revert during another revert."
|
|
|
|
|
#~ msgstr "不能在回退中执行另一回退。"
|
|
|
|
|
|
|
|
|
|
#~ msgid "Cannot cherry-pick during another cherry-pick."
|
|
|
|
|
#~ msgstr "不能在拣选过程中执行另一拣选。"
|
|
|
|
|
|
|
|
|
|
#~ msgid "Could not parse line %d."
|
|
|
|
|
#~ msgstr "不能解析第 %d 行。"
|
|
|
|
|
|
|
|
|
|
#~ msgid "Could not open %s"
|
|
|
|
|
#~ msgstr "不能打开 %s"
|
|
|
|
|
|
|
|
|
|
#~ msgid "Could not read %s."
|
|
|
|
|
#~ msgstr "不能读取 %s。"
|
|
|
|
|
|
|
|
|
|
#~ msgid "Could not format %s."
|
|
|
|
|
#~ msgstr "不能格式化 %s。"
|
|
|
|
|
|
|
|
|
|
#~ msgid "%s: %s"
|
|
|
|
|
#~ msgstr "%s:%s"
|
|
|
|
|
|
|
|
|
|
#~ msgid "cannot open %s: %s"
|
|
|
|
|
#~ msgstr "不能打开 %s:%s"
|
|
|
|
|
|
|
|
|
|
#~ msgid "You need to set your committer info first"
|
|
|
|
|
#~ msgstr "您需要先设置您的提交者信息"
|