Update Copyright information

diff --git a/Makefile.am b/Makefile.am
index 94da686..304bd31 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
 #
 # ibus-pinyin - The Chinese PinYin engine for IBus
 #
-# Copyright (c) 2007-2008 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2008-2010 Peng Huang <shawn.p.huang@gmail.com>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

diff --git a/configure.ac b/configure.ac
index 38e5e16..607951e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 #
 # ibus-pinyin - The Chinese PinYin engine for IBus
 #
-# Copyright (c) 2007-2008 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2008-2010 Peng Huang <shawn.p.huang@gmail.com>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -19,10 +19,10 @@
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 # if not 1, append datestamp to the version number.
-m4_define([ibus_released], [0])
+m4_define([ibus_released], [1])
 m4_define([ibus_major_version], [1])
 m4_define([ibus_minor_version], [3])
-m4_define([ibus_micro_version], [5])
+m4_define([ibus_micro_version], [6])
 m4_define(ibus_maybe_datestamp,
     m4_esyscmd([if test x]ibus_released[ != x1; then date +.%Y%m%d | tr -d '\n\r'; fi]))
 

diff --git a/data/Makefile.am b/data/Makefile.am
index 64ac271..d0ca35c 100644 (file)
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -2,7 +2,7 @@
 #
 # ibus-pinyin - The Chinese PinYin engine for IBus
 #
-# Copyright (c) 2007-2008 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2008-2010 Peng Huang <shawn.p.huang@gmail.com>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

diff --git a/data/db/Makefile.am b/data/db/Makefile.am
index 67e2f95..398bcad 100644 (file)
--- a/data/db/Makefile.am
+++ b/data/db/Makefile.am
@@ -2,7 +2,7 @@
 #
 # ibus-pinyin - The Chinese PinYin engine for IBus
 #
-# Copyright (c) 2007-2008 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2008-2010 Peng Huang <shawn.p.huang@gmail.com>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

diff --git a/data/db/android/Makefile.am b/data/db/android/Makefile.am
index e4908e9..76f4e33 100644 (file)
--- a/data/db/android/Makefile.am
+++ b/data/db/android/Makefile.am
@@ -2,7 +2,7 @@
 #
 # ibus-pinyin - The Chinese PinYin engine for IBus
 #
-# Copyright (c) 2007-2008 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2008-2010 Peng Huang <shawn.p.huang@gmail.com>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

diff --git a/data/db/open-phrase/Makefile.am b/data/db/open-phrase/Makefile.am
index 6246c30..32bc052 100644 (file)
--- a/data/db/open-phrase/Makefile.am
+++ b/data/db/open-phrase/Makefile.am
@@ -2,7 +2,7 @@
 #
 # ibus-pinyin - The Chinese PinYin engine for IBus
 #
-# Copyright (c) 2007-2008 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2008-2010 Peng Huang <shawn.p.huang@gmail.com>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index 4fbca90..d025737 100644 (file)
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -2,7 +2,7 @@
 #
 # ibus-pinyin - The Chinese PinYin engine for IBus
 #
-# Copyright (c) 2007-2008 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2008-2010 Peng Huang <shawn.p.huang@gmail.com>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/m4/Makefile.am b/m4/Makefile.am
index f545bbd..2d457ce 100644 (file)
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -1,8 +1,8 @@
 # vim:set noet ts=4:
 #
-# ibus-tmpl - The Input Bus template project
+# ibus-pinyin - The Chinese PinYin engine for IBus
 #
-# Copyright (c) 2007-2008 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2008-2010 Peng Huang <shawn.p.huang@gmail.com>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

diff --git a/po/ru.po b/po/ru.po
index 14857b9..1eedfb1 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 20:04+0800\n"
+"POT-Creation-Date: 2010-05-19 13:31+0800\n"
 "PO-Revision-Date: 2009-10-14 09:44+0300\n"
 "Last-Translator: Alexey Kotlyarov <koterpillar@gmail.com>\n"
 "Language-Team: Russian\n"
@@ -31,11 +31,11 @@ msgstr "Пиньинь"
 msgid "Pinyin input method (debug)"
 msgstr "Метод ввода пиньинь"
 
-#: ../src/Main.cc:77
+#: ../src/Main.cc:78
 msgid "Bopomofo (debug)"
 msgstr ""
 
-#: ../src/Main.cc:78
+#: ../src/Main.cc:79
 #, fuzzy
 msgid "Bopomofo input method (debug)"
 msgstr "Метод ввода пиньинь"
@@ -90,11 +90,8 @@ msgid "<b>UI</b>"
 msgstr "<b>Другие</b>"
 
 #: ../setup/ibus-pinyin-preferences.ui.h:8
-msgid ""
-"<small>Copyright &#xA9; 2009 Peng Huang &lt;shawn.p.huang@gmail.com&gt;</"
-"small>"
+msgid "<small>Copyright (c) 2009-2010 Peng Huang</small>"
 msgstr ""
