threads / patch / 9130

patchInitial Chinese translation

Subject: [PATCH] Initial Chinese translation

## tl;dr

11 messages between Jul 22, 2007 and Jul 22, 2007. Diffs are folded; open one to read it.

replies: 10people: 4as markdown or json

Xudong Guan· Jul 22, 2007, 00:08 UTC · lore

Simplified Chinese, in UTF-8 encoding.

Signed-off-by: Xudong Guan <xudong.guan@gmail.com>
---
 po/zh.po |  250 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 250 insertions(+), 0 deletions(-)
 create mode 100644 po/zh.po

Show changes to po/zh.po +250 −0

diff --git a/po/zh.po b/po/zh.po
new file mode 100644
index 0000000..bea5e54
--- /dev/null
+++ b/po/zh.po
@@ -0,0 +1,250 @@
+# Translation of git-gui to Chinese
+# Copyright (C) 2007 Shawn Pearce
+# This file is distributed under the same license as the git-gui package.
+# Xudong Guan <xudong.guan@gmail.com>, 2007.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: git-gui\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-07-21 23:46+0100\n"
+"PO-Revision-Date: 2007-07-21 01:23-0700\n"
+"Last-Translator: Xudong Guan <xudong.guan@gmail.com>\n"
+"Language-Team: Chinese\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: git-gui.sh:1656
+msgid "Repository"
+msgstr "çæ¬æ "
+
+#: git-gui.sh:1657
+msgid "Edit"
+msgstr "ç¼è¾"
+
+#: git-gui.sh:1659
+msgid "Branch"
+msgstr "åæ¯"
+
+#: git-gui.sh:1662 git-gui.sh:1840
+msgid "Commit"
+msgstr "æäº¤"
+
+#: git-gui.sh:1665
+msgid "Merge"
+msgstr "åå¹¶"
+
+#: git-gui.sh:1666
+msgid "Fetch"
+msgstr "å¯¼å¥"
+
+#: git-gui.sh:1667
+msgid "Push"
+msgstr "ä¸ä¼ "
+
+#: git-gui.sh:1676
+msgid "Browse Current Branch's Files"
+msgstr "æµè§å½ååæ¯æä»¶"
+
+#: git-gui.sh:1685
+msgid "Visualize Current Branch's History"
+msgstr "è°ç¨gitkæ¾ç¤ºå½ååæ¯"
+
+#: git-gui.sh:1689
+msgid "Visualize All Branch History"
+msgstr "è°ç¨gitkæ¾ç¤ºææåæ¯"
+
+#: git-gui.sh:1694
+msgid "Database Statistics"
+msgstr "æ°æ®åºç»è®¡æ°æ®"
+
+#: git-gui.sh:1697
+msgid "Compress Database"
+msgstr "åç¼©æ°æ®åº"
+
+#: git-gui.sh:1700
+msgid "Verify Database"
+msgstr "éªè¯æ°æ®åº"
+
+#: git-gui.sh:1707 git-gui.sh:1711 git-gui.sh:1715
+msgid "Create Desktop Icon"
+msgstr "åå»ºæ¡é¢å¾æ "
+
+#: git-gui.sh:1720
+msgid "Quit"
+msgstr "éåº"
+
+#: git-gui.sh:1727
+msgid "Undo"
+msgstr "æ¤é"
+
+#: git-gui.sh:1730
+msgid "Redo"
+msgstr "éå"
+
+#: git-gui.sh:1734 git-gui.sh:2249
+msgid "Cut"
+msgstr "åªå"
+
+#: git-gui.sh:1737 git-gui.sh:2252 git-gui.sh:2323 git-gui.sh:2395
+msgid "Copy"
+msgstr "å¤å¶"
+
+#: git-gui.sh:1740 git-gui.sh:2255
+msgid "Paste"
+msgstr "ç²è´´"
+
+#: git-gui.sh:1743 git-gui.sh:2258
+msgid "Delete"
+msgstr "å é¤"
+
+#: git-gui.sh:1747 git-gui.sh:2262 git-gui.sh:2399
+msgid "Select All"
+msgstr "å¨é"
+
+#: git-gui.sh:1756
+msgid "Create..."
+msgstr "æ°å»º..."
+
+#: git-gui.sh:1762
+msgid "Checkout..."
+msgstr "åæ¢..."
+
+#: git-gui.sh:1768
+msgid "Rename..."
+msgstr "æ¹å..."
+
+#: git-gui.sh:1773 git-gui.sh:1871
+msgid "Delete..."
+msgstr "å é¤..."
+
+#: git-gui.sh:1778
+msgid "Reset..."
+msgstr "éç½®ææä¿®å¨..."
+
+#: git-gui.sh:1790
+msgid "New Commit"
+msgstr "æ°æäº¤"
+
+#: git-gui.sh:1798
+msgid "Amend Last Commit"
+msgstr "ä¿®è®¢ä¸æ¬¡æäº¤"
+
+#: git-gui.sh:1807
+msgid "Rescan"
+msgstr "éæ°æ«æ"
+
+#: git-gui.sh:1813
+msgid "Add To Commit"
+msgstr "æ·»å å°æ¬æ¬¡æäº¤"
+
+#: git-gui.sh:1818
+msgid "Add Existing To Commit"
+msgstr "æ·»å é»è®¤ä¿®æ¹æä»¶"
+
+#: git-gui.sh:1824
+msgid "Unstage From Commit"
+msgstr "ä»æ¬æ¬¡æäº¤ç§»é¤"
+
+#: git-gui.sh:1829
+msgid "Revert Changes"
+msgstr "æ¢å¤ä¿®æ¹"
+
+#: git-gui.sh:1836 git-gui.sh:2273
+msgid "Sign Off"
+msgstr "ç¾å"
+
+#: git-gui.sh:1851
+msgid "Local Merge..."
+msgstr "æ¬å°åå¹¶..."
+
+#: git-gui.sh:1856
+msgid "Abort Merge..."
+msgstr "åæ¶åå¹¶..."
+
+#: git-gui.sh:1868
+msgid "Push..."
+msgstr "ä¸ä¼ ..."
+
+#: git-gui.sh:1878
+msgid "Apple"
+msgstr "è¹æ"
+
+#: git-gui.sh:1881 git-gui.sh:1928
+#, tcl-format
+msgid "About %s"
+msgstr "å³äº%s"
+
+#: git-gui.sh:1883 git-gui.sh:1889 git-gui.sh:2441
+msgid "Options..."
+msgstr "éé¡¹..."
+
+#: git-gui.sh:1913
+msgid "Tools"
+msgstr "å·¥å·"
+
+#: git-gui.sh:1915
+msgid "Migrate"
+msgstr "ç§»æ¤"
+
+#: git-gui.sh:1924
+msgid "Help"
+msgstr "å¸®å©"
+
+#: git-gui.sh:1965
+msgid "Online Documentation"
+msgstr "å¨çº¿ææ¡£"
+
+#: git-gui.sh:2215
+msgid "Initial Commit Message:"
+msgstr "åå§æäº¤æè¿°:"
+
+#: git-gui.sh:2216
+msgid "Amended Commit Message:"
+msgstr "ä¿®è®¢æäº¤æè¿°:"
+
+#: git-gui.sh:2217
+msgid "Amended Initial Commit Message:"
+msgstr "ä¿®è®¢åå§æäº¤æè¿°:"
+
+#: git-gui.sh:2218
+msgid "Amended Merge Commit Message:"
+msgstr "ä¿®è®¢åå¹¶æäº¤æè¿°:"
+
+#: git-gui.sh:2219
+msgid "Merge Commit Message:"
+msgstr "åå¹¶æäº¤æè¿°:"
+
+#: git-gui.sh:2220
+msgid "Commit Message:"
+msgstr "æäº¤æè¿°:"
+
+#: git-gui.sh:2265 git-gui.sh:2403
+msgid "Copy All"
+msgstr "å¨é¨å¤å¶"
+
+#: git-gui.sh:2391
+msgid "Refresh"
+msgstr "å·æ°"
+
+#: git-gui.sh:2412
+msgid "Apply/Reverse Hunk"
+msgstr ""
+
+#: git-gui.sh:2418
+msgid "Decrease Font Size"
+msgstr "ç¼©å°åä½"
+
+#: git-gui.sh:2422
+msgid "Increase Font Size"
+msgstr "æ¾å¤§åä½"
+
+#: git-gui.sh:2427
+msgid "Show Less Context"
+msgstr "æ¾ç¤ºæ´å¤diffä¸ä¸æ"
+
+#: git-gui.sh:2434
+msgid "Show More Context"
+msgstr "æ¾ç¤ºæ´å°diffä¸ä¸æ"

