Simplified Chinese translations for Git 2.3.0

0001-l10n-zh_CN-translations-for-git-v2.3.0-rc0.patch

From ff8beb0743aefb7a1bc3ca93ff2c69ae2c0034a6 Mon Sep 17 00:00:00 2001
Message-Id: <ff8beb0743aefb7a1bc3ca93ff2c69ae2c0034a6.1421131857.git.worldhello.net@gmail.com>
From: Jiang Xin <worldhello.net@gmail.com>
Date: Sun, 4 Jan 2015 12:27:38 +0800
Subject: [PATCH] l10n: zh_CN: translations for git v2.3.0-rc0

Translate 13 new messages (2298t0f0u) for git v2.3.0-rc0.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
---
This patch is generated with --textconv option, so ...

 po/zh_CN.po | 1683 ++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 853 insertions(+), 830 deletions(-)

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 4b0e9ee..b6f61ee 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2014-11-20 09:42+0800\n"
-"PO-Revision-Date: 2014-11-20 16:10+0800\n"
+"POT-Creation-Date: 2015-01-13 14:05+0800\n"
+"PO-Revision-Date: 2015-01-13 14:21+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: GitHub <https://github.com/gotgit/git/>\n"
 "Language: zh_CN\n"
@@ -1408,9 +1408,6 @@ msgstr "检查在演习模式下文件（即使不存在）是否被忽略"
 msgid "Use -f if you really want to add them.\n"
 msgstr "使用 -f 参数如果您确实要添加它们。\n"
 
-msgid "no files added"
-msgstr "没有文件被添加"
-
 msgid "adding files failed"
 msgstr "添加文件失败"
 
@@ -2044,8 +2041,8 @@ msgstr "创建分支的引用日志"
 msgid "edit the description for the branch"
 msgstr "标记分支的描述"
 
-msgid "force creation (when already exists)"
-msgstr "强制创建（当已经存在）"
+msgid "force creation, move/rename, deletion"
+msgstr "强制创建、移动/重命名、删除"
 
 msgid "print only not merged branches"
 msgstr "只打印没有合并的分支"
@@ -2663,6 +2660,9 @@ msgstr "创建一个指定深度的浅克隆"
 msgid "clone only one branch, HEAD or --branch"
 msgstr "只克隆一个分支、HEAD 或 --branch"
 
+msgid "use --reference only while cloning"
+msgstr "仅在克隆时参考 --reference 指向的本地版本库"
+
 msgid "gitdir"
 msgstr "git目录"
 
@@ -2729,6 +2729,12 @@ msgstr "远程 HEAD 指向一个不存在的引用，无法检出。\n"
 msgid "unable to checkout working tree"
 msgstr "不能检出工作区"
 
+msgid "cannot repack to clean up"
+msgstr "无法执行 repack 来清理"
+
+msgid "cannot unlink temporary alternates file"
+msgstr "无法删除临时的 alternates 文件"
+
 msgid "Too many arguments."
 msgstr "太多参数。"
 
@@ -2765,6 +2771,9 @@ msgstr "克隆到纯版本库 '%s'...\n"
 msgid "Cloning into '%s'...\n"
 msgstr "正克隆到 '%s'...\n"
 
+msgid "--dissociate given, but there is no --reference"
+msgstr "提供了参数 --dissociate，但未提供 --reference"
+
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr "--depth 在本地克隆被忽略，改为 file:// 协议试试。"
 
@@ -2942,9 +2951,6 @@ msgstr "非法的 --author 参数"
 msgid "invalid date format: %s"
 msgstr "无效的日期格式：%s"
 
-msgid "Malformed ident string: '%s'"
-msgstr "非法的身份字符串：'%s'"
-
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
@@ -3330,14 +3336,11 @@ msgstr "列出所有"
 msgid "open an editor"
 msgstr "打开一个编辑器"
 
-msgid "slot"
-msgstr "slot"
-
-msgid "find the color configured: [default]"
-msgstr "找到配置的颜色：[默认]"
+msgid "find the color configured: slot [default]"
+msgstr "获得配置的颜色：配置 [默认]"
 
