2006-06-11 Andrew John Hughes <gnu_andrew@member.fsf.org>

	* Merge of HEAD-->generics between
	2006/05/29 and 2006/06/11.

1 files changed, 28 insertions, 0 deletions

diff --git a/resource/gnu/classpath/tools/keytool/messages.properties b/resource/gnu/classpath/tools/keytool/messages.properties
index 71b70a766..98f4e6842 100644
--- a/resource/gnu/classpath/tools/keytool/messages.properties
+++ b/resource/gnu/classpath/tools/keytool/messages.properties
@@ -40,6 +40,9 @@
 
 Main.6=keytool: {0}
 Main.8=keytool error: {0}
+Main.5=Import a CA's Trusted Certificate.\n\
+[-file FILE] [-storetype STORE_TYPE] [-keystore URL]\n\
+[-storepass PASSWORD] [-provider PROVIDER_CLASS_NAME] [-v].
 Main.18=Unrecognized command: {0}
 Main.19=Usage:  keytool [COMMAND] [-- COMMAND]...\n\
 Manage private keys and public certificates.
@@ -540,3 +543,28 @@ SelfCertCmd.33=Fully qualified class name of a Security Provider to add to the \
 JVM in-use.
 SelfCertCmd.34=PROVIDER_CLASS_NAME
 SelfCertCmd.35=Emit more verbose messages.
+
+CACertCmd.0=Alias [{0}] is already present in key store
+CACertCmd.1=Certificate in file "{0}" was added to the key store under the alias "{1}"
+CACertCmd.2=Usage:  keytool -cacert [OPTION]...\n\
+Import a trusted CA certificate.
+CACertCmd.3=Please report bugs at http://www.gnu.org/software/classpath/bugs.html
+CACertCmd.4=Command options
+CACertCmd.5=Location of the trusted CA certificate to import.
+CACertCmd.6=FILE
+CACertCmd.7=Type of the key store to use.  If omitted, the default value is \
+that of the property "keystore.type" in the security properties file.
+CACertCmd.8=STORE_TYPE
+CACertCmd.9=Location of the key store to use.  The default value is a \
+file-based scheme whose path is the file named ".keystore" in your home \
+directory.\n\
+If URL is malformed, the tool will use URL as a file-name of a key store; \
+i.e. as if the protocol was "file:".
+CACertCmd.10=URL
+CACertCmd.11=Password to unlock the key store.  If omitted, you will be \
+prompted for one.
+CACertCmd.12=PASSWORD
+CACertCmd.13=Fully qualified class name of a Security Provider to add to the \
+JVM in-use.
+CACertCmd.14=PROVIDER_CLASS_NAME
+CACertCmd.15=Emit more verbose messages.