summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHuang Peng <shawn.p.huang@gmail.com>2009-02-05 11:03:39 +0800
committerHuang Peng <shawn.p.huang@gmail.com>2009-02-05 11:03:39 +0800
commit33aa241841500c0b59204d905e05d55fb273486c (patch)
treee23ddce6a8a5d61201cfef7c29ffa6fa9c15861a
parentaaa9a8cea3a23bca6444221192ffc52ccbff3cb8 (diff)
parenta07a51ff63d323a7b742e30ad5368371023b4265 (diff)
downloadibus-c_impl.tar.gz
ibus-c_impl.tar.xz
ibus-c_impl.zip
Merge branch 'master' into c_implc_impl
Conflicts: po/ja.po po/pa.po po/zh_CN.po
-rw-r--r--po/ja.po2
-rw-r--r--po/pa.po2
-rw-r--r--po/zh_CN.po2
3 files changed, 3 insertions, 3 deletions
diff --git a/po/ja.po b/po/ja.po
index abdbf0e..2429497 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ibus VERSION\n"
"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/entry\n"
-"POT-Creation-Date: 2009-02-05 10:29+0800\n"
+"POT-Creation-Date: 2009-02-05 10:11+0800\n"
"PO-Revision-Date: 2008-08-28 17:31+0900\n"
"Last-Translator: UTUMI Hirosi <utuhiro78@yahoo.co.jp>\n"
"Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
diff --git a/po/pa.po b/po/pa.po
index 483967b..5331b3b 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ibus\n"
"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/entry\n"
-"POT-Creation-Date: 2009-02-05 10:29+0800\n"
+"POT-Creation-Date: 2009-02-05 10:11+0800\n"
"PO-Revision-Date: 2008-10-17 14:15+0530\n"
"Last-Translator: Amanpreet Singh <aalam@users.sf.net>\n"
"Language-Team: Punjabi/Panjabi <punjabi-l10n@lists.sf.net>\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 7c5b745..a8f7521 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.1.1.20080813\n"
"Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/entry\n"
-"POT-Creation-Date: 2009-02-05 10:29+0800\n"
+"POT-Creation-Date: 2009-02-05 10:11+0800\n"
"PO-Revision-Date: 2008-08-13 21:59+0800\n"
"Last-Translator: Huang Peng <shawn.p.huang@gmail.com>\n"
"Language-Team: Huang Peng <shawn.p.huang@gmail.com>\n"