2006-05-21 Raif S. Naffah <raif@swiftdsl.com.au>

	* doc/tools.texinfo: Replaced references to MessageBundle.properties
	to messages.properties.
	* resource/gnu/classpath/tools/jarsigner/MessageBundle.properties:
	Renamed to messages.properties.
	* resource/gnu/classpath/tools/keytool/MessageBundle.properties:
	Likewise.
	* resource/gnu/classpath/tools/jarsigner/messages.properties:
	Renamed from MessageBundle.properties.
	Added copyright notice.
	* resource/gnu/classpath/tools/keytool/messages.properties:
	Likewise.
	* tools/gnu/classpath/tools/jarsigner/Messages.java
	(BUNDLE_NAME): Use messages instead of MessageBundle properties file.
	(getFormattedString): Fixed a spelling mistake.
	* tools/gnu/classpath/tools/keytool/Messages.java: Likewise.

2 files changed, 78 insertions, 2 deletions

diff --git a/resource/gnu/classpath/tools/jarsigner/MessageBundle.properties b/resource/gnu/classpath/tools/jarsigner/messages.properties
index 565041f21..4383256de 100644
--- a/resource/gnu/classpath/tools/jarsigner/MessageBundle.properties
+++ b/resource/gnu/classpath/tools/jarsigner/messages.properties
@@ -1,4 +1,42 @@
-# default locale messages for gnu.classpath.tools.jarsigner package
+# messages.properties -- English language messages and message formats
+# Copyright (C) 2006  Free Software Foundation, Inc.
+#
+# This file is part of GNU Classpath.
+#
+# GNU Classpath 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.
+#
+# GNU Classpath 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 GNU Classpath; see the file COPYING.  If not, write to the
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301 USA.
+#
+# Linking this library statically or dynamically with other modules is
+# making a combined work based on this library.  Thus, the terms and
+# conditions of the GNU General Public License cover the whole
+# combination.
+#
+# As a special exception, the copyright holders of this library give you
+# permission to link this library with independent modules to produce an
+# executable, regardless of the license terms of these independent
+# modules, and to copy and distribute the resulting executable under
+# terms of your choice, provided that you also meet, for each linked
+# independent module, the terms and conditions of the license of that
+# module.  An independent module is a module which is not derived from
+# or based on this library.  If you modify this library, you may extend
+# this exception to your version of the library, but you are not
+# obligated to do so.  If you do not wish to do so, delete this
+# exception statement from your version.
+#
+# for gnu.classpath.tools.jarsigner package
+#
 
 Main.7=jarsigner: 
 Main.9=jarsigner error: 
diff --git a/resource/gnu/classpath/tools/keytool/MessageBundle.properties b/resource/gnu/classpath/tools/keytool/messages.properties
index 2362d6a84..475e80b84 100644
--- a/resource/gnu/classpath/tools/keytool/MessageBundle.properties
+++ b/resource/gnu/classpath/tools/keytool/messages.properties
@@ -1,4 +1,42 @@
-# default locale messages for gnu.classpath.tools.keytool package
+# messages.properties -- English language messages and message formats
+# Copyright (C) 2006  Free Software Foundation, Inc.
+#
+# This file is part of GNU Classpath.
+#
+# GNU Classpath 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.
+#
+# GNU Classpath 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 GNU Classpath; see the file COPYING.  If not, write to the
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301 USA.
+#
+# Linking this library statically or dynamically with other modules is
+# making a combined work based on this library.  Thus, the terms and
+# conditions of the GNU General Public License cover the whole
+# combination.
+#
+# As a special exception, the copyright holders of this library give you
+# permission to link this library with independent modules to produce an
+# executable, regardless of the license terms of these independent
+# modules, and to copy and distribute the resulting executable under
+# terms of your choice, provided that you also meet, for each linked
+# independent module, the terms and conditions of the license of that
+# module.  An independent module is a module which is not derived from
+# or based on this library.  If you modify this library, you may extend
+# this exception to your version of the library, but you are not
+# obligated to do so.  If you do not wish to do so, delete this
+# exception statement from your version.
+#
+# for gnu.classpath.tools.keytool package
+#
 
 Main.6=keytool: {0}
 Main.8=keytool error: {0}