-"<small>Copyright &#xA9; 2009 Хуан Пэн &lt;shawn.p.huang@gmail.com&gt;</small>"
 
 #: ../setup/ibus-pinyin-preferences.ui.h:9
 msgid "ABC"
@@ -277,6 +274,15 @@ msgstr "Использовать [Shift] для выбора кандидато
 msgid "http://ibus.googlecode.com"
 msgstr "http://ibus.googlecode.com"
 
+#, fuzzy
+#~ msgid ""
+#~ "<small>Copyright &#xA9; 2009\n"
+#~ "Peng Huang &lt;shawn.p.huang@gmail.com&gt;,\n"
+#~ "BYVoid &lt;byvoid1@gmail.com&gt;</small>"
+#~ msgstr ""
+#~ "<small>Copyright &#xA9; 2009 Хуан Пэн &lt;shawn.p.huang@gmail.com&gt;</"
+#~ "small>"
+
 #~ msgid "Enable automatic commit phrase."
 #~ msgstr "Подтверждать набранную фразу при вводе знаков препинания."
 

diff --git a/po/zh_CN.po b/po/zh_CN.po
index a3ef6a0..5de3fec 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ibus-pinyin 1.2.99\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 20:04+0800\n"
+"POT-Creation-Date: 2010-05-19 13:31+0800\n"
 "PO-Revision-Date: 2009-09-20 16:05+8\n"
 "Last-Translator: Peng Huang <shawn.p.huang@gmail.com>\n"
 "Language-Team: Peng Huang <shawn.p.huang@gmail.com>\n"
@@ -27,11 +27,11 @@ msgstr "拼音（调试）"
 msgid "Pinyin input method (debug)"
 msgstr "拼音输入法（调试）"
 
-#: ../src/Main.cc:77
+#: ../src/Main.cc:78
 msgid "Bopomofo (debug)"
 msgstr "注音（调试）"
 
-#: ../src/Main.cc:78
+#: ../src/Main.cc:79
 msgid "Bopomofo input method (debug)"
 msgstr "注音输入法（调试）"
 
@@ -82,10 +82,8 @@ msgid "<b>UI</b>"
 msgstr "<b>外观</b>"
 
 #: ../setup/ibus-pinyin-preferences.ui.h:8
-msgid ""
-"<small>Copyright &#xA9; 2009 Peng Huang &lt;shawn.p.huang@gmail.com&gt;</"
-"small>"
-msgstr "<small>版权所有 © 2009 黄鹏 &lt;shawn.p.huang@gmail.com&gt;</small>"
+msgid "<small>Copyright (c) 2009-2010 Peng Huang</small>"
+msgstr "<small>版权所有 (c) 2009-2010 黄鹏</small>"
 
 #: ../setup/ibus-pinyin-preferences.ui.h:9
 msgid "ABC"
@@ -267,6 +265,13 @@ msgstr "[Shift]键选词"
 msgid "http://ibus.googlecode.com"
 msgstr "http://ibus.googlecode.com"
 
+#, fuzzy
+#~ msgid ""
+#~ "<small>Copyright &#xA9; 2009\n"
+#~ "Peng Huang &lt;shawn.p.huang@gmail.com&gt;,\n"
+#~ "BYVoid &lt;byvoid1@gmail.com&gt;</small>"
+#~ msgstr "<small>版权所有 © 2009 黄鹏 &lt;shawn.p.huang@gmail.com&gt;</small>"
+
 #~ msgid "Enable automatic commit phrase."
 #~ msgstr "启动自动上词。"
 

diff --git a/po/zh_HK.po b/po/zh_HK.po
index 1d72bf4..dc767e3 100644 (file)
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ibus-pinyin 1.3.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 20:04+0800\n"
+"POT-Creation-Date: 2010-05-19 13:31+0800\n"
 "PO-Revision-Date: 2009-09-20 16:05+8\n"
 "Last-Translator: BYVoid <byvoid1@gmail.com>\n"
 "Language-Team: BYVoid <byvoid1@gmail.com>\n"
@@ -22,11 +22,11 @@ msgstr "拼音（調試）"
 msgid "Pinyin input method (debug)"
 msgstr "拼音輸入法（調試）"
 
-#: ../src/Main.cc:77
+#: ../src/Main.cc:78
 msgid "Bopomofo (debug)"
 msgstr "注音（調試）"
 
-#: ../src/Main.cc:78
+#: ../src/Main.cc:79
 msgid "Bopomofo input method (debug)"
 msgstr "注音輸入法（調試）"
 
@@ -77,10 +77,8 @@ msgid "<b>UI</b>"
 msgstr "<b>外觀</b>"
 
 #: ../setup/ibus-pinyin-preferences.ui.h:8
-msgid ""
-"<small>Copyright &#xA9; 2009 Peng Huang &lt;shawn.p.huang@gmail.com&gt;</"
-"small>"
-msgstr "<small>版權所有 © 2009 黃鵬 &lt;shawn.p.huang@gmail.com&gt;</small>"
+msgid "<small>Copyright (c) 2009-2010 Peng Huang</small>"
+msgstr "<small>版權所有 (c) 2009-2010 黃鵬</small>"
 
 #: ../setup/ibus-pinyin-preferences.ui.h:9
 msgid "ABC"
