Fix License and Copyright

27 files changed, 162 insertions, 52 deletions

diff --git a/Makefile.am b/Makefile.am
index 3cec42d..a959542 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,8 @@
 #
 # ibus-anthy - The Anthy engine for IBus
 #
-# Copyright (c) 2007-2008 Huang Peng <shawn.p.huang@gmail.com>
+# Copyright (c) 2007-2008 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2007-2010 Red Hat, Inc.
 #
 # 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 027fd28..8d39e72 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,8 @@
 #
 # ibus-anthy - The Anthy engine for IBus
 #
-# Copyright (c) 2007-2008 Huang Peng <shawn.p.huang@gmail.com>
+# Copyright (c) 2007-2008 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2007-2010 Red Hat, Inc.
 #
 # 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/engine/Makefile.am b/engine/Makefile.am
index b8c81e4..6c2dae3 100644
--- a/engine/Makefile.am
+++ b/engine/Makefile.am
@@ -2,7 +2,8 @@
 #
 # ibus-anthy - The Anthy engine for IBus
 #
-# Copyright (c) 2007-2008 Huang Peng <shawn.p.huang@gmail.com>
+# Copyright (c) 2007-2008 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2007-2010 Red Hat, Inc.
 #
 # 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/engine/anthy.i b/engine/anthy.i
