2012-02-13 14:41:59 +08:00
|
|
|
|
# Chinese translations for Git package
|
|
|
|
|
# Git 软件包的简体中文翻译.
|
|
|
|
|
# Copyright (C) 2012 Jiang Xin <worldhello.net AT gmail.com>
|
|
|
|
|
# This file is distributed under the same license as the Git package.
|
|
|
|
|
# Contributers:
|
|
|
|
|
# - Jiang Xin <worldhello.net AT gmail.com>
|
|
|
|
|
# - Riku <lu.riku AT gmail.com>
|
|
|
|
|
# - Zhuang Ya <zhuangya AT me.com>
|
|
|
|
|
# - Lian Cheng <rhythm.mail AT gmail.com>
|
|
|
|
|
#
|
|
|
|
|
msgid ""
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Project-Id-Version: Git\n"
|
|
|
|
|
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
|
2012-08-07 01:10:34 +08:00
|
|
|
|
"POT-Creation-Date: 2012-08-06 23:47+0800\n"
|
|
|
|
|
"PO-Revision-Date: 2012-08-07 01:07+0800\n"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
|
|
|
|
|
"Language-Team: GitHub <https://github.com/gotgit/git/>\n"
|
|
|
|
|
"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 17:35:59 +08:00
|
|
|
|
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: advice.c:40
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "hint: %.*s\n"
|
|
|
|
|
msgstr "提示:%.*s\n"
|
|
|
|
|
|
|
|
|
|
#.
|
|
|
|
|
#. * Message used both when 'git commit' fails and when
|
|
|
|
|
#. * other commands doing a merge do.
|
|
|
|
|
#.
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: advice.c:70
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid ""
|
|
|
|
|
"Fix them up in the work tree,\n"
|
|
|
|
|
"and then use 'git add/rm <file>' as\n"
|
|
|
|
|
"appropriate to mark resolution and make a commit,\n"
|
|
|
|
|
"or use 'git commit -a'."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"请先在工作区改正文件,然后酌情使用\n"
|
|
|
|
|
"'git add/rm <file>' 标记解决方案,\n"
|
|
|
|
|
"或使用 'git commit -a'。"
|
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: bundle.c:36
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "'%s' does not look like a v2 bundle file"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "'%s' 不像是一个 v2 版本的包文件"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: bundle.c:63
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "unrecognized header: %s%s (%d)"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "未能识别的包头:%s%s (%d)"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: bundle.c:89 builtin/commit.c:699
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "could not open '%s'"
|
|
|
|
|
msgstr "不能打开 '%s'"
|
|
|
|
|
|
|
|
|
|
#: bundle.c:140
|
|
|
|
|
msgid "Repository lacks these prerequisite commits:"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "版本库缺少这些必备的提交:"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-04 17:20:34 +08:00
|
|
|
|
#: bundle.c:164 sequencer.c:550 sequencer.c:982 builtin/log.c:290
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/log.c:726 builtin/log.c:1316 builtin/log.c:1535 builtin/merge.c:347
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/shortlog.c:181
|
|
|
|
|
msgid "revision walk setup failed"
|
|
|
|
|
msgstr "版本遍历设置失败"
|
|
|
|
|
|
|
|
|
|
#: bundle.c:186
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "The bundle contains %d ref"
|
|
|
|
|
msgid_plural "The bundle contains %d refs"
|
2012-05-30 12:19:47 +08: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 17:35:59 +08:00
|
|
|
|
msgstr[1] "这个包中含有 %d 个引用"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: bundle.c:192
|
2012-07-04 17:20:34 +08:00
|
|
|
|
msgid "The bundle records a complete history."
|
|
|
|
|
msgstr "这个包记录一个完整历史。"
|
|
|
|
|
|
|
|
|
|
#: bundle.c:195
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "The bundle requires this ref"
|
|
|
|
|
msgid_plural "The bundle requires these %d refs"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr[0] "这个包需要这个引用"
|
|
|
|
|
msgstr[1] "这个包需要 %d 个这些引用"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-04 17:20:34 +08:00
|
|
|
|
#: bundle.c:294
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "rev-list died"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "rev-list 终止"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: bundle.c:300 builtin/log.c:1212 builtin/shortlog.c:284
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unrecognized argument: %s"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "未能识别的参数:%s"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-04 17:20:34 +08:00
|
|
|
|
#: bundle.c:335
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "ref '%s' is excluded by the rev-list options"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "引用 '%s' 被 rev-list 选项排除"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-04 17:20:34 +08:00
|
|
|
|
#: bundle.c:380
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "Refusing to create empty bundle."
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "不能创建空包。"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-04 17:20:34 +08:00
|
|
|
|
#: bundle.c:398
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "Could not spawn pack-objects"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "不能生成 pack-objects 进程"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-04 17:20:34 +08:00
|
|
|
|
#: bundle.c:416
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "pack-objects died"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "pack-objects 终止"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-04 17:20:34 +08:00
|
|
|
|
#: bundle.c:419
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "cannot create '%s'"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "不能创建 '%s'"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-04 17:20:34 +08:00
|
|
|
|
#: bundle.c:441
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "index-pack died"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "index-pack 终止"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: commit.c:48
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "could not parse %s"
|
|
|
|
|
msgstr "不能解析 %s"
|
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: commit.c:50
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "%s %s is not a commit!"
|
|
|
|
|
msgstr "%s %s 不是一个提交!"
|
|
|
|
|
|
|
|
|
|
#: compat/obstack.c:406 compat/obstack.c:408
|
|
|
|
|
msgid "memory exhausted"
|
|
|
|
|
msgstr "内存耗尽"
|
|
|
|
|
|
|
|
|
|
#: connected.c:39
|
|
|
|
|
msgid "Could not run 'git rev-list'"
|
|
|
|
|
msgstr "不能执行 'git rev-list'"
|
|
|
|
|
|
|
|
|
|
#: connected.c:48
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "failed write to rev-list: %s"
|
|
|
|
|
msgstr "无法写入 rev-list:%s"
|
|
|
|
|
|
|
|
|
|
#: connected.c:56
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to close rev-list's stdin: %s"
|
|
|
|
|
msgstr "无法关闭 rev-list 的标准输入:%s"
|
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: date.c:95
|
|
|
|
|
msgid "in the future"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "在将来"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: date.c:101
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "%lu second ago"
|
|
|
|
|
msgid_plural "%lu seconds ago"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr[0] "%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 17:35:59 +08:00
|
|
|
|
msgstr[1] "%lu 秒钟之前"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: date.c:108
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "%lu minute ago"
|
|
|
|
|
msgid_plural "%lu minutes ago"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr[0] "%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 17:35:59 +08:00
|
|
|
|
msgstr[1] "%lu 分钟之前"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: date.c:115
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "%lu hour ago"
|
|
|
|
|
msgid_plural "%lu hours ago"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr[0] "%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 17:35:59 +08:00
|
|
|
|
msgstr[1] "%lu 小时之前"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: date.c:122
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "%lu day ago"
|
|
|
|
|
msgid_plural "%lu days ago"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr[0] "%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 17:35:59 +08:00
|
|
|
|
msgstr[1] "%lu 天之前"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: date.c:128
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "%lu week ago"
|
|
|
|
|
msgid_plural "%lu weeks ago"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr[0] "%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 17:35:59 +08:00
|
|
|
|
msgstr[1] "%lu 周之前"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: date.c:135
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "%lu month ago"
|
|
|
|
|
msgid_plural "%lu months ago"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr[0] "%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 17:35:59 +08:00
|
|
|
|
msgstr[1] "%lu 个月之前"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: date.c:146
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "%lu year"
|
|
|
|
|
msgid_plural "%lu years"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr[0] "%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 17:35:59 +08:00
|
|
|
|
msgstr[1] "%lu 年"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: date.c:149
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "%s, %lu month ago"
|
|
|
|
|
msgid_plural "%s, %lu months ago"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr[0] "%s,%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 17:35:59 +08:00
|
|
|
|
msgstr[1] "%s,%lu 个月之前"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: date.c:154 date.c:159
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "%lu year ago"
|
|
|
|
|
msgid_plural "%lu years ago"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr[0] "%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 17:35:59 +08:00
|
|
|
|
msgstr[1] "%lu 年前"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-03-27 14:46:11 +08:00
|
|
|
|
# 译者:注意保持前导空格
|
2012-03-08 12:06:53 +08:00
|
|
|
|
#: diff.c:105
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid " Failed to parse dirstat cut-off percentage '%.*s'\n"
|
|
|
|
|
msgstr " 无法解析 dirstat 阈值 '%.*s'\n"
|
|
|
|
|
|
2012-03-27 14:46:11 +08:00
|
|
|
|
# 译者:注意保持前导空格
|
2012-03-08 12:06:53 +08:00
|
|
|
|
#: diff.c:110
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid " Unknown dirstat parameter '%.*s'\n"
|
|
|
|
|
msgstr " 未知 dirstat 参数 '%.*s'\n"
|
|
|
|
|
|
2012-03-08 12:06:53 +08:00
|
|
|
|
#: diff.c:210
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Found errors in 'diff.dirstat' config variable:\n"
|
|
|
|
|
"%s"
|
|
|
|
|
msgstr ""
|
2012-03-27 14:46:11 +08:00
|
|
|
|
"发现配置变量 'diff.dirstat' 中的错误:\n"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
"%s"
|
|
|
|
|
|
2012-04-28 22:42:41 +08:00
|
|
|
|
#: diff.c:1400
|
2012-08-02 11:50:59 +08:00
|
|
|
|
msgid " 0 files changed"
|
|
|
|
|
msgstr " 0 个文件被修改"
|
2012-02-28 12:24:54 +08:00
|
|
|
|
|
2012-04-28 22:42:41 +08:00
|
|
|
|
#: diff.c:1404
|
2012-02-28 12:24:54 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid " %d file changed"
|
|
|
|
|
msgid_plural " %d files changed"
|
2012-02-29 20:53:26 +08: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 17:35:59 +08:00
|
|
|
|
msgstr[1] " %d 个文件被修改"
|
2012-02-28 12:24:54 +08:00
|
|
|
|
|
2012-04-28 22:42:41 +08:00
|
|
|
|
#: diff.c:1421
|
2012-02-28 12:24:54 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid ", %d insertion(+)"
|
|
|
|
|
msgid_plural ", %d insertions(+)"
|
2012-02-29 01:57:24 +08: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 17:35:59 +08:00
|
|
|
|
msgstr[1] ",插入 %d 行(+)"
|
2012-02-28 12:24:54 +08:00
|
|
|
|
|
2012-04-28 22:42:41 +08:00
|
|
|
|
#: diff.c:1432
|
2012-02-28 12:24:54 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid ", %d deletion(-)"
|
|
|
|
|
msgid_plural ", %d deletions(-)"
|
2012-02-29 01:57:24 +08: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 17:35:59 +08:00
|
|
|
|
msgstr[1] ",删除 %d 行(-)"
|
2012-02-28 12:24:54 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: diff.c:3461
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Failed to parse --dirstat/-X option parameter:\n"
|
|
|
|
|
"%s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"无法解析 --dirstat/-X 选项的参数:\n"
|
|
|
|
|
"%s"
|
|
|
|
|
|
|
|
|
|
#: gpg-interface.c:59
|
|
|
|
|
msgid "could not run gpg."
|
|
|
|
|
msgstr "不能执行 gpg。"
|
|
|
|
|
|
|
|
|
|
#: gpg-interface.c:71
|
|
|
|
|
msgid "gpg did not accept the data"
|
|
|
|
|
msgstr "gpg 没有接受数据"
|
|
|
|
|
|
|
|
|
|
#: gpg-interface.c:82
|
|
|
|
|
msgid "gpg failed to sign the data"
|
|
|
|
|
msgstr "gpg 无法为数据签名"
|
|
|
|
|
|
2012-06-02 17:12:59 +08:00
|
|
|
|
#: grep.c:1320
|
2012-02-28 12:24:54 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "'%s': unable to read %s"
|
|
|
|
|
msgstr "'%s':无法读取 %s"
|
|
|
|
|
|
2012-06-02 17:12:59 +08:00
|
|
|
|
#: grep.c:1337
|
2012-02-28 12:24:54 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "'%s': %s"
|
|
|
|
|
msgstr "'%s':%s"
|
|
|
|
|
|
2012-06-02 17:12:59 +08:00
|
|
|
|
#: grep.c:1348
|
2012-02-28 12:24:54 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "'%s': short read %s"
|
|
|
|
|
msgstr "'%s':读取不完整 %s"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: help.c:212
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "available git commands in '%s'"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "在 '%s' 下可用的 git 命令"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: help.c:219
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "git commands available from elsewhere on your $PATH"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "在 $PATH 路径中的其他地方可用的 git 命令"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: help.c:275
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"'%s' appears to be a git command, but we were not\n"
|
|
|
|
|
"able to execute it. Maybe git-%s is broken?"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"'%s' 像是一个 git 命令,但却无法运行。\n"
|
|
|
|
|
"可能是 git-%s 受损?"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: help.c:332
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "Uh oh. Your system reports no Git commands at all."
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "唉呀,您的系统中未发现 Git 命令。"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: help.c:354
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"WARNING: You called a Git command named '%s', which does not exist.\n"
|
|
|
|
|
"Continuing under the assumption that you meant '%s'"
|
|
|
|
|
msgstr ""
|
2012-05-30 12:19:47 +08:00
|
|
|
|
"警告:您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n"
|
|
|
|
|
"是 '%s'"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: help.c:359
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "in %0.1f seconds automatically..."
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "在 %0.1f 秒钟后自动运行..."
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: help.c:366
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "git: '%s' is not a git command. See 'git --help'."
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "git:'%s' 不是一个 git 命令。参见 'git --help'。"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: help.c:370
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid ""
|
|
|
|
|
"\n"
|
|
|
|
|
"Did you mean this?"
|
|
|
|
|
msgid_plural ""
|
|
|
|
|
"\n"
|
|
|
|
|
"Did you mean one of these?"
|
|
|
|
|
msgstr[0] ""
|
2012-05-30 12:19:47 +08:00
|
|
|
|
"\n"
|
|
|
|
|
"您指的是这个么?"
|
|
|
|
|
msgstr[1] ""
|
|
|
|
|
"\n"
|
|
|
|
|
"您指的是这些其中一个么?"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-08-02 11:50:59 +08:00
|
|
|
|
#: merge-recursive.c:190
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "(bad commit)\n"
|
|
|
|
|
msgstr "(坏提交)\n"
|
|
|
|
|
|
|
|
|
|
#: merge-recursive.c:206
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "addinfo_cache failed for path '%s'"
|
|
|
|
|
msgstr "为路径 '%s' addinfo_cache 失败"
|
|
|
|
|
|
|
|
|
|
#: merge-recursive.c:268
|
|
|
|
|
msgid "error building trees"
|
|
|
|
|
msgstr "无法创建树"
|
|
|
|
|
|
|
|
|
|
#: merge-recursive.c:497
|
|
|
|
|
msgid "diff setup failed"
|
|
|
|
|
msgstr "diff 设置失败"
|
|
|
|
|
|
|
|
|
|
#: merge-recursive.c:627
|
|
|
|
|
msgid "merge-recursive: disk full?"
|
|
|
|
|
msgstr "merge-recursive:磁盘已满?"
|
|
|
|
|
|
|
|
|
|
#: merge-recursive.c:690
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to create path '%s'%s"
|
|
|
|
|
msgstr "无法创建路径 '%s'%s"
|
|
|
|
|
|
|
|
|
|
#: merge-recursive.c:701
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Removing %s to make room for subdirectory\n"
|
|
|
|
|
msgstr "删除 %s 以便为子目录留出空间\n"
|
|
|
|
|
|
|
|
|
|
#. something else exists
|
|
|
|
|
#. .. but not some other error (who really cares what?)
|
|
|
|
|
#: merge-recursive.c:715 merge-recursive.c:736
|
|
|
|
|
msgid ": perhaps a D/F conflict?"
|
|
|
|
|
msgstr ":可能是一个目录/文件冲突?"
|
|
|
|
|
|
|
|
|
|
#: merge-recursive.c:726
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "refusing to lose untracked file at '%s'"
|
|
|
|
|
msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
|
|
|
|
|
|
|
|
|
|
#: merge-recursive.c:766
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot read object %s '%s'"
|
|
|
|
|
msgstr "不能读取对象 %s '%s'"
|
|
|
|
|
|
|
|
|
|
#: merge-recursive.c:768
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "blob expected for %s '%s'"
|
|
|
|
|
msgstr "%s '%s' 应为二进制对象(blob)"
|
|
|
|
|
|
|
|
|
|
#: merge-recursive.c:791 builtin/clone.c:302
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to open '%s'"
|
|
|
|
|
msgstr "无法打开 '%s'"
|
|
|
|
|
|
|
|
|
|
#: merge-recursive.c:799
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to symlink '%s'"
|
|
|
|
|
msgstr "无法创建符号链接 '%s'"
|
|
|
|
|
|
|
|
|
|
#: merge-recursive.c:802
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "do not know what to do with %06o %s '%s'"
|
|
|
|
|
msgstr "不知道如何处理 %06o %s '%s'"
|
|
|
|
|
|
|
|
|
|
#: merge-recursive.c:939
|
|
|
|
|
msgid "Failed to execute internal merge"
|
|
|
|
|
msgstr "无法执行内部合并"
|
|
|
|
|
|
|
|
|
|
#: merge-recursive.c:943
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Unable to add %s to database"
|
|
|
|
|
msgstr "不能添加 %s 至对象库"
|
|
|
|
|
|
|
|
|
|
#: merge-recursive.c:959
|
|
|
|
|
msgid "unsupported object type in the tree"
|
|
|
|
|
msgstr "在树中有不支持的对象类型"
|
|
|
|
|
|
|
|
|
|
#: merge-recursive.c:1038 merge-recursive.c:1052
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
|
|
|
|
|
"in tree."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
|
|
|
|
|
"的版本被保留。"
|
|
|
|
|
|
|
|
|
|
#: merge-recursive.c:1044 merge-recursive.c:1057
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
|
|
|
|
|
"in tree at %s."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"冲突(%1$s/删除):%2$s 在 %3$s 中被删除,在 %5$s 中被 %4$s。%7$s 在 %6$s 中"
|
|
|
|
|
"的版本保留于 %8$s 中。"
|
|
|
|
|
|
|
|
|
|
#: merge-recursive.c:1098
|
|
|
|
|
msgid "rename"
|
|
|
|
|
msgstr "重命名"
|
|
|
|
|
|
|
|
|
|
#: merge-recursive.c:1098
|
|
|
|
|
msgid "renamed"
|
|
|
|
|
msgstr "重命名"
|
|
|
|
|
|
|
|
|
|
#: merge-recursive.c:1154
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "%s is a directory in %s adding as %s instead"
|
|
|
|
|
msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
|
|
|
|
|
|
|
|
|
|
#: merge-recursive.c:1176
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
|
|
|
|
|
"\"->\"%s\" in \"%s\"%s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"冲突(重命名/重命名):在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\",在分支 "
|
|
|
|
|
"\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
|
|
|
|
|
|
|
|
|
|
#: merge-recursive.c:1181
|
|
|
|
|
msgid " (left unresolved)"
|
|
|
|
|
msgstr "(留下未解决)"
|
|
|
|
|
|
|
|
|
|
#: merge-recursive.c:1235
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"冲突(重命名/重命名):在 %3$s 中重命名 %1$s->%2$s,在 %6$s 中重命名 %4$s->"
|
|
|
|
|
"%5$s"
|
|
|
|
|
|
|
|
|
|
#: merge-recursive.c:1265
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Renaming %s to %s and %s to %s instead"
|
|
|
|
|
msgstr "而是重命名 %s 至 %s 以及 %s 至 %s"
|
|
|
|
|
|
|
|
|
|
#: merge-recursive.c:1464
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
|
|
|
|
|
msgstr "冲突(重命名/添加):在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
|
|
|
|
|
|
|
|
|
|
#: merge-recursive.c:1474
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Adding merged %s"
|
|
|
|
|
msgstr "添加合并后的 %s"
|
|
|
|
|
|
|
|
|
|
#: merge-recursive.c:1479 merge-recursive.c:1677
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Adding as %s instead"
|
|
|
|
|
msgstr "而是以 %s 为名添加"
|
|
|
|
|
|
|
|
|
|
#: merge-recursive.c:1530
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot read object %s"
|
|
|
|
|
msgstr "不能读取对象 %s"
|
|
|
|
|
|
|
|
|
|
#: merge-recursive.c:1533
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "object %s is not a blob"
|
|
|
|
|
msgstr "对象 %s 不是一个二进制对象(blob)"
|
|
|
|
|
|
|
|
|
|
#: merge-recursive.c:1581
|
|
|
|
|
msgid "modify"
|
|
|
|
|
msgstr "修改"
|
|
|
|
|
|
|
|
|
|
#: merge-recursive.c:1581
|
|
|
|
|
msgid "modified"
|
|
|
|
|
msgstr "修改"
|
|
|
|
|
|
|
|
|
|
#: merge-recursive.c:1591
|
|
|
|
|
msgid "content"
|
|
|
|
|
msgstr "内容"
|
|
|
|
|
|
|
|
|
|
#: merge-recursive.c:1598
|
|
|
|
|
msgid "add/add"
|
|
|
|
|
msgstr "添加/添加"
|
|
|
|
|
|
|
|
|
|
#: merge-recursive.c:1632
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Skipped %s (merged same as existing)"
|
|
|
|
|
msgstr "略过 %s(已经做过相同合并)"
|
|
|
|
|
|
|
|
|
|
#: merge-recursive.c:1646
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Auto-merging %s"
|
|
|
|
|
msgstr "自动合并 %s"
|
|
|
|
|
|
|
|
|
|
#: merge-recursive.c:1650 git-submodule.sh:844
|
|
|
|
|
msgid "submodule"
|
|
|
|
|
msgstr "子模组"
|
|
|
|
|
|
|
|
|
|
#: merge-recursive.c:1651
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "CONFLICT (%s): Merge conflict in %s"
|
|
|
|
|
msgstr "冲突(%s):合并冲突于 %s"
|
|
|
|
|
|
|
|
|
|
#: merge-recursive.c:1741
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Removing %s"
|
|
|
|
|
msgstr "删除 %s"
|
|
|
|
|
|
|
|
|
|
#: merge-recursive.c:1766
|
|
|
|
|
msgid "file/directory"
|
|
|
|
|
msgstr "文件/目录"
|
|
|
|
|
|
|
|
|
|
#: merge-recursive.c:1772
|
|
|
|
|
msgid "directory/file"
|
|
|
|
|
msgstr "目录/文件"
|
|
|
|
|
|
|
|
|
|
#: merge-recursive.c:1777
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
|
|
|
|
|
msgstr "冲突(%1$s):在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
|
|
|
|
|
|
|
|
|
|
#: merge-recursive.c:1787
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Adding %s"
|
|
|
|
|
msgstr "添加 %s"
|
|
|
|
|
|
|
|
|
|
#: merge-recursive.c:1804
|
|
|
|
|
msgid "Fatal merge failure, shouldn't happen."
|
|
|
|
|
msgstr "严重的合并错误,不应发生。"
|
|
|
|
|
|
|
|
|
|
#: merge-recursive.c:1823
|
|
|
|
|
msgid "Already up-to-date!"
|
|
|
|
|
msgstr "已经是最新的!"
|
|
|
|
|
|
|
|
|
|
#: merge-recursive.c:1832
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "merging of trees %s and %s failed"
|
|
|
|
|
msgstr "无法合并树 %s 和 %s"
|
|
|
|
|
|
|
|
|
|
#: merge-recursive.c:1862
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Unprocessed path??? %s"
|
|
|
|
|
msgstr "未处理的路径??? %s"
|
|
|
|
|
|
|
|
|
|
#: merge-recursive.c:1907
|
|
|
|
|
msgid "Merging:"
|
|
|
|
|
msgstr "合并:"
|
|
|
|
|
|
2012-08-07 01:10:34 +08:00
|
|
|
|
#: merge-recursive.c:1920
|
2012-08-02 11:50:59 +08:00
|
|
|
|
#, c-format
|
2012-08-07 01:10:34 +08:00
|
|
|
|
msgid "found %u common ancestor:"
|
|
|
|
|
msgid_plural "found %u common ancestors:"
|
|
|
|
|
msgstr[0] "发现 %u 个共同祖先:"
|
|
|
|
|
msgstr[1] "发现 %u 个共同祖先:"
|
2012-08-02 11:50:59 +08:00
|
|
|
|
|
2012-08-07 01:10:34 +08:00
|
|
|
|
#: merge-recursive.c:1957
|
2012-08-02 11:50:59 +08:00
|
|
|
|
msgid "merge returned no commit"
|
|
|
|
|
msgstr "合并未返回提交"
|
|
|
|
|
|
2012-08-07 01:10:34 +08:00
|
|
|
|
#: merge-recursive.c:2014
|
2012-08-02 11:50:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Could not parse object '%s'"
|
|
|
|
|
msgstr "不能解析对象 '%s'"
|
|
|
|
|
|
2012-08-07 01:10:34 +08:00
|
|
|
|
#: merge-recursive.c:2026 builtin/merge.c:697
|
2012-08-02 11:50:59 +08:00
|
|
|
|
msgid "Unable to write index."
|
|
|
|
|
msgstr "不能写入索引。"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: parse-options.c:494
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "..."
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "..."
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: parse-options.c:512
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "usage: %s"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "用法:%s"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#. TRANSLATORS: the colon here should align with the
|
|
|
|
|
#. one in "usage: %s" translation
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: parse-options.c:516
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid " or: %s"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr " 或:%s"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
# 译者:为保证在输出中对齐,注意调整句中空格!
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: parse-options.c:519
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid " %s"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr " %s"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: remote.c:1632
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, 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"
|
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 17:35:59 +08:00
|
|
|
|
msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: remote.c:1638
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, 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"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr[0] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\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 17:35:59 +08:00
|
|
|
|
msgstr[1] "您的分支落后 '%s' 共 %d 个提交,并且可以快进。\n"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: remote.c:1646
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, 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"
|
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 17:35:59 +08:00
|
|
|
|
msgstr[1] ""
|
|
|
|
|
"您的分支和 '%s' 出现了偏离,\n"
|
|
|
|
|
"并且各自分别有 %d 和 %d 处不同的提交。\n"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: sequencer.c:121 builtin/merge.c:865 builtin/merge.c:978
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/merge.c:1088 builtin/merge.c:1098
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Could not open '%s' for writing"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "不能为写入打开 '%s'"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: sequencer.c:123 builtin/merge.c:333 builtin/merge.c:868
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/merge.c:1090 builtin/merge.c:1103
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Could not write to '%s'"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "不能写入 '%s'"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: sequencer.c:144
|
2012-03-08 12:06:53 +08:00
|
|
|
|
msgid ""
|
|
|
|
|
"after resolving the conflicts, mark the corrected paths\n"
|
|
|
|
|
"with 'git add <paths>' or 'git rm <paths>'"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"冲突解决完毕后,用 'git add <paths>' 或 'git rm <paths>'\n"
|
|
|
|
|
"命令标记修正后的文件"
|
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: sequencer.c:147
|
2012-02-13 14:41:59 +08:00
|
|
|
|
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 <paths>' 或 'git rm <paths>'\n"
|
|
|
|
|
"对修正后的文件做标记,然后用 'git commit' 提交"
|
|
|
|
|
|
2012-06-02 17:12:59 +08:00
|
|
|
|
#: sequencer.c:160 sequencer.c:758 sequencer.c:841
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Could not write to %s"
|
|
|
|
|
msgstr "不能写入 %s"
|
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: sequencer.c:163
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Error wrapping up %s"
|
|
|
|
|
msgstr "错误收尾 %s"
|
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: sequencer.c:178
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "Your local changes would be overwritten by cherry-pick."
|
|
|
|
|
msgstr "您的本地修改将被拣选操作覆盖。"
|
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: sequencer.c:180
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "Your local changes would be overwritten by revert."
|
|
|
|
|
msgstr "您的本地修改将被还原操作覆盖。"
|
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: sequencer.c:183
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "Commit your changes or stash them to proceed."
|
|
|
|
|
msgstr "提交您的修改或保存进度后再继续。"
|
|
|
|
|
|
|
|
|
|
#. TRANSLATORS: %s will be "revert" or "cherry-pick"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: sequencer.c:233
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "%s: Unable to write new index file"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "%s:无法写入新索引文件"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: sequencer.c:261
|
|
|
|
|
msgid "Could not resolve HEAD commit\n"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "不能解析 HEAD 提交\n"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: sequencer.c:282
|
|
|
|
|
msgid "Unable to update cache tree\n"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "不能更新缓存\n"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-06-02 17:12:59 +08:00
|
|
|
|
#: sequencer.c:324
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "Could not parse commit %s\n"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "不能解析提交 %s\n"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-06-02 17:12:59 +08:00
|
|
|
|
#: sequencer.c:329
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "Could not parse parent commit %s\n"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "不能解析父提交 %s\n"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-06-02 17:12:59 +08:00
|
|
|
|
#: sequencer.c:395
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "Your index file is unmerged."
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "您的索引文件未完成合并。"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-06-02 17:12:59 +08:00
|
|
|
|
#: sequencer.c:398
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "You do not have a valid HEAD"
|
|
|
|
|
msgstr "您没有一个有效的 HEAD"
|
|
|
|
|
|
2012-06-02 17:12:59 +08:00
|
|
|
|
#: sequencer.c:413
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Commit %s is a merge but no -m option was given."
|
|
|
|
|
msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
|
|
|
|
|
|
2012-06-02 17:12:59 +08:00
|
|
|
|
#: sequencer.c:421
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Commit %s does not have parent %d"
|
|
|
|
|
msgstr "提交 %s 没有父提交 %d"
|
|
|
|
|
|
2012-06-02 17:12:59 +08:00
|
|
|
|
#: sequencer.c:425
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Mainline was specified but commit %s is not a merge."
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "指定了主线但提交 %s 不是一个合并。"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
|
|
|
|
#. TRANSLATORS: The first %s will be "revert" or
|
|
|
|
|
#. "cherry-pick", the second %s a SHA1
|
2012-06-02 17:12:59 +08:00
|
|
|
|
#: sequencer.c:436
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "%s: cannot parse parent commit %s"
|
|
|
|
|
msgstr "%s:不能解析父提交 %s"
|
|
|
|
|
|
2012-06-02 17:12:59 +08:00
|
|
|
|
#: sequencer.c:440
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Cannot get commit message for %s"
|
|
|
|
|
msgstr "不能得到 %s 的提交说明"
|
|
|
|
|
|
2012-06-02 17:12:59 +08:00
|
|
|
|
#: sequencer.c:524
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "could not revert %s... %s"
|
|
|
|
|
msgstr "不能还原 %s... %s"
|
|
|
|
|
|
2012-06-02 17:12:59 +08:00
|
|
|
|
#: sequencer.c:525
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "could not apply %s... %s"
|
|
|
|
|
msgstr "不能应用 %s... %s"
|
|
|
|
|
|
2012-06-02 17:12:59 +08:00
|
|
|
|
#: sequencer.c:553
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "empty commit set passed"
|
|
|
|
|
msgstr "提供了空的提交集"
|
|
|
|
|
|
2012-06-02 17:12:59 +08:00
|
|
|
|
#: sequencer.c:561
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "git %s: failed to read the index"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "git %s:无法读取索引"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-06-02 17:12:59 +08:00
|
|
|
|
#: sequencer.c:566
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "git %s: failed to refresh the index"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "git %s:无法刷新索引"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-06-02 17:12:59 +08:00
|
|
|
|
#: sequencer.c:624
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Cannot %s during a %s"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "无法 %s 在一个 %s 过程中"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-06-02 17:12:59 +08:00
|
|
|
|
#: sequencer.c:646
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Could not parse line %d."
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "不能解析第 %d 行。"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-06-02 17:12:59 +08:00
|
|
|
|
#: sequencer.c:651
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "No commits parsed."
|
2012-03-30 10:55:34 +08:00
|
|
|
|
msgstr "没有提交被解析。"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-06-02 17:12:59 +08:00
|
|
|
|
#: sequencer.c:664
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Could not open %s"
|
|
|
|
|
msgstr "不能打开 %s"
|
|
|
|
|
|
2012-06-02 17:12:59 +08:00
|
|
|
|
#: sequencer.c:668
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Could not read %s."
|
|
|
|
|
msgstr "不能读取 %s。"
|
|
|
|
|
|
2012-06-02 17:12:59 +08:00
|
|
|
|
#: sequencer.c:675
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Unusable instruction sheet: %s"
|
|
|
|
|
msgstr "无用的指令表单:%s"
|
|
|
|
|
|
2012-06-02 17:12:59 +08:00
|
|
|
|
#: sequencer.c:703
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Invalid key: %s"
|
|
|
|
|
msgstr "无效键名:%s"
|
|
|
|
|
|
2012-06-02 17:12:59 +08:00
|
|
|
|
#: sequencer.c:706
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Invalid value for %s: %s"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "%s 的值无效:%s"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-06-02 17:12:59 +08:00
|
|
|
|
#: sequencer.c:718
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Malformed options sheet: %s"
|
|
|
|
|
msgstr "非法的选项表单:%s"
|
|
|
|
|
|
2012-06-02 17:12:59 +08:00
|
|
|
|
#: sequencer.c:739
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "a cherry-pick or revert is already in progress"
|
|
|
|
|
msgstr "一个拣选或还原操作已在进行"
|
|
|
|
|
|
2012-06-02 17:12:59 +08:00
|
|
|
|
#: sequencer.c:740
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
|
|
|
|
|
msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
|
|
|
|
|
|
2012-06-02 17:12:59 +08:00
|
|
|
|
#: sequencer.c:744
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Could not create sequencer directory %s"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "不能创建序列目录 %s"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-06-02 17:12:59 +08:00
|
|
|
|
#: sequencer.c:760 sequencer.c:845
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Error wrapping up %s."
|
|
|
|
|
msgstr "错误收尾 %s。"
|
|
|
|
|
|
2012-06-02 17:12:59 +08:00
|
|
|
|
#: sequencer.c:779 sequencer.c:913
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "no cherry-pick or revert in progress"
|
|
|
|
|
msgstr "没有拣选或还原操作在进行"
|
|
|
|
|
|
2012-06-02 17:12:59 +08:00
|
|
|
|
#: sequencer.c:781
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "cannot resolve HEAD"
|
|
|
|
|
msgstr "不能解析 HEAD"
|
|
|
|
|
|
2012-06-02 17:12:59 +08:00
|
|
|
|
#: sequencer.c:783
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "cannot abort from a branch yet to be born"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "不能从尚未建立的分支终止"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: sequencer.c:805 builtin/apply.c:3988
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot open %s: %s"
|
|
|
|
|
msgstr "不能打开 %s:%s"
|
|
|
|
|
|
2012-06-02 17:12:59 +08:00
|
|
|
|
#: sequencer.c:808
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot read %s: %s"
|
|
|
|
|
msgstr "不能读取 %s:%s"
|
|
|
|
|
|
2012-06-02 17:12:59 +08:00
|
|
|
|
#: sequencer.c:809
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "unexpected end of file"
|
2012-08-07 17:25:21 +08:00
|
|
|
|
msgstr "意外的文件结束"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-06-02 17:12:59 +08:00
|
|
|
|
#: sequencer.c:815
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-06-02 17:12:59 +08:00
|
|
|
|
#: sequencer.c:838
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Could not format %s."
|
|
|
|
|
msgstr "不能格式化 %s。"
|
|
|
|
|
|
2012-06-02 17:12:59 +08:00
|
|
|
|
#: sequencer.c:1000
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "Can't revert as initial commit"
|
|
|
|
|
msgstr "不能作为初始提交还原"
|
|
|
|
|
|
2012-06-02 17:12:59 +08:00
|
|
|
|
#: sequencer.c:1001
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "Can't cherry-pick into empty head"
|
|
|
|
|
msgstr "不能拣选到空分支"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: sha1_name.c:1044
|
2012-04-30 00:06:55 +08:00
|
|
|
|
msgid "HEAD does not point to a branch"
|
|
|
|
|
msgstr "HEAD 没有指向一个分支"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: sha1_name.c:1047
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "No such branch: '%s'"
|
|
|
|
|
msgstr "没有此分支:'%s'"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: sha1_name.c:1049
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "No upstream configured for branch '%s'"
|
|
|
|
|
msgstr "尚未给分支 '%s' 设置上游"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: sha1_name.c:1052
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Upstream branch '%s' not stored as a remote-tracking branch"
|
|
|
|
|
msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
|
|
|
|
|
|
2012-06-02 17:12:59 +08:00
|
|
|
|
#: wrapper.c:413
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to look up current user in the passwd file: %s"
|
|
|
|
|
msgstr "无法在 passwd 文件中查询到当前用户:%s"
|
|
|
|
|
|
|
|
|
|
#: wrapper.c:414
|
|
|
|
|
msgid "no such user"
|
|
|
|
|
msgstr "无此用户"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:140
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "Unmerged paths:"
|
|
|
|
|
msgstr "未合并的路径:"
|
|
|
|
|
|
2012-03-27 14:46:11 +08:00
|
|
|
|
# 译者:注意保持前导空格
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:167 wt-status.c:194
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid " (use \"git reset %s <file>...\" to unstage)"
|
|
|
|
|
msgstr " (使用 \"git reset %s <file>...\" 撤出暂存区)"
|
|
|
|
|
|
2012-03-27 14:46:11 +08:00
|
|
|
|
# 译者:注意保持前导空格
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:169 wt-status.c:196
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid " (use \"git rm --cached <file>...\" to unstage)"
|
|
|
|
|
msgstr " (使用 \"git rm --cached <file>...\" 撤出暂存区)"
|
|
|
|
|
|
2012-03-27 14:46:11 +08:00
|
|
|
|
# 译者:注意保持前导空格
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:173
|
2012-07-04 17:20:34 +08:00
|
|
|
|
msgid " (use \"git add <file>...\" to mark resolution)"
|
|
|
|
|
msgstr " (使用 \"git add <file>...\" 标记解决方案)"
|
|
|
|
|
|
|
|
|
|
# 译者:注意保持前导空格
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:175 wt-status.c:179
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
|
|
|
|
|
msgstr " (酌情使用 \"git add/rm <file>...\" 标记解决方案)"
|
|
|
|
|
|
2012-07-04 17:20:34 +08:00
|
|
|
|
# 译者:注意保持前导空格
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:177
|
2012-07-04 17:20:34 +08:00
|
|
|
|
msgid " (use \"git rm <file>...\" to mark resolution)"
|
|
|
|
|
msgstr " (使用 \"git rm <file>...\" 标记解决方案)"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:188
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "Changes to be committed:"
|
|
|
|
|
msgstr "要提交的变更:"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:206
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "Changes not staged for commit:"
|
2012-03-30 10:55:34 +08:00
|
|
|
|
msgstr "尚未暂存以备提交的变更:"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-03-27 14:46:11 +08:00
|
|
|
|
# 译者:注意保持前导空格
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:210
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid " (use \"git add <file>...\" to update what will be committed)"
|
|
|
|
|
msgstr " (使用 \"git add <file>...\" 更新要提交的内容)"
|
|
|
|
|
|
2012-03-27 14:46:11 +08:00
|
|
|
|
# 译者:注意保持前导空格
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:212
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
|
|
|
|
|
msgstr " (使用 \"git add/rm <file>...\" 更新要提交的内容)"
|
|
|
|
|
|
2012-03-27 14:46:11 +08:00
|
|
|
|
# 译者:注意保持前导空格
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:213
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid ""
|
|
|
|
|
" (use \"git checkout -- <file>...\" to discard changes in working directory)"
|
|
|
|
|
msgstr " (使用 \"git checkout -- <file>...\" 丢弃工作区的改动)"
|
|
|
|
|
|
2012-03-27 14:46:11 +08:00
|
|
|
|
# 译者:注意保持前导空格
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:215
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid " (commit or discard the untracked or modified content in submodules)"
|
|
|
|
|
msgstr " (提交或丢弃子模组中未跟踪或修改的内容)"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:224
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "%s files:"
|
|
|
|
|
msgstr "%s文件:"
|
|
|
|
|
|
2012-03-27 14:46:11 +08:00
|
|
|
|
# 译者:注意保持前导空格
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:227
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid " (use \"git %s <file>...\" to include in what will be committed)"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr " (使用 \"git %s <file>...\" 以包含要提交的内容)"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:244
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "bug"
|
|
|
|
|
msgstr "bug"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:249
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "both deleted:"
|
|
|
|
|
msgstr "双方删除:"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:250
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "added by us:"
|
|
|
|
|
msgstr "由我们添加:"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:251
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "deleted by them:"
|
|
|
|
|
msgstr "由他们删除:"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:252
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "added by them:"
|
|
|
|
|
msgstr "由他们添加:"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:253
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "deleted by us:"
|
|
|
|
|
msgstr "由我们删除:"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:254
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "both added:"
|
|
|
|
|
msgstr "双方添加:"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:255
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "both modified:"
|
|
|
|
|
msgstr "双方修改:"
|
|
|
|
|
|
2012-03-27 14:46:11 +08:00
|
|
|
|
# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:285
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "new commits, "
|
2012-03-05 13:16:27 +08:00
|
|
|
|
msgstr "新提交, "
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-03-27 14:46:11 +08:00
|
|
|
|
# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:287
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "modified content, "
|
2012-03-05 13:16:27 +08:00
|
|
|
|
msgstr "修改的内容, "
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-03-27 14:46:11 +08:00
|
|
|
|
# 译者:末尾两个字节可能被删减,如果翻译为中文标点会出现半个汉字
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:289
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "untracked content, "
|
2012-03-05 13:16:27 +08:00
|
|
|
|
msgstr "未跟踪的内容, "
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-03-27 14:46:11 +08:00
|
|
|
|
# 译者:为保证在输出中对齐,注意调整句中空格!
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:303
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "new file: %s"
|
|
|
|
|
msgstr "新文件: %s"
|
|
|
|
|
|
2012-03-27 14:46:11 +08:00
|
|
|
|
# 译者:为保证在输出中对齐,注意调整句中空格!
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:306
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "copied: %s -> %s"
|
|
|
|
|
msgstr "拷贝: %s -> %s"
|
|
|
|
|
|
2012-03-27 14:46:11 +08:00
|
|
|
|
# 译者:为保证在输出中对齐,注意调整句中空格!
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:309
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "deleted: %s"
|
|
|
|
|
msgstr "删除: %s"
|
|
|
|
|
|
2012-03-27 14:46:11 +08:00
|
|
|
|
# 译者:为保证在输出中对齐,注意调整句中空格!
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:312
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "modified: %s"
|
|
|
|
|
msgstr "修改: %s"
|
|
|
|
|
|
2012-03-27 14:46:11 +08:00
|
|
|
|
# 译者:为保证在输出中对齐,注意调整句中空格!
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:315
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "renamed: %s -> %s"
|
|
|
|
|
msgstr "重命名: %s -> %s"
|
|
|
|
|
|
2012-03-27 14:46:11 +08:00
|
|
|
|
# 译者:为保证在输出中对齐,注意调整句中空格!
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:318
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "typechange: %s"
|
|
|
|
|
msgstr "类型变更: %s"
|
|
|
|
|
|
2012-03-27 14:46:11 +08:00
|
|
|
|
# 译者:为保证在输出中对齐,注意调整句中空格!
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:321
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unknown: %s"
|
|
|
|
|
msgstr "未知: %s"
|
|
|
|
|
|
2012-03-27 14:46:11 +08:00
|
|
|
|
# 译者:为保证在输出中对齐,注意调整句中空格!
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:324
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unmerged: %s"
|
|
|
|
|
msgstr "未合并: %s"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:327
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "bug: unhandled diff status %c"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "bug:未处理的差异状态 %c"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:785
|
2012-07-04 17:20:34 +08:00
|
|
|
|
msgid "You have unmerged paths."
|
|
|
|
|
msgstr "您有路径尚未合并。"
|
|
|
|
|
|
|
|
|
|
# 译者:注意保持前导空格
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:788 wt-status.c:912
|
2012-07-04 17:20:34 +08:00
|
|
|
|
msgid " (fix conflicts and run \"git commit\")"
|
|
|
|
|
msgstr " (解决冲突并运行 \"git commit\")"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:791
|
2012-07-04 17:20:34 +08:00
|
|
|
|
msgid "All conflicts fixed but you are still merging."
|
|
|
|
|
msgstr "所有冲突已解决但您仍处于合并中。"
|
|
|
|
|
|
|
|
|
|
# 译者:注意保持前导空格
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:794
|
2012-07-04 17:20:34 +08:00
|
|
|
|
msgid " (use \"git commit\" to conclude merge)"
|
|
|
|
|
msgstr " (使用 \"git commit\" 结束合并)"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:804
|
2012-07-04 17:20:34 +08:00
|
|
|
|
msgid "You are in the middle of an am session."
|
|
|
|
|
msgstr "您正处于一个 am 过程中。"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:807
|
2012-07-04 17:20:34 +08:00
|
|
|
|
msgid "The current patch is empty."
|
|
|
|
|
msgstr "当前的补丁为空。"
|
|
|
|
|
|
|
|
|
|
# 译者:注意保持前导空格
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:811
|
2012-07-04 17:20:34 +08:00
|
|
|
|
msgid " (fix conflicts and then run \"git am --resolved\")"
|
|
|
|
|
msgstr " (解决冲突,然后运行 \"git am --resolved\")"
|
|
|
|
|
|
|
|
|
|
# 译者:注意保持前导空格
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:813
|
2012-07-04 17:20:34 +08:00
|
|
|
|
msgid " (use \"git am --skip\" to skip this patch)"
|
|
|
|
|
msgstr " (使用 \"git am --skip\" 跳过此补丁)"
|
|
|
|
|
|
|
|
|
|
# 译者:注意保持前导空格
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:815
|
2012-07-04 17:20:34 +08:00
|
|
|
|
msgid " (use \"git am --abort\" to restore the original branch)"
|
|
|
|
|
msgstr " (使用 \"git am --abort\" 恢复原有分支)"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:873 wt-status.c:883
|
2012-07-04 17:20:34 +08:00
|
|
|
|
msgid "You are currently rebasing."
|
|
|
|
|
msgstr "您正在变基。"
|
|
|
|
|
|
|
|
|
|
# 译者:注意保持前导空格
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:876
|
2012-07-04 17:20:34 +08:00
|
|
|
|
msgid " (fix conflicts and then run \"git rebase --continue\")"
|
|
|
|
|
msgstr " (解决冲突,然后运行 \"git rebase --continue\")"
|
|
|
|
|
|
|
|
|
|
# 译者:注意保持前导空格
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:878
|
2012-07-04 17:20:34 +08:00
|
|
|
|
msgid " (use \"git rebase --skip\" to skip this patch)"
|
|
|
|
|
msgstr " (使用 \"git rebase --skip\" 跳过此补丁)"
|
|
|
|
|
|
|
|
|
|
# 译者:注意保持前导空格
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:880
|
2012-07-04 17:20:34 +08:00
|
|
|
|
msgid " (use \"git rebase --abort\" to check out the original branch)"
|
|
|
|
|
msgstr " (使用 \"git rebase --abort\" 以检出原有分支)"
|
|
|
|
|
|
|
|
|
|
# 译者:注意保持前导空格
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:886
|
2012-07-04 17:20:34 +08:00
|
|
|
|
msgid " (all conflicts fixed: run \"git rebase --continue\")"
|
|
|
|
|
msgstr " (所有冲突已解决:运行 \"git rebase --continue\")"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:888
|
2012-07-04 17:20:34 +08:00
|
|
|
|
msgid "You are currently splitting a commit during a rebase."
|
|
|
|
|
msgstr "您正在变基过程中拆分一个提交。"
|
|
|
|
|
|
|
|
|
|
# 译者:注意保持前导空格
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:891
|
2012-07-04 17:20:34 +08:00
|
|
|
|
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
|
|
|
|
|
msgstr " (一旦您工作目录提交干净后,运行 \"git rebase --continue\")"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:893
|
2012-07-04 17:20:34 +08:00
|
|
|
|
msgid "You are currently editing a commit during a rebase."
|
|
|
|
|
msgstr "您正在变基过程中编辑一个提交。"
|
|
|
|
|
|
|
|
|
|
# 译者:注意保持前导空格
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:896
|
2012-07-04 17:20:34 +08:00
|
|
|
|
msgid " (use \"git commit --amend\" to amend the current commit)"
|
|
|
|
|
msgstr " (使用 \"git commit --amend\" 修补当前提交)"
|
|
|
|
|
|
|
|
|
|
# 译者:注意保持前导空格
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:898
|
2012-07-04 17:20:34 +08:00
|
|
|
|
msgid ""
|
|
|
|
|
" (use \"git rebase --continue\" once you are satisfied with your changes)"
|
2012-07-31 06:45:33 +08:00
|
|
|
|
msgstr " (执行 \"git rebase --continue\" 一旦您满意您的修改)"
|
2012-07-04 17:20:34 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:908
|
2012-07-04 17:20:34 +08:00
|
|
|
|
msgid "You are currently cherry-picking."
|
|
|
|
|
msgstr "您正在做拣选操作。"
|
|
|
|
|
|
|
|
|
|
# 译者:注意保持前导空格
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:915
|
2012-07-04 17:20:34 +08:00
|
|
|
|
msgid " (all conflicts fixed: run \"git commit\")"
|
|
|
|
|
msgstr " (解决所有冲突后,执行 \"git commit\")"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:924
|
2012-07-04 17:20:34 +08:00
|
|
|
|
msgid "You are currently bisecting."
|
|
|
|
|
msgstr "您正在做二分查找。"
|
|
|
|
|
|
|
|
|
|
# 译者:注意保持前导空格
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:927
|
2012-07-04 17:20:34 +08:00
|
|
|
|
msgid " (use \"git bisect reset\" to get back to the original branch)"
|
|
|
|
|
msgstr " (使用 \"git bisect reset\" 以回到原有分支)"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:978
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "On branch "
|
|
|
|
|
msgstr "位于分支 "
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:985
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "Not currently on any branch."
|
|
|
|
|
msgstr "当前不在任何分支上。"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:997
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "Initial commit"
|
|
|
|
|
msgstr "初始提交"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:1011
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "Untracked"
|
|
|
|
|
msgstr "未跟踪的"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:1013
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "Ignored"
|
|
|
|
|
msgstr "忽略的"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:1015
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Untracked files not listed%s"
|
|
|
|
|
msgstr "未跟踪的文件没有列出%s"
|
|
|
|
|
|
2012-03-30 10:55:34 +08:00
|
|
|
|
# 译者:中文字符串拼接,可删除前导空格
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:1017
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid " (use -u option to show untracked files)"
|
2012-03-30 10:55:34 +08:00
|
|
|
|
msgstr "(使用 -u 参数显示未跟踪的文件)"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:1023
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "No changes"
|
|
|
|
|
msgstr "没有修改"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:1027
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "no changes added to commit%s\n"
|
|
|
|
|
msgstr "修改尚未加入提交%s\n"
|
|
|
|
|
|
2012-03-30 10:55:34 +08:00
|
|
|
|
# 译者:中文字符串拼接,可删除前导空格
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:1029
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid " (use \"git add\" and/or \"git commit -a\")"
|
2012-03-30 10:55:34 +08:00
|
|
|
|
msgstr "(使用 \"git add\" 和/或 \"git commit -a\")"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:1031
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "nothing added to commit but untracked files present%s\n"
|
|
|
|
|
msgstr "空提交但存在未跟踪文件%s\n"
|
|
|
|
|
|
2012-03-30 10:55:34 +08:00
|
|
|
|
# 译者:中文字符串拼接,可删除前导空格
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:1033
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid " (use \"git add\" to track)"
|
2012-03-30 10:55:34 +08:00
|
|
|
|
msgstr "(使用 \"git add\" 建立跟踪)"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:1035 wt-status.c:1038 wt-status.c:1041
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "nothing to commit%s\n"
|
|
|
|
|
msgstr "无须提交%s\n"
|
|
|
|
|
|
2012-03-30 10:55:34 +08:00
|
|
|
|
# 译者:中文字符串拼接,可删除前导空格
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:1036
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid " (create/copy files and use \"git add\" to track)"
|
2012-03-30 10:55:34 +08:00
|
|
|
|
msgstr "(新建/拷贝的文件使用 \"git add\" 建立跟踪)"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-03-30 10:55:34 +08:00
|
|
|
|
# 译者:中文字符串拼接,可删除前导空格
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:1039
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid " (use -u to show untracked files)"
|
2012-03-30 10:55:34 +08:00
|
|
|
|
msgstr "(使用 -u 显示未跟踪文件)"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-03-30 10:55:34 +08:00
|
|
|
|
# 译者:中文字符串拼接,可删除前导空格
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:1042
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid " (working directory clean)"
|
2012-03-30 10:55:34 +08:00
|
|
|
|
msgstr "(干净的工作区)"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:1150
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "HEAD (no branch)"
|
2012-02-29 20:53:26 +08:00
|
|
|
|
msgstr "HEAD(非分支)"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-03-27 14:46:11 +08:00
|
|
|
|
# 译者:注意保持句尾空格
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:1156
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "Initial commit on "
|
|
|
|
|
msgstr "初始提交于 "
|
|
|
|
|
|
2012-03-27 14:46:11 +08:00
|
|
|
|
# 译者:注意保持句尾空格
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:1171
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "behind "
|
|
|
|
|
msgstr "落后 "
|
|
|
|
|
|
2012-03-27 14:46:11 +08:00
|
|
|
|
# 译者:注意保持句尾空格
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:1174 wt-status.c:1177
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "ahead "
|
|
|
|
|
msgstr "领先 "
|
|
|
|
|
|
2012-03-27 14:46:11 +08:00
|
|
|
|
# 译者:注意保持句尾空格
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: wt-status.c:1179
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid ", behind "
|
|
|
|
|
msgstr ",落后 "
|
|
|
|
|
|
|
|
|
|
#: builtin/add.c:62
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unexpected diff status %c"
|
|
|
|
|
msgstr "意外的差异状态 %c"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/add.c:67 builtin/commit.c:229
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "updating files failed"
|
|
|
|
|
msgstr "更新文件失败"
|
|
|
|
|
|
|
|
|
|
#: builtin/add.c:77
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "remove '%s'\n"
|
|
|
|
|
msgstr "删除 '%s'\n"
|
|
|
|
|
|
|
|
|
|
#: builtin/add.c:176
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Path '%s' is in submodule '%.*s'"
|
|
|
|
|
msgstr "路径 '%s' 属于模组 '%.*s'"
|
|
|
|
|
|
|
|
|
|
#: builtin/add.c:192
|
|
|
|
|
msgid "Unstaged changes after refreshing the index:"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "刷新索引之后尚未被暂存的变更:"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-04 17:20:34 +08:00
|
|
|
|
#: builtin/add.c:195 builtin/add.c:459 builtin/rm.c:186
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "pathspec '%s' did not match any files"
|
|
|
|
|
msgstr "路径 '%s' 未匹配任何文件"
|
|
|
|
|
|
|
|
|
|
#: builtin/add.c:209
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "'%s' is beyond a symbolic link"
|
|
|
|
|
msgstr "'%s' 位于符号链接中"
|
|
|
|
|
|
|
|
|
|
#: builtin/add.c:276
|
|
|
|
|
msgid "Could not read the index"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "不能读取索引"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/add.c:286
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Could not open '%s' for writing."
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "不能为写入打开 '%s'。"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/add.c:290
|
|
|
|
|
msgid "Could not write patch"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "不能写补丁"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/add.c:295
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Could not stat '%s'"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "不能查看文件状态 '%s'"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/add.c:297
|
|
|
|
|
msgid "Empty patch. Aborted."
|
|
|
|
|
msgstr "空补丁。异常终止。"
|
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/add.c:303
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Could not apply '%s'"
|
|
|
|
|
msgstr "不能应用 '%s'"
|
|
|
|
|
|
|
|
|
|
#: builtin/add.c:312
|
|
|
|
|
msgid "The following paths are ignored by one of your .gitignore files:\n"
|
|
|
|
|
msgstr "下列路径被您的一个 .gitignore 文件所忽略:\n"
|
|
|
|
|
|
|
|
|
|
#: builtin/add.c:352
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Use -f if you really want to add them.\n"
|
|
|
|
|
msgstr "使用 -f 参数如果您确实要添加它们。\n"
|
|
|
|
|
|
|
|
|
|
#: builtin/add.c:353
|
|
|
|
|
msgid "no files added"
|
|
|
|
|
msgstr "没有文件被添加"
|
|
|
|
|
|
|
|
|
|
#: builtin/add.c:359
|
|
|
|
|
msgid "adding files failed"
|
|
|
|
|
msgstr "添加文件失败"
|
|
|
|
|
|
|
|
|
|
#: builtin/add.c:391
|
|
|
|
|
msgid "-A and -u are mutually incompatible"
|
|
|
|
|
msgstr "-A 和 -u 选项互斥"
|
|
|
|
|
|
|
|
|
|
#: builtin/add.c:393
|
|
|
|
|
msgid "Option --ignore-missing can only be used together with --dry-run"
|
2012-08-02 11:50:59 +08:00
|
|
|
|
msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/add.c:413
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Nothing specified, nothing added.\n"
|
|
|
|
|
msgstr "没有指定文件,也没有文件被添加。\n"
|
|
|
|
|
|
|
|
|
|
#: builtin/add.c:414
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Maybe you wanted to say 'git add .'?\n"
|
|
|
|
|
msgstr "也许您想要执行 'git add .'?\n"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:289 builtin/mv.c:82
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/rm.c:162
|
|
|
|
|
msgid "index file corrupt"
|
|
|
|
|
msgstr "索引文件损坏"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/add.c:480 builtin/apply.c:4433 builtin/mv.c:229 builtin/rm.c:260
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "Unable to write new index file"
|
|
|
|
|
msgstr "无法写入新索引文件"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:57
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "git apply [options] [<patch>...]"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "git apply [选项] [<补丁>...]"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:110
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "unrecognized whitespace option '%s'"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "未能识别的空白字符选项 '%s'"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:125
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "unrecognized whitespace ignore option '%s'"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "未能识别的空白字符忽略选项 '%s'"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:824
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Cannot prepare timestamp regexp %s"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "无法准备时间戳正则表达式 %s"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:833
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "regexec returned %d for input: %s"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "regexec 返回 %d,输入为:%s"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:914
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "unable to find filename in patch at line %d"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "不能在补丁的第 %d 行找到文件名"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:946
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
|
2012-08-07 17:25:21 +08:00
|
|
|
|
msgstr "git apply:错误的 git-diff - 应为 /dev/null,但在第 %2$d 行得到 %1$s"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:950
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "git apply:错误的 git-diff - 第 %d 行上新文件名不一致"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:951
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "git apply:错误的 git-diff - 第 %d 行上旧文件名不一致"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:958
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "git apply: bad git-diff - expected /dev/null on line %d"
|
2012-08-07 17:25:21 +08:00
|
|
|
|
msgstr "git apply:错误的 git-diff - 第 %d 行处应为 /dev/null"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:1403
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "recount: unexpected line: %.*s"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "recount:意外的行:%.*s"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:1460
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "patch fragment without header at line %d: %.*s"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "第 %d 行的补丁片段没有头信息:%.*s"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:1477
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#, 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)"
|
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 17:35:59 +08:00
|
|
|
|
msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
|
|
|
|
|
msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息(第 %d 行)"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:1637
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "new file depends on old contents"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "新文件依赖旧内容"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:1639
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "deleted file still has contents"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "删除的文件仍有内容"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:1665
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "corrupt patch at line %d"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "补丁损坏位于第 %d 行"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:1701
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "new file %s depends on old contents"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "新文件 %s 依赖旧内容"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:1703
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "deleted file %s still has contents"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "删除的文件 %s 仍有内容"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:1706
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "** warning: file %s becomes empty but is not deleted"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "** 警告:文件 %s 成为空文件但并未删除"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:1852
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "corrupt binary patch at line %d: %.*s"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "二进制补丁在第 %d 行损坏:%.*s"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#. there has to be one hunk (forward hunk)
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:1881
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unrecognized binary patch at line %d"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "未能识别的二进制补丁位于第 %d 行"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:1967
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "patch with only garbage at line %d"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "补丁文件的第 %d 行只有垃圾数据"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:2057
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "unable to read symlink %s"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "无法读取符号链接 %s"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:2061
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "unable to open or read %s"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "不能打开或读取 %s"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:2132
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "oops"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "哎哟"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:2654
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "invalid start of line: '%c'"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "无效的行首字符:'%c'"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:2772
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Hunk #%d succeeded at %d (offset %d line)."
|
|
|
|
|
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr[0] "块 #%d 成功应用于 %d (偏移 %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 17:35:59 +08:00
|
|
|
|
msgstr[1] "块 #%d 成功应用于 %d (偏移 %d 行)"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:2784
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "上下文减少到(%ld/%ld)以在第 %d 行应用补丁片段"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:2790
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"while searching for:\n"
|
|
|
|
|
"%.*s"
|
|
|
|
|
msgstr ""
|
2012-05-30 12:19:47 +08:00
|
|
|
|
"当查询:\n"
|
|
|
|
|
"%.*s"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:2809
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "missing binary patch data for '%s'"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "缺失 '%s' 的二进制补丁数据"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:2912
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "binary patch does not apply to '%s'"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "二进制补丁未应用到 '%s'"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:2918
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
|
2012-08-07 17:25:21 +08:00
|
|
|
|
msgstr "到 '%s' 的二进制补丁产生了不正确的结果(应为 %s,却为 %s)"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:2939
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "patch failed: %s:%ld"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "打补丁失败:%s:%ld"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:3061
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#, c-format
|
2012-07-31 06:45:33 +08:00
|
|
|
|
msgid "cannot checkout %s"
|
|
|
|
|
msgstr "不能检出 %s"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:3106 builtin/apply.c:3115 builtin/apply.c:3159
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "read of %s failed"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "读取 %s 失败"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:3139 builtin/apply.c:3361
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-07-31 06:45:33 +08:00
|
|
|
|
msgid "path %s has been renamed/deleted"
|
|
|
|
|
msgstr "路径 %s 已经被重命名/删除"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:3220 builtin/apply.c:3375
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#, c-format
|
2012-07-31 06:45:33 +08:00
|
|
|
|
msgid "%s: does not exist in index"
|
|
|
|
|
msgstr "%s:不存在于索引中"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:3224 builtin/apply.c:3367 builtin/apply.c:3389
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "%s: %s"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "%s:%s"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:3229 builtin/apply.c:3383
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "%s: does not match index"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "%s:和索引不匹配"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:3331
|
|
|
|
|
msgid "removal patch leaves file contents"
|
|
|
|
|
msgstr "移除补丁仍留下了文件内容"
|
|
|
|
|
|
|
|
|
|
#: builtin/apply.c:3400
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "%s: wrong type"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "%s:错误类型"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:3402
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "%s has type %o, expected %o"
|
2012-08-07 17:25:21 +08:00
|
|
|
|
msgstr "%s 的类型是 %o,应为 %o"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:3503
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "%s: already exists in index"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "%s:已经存在于索引中"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:3506
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "%s: already exists in working directory"
|
|
|
|
|
msgstr "%s:已经存在于工作区中"
|
|
|
|
|
|
|
|
|
|
#: builtin/apply.c:3526
|
2012-06-02 17:12:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "new mode (%o) of %s does not match old mode (%o)"
|
|
|
|
|
msgstr "%2$s 的新模式(%1$o)和旧模式(%3$o)不匹配"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:3531
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#, c-format
|
2012-06-02 17:12:59 +08:00
|
|
|
|
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
|
|
|
|
|
msgstr "%2$s 的新模式(%1$o)和 %4$s 的旧模式(%3$o)不匹配"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:3539
|
2012-06-02 17:12:59 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "%s: patch does not apply"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "%s:补丁未应用"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:3552
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Checking patch %s..."
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "检查补丁 %s..."
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:3607 builtin/checkout.c:213 builtin/reset.c:158
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "make_cache_entry failed for path '%s'"
|
|
|
|
|
msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:3750
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "unable to remove %s from index"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "不能从索引中移除 %s"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:3778
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "corrupt patch for subproject %s"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "子项目 %s 损坏的补丁"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:3782
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "unable to stat newly created file '%s'"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "不能枚举新建文件 '%s' 的状态"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:3787
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to create backing store for newly created file %s"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "不能为新建文件 %s 创建后端存储"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:3790 builtin/apply.c:3898
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "unable to add cache entry for %s"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "无法为 %s 添加缓存条目"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:3823
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "closing file '%s'"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "关闭文件 '%s'"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:3872
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "unable to write file '%s' mode %o"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "不能写文件 '%s' 权限 %o"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:3959
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Applied patch %s cleanly."
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "成功应用补丁 %s。"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:3967
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "internal error"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "内部错误"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#. Say this even without --verbose
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:3970
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Applying patch %%s with %d reject..."
|
|
|
|
|
msgid_plural "Applying patch %%s with %d rejects..."
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr[0] "应用补丁 %%s 时 %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 17:35:59 +08:00
|
|
|
|
msgstr[1] "应用补丁 %%s 时 %d 个被拒绝..."
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:3980
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "truncating .rej filename to %.*s.rej"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "截短 .rej 文件名为 %.*s.rej"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:4001
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Hunk #%d applied cleanly."
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "第 #%d 个片段成功应用。"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:4004
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Rejected hunk #%d."
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "拒绝第 #%d 个片段。"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:4154
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "unrecognized input"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "未能识别的输入"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:4165
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "unable to read index file"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "无法读取索引文件"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:4284 builtin/apply.c:4287
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "path"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "路径"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:4285
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "don't apply changes matching the given path"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "不要应用与给出路径向匹配的变更"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:4288
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "apply changes matching the given path"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "应用与给出路径向匹配的变更"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:4290
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "num"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "数字"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:4291
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "remove <num> leading slashes from traditional diff paths"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "从传统的 diff 路径中移除 <数字> 个前导路径"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:4294
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "ignore additions made by the patch"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "忽略补丁中的添加的文件"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:4296
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "instead of applying the patch, output diffstat for the input"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "不应用补丁,而是显示输入的差异统计(diffstat)"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:4300
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "shows number of added and deleted lines in decimal notation"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "以数字方式显示添加或删除行的数量"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:4302
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "instead of applying the patch, output a summary for the input"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "不应用补丁,而是显示输入的概要"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:4304
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "instead of applying the patch, see if the patch is applicable"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "不应用补丁,而是查看补丁是否可应用"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:4306
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "make sure the patch is applicable to the current index"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "确认补丁可以应用到当前索引"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:4308
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "apply a patch without touching the working tree"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "应用补丁而不修改工作区"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:4310
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "also apply the patch (use with --stat/--summary/--check)"
|
2012-08-02 11:50:59 +08:00
|
|
|
|
msgstr "还应用此补丁(使用 --stat/--summary/--check 参数)"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:4312
|
|
|
|
|
msgid "attempt three-way merge if a patch does not apply"
|
|
|
|
|
msgstr "如果一个补丁不能应用则尝试三路合并"
|
|
|
|
|
|
|
|
|
|
#: builtin/apply.c:4314
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "build a temporary index based on embedded index information"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "创建一个临时索引基于嵌入的索引信息"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:4316
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "paths are separated with NUL character"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "路径以 NUL 字符分隔"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:4319
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "ensure at least <n> lines of context match"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "确保至少匹配 <n> 行上下文"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:4320
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "action"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "动作"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:4321
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "detect new or modified lines that have whitespace errors"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "检查新增和修改的行中间的空白字符滥用"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:4324 builtin/apply.c:4327
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "ignore changes in whitespace when finding context"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "查找上下文时忽略空白字符的变更"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:4330
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "apply the patch in reverse"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "反向应用补丁"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:4332
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "don't expect at least one line of context"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "无需至少一行上下文"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:4334
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "leave the rejected hunks in corresponding *.rej files"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:4336
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "allow overlapping hunks"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "允许重叠的补丁片段"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:4337
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "be verbose"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "冗长输出"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:4339
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "tolerate incorrectly detected missing new-line at the end of file"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "宽容不正确的文件末尾换行符"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:4342
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "do not trust the line counts in the hunk headers"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "不信任补丁片段的头信息中的行号"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:4344
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "root"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "根目录"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:4345
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "prepend <root> to all filenames"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "为所有文件名前添加 <根目录>"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:4367
|
|
|
|
|
msgid "--3way outside a repository"
|
|
|
|
|
msgstr "--3way 在一个版本库之外"
|
|
|
|
|
|
|
|
|
|
#: builtin/apply.c:4375
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "--index outside a repository"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "--index 在一个版本库之外"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:4378
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "--cached outside a repository"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "--cached 在一个版本库之外"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:4394
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "can't open patch '%s'"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "不能打开补丁 '%s'"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:4408
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "squelched %d whitespace error"
|
|
|
|
|
msgid_plural "squelched %d whitespace errors"
|
2012-05-30 12:19:47 +08: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 17:35:59 +08:00
|
|
|
|
msgstr[1] "抑制下仍有 %d 个空白字符误用"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/apply.c:4414 builtin/apply.c:4424
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "%d line adds whitespace errors."
|
|
|
|
|
msgid_plural "%d lines add whitespace errors."
|
2012-05-30 12:19:47 +08: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 17:35:59 +08:00
|
|
|
|
msgstr[1] "%d 行有空白字符误用。"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/archive.c:17
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "could not create archive file '%s'"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "不能创建归档文件 '%s'"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/archive.c:20
|
|
|
|
|
msgid "could not redirect output"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "不能输出重定向"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/archive.c:37
|
|
|
|
|
msgid "git archive: Remote with no URL"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "git archive:未提供远程URL"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/archive.c:58
|
|
|
|
|
msgid "git archive: expected ACK/NAK, got EOF"
|
2012-08-07 17:25:21 +08:00
|
|
|
|
msgstr "git archive:应为ACK/NACK,却得到EOF"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/archive.c:63
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "git archive: NACK %s"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "git archive:NACK %s"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/archive.c:65
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "remote error: %s"
|
|
|
|
|
msgstr "远程错误:%s"
|
|
|
|
|
|
|
|
|
|
#: builtin/archive.c:66
|
|
|
|
|
msgid "git archive: protocol error"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "git archive:协议错误"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/archive.c:71
|
|
|
|
|
msgid "git archive: expected a flush"
|
2012-08-07 17:25:21 +08:00
|
|
|
|
msgstr "git archive:应为一个刷新"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-03-27 14:46:11 +08:00
|
|
|
|
# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/branch.c:144
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"deleting branch '%s' that has been merged to\n"
|
|
|
|
|
" '%s', but not yet merged to HEAD."
|
|
|
|
|
msgstr ""
|
2012-02-29 01:58:30 +08:00
|
|
|
|
"将要删除的分支 '%s' 已经被合并到\n"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
" '%s',但未合并到 HEAD。"
|
|
|
|
|
|
2012-03-27 14:46:11 +08:00
|
|
|
|
# 译者:保持原换行格式,在输出时 %s 的替代内容会让字符串变长
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/branch.c:148
|
2012-02-13 14:41:59 +08: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-29 01:58:30 +08:00
|
|
|
|
"并未删除分支 '%s', 虽然它已经合并到 HEAD,\n"
|
|
|
|
|
" 然而却尚未被合并到分支 '%s' 。"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/branch.c:180
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "cannot use -a with -d"
|
2012-08-02 11:50:59 +08:00
|
|
|
|
msgstr "不能将 -a 和 -d 同时使用"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/branch.c:186
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "Couldn't look up commit object for HEAD"
|
|
|
|
|
msgstr "无法查询 HEAD 指向的提交对象"
|
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/branch.c:191
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Cannot delete the branch '%s' which you are currently on."
|
|
|
|
|
msgstr "无法删除您当前所在的分支 '%s'。"
|
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/branch.c:202
|
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 17:35:59 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "remote branch '%s' not found."
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "远程分支 '%s' 未发现。"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/branch.c:203
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "branch '%s' not found."
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "分支 '%s' 未发现。"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:210
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Couldn't look up commit object for '%s'"
|
|
|
|
|
msgstr "无法查询 '%s' 指向的提交对象"
|
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/branch.c:216
|
2012-02-13 14:41:59 +08: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'。"
|
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/branch.c:225
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "Error deleting remote branch '%s'"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "删除远程分支 '%s' 时出错"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/branch.c:226
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "Error deleting branch '%s'"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "删除分支 '%s' 时出错"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:233
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "Deleted remote branch %s (was %s).\n"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "已删除远程分支 %s(曾为 %s)。\n"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/branch.c:234
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "Deleted branch %s (was %s).\n"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "已删除分支 %s(曾为 %s)。\n"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:239
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "Update of config-file failed"
|
|
|
|
|
msgstr "无法更新 config 文件"
|
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/branch.c:337
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "branch '%s' does not point at a commit"
|
|
|
|
|
msgstr "分支 '%s' 未指向一个提交"
|
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/branch.c:409
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "[%s: behind %d]"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "[%s:落后 %d]"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/branch.c:411
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "[behind %d]"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "[落后 %d]"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:415
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "[%s: ahead %d]"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "[%s:领先 %d]"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/branch.c:417
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "[ahead %d]"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "[领先 %d]"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:420
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "[%s: ahead %d, behind %d]"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "[%s:领先 %d,落后 %d]"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:423
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "[ahead %d, behind %d]"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "[领先 %d,落后 %d]"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/branch.c:535
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "(no branch)"
|
|
|
|
|
msgstr "(非分支)"
|
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/branch.c:600
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "some refs could not be read"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "一些引用不能读取"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/branch.c:613
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "cannot rename the current branch while not on any."
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "无法重命名当前分支因为不处于任何分支上。"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/branch.c:623
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Invalid branch name: '%s'"
|
|
|
|
|
msgstr "无效的分支名:'%s'"
|
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/branch.c:638
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "Branch rename failed"
|
|
|
|
|
msgstr "分支重命名失败"
|
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/branch.c:642
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Renamed a misnamed branch '%s' away"
|
|
|
|
|
msgstr "重命名掉一个错误命名的旧分支 '%s'"
|
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/branch.c:646
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Branch renamed to %s, but HEAD is not updated!"
|
|
|
|
|
msgstr "分支重命名为 %s,但 HEAD 没有更新!"
|
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/branch.c:653
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "Branch is renamed, but update of config-file failed"
|
|
|
|
|
msgstr "分支被重命名,但更新 config 文件失败"
|
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/branch.c:668
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "malformed object name %s"
|
|
|
|
|
msgstr "非法的对象名 %s"
|
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/branch.c:692
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "could not write branch description template: %s"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "不能写分支描述模版:%s"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/branch.c:783
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "Failed to resolve HEAD as a valid ref."
|
|
|
|
|
msgstr "无法将 HEAD 解析为有效引用。"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/branch.c:788 builtin/clone.c:561
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "HEAD not found below refs/heads!"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "HEAD 没有位于 /refs/heads 之下!"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/branch.c:808
|
|
|
|
|
msgid "--column and --verbose are incompatible"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "--column 和 --verbose 不兼容"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/branch.c:857
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
|
|
|
|
|
msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
|
|
|
|
|
|
|
|
|
|
#: builtin/bundle.c:47
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "%s is okay\n"
|
|
|
|
|
msgstr "%s 可以\n"
|
|
|
|
|
|
|
|
|
|
#: builtin/bundle.c:56
|
|
|
|
|
msgid "Need a repository to create a bundle."
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "需要一个版本库来创建包。"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/bundle.c:60
|
|
|
|
|
msgid "Need a repository to unbundle."
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "需要一个版本库来解包。"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/checkout.c:114 builtin/checkout.c:147
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "path '%s' does not have our version"
|
|
|
|
|
msgstr "路径 '%s' 没有我们的版本"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/checkout.c:116 builtin/checkout.c:149
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "path '%s' does not have their version"
|
|
|
|
|
msgstr "路径 '%s' 没有他们的版本"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/checkout.c:132
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "path '%s' does not have all necessary versions"
|
|
|
|
|
msgstr "路径 '%s' 没有全部必须的版本"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/checkout.c:176
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "path '%s' does not have necessary versions"
|
|
|
|
|
msgstr "路径 '%s' 没有必须的版本"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/checkout.c:193
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "path '%s': cannot merge"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "path '%s':无法合并"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/checkout.c:210
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Unable to add merge result for '%s'"
|
|
|
|
|
msgstr "无法为 '%s' 添加合并结果"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/checkout.c:235 builtin/checkout.c:393
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "corrupt index file"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "损坏的索引文件"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/checkout.c:265 builtin/checkout.c:272
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "path '%s' is unmerged"
|
|
|
|
|
msgstr "路径 '%s' 未合并"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/checkout.c:303 builtin/checkout.c:499 builtin/clone.c:586
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/merge.c:812
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "unable to write new index file"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "无法写新的索引文件"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/checkout.c:320 builtin/diff.c:302 builtin/merge.c:408
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "diff_setup_done failed"
|
|
|
|
|
msgstr "diff_setup_done 失败"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/checkout.c:415
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "you need to resolve your current index first"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "您需要先解决当前索引的冲突"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/checkout.c:534
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Can not do reflog for '%s'\n"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "不能对 '%s' 执行 reflog 操作\n"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/checkout.c:567
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "HEAD is now at"
|
|
|
|
|
msgstr "HEAD 目前位于"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/checkout.c:574
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Reset branch '%s'\n"
|
|
|
|
|
msgstr "重置分支 '%s'\n"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/checkout.c:577
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Already on '%s'\n"
|
|
|
|
|
msgstr "已经位于 '%s'\n"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/checkout.c:581
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Switched to and reset branch '%s'\n"
|
|
|
|
|
msgstr "切换并重置分支 '%s'\n"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/checkout.c:583
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Switched to a new branch '%s'\n"
|
|
|
|
|
msgstr "切换到一个新分支 '%s'\n"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/checkout.c:585
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Switched to branch '%s'\n"
|
|
|
|
|
msgstr "切换到分支 '%s'\n"
|
|
|
|
|
|
2012-03-27 14:46:11 +08:00
|
|
|
|
# 译者:注意保持前导空格
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/checkout.c:641
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid " ... and %d more.\n"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr " ... 及其它 %d 个。\n"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
|
|
|
|
#. The singular version
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/checkout.c:647
|
2012-02-13 14:41:59 +08: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 17:35:59 +08:00
|
|
|
|
msgstr[1] ""
|
|
|
|
|
"警告:您正丢下 %d 个提交,未和任何分支关联:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"%s\n"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/checkout.c:665
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"If you want to keep them by creating a new branch, this may be a good time\n"
|
|
|
|
|
"to do so with:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git branch new_branch_name %s\n"
|
|
|
|
|
"\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"如果您想要通过创建新分支保存他们,这可能是一个好时候。\n"
|
|
|
|
|
"如下操作:\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git branch new_branch_name %s\n"
|
|
|
|
|
"\n"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/checkout.c:695
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "internal error in revision walk"
|
|
|
|
|
msgstr "在版本遍历时遇到内部错误"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/checkout.c:699
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "Previous HEAD position was"
|
|
|
|
|
msgstr "之前的 HEAD 位置是"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/checkout.c:725 builtin/checkout.c:920
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "You are on a branch yet to be born"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "您位于一个尚未初始化的分支"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
|
|
|
|
#. case (1)
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/checkout.c:856
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "invalid reference: %s"
|
|
|
|
|
msgstr "无效引用:%s"
|
|
|
|
|
|
|
|
|
|
#. case (1): want a tree
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/checkout.c:895
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "reference is not a tree: %s"
|
|
|
|
|
msgstr "引用不是一个树:%s"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/checkout.c:977
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "-B cannot be used with -b"
|
2012-08-02 11:50:59 +08:00
|
|
|
|
msgstr "-B 不能和 -b 同时使用"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/checkout.c:986
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "--patch is incompatible with all other options"
|
|
|
|
|
msgstr "--patch 选项和其他选项不兼容"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/checkout.c:989
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "--detach cannot be used with -b/-B/--orphan"
|
2012-08-02 11:50:59 +08:00
|
|
|
|
msgstr "--detach 不能和 -b/-B/--orphan 同时使用"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/checkout.c:991
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "--detach cannot be used with -t"
|
2012-08-02 11:50:59 +08:00
|
|
|
|
msgstr "--detach 不能和 -t 同时使用"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/checkout.c:997
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "--track needs a branch name"
|
|
|
|
|
msgstr "--track 需要一个分支名"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/checkout.c:1004
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "Missing branch name; try -b"
|
|
|
|
|
msgstr "缺少分支名;尝试 -b"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/checkout.c:1010
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "--orphan and -b|-B are mutually exclusive"
|
|
|
|
|
msgstr "--orphan 和 -b|-B 互斥"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/checkout.c:1012
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "--orphan cannot be used with -t"
|
2012-08-02 11:50:59 +08:00
|
|
|
|
msgstr "--orphan 不能和 -t 同时使用"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/checkout.c:1022
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "git checkout: -f and -m are incompatible"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "git checkout:-f 和 -m 不兼容"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/checkout.c:1056
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "invalid path specification"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "无效的路径规格"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/checkout.c:1064
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"git checkout: updating paths is incompatible with switching branches.\n"
|
|
|
|
|
"Did you intend to checkout '%s' which can not be resolved as commit?"
|
|
|
|
|
msgstr ""
|
2012-03-27 14:46:11 +08:00
|
|
|
|
"git checkout:更新路径和切换分支不兼容。\n"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
"您是想要检出 '%s' 但未能将其解析为提交么?"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/checkout.c:1066
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "git checkout: updating paths is incompatible with switching branches."
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "git checkout:更新路径和切换分支不兼容。"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/checkout.c:1071
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "git checkout: --detach does not take a path argument"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "git checkout:--detach 不跟路径参数"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/checkout.c:1074
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid ""
|
|
|
|
|
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
|
|
|
|
|
"checking out of the index."
|
|
|
|
|
msgstr ""
|
2012-03-27 14:46:11 +08:00
|
|
|
|
"git checkout:在从索引检出时,--ours/--theirs、--force 和 --merge 不兼容。"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/checkout.c:1093
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "Cannot switch branch to a non-commit."
|
|
|
|
|
msgstr "无法切换分支到一个非提交。"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/checkout.c:1096
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "--ours/--theirs is incompatible with switching branches."
|
|
|
|
|
msgstr "--ours/--theirs 和切换分支不兼容。"
|
|
|
|
|
|
|
|
|
|
#: builtin/clean.c:78
|
|
|
|
|
msgid "-x and -X cannot be used together"
|
2012-08-02 11:50:59 +08:00
|
|
|
|
msgstr "-x 和 -X 不能同时使用"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/clean.c:82
|
|
|
|
|
msgid ""
|
|
|
|
|
"clean.requireForce set to true and neither -n nor -f given; refusing to clean"
|
|
|
|
|
msgstr ""
|
2012-03-27 14:46:11 +08:00
|
|
|
|
"clean.requireForce 设置为 true 且未提供 -n 或 -f 选项,拒绝执行清理动作"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/clean.c:85
|
|
|
|
|
msgid ""
|
|
|
|
|
"clean.requireForce defaults to true and neither -n nor -f given; refusing to "
|
|
|
|
|
"clean"
|
|
|
|
|
msgstr ""
|
2012-03-27 14:46:11 +08:00
|
|
|
|
"clean.requireForce 默认为 true 且未提供 -n 或 -f 选项,拒绝执行清理动作"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/clean.c:155 builtin/clean.c:176
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Would remove %s\n"
|
|
|
|
|
msgstr "将删除 %s\n"
|
|
|
|
|
|
|
|
|
|
#: builtin/clean.c:159 builtin/clean.c:179
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Removing %s\n"
|
|
|
|
|
msgstr "正删除 %s\n"
|
|
|
|
|
|
|
|
|
|
#: builtin/clean.c:162 builtin/clean.c:182
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to remove %s"
|
|
|
|
|
msgstr "无法删除 %s"
|
|
|
|
|
|
|
|
|
|
#: builtin/clean.c:166
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Would not remove %s\n"
|
|
|
|
|
msgstr "不会删除 %s\n"
|
|
|
|
|
|
|
|
|
|
#: builtin/clean.c:168
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Not removing %s\n"
|
|
|
|
|
msgstr "未删除 %s\n"
|
|
|
|
|
|
2012-02-28 12:24:54 +08:00
|
|
|
|
#: builtin/clone.c:243
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "reference repository '%s' is not a local directory."
|
|
|
|
|
msgstr "引用版本库 '%s' 不是一个本地目录。"
|
|
|
|
|
|
2012-02-28 12:24:54 +08:00
|
|
|
|
#: builtin/clone.c:306
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to create directory '%s'"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "无法创建目录 '%s'"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-02-28 12:24:54 +08:00
|
|
|
|
#: builtin/clone.c:308 builtin/diff.c:75
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to stat '%s'"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "无法枚举 '%s' 状态"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-02-28 12:24:54 +08:00
|
|
|
|
#: builtin/clone.c:310
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "%s exists and is not a directory"
|
|
|
|
|
msgstr "%s 存在且不是一个目录"
|
|
|
|
|
|
2012-02-28 12:24:54 +08:00
|
|
|
|
#: builtin/clone.c:324
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to stat %s\n"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "无法枚举 %s 状态\n"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-02-28 12:24:54 +08:00
|
|
|
|
#: builtin/clone.c:341
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to unlink '%s'"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "无法删除 '%s'"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-02-28 12:24:54 +08:00
|
|
|
|
#: builtin/clone.c:346
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to create link '%s'"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "无法创建链接 '%s'"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-02-28 12:24:54 +08:00
|
|
|
|
#: builtin/clone.c:350
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to copy file to '%s'"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "无法拷贝文件至 '%s'"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-02-28 12:24:54 +08:00
|
|
|
|
#: builtin/clone.c:373
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "done.\n"
|
|
|
|
|
msgstr "完成。\n"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/clone.c:443
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Could not find remote branch %s to clone."
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "不能发现要克隆的远程分支 %s。"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/clone.c:552
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
|
|
|
|
|
msgstr "远程 HEAD 指向一个不存在的引用,无法检出。\n"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/clone.c:642
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "Too many arguments."
|
|
|
|
|
msgstr "太多参数。"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/clone.c:646
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "You must specify a repository to clone."
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "您必须指定一个版本库来克隆。"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/clone.c:657
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "--bare and --origin %s options are incompatible."
|
|
|
|
|
msgstr "--bare 和 --origin %s 选项不兼容。"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/clone.c:671
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "repository '%s' does not exist"
|
|
|
|
|
msgstr "版本库 '%s' 不存在"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/clone.c:676
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "--depth is ignored in local clones; use file:// instead."
|
|
|
|
|
msgstr "--depth 在本地克隆被忽略,改为 file:// 协议试试。"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/clone.c:686
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "destination path '%s' already exists and is not an empty directory."
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "目标路径 '%s' 已经存在,并且不是一个空目录。"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/clone.c:696
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "working tree '%s' already exists."
|
|
|
|
|
msgstr "工作区 '%s' 已经存在。"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/clone.c:709 builtin/clone.c:723
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "could not create leading directories of '%s'"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "不能为 '%s' 创建先导目录"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/clone.c:712
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "could not create work tree dir '%s'."
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "不能为 '%s' 创建工作区目录。"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/clone.c:731
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Cloning into bare repository '%s'...\n"
|
|
|
|
|
msgstr "克隆到裸版本库 '%s'...\n"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/clone.c:733
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Cloning into '%s'...\n"
|
|
|
|
|
msgstr "正克隆到 '%s'...\n"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/clone.c:789
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Don't know how to clone %s"
|
|
|
|
|
msgstr "不知道如何克隆 %s"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/clone.c:838
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Remote branch %s not found in upstream %s"
|
|
|
|
|
msgstr "远程分支 %s 在上游 %s 未发现"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/clone.c:845
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "You appear to have cloned an empty repository."
|
|
|
|
|
msgstr "您似乎克隆了一个空版本库。"
|
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/column.c:51
|
|
|
|
|
msgid "--command must be the first argument"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "--command 必须是第一个参数"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/commit.c:43
|
2012-02-13 14:41:59 +08: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 14:46:11 +08:00
|
|
|
|
"您的姓名和邮件地址基于登录名和主机名进行了自动设置。请检查它们正确\n"
|
|
|
|
|
"与否。您可以通过下面的命令对其进行明确地设置以免再出现本提示信息:\n"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
"\n"
|
|
|
|
|
" git config --global user.name \"Your Name\"\n"
|
|
|
|
|
" git config --global user.email you@example.com\n"
|
|
|
|
|
"\n"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
"设置完毕后,您可以用下面的命令来修正本次提交所使用的用户身份:\n"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
"\n"
|
|
|
|
|
" git commit --amend --reset-author\n"
|
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/commit.c:55
|
2012-02-13 14:41:59 +08: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-29 02:08:22 +08:00
|
|
|
|
"您要修补最近的提交,但这么做会让它成为空提交。您可以重复您的命令并带上\n"
|
|
|
|
|
"--allow-empty 选项,或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/commit.c:60
|
2012-02-13 14:41:59 +08: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"
|
|
|
|
|
"Otherwise, please use 'git reset'\n"
|
|
|
|
|
msgstr ""
|
2012-02-29 02:03:39 +08:00
|
|
|
|
"之前的拣选操作现在是一个空提交,可能是由冲突解决导致的。如果您无论如何\n"
|
|
|
|
|
"也要提交,使用命令:\n"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
"\n"
|
|
|
|
|
" git commit --allow-empty\n"
|
|
|
|
|
"\n"
|
2012-02-29 02:03:39 +08:00
|
|
|
|
"否则,请使用命令 'git reset'\n"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/commit.c:256
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "failed to unpack HEAD tree object"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "无法解包 HEAD 树对象"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/commit.c:298
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "unable to create temporary index"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "不能创建临时索引"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/commit.c:304
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "interactive add failed"
|
|
|
|
|
msgstr "交互式添加失败"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/commit.c:337 builtin/commit.c:358 builtin/commit.c:408
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "unable to write new_index file"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "无法写 new_index 文件"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/commit.c:389
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "cannot do a partial commit during a merge."
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "在合并过程中不能做部分提交。"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/commit.c:391
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "cannot do a partial commit during a cherry-pick."
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "在拣选过程中不能做部分提交。"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/commit.c:401
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "cannot read the index"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "无法读取索引"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/commit.c:421
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "unable to write temporary index file"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "无法写临时索引文件"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/commit.c:496 builtin/commit.c:502
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "invalid commit: %s"
|
|
|
|
|
msgstr "无效的提交:%s"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/commit.c:525
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "malformed --author parameter"
|
|
|
|
|
msgstr "非法的 --author 参数"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/commit.c:585
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Malformed ident string: '%s'"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "非法的身份字符串:'%s'"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/commit.c:623 builtin/commit.c:656 builtin/commit.c:970
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "could not lookup commit %s"
|
|
|
|
|
msgstr "不能查询提交 %s"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/commit.c:635 builtin/shortlog.c:296
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "(reading log message from standard input)\n"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "(正从标准输入中读取日志信息)\n"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/commit.c:637
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "could not read log from standard input"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "不能从标准输入中读取日志信息"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/commit.c:641
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "could not read log file '%s'"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "不能读取日志文件 '%s'"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/commit.c:647
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "commit has empty message"
|
|
|
|
|
msgstr "提交说明为空"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/commit.c:663
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "could not read MERGE_MSG"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "不能读取 MERGE_MSG"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/commit.c:667
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "could not read SQUASH_MSG"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "不能读取 SQUASH_MSG"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/commit.c:671
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "could not read '%s'"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "不能读取 '%s'"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/commit.c:723
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "could not write commit template"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "不能写提交模版"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/commit.c:734
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid ""
|
|
|
|
|
"\n"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
"It looks like you may be committing a merge.\n"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
"If this is not correct, please remove the file\n"
|
|
|
|
|
"\t%s\n"
|
|
|
|
|
"and try again.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"\n"
|
2012-08-02 11:50:59 +08:00
|
|
|
|
"似乎您正在做一个合并提交。如果不对,请删除文件\n"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
"\t%s\n"
|
|
|
|
|
"然后重试。\n"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/commit.c:739
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08: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 11:50:59 +08:00
|
|
|
|
"似乎您正在做一个拣选提交。如果不对,请删除文件\n"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
"\t%s\n"
|
|
|
|
|
"然后重试。\n"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/commit.c:751
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid ""
|
2012-05-21 09:35:47 +08:00
|
|
|
|
"Please enter the commit message for your changes. Lines starting\n"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
"with '#' will be ignored, and an empty message aborts the commit.\n"
|
|
|
|
|
msgstr ""
|
2012-05-30 12:19:47 +08:00
|
|
|
|
"请为您的变更输入提交说明。以 '#' 开始的行将被忽略,而一个空的提交\n"
|
|
|
|
|
"说明将会终止提交。\n"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/commit.c:756
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid ""
|
2012-05-21 09:35:47 +08:00
|
|
|
|
"Please enter the commit message for your changes. Lines starting\n"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
"with '#' will be kept; you may remove them yourself if you want to.\n"
|
|
|
|
|
"An empty message aborts the commit.\n"
|
|
|
|
|
msgstr ""
|
2012-05-30 12:19:47 +08:00
|
|
|
|
"请为您的变更输入提交说明。以 '#' 开始的行将被保留,您可以删除它们\n"
|
|
|
|
|
"如果您想这样做的话。而一个空的提交说明将会终止提交。\n"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-03-27 14:46:11 +08:00
|
|
|
|
# 译者:为保证在输出中对齐,注意调整句中空格!
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/commit.c:769
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "%sAuthor: %s"
|
|
|
|
|
msgstr "%s作者: %s"
|
|
|
|
|
|
2012-03-27 14:46:11 +08:00
|
|
|
|
# 译者:为保证在输出中对齐,注意调整句中空格!
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/commit.c:776
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "%sCommitter: %s"
|
|
|
|
|
msgstr "%s提交者: %s"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/commit.c:796
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "Cannot read index"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "无法读取索引"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/commit.c:833
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "Error building trees"
|
|
|
|
|
msgstr "无法创建树对象"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/commit.c:848 builtin/tag.c:361
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Please supply the message using either -m or -F option.\n"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "请使用 -m 或者 -F 选项提供提交说明。\n"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/commit.c:945
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "No existing author found with '%s'"
|
|
|
|
|
msgstr "没有找到匹配 '%s' 的作者"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/commit.c:960 builtin/commit.c:1160
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Invalid untracked files mode '%s'"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "无效的未追踪文件参数 '%s'"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/commit.c:1000
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "Using both --reset-author and --author does not make sense"
|
|
|
|
|
msgstr "同时使用 --reset-author 和 --author 没有意义"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/commit.c:1011
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "You have nothing to amend."
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "您没有可修补的提交。"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/commit.c:1014
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "You are in the middle of a merge -- cannot amend."
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "您正处于一个合并过程中 -- 无法修补提交。"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/commit.c:1016
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "You are in the middle of a cherry-pick -- cannot amend."
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/commit.c:1019
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "Options --squash and --fixup cannot be used together"
|
2012-08-02 11:50:59 +08:00
|
|
|
|
msgstr "选项 --squash 和 --fixup 不能同时使用"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/commit.c:1029
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "Only one of -c/-C/-F/--fixup can be used."
|
|
|
|
|
msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/commit.c:1031
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
|
2012-08-02 11:50:59 +08:00
|
|
|
|
msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/commit.c:1039
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "--reset-author can be used only with -C, -c or --amend."
|
2012-08-02 11:50:59 +08:00
|
|
|
|
msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/commit.c:1056
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
|
|
|
|
|
msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/commit.c:1058
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "No paths with --include/--only does not make sense."
|
|
|
|
|
msgstr "参数 --include/--only 不跟路径没有意义。"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/commit.c:1060
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "Clever... amending the last one with dirty index."
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "聪明... 在索引不干净下修补最后的提交。"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/commit.c:1062
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "指定了明确的路径而没有使用 -i 或 -o 选项;认为是 --only paths..."
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/commit.c:1072 builtin/tag.c:577
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Invalid cleanup mode %s"
|
|
|
|
|
msgstr "无效的清理模式 %s"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/commit.c:1077
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "Paths with -a does not make sense."
|
2012-08-02 11:50:59 +08:00
|
|
|
|
msgstr "路径和 -a 选项同时使用没有意义。"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/commit.c:1260
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "couldn't look up newly created commit"
|
|
|
|
|
msgstr "无法找到新创建的提交"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/commit.c:1262
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "could not parse newly created commit"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "不能解析新创建的提交"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/commit.c:1303
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "detached HEAD"
|
|
|
|
|
msgstr "分离头指针"
|
|
|
|
|
|
2012-03-30 10:55:34 +08:00
|
|
|
|
# 译者:中文字符串拼接,可删除前导空格
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/commit.c:1305
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid " (root-commit)"
|
2012-03-30 10:55:34 +08:00
|
|
|
|
msgstr "(根提交)"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/commit.c:1449
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "could not parse HEAD commit"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "不能解析 HEAD 提交"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/commit.c:1487 builtin/merge.c:509
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "could not open '%s' for reading"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "不能为读入打开 '%s'"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/commit.c:1494
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Corrupt MERGE_HEAD file (%s)"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "损坏的 MERGE_HEAD 文件(%s)"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/commit.c:1501
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "could not read MERGE_MODE"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "不能读取 MERGE_MODE"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/commit.c:1520
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "could not read commit message: %s"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "不能读取提交说明:%s"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/commit.c:1534
|
2012-04-28 22:42:41 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Aborting commit; you did not edit the message.\n"
|
|
|
|
|
msgstr "终止提交;您未更改来自模版的提交说明。\n"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/commit.c:1539
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Aborting commit due to empty commit message.\n"
|
|
|
|
|
msgstr "终止提交因为提交说明为空。\n"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/commit.c:1554 builtin/merge.c:936 builtin/merge.c:961
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "failed to write commit object"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "无法写提交对象"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/commit.c:1575
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "cannot lock HEAD ref"
|
|
|
|
|
msgstr "无法锁定 HEAD 引用"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/commit.c:1579
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "cannot update HEAD ref"
|
|
|
|
|
msgstr "无法更新 HEAD 引用"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/commit.c:1590
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid ""
|
|
|
|
|
"Repository has been updated, but unable to write\n"
|
|
|
|
|
"new_index file. Check that disk is not full or quota is\n"
|
|
|
|
|
"not exceeded, and then \"git reset HEAD\" to recover."
|
|
|
|
|
msgstr ""
|
2012-03-27 14:46:11 +08:00
|
|
|
|
"版本库已更新,但无法写 new_index 文件。检查是否磁盘已满\n"
|
|
|
|
|
"或磁盘配额已耗尽,然后执行 \"git reset HEAD\" 恢复。"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/describe.c:234
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "annotated tag %s not available"
|
|
|
|
|
msgstr "注释 tag %s 无效"
|
|
|
|
|
|
|
|
|
|
#: builtin/describe.c:238
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "annotated tag %s has no embedded name"
|
|
|
|
|
msgstr "注释 tag %s 没有嵌入名称"
|
|
|
|
|
|
|
|
|
|
#: builtin/describe.c:240
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "tag '%s' is really '%s' here"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "tag '%s' 的确是在 '%s'"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/describe.c:267
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Not a valid object name %s"
|
|
|
|
|
msgstr "不是一个有效的对象名 %s"
|
|
|
|
|
|
|
|
|
|
#: builtin/describe.c:270
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "%s is not a valid '%s' object"
|
|
|
|
|
msgstr "%s 不是一个有效的 '%s' 对象"
|
|
|
|
|
|
|
|
|
|
#: builtin/describe.c:287
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "no tag exactly matches '%s'"
|
|
|
|
|
msgstr "没有 tag 准确匹配 '%s'"
|
|
|
|
|
|
|
|
|
|
#: builtin/describe.c:289
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "searching to describe %s\n"
|
|
|
|
|
msgstr "搜索描述 %s\n"
|
|
|
|
|
|
|
|
|
|
#: builtin/describe.c:329
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "finished search at %s\n"
|
|
|
|
|
msgstr "完成搜索 %s\n"
|
|
|
|
|
|
|
|
|
|
#: builtin/describe.c:353
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"No annotated tags can describe '%s'.\n"
|
|
|
|
|
"However, there were unannotated tags: try --tags."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"没有注释 tag 能描述 '%s'。\n"
|
|
|
|
|
"然而,有非注释 tag:尝试 --tags。"
|
|
|
|
|
|
|
|
|
|
#: builtin/describe.c:357
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"No tags can describe '%s'.\n"
|
|
|
|
|
"Try --always, or create some tags."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"没有注释 tag 能描述 '%s'。\n"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
"尝试 --always,或者创建一些 tag。"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/describe.c:378
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "traversed %lu commits\n"
|
|
|
|
|
msgstr "已遍历 %lu 个提交\n"
|
|
|
|
|
|
|
|
|
|
#: builtin/describe.c:381
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"more than %i tags found; listed %i most recent\n"
|
|
|
|
|
"gave up search at %s\n"
|
|
|
|
|
msgstr ""
|
2012-03-27 14:46:11 +08:00
|
|
|
|
"发现多于 %i 个 tag,列出最近的 %i 个\n"
|
|
|
|
|
"在 %s 放弃搜索\n"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/describe.c:436
|
|
|
|
|
msgid "--long is incompatible with --abbrev=0"
|
|
|
|
|
msgstr "--long 与 --abbrev=0 不兼容"
|
|
|
|
|
|
|
|
|
|
#: builtin/describe.c:462
|
|
|
|
|
msgid "No names found, cannot describe anything."
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "没有发现名称,无法描述任何东西。"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/describe.c:482
|
|
|
|
|
msgid "--dirty is incompatible with committishes"
|
2012-08-02 11:50:59 +08:00
|
|
|
|
msgstr "--dirty 不能与提交同时使用"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/diff.c:77
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "'%s': not a regular file or symlink"
|
|
|
|
|
msgstr "'%s':不是一个正规文件或符号链接"
|
|
|
|
|
|
|
|
|
|
#: builtin/diff.c:220
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "invalid option: %s"
|
|
|
|
|
msgstr "无效选项:%s"
|
|
|
|
|
|
2012-03-08 12:06:53 +08:00
|
|
|
|
#: builtin/diff.c:297
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "Not a git repository"
|
|
|
|
|
msgstr "不是一个 git 版本库"
|
|
|
|
|
|
2012-07-04 17:20:34 +08:00
|
|
|
|
#: builtin/diff.c:341
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "invalid object '%s' given."
|
|
|
|
|
msgstr "提供了无效对象 '%s'。"
|
|
|
|
|
|
2012-07-04 17:20:34 +08:00
|
|
|
|
#: builtin/diff.c:346
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "more than %d trees given: '%s'"
|
|
|
|
|
msgstr "提供了超过 %d 个树对象:'%s'"
|
|
|
|
|
|
2012-07-04 17:20:34 +08:00
|
|
|
|
#: builtin/diff.c:356
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "more than two blobs given: '%s'"
|
2012-08-02 11:50:59 +08:00
|
|
|
|
msgstr "提供了超过两个二进制对象(blob):'%s'"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-04 17:20:34 +08:00
|
|
|
|
#: builtin/diff.c:364
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unhandled object '%s' given."
|
|
|
|
|
msgstr "提供了无法处理的对象 '%s'。"
|
|
|
|
|
|
|
|
|
|
#: builtin/fetch.c:200
|
|
|
|
|
msgid "Couldn't find remote ref HEAD"
|
|
|
|
|
msgstr "无法发现远程 HEAD 引用"
|
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/fetch.c:253
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "object %s not found"
|
|
|
|
|
msgstr "对象 %s 未发现"
|
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/fetch.c:259
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "[up to date]"
|
|
|
|
|
msgstr "[最新]"
|
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/fetch.c:273
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
|
|
|
|
|
msgstr "! %-*s %-*s -> %s (在当前分支下不能获取)"
|
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/fetch.c:274 builtin/fetch.c:360
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "[rejected]"
|
|
|
|
|
msgstr "[已拒绝]"
|
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/fetch.c:285
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "[tag update]"
|
|
|
|
|
msgstr "[tag更新]"
|
|
|
|
|
|
2012-03-27 14:46:11 +08:00
|
|
|
|
# 译者:注意保持前导空格
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid " (unable to update local ref)"
|
|
|
|
|
msgstr " (不能更新本地引用)"
|
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/fetch.c:305
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "[new tag]"
|
|
|
|
|
msgstr "[新tag]"
|
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/fetch.c:308
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "[new branch]"
|
|
|
|
|
msgstr "[新分支]"
|
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/fetch.c:311
|
|
|
|
|
msgid "[new ref]"
|
|
|
|
|
msgstr "[新引用]"
|
|
|
|
|
|
|
|
|
|
#: builtin/fetch.c:356
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "unable to update local ref"
|
|
|
|
|
msgstr "不能更新本地引用"
|
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/fetch.c:356
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "forced update"
|
|
|
|
|
msgstr "强制更新"
|
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/fetch.c:362
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "(non-fast-forward)"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "(非快进式)"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/fetch.c:393 builtin/fetch.c:685
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot open %s: %s\n"
|
|
|
|
|
msgstr "无法打开 %s:%s\n"
|
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/fetch.c:402
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "%s did not send all necessary objects\n"
|
|
|
|
|
msgstr "%s 未发送所有必须的对象\n"
|
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/fetch.c:488
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "From %.*s\n"
|
|
|
|
|
msgstr "来自 %.*s\n"
|
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/fetch.c:499
|
2012-02-13 14:41:59 +08: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 14:46:11 +08:00
|
|
|
|
# 译者:注意保持前导空格
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/fetch.c:549
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid " (%s will become dangling)"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr " (%s 将成为悬空状态)"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-03-27 14:46:11 +08:00
|
|
|
|
# 译者:注意保持前导空格
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/fetch.c:550
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid " (%s has become dangling)"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr " (%s 已成为悬空状态)"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/fetch.c:557
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "[deleted]"
|
|
|
|
|
msgstr "[已删除]"
|
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/fetch.c:558 builtin/remote.c:1055
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "(none)"
|
|
|
|
|
msgstr "(无)"
|
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/fetch.c:675
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Refusing to fetch into current branch %s of non-bare repository"
|
|
|
|
|
msgstr "拒绝获取到非裸版本库的当前分支 %s"
|
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/fetch.c:709
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Don't know how to fetch from %s"
|
|
|
|
|
msgstr "不知道如何从 %s 获取"
|
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/fetch.c:786
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Option \"%s\" value \"%s\" is not valid for %s"
|
|
|
|
|
msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
|
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/fetch.c:789
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Option \"%s\" is ignored for %s\n"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "选项 \"%s\" 为 %s 所忽略\n"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/fetch.c:888
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Fetching %s\n"
|
2012-02-02 16:40:12 +08:00
|
|
|
|
msgstr "正在获取 %s\n"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/fetch.c:890 builtin/remote.c:100
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Could not fetch %s"
|
|
|
|
|
msgstr "不能获取 %s"
|
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/fetch.c:907
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid ""
|
|
|
|
|
"No remote repository specified. Please, specify either a URL or a\n"
|
|
|
|
|
"remote name from which new revisions should be fetched."
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定,用以获取新提交。"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/fetch.c:927
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "You need to specify a tag name."
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "您需要指定一个 tag 名称。"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/fetch.c:979
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "fetch --all does not take a repository argument"
|
|
|
|
|
msgstr "fetch --all 不能带一个版本库参数"
|
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/fetch.c:981
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "fetch --all does not make sense with refspecs"
|
|
|
|
|
msgstr "fetch --all 带引用表达式没有任何意义"
|
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/fetch.c:992
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "No such remote or remote group: %s"
|
|
|
|
|
msgstr "没有这样的远程或远程组:%s"
|
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/fetch.c:1000
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "Fetching a group and specifying refspecs does not make sense"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "获取组并指定引用表达式没有意义"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/gc.c:63
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Invalid %s: '%s'"
|
|
|
|
|
msgstr "无效的 %s:'%s'"
|
|
|
|
|
|
2012-05-15 11:53:26 +08:00
|
|
|
|
#: builtin/gc.c:90
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "insanely long object directory %.*s"
|
|
|
|
|
msgstr "不正常的长对象目录 %.*s"
|
|
|
|
|
|
2012-05-15 11:53:26 +08:00
|
|
|
|
#: builtin/gc.c:221
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Auto packing the repository for optimum performance.\n"
|
|
|
|
|
msgstr "自动打包版本库以求最佳性能。\n"
|
|
|
|
|
|
2012-05-15 11:53:26 +08:00
|
|
|
|
#: builtin/gc.c:224
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Auto packing the repository for optimum performance. You may also\n"
|
|
|
|
|
"run \"git gc\" manually. See \"git help gc\" for more information.\n"
|
|
|
|
|
msgstr ""
|
2012-03-27 14:46:11 +08:00
|
|
|
|
"自动打包版本库以求最佳性能。您还可以手动运行 \"git gc\"。\n"
|
|
|
|
|
"参见 \"git help gc\" 以获取更多信息。\n"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-05-15 11:53:26 +08:00
|
|
|
|
#: builtin/gc.c:251
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid ""
|
|
|
|
|
"There are too many unreachable loose objects; run 'git prune' to remove them."
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "有太多不可达的松散对象,运行 'git prune' 删除它们。"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-02-28 12:24:54 +08:00
|
|
|
|
#: builtin/grep.c:216
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "grep: failed to create thread: %s"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "grep:无法创建线程:%s"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-02-28 12:24:54 +08:00
|
|
|
|
#: builtin/grep.c:402
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Failed to chdir: %s"
|
|
|
|
|
msgstr "无法切换目录:%s"
|
|
|
|
|
|
2012-02-28 12:24:54 +08:00
|
|
|
|
#: builtin/grep.c:478 builtin/grep.c:512
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to read tree (%s)"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "无法读取树(%s)"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-02-28 12:24:54 +08:00
|
|
|
|
#: builtin/grep.c:526
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to grep from object of type %s"
|
|
|
|
|
msgstr "无法抓取来自于 %s 类型的对象"
|
|
|
|
|
|
2012-02-28 12:24:54 +08:00
|
|
|
|
#: builtin/grep.c:584
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "switch `%c' expects a numerical value"
|
|
|
|
|
msgstr "开关 `%c' 期望一个数字值"
|
|
|
|
|
|
2012-02-28 12:24:54 +08:00
|
|
|
|
#: builtin/grep.c:601
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot open '%s'"
|
|
|
|
|
msgstr "不能打开 '%s'"
|
|
|
|
|
|
2012-06-02 17:12:59 +08:00
|
|
|
|
#: builtin/grep.c:885
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "no pattern given."
|
|
|
|
|
msgstr "未提供模式匹配。"
|
|
|
|
|
|
2012-06-02 17:12:59 +08:00
|
|
|
|
#: builtin/grep.c:899
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "bad object %s"
|
|
|
|
|
msgstr "坏对象 %s"
|
|
|
|
|
|
2012-06-02 17:12:59 +08:00
|
|
|
|
#: builtin/grep.c:940
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "--open-files-in-pager only works on the worktree"
|
|
|
|
|
msgstr "--open-files-in-pager 仅用于工作区"
|
|
|
|
|
|
2012-06-02 17:12:59 +08:00
|
|
|
|
#: builtin/grep.c:963
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "--cached or --untracked cannot be used with --no-index."
|
2012-08-02 11:50:59 +08:00
|
|
|
|
msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-06-02 17:12:59 +08:00
|
|
|
|
#: builtin/grep.c:968
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "--no-index or --untracked cannot be used with revs."
|
2012-08-02 11:50:59 +08:00
|
|
|
|
msgstr "--no-index 或 --untracked 不能和版本同时使用。"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-06-02 17:12:59 +08:00
|
|
|
|
#: builtin/grep.c:971
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "--[no-]exclude-standard cannot be used for tracked contents."
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-06-02 17:12:59 +08:00
|
|
|
|
#: builtin/grep.c:979
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "both --cached and trees are given."
|
|
|
|
|
msgstr "同时给出了 --cached 和树对象。"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/help.c:65
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "unrecognized help format '%s'"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "未能识别的帮助格式 '%s'"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/help.c:93
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "Failed to start emacsclient."
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "无法启动 emacsclient。"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/help.c:106
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "Failed to parse emacsclient version."
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "无法解析 emacsclient 版本。"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/help.c:114
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "emacsclient version '%d' too old (< 22)."
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "emacsclient 版本 '%d' 太老 (< 22)。"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/help.c:132 builtin/help.c:160 builtin/help.c:169 builtin/help.c:177
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "failed to exec '%s': %s"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "无法执行 '%s':%s"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/help.c:217
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"'%s': path for unsupported man viewer.\n"
|
|
|
|
|
"Please consider using 'man.<tool>.cmd' instead."
|
|
|
|
|
msgstr ""
|
2012-05-30 12:19:47 +08:00
|
|
|
|
"'%s':不支持的 man 手册查看器的路径。\n"
|
|
|
|
|
"请使用 'man.<tool>.cmd'。"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/help.c:229
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"'%s': cmd for supported man viewer.\n"
|
|
|
|
|
"Please consider using 'man.<tool>.path' instead."
|
|
|
|
|
msgstr ""
|
2012-05-30 12:19:47 +08:00
|
|
|
|
"'%s': 支持的 man 手册查看器命令。\n"
|
|
|
|
|
"请使用 'man.<tool>.path'。"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/help.c:299
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "The most commonly used git commands are:"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "最常用的 git 命令有:"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/help.c:367
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "'%s': unknown man viewer."
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "'%s':未知的 man 查看器。"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/help.c:384
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "no man viewer handled the request"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "没有 man 查看器处理此请求"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/help.c:392
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "no info viewer handled the request"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "没有 info 查看器处理此请求"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/help.c:447 builtin/help.c:454
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "usage: %s%s"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "用法:%s%s"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/help.c:470
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "`git %s' is aliased to `%s'"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "`git %s' 是 `%s' 的别名"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-04 17:20:34 +08:00
|
|
|
|
#: builtin/index-pack.c:170
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "object type mismatch at %s"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "%s 的对象类型不匹配"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-04 17:20:34 +08:00
|
|
|
|
#: builtin/index-pack.c:190
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "object of unexpected type"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "意外的类型的对象"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-04 17:20:34 +08:00
|
|
|
|
#: builtin/index-pack.c:227
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "cannot fill %d byte"
|
|
|
|
|
msgid_plural "cannot fill %d bytes"
|
2012-05-30 12:19:47 +08: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 17:35:59 +08:00
|
|
|
|
msgstr[1] "无法填充 %d 字节"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-04 17:20:34 +08:00
|
|
|
|
#: builtin/index-pack.c:237
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "early EOF"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "过早的文件结束符(EOF)"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-04 17:20:34 +08:00
|
|
|
|
#: builtin/index-pack.c:238
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "read error on input"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "输入上的读错误"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-04 17:20:34 +08:00
|
|
|
|
#: builtin/index-pack.c:250
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "used more bytes than were available"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "用掉了超过可用的字节"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-04 17:20:34 +08:00
|
|
|
|
#: builtin/index-pack.c:257
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "pack too large for current definition of off_t"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "包太大超过了当前 off_t 的定义"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-04 17:20:34 +08:00
|
|
|
|
#: builtin/index-pack.c:273
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "unable to create '%s'"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "不能创建 '%s'"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-04 17:20:34 +08:00
|
|
|
|
#: builtin/index-pack.c:278
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "cannot open packfile '%s'"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "无法打开包文件 '%s'"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-04 17:20:34 +08:00
|
|
|
|
#: builtin/index-pack.c:292
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "pack signature mismatch"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "包签名不匹配"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-04 17:20:34 +08:00
|
|
|
|
#: builtin/index-pack.c:312
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "pack has bad object at offset %lu: %s"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "包中有错误的对象位于 %lu:%s"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-04 17:20:34 +08:00
|
|
|
|
#: builtin/index-pack.c:434
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "inflate returned %d"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "解压缩返回 %d"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-04 17:20:34 +08:00
|
|
|
|
#: builtin/index-pack.c:483
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "offset value overflow for delta base object"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "偏移值覆盖了 delta 基准对象"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-04 17:20:34 +08:00
|
|
|
|
#: builtin/index-pack.c:491
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "delta base offset is out of bound"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "delta 基准偏移越界"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-04 17:20:34 +08:00
|
|
|
|
#: builtin/index-pack.c:499
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "unknown object type %d"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "未知对象类型 %d"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/index-pack.c:530
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "cannot pread pack file"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "无法读取包文件"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/index-pack.c:532
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "premature end of pack file, %lu byte missing"
|
|
|
|
|
msgid_plural "premature end of pack file, %lu bytes missing"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr[0] "包文件过早结束,缺少 %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 17:35:59 +08:00
|
|
|
|
msgstr[1] "包文件过早结束,缺少 %lu 字节"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/index-pack.c:558
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "serious inflate inconsistency"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "解压缩严重的不一致"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/index-pack.c:649 builtin/index-pack.c:655 builtin/index-pack.c:678
|
|
|
|
|
#: builtin/index-pack.c:712 builtin/index-pack.c:721
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "SHA1 COLLISION FOUND WITH %s !"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "发现 %s 出现 SHA1 冲突!"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/index-pack.c:652 builtin/pack-objects.c:170
|
2012-07-04 17:20:34 +08:00
|
|
|
|
#: builtin/pack-objects.c:262
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to read %s"
|
|
|
|
|
msgstr "不能读 %s"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/index-pack.c:718
|
2012-07-04 17:20:34 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot read existing object %s"
|
|
|
|
|
msgstr "不能读取现存对象 %s"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/index-pack.c:732
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "invalid blob object %s"
|
2012-08-02 11:50:59 +08:00
|
|
|
|
msgstr "无效的二进制对象(blob)%s"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/index-pack.c:747
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "invalid %s"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "无效的 %s"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/index-pack.c:749
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "Error in object"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "对象中出错"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/index-pack.c:751
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Not all child objects of %s are reachable"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "%s 的所有子对象并非都可达"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/index-pack.c:821 builtin/index-pack.c:847
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "failed to apply delta"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "无法应用 delta"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/index-pack.c:986
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "Receiving objects"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "接收对象中"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/index-pack.c:986
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "Indexing objects"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "索引对象中"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/index-pack.c:1012
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "pack is corrupted (SHA1 mismatch)"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "包冲突(SHA1 不匹配)"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/index-pack.c:1017
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "cannot fstat packfile"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "不能枚举包文件状态"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/index-pack.c:1020
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "pack has junk at the end"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "包的结尾有垃圾数据"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/index-pack.c:1031
|
2012-07-04 17:20:34 +08:00
|
|
|
|
msgid "confusion beyond insanity in parse_pack_objects()"
|
|
|
|
|
msgstr "parse_pack_objects() 中遇到不可理喻的问题"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/index-pack.c:1054
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "Resolving deltas"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "处理 delta 中"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/index-pack.c:1105
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "confusion beyond insanity"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "不可理喻"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/index-pack.c:1124
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "pack has %d unresolved delta"
|
|
|
|
|
msgid_plural "pack has %d unresolved deltas"
|
2012-05-30 12:19:47 +08: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 17:35:59 +08:00
|
|
|
|
msgstr[1] "包有 %d 个未解决的 delta"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/index-pack.c:1149
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "unable to deflate appended object (%d)"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "不能缩小附加对象(%d)"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/index-pack.c:1228
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "local object %s is corrupt"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "本地对象 %s 已损坏"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/index-pack.c:1252
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "error while closing pack file"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "关闭包文件时出错"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/index-pack.c:1265
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "cannot write keep file '%s'"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "无法写保留文件 '%s'"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/index-pack.c:1273
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "cannot close written keep file '%s'"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "无法关闭保留文件 '%s'"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/index-pack.c:1286
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "cannot store pack file"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "无法存储包文件"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/index-pack.c:1297
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "cannot store index file"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "无法存储索引文件"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/index-pack.c:1398
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "Cannot open existing pack file '%s'"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "无法打开现存包文件 '%s'"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/index-pack.c:1400
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "Cannot open existing pack idx file for '%s'"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "无法为 %s 打开包索引文件"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/index-pack.c:1447
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "non delta: %d object"
|
|
|
|
|
msgid_plural "non delta: %d objects"
|
2012-05-30 12:19:47 +08: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 17:35:59 +08:00
|
|
|
|
msgstr[1] "非 delta:%d 个对象"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/index-pack.c:1454
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "chain length = %d: %lu object"
|
|
|
|
|
msgid_plural "chain length = %d: %lu objects"
|
2012-05-30 12:19:47 +08: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 17:35:59 +08:00
|
|
|
|
msgstr[1] "链长 = %d: %lu 对象"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/index-pack.c:1481
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "Cannot come back to cwd"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "无法返回当前工作目录"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/index-pack.c:1525 builtin/index-pack.c:1528
|
|
|
|
|
#: builtin/index-pack.c:1540 builtin/index-pack.c:1544
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "bad %s"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "错误选项 %s"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/index-pack.c:1558
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "--fix-thin cannot be used without --stdin"
|
2012-08-02 11:50:59 +08:00
|
|
|
|
msgstr "--fix-thin 不能和 --stdin 同时使用"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/index-pack.c:1562 builtin/index-pack.c:1572
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "packfile name '%s' does not end with '.pack'"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "包名 '%s' 没有以 '.pack' 结尾"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/index-pack.c:1581
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "--verify with no packfile name given"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "--verify 没有提供包名参数"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#: builtin/init-db.c:35
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Could not make %s writable by group"
|
|
|
|
|
msgstr "不能设置 %s 为组可写"
|
|
|
|
|
|
|
|
|
|
#: builtin/init-db.c:62
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "insanely long template name %s"
|
|
|
|
|
msgstr "太长的模版名 %s"
|
|
|
|
|
|
|
|
|
|
#: builtin/init-db.c:67
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot stat '%s'"
|
|
|
|
|
msgstr "不能枚举 '%s' 状态"
|
|
|
|
|
|
|
|
|
|
#: builtin/init-db.c:73
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot stat template '%s'"
|
|
|
|
|
msgstr "不能枚举模版 '%s' 状态"
|
|
|
|
|
|
|
|
|
|
#: builtin/init-db.c:80
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot opendir '%s'"
|
|
|
|
|
msgstr "不能打开目录 '%s'"
|
|
|
|
|
|
|
|
|
|
#: builtin/init-db.c:97
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot readlink '%s'"
|
|
|
|
|
msgstr "不能读取链接 '%s'"
|
|
|
|
|
|
|
|
|
|
#: builtin/init-db.c:99
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "insanely long symlink %s"
|
|
|
|
|
msgstr "太长的符号链接 %s"
|
|
|
|
|
|
|
|
|
|
#: builtin/init-db.c:102
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot symlink '%s' '%s'"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "不能自 '%s' 到 '%s' 创建符号链接"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/init-db.c:106
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot copy '%s' to '%s'"
|
|
|
|
|
msgstr "不能拷贝 '%s' 至 '%s'"
|
|
|
|
|
|
|
|
|
|
#: builtin/init-db.c:110
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "ignoring template %s"
|
|
|
|
|
msgstr "忽略模版 %s"
|
|
|
|
|
|
|
|
|
|
#: builtin/init-db.c:133
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "insanely long template path %s"
|
|
|
|
|
msgstr "太长的模版路径 %s"
|
|
|
|
|
|
|
|
|
|
#: builtin/init-db.c:141
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "templates not found %s"
|
|
|
|
|
msgstr "模版未找到 %s"
|
|
|
|
|
|
|
|
|
|
#: builtin/init-db.c:154
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "not copying templates of a wrong format version %d from '%s'"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/init-db.c:192
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "insane git directory %s"
|
|
|
|
|
msgstr "不正常的 git 目录 %s"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/init-db.c:323 builtin/init-db.c:326
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "%s already exists"
|
|
|
|
|
msgstr "%s 已经存在"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/init-db.c:355
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to handle file type %d"
|
|
|
|
|
msgstr "不能处理 %d 类型的文件"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/init-db.c:358
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to move %s to %s"
|
|
|
|
|
msgstr "不能移动 %s 至 %s"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/init-db.c:363
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Could not create git link %s"
|
|
|
|
|
msgstr "不能创建 git link %s"
|
|
|
|
|
|
|
|
|
|
#.
|
|
|
|
|
#. * TRANSLATORS: The first '%s' is either "Reinitialized
|
|
|
|
|
#. * existing" or "Initialized empty", the second " shared" or
|
|
|
|
|
#. * "", and the last '%s%s' is the verbatim directory name.
|
|
|
|
|
#.
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/init-db.c:420
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "%s%s Git repository in %s%s\n"
|
|
|
|
|
msgstr "%s%s Git 版本库于 %s%s\n"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/init-db.c:421
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "Reinitialized existing"
|
|
|
|
|
msgstr "重新初始化现存的"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/init-db.c:421
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "Initialized empty"
|
|
|
|
|
msgstr "初始化空的"
|
|
|
|
|
|
2012-03-30 10:55:34 +08:00
|
|
|
|
# 译者:中文字符串拼接,可删除前导空格
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/init-db.c:422
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid " shared"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "共享"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/init-db.c:441
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "cannot tell cwd"
|
|
|
|
|
msgstr "无法获知当前路径"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/init-db.c:522 builtin/init-db.c:529
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot mkdir %s"
|
|
|
|
|
msgstr "不能创建目录 %s"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/init-db.c:533
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot chdir to %s"
|
|
|
|
|
msgstr "不能切换目录到 %s"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/init-db.c:555
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
|
|
|
|
|
"dir=<directory>)"
|
|
|
|
|
msgstr ""
|
2012-04-28 22:42:41 +08:00
|
|
|
|
"不允许 %s(或 --work-tree=<directory>)而没有指定 %s(或 --git-"
|
|
|
|
|
"dir=<directory>)"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/init-db.c:579
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "Cannot access current working directory"
|
|
|
|
|
msgstr "不能访问当前工作目录"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/init-db.c:586
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Cannot access work tree '%s'"
|
|
|
|
|
msgstr "不能访问工作区 '%s'"
|
|
|
|
|
|
2012-07-04 17:20:34 +08:00
|
|
|
|
#: builtin/log.c:189
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Final output: %d %s\n"
|
|
|
|
|
msgstr "最终输出:%d %s\n"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/log.c:403 builtin/log.c:494
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Could not read object %s"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "不能读取对象 %s"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/log.c:518
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Unknown type: %d"
|
|
|
|
|
msgstr "未知类型:%d"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/log.c:608
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "format.headers without value"
|
|
|
|
|
msgstr "format.headers 没有值"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/log.c:682
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "name of output directory is too long"
|
|
|
|
|
msgstr "输出目录名太长"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/log.c:693
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Cannot open patch file %s"
|
|
|
|
|
msgstr "无法打开补丁文件 %s"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/log.c:707
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "Need exactly one range."
|
|
|
|
|
msgstr "只需要一个范围。"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/log.c:715
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "Not a range."
|
|
|
|
|
msgstr "不是一个范围。"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/log.c:792
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "Cover letter needs email format"
|
|
|
|
|
msgstr "信封需要邮件地址格式"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/log.c:865
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "insane in-reply-to: %s"
|
|
|
|
|
msgstr "不正常的 in-reply-to:%s"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/log.c:938
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "Two output directories?"
|
|
|
|
|
msgstr "两个输出目录?"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/log.c:1160
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "bogus committer info %s"
|
|
|
|
|
msgstr "虚假的提交者信息 %s"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/log.c:1205
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "-n and -k are mutually exclusive."
|
|
|
|
|
msgstr "-n 和 -k 互斥。"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/log.c:1207
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "--subject-prefix and -k are mutually exclusive."
|
|
|
|
|
msgstr "--subject-prefix 和 -k 互斥。"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/log.c:1215
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "--name-only does not make sense"
|
|
|
|
|
msgstr "--name-only 无意义"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/log.c:1217
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "--name-status does not make sense"
|
|
|
|
|
msgstr "--name-status 无意义"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/log.c:1219
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "--check does not make sense"
|
|
|
|
|
msgstr "--check 无意义"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/log.c:1242
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "standard output, or directory, which one?"
|
|
|
|
|
msgstr "标准输出或目录,哪一个?"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/log.c:1244
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Could not create directory '%s'"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "不能创建目录 '%s'"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/log.c:1397
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "Failed to create output files"
|
|
|
|
|
msgstr "无法创建输出文件"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/log.c:1501
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "不能找到跟踪的远程分支,请手工指定 <upstream>。\n"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/log.c:1517 builtin/log.c:1519 builtin/log.c:1531
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Unknown commit %s"
|
|
|
|
|
msgstr "未知提交 %s"
|
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/merge.c:90
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "switch `m' requires a value"
|
|
|
|
|
msgstr "开关 `m' 需要一个值"
|
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/merge.c:127
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Could not find merge strategy '%s'.\n"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "不能找到合并策略 '%s'。\n"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/merge.c:128
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Available strategies are:"
|
|
|
|
|
msgstr "可用的策略有:"
|
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/merge.c:133
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Available custom strategies are:"
|
|
|
|
|
msgstr "可用的自定义策略有:"
|
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/merge.c:240
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "could not run stash."
|
|
|
|
|
msgstr "不能进行进度保存。"
|
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/merge.c:245
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "stash failed"
|
|
|
|
|
msgstr "进度保存失败"
|
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/merge.c:250
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "not a valid object: %s"
|
|
|
|
|
msgstr "不是一个有效对象:%s"
|
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/merge.c:269 builtin/merge.c:286
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "read-tree failed"
|
|
|
|
|
msgstr "读取树失败"
|
|
|
|
|
|
2012-03-27 14:46:11 +08:00
|
|
|
|
# 译者:注意保持前导空格
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/merge.c:316
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid " (nothing to squash)"
|
|
|
|
|
msgstr " (无可压缩)"
|
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/merge.c:329
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Squash commit -- not updating HEAD\n"
|
|
|
|
|
msgstr "压缩提交 -- 未更新 HEAD\n"
|
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/merge.c:361
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "Writing SQUASH_MSG"
|
|
|
|
|
msgstr "写入 SQUASH_MSG"
|
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/merge.c:363
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "Finishing SQUASH_MSG"
|
|
|
|
|
msgstr "完成 SQUASH_MSG"
|
|
|
|
|
|
|
|
|
|
#: builtin/merge.c:386
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "No merge message -- not updating HEAD\n"
|
|
|
|
|
msgstr "无合并信息 -- 未更新 HEAD\n"
|
|
|
|
|
|
2012-03-08 12:06:53 +08:00
|
|
|
|
#: builtin/merge.c:437
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "'%s' does not point to a commit"
|
|
|
|
|
msgstr "'%s' 没有指向一个提交"
|
|
|
|
|
|
2012-03-08 12:06:53 +08:00
|
|
|
|
#: builtin/merge.c:536
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Bad branch.%s.mergeoptions string: %s"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "坏的 branch.%s.mergeoptions 字符串:%s"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-03-08 12:06:53 +08:00
|
|
|
|
#: builtin/merge.c:629
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "git write-tree failed to write a tree"
|
|
|
|
|
msgstr "git write-tree 无法写入一树对象"
|
|
|
|
|
|
2012-03-08 12:06:53 +08:00
|
|
|
|
#: builtin/merge.c:679
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "failed to read the cache"
|
|
|
|
|
msgstr "无法读取缓存"
|
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/merge.c:710
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "Not handling anything other than two heads merge."
|
|
|
|
|
msgstr "不能处理两个头合并之外的任何操作。"
|
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/merge.c:724
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Unknown option for merge-recursive: -X%s"
|
|
|
|
|
msgstr "merge-recursive 的未知选项:-X%s"
|
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/merge.c:738
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to write %s"
|
|
|
|
|
msgstr "不能写 %s"
|
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/merge.c:877
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Could not read from '%s'"
|
|
|
|
|
msgstr "不能从 '%s' 读取"
|
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/merge.c:886
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
|
|
|
|
|
msgstr "未提交合并,使用 'git commit' 完成此次合并。\n"
|
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/merge.c:892
|
2012-02-13 14:41:59 +08: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"
|
|
|
|
|
"Lines starting with '#' will be ignored, and an empty message aborts\n"
|
|
|
|
|
"the commit.\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支\n"
|
|
|
|
|
"合并到主题分支。\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"以 '#' 开头的行将被忽略,而且空提交说明将会终止提交。\n"
|
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/merge.c:916
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "Empty commit message."
|
|
|
|
|
msgstr "空提交信息。"
|
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/merge.c:928
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Wonderful.\n"
|
|
|
|
|
msgstr "太棒了。\n"
|
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/merge.c:993
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
|
|
|
|
|
msgstr "自动合并失败,修正冲突然后提交修正的结果。\n"
|
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/merge.c:1009
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "'%s' is not a commit"
|
|
|
|
|
msgstr "'%s' 不是一个提交"
|
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/merge.c:1050
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "No current branch."
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "没有当前分支。"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/merge.c:1052
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "No remote for the current branch."
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "当前分支没有对应的远程版本库。"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/merge.c:1054
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "No default upstream defined for the current branch."
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "当前分支没有定义默认的上游分支。"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/merge.c:1059
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "No remote tracking branch for %s from %s"
|
|
|
|
|
msgstr "%s 没有来自 %s 的远程跟踪分支"
|
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/merge.c:1146 builtin/merge.c:1303
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "%s - not something we can merge"
|
|
|
|
|
msgstr "%s - 不能被合并"
|
|
|
|
|
|
|
|
|
|
#: builtin/merge.c:1214
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "There is no merge to abort (MERGE_HEAD missing)."
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "没有要终止的合并(MERGE_HEAD 丢失)。"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/merge.c:1230 git-pull.sh:31
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid ""
|
|
|
|
|
"You have not concluded your merge (MERGE_HEAD exists).\n"
|
|
|
|
|
"Please, commit your changes before you can merge."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"您尚未结束您的合并(存在 MERGE_HEAD)。\n"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
"请在合并前先提交您的修改。"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/merge.c:1233 git-pull.sh:34
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "You have not concluded your merge (MERGE_HEAD exists)."
|
|
|
|
|
msgstr "您尚未结束您的合并(存在 MERGE_HEAD)。"
|
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/merge.c:1237
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid ""
|
|
|
|
|
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
|
|
|
|
|
"Please, commit your changes before you can merge."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。\n"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
"请在合并前先提交您的修改。"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/merge.c:1240
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
|
|
|
|
|
msgstr "您尚未结束您的拣选(存在 CHERRY_PICK_HEAD)。"
|
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/merge.c:1249
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "You cannot combine --squash with --no-ff."
|
2012-08-02 11:50:59 +08:00
|
|
|
|
msgstr "您不能将 --squash 与 --no-ff 同时使用。"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/merge.c:1254
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "You cannot combine --no-ff with --ff-only."
|
2012-08-02 11:50:59 +08:00
|
|
|
|
msgstr "您不能将 --no-ff 与 --ff-only 同时使用。"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/merge.c:1261
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "No commit specified and merge.defaultToUpstream not set."
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/merge.c:1293
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "Can merge only exactly one commit into empty head"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "只能将一个提交合并到空分支上"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/merge.c:1296
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "Squash commit into empty head not supported yet"
|
|
|
|
|
msgstr "尚不支持到空分支的压缩提交"
|
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/merge.c:1298
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "Non-fast-forward commit does not make sense into an empty head"
|
|
|
|
|
msgstr "到空分支的非快进式提交没有意义"
|
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/merge.c:1413
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Updating %s..%s\n"
|
|
|
|
|
msgstr "更新 %s..%s\n"
|
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/merge.c:1451
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Trying really trivial in-index merge...\n"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "尝试非常小的索引内合并...\n"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/merge.c:1458
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Nope.\n"
|
|
|
|
|
msgstr "无。\n"
|
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/merge.c:1490
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "Not possible to fast-forward, aborting."
|
2012-03-03 08:34:28 +08:00
|
|
|
|
msgstr "无法快进,终止。"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/merge.c:1513 builtin/merge.c:1592
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Rewinding the tree to pristine...\n"
|
|
|
|
|
msgstr "将树回滚至原始状态...\n"
|
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/merge.c:1517
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Trying merge strategy %s...\n"
|
|
|
|
|
msgstr "尝试合并策略 %s...\n"
|
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/merge.c:1583
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "No merge strategy handled the merge.\n"
|
|
|
|
|
msgstr "没有合并策略处理此合并。\n"
|
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/merge.c:1585
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Merge with strategy %s failed.\n"
|
|
|
|
|
msgstr "使用策略 %s 合并失败。\n"
|
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/merge.c:1594
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Using the %s to prepare resolving by hand.\n"
|
|
|
|
|
msgstr "使用 %s 以准备手工解决。\n"
|
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/merge.c:1606
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Automatic merge went well; stopped before committing as requested\n"
|
|
|
|
|
msgstr "自动合并进展顺利,按要求在提交前停止\n"
|
|
|
|
|
|
|
|
|
|
#: builtin/mv.c:108
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Checking rename of '%s' to '%s'\n"
|
|
|
|
|
msgstr "检查 '%s' 到 '%s' 的重命名\n"
|
|
|
|
|
|
|
|
|
|
#: builtin/mv.c:112
|
|
|
|
|
msgid "bad source"
|
|
|
|
|
msgstr "坏的源"
|
|
|
|
|
|
|
|
|
|
#: builtin/mv.c:115
|
|
|
|
|
msgid "can not move directory into itself"
|
|
|
|
|
msgstr "不能将目录移动到自身"
|
|
|
|
|
|
|
|
|
|
#: builtin/mv.c:118
|
|
|
|
|
msgid "cannot move directory over file"
|
|
|
|
|
msgstr "不能将目录移动到文件"
|
|
|
|
|
|
|
|
|
|
#: builtin/mv.c:128
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Huh? %.*s is in index?"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "嗯?%.*s 在索引中?"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/mv.c:140
|
|
|
|
|
msgid "source directory is empty"
|
|
|
|
|
msgstr "源目录为空"
|
|
|
|
|
|
|
|
|
|
#: builtin/mv.c:171
|
|
|
|
|
msgid "not under version control"
|
|
|
|
|
msgstr "不在版本控制之下"
|
|
|
|
|
|
|
|
|
|
#: builtin/mv.c:173
|
|
|
|
|
msgid "destination exists"
|
|
|
|
|
msgstr "目标已存在"
|
|
|
|
|
|
|
|
|
|
#: builtin/mv.c:181
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "overwriting '%s'"
|
|
|
|
|
msgstr "覆盖 '%s'"
|
|
|
|
|
|
|
|
|
|
#: builtin/mv.c:184
|
|
|
|
|
msgid "Cannot overwrite"
|
|
|
|
|
msgstr "不能覆盖"
|
|
|
|
|
|
|
|
|
|
#: builtin/mv.c:187
|
|
|
|
|
msgid "multiple sources for the same target"
|
|
|
|
|
msgstr "同一目标具有多个源"
|
|
|
|
|
|
|
|
|
|
#: builtin/mv.c:202
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "%s, source=%s, destination=%s"
|
|
|
|
|
msgstr "%s,源=%s,目标=%s"
|
|
|
|
|
|
|
|
|
|
#: builtin/mv.c:212
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Renaming %s to %s\n"
|
|
|
|
|
msgstr "重命名 %s 至 %s\n"
|
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/mv.c:215 builtin/remote.c:731
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "renaming '%s' failed"
|
|
|
|
|
msgstr "重命名 '%s' 失败"
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:139
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to start 'show' for object '%s'"
|
|
|
|
|
msgstr "不能为对象 '%s' 开始 'show'"
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:145
|
|
|
|
|
msgid "can't fdopen 'show' output fd"
|
|
|
|
|
msgstr "不能打开 'show' 输出文件句柄"
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:155
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to close pipe to 'show' for object '%s'"
|
|
|
|
|
msgstr "无法为对象 '%s' 的 'show' 关闭管道"
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:158
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to finish 'show' for object '%s'"
|
|
|
|
|
msgstr "无法为对象 '%s' 完成 'show'"
|
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/notes.c:175 builtin/tag.c:347
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "could not create file '%s'"
|
|
|
|
|
msgstr "不能创建文件 '%s'"
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:189
|
|
|
|
|
msgid "Please supply the note contents using either -m or -F option"
|
|
|
|
|
msgstr "请通过 -m 或 -F 选项为注解提供内容"
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:210 builtin/notes.c:973
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Removing note for object %s\n"
|
|
|
|
|
msgstr "删除对象 %s 的注解\n"
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:215
|
|
|
|
|
msgid "unable to write note object"
|
|
|
|
|
msgstr "不能写注解对象"
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:217
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "The note contents has been left in %s"
|
|
|
|
|
msgstr "注解内容被留在文件 %s 中"
|
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/notes.c:251 builtin/tag.c:542
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "cannot read '%s'"
|
|
|
|
|
msgstr "不能读取 '%s'"
|
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/notes.c:253 builtin/tag.c:545
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "could not open or read '%s'"
|
|
|
|
|
msgstr "不能打开或读取 '%s'"
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:272 builtin/notes.c:445 builtin/notes.c:447
|
|
|
|
|
#: builtin/notes.c:507 builtin/notes.c:561 builtin/notes.c:644
|
|
|
|
|
#: builtin/notes.c:649 builtin/notes.c:724 builtin/notes.c:766
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:558
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Failed to resolve '%s' as a valid ref."
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "无法解析 '%s' 为一个有效引用。"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:275
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Failed to read object '%s'."
|
|
|
|
|
msgstr "无法读取对象 '%s'。"
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:299
|
|
|
|
|
msgid "Cannot commit uninitialized/unreferenced notes tree"
|
|
|
|
|
msgstr "不能提交未初始化/未引用的注解树"
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:340
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Bad notes.rewriteMode value: '%s'"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "坏的 notes.rewriteMode 值:'%s'"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:350
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
|
|
|
|
|
msgstr "拒绝向 %s(在 refs/notes/ 之外)写入注解"
|
|
|
|
|
|
|
|
|
|
#. TRANSLATORS: The first %s is the name of the
|
|
|
|
|
#. environment variable, the second %s is its value
|
|
|
|
|
#: builtin/notes.c:377
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Bad %s value: '%s'"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "坏的 %s 值:'%s'"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:441
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Malformed input line: '%s'."
|
|
|
|
|
msgstr "非法的输入行:'%s'。"
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:456
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Failed to copy notes from '%s' to '%s'"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "无法从 '%s' 到 '%s' 拷贝注解"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:500 builtin/notes.c:554 builtin/notes.c:627
|
|
|
|
|
#: builtin/notes.c:639 builtin/notes.c:712 builtin/notes.c:759
|
|
|
|
|
#: builtin/notes.c:1033
|
|
|
|
|
msgid "too many parameters"
|
|
|
|
|
msgstr "参数太多"
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:513 builtin/notes.c:772
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "No note found for object %s."
|
|
|
|
|
msgstr "未发现对象 %s 的注解。"
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:580
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
|
|
|
|
|
"existing notes"
|
|
|
|
|
msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:585 builtin/notes.c:662
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Overwriting existing notes for object %s\n"
|
|
|
|
|
msgstr "覆盖对象 %s 现存注解\n"
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:635
|
|
|
|
|
msgid "too few parameters"
|
|
|
|
|
msgstr "参数太少"
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:656
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
|
|
|
|
|
"existing notes"
|
|
|
|
|
msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:668
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Missing notes on source object %s. Cannot copy."
|
|
|
|
|
msgstr "源对象 %s 缺少注解。不能拷贝。"
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:717
|
|
|
|
|
#, 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 ""
|
2012-03-27 14:46:11 +08:00
|
|
|
|
"子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
"请换用 'git notes add -f -m/-F/-c/-C'。\n"
|
|
|
|
|
|
|
|
|
|
#: builtin/notes.c:971
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Object %s has no note\n"
|
|
|
|
|
msgstr "对象 %s 没有注解\n"
|
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/notes.c:1103 builtin/remote.c:1598
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Unknown subcommand: %s"
|
|
|
|
|
msgstr "未知子命令:%s"
|
|
|
|
|
|
2012-07-04 17:20:34 +08:00
|
|
|
|
#: builtin/pack-objects.c:183 builtin/pack-objects.c:186
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "deflate error (%d)"
|
|
|
|
|
msgstr "压缩错误 (%d)"
|
|
|
|
|
|
|
|
|
|
#: builtin/pack-objects.c:2398
|
2012-02-28 12:24:54 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unsupported index version %s"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "不支持的索引版本 %s"
|
2012-02-28 12:24:54 +08:00
|
|
|
|
|
2012-07-04 17:20:34 +08:00
|
|
|
|
#: builtin/pack-objects.c:2402
|
2012-02-28 12:24:54 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "bad index version '%s'"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "坏的索引版本 '%s'"
|
2012-02-28 12:24:54 +08:00
|
|
|
|
|
2012-07-04 17:20:34 +08:00
|
|
|
|
#: builtin/pack-objects.c:2425
|
2012-02-28 12:24:54 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "option %s does not accept negative form"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "选项 %s 不接受否定格式"
|
2012-02-28 12:24:54 +08:00
|
|
|
|
|
2012-07-04 17:20:34 +08:00
|
|
|
|
#: builtin/pack-objects.c:2429
|
2012-02-28 12:24:54 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "unable to parse value '%s' for option %s"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "不能解析选项 %1$s 的值 '%2$s'"
|
2012-02-28 12:24:54 +08:00
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/push.c:45
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "tag shorthand without <tag>"
|
|
|
|
|
msgstr "tag 简写没有跟 <tag> 参数"
|
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/push.c:64
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "--delete only accepts plain target ref names"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "--delete 只接受简单的目标引用名"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/push.c:99
|
|
|
|
|
msgid ""
|
|
|
|
|
"\n"
|
|
|
|
|
"To choose either option permanently, see push.default in 'git help config'."
|
|
|
|
|
msgstr ""
|
2012-05-30 12:19:47 +08:00
|
|
|
|
"\n"
|
|
|
|
|
"为了永久地选择任一选项,参见 'git help config' 中的 push.default。"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/push.c:102
|
|
|
|
|
#, 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 12:19:47 +08:00
|
|
|
|
"如果您当前分支的上游分支和您当前分支名不匹配,为推送到远程的\n"
|
|
|
|
|
"上游分支,使用\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git push %s HEAD:%s\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"为推送至远程同名分支,使用\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git push %s %s\n"
|
|
|
|
|
"%s"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/push.c:121
|
2012-02-13 14:41:59 +08: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 14:46:11 +08:00
|
|
|
|
"现在为推送当前(分离头指针)的历史,使用\n"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
"\n"
|
|
|
|
|
" git push %s HEAD:<name-of-remote-branch>\n"
|
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/push.c:128
|
2012-02-13 14:41:59 +08: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"
|
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/push.c:136
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "The current branch %s has multiple upstream branches, refusing to push."
|
|
|
|
|
msgstr "当前分支 %s 有多个上游分支,拒绝推送。"
|
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/push.c:139
|
2012-04-28 22:42:41 +08: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"
|
|
|
|
|
"而没有告诉我要推送什么、更新哪个远程分支。"
|
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/push.c:174
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid ""
|
|
|
|
|
"You didn't specify any refspecs to push, and push.default is \"nothing\"."
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "您没有为推送指定任何引用表达式,并且 push.default 为 \"nothing\"。"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/push.c:181
|
2012-04-30 00:06:55 +08:00
|
|
|
|
msgid ""
|
|
|
|
|
"Updates were rejected because the tip of your current branch is behind\n"
|
|
|
|
|
"its remote counterpart. Merge the remote changes (e.g. 'git pull')\n"
|
|
|
|
|
"before pushing again.\n"
|
|
|
|
|
"See the 'Note about fast-forwards' in 'git push --help' for details."
|
|
|
|
|
msgstr ""
|
2012-05-15 11:53:26 +08:00
|
|
|
|
"更新被拒绝,因为您当前分支的最新提交落后于其对应的远程分支。\n"
|
|
|
|
|
"再次推送前,先与远程变更合并(如 'git pull')。详见\n"
|
|
|
|
|
"'git push --help' 中的 'Note about fast-forwards' 小节。"
|
2012-04-30 00:06:55 +08:00
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/push.c:187
|
2012-04-30 00:06:55 +08:00
|
|
|
|
msgid ""
|
|
|
|
|
"Updates were rejected because a pushed branch tip is behind its remote\n"
|
|
|
|
|
"counterpart. If you did not intend to push that branch, you may want to\n"
|
|
|
|
|
"specify branches to push or set the 'push.default' configuration\n"
|
|
|
|
|
"variable to 'current' or 'upstream' to push only the current branch."
|
|
|
|
|
msgstr ""
|
2012-05-15 11:53:26 +08:00
|
|
|
|
"更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
|
|
|
|
|
"如果您并非有意推送该分支,您可以在推送时指定要推送的分支,或者将\n"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
"配置变量 'push.default' 设置为 'current' 或 'upstream' 以便只推送当前分支。"
|
2012-04-30 00:06:55 +08:00
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/push.c:193
|
2012-04-30 00:06:55 +08:00
|
|
|
|
msgid ""
|
|
|
|
|
"Updates were rejected because a pushed branch tip is behind its remote\n"
|
|
|
|
|
"counterpart. Check out this branch and merge the remote changes\n"
|
|
|
|
|
"(e.g. 'git pull') before pushing again.\n"
|
|
|
|
|
"See the 'Note about fast-forwards' in 'git push --help' for details."
|
|
|
|
|
msgstr ""
|
2012-05-15 11:53:26 +08:00
|
|
|
|
"更新被拒绝,因为推送的一个分支的最新提交落后于其对应的远程分支。\n"
|
|
|
|
|
"检出该分支并与远程变更合并(如 'git pull'),然后再推送。详见\n"
|
|
|
|
|
"'git push --help' 中的 'Note about fast-forwards' 小节。"
|
2012-04-30 00:06:55 +08:00
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/push.c:233
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Pushing to %s\n"
|
|
|
|
|
msgstr "推送到 %s\n"
|
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/push.c:237
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "failed to push some refs to '%s'"
|
|
|
|
|
msgstr "无法推送一些引用到 '%s'"
|
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/push.c:269
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "bad repository '%s'"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "坏的版本库 '%s'"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/push.c:270
|
2012-02-13 14:41:59 +08: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 14:46:11 +08:00
|
|
|
|
"没有配置推送目标。\n"
|
|
|
|
|
"或者通过命令行指定URL,或者用下面命令配置一个远程版本库\n"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
"\n"
|
|
|
|
|
" git remote add <name> <url>\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"然后使用该远程版本库名执行推送\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" git push <name>\n"
|
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/push.c:285
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "--all and --tags are incompatible"
|
|
|
|
|
msgstr "--all 和 --tags 不兼容"
|
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/push.c:286
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "--all can't be combined with refspecs"
|
2012-08-02 11:50:59 +08:00
|
|
|
|
msgstr "--all 不能和引用表达式同时使用"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/push.c:291
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "--mirror and --tags are incompatible"
|
|
|
|
|
msgstr "--mirror 和 --tags 不兼容"
|
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/push.c:292
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "--mirror can't be combined with refspecs"
|
2012-08-02 11:50:59 +08:00
|
|
|
|
msgstr "--mirror 不能和引用表达式同时使用"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/push.c:297
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "--all and --mirror are incompatible"
|
|
|
|
|
msgstr "--all 和 --mirror 不兼容"
|
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/push.c:385
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "--delete is incompatible with --all, --mirror and --tags"
|
|
|
|
|
msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
|
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/push.c:387
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "--delete doesn't make sense without any refs"
|
|
|
|
|
msgstr "--delete 未接任何引用没有意义"
|
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/remote.c:98
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "Updating %s"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "更新 %s 中"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/remote.c:130
|
|
|
|
|
msgid ""
|
|
|
|
|
"--mirror is dangerous and deprecated; please\n"
|
|
|
|
|
"\t use --mirror=fetch or --mirror=push instead"
|
|
|
|
|
msgstr ""
|
2012-05-30 12:19:47 +08:00
|
|
|
|
"--mirror 选项危险且过时,请使用 --mirror=fetch\n"
|
|
|
|
|
"\t 或 --mirror=push"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/remote.c:147
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "unknown mirror argument: %s"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "未知的镜像参数:%s"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/remote.c:185
|
|
|
|
|
msgid "specifying a master branch makes no sense with --mirror"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/remote.c:187
|
|
|
|
|
msgid "specifying branches to track makes sense only with fetch mirrors"
|
2012-08-02 11:50:59 +08:00
|
|
|
|
msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/remote.c:195 builtin/remote.c:646
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "remote %s already exists."
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "远程 %s 已经存在。"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/remote.c:199 builtin/remote.c:650
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "'%s' is not a valid remote name"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "'%s' 不是一个有效的远程名称"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/remote.c:243
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "Could not setup master '%s'"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "无法设置 master '%s'"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/remote.c:299
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "more than one %s"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "多于一个 %s"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/remote.c:339
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "Could not get fetch map for refspec %s"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "无法得到引用表达式 %s 的获取列表"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/remote.c:440 builtin/remote.c:448
|
|
|
|
|
msgid "(matching)"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "(匹配)"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/remote.c:452
|
|
|
|
|
msgid "(delete)"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "(删除)"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "Could not append '%s' to '%s'"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "不能添加 '%s' 至 '%s'"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "No such remote: %s"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "没有这样的远程:%s"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/remote.c:656
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "Could not rename config section '%s' to '%s'"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "不能重命名配置小节 '%s' 到 '%s'"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/remote.c:662 builtin/remote.c:799
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "Could not remove config section '%s'"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "不能移除配置小节 '%s'"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/remote.c:677
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
2012-06-02 17:12:59 +08:00
|
|
|
|
"Not updating non-default fetch refspec\n"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
"\t%s\n"
|
|
|
|
|
"\tPlease update the configuration manually if necessary."
|
|
|
|
|
msgstr ""
|
2012-05-30 12:19:47 +08:00
|
|
|
|
"没有更新非默认的获取引用表达式\n"
|
|
|
|
|
"\t%s\n"
|
|
|
|
|
"\t如果必要请手动更新配置。"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/remote.c:683
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "Could not append '%s'"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "不能追加 '%s'"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/remote.c:694
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "Could not set '%s'"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "不能设置 '%s'"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/remote.c:716
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "deleting '%s' failed"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "删除 '%s' 失败"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/remote.c:750
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "creating '%s' failed"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "创建 '%s' 失败"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/remote.c:764
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "Could not remove branch %s"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "无法移除分支 %s"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/remote.c:834
|
|
|
|
|
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 17:35:59 +08:00
|
|
|
|
msgstr[0] "注意:ref/remotes 层级之外的一个分支未被移除。要删除它,使用:"
|
|
|
|
|
msgstr[1] "注意:ref/remotes 层级之外的一些分支未被移除。要删除它们,使用:"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/remote.c:943
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid " new (next fetch will store in remotes/%s)"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr " 新的(下一次获取将存储于 remotes/%s)"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/remote.c:946
|
|
|
|
|
msgid " tracked"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr " 已跟踪"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/remote.c:948
|
|
|
|
|
msgid " stale (use 'git remote prune' to remove)"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr " 过时(使用 'git remote prune' 来移除)"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/remote.c:950
|
|
|
|
|
msgid " ???"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr " ???"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/remote.c:991
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "无效的 branch.%s.merge,不能变基到一个以上的分支"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/remote.c:998
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "rebases onto remote %s"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "变基到远程 %s"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/remote.c:1001
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid " merges with remote %s"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr " 与远程 %s 合并"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/remote.c:1002
|
|
|
|
|
msgid " and with remote"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr " 且有远程"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/remote.c:1004
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "merges with remote %s"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "与远程 %s 合并"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/remote.c:1005
|
|
|
|
|
msgid " and with remote"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr " 且有远程"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/remote.c:1051
|
|
|
|
|
msgid "create"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "创建"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/remote.c:1054
|
|
|
|
|
msgid "delete"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "删除"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/remote.c:1058
|
|
|
|
|
msgid "up to date"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "最新"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/remote.c:1061
|
|
|
|
|
msgid "fast-forwardable"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "可快进"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/remote.c:1064
|
|
|
|
|
msgid "local out of date"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "本地已过时"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/remote.c:1071
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid " %-*s forces to %-*s (%s)"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr " %-*s 强制推送至 %-*s (%s)"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/remote.c:1074
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid " %-*s pushes to %-*s (%s)"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr " %-*s 推送至 %-*s (%s)"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/remote.c:1078
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid " %-*s forces to %s"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr " %-*s 强制推送至 %s"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/remote.c:1081
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid " %-*s pushes to %s"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr " %-*s 推送至 %s"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/remote.c:1118
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "* remote %s"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "* 远程 %s"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/remote.c:1119
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid " Fetch URL: %s"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr " 获取地址:%s"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/remote.c:1120 builtin/remote.c:1285
|
|
|
|
|
msgid "(no URL)"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "(无 URL)"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/remote.c:1129 builtin/remote.c:1131
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid " Push URL: %s"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr " 推送地址:%s"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid " HEAD branch: %s"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr " HEAD分支:%s"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/remote.c:1139
|
|
|
|
|
#, 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 17:35:59 +08:00
|
|
|
|
msgstr " HEAD 分支(远程 HEAD 模糊,可能是下列中的一个):\n"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/remote.c:1151
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid " Remote branch:%s"
|
|
|
|
|
msgid_plural " Remote branches:%s"
|
2012-05-30 12:19:47 +08: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 17:35:59 +08:00
|
|
|
|
msgstr[1] " 远程分支:%s"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-05-30 12:19:47 +08:00
|
|
|
|
# 译者:中文字符串拼接,可删除前导空格
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/remote.c:1154 builtin/remote.c:1181
|
|
|
|
|
msgid " (status not queried)"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "(状态未查询)"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/remote.c:1163
|
|
|
|
|
msgid " Local branch configured for 'git pull':"
|
|
|
|
|
msgid_plural " Local branches configured for 'git pull':"
|
2012-05-30 12:19:47 +08: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 17:35:59 +08:00
|
|
|
|
msgstr[1] " 为 'git pull' 配置的本地分支:"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/remote.c:1171
|
|
|
|
|
msgid " Local refs will be mirrored by 'git push'"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr " 本地引用将在 'git push' 时被镜像"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/remote.c:1178
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid " Local ref configured for 'git push'%s:"
|
|
|
|
|
msgid_plural " Local refs configured for 'git push'%s:"
|
2012-05-30 12:19:47 +08: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 17:35:59 +08:00
|
|
|
|
msgstr[1] " 为 'git push' 配置的本地引用%s:"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/remote.c:1216
|
|
|
|
|
msgid "Cannot determine remote HEAD"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "无法确定远程 HEAD"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/remote.c:1218
|
|
|
|
|
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "多个远程 HEAD 分支。请明确地选择一个用命令:"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/remote.c:1228
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "Could not delete %s"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "无法删除 %s"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/remote.c:1236
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "Not a valid ref: %s"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "不是一个有效引用:%s"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/remote.c:1238
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "Could not setup %s"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "不能设置 %s"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
# 译者:注意保持前导空格
|
|
|
|
|
#: builtin/remote.c:1274
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid " %s will become dangling!"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr " %s 将成为悬空状态!"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
# 译者:注意保持前导空格
|
|
|
|
|
#: builtin/remote.c:1275
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid " %s has become dangling!"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr " %s 已成为悬空状态!"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/remote.c:1281
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "Pruning %s"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "修剪 %s"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/remote.c:1282
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "URL: %s"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "URL:%s"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/remote.c:1295
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid " * [would prune] %s"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr " * [将删除] %s"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/remote.c:1298
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid " * [pruned] %s"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr " * [已删除] %s"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/remote.c:1387 builtin/remote.c:1461
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "No such remote '%s'"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "没有此远程 '%s'"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/remote.c:1414
|
|
|
|
|
msgid "no remote specified"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "未指定远程"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/remote.c:1447
|
|
|
|
|
msgid "--add --delete doesn't make sense"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "--add --delete 无意义"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/remote.c:1487
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "Invalid old URL pattern: %s"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "无效的旧URL匹配模版:%s"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/remote.c:1495
|
2012-05-30 12:19:47 +08:00
|
|
|
|
#, c-format
|
2012-05-21 09:35:47 +08:00
|
|
|
|
msgid "No such URL found: %s"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "未找到此URL:%s"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/remote.c:1497
|
|
|
|
|
msgid "Will not delete all non-push URLs"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "将不会删除所有非推送URL地址"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#: builtin/reset.c:33
|
|
|
|
|
msgid "mixed"
|
|
|
|
|
msgstr "混杂"
|
|
|
|
|
|
|
|
|
|
#: builtin/reset.c:33
|
|
|
|
|
msgid "soft"
|
|
|
|
|
msgstr "软性"
|
|
|
|
|
|
|
|
|
|
#: builtin/reset.c:33
|
|
|
|
|
msgid "hard"
|
|
|
|
|
msgstr "硬性"
|
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/reset.c:33
|
|
|
|
|
msgid "merge"
|
|
|
|
|
msgstr "合并"
|
|
|
|
|
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#: builtin/reset.c:33
|
|
|
|
|
msgid "keep"
|
|
|
|
|
msgstr "保持"
|
|
|
|
|
|
|
|
|
|
#: builtin/reset.c:77
|
|
|
|
|
msgid "You do not have a valid HEAD."
|
|
|
|
|
msgstr "您没有一个有效的 HEAD。"
|
|
|
|
|
|
|
|
|
|
#: builtin/reset.c:79
|
|
|
|
|
msgid "Failed to find tree of HEAD."
|
|
|
|
|
msgstr "无法找到 HEAD 指向的树。"
|
|
|
|
|
|
|
|
|
|
#: builtin/reset.c:85
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Failed to find tree of %s."
|
|
|
|
|
msgstr "无法找到 %s 指向的树。"
|
|
|
|
|
|
|
|
|
|
#: builtin/reset.c:96
|
|
|
|
|
msgid "Could not write new index file."
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "不能写入新的索引文件。"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/reset.c:106
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "HEAD is now at %s"
|
|
|
|
|
msgstr "HEAD 现在位于 %s"
|
|
|
|
|
|
|
|
|
|
#: builtin/reset.c:130
|
|
|
|
|
msgid "Could not read index"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "不能读取索引"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/reset.c:133
|
|
|
|
|
msgid "Unstaged changes after reset:"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "重置后撤出暂存区的变更:"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-03-27 14:46:11 +08:00
|
|
|
|
# 译者:汉字之间无空格,故删除%s前后空格
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#: builtin/reset.c:223
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Cannot do a %s reset in the middle of a merge."
|
|
|
|
|
msgstr "在合并过程中不能做%s重置操作。"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/reset.c:303
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Could not parse object '%s'."
|
|
|
|
|
msgstr "不能解析对象 '%s'。"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/reset.c:308
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "--patch is incompatible with --{hard,mixed,soft}"
|
|
|
|
|
msgstr "--patch 与 --{hard,mixed,soft} 不兼容"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/reset.c:317
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
|
2012-07-31 06:45:33 +08:00
|
|
|
|
msgstr "--mixed 带路径已弃用,而是用 'git reset -- <paths>'。"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-03-27 14:46:11 +08:00
|
|
|
|
# 译者:汉字之间无空格,故删除%s前后空格
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/reset.c:319
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Cannot do %s reset with paths."
|
|
|
|
|
msgstr "不能带路径进行%s重置。"
|
|
|
|
|
|
2012-03-27 14:46:11 +08:00
|
|
|
|
# 译者:汉字之间无空格,故删除%s前后空格
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/reset.c:331
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "%s reset is not allowed in a bare repository"
|
|
|
|
|
msgstr "不能对裸版本库进行%s重置"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: builtin/reset.c:347
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Could not reset index file to revision '%s'."
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "不能重置索引文件至版本 '%s'。"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: builtin/revert.c:70 builtin/revert.c:92
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "%s: %s cannot be used with %s"
|
2012-08-02 11:50:59 +08:00
|
|
|
|
msgstr "%s:%s 不能和 %s 同时使用"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/revert.c:131
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "program error"
|
|
|
|
|
msgstr "程序错误"
|
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/revert.c:221
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "revert failed"
|
|
|
|
|
msgstr "还原失败"
|
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/revert.c:236
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "cherry-pick failed"
|
|
|
|
|
msgstr "拣选失败"
|
|
|
|
|
|
|
|
|
|
#: builtin/rm.c:109
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"'%s' has staged content different from both the file and the HEAD\n"
|
|
|
|
|
"(use -f to force removal)"
|
|
|
|
|
msgstr ""
|
2012-03-27 14:46:11 +08:00
|
|
|
|
"'%s' 暂存的内容和工作区及 HEAD 中的都不一样\n"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
"(使用 -f 强制删除)"
|
|
|
|
|
|
|
|
|
|
#: builtin/rm.c:115
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"'%s' has changes staged in the index\n"
|
|
|
|
|
"(use --cached to keep the file, or -f to force removal)"
|
|
|
|
|
msgstr ""
|
2012-03-27 14:46:11 +08:00
|
|
|
|
"'%s' 有变更已暂存至索引中\n"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
"(使用 --cached 保存文件,或用 -f 强制删除)"
|
|
|
|
|
|
|
|
|
|
#: builtin/rm.c:119
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"'%s' has local modifications\n"
|
|
|
|
|
"(use --cached to keep the file, or -f to force removal)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"'%s' 有本地修改\n"
|
|
|
|
|
"(使用 --cached 保存文件,或用 -f 强制删除)"
|
|
|
|
|
|
|
|
|
|
#: builtin/rm.c:194
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "not removing '%s' recursively without -r"
|
|
|
|
|
msgstr "未提供 -r 选项不会递归删除 '%s'"
|
|
|
|
|
|
|
|
|
|
#: builtin/rm.c:230
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "git rm: unable to remove %s"
|
|
|
|
|
msgstr "git rm:不能删除 %s"
|
|
|
|
|
|
|
|
|
|
#: builtin/shortlog.c:157
|
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Missing author: %s"
|
|
|
|
|
msgstr "缺少作者:%s"
|
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/tag.c:60
|
2012-02-28 12:24:54 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "malformed object at '%s'"
|
|
|
|
|
msgstr "非法的对象于 '%s'"
|
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/tag.c:207
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "tag name too long: %.*s..."
|
|
|
|
|
msgstr "tag 名字太长:%.*s..."
|
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/tag.c:212
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "tag '%s' not found."
|
|
|
|
|
msgstr "tag '%s' 未发现。"
|
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/tag.c:227
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Deleted tag '%s' (was %s)\n"
|
|
|
|
|
msgstr "已删除 tag '%s'(曾为 %s)\n"
|
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/tag.c:239
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "could not verify the tag '%s'"
|
|
|
|
|
msgstr "不能校验 tag '%s'"
|
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/tag.c:249
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid ""
|
|
|
|
|
"\n"
|
|
|
|
|
"#\n"
|
|
|
|
|
"# Write a tag message\n"
|
|
|
|
|
"# Lines starting with '#' will be ignored.\n"
|
|
|
|
|
"#\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"\n"
|
|
|
|
|
"#\n"
|
|
|
|
|
"# 输入一个 tag 说明\n"
|
|
|
|
|
"# 以 '#' 开头的行将被忽略。\n"
|
|
|
|
|
"#\n"
|
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/tag.c:256
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid ""
|
|
|
|
|
"\n"
|
|
|
|
|
"#\n"
|
|
|
|
|
"# Write a tag message\n"
|
|
|
|
|
"# Lines starting with '#' will be kept; you may remove them yourself if you "
|
|
|
|
|
"want to.\n"
|
|
|
|
|
"#\n"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"\n"
|
|
|
|
|
"#\n"
|
|
|
|
|
"# 输入一个 tag 说明\n"
|
|
|
|
|
"# 以 '#' 开头的行将被忽略,您可以删除它们如果您想这样做。\n"
|
|
|
|
|
"#\n"
|
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/tag.c:298
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "unable to sign the tag"
|
|
|
|
|
msgstr "无法签署 tag"
|
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/tag.c:300
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "unable to write tag file"
|
|
|
|
|
msgstr "无法写 tag 文件"
|
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/tag.c:325
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "bad object type."
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "坏的对象类型。"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/tag.c:338
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "tag header too big."
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "tag 头信息太大。"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/tag.c:370
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "no tag message?"
|
|
|
|
|
msgstr "无 tag 说明?"
|
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/tag.c:376
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "The tag message has been left in %s\n"
|
|
|
|
|
msgstr "tag 说明被保留在 %s\n"
|
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/tag.c:425
|
2012-02-28 12:24:54 +08:00
|
|
|
|
msgid "switch 'points-at' requires an object"
|
|
|
|
|
msgstr "开关 'points-at' 需要一个对象"
|
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/tag.c:427
|
2012-02-28 12:24:54 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "malformed object name '%s'"
|
|
|
|
|
msgstr "非法的对象名 '%s'"
|
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/tag.c:506
|
|
|
|
|
msgid "--column and -n are incompatible"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "--column 和 -n 不兼容"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: builtin/tag.c:523
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "-n option is only allowed with -l."
|
2012-08-02 11:50:59 +08:00
|
|
|
|
msgstr "-n 选项只允许和 -l 同时使用。"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/tag.c:525
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "--contains option is only allowed with -l."
|
2012-08-02 11:50:59 +08:00
|
|
|
|
msgstr "--contains 选项只允许和 -l 同时使用。"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/tag.c:527
|
2012-02-28 12:24:54 +08:00
|
|
|
|
msgid "--points-at option is only allowed with -l."
|
2012-08-02 11:50:59 +08:00
|
|
|
|
msgstr "--points-at 选项只允许和 -l 同时使用。"
|
2012-02-28 12:24:54 +08:00
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/tag.c:535
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "only one -F or -m option is allowed."
|
|
|
|
|
msgstr "只允许一个 -F 或 -m 选项。"
|
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/tag.c:555
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "too many params"
|
|
|
|
|
msgstr "太多参数"
|
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/tag.c:561
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "'%s' is not a valid tag name."
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "'%s' 不是一个有效的tag名称。"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/tag.c:566
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "tag '%s' already exists"
|
|
|
|
|
msgstr "tag '%s' 已存在"
|
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/tag.c:584
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "%s: cannot lock the ref"
|
|
|
|
|
msgstr "%s:不能锁定引用"
|
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/tag.c:586
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "%s: cannot update the ref"
|
|
|
|
|
msgstr "%s:不能更新引用"
|
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: builtin/tag.c:588
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, c-format
|
|
|
|
|
msgid "Updated tag '%s' (was %s)\n"
|
|
|
|
|
msgstr "已更新tag '%s'(曾为 %s)\n"
|
|
|
|
|
|
2012-05-21 09:35:47 +08:00
|
|
|
|
#: git.c:16
|
|
|
|
|
msgid "See 'git help <command>' for more information on a specific command."
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "参见 'git help <command>' 以获得该特定命令的详细信息。"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: parse-options.h:133 parse-options.h:235
|
|
|
|
|
msgid "n"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "数字"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: parse-options.h:141
|
|
|
|
|
msgid "time"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "时间"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: parse-options.h:149
|
|
|
|
|
msgid "file"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "文件"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: parse-options.h:151
|
|
|
|
|
msgid "when"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "何时"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: parse-options.h:156
|
|
|
|
|
msgid "no-op (backward compatibility)"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "空操作(向后兼容)"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: parse-options.h:228
|
|
|
|
|
msgid "be more verbose"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "更加详细"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: parse-options.h:230
|
|
|
|
|
msgid "be more quiet"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "更加安静"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: parse-options.h:236
|
|
|
|
|
msgid "use <n> digits to display SHA-1s"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "用 <n> 位数字显示 SHA-1 哈希值"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: common-cmds.h:8
|
|
|
|
|
msgid "Add file contents to the index"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "添加文件内容至索引"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: common-cmds.h:9
|
|
|
|
|
msgid "Find by binary search the change that introduced a bug"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "通过二分查找定位引入 bug 的变更"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: common-cmds.h:10
|
|
|
|
|
msgid "List, create, or delete branches"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "列出、创建或删除分支"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: common-cmds.h:11
|
|
|
|
|
msgid "Checkout a branch or paths to the working tree"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "检出一个分支或路径到工作区"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: common-cmds.h:12
|
|
|
|
|
msgid "Clone a repository into a new directory"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "克隆一个版本库到一个新目录"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: common-cmds.h:13
|
|
|
|
|
msgid "Record changes to the repository"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "记录变更到版本库"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: common-cmds.h:14
|
|
|
|
|
msgid "Show changes between commits, commit and working tree, etc"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "显示提交之间、提交和工作区之间等的差异"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: common-cmds.h:15
|
|
|
|
|
msgid "Download objects and refs from another repository"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "从另外一个版本库下载对象和引用"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: common-cmds.h:16
|
|
|
|
|
msgid "Print lines matching a pattern"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "输出和模式匹配的行"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: common-cmds.h:17
|
|
|
|
|
msgid "Create an empty git repository or reinitialize an existing one"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "创建一个空的 git 版本库或者重新初始化一个"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: common-cmds.h:18
|
|
|
|
|
msgid "Show commit logs"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "显示提交日志"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: common-cmds.h:19
|
|
|
|
|
msgid "Join two or more development histories together"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "合并两个或更多开发历史"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: common-cmds.h:20
|
|
|
|
|
msgid "Move or rename a file, a directory, or a symlink"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "移动或重命名一个文件、目录或符号链接"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: common-cmds.h:21
|
|
|
|
|
msgid "Fetch from and merge with another repository or a local branch"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "获取并合并另外的版本库或一个本地分支"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: common-cmds.h:22
|
|
|
|
|
msgid "Update remote refs along with associated objects"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "更新远程引用和相关的对象"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: common-cmds.h:23
|
|
|
|
|
msgid "Forward-port local commits to the updated upstream head"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "本地提交转移至更新后的上游分支中"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: common-cmds.h:24
|
|
|
|
|
msgid "Reset current HEAD to the specified state"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "重置当前HEAD到指定状态"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: common-cmds.h:25
|
|
|
|
|
msgid "Remove files from the working tree and from the index"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "从工作区和索引中删除文件"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: common-cmds.h:26
|
|
|
|
|
msgid "Show various types of objects"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "显示各种类型的对象"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: common-cmds.h:27
|
|
|
|
|
msgid "Show the working tree status"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "显示工作区状态"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
|
|
|
|
#: common-cmds.h:28
|
|
|
|
|
msgid "Create, list, delete or verify a tag object signed with GPG"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "创建、列出、删除或校验一个GPG签名的 tag 对象"
|
2012-05-21 09:35:47 +08:00
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: git-am.sh:50
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "You need to set your committer info first"
|
|
|
|
|
msgstr "您需要先设置你的提交者信息"
|
|
|
|
|
|
2012-06-08 12:07:25 +08:00
|
|
|
|
#: git-am.sh:95
|
|
|
|
|
msgid ""
|
|
|
|
|
"You seem to have moved HEAD since the last 'am' failure.\n"
|
|
|
|
|
"Not rewinding to ORIG_HEAD"
|
2012-07-04 17:20:34 +08:00
|
|
|
|
msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
|
2012-06-08 12:07:25 +08:00
|
|
|
|
|
|
|
|
|
#: git-am.sh:105
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid ""
|
2012-08-02 11:50:59 +08:00
|
|
|
|
"When you have resolved this problem, run \"$cmdline --resolved\".\n"
|
|
|
|
|
"If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
|
|
|
|
|
"To restore the original branch and stop patching, run \"$cmdline --abort\"."
|
2012-06-08 12:07:25 +08:00
|
|
|
|
msgstr ""
|
|
|
|
|
"当您解决了此问题后,执行 \"$cmdline --resolved\"。\n"
|
|
|
|
|
"如果您想跳过此补丁,则执行 \"$cmdline --skip\"。\n"
|
|
|
|
|
"要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
|
|
|
|
|
|
|
|
|
|
#: git-am.sh:121
|
|
|
|
|
msgid "Cannot fall back to three-way merge."
|
|
|
|
|
msgstr "无法求助于三路合并。"
|
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: git-am.sh:137
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
|
2012-08-02 11:50:59 +08:00
|
|
|
|
msgstr "版本库缺乏必要的二进制对象(blob)以进行三路合并。"
|
|
|
|
|
|
|
|
|
|
#: git-am.sh:139
|
|
|
|
|
msgid "Using index info to reconstruct a base tree..."
|
|
|
|
|
msgstr "更新索引信息以重建基树..."
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: git-am.sh:154
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid ""
|
|
|
|
|
"Did you hand edit your patch?\n"
|
|
|
|
|
"It does not apply to blobs recorded in its index."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"您是否曾手动编辑过您的补丁?\n"
|
2012-08-02 11:50:59 +08:00
|
|
|
|
"无法应用补丁到索引中的二进制对象(blob)上。"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-04-30 00:06:55 +08:00
|
|
|
|
#: git-am.sh:163
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "Falling back to patching base and 3-way merge..."
|
2012-06-08 12:07:25 +08:00
|
|
|
|
msgstr "转而在基础版本上打补丁及进行三路合并..."
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-08-02 11:50:59 +08:00
|
|
|
|
#: git-am.sh:179
|
|
|
|
|
msgid "Failed to merge in the changes."
|
|
|
|
|
msgstr "无法合并变更。"
|
|
|
|
|
|
|
|
|
|
#: git-am.sh:274
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "Only one StGIT patch series can be applied at once"
|
|
|
|
|
msgstr "一次只能有一个 StGIT 补丁队列被应用"
|
|
|
|
|
|
2012-08-02 11:50:59 +08:00
|
|
|
|
#: git-am.sh:361
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Patch format $patch_format is not supported."
|
|
|
|
|
msgstr "不支持 $patch_format 补丁格式。"
|
|
|
|
|
|
2012-08-02 11:50:59 +08:00
|
|
|
|
#: git-am.sh:363
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "Patch format detection failed."
|
|
|
|
|
msgstr "补丁格式检测失败。"
|
|
|
|
|
|
2012-08-02 11:50:59 +08:00
|
|
|
|
#: git-am.sh:389
|
|
|
|
|
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-02-13 14:41:59 +08:00
|
|
|
|
|
2012-08-02 11:50:59 +08:00
|
|
|
|
#: git-am.sh:477
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "previous rebase directory $dotest still exists but mbox given."
|
|
|
|
|
msgstr "之前的变基目录 $dotest 仍然存在但给出了mbox。"
|
|
|
|
|
|
2012-08-02 11:50:59 +08:00
|
|
|
|
#: git-am.sh:482
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "Please make up your mind. --skip or --abort?"
|
|
|
|
|
msgstr "请下决心。--skip 或是 --abort ?"
|
|
|
|
|
|
2012-08-02 11:50:59 +08:00
|
|
|
|
#: git-am.sh:509
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "Resolve operation not in progress, we are not resuming."
|
|
|
|
|
msgstr "解决操作未进行,我们不会继续。"
|
|
|
|
|
|
2012-08-02 11:50:59 +08:00
|
|
|
|
#: git-am.sh:575
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Dirty index: cannot apply patches (dirty: $files)"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "脏的索引:不能应用补丁(脏文件:$files)"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-08-02 11:50:59 +08:00
|
|
|
|
#: git-am.sh:679
|
2012-06-08 12:07:25 +08:00
|
|
|
|
#, sh-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Patch is empty. Was it split wrong?\n"
|
|
|
|
|
"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
|
|
|
|
|
"To restore the original branch and stop patching run \"$cmdline --abort\"."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"补丁为空。是不是切分错误?\n"
|
|
|
|
|
"如果您想要跳过这个补丁,执行 \"$cmdline --skip\"。\n"
|
|
|
|
|
"要恢复原分支并停止打补丁,执行 \"$cmdline --abort\"。"
|
|
|
|
|
|
2012-08-02 11:50:59 +08:00
|
|
|
|
#: git-am.sh:706
|
2012-06-08 12:07:25 +08:00
|
|
|
|
msgid "Patch does not have a valid e-mail address."
|
|
|
|
|
msgstr "补丁中没有一个有效的邮件地址。"
|
|
|
|
|
|
2012-08-02 11:50:59 +08:00
|
|
|
|
#: git-am.sh:753
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "cannot be interactive without stdin connected to a terminal."
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "标准输入没有和终端关联,不能进行交互式操作。"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-08-02 11:50:59 +08:00
|
|
|
|
#: git-am.sh:757
|
2012-06-08 12:07:25 +08:00
|
|
|
|
msgid "Commit Body is:"
|
|
|
|
|
msgstr "提交内容为:"
|
|
|
|
|
|
2012-03-27 14:46:11 +08:00
|
|
|
|
# 译者:注意保持句尾空格
|
2012-02-13 14:41:59 +08: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.
|
2012-08-02 11:50:59 +08:00
|
|
|
|
#: git-am.sh:764
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
|
|
|
|
|
msgstr "应用?[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
|
|
|
|
|
|
2012-08-02 11:50:59 +08:00
|
|
|
|
#: git-am.sh:800
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Applying: $FIRSTLINE"
|
|
|
|
|
msgstr "正应用:$FIRSTLINE"
|
|
|
|
|
|
2012-08-02 11:50:59 +08:00
|
|
|
|
#: git-am.sh:821
|
2012-06-08 12:07:25 +08:00
|
|
|
|
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-08-02 11:50:59 +08:00
|
|
|
|
#: git-am.sh:829
|
2012-06-08 12:07:25 +08:00
|
|
|
|
msgid ""
|
|
|
|
|
"You still have unmerged paths in your index\n"
|
|
|
|
|
"did you forget to use 'git add'?"
|
2012-07-04 17:20:34 +08:00
|
|
|
|
msgstr "您的索引中仍有未合并的路径。您是否忘了执行 'git add'?"
|
2012-06-08 12:07:25 +08:00
|
|
|
|
|
2012-08-02 11:50:59 +08:00
|
|
|
|
#: git-am.sh:845
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "No changes -- Patch already applied."
|
|
|
|
|
msgstr "没有变更 -- 补丁已经应用过。"
|
|
|
|
|
|
2012-08-02 11:50:59 +08:00
|
|
|
|
#: git-am.sh:855
|
2012-06-08 12:07:25 +08:00
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Patch failed at $msgnum $FIRSTLINE"
|
|
|
|
|
msgstr "补丁失败于 $msgnum $FIRSTLINE"
|
|
|
|
|
|
2012-08-02 11:50:59 +08:00
|
|
|
|
#: git-am.sh:876
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "applying to an empty history"
|
|
|
|
|
msgstr "正应用到一个空历史上"
|
|
|
|
|
|
2012-06-08 12:07:25 +08:00
|
|
|
|
#: git-bisect.sh:48
|
|
|
|
|
msgid "You need to start by \"git bisect start\""
|
|
|
|
|
msgstr "您需要执行 \"git bisect start\" 来开始"
|
|
|
|
|
|
2012-03-27 14:46:11 +08:00
|
|
|
|
# 译者:注意保持句尾空格
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#. TRANSLATORS: Make sure to include [Y] and [n] in your
|
|
|
|
|
#. translation. The program will only accept English input
|
|
|
|
|
#. at this point.
|
|
|
|
|
#: git-bisect.sh:54
|
|
|
|
|
msgid "Do you want me to do it for you [Y/n]? "
|
|
|
|
|
msgstr "您想让我为您这样做么[Y/n]? "
|
|
|
|
|
|
|
|
|
|
#: git-bisect.sh:95
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "unrecognised option: '$arg'"
|
2012-05-30 12:19:47 +08:00
|
|
|
|
msgstr "未能识别的选项:'$arg'"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
|
|
|
|
#: git-bisect.sh:99
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "'$arg' does not appear to be a valid revision"
|
|
|
|
|
msgstr "'$arg' 看起来不像是一个有效的版本"
|
|
|
|
|
|
|
|
|
|
#: git-bisect.sh:117
|
|
|
|
|
msgid "Bad HEAD - I need a HEAD"
|
|
|
|
|
msgstr "坏的 HEAD - 我需要一个 HEAD"
|
|
|
|
|
|
|
|
|
|
#: git-bisect.sh:130
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'."
|
|
|
|
|
msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <validbranch>'。"
|
|
|
|
|
|
|
|
|
|
#: git-bisect.sh:140
|
|
|
|
|
msgid "won't bisect on seeked tree"
|
|
|
|
|
msgstr "不会在已查找过的树上二分查找"
|
|
|
|
|
|
|
|
|
|
#: git-bisect.sh:144
|
|
|
|
|
msgid "Bad HEAD - strange symbolic ref"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "坏的 HEAD - 奇怪的符号引用"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
|
|
|
|
#: git-bisect.sh:189
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Bad bisect_write argument: $state"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "坏的 bisect_write 参数:$state"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
|
|
|
|
#: git-bisect.sh:218
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Bad rev input: $arg"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "输入坏的版本:$arg"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
|
|
|
|
#: git-bisect.sh:232
|
|
|
|
|
msgid "Please call 'bisect_state' with at least one argument."
|
|
|
|
|
msgstr "请在调用 'bisect_state' 时跟至少一个参数。"
|
|
|
|
|
|
|
|
|
|
#: git-bisect.sh:244
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Bad rev input: $rev"
|
|
|
|
|
msgstr "输入坏的版本:$rev"
|
|
|
|
|
|
|
|
|
|
#: git-bisect.sh:250
|
|
|
|
|
msgid "'git bisect bad' can take only one argument."
|
|
|
|
|
msgstr "'git bisect bad' 只能带一个参数。"
|
|
|
|
|
|
2012-06-08 12:07:25 +08:00
|
|
|
|
#. have bad but not good. we could bisect although
|
|
|
|
|
#. this is less optimum.
|
|
|
|
|
#: git-bisect.sh:273
|
|
|
|
|
msgid "Warning: bisecting only with a bad commit."
|
|
|
|
|
msgstr "警告:在仅有一个坏提交下进行二分查找。"
|
|
|
|
|
|
2012-03-27 14:46:11 +08:00
|
|
|
|
# 译者:注意保持句尾空格
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#. TRANSLATORS: Make sure to include [Y] and [n] in your
|
|
|
|
|
#. translation. The program will only accept English input
|
|
|
|
|
#. at this point.
|
|
|
|
|
#: git-bisect.sh:279
|
|
|
|
|
msgid "Are you sure [Y/n]? "
|
|
|
|
|
msgstr "您确认么[Y/n]? "
|
|
|
|
|
|
2012-06-08 12:07:25 +08:00
|
|
|
|
#: git-bisect.sh:289
|
|
|
|
|
msgid ""
|
|
|
|
|
"You need to give me at least one good and one bad revisions.\n"
|
|
|
|
|
"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"您需要给我至少一个好版本和一个坏版本。\n"
|
|
|
|
|
"(您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令来标识。)"
|
|
|
|
|
|
|
|
|
|
#: git-bisect.sh:292
|
|
|
|
|
msgid ""
|
|
|
|
|
"You need to start by \"git bisect start\".\n"
|
|
|
|
|
"You then need to give me at least one good and one bad revisions.\n"
|
|
|
|
|
"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"您需要执行 \"git bisect start\" 来开始。\n"
|
|
|
|
|
"然后需要提供我至少一个好版本和一个坏版本。\n"
|
|
|
|
|
"(您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令来标识。)"
|
|
|
|
|
|
|
|
|
|
#: git-bisect.sh:347 git-bisect.sh:474
|
|
|
|
|
msgid "We are not bisecting."
|
|
|
|
|
msgstr "我们没有在二分查找。"
|
|
|
|
|
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#: git-bisect.sh:354
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "'$invalid' is not a valid commit"
|
|
|
|
|
msgstr "'$invalid' 不是一个有效的提交"
|
|
|
|
|
|
|
|
|
|
#: git-bisect.sh:363
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Could not check out original HEAD '$branch'.\n"
|
|
|
|
|
"Try 'git bisect reset <commit>'."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"不能检出原始 HEAD '$branch'。\n"
|
|
|
|
|
"尝试 'git bisect reset <commit>'。"
|
|
|
|
|
|
|
|
|
|
#: git-bisect.sh:390
|
|
|
|
|
msgid "No logfile given"
|
|
|
|
|
msgstr "未提供日志文件"
|
|
|
|
|
|
|
|
|
|
#: git-bisect.sh:391
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "cannot read $file for replaying"
|
|
|
|
|
msgstr "不能读取 $file 来重放"
|
|
|
|
|
|
|
|
|
|
#: git-bisect.sh:408
|
|
|
|
|
msgid "?? what are you talking about?"
|
|
|
|
|
msgstr "?? 您在说什么?"
|
|
|
|
|
|
2012-06-08 12:07:25 +08:00
|
|
|
|
#: git-bisect.sh:420
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "running $command"
|
|
|
|
|
msgstr "运行 $command"
|
|
|
|
|
|
|
|
|
|
#: git-bisect.sh:427
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"bisect run failed:\n"
|
|
|
|
|
"exit code $res from '$command' is < 0 or >= 128"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"二分查找运行失败:\n"
|
|
|
|
|
"命令 '$command' 的退出码 $res 或者小于 0 或者大于等于 128"
|
|
|
|
|
|
|
|
|
|
#: git-bisect.sh:453
|
|
|
|
|
msgid "bisect run cannot continue any more"
|
|
|
|
|
msgstr "二分查找不能继续运行"
|
|
|
|
|
|
|
|
|
|
#: git-bisect.sh:459
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"bisect run failed:\n"
|
|
|
|
|
"'bisect_state $state' exited with error code $res"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"二分查找运行失败:\n"
|
|
|
|
|
"'bisect_state $state' 退出码为 $res"
|
|
|
|
|
|
|
|
|
|
#: git-bisect.sh:466
|
|
|
|
|
msgid "bisect run success"
|
|
|
|
|
msgstr "二分查找运行成功"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
|
|
|
|
#: git-pull.sh:21
|
|
|
|
|
msgid ""
|
|
|
|
|
"Pull is not possible because you have unmerged files.\n"
|
|
|
|
|
"Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
|
|
|
|
|
"as appropriate to mark resolution, or use 'git commit -a'."
|
|
|
|
|
msgstr ""
|
2012-03-27 14:46:11 +08:00
|
|
|
|
"Pull 不可用,因为您尚有未合并的文件。请先在工作区改正文件,\n"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
"然后酌情使用 'git add/rm <file>' 标记解决方案,\n"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
"或者使用 'git commit -a'。"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
|
|
|
|
#: git-pull.sh:25
|
|
|
|
|
msgid "Pull is not possible because you have unmerged files."
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "Pull 不可用,因为您尚有未合并的文件。"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-02-28 12:24:54 +08:00
|
|
|
|
#: git-pull.sh:197
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "updating an unborn branch with changes added to the index"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "更新尚未诞生的分支,变更添加至索引"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-06-08 12:07:25 +08:00
|
|
|
|
#. The fetch involved updating the current branch.
|
|
|
|
|
#. The working tree and the index file is still based on the
|
|
|
|
|
#. $orig_head commit, but we are merging into $curr_head.
|
|
|
|
|
#. First update the working tree to match $curr_head.
|
|
|
|
|
#: git-pull.sh:228
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"Warning: fetch updated the current branch head.\n"
|
|
|
|
|
"Warning: fast-forwarding your working tree from\n"
|
|
|
|
|
"Warning: commit $orig_head."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"警告:fetch 更新了当前的分支。您的工作区\n"
|
|
|
|
|
"警告:从原提交 $orig_head 快进。"
|
|
|
|
|
|
2012-02-28 12:24:54 +08:00
|
|
|
|
#: git-pull.sh:253
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "Cannot merge multiple branches into empty head"
|
|
|
|
|
msgstr "无法将多个分支合并到空分支"
|
|
|
|
|
|
2012-02-28 12:24:54 +08:00
|
|
|
|
#: git-pull.sh:257
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "Cannot rebase onto multiple branches"
|
|
|
|
|
msgstr "无法变基到多个分支"
|
|
|
|
|
|
2012-08-02 11:50:59 +08:00
|
|
|
|
#: git-rebase.sh:52
|
|
|
|
|
msgid ""
|
|
|
|
|
"When you have resolved this problem, run \"git rebase --continue\".\n"
|
|
|
|
|
"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
|
|
|
|
|
"To check out the original branch and stop rebasing, run \"git rebase --abort"
|
|
|
|
|
"\"."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"当您解决了此问题后,执行 \"git rebase --continue\"。\n"
|
|
|
|
|
"如果您想跳过此补丁,则执行 \"git rebase --skip\"。\n"
|
|
|
|
|
"要恢复原分支并停止变基,执行 \"git rebase --abort\"。"
|
|
|
|
|
|
|
|
|
|
#: git-rebase.sh:159
|
|
|
|
|
msgid "The pre-rebase hook refused to rebase."
|
|
|
|
|
msgstr "钩子 pre-rebase 拒绝变基。"
|
|
|
|
|
|
|
|
|
|
#: git-rebase.sh:164
|
|
|
|
|
msgid "It looks like git-am is in progress. Cannot rebase."
|
|
|
|
|
msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"
|
|
|
|
|
|
|
|
|
|
#: git-rebase.sh:295
|
|
|
|
|
msgid "The --exec option must be used with the --interactive option"
|
|
|
|
|
msgstr "选项 --exec 必须和选项 --interactive 同时使用"
|
|
|
|
|
|
|
|
|
|
#: git-rebase.sh:300
|
|
|
|
|
msgid "No rebase in progress?"
|
|
|
|
|
msgstr "没有正在进行的变基?"
|
|
|
|
|
|
|
|
|
|
#: git-rebase.sh:313
|
|
|
|
|
msgid "Cannot read HEAD"
|
|
|
|
|
msgstr "不能读取 HEAD"
|
|
|
|
|
|
|
|
|
|
#: git-rebase.sh:316
|
|
|
|
|
msgid ""
|
|
|
|
|
"You must edit all merge conflicts and then\n"
|
|
|
|
|
"mark them as resolved using git add"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"您必须编辑所有的合并冲突,然后通过 git add\n"
|
|
|
|
|
"命令将它们标记为已解决"
|
|
|
|
|
|
|
|
|
|
#: git-rebase.sh:334
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Could not move back to $head_name"
|
|
|
|
|
msgstr "无法移回 $head_name"
|
|
|
|
|
|
|
|
|
|
#: git-rebase.sh:350
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid ""
|
|
|
|
|
"It seems that there is already a $state_dir_base directory, and\n"
|
|
|
|
|
"I wonder if you are in the middle of another rebase. If that is the\n"
|
|
|
|
|
"case, please try\n"
|
|
|
|
|
"\t$cmd_live_rebase\n"
|
|
|
|
|
"If that is not the case, please\n"
|
|
|
|
|
"\t$cmd_clear_stale_rebase\n"
|
|
|
|
|
"and run me again. I am stopping in case you still have something\n"
|
|
|
|
|
"valuable there."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"好像已有一个 $state_dir_base 目录,我怀疑您正处于另外一个变基过程中。\n"
|
|
|
|
|
"如果是这样,请尝试执行\n"
|
|
|
|
|
"\t$cmd_live_rebase\n"
|
|
|
|
|
"如果不是这样,请执行\n"
|
|
|
|
|
"\t$cmd_clear_stale_rebase\n"
|
|
|
|
|
"然后再重新执行变基。为避免您丢失重要数据,我已经停止当前操作。"
|
|
|
|
|
|
|
|
|
|
#: git-rebase.sh:395
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "invalid upstream $upstream_name"
|
|
|
|
|
msgstr "无效的上游 $upstream_name"
|
|
|
|
|
|
|
|
|
|
#: git-rebase.sh:419
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "$onto_name: there are more than one merge bases"
|
|
|
|
|
msgstr "$onto_name: 有一个以上的合并基准"
|
|
|
|
|
|
|
|
|
|
#: git-rebase.sh:422 git-rebase.sh:426
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "$onto_name: there is no merge base"
|
|
|
|
|
msgstr "$onto_name: 没有合并基准"
|
|
|
|
|
|
|
|
|
|
#: git-rebase.sh:431
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Does not point to a valid commit: $onto_name"
|
|
|
|
|
msgstr "没有指向一个有效的提交:$onto_name"
|
|
|
|
|
|
|
|
|
|
#: git-rebase.sh:454
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "fatal: no such branch: $branch_name"
|
|
|
|
|
msgstr "严重错误:无此分支:$branch_name"
|
|
|
|
|
|
|
|
|
|
#: git-rebase.sh:474
|
|
|
|
|
msgid "Please commit or stash them."
|
|
|
|
|
msgstr "请提交或为它们保存进度。"
|
|
|
|
|
|
|
|
|
|
#: git-rebase.sh:492
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Current branch $branch_name is up to date."
|
|
|
|
|
msgstr "当前分支 $branch_name 是最新的。"
|
|
|
|
|
|
|
|
|
|
#: git-rebase.sh:495
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Current branch $branch_name is up to date, rebase forced."
|
|
|
|
|
msgstr "当前分支 $branch_name 是最新的,强制变基。"
|
|
|
|
|
|
|
|
|
|
#: git-rebase.sh:506
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Changes from $mb to $onto:"
|
|
|
|
|
msgstr "变更从 $mb 到 $onto:"
|
|
|
|
|
|
|
|
|
|
#. Detach HEAD and reset the tree
|
|
|
|
|
#: git-rebase.sh:515
|
|
|
|
|
msgid "First, rewinding head to replay your work on top of it..."
|
|
|
|
|
msgstr "首先,重置头指针以便在上面重放您的工作..."
|
|
|
|
|
|
|
|
|
|
#: git-rebase.sh:523
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Fast-forwarded $branch_name to $onto_name."
|
|
|
|
|
msgstr "快进 $branch_name 至 $onto_name。"
|
|
|
|
|
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#: git-stash.sh:51
|
|
|
|
|
msgid "git stash clear with parameters is unimplemented"
|
|
|
|
|
msgstr "git stash clear 不支持参数"
|
|
|
|
|
|
|
|
|
|
#: git-stash.sh:74
|
|
|
|
|
msgid "You do not have the initial commit yet"
|
|
|
|
|
msgstr "您尚未建立初始提交"
|
|
|
|
|
|
|
|
|
|
#: git-stash.sh:89
|
|
|
|
|
msgid "Cannot save the current index state"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "无法保存当前索引状态"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
|
|
|
|
#: git-stash.sh:123 git-stash.sh:136
|
|
|
|
|
msgid "Cannot save the current worktree state"
|
|
|
|
|
msgstr "无法保存当前工作区状态"
|
|
|
|
|
|
|
|
|
|
#: git-stash.sh:140
|
|
|
|
|
msgid "No changes selected"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "没有选择变更"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
|
|
|
|
#: git-stash.sh:143
|
|
|
|
|
msgid "Cannot remove temporary index (can't happen)"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "无法删除临时索引(不应发生)"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
|
|
|
|
#: git-stash.sh:156
|
|
|
|
|
msgid "Cannot record working tree state"
|
|
|
|
|
msgstr "不能记录工作区状态"
|
|
|
|
|
|
2012-06-08 12:07:25 +08: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'
|
|
|
|
|
#: git-stash.sh:202
|
|
|
|
|
#, 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'"
|
|
|
|
|
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#: git-stash.sh:223
|
|
|
|
|
msgid "No local changes to save"
|
|
|
|
|
msgstr "没有要保存的本地修改"
|
|
|
|
|
|
|
|
|
|
#: git-stash.sh:227
|
|
|
|
|
msgid "Cannot initialize stash"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "无法初始化 stash"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
|
|
|
|
#: git-stash.sh:235
|
|
|
|
|
msgid "Cannot save the current status"
|
|
|
|
|
msgstr "无法保存当前状态"
|
|
|
|
|
|
|
|
|
|
#: git-stash.sh:253
|
|
|
|
|
msgid "Cannot remove worktree changes"
|
|
|
|
|
msgstr "无法删除工作区变更"
|
|
|
|
|
|
|
|
|
|
#: git-stash.sh:352
|
|
|
|
|
msgid "No stash found."
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "未发现 stash。"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
|
|
|
|
#: git-stash.sh:359
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Too many revisions specified: $REV"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "指定了太多的版本:$REV"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
|
|
|
|
#: git-stash.sh:365
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "$reference is not valid reference"
|
|
|
|
|
msgstr "$reference 不是有效的引用"
|
|
|
|
|
|
|
|
|
|
#: git-stash.sh:393
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "'$args' is not a stash-like commit"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "'$args' 不是 stash 样提交"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
|
|
|
|
#: git-stash.sh:404
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "'$args' is not a stash reference"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "'$args' 不是一个 stash 引用"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
|
|
|
|
#: git-stash.sh:412
|
|
|
|
|
msgid "unable to refresh index"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "无法刷新索引"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
|
|
|
|
#: git-stash.sh:416
|
|
|
|
|
msgid "Cannot apply a stash in the middle of a merge"
|
|
|
|
|
msgstr "无法在合并过程中恢复进度"
|
|
|
|
|
|
|
|
|
|
#: git-stash.sh:424
|
|
|
|
|
msgid "Conflicts in index. Try without --index."
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "索引中有冲突。尝试不使用 --index。"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
|
|
|
|
#: git-stash.sh:426
|
|
|
|
|
msgid "Could not save index tree"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "不能保存索引树"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
|
|
|
|
#: git-stash.sh:460
|
|
|
|
|
msgid "Cannot unstage modified files"
|
|
|
|
|
msgstr "无法还原修改的文件"
|
|
|
|
|
|
2012-06-08 12:07:25 +08:00
|
|
|
|
#: git-stash.sh:474
|
|
|
|
|
msgid "Index was not unstashed."
|
|
|
|
|
msgstr "索引的进度没有被恢复。"
|
|
|
|
|
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#: git-stash.sh:491
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Dropped ${REV} ($s)"
|
|
|
|
|
msgstr "丢弃了 ${REV} ($s)"
|
|
|
|
|
|
|
|
|
|
#: git-stash.sh:492
|
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "${REV}: Could not drop stash entry"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "${REV}:不能丢弃进度条目"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
|
|
|
|
#: git-stash.sh:499
|
|
|
|
|
msgid "No branch name specified"
|
|
|
|
|
msgstr "未指定分支名"
|
|
|
|
|
|
|
|
|
|
#: git-stash.sh:570
|
|
|
|
|
msgid "(To restore them type \"git stash apply\")"
|
|
|
|
|
msgstr "(为恢复数据输入 \"git stash apply\")"
|
|
|
|
|
|
2012-07-04 17:20:34 +08:00
|
|
|
|
#: git-submodule.sh:88
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "cannot strip one component off url '$remoteurl'"
|
|
|
|
|
msgstr "无法从 url '$remoteurl' 剥离一个组件"
|
|
|
|
|
|
2012-07-04 17:20:34 +08:00
|
|
|
|
#: git-submodule.sh:145
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, sh-format
|
2012-04-30 00:06:55 +08:00
|
|
|
|
msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
|
|
|
|
|
msgstr "未在 .gitmodules 中发现路径 '$sm_path' 的子模组映射"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: git-submodule.sh:189
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, sh-format
|
2012-04-30 00:06:55 +08:00
|
|
|
|
msgid "Clone of '$url' into submodule path '$sm_path' failed"
|
|
|
|
|
msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: git-submodule.sh:201
|
2012-03-16 22:35:58 +08:00
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
|
|
|
|
|
msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或者相反"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: git-submodule.sh:290
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
|
|
|
|
|
msgstr "版本库URL:'$repo' 必须是绝对路径或以 ./|../ 起始"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: git-submodule.sh:307
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, sh-format
|
2012-04-30 00:06:55 +08:00
|
|
|
|
msgid "'$sm_path' already exists in the index"
|
|
|
|
|
msgstr "'$sm_path' 已经存在于索引中"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: git-submodule.sh:311
|
2012-06-08 12:07:25 +08: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 参数。"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: git-submodule.sh:322
|
2012-06-08 12:07:25 +08:00
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Adding existing repo at '$sm_path' to the index"
|
|
|
|
|
msgstr "添加位于 '$sm_path' 的现存版本库到索引"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: git-submodule.sh:324
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, sh-format
|
2012-04-30 00:06:55 +08:00
|
|
|
|
msgid "'$sm_path' already exists and is not a valid git repo"
|
|
|
|
|
msgstr "'$sm_path' 已存在且不是一个有效的 git 版本库"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: git-submodule.sh:338
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, sh-format
|
2012-04-30 00:06:55 +08:00
|
|
|
|
msgid "Unable to checkout submodule '$sm_path'"
|
|
|
|
|
msgstr "不能检出子模组 '$sm_path'"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: git-submodule.sh:343
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, sh-format
|
2012-04-30 00:06:55 +08:00
|
|
|
|
msgid "Failed to add submodule '$sm_path'"
|
|
|
|
|
msgstr "无法添加子模组 '$sm_path'"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: git-submodule.sh:348
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, sh-format
|
2012-04-30 00:06:55 +08:00
|
|
|
|
msgid "Failed to register submodule '$sm_path'"
|
|
|
|
|
msgstr "无法注册子模组 '$sm_path'"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: git-submodule.sh:390
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, sh-format
|
2012-04-30 00:06:55 +08:00
|
|
|
|
msgid "Entering '$prefix$sm_path'"
|
|
|
|
|
msgstr "正在进入 '$prefix$sm_path'"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: git-submodule.sh:404
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, sh-format
|
2012-04-30 00:06:55 +08:00
|
|
|
|
msgid "Stopping at '$sm_path'; script returned non-zero status."
|
|
|
|
|
msgstr "停止于 '$sm_path',脚本返回非零值。"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: git-submodule.sh:447
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, sh-format
|
2012-04-30 00:06:55 +08:00
|
|
|
|
msgid "No url found for submodule path '$sm_path' in .gitmodules"
|
|
|
|
|
msgstr "在 .gitmodules 中未找到子模组路径 '$sm_path' 的 url"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: git-submodule.sh:456
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, sh-format
|
2012-04-30 00:06:55 +08:00
|
|
|
|
msgid "Failed to register url for submodule path '$sm_path'"
|
|
|
|
|
msgstr "无法为子模组路径 '$sm_path' 注册 url"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: git-submodule.sh:458
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, sh-format
|
2012-04-30 00:06:55 +08:00
|
|
|
|
msgid "Submodule '$name' ($url) registered for path '$sm_path'"
|
|
|
|
|
msgstr "子模组 '$name' ($url) 已为路径 '$sm_path' 注册"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: git-submodule.sh:466
|
2012-06-02 17:12:59 +08:00
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Failed to register update mode for submodule path '$sm_path'"
|
|
|
|
|
msgstr "无法为子模组路径 '$sm_path' 注册更新模式"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: git-submodule.sh:565
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, sh-format
|
|
|
|
|
msgid ""
|
2012-04-30 00:06:55 +08:00
|
|
|
|
"Submodule path '$sm_path' not initialized\n"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
"Maybe you want to use 'update --init'?"
|
|
|
|
|
msgstr ""
|
2012-04-30 00:06:55 +08:00
|
|
|
|
"子模组路径 '$sm_path' 没有初始化\n"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
"也许您想用 'update --init'?"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: git-submodule.sh:578
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, sh-format
|
2012-04-30 00:06:55 +08:00
|
|
|
|
msgid "Unable to find current revision in submodule path '$sm_path'"
|
|
|
|
|
msgstr "无法在子模组路径 '$sm_path' 中找到当前版本"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: git-submodule.sh:597
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, sh-format
|
2012-04-30 00:06:55 +08:00
|
|
|
|
msgid "Unable to fetch in submodule path '$sm_path'"
|
|
|
|
|
msgstr "无法在子模组路径 '$sm_path' 中获取"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: git-submodule.sh:611
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, sh-format
|
2012-04-30 00:06:55 +08:00
|
|
|
|
msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"
|
|
|
|
|
msgstr "无法在子模组路径 '$sm_path' 中变基 '$sha1'"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: git-submodule.sh:612
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, sh-format
|
2012-04-30 00:06:55 +08:00
|
|
|
|
msgid "Submodule path '$sm_path': rebased into '$sha1'"
|
|
|
|
|
msgstr "子模组路径 '$sm_path':变基至 '$sha1'"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: git-submodule.sh:617
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, sh-format
|
2012-04-30 00:06:55 +08:00
|
|
|
|
msgid "Unable to merge '$sha1' in submodule path '$sm_path'"
|
|
|
|
|
msgstr "无法合并 '$sha1' 到子模组路径 '$sm_path' 中"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: git-submodule.sh:618
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, sh-format
|
2012-04-30 00:06:55 +08:00
|
|
|
|
msgid "Submodule path '$sm_path': merged in '$sha1'"
|
|
|
|
|
msgstr "子模组路径 '$sm_path':已合并入 '$sha1'"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: git-submodule.sh:623
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, sh-format
|
2012-04-30 00:06:55 +08:00
|
|
|
|
msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"
|
|
|
|
|
msgstr "无法在子模组路径 '$sm_path' 中检出 '$sha1'"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: git-submodule.sh:624
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, sh-format
|
2012-04-30 00:06:55 +08:00
|
|
|
|
msgid "Submodule path '$sm_path': checked out '$sha1'"
|
|
|
|
|
msgstr "子模组路径 '$sm_path':检出 '$sha1'"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: git-submodule.sh:646 git-submodule.sh:969
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, sh-format
|
2012-04-30 00:06:55 +08:00
|
|
|
|
msgid "Failed to recurse into submodule path '$sm_path'"
|
|
|
|
|
msgstr "无法递归进子模组路径 '$sm_path'"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: git-submodule.sh:754
|
2012-08-02 11:50:59 +08:00
|
|
|
|
msgid "The --cached option cannot be used with the --files option"
|
|
|
|
|
msgstr "选项 --cached 不能和选项 --files 同时使用"
|
2012-06-08 12:07:25 +08:00
|
|
|
|
|
|
|
|
|
#. unexpected type
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: git-submodule.sh:794
|
2012-06-08 12:07:25 +08:00
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "unexpected mode $mod_dst"
|
|
|
|
|
msgstr "意外的模式 $mod_dst"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-03-27 14:46:11 +08:00
|
|
|
|
# 译者:注意保持前导空格
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: git-submodule.sh:812
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, sh-format
|
|
|
|
|
msgid " Warn: $name doesn't contain commit $sha1_src"
|
|
|
|
|
msgstr " 警告:$name 未包含提交 $sha1_src"
|
|
|
|
|
|
2012-03-27 14:46:11 +08:00
|
|
|
|
# 译者:注意保持前导空格
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: git-submodule.sh:815
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, sh-format
|
|
|
|
|
msgid " Warn: $name doesn't contain commit $sha1_dst"
|
|
|
|
|
msgstr " 警告:$name 未包含提交 $sha1_dst"
|
|
|
|
|
|
2012-03-27 14:46:11 +08:00
|
|
|
|
# 译者:注意保持前导空格
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: git-submodule.sh:818
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, sh-format
|
|
|
|
|
msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
|
|
|
|
|
msgstr " 警告:$name 未包含提交 $sha1_src 和 $sha1_dst"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: git-submodule.sh:843
|
2012-02-13 14:41:59 +08:00
|
|
|
|
msgid "blob"
|
2012-08-02 11:50:59 +08:00
|
|
|
|
msgstr "二进制对象"
|
2012-02-13 14:41:59 +08:00
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: git-submodule.sh:881
|
2012-06-08 12:07:25 +08:00
|
|
|
|
msgid "# Submodules changed but not updated:"
|
|
|
|
|
msgstr "# 子模组已修改但尚未更新:"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: git-submodule.sh:883
|
2012-06-08 12:07:25 +08:00
|
|
|
|
msgid "# Submodule changes to be committed:"
|
|
|
|
|
msgstr "要提交的子模组变更:"
|
|
|
|
|
|
2012-07-31 06:45:33 +08:00
|
|
|
|
#: git-submodule.sh:1027
|
2012-02-13 14:41:59 +08:00
|
|
|
|
#, sh-format
|
|
|
|
|
msgid "Synchronizing submodule url for '$name'"
|
2012-03-27 14:46:11 +08:00
|
|
|
|
msgstr "为 '$name' 同步子模组 url"
|