-- 
1.5.0.rc3.81.g8188e

Junio C Hamano· Jul 22, 2007, 00:32 UTC · re: Xudong Guan · lore

Re: [PATCH] Initial Chinese translation

Xudong Guan <xudong.guan@gmail.com> writes:

> Simplified Chinese, in UTF-8 encoding.

     From: Xudong Guan <xudong.guan@gmail.com>
     Subject: [PATCH] Initial Chinese translation
     To: git@vger.kernel.org
     Cc: Xudong Guan <xudong.guan@gmail.com>
     Date: Sun, 22 Jul 2007 01:08:56 +0100
     Message-ID: <11850629362012-git-send-email-xudong.guan@gmail.com>
     Content-Type: TEXT/PLAIN; charset=ISO-8859-1

Your MUA disagrees with you, at least in the copy I see on gmane.

Johannes Schindelin· Jul 22, 2007, 00:34 UTC · re: Xudong Guan · lore

Re: [PATCH] Initial Chinese translation

Hi,

On Sun, 22 Jul 2007, Xudong Guan wrote:

> Simplified Chinese, in UTF-8 encoding.

Unfortunately, I am not able to verify ;-)

I applied it an pushed it out. AFAICT the UTF-8 was imported correctly this time ;-)

Ciao, Dscho