@@ -261,3 +259,10 @@ msgstr "[Shift]鍵選詞"
 #: ../setup/ibus-pinyin-preferences.ui.h:55
 msgid "http://ibus.googlecode.com"
 msgstr "http://ibus.googlecode.com"
+
+#, fuzzy
+#~ msgid ""
+#~ "<small>Copyright &#xA9; 2009\n"
+#~ "Peng Huang &lt;shawn.p.huang@gmail.com&gt;,\n"
+#~ "BYVoid &lt;byvoid1@gmail.com&gt;</small>"
+#~ msgstr "<small>版權所有 © 2009 黃鵬 &lt;shawn.p.huang@gmail.com&gt;</small>"

diff --git a/po/zh_TW.po b/po/zh_TW.po
index 3560421..882ecf1 100644 (file)
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ibus-pinyin 1.3.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 20:04+0800\n"
+"POT-Creation-Date: 2010-05-19 13:31+0800\n"
 "PO-Revision-Date: 2009-09-20 16:05+8\n"
 "Last-Translator: BYVoid <byvoid1@gmail.com>\n"
 "Language-Team: BYVoid <byvoid1@gmail.com>\n"
@@ -22,11 +22,11 @@ msgstr "拼音（調試）"
 msgid "Pinyin input method (debug)"
 msgstr "拼音輸入法（調試）"
 
-#: ../src/Main.cc:77
+#: ../src/Main.cc:78
 msgid "Bopomofo (debug)"
 msgstr "注音（調試）"
 
-#: ../src/Main.cc:78
+#: ../src/Main.cc:79
 msgid "Bopomofo input method (debug)"
 msgstr "注音輸入法（調試）"
 
@@ -77,10 +77,8 @@ msgid "<b>UI</b>"
 msgstr "<b>外觀</b>"
 
 #: ../setup/ibus-pinyin-preferences.ui.h:8
-msgid ""
-"<small>Copyright &#xA9; 2009 Peng Huang &lt;shawn.p.huang@gmail.com&gt;</"
-"small>"
-msgstr "<small>版權所有 © 2009 黃鵬 &lt;shawn.p.huang@gmail.com&gt;</small>"
+msgid "<small>Copyright (c) 2009-2010 Peng Huang</small>"
+msgstr "<small>版權所有 (c) 2009-2010 黃鵬</small>"
 
 #: ../setup/ibus-pinyin-preferences.ui.h:9
 msgid "ABC"
@@ -261,3 +259,10 @@ msgstr "[Shift]鍵選詞"
 #: ../setup/ibus-pinyin-preferences.ui.h:55
 msgid "http://ibus.googlecode.com"
 msgstr "http://ibus.googlecode.com"
+
+#, fuzzy
+#~ msgid ""
+#~ "<small>Copyright &#xA9; 2009\n"
+#~ "Peng Huang &lt;shawn.p.huang@gmail.com&gt;,\n"
+#~ "BYVoid &lt;byvoid1@gmail.com&gt;</small>"
+#~ msgstr "<small>版權所有 © 2009 黃鵬 &lt;shawn.p.huang@gmail.com&gt;</small>"

diff --git a/setup/Makefile.am b/setup/Makefile.am
index 533b390..5593adb 100644 (file)
--- a/setup/Makefile.am
+++ b/setup/Makefile.am
@@ -1,8 +1,8 @@
 # vim:set noet ts=4:
 #
-# ibus-pinyin - The PinYin engine for IBus
+# ibus-pinyin - The Chinese PinYin engine for IBus
 #
-# Copyright (c) 2007-2008 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2008-2010 Peng Huang <shawn.p.huang@gmail.com>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

diff --git a/setup/ibus-pinyin-preferences.ui b/setup/ibus-pinyin-preferences.ui
index 865c8fc..976f324 100644 (file)
--- a/setup/ibus-pinyin-preferences.ui
+++ b/setup/ibus-pinyin-preferences.ui
@@ -1375,9 +1375,7 @@
                         <child>
                           <object class="GtkLabel" id="label15">
                             <property name="visible">True</property>
-                            <property name="label" translatable="yes">&lt;small&gt;Copyright &#xA9; 2009
-Peng Huang &amp;lt;shawn.p.huang@gmail.com&amp;gt;,
-BYVoid &amp;lt;byvoid1@gmail.com&amp;gt;&lt;/small&gt;</property>
+                            <property name="label" translatable="yes">&lt;small&gt;Copyright (c) 2009-2010 Peng Huang&lt;/small&gt;</property>
                             <property name="use_markup">True</property>
                             <property name="wrap">True</property>
                             <property name="selectable">True</property>

diff --git a/src/Makefile.am b/src/Makefile.am
index 29a1d01..e2bec41 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,7 +2,7 @@
 #
 # ibus-pinyin - The Chinese PinYin engine for IBus
 #
-# Copyright (c) 2007-2008 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2008-2010 Peng Huang <shawn.p.huang@gmail.com>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by