diff options
author | Huang Peng <shawn.p.huang@gmail.com> | 2009-02-05 11:03:39 +0800 |
---|---|---|
committer | Huang Peng <shawn.p.huang@gmail.com> | 2009-02-05 11:03:39 +0800 |
commit | 33aa241841500c0b59204d905e05d55fb273486c (patch) | |
tree | e23ddce6a8a5d61201cfef7c29ffa6fa9c15861a | |
parent | aaa9a8cea3a23bca6444221192ffc52ccbff3cb8 (diff) | |
parent | a07a51ff63d323a7b742e30ad5368371023b4265 (diff) | |
download | ibus-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.po | 2 | ||||
-rw-r--r-- | po/pa.po | 2 | ||||
-rw-r--r-- | po/zh_CN.po | 2 |
3 files changed, 3 insertions, 3 deletions
@@ -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" @@ -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" |