Xudong Guan· Jul 22, 2007, 00:54 UTC · re: Johannes Schindelin · lore

Re: [PATCH] Initial Chinese translation

On 01:34 Sun 22 Jul     , Johannes Schindelin wrote:

> Unfortunately, I am not able to verify ;-)

I pulled and saw your commit. The encoding is good.

Xudong

Junio C Hamano· Jul 22, 2007, 00:35 UTC · re: Xudong Guan · lore

Re: [PATCH] Initial Chinese translation

Xudong Guan <xudong.guan@gmail.com> writes:

Show 6 quoted lines

> Simplified Chinese, in UTF-8 encoding.
>
> Signed-off-by: Xudong Guan <xudong.guan@gmail.com>
> ---
>  po/zh.po |  250 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>  1 files changed, 250 insertions(+), 0 deletions(-)

This raises another point in the current i18n scheme. How would we allow zh_CN and zh_TW to coexist?

Shawn O. Pearce· Jul 22, 2007, 07:35 UTC · re: Junio C Hamano · lore

Re: [PATCH] Initial Chinese translation

Junio C Hamano <gitster@pobox.com> wrote:

Show 11 quoted lines

> Xudong Guan <xudong.guan@gmail.com> writes:
> 
> > Simplified Chinese, in UTF-8 encoding.
> >
> > Signed-off-by: Xudong Guan <xudong.guan@gmail.com>
> > ---
> >  po/zh.po |  250 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> >  1 files changed, 250 insertions(+), 0 deletions(-)
> 
> This raises another point in the current i18n scheme.  How would
> we allow zh_CN and zh_TW to coexist?

They probably should be po/zh_CN.po and po/zh_TW.po. Tcl msgcat loads the file that best matches the user's local preferences, so zh.po would be the fallback if neither zh_CN and zh_TW were present, or if the user was using say zh_US as their preferred local.

-- 
Shawn.

Junio C Hamano· Jul 22, 2007, 08:06 UTC · re: Shawn O. Pearce · lore