index c48481c..2f1140d 100644
--- a/engine/anthy.i
+++ b/engine/anthy.i
@@ -2,7 +2,8 @@
 /*
  * ibus-anthy - The Anthy engine for IBus
  *
- * Copyright (c) 2007-2008 Huang Peng <shawn.p.huang@gmail.com>
+ * Copyright (c) 2007-2008 Peng Huang <shawn.p.huang@gmail.com>
+ * Copyright (c) 2007-2010 Red Hat, Inc.
  *
  * 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/engine/anthy.xml.in.in b/engine/anthy.xml.in.in
index 2578723..196537f 100644
--- a/engine/anthy.xml.in.in
+++ b/engine/anthy.xml.in.in
@@ -1,5 +1,5 @@
 <?xml version=\"1.0\" encoding=\"utf-8\"?>
-<!-- filename: pinyin.xml -->
+<!-- filename: anthy.xml -->
 <component>
 	<name>org.freedesktop.IBus.Anthy</name>
 	<description>Anthy Component</description>
diff --git a/engine/engine.py b/engine/engine.py
index cd139db..99b4054 100644
--- a/engine/engine.py
+++ b/engine/engine.py
@@ -3,7 +3,8 @@
 #
 # ibus-anthy - The Anthy engine for IBus
 #
-# Copyright (c) 2007-2008 Huang Peng <shawn.p.huang@gmail.com>
+# Copyright (c) 2007-2008 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2007-2010 Red Hat, Inc.
 #
 # 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/engine/factory.py b/engine/factory.py
index eee85dc..c2a342e 100644
--- a/engine/factory.py
+++ b/engine/factory.py
@@ -3,7 +3,8 @@
 #
 # ibus-anthy - The Anthy engine for IBus
 #
-# Copyright (c) 2007-2008 Huang Peng <shawn.p.huang@gmail.com>
+# Copyright (c) 2007-2008 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2007-2010 Red Hat, Inc.
 #
 # 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/engine/ibus-engine-anthy.in b/engine/ibus-engine-anthy.in
index fb7c09a..9f29e32 100644
--- a/engine/ibus-engine-anthy.in
+++ b/engine/ibus-engine-anthy.in
@@ -1,23 +1,26 @@
 #!/bin/sh
 #
-# ibus - The Input Bus
+# vim:set noet ts=4:
 #
-# Copyright (c) 2007-2008 Huang Peng <shawn.p.huang@gmail.com>
+# ibus-anthy - The Anthy engine for IBus
 #
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2 of the License, or (at your option) any later version.
+# Copyright (c) 2007-2008 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2007-2010 Red Hat, Inc.
 #
-# This library is distributed in the hope that it will be useful,
+# 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
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
+# GNU General Public License for more details.
 #
-# You should have received a copy of the GNU Lesser General Public
-# License along with this program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
 prefix=@prefix@
 datarootdir=@datarootdir@
 exec_prefix=@exec_prefix@
diff --git a/engine/jastring.py b/engine/jastring.py
index c2ec4b4..306691e 100644
--- a/engine/jastring.py
+++ b/engine/jastring.py
@@ -3,7 +3,8 @@
 #
 # ibus-anthy - The Anthy engine for IBus
 #
-# Copyright (c) 2007-2008 Huang Peng <shawn.p.huang@gmail.com>
+# Copyright (c) 2007-2008 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2007-2010 Red Hat, Inc.
 #
 # 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/engine/kana.py b/engine/kana.py
index 4bf53a3..4932a6c 100644
--- a/engine/kana.py
+++ b/engine/kana.py
@@ -3,7 +3,8 @@
 #
 # ibus-anthy - The Anthy engine for IBus
 #
-# Copyright (c) 2007-2008 Huang Peng <shawn.p.huang@gmail.com>
+# Copyright (c) 2007-2008 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2007-2010 Red Hat, Inc.
 #
 # 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/engine/romaji.py b/engine/romaji.py
index 80010cd..12c6656 100644
--- a/engine/romaji.py
+++ b/engine/romaji.py
@@ -3,7 +3,8 @@
 #
 # ibus-anthy - The Anthy engine for IBus
 #
-# Copyright (c) 2007-2008 Huang Peng <shawn.p.huang@gmail.com>
+# Copyright (c) 2007-2008 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2007-2010 Red Hat, Inc.
 #
 # 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/engine/segment.py b/engine/segment.py
index a91607a..224bfcc 100644
--- a/engine/segment.py
+++ b/engine/segment.py
@@ -3,7 +3,8 @@
 #
 # ibus-anthy - The Anthy engine for IBus
 #
-# Copyright (c) 2007-2008 Huang Peng <shawn.p.huang@gmail.com>
+# Copyright (c) 2007-2008 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2007-2010 Red Hat, Inc.
 #
 # 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/engine/tables.py b/engine/tables.py
index b0a8e68..2ea67e0 100644
--- a/engine/tables.py
+++ b/engine/tables.py
@@ -3,7 +3,8 @@
 #
 # ibus-anthy - The Anthy engine for IBus
 #
-# Copyright (c) 2007-2008 Huang Peng <shawn.p.huang@gmail.com>
+# Copyright (c) 2007-2008 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2007-2010 Red Hat, Inc.
 #
 # 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/engine/thumb.py b/engine/thumb.py
index 4eb8ccf..b678cda 100644
--- a/engine/thumb.py
+++ b/engine/thumb.py
@@ -1,4 +1,25 @@
 # -*- coding: utf-8 -*-
+# vim:set et sts=4 sw=4:
+#
+# ibus-anthy - The Anthy engine for IBus
+#
+# Copyright (c) 2007-2008 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2009 Hideaki ABE <abe.sendai@gmail.com>
+# Copyright (c) 2007-2010 Red Hat, Inc.
+#
+# 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
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 import gtk
 import gobject
diff --git a/icons/Makefile.am b/icons/Makefile.am
index dbd5537..5a29495 100644
--- a/icons/Makefile.am
+++ b/icons/Makefile.am
@@ -1,23 +1,23 @@
 # vim:set noet ts=4:
 #
-# ibus - The Anthy engine for IBus
+# ibus-anthy - The Anthy engine for IBus
 #
-# Copyright (c) 2007-2008 Huang Peng <shawn.p.huang@gmail.com>
+# Copyright (c) 2007-2008 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2007-2010 Red Hat, Inc.
 #
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2 of the License, or (at your option) any later version.
+# 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
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
 #
-# This library is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
+# GNU General Public License for more details.
 #
-# You should have received a copy of the GNU Lesser General Public
-# License along with this program; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-# Boston, MA  02111-1307  USA
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 icons_DATA = \
 	ibus-anthy.png \
diff --git a/m4/Makefile.am b/m4/Makefile.am
index 675bb5f..fd78846 100644
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -1,8 +1,9 @@
 # vim:set noet ts=4:
 #
-# ibus-tmpl - The Input Bus template project
+# ibus-anthy - The Anthy engine for IBus
 #
-# Copyright (c) 2007-2008 Huang Peng <shawn.p.huang@gmail.com>
+# Copyright (c) 2007-2008 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2007-2010 Red Hat, Inc.
 #
 # 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/LINGUAS b/po/LINGUAS
index 62fd80a..ee7c806 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -1,4 +1,5 @@
+# please keep this list sorted alphabetically
+#
 fr
 ja
 zh_CN
-
diff --git a/po/Makevars b/po/Makevars
index aeae475..e4cf580 100644
--- a/po/Makevars
+++ b/po/Makevars
@@ -18,7 +18,7 @@ XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
 # or entity, or to disclaim their copyright.  The empty string stands for
 # the public domain; in this case the translators are expected to disclaim
 # their copyright.
-COPYRIGHT_HOLDER = Huang Peng <shawn.p.huang@gmail.com>
+COPYRIGHT_HOLDER = Peng Huang <shawn.p.huang@gmail.com>
 
 # This is the email address or URL to which the translators shall report
 # bugs in the untranslated strings:
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 819647e..2360a02 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,3 +1,5 @@
+# Files with translatable strings.
+# Please keep this file in alphabetical order.
 engine/engine.py
 engine/factory.py
 setup/main.py
diff --git a/po/fr.po b/po/fr.po
index e7311e4..cc8a18b 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,12 +1,13 @@
 # French translation of ibus-anthy.
-# Copyright (C) 2008 Huang Peng <shawn.p.huang@gmail.com>
+# Copyright (C) 2008 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 1999-2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the ibus-anthy package.
 #
 # UTUMI Hirosi <utuhiro78@yahoo.co.jp>, 2008.
 # Humbert Julien <julroy67@gmail.com>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: ibus-anthy VERSION\n"
+"Project-Id-Version: ibus-anthy 1.2\n"
 "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/entry\n"
 "POT-Creation-Date: 2010-01-13 12:58+0900\n"
 "PO-Revision-Date: 2009-12-04 18:54+0100\n"
diff --git a/po/ja.po b/po/ja.po
index 2a562f0..490e068 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,11 +1,12 @@
 # Japanese translation of ibus-anthy.
-# Copyright (C) 2008 Huang Peng <shawn.p.huang@gmail.com>
+# Copyright (C) 2008 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 1999-2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the ibus-anthy package.
 # UTUMI Hirosi <utuhiro78@yahoo.co.jp>, 2008.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: ibus-anthy VERSION\n"
+"Project-Id-Version: ibus-anthy 1.2\n"
 "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/entry\n"
 "POT-Creation-Date: 2010-01-13 12:58+0900\n"
 "PO-Revision-Date: 2009-03-16 12:31+1000\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 98cc4a3..05e9921 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,16 +1,17 @@
 # Chinese translation for ibus-anthy.
-# Copyright (C) YEAR Huang Peng <shawn.p.huang@gmail.com>
+# Copyright (C) 2008 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (C) 1999-2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the ibus-anthy package.
-# Huang Peng <shawn.p.huang@gmail.com>, 2008.
+# Peng Huang <shawn.p.huang@gmail.com>, 2008.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: ibus-anthy VERSION\n"
+"Project-Id-Version: ibus-anthy 1.2\n"
 "Report-Msgid-Bugs-To: http://code.google.com/p/ibus/issues/entry\n"
 "POT-Creation-Date: 2010-01-13 12:58+0900\n"
 "PO-Revision-Date: 2008-08-21 21:37+0800\n"
-"Last-Translator: Huang Peng <shawn.p.huang@gmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Last-Translator: Peng Huang <shawn.p.huang@gmail.com>\n"
+"Language-Team: Peng Huang <shawn.p.huang@gmail.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/setup/Makefile.am b/setup/Makefile.am
index 7c9e591..5187536 100644
--- a/setup/Makefile.am
+++ b/setup/Makefile.am
@@ -1,8 +1,10 @@
 # vim:set noet ts=4:
 #
-# ibus-pinyin - The PinYin engine for IBus
+# ibus-anthy - The Anthy engine for IBus
 #
-# Copyright (c) 2007-2008 Huang Peng <shawn.p.huang@gmail.com>
+# Copyright (c) 2007-2008 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2009 Hideaki ABE <abe.sendai@gmail.com>
+# Copyright (c) 2007-2010 Red Hat, Inc.
 #
 # 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/anthyprefs.py b/setup/anthyprefs.py
index 829cde8..f632c1e 100644
--- a/setup/anthyprefs.py
+++ b/setup/anthyprefs.py
@@ -1,4 +1,25 @@
 # -*- coding: utf-8 -*-
+# vim:set noet ts=4:
+#
+# ibus-anthy - The Anthy engine for IBus
+#
+# Copyright (c) 2007-2008 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2009 Hideaki ABE <abe.sendai@gmail.com>
+# Copyright (c) 2007-2010 Red Hat, Inc.
+#
+# 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
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 import gtk
 
diff --git a/setup/ibus-setup-anthy.in b/setup/ibus-setup-anthy.in
index 2ec8099..1ed2165 100644
--- a/setup/ibus-setup-anthy.in
+++ b/setup/ibus-setup-anthy.in
@@ -3,7 +3,8 @@
 #
 # ibus-tmpl - The Input Bus template project
 #
-# Copyright (c) 2007-2008 Huang Peng <shawn.p.huang@gmail.com>
+# Copyright (c) 2007-2008 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2007-2010 Red Hat, Inc.
 #
 # 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/main.py b/setup/main.py
index 73a47cc..e584fa6 100644
--- a/setup/main.py
+++ b/setup/main.py
@@ -1,3 +1,25 @@
+# vim:set noet ts=4:
+#
+# ibus-anthy - The Anthy engine for IBus
+#
+# Copyright (c) 2007-2008 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2009 Hideaki ABE <abe.sendai@gmail.com>
+# Copyright (c) 2007-2010 Red Hat, Inc.
+#
+# 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
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
 from os import path, getenv
 import gtk
 import pango
diff --git a/setup/prefs.py b/setup/prefs.py
index 7d67994..4aa900b 100644
--- a/setup/prefs.py
+++ b/setup/prefs.py
@@ -1,3 +1,25 @@
+# vim:set noet ts=4:
+#
+# ibus-anthy - The Anthy engine for IBus
+#
+# Copyright (c) 2007-2008 Peng Huang <shawn.p.huang@gmail.com>
+# Copyright (c) 2009 Hideaki ABE <abe.sendai@gmail.com>
+# Copyright (c) 2007-2010 Red Hat, Inc.
+#
+# 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
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
 from ibus import Bus