From ffde862e033a0825e1e9972a89c0f1f80b261a8e Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 14 Aug 2006 23:12:35 +0000 Subject: 2006-08-14 Mark Wielaard Imported GNU Classpath 0.92 * HACKING: Add more importing hints. Update automake version requirement. * configure.ac (gconf-peer): New enable AC argument. Add --disable-gconf-peer and --enable-default-preferences-peer to classpath configure when gconf is disabled. * scripts/makemake.tcl: Set gnu/java/util/prefs/gconf and gnu/java/awt/dnd/peer/gtk to bc. Classify gnu/java/security/Configuration.java as generated source file. * gnu/java/lang/management/VMGarbageCollectorMXBeanImpl.java, gnu/java/lang/management/VMMemoryPoolMXBeanImpl.java, gnu/java/lang/management/VMClassLoadingMXBeanImpl.java, gnu/java/lang/management/VMRuntimeMXBeanImpl.java, gnu/java/lang/management/VMMemoryManagerMXBeanImpl.java, gnu/java/lang/management/VMThreadMXBeanImpl.java, gnu/java/lang/management/VMMemoryMXBeanImpl.java, gnu/java/lang/management/VMCompilationMXBeanImpl.java: New VM stub classes. * java/lang/management/VMManagementFactory.java: Likewise. * java/net/VMURLConnection.java: Likewise. * gnu/java/nio/VMChannel.java: Likewise. * java/lang/Thread.java (getState): Add stub implementation. * java/lang/Class.java (isEnum): Likewise. * java/lang/Class.h (isEnum): Likewise. * gnu/awt/xlib/XToolkit.java (getClasspathTextLayoutPeer): Removed. * javax/naming/spi/NamingManager.java: New override for StackWalker functionality. * configure, sources.am, Makefile.in, gcj/Makefile.in, include/Makefile.in, testsuite/Makefile.in: Regenerated. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@116139 138bc75d-0d04-0410-961f-82ee72b054a4 --- .../classpath/tools/jarsigner/messages.properties | 4 ++ .../classpath/tools/keytool/messages.properties | 28 ++++++++++ .../resource/gnu/java/awt/peer/x/fonts.properties | 61 ++++++++++++++++++++++ .../gnu/java/util/regex/MessagesBundle.properties | 22 ++++++++ .../java/util/regex/MessagesBundle_fr.properties | 22 ++++++++ .../java/util/regex/MessagesBundle_it.properties | 31 +++++++++++ .../resource/gnu/regexp/MessagesBundle.properties | 22 -------- .../gnu/regexp/MessagesBundle_fr.properties | 22 -------- .../gnu/regexp/MessagesBundle_it.properties | 31 ----------- 9 files changed, 168 insertions(+), 75 deletions(-) create mode 100644 libjava/classpath/resource/gnu/java/awt/peer/x/fonts.properties create mode 100644 libjava/classpath/resource/gnu/java/util/regex/MessagesBundle.properties create mode 100644 libjava/classpath/resource/gnu/java/util/regex/MessagesBundle_fr.properties create mode 100644 libjava/classpath/resource/gnu/java/util/regex/MessagesBundle_it.properties delete mode 100644 libjava/classpath/resource/gnu/regexp/MessagesBundle.properties delete mode 100644 libjava/classpath/resource/gnu/regexp/MessagesBundle_fr.properties delete mode 100644 libjava/classpath/resource/gnu/regexp/MessagesBundle_it.properties (limited to 'libjava/classpath/resource/gnu') diff --git a/libjava/classpath/resource/gnu/classpath/tools/jarsigner/messages.properties b/libjava/classpath/resource/gnu/classpath/tools/jarsigner/messages.properties index 4383256debb..d4088177c3a 100644 --- a/libjava/classpath/resource/gnu/classpath/tools/jarsigner/messages.properties +++ b/libjava/classpath/resource/gnu/classpath/tools/jarsigner/messages.properties @@ -119,4 +119,8 @@ SFHelper.1=Helper is NOT finished SFHelper.4=.SF file has NOT been generated SFHelper.6=Unknown or unsupported private key algorithm SFHelper.9=Helper is NOT ready +SFHelper.0=Warning: The certificate issued by {0}, for {1}, has expired as of {3,date,full} - {3,time,full}. SFHelper.10=Helper is NOT started +SFHelper.11=Warning: The certificate issued by {0}, for {1}, is only valid after {3,date,full} - {3,time,full}. +SFHelper.14=[unknown] +SFHelper.17=[unnamed] diff --git a/libjava/classpath/resource/gnu/classpath/tools/keytool/messages.properties b/libjava/classpath/resource/gnu/classpath/tools/keytool/messages.properties index 71b70a76694..98f4e684251 100644 --- a/libjava/classpath/resource/gnu/classpath/tools/keytool/messages.properties +++ b/libjava/classpath/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. diff --git a/libjava/classpath/resource/gnu/java/awt/peer/x/fonts.properties b/libjava/classpath/resource/gnu/java/awt/peer/x/fonts.properties new file mode 100644 index 00000000000..71a95c1935c --- /dev/null +++ b/libjava/classpath/resource/gnu/java/awt/peer/x/fonts.properties @@ -0,0 +1,61 @@ +# fonts.properties +# 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. + +serif.plain=-adobe-times-medium-r-normal--*-%d-75-*-p-*-iso8859-1 +serif.bold=-adobe-times-bold-r-normal--*-%d-75-*-p-*-iso8859-1 +serif.italic=-adobe-times-medium-o-normal--*-%d-75-*-p-*-iso8859-1 +serif.bolditalic=-adobe-times-bold-o-normal--*-%d-75-*-p-*-iso8859-1 + +sansserif.plain=-adobe-helvetica-medium-r-normal--*-%d-75-*-p-*-iso8859-1 +sansserif.bold=-adobe-helvetica-bold-r-normal--*-%d-75-*-p-*-iso8859-1 +sansserif.italic=-adobe-helvetica-medium-o-normal--*-%d-75-*-p-*-iso8859-1 +sansserif.bolditalic=-adobe-helvetica-bold-o-normal--*-%d-75-*-p-*-iso8859-1 + +monospaced.plain=-adobe-courier-medium-r-normal--*-%d-75-*-p-*-iso8859-1 +monospaced.bold=-adobe-courier-bold-r-normal--*-%d-75-*-p-*-iso8859-1 +monospaced.italic=-adobe-courier-medium-o-normal--*-%d-75-*-p-*-iso8859-1 +monospaced.bolditalic=-adobe-courier-bold-o-normal--*-%d-75-*-p-*-iso8859-1 + +dialog.plain=-adobe-helvetica-medium-r-normal--*-%d-75-*-p-*-iso8859-1 +dialog.bold=-adobe-helvetica-bold-r-normal--*-%d-75-*-p-*-iso8859-1 +dialog.italic=-adobe-helvetica-medium-o-normal--*-%d-75-*-p-*-iso8859-1 +dialog.bolditalic=-adobe-helvetica-bold-o-normal--*-%d-75-*-p-*-iso8859-1 + +dialoginput.plain=-adobe-helvetica-medium-r-normal--*-%d-75-*-p-*-iso8859-1 +dialoginput.bold=-adobe-helvetica-bold-r-normal--*-%d-75-*-p-*-iso8859-1 +dialoginput.italic=-adobe-helvetica-medium-o-normal--*-%d-75-*-p-*-iso8859-1 +dialoginput.bolditalic=-adobe-helvetica-bold-o-normal--*-%d-75-*-p-*-iso8859-1 diff --git a/libjava/classpath/resource/gnu/java/util/regex/MessagesBundle.properties b/libjava/classpath/resource/gnu/java/util/regex/MessagesBundle.properties new file mode 100644 index 00000000000..fb2f27c3991 --- /dev/null +++ b/libjava/classpath/resource/gnu/java/util/regex/MessagesBundle.properties @@ -0,0 +1,22 @@ +# Localized error messages for gnu.regexp + +# Prefix for REException messages +error.prefix=At position {0} in regular expression pattern: + +# REException (parse error) messages +repeat.assertion=repeated token is zero-width assertion +repeat.chained=attempted to repeat a token that is already repeated +repeat.no.token=quantifier (?*+{}) without preceding token +repeat.empty.token=repeated token may be empty +unmatched.brace=unmatched brace +unmatched.bracket=unmatched bracket +unmatched.paren=unmatched parenthesis +interval.no.end=unexpected end of interval +class.no.end=unexpected end of character class +subexpr.no.end=unexpected end of subexpression +interval.order=an interval''s minimum is greater than its maximum +interval.error=an interval is empty * or contains illegal characters +ends.with.backslash=backslash at end of pattern + +# RESyntax message +syntax.final=Syntax has been declared final and cannot be modified diff --git a/libjava/classpath/resource/gnu/java/util/regex/MessagesBundle_fr.properties b/libjava/classpath/resource/gnu/java/util/regex/MessagesBundle_fr.properties new file mode 100644 index 00000000000..99da4e22da6 --- /dev/null +++ b/libjava/classpath/resource/gnu/java/util/regex/MessagesBundle_fr.properties @@ -0,0 +1,22 @@ +# Localized error messages for gnu.regexp + +# Prefix for REException messages +error.prefix=A l''index {0} dans le modèle d''expression régulière: + +# REException (parse error) messages +repeat.assertion=l''élément répété est de largeur zéro +repeat.chained=tentative de répétition d''un élément déjà répété +repeat.no.token=quantifieur (?*+{}) sans élément précédent +repeat.empty.token=l''élément répété peut être vide +unmatched.brace=accolade inégalée +unmatched.bracket=crochet inégalé +unmatched.paren=parenthèse inégalée +interval.no.end=fin d''interval non attendue +class.no.end=fin de classe de caractères non attendue +subexpr.no.end=fin de sous-expression non attendue +interval.order=l''interval minimum est supérieur à l''interval maximum +interval.error=l''interval est vide ou contient des caractères illégaux +ends.with.backslash=antislash à la fin du modèle + +# RESyntax message +syntax.final=La syntaxe a été déclarée finale et ne peut pas être modifiée diff --git a/libjava/classpath/resource/gnu/java/util/regex/MessagesBundle_it.properties b/libjava/classpath/resource/gnu/java/util/regex/MessagesBundle_it.properties new file mode 100644 index 00000000000..ae8e141321b --- /dev/null +++ b/libjava/classpath/resource/gnu/java/util/regex/MessagesBundle_it.properties @@ -0,0 +1,31 @@ +# Localized error messages for gnu.regexp, in Italian. +# $Id: MessagesBundle_it.properties,v 1.1 2006/07/19 19:47:07 rabbit78 Exp $ +# Messaggi italiani per gnu.regexp. +# +# Attenzione: Questa traduzione fu scritto da un italo-americano. +# Per favore correggete l'italiano bestemmiato e mandate i patch +# al listo . +# +# @author Steven Augart , + +# Prefix for REException messages +error.prefix=Al indice {0} nel modello dell''espressione regulare: + +# REException (parse error) messages +repeat.assertion=l''elemento ripetuto ha larghezza zero +repeat.chained=prova di ripetere un elemento già ripetuto +repeat.no.token=quantificatore (?*+{}) senza elemento precedente +repeat.empty.token=l''elemento ripetuto può essere vuoto +unmatched.brace=parentesi quadra senza corrispondente +unmatched.bracket=graffa senza corrispondente +unmatched.paren=parentesi senza corrispondente +interval.no.end=la fine d''intervallo è imprevista +class.no.end=la fine della classe di caratteri è imprevista +subexpr.no.end=la fine del sub-espressione è imprevista +interval.order=il valore minimo d''intervallo è piú grande del suo valore massimo +interval.error=l''intervallo è vuoto o contiene caratteri impermessibili +# Non so come si dice "backslash" in italiano. +ends.with.backslash=il modello finisce con un backslash (il carattere "\") + +# RESyntax message +syntax.final=La sintassi è dichiarata "final" (finale) e non si può modificarla diff --git a/libjava/classpath/resource/gnu/regexp/MessagesBundle.properties b/libjava/classpath/resource/gnu/regexp/MessagesBundle.properties deleted file mode 100644 index fb2f27c3991..00000000000 --- a/libjava/classpath/resource/gnu/regexp/MessagesBundle.properties +++ /dev/null @@ -1,22 +0,0 @@ -# Localized error messages for gnu.regexp - -# Prefix for REException messages -error.prefix=At position {0} in regular expression pattern: - -# REException (parse error) messages -repeat.assertion=repeated token is zero-width assertion -repeat.chained=attempted to repeat a token that is already repeated -repeat.no.token=quantifier (?*+{}) without preceding token -repeat.empty.token=repeated token may be empty -unmatched.brace=unmatched brace -unmatched.bracket=unmatched bracket -unmatched.paren=unmatched parenthesis -interval.no.end=unexpected end of interval -class.no.end=unexpected end of character class -subexpr.no.end=unexpected end of subexpression -interval.order=an interval''s minimum is greater than its maximum -interval.error=an interval is empty * or contains illegal characters -ends.with.backslash=backslash at end of pattern - -# RESyntax message -syntax.final=Syntax has been declared final and cannot be modified diff --git a/libjava/classpath/resource/gnu/regexp/MessagesBundle_fr.properties b/libjava/classpath/resource/gnu/regexp/MessagesBundle_fr.properties deleted file mode 100644 index 99da4e22da6..00000000000 --- a/libjava/classpath/resource/gnu/regexp/MessagesBundle_fr.properties +++ /dev/null @@ -1,22 +0,0 @@ -# Localized error messages for gnu.regexp - -# Prefix for REException messages -error.prefix=A l''index {0} dans le modèle d''expression régulière: - -# REException (parse error) messages -repeat.assertion=l''élément répété est de largeur zéro -repeat.chained=tentative de répétition d''un élément déjà répété -repeat.no.token=quantifieur (?*+{}) sans élément précédent -repeat.empty.token=l''élément répété peut être vide -unmatched.brace=accolade inégalée -unmatched.bracket=crochet inégalé -unmatched.paren=parenthèse inégalée -interval.no.end=fin d''interval non attendue -class.no.end=fin de classe de caractères non attendue -subexpr.no.end=fin de sous-expression non attendue -interval.order=l''interval minimum est supérieur à l''interval maximum -interval.error=l''interval est vide ou contient des caractères illégaux -ends.with.backslash=antislash à la fin du modèle - -# RESyntax message -syntax.final=La syntaxe a été déclarée finale et ne peut pas être modifiée diff --git a/libjava/classpath/resource/gnu/regexp/MessagesBundle_it.properties b/libjava/classpath/resource/gnu/regexp/MessagesBundle_it.properties deleted file mode 100644 index 71be9207aec..00000000000 --- a/libjava/classpath/resource/gnu/regexp/MessagesBundle_it.properties +++ /dev/null @@ -1,31 +0,0 @@ -# Localized error messages for gnu.regexp, in Italian. -# $Id: MessagesBundle_it.properties,v 1.1 2004/06/04 21:13:58 saugart Exp $ -# Messaggi italiani per gnu.regexp. -# -# Attenzione: Questa traduzione fu scritto da un italo-americano. -# Per favore correggete l'italiano bestemmiato e mandate i patch -# al listo . -# -# @author Steven Augart , - -# Prefix for REException messages -error.prefix=Al indice {0} nel modello dell''espressione regulare: - -# REException (parse error) messages -repeat.assertion=l''elemento ripetuto ha larghezza zero -repeat.chained=prova di ripetere un elemento già ripetuto -repeat.no.token=quantificatore (?*+{}) senza elemento precedente -repeat.empty.token=l''elemento ripetuto può essere vuoto -unmatched.brace=parentesi quadra senza corrispondente -unmatched.bracket=graffa senza corrispondente -unmatched.paren=parentesi senza corrispondente -interval.no.end=la fine d''intervallo è imprevista -class.no.end=la fine della classe di caratteri è imprevista -subexpr.no.end=la fine del sub-espressione è imprevista -interval.order=il valore minimo d''intervallo è piú grande del suo valore massimo -interval.error=l''intervallo è vuoto o contiene caratteri impermessibili -# Non so come si dice "backslash" in italiano. -ends.with.backslash=il modello finisce con un backslash (il carattere "\") - -# RESyntax message -syntax.final=La sintassi è dichiarata "final" (finale) e non si può modificarla -- cgit v1.2.3