Re: [PATCH] Initial Chinese translation

"Shawn O. Pearce" <spearce@spearce.org> writes:

Show 14 quoted lines

> Junio C Hamano <gitster@pobox.com> wrote:
>> Xudong Guan <xudong.guan@gmail.com> writes:
>> 
>> > Simplified Chinese, in UTF-8 encoding.
>> >
>> > Signed-off-by: Xudong Guan <xudong.guan@gmail.com>
>> > ---
>> >  po/zh.po |  250 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>> >  1 files changed, 250 insertions(+), 0 deletions(-)
>> 
>> This raises another point in the current i18n scheme.  How would
>> we allow zh_CN and zh_TW to coexist?
>
> They probably should be po/zh_CN.po and po/zh_TW.po.

Yeah, I was hinting to rename this file to zh_CN.po from day one.

Xudong Guan· Jul 22, 2007, 08:53 UTC · re: Junio C Hamano · lore

Re: [PATCH] Initial Chinese translation

On 01:06 Sun 22 Jul     , Junio C Hamano wrote:

> Yeah, I was hinting to rename this file to zh_CN.po from day
> one.

I agree.

I am new to the patch-in-email way of doing things. If I could do better, please give me hints. Can I push directly to mob? Like: $ git clone http://repo.or.cz/r/git-gui/git-gui-i18n hack hack hack .... $ git push http://repo.or.cz/r/git-gui/git-gui-i18n master:mob

-- >8 --

From 936787ddbdeaf0bcecbb1359179dae90c20418b0 Mon Sep 17 00:00:00 2001
From: Xudong Guan <xudong.guan@gmail.com>
Date: Sun, 22 Jul 2007 09:41:12 +0100
Subject: [PATCH] git-gui: renamed po/zh.po -> po/zh_CN.po

---
 po/zh.po    |  250 -----------------------------------------------------------
 po/zh_CN.po |  250 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 250 insertions(+), 250 deletions(-)
 delete mode 100644 po/zh.po
 create mode 100644 po/zh_CN.po

Show changes to 2 files +250 −250

po/zh.po, po/zh_CN.po