-msgid "find the color setting: [stdout-is-tty]"
-msgstr "找到颜色设置：[stdout-is-tty]"
+msgid "find the color setting: slot [stdout-is-tty]"
+msgstr "获得颜色设置：配置 [stdout-is-tty]"
 
 msgid "Type"
 msgstr "类型"
@@ -3767,8 +3770,8 @@ msgstr "引用占位符适用于 perl"
 msgid "quote placeholders suitably for python"
 msgstr "引用占位符适用于 python"
 
-msgid "quote placeholders suitably for tcl"
-msgstr "引用占位符适用于 tcl"
+msgid "quote placeholders suitably for Tcl"
+msgstr "引用占位符适用于 Tcl"
 
 msgid "show only <n> matched refs"
 msgstr "只显示 <n> 个匹配的引用"
@@ -5159,24 +5162,24 @@ msgid "git notes [--ref <notes_ref>] [list [<object>]]"
 msgstr "git notes [--ref <注解引用>] [list [<对象>]]"
 
 msgid ""
-"git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) "
-"<object>] [<object>]"
+"git notes [--ref <notes_ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
+"| (-c | -C) <object>] [<object>]"
 msgstr ""
-"git notes [--ref <注解引用>] add [-f] [-m <说明> | -F <文件> | (-c | -C) <对"
-"象>] [<对象>]"
+"git notes [--ref <注解引用>] add [-f] [--allow-empty] [-m <说明> | -F <文件> "
+"| (-c | -C) <对象>] [<对象>]"
 
 msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>"
 msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>"
 
 msgid ""
-"git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) "
-"<object>] [<object>]"
+"git notes [--ref <notes_ref>] append [--allow-empty] [-m <msg> | -F <file> | "
+"(-c | -C) <object>] [<object>]"
 msgstr ""
-"git notes [--ref <注解引用>] append [-m <说明> | -F <文件> | (-c | -C) <对象"
-">] [<对象>]"
+"git notes [--ref <注解引用>] append [--allow-empty] [-m <说明> | -F <文件> | "
+"(-c | -C) <对象>] [<对象>]"
 
-msgid "git notes [--ref <notes_ref>] edit [<object>]"
-msgstr "git notes [--ref <注解引用>] edit [<对象>]"
+msgid "git notes [--ref <notes_ref>] edit [--allow-empty] [<object>]"
+msgstr "git notes [--ref <注解引用>] edit [--allow-empty] [<对象>]"
 
 msgid "git notes [--ref <notes_ref>] show [<object>]"
 msgstr "git notes [--ref <注解引用>] show [<对象>]"
@@ -5254,9 +5257,6 @@ msgstr "不能创建文件 '%s'"
 msgid "Please supply the note contents using either -m or -F option"
 msgstr "请通过 -m 或 -F 选项为注解提供内容"
 
-msgid "Removing note for object %s\n"
-msgstr "删除对象 %s 的注解\n"
-
 msgid "unable to write note object"
 msgstr "不能写注解对象"
 
@@ -5305,6 +5305,9 @@ msgstr "重用和编辑指定的注解对象"
 msgid "reuse specified note object"
 msgstr "重用指定的注解对象"
 
+msgid "allow storing empty note"
+msgstr "允许保存空白注释"
+
 msgid "replace existing notes"
 msgstr "替换已存在的注解"
 
@@ -5316,6 +5319,9 @@ msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆
 msgid "Overwriting existing notes for object %s\n"
 msgstr "覆盖对象 %s 现存注解\n"
 
+msgid "Removing note for object %s\n"
+msgstr "删除对象 %s 的注解\n"
+
 msgid "read objects from stdin"
 msgstr "从标准输入读取对象"
 
@@ -5495,6 +5501,9 @@ msgstr "将比给定 <时间> 新的无法访问的对象解包"
 msgid "create thin packs"
 msgstr "创建精简包"
 
+msgid "create packs suitable for shallow fetches"
+msgstr "创建适合浅克隆版本库获取的包"
+
 msgid "ignore packs that have companion .keep file"
 msgstr "忽略配有 .keep 文件的包"
 
@@ -7843,3 +7852,7 @@ msgstr "为 '$displaypath' 同步子模组 url"
 
 
 
+
+
+
+
-- 
2.3.0.rc0.4.ga04d4ec.dirty