diff --git a/po/zh.po b/po/zh.po
deleted file mode 100644
index bea5e54..0000000
--- a/po/zh.po
+++ /dev/null
@@ -1,250 +0,0 @@
-# Translation of git-gui to Chinese
-# Copyright (C) 2007 Shawn Pearce
-# This file is distributed under the same license as the git-gui package.
-# Xudong Guan <xudong.guan@gmail.com>, 2007.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: git-gui\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-21 23:46+0100\n"
-"PO-Revision-Date: 2007-07-21 01:23-0700\n"
-"Last-Translator: Xudong Guan <xudong.guan@gmail.com>\n"
-"Language-Team: Chinese\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: git-gui.sh:1656
-msgid "Repository"
-msgstr "版本树"
-
-#: git-gui.sh:1657
-msgid "Edit"
-msgstr "编辑"
-
-#: git-gui.sh:1659
-msgid "Branch"
-msgstr "分支"
-
-#: git-gui.sh:1662 git-gui.sh:1840
-msgid "Commit"
-msgstr "提交"
-
-#: git-gui.sh:1665
-msgid "Merge"
-msgstr "合并"
-
-#: git-gui.sh:1666
-msgid "Fetch"
-msgstr "导入"
-
-#: git-gui.sh:1667
-msgid "Push"
-msgstr "上传"
-
-#: git-gui.sh:1676
-msgid "Browse Current Branch's Files"
-msgstr "浏览当前分支文件"
-
-#: git-gui.sh:1685
-msgid "Visualize Current Branch's History"
-msgstr "调用gitk显示当前分支"
-
-#: git-gui.sh:1689
-msgid "Visualize All Branch History"
-msgstr "调用gitk显示所有分支"
-
-#: git-gui.sh:1694
-msgid "Database Statistics"
-msgstr "数据库统计数据"
-
-#: git-gui.sh:1697
-msgid "Compress Database"
-msgstr "压缩数据库"
-
-#: git-gui.sh:1700
-msgid "Verify Database"
-msgstr "验证数据库"
-
-#: git-gui.sh:1707 git-gui.sh:1711 git-gui.sh:1715
-msgid "Create Desktop Icon"
-msgstr "创建桌面图标"
-
-#: git-gui.sh:1720
-msgid "Quit"
-msgstr "退出"
-
-#: git-gui.sh:1727
-msgid "Undo"
-msgstr "撤销"
-
-#: git-gui.sh:1730
-msgid "Redo"
-msgstr "重做"
-
-#: git-gui.sh:1734 git-gui.sh:2249
-msgid "Cut"
-msgstr "剪切"
-
-#: git-gui.sh:1737 git-gui.sh:2252 git-gui.sh:2323 git-gui.sh:2395
-msgid "Copy"
-msgstr "复制"
-
-#: git-gui.sh:1740 git-gui.sh:2255
-msgid "Paste"
-msgstr "粘贴"
-
-#: git-gui.sh:1743 git-gui.sh:2258
-msgid "Delete"
-msgstr "删除"
-
-#: git-gui.sh:1747 git-gui.sh:2262 git-gui.sh:2399
-msgid "Select All"
-msgstr "全选"
-
-#: git-gui.sh:1756
-msgid "Create..."
-msgstr "新建..."
-
-#: git-gui.sh:1762
-msgid "Checkout..."
-msgstr "切换..."
-
-#: git-gui.sh:1768
-msgid "Rename..."
-msgstr "改名..."
-
-#: git-gui.sh:1773 git-gui.sh:1871
-msgid "Delete..."
-msgstr "删除..."
-
-#: git-gui.sh:1778
-msgid "Reset..."
-msgstr "重置所有修动..."
-
-#: git-gui.sh:1790
-msgid "New Commit"
-msgstr "新提交"
-
-#: git-gui.sh:1798
-msgid "Amend Last Commit"
-msgstr "修订上次提交"
-
-#: git-gui.sh:1807
-msgid "Rescan"
-msgstr "重新扫描"
-
-#: git-gui.sh:1813
-msgid "Add To Commit"
-msgstr "添加到本次提交"
-
-#: git-gui.sh:1818
-msgid "Add Existing To Commit"
-msgstr "添加默认修改文件"
-
-#: git-gui.sh:1824
-msgid "Unstage From Commit"
-msgstr "从本次提交移除"
-
-#: git-gui.sh:1829
-msgid "Revert Changes"
-msgstr "恢复修改"
-
-#: git-gui.sh:1836 git-gui.sh:2273
-msgid "Sign Off"
-msgstr "签名"
-
-#: git-gui.sh:1851
-msgid "Local Merge..."
-msgstr "本地合并..."
-
-#: git-gui.sh:1856
-msgid "Abort Merge..."
-msgstr "取消合并..."
-
-#: git-gui.sh:1868
-msgid "Push..."
-msgstr "上传..."
-
-#: git-gui.sh:1878
-msgid "Apple"
-msgstr "苹果"
-
-#: git-gui.sh:1881 git-gui.sh:1928
-#, tcl-format
-msgid "About %s"
-msgstr "关于%s"
-
-#: git-gui.sh:1883 git-gui.sh:1889 git-gui.sh:2441
-msgid "Options..."
-msgstr "选项..."
-
-#: git-gui.sh:1913
-msgid "Tools"
-msgstr "工具"
-
-#: git-gui.sh:1915
-msgid "Migrate"
-msgstr "移植"
-
-#: git-gui.sh:1924
-msgid "Help"
-msgstr "帮助"
-
-#: git-gui.sh:1965
-msgid "Online Documentation"
-msgstr "在线文档"
-
-#: git-gui.sh:2215
-msgid "Initial Commit Message:"
-msgstr "初始提交描述:"
-
-#: git-gui.sh:2216
-msgid "Amended Commit Message:"
-msgstr "修订提交描述:"
-
-#: git-gui.sh:2217
-msgid "Amended Initial Commit Message:"
-msgstr "修订初始提交描述:"
-
-#: git-gui.sh:2218
-msgid "Amended Merge Commit Message:"
-msgstr "修订合并提交描述:"
-
-#: git-gui.sh:2219
-msgid "Merge Commit Message:"
-msgstr "合并提交描述:"
-
-#: git-gui.sh:2220
-msgid "Commit Message:"
-msgstr "提交描述:"
-
-#: git-gui.sh:2265 git-gui.sh:2403
-msgid "Copy All"
-msgstr "全部复制"
-
-#: git-gui.sh:2391
-msgid "Refresh"
-msgstr "刷新"
-
-#: git-gui.sh:2412
-msgid "Apply/Reverse Hunk"
-msgstr ""
-
-#: git-gui.sh:2418
-msgid "Decrease Font Size"
-msgstr "缩小字体"
-
-#: git-gui.sh:2422
-msgid "Increase Font Size"
-msgstr "放大字体"
-
-#: git-gui.sh:2427
-msgid "Show Less Context"
-msgstr "显示更多diff上下文"
-
-#: git-gui.sh:2434
-msgid "Show More Context"
-msgstr "显示更少diff上下文"
diff --git a/po/zh_CN.po b/po/zh_CN.po
new file mode 100644
index 0000000..bea5e54
--- /dev/null
+++ b/po/zh_CN.po
@@ -0,0 +1,250 @@
+# Translation of git-gui to Chinese
+# Copyright (C) 2007 Shawn Pearce
+# This file is distributed under the same license as the git-gui package.
+# Xudong Guan <xudong.guan@gmail.com>, 2007.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: git-gui\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-07-21 23:46+0100\n"
+"PO-Revision-Date: 2007-07-21 01:23-0700\n"
+"Last-Translator: Xudong Guan <xudong.guan@gmail.com>\n"
+"Language-Team: Chinese\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: git-gui.sh:1656
+msgid "Repository"
+msgstr "版本树"
+
+#: git-gui.sh:1657
+msgid "Edit"
+msgstr "编辑"
+
+#: git-gui.sh:1659
+msgid "Branch"
+msgstr "分支"
+
+#: git-gui.sh:1662 git-gui.sh:1840
+msgid "Commit"
+msgstr "提交"
+
+#: git-gui.sh:1665
+msgid "Merge"
+msgstr "合并"
+
+#: git-gui.sh:1666
+msgid "Fetch"
+msgstr "导入"
+
+#: git-gui.sh:1667
+msgid "Push"
+msgstr "上传"
+
+#: git-gui.sh:1676
+msgid "Browse Current Branch's Files"
+msgstr "浏览当前分支文件"
+
+#: git-gui.sh:1685
+msgid "Visualize Current Branch's History"
+msgstr "调用gitk显示当前分支"
+
+#: git-gui.sh:1689
+msgid "Visualize All Branch History"
+msgstr "调用gitk显示所有分支"
+
+#: git-gui.sh:1694
+msgid "Database Statistics"
+msgstr "数据库统计数据"
+
+#: git-gui.sh:1697
+msgid "Compress Database"
+msgstr "压缩数据库"
+
+#: git-gui.sh:1700
+msgid "Verify Database"
+msgstr "验证数据库"
+
+#: git-gui.sh:1707 git-gui.sh:1711 git-gui.sh:1715
+msgid "Create Desktop Icon"
+msgstr "创建桌面图标"
+
+#: git-gui.sh:1720
+msgid "Quit"
+msgstr "退出"
+
+#: git-gui.sh:1727
+msgid "Undo"
+msgstr "撤销"
+
+#: git-gui.sh:1730
+msgid "Redo"
+msgstr "重做"
+
+#: git-gui.sh:1734 git-gui.sh:2249
+msgid "Cut"
+msgstr "剪切"
+
+#: git-gui.sh:1737 git-gui.sh:2252 git-gui.sh:2323 git-gui.sh:2395
+msgid "Copy"
+msgstr "复制"
+
+#: git-gui.sh:1740 git-gui.sh:2255
+msgid "Paste"
+msgstr "粘贴"
+
+#: git-gui.sh:1743 git-gui.sh:2258
+msgid "Delete"
+msgstr "删除"
+
+#: git-gui.sh:1747 git-gui.sh:2262 git-gui.sh:2399
+msgid "Select All"
+msgstr "全选"
+
+#: git-gui.sh:1756
+msgid "Create..."
+msgstr "新建..."
+
+#: git-gui.sh:1762
+msgid "Checkout..."
+msgstr "切换..."
+
+#: git-gui.sh:1768
+msgid "Rename..."
+msgstr "改名..."
+
+#: git-gui.sh:1773 git-gui.sh:1871
+msgid "Delete..."
+msgstr "删除..."
+
+#: git-gui.sh:1778
+msgid "Reset..."
+msgstr "重置所有修动..."
+
+#: git-gui.sh:1790
+msgid "New Commit"
+msgstr "新提交"
+
+#: git-gui.sh:1798
+msgid "Amend Last Commit"
+msgstr "修订上次提交"
+
+#: git-gui.sh:1807
+msgid "Rescan"
+msgstr "重新扫描"
+
+#: git-gui.sh:1813
+msgid "Add To Commit"
+msgstr "添加到本次提交"
+
+#: git-gui.sh:1818
+msgid "Add Existing To Commit"
+msgstr "添加默认修改文件"
+
+#: git-gui.sh:1824
+msgid "Unstage From Commit"
+msgstr "从本次提交移除"
+
+#: git-gui.sh:1829
+msgid "Revert Changes"
+msgstr "恢复修改"
+
+#: git-gui.sh:1836 git-gui.sh:2273
+msgid "Sign Off"
+msgstr "签名"
+
+#: git-gui.sh:1851
+msgid "Local Merge..."
+msgstr "本地合并..."
+
+#: git-gui.sh:1856
+msgid "Abort Merge..."
+msgstr "取消合并..."
+
+#: git-gui.sh:1868
+msgid "Push..."
+msgstr "上传..."
+
+#: git-gui.sh:1878
+msgid "Apple"
+msgstr "苹果"
+
+#: git-gui.sh:1881 git-gui.sh:1928
+#, tcl-format
+msgid "About %s"
+msgstr "关于%s"
+
+#: git-gui.sh:1883 git-gui.sh:1889 git-gui.sh:2441
+msgid "Options..."
+msgstr "选项..."
+
+#: git-gui.sh:1913
+msgid "Tools"
+msgstr "工具"
+
+#: git-gui.sh:1915
+msgid "Migrate"
+msgstr "移植"
+
+#: git-gui.sh:1924
+msgid "Help"
+msgstr "帮助"
+
+#: git-gui.sh:1965
+msgid "Online Documentation"
+msgstr "在线文档"
+
+#: git-gui.sh:2215
+msgid "Initial Commit Message:"
+msgstr "初始提交描述:"
+
+#: git-gui.sh:2216
+msgid "Amended Commit Message:"
+msgstr "修订提交描述:"
+
+#: git-gui.sh:2217
+msgid "Amended Initial Commit Message:"
+msgstr "修订初始提交描述:"
+
+#: git-gui.sh:2218
+msgid "Amended Merge Commit Message:"
+msgstr "修订合并提交描述:"
+
+#: git-gui.sh:2219
+msgid "Merge Commit Message:"
+msgstr "合并提交描述:"
+
+#: git-gui.sh:2220
+msgid "Commit Message:"
+msgstr "提交描述:"
+
+#: git-gui.sh:2265 git-gui.sh:2403
+msgid "Copy All"
+msgstr "全部复制"
+
+#: git-gui.sh:2391
+msgid "Refresh"
+msgstr "刷新"
+
+#: git-gui.sh:2412
+msgid "Apply/Reverse Hunk"
+msgstr ""
+
+#: git-gui.sh:2418
+msgid "Decrease Font Size"
+msgstr "缩小字体"
+
+#: git-gui.sh:2422
+msgid "Increase Font Size"
+msgstr "放大字体"
+
+#: git-gui.sh:2427
+msgid "Show Less Context"
+msgstr "显示更多diff上下文"
+
+#: git-gui.sh:2434
+msgid "Show More Context"
+msgstr "显示更少diff上下文"

-- 
1.5.0.rc3.81.g8188e

Junio C Hamano· Jul 22, 2007, 09:06 UTC · re: Xudong Guan · lore

Re: [PATCH] Initial Chinese translation

Xudong Guan <xudong.guan@gmail.com> writes:

Show 7 quoted lines

> On 01:06 Sun 22 Jul     , Junio C Hamano wrote:
>> Yeah, I was hinting to rename this file to zh_CN.po from day
>> one.
>
> I agree.
>
> I am new to the patch-in-email way of doing things...

Well, as Johannes already has your original patch in his tree, it probably is easiest to give him an email requesting a rename on his end ;-).

Johannes Schindelin· Jul 22, 2007, 11:39 UTC · re: Xudong Guan · lore

Re: [PATCH] Initial Chinese translation

Hi,

On Sun, 22 Jul 2007, Xudong Guan wrote:

Show 11 quoted lines

> On 01:06 Sun 22 Jul     , Junio C Hamano wrote:
> > Yeah, I was hinting to rename this file to zh_CN.po from day
> > one.
> 
> I agree.
> 
> I am new to the patch-in-email way of doing things. If I could do
> better, please give me hints. Can I push directly to mob? Like:
> $ git clone http://repo.or.cz/r/git-gui/git-gui-i18n
> hack hack hack ....
> $ git push http://repo.or.cz/r/git-gui/git-gui-i18n master:mob

Almost:

$ git push mob@repo.or.cz:/srv/git/git-gui/git-gui-i18n.git master:mob

If it says that you might want to pull first, please consider pulling from mob with

$ git pull http://repo.or.cz/r/git-gui/git-gui-i18n.git/ mob

or rebasing with

$ git fetch http://repo.or.cz/r/git-gui/git-gui-i18n.git/ mob $ git rebase FETCH_HEAD

> >From 936787ddbdeaf0bcecbb1359179dae90c20418b0 Mon Sep 17 00:00:00 2001
> From: Xudong Guan <xudong.guan@gmail.com>
> Date: Sun, 22 Jul 2007 09:41:12 +0100
> Subject: [PATCH] git-gui: renamed po/zh.po -> po/zh_CN.po

Thanks.  Applied.

Before applying, I usually compile test, and it seems like just one translation is missing: Apply/Revert Hunk. Could you please add that, too? Thank you.

> ---
>  po/zh.po    |  250 -----------------------------------------------------------
>  po/zh_CN.po |  250 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Just a tip for the next time: the git diff family -- including format-patch -- knows about renames, when you call it with "-M". The patch will be much shorter then, saying that there was a rename. It is not turned on by default, since only Git knows about this extension for the time being. But that's what we're using, so no problem there.

Ciao, Dscho

Johannes Schindelin· Jul 22, 2007, 12:04 UTC · re: Johannes Schindelin · lore

Re: [PATCH] Initial Chinese translation

Hi,

On Sun, 22 Jul 2007, Johannes Schindelin wrote:

Show 6 quoted lines

> > >From 936787ddbdeaf0bcecbb1359179dae90c20418b0 Mon Sep 17 00:00:00 2001
> > From: Xudong Guan <xudong.guan@gmail.com>
> > Date: Sun, 22 Jul 2007 09:41:12 +0100
> > Subject: [PATCH] git-gui: renamed po/zh.po -> po/zh_CN.po
> 
> Thanks.  Applied.

Ooops. I amended it, because msgformat seems to downcase the name in tcl mode. So it is now called po/zh_cn.po.

I hope it did not inconvenience anybody that I did not do a brown-paper bag commit, but forced a push.

Ciao, Dscho