db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kahat...@apache.org
Subject svn commit: r1033977 [1/4] - in /db/derby/code/trunk: ./ java/build/org/apache/derbyBuild/ java/drda/org/apache/derby/loc/drda/ java/engine/org/apache/derby/loc/ java/testing/org/apache/derbyTesting/functionTests/master/ java/testing/org/apache/derbyTe...
Date Thu, 11 Nov 2010 16:06:40 GMT
Author: kahatlen
Date: Thu Nov 11 16:06:38 2010
New Revision: 1033977

URL: http://svn.apache.org/viewvc?rev=1033977&view=rev
Log:
DERBY-4796: Missing escape for apostrophes in many messages

- Made LocalizedResource use java.text.MessageFormat for all messages,
  including those with no parameters, for orthogonality.

- Changed messages in java/tools and java/drda to consistently use two
  single-quote characters to produce a single apostrophe in the
  message text.

- Fixed invalid parameter marker in one of the Italian messages in
  java/engine.

- Updated test canons to expect the new output.

- Added a class that runs at build time and verifies the format of all
  the messages.

Added:
    db/derby/code/trunk/java/build/org/apache/derbyBuild/MessageVetter.java   (with props)
Modified:
    db/derby/code/trunk/build.xml
    db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_cs.properties
    db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_de_DE.properties
    db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_en.properties
    db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_es.properties
    db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_fr.properties
    db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_hu.properties
    db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_it.properties
    db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_ja_JP.properties
    db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_ko_KR.properties
    db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_pl.properties
    db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_pt_BR.properties
    db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_ru.properties
    db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_zh_CN.properties
    db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_zh_TW.properties
    db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_it.properties
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/derbyrunjartest.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NetworkServerControlApiTest.java
    db/derby/code/trunk/java/tools/org/apache/derby/iapi/tools/i18n/LocalizedResource.java
    db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages.properties
    db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_cs.properties
    db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_de_DE.properties
    db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_es.properties
    db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_fr.properties
    db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_hu.properties
    db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_it.properties
    db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_ja_JP.properties
    db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_ko_KR.properties
    db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_pl.properties
    db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_pt_BR.properties
    db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_ru.properties
    db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_zh_CN.properties
    db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_zh_TW.properties

Modified: db/derby/code/trunk/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/build.xml?rev=1033977&r1=1033976&r2=1033977&view=diff
==============================================================================
--- db/derby/code/trunk/build.xml (original)
+++ db/derby/code/trunk/build.xml Thu Nov 11 16:06:38 2010
@@ -399,7 +399,9 @@
 <!--                           Build Locale info                          -->
 <!-- ==================================================================== -->
 
-  <target name="localeinfo" depends="checklocaleinfo" unless="localeinfo.available">
+  <target name="localeinfo"
+          depends="checklocaleinfo,checkmessages"
+          unless="localeinfo.available">
 
     <antcall target="buildlocaleinfo">
       <param name="locale.iname" value="cs"/>
@@ -517,6 +519,15 @@
     <delete file="${out.dir}/org/apache/derby/info/locale_zh_TW.properties"/>
   </target>
 
+  <target name="checkmessages">
+    <java classname="org.apache.derbyBuild.MessageVetter"
+          classpath="${out.dir}"
+          failonerror="true">
+      <arg file="${out.dir}/org/apache/derby/loc"/>
+      <arg file="${out.dir}/org/apache/derby/loc/drda"/>
+    </java>
+  </target>
+
 <!-- ==================================================================== -->
 <!--                   Derby Engine build target                     -->
 <!-- ==================================================================== -->

Added: db/derby/code/trunk/java/build/org/apache/derbyBuild/MessageVetter.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/build/org/apache/derbyBuild/MessageVetter.java?rev=1033977&view=auto
==============================================================================
--- db/derby/code/trunk/java/build/org/apache/derbyBuild/MessageVetter.java (added)
+++ db/derby/code/trunk/java/build/org/apache/derbyBuild/MessageVetter.java Thu Nov 11 16:06:38 2010
@@ -0,0 +1,195 @@
+/*
+
+   Derby - Class org.apache.derbyBuild.MessageVetter
+
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+ */
+
+package org.apache.derbyBuild;
+
+import java.io.File;
+import java.io.FileFilter;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.text.MessageFormat;
+import java.util.Enumeration;
+import java.util.HashSet;
+import java.util.Properties;
+import java.util.Set;
+import java.util.regex.Pattern;
+
+/**
+ * Class that checks the message files for common problems.
+ */
+public class MessageVetter {
+
+    /**
+     * <p>
+     * Check all the message translations in the specified directories for
+     * common problems. Assume that all properties files in the directories
+     * are message translations.
+     * </p>
+     *
+     * <p>
+     * If a problem is found, an error will be raised.
+     * </p>
+     *
+     * @param args names of the directories to check
+     */
+    public static void main(String[] args) throws IOException {
+        FileFilter filter = new FileFilter() {
+            public boolean accept(File pathname) {
+                return pathname.getName().endsWith(".properties");
+            }
+        };
+        for (String directory : args) {
+            for (File file : new File(directory).listFiles(filter)) {
+                new MessageVetter(file).vet();
+            }
+        }
+    }
+
+    /**
+     * A regular expression that matches a single-quote character that is
+     * neither preceeded nor followed by another single-quote character. Used
+     * by {@link #checkSingleQuotes(java.lang.String, java.lang.String)} to
+     * verify that messages contain two single-quotes in order to produce a
+     * single apostrophe (dictated by {@code java.text.MessageFormat}).
+     */
+    private static final Pattern LONE_QUOTE_PATTERN =
+            Pattern.compile("^'[^']|[^']'[^']|[^']'$");
+
+    /**
+     * A regular expression that matches a single-quote character that have
+     * no adjacent single-quote or curly brace character. Used by
+     * {@link #checkSingleQuotes(java.lang.String, java.lang.String)} to
+     * verify that all single-quotes are either correctly formatted apostrophes
+     * or used for quoting curly braces, as required by
+     * {@code java.text.MessageFormat}.
+     */
+    private static final Pattern LONE_QUOTE_ALLOWED_PATTERN =
+            Pattern.compile("^'[^'{}]|[^'{}]'[^'{}]|[^'{}]'$");
+
+    /**
+     * A set of message identifiers in whose messages single-quotes may legally
+     * appear with no adjacent single-quote character. This will be messages
+     * where the single-quotes are needed to quote curly braces that should
+     * appear literally in the message text.
+     */
+    private static final Set<String> LONE_QUOTE_ALLOWED = new HashSet<String>();
+    static {
+        // The IJ help text contains curly braces that need quoting.
+        LONE_QUOTE_ALLOWED.add("IJ_HelpText");
+        // Some of the DRDA usage messages contain the text {on|off}, which
+        // needs quoting.
+        LONE_QUOTE_ALLOWED.add("DRDA_Usage8.I");
+        LONE_QUOTE_ALLOWED.add("DRDA_Usage11.I");
+    }
+
+    /** The message file to check. */
+    private final File file;
+
+    /** The properties found in the message file. */
+    private final Properties properties;
+
+    /**
+     * Create a new {@code MessageVetter} instance.
+     *
+     * @param file the file with the messages to check
+     * @throws IOException if the file cannot be loaded
+     */
+    private MessageVetter(File file) throws IOException {
+        this.file = file;
+        properties = new Properties();
+        properties.load(new FileInputStream(file));
+    }
+
+    /**
+     * Vet the messages in this file. An error will be raised if an
+     * ill-formatted message is found.
+     */
+    private void vet() {
+        Enumeration e = properties.propertyNames();
+        while (e.hasMoreElements()) {
+            String key = (String) e.nextElement();
+            String message = properties.getProperty(key);
+            vetMessage(key, message);
+        }
+    }
+
+    /**
+     * Vet a specific message. Raise an error if it is not well-formed.
+     *
+     * @param key the message identifier
+     * @param message the message format specifier
+     */
+    private void vetMessage(String key, String message) {
+        checkSingleQuotes(key, message);
+        checkValidMessageFormat(key, message);
+    }
+
+    /**
+     * Check that single-quote characters are doubled, as required by
+     * {@code java.text.MessageFormat}. Raise an error otherwise.
+     *
+     * @param key the message identifier
+     * @param message the message format specifier
+     */
+    private void checkSingleQuotes(String key, String message) {
+        Pattern p;
+
+        if (LONE_QUOTE_ALLOWED.contains(key)) {
+            // In some messages we allow lone single-quote characters, but
+            // only if they are used to quote curly braces. Use a regular
+            // expression that finds all single-quotes that aren't adjacent to
+            // another single-quote or a curly brace character.
+            p = LONE_QUOTE_ALLOWED_PATTERN;
+        } else {
+            // Otherwise, we don't allow lone single-quote characters at all.
+            p = LONE_QUOTE_PATTERN;
+        }
+
+        if (p.matcher(message).find()) {
+            throw new AssertionError("Lone single-quote in message " + key +
+                    " in " + file + ".\nThis is OK if it is used for quoting " +
+                    "special characters in the message. If this is what the " +
+                    "character is used for, add an exception in " +
+                    getClass().getName() + ".LONE_QUOTE_ALLOWED.");
+        }
+    }
+
+    /**
+     * Check that a message format specifier is valid. Raise an error if it
+     * is not.
+     *
+     * @param key the message identifier
+     * @param message the message format specifier
+     */
+    private void checkValidMessageFormat(String key, String message) {
+        try {
+            // See if a MessageFormat instance can be produced based on this
+            // message format specifier.
+            new MessageFormat(message);
+        } catch (Exception e) {
+            AssertionError ae = new AssertionError(
+                    "Message " + key + " in " + file + " isn't a valid " +
+                    "java.text.MessageFormat pattern.");
+            ae.initCause(e);
+            throw ae;
+        }
+    }
+}

Propchange: db/derby/code/trunk/java/build/org/apache/derbyBuild/MessageVetter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_cs.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_cs.properties?rev=1033977&r1=1033976&r2=1033977&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_cs.properties (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_cs.properties Thu Nov 11 16:06:38 2010
@@ -112,14 +112,8 @@ DRDA_Usage4.I=shutdown [-h <hostitel>][-
 DRDA_Usage5.I=ping [-h <hostitel>][-p <\u010d\u00edsloportu>]
 DRDA_Usage6.I=sysinfo [-h <hostitel>][-p <\u010d\u00edsloportu>]
 DRDA_Usage7.I=runtimeinfo [-h <hostitel>][-p <\u010d\u00edsloportu>]
-DRDA_Usage8.I=logconnections {on|off}[-h <hostitel>][-p <\u010d\u00edsloportu>]
+DRDA_Usage8.I=logconnections '{on|off}' [-h <hostitel>][-p <\u010d\u00edsloportu>]
 DRDA_Usage9.I=maxthreads <maximum>[-h <hostitel>][-p <\u010d\u00edsloportu>]
 DRDA_Usage10.I=timeslice <milisekundy>[-h <hostitel>][-p <\u010d\u00edsloportu>]
-DRDA_Usage11.I=trace {on|off}[-s <IDrelace>][-h <hostitel>][-p <\u010d\u00edsloportu>]
+DRDA_Usage11.I=trace '{on|off}' [-s <IDrelace>][-h <hostitel>][-p <\u010d\u00edsloportu>]
 DRDA_Usage12.I=tracedirectory <adres\u00e1\u0159trasov\u00e1n\u00ed>[-h <hostitel>][-p <\u010d\u00edsloportu>]
-
-
-
-
-
-

Modified: db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_de_DE.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_de_DE.properties?rev=1033977&r1=1033976&r2=1033977&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_de_DE.properties (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_de_DE.properties Thu Nov 11 16:06:38 2010
@@ -100,7 +100,7 @@ DRDA_UnknownHostWarning.I=Warnung\: Unkn
 DRDA_UnknownProtocol=Unbekannte Befehlsprotokollversion\: {0}.
 DRDA_Usage1.I=Syntax\: NetworkServerControl <Befehle> 
 DRDA_Usage10.I=timeslice <Millisekunden>[-h <Host>][-p <Portnummer>] [-ssl <SSL-Modus>]
-DRDA_Usage11.I=trace {on|off} [-s <Sitzungs-ID>][-h <Host>][-p <Portnummer>] [-ssl <SSL-Modus>]
+DRDA_Usage11.I=trace '{on|off}' [-s <Sitzungs-ID>][-h <Host>][-p <Portnummer>] [-ssl <SSL-Modus>]
 DRDA_Usage12.I=tracedirectory <Trace-Verzeichnis>[-h <Host>][-p <Portnummer>] [-ssl <SSL-Modus>]
 DRDA_Usage2.I=Befehle\:
 DRDA_Usage3.I=start [-h <Host>] [-p <Portnummer>] [-noSecurityManager] [-ssl <SSL-Modus>]
@@ -108,6 +108,6 @@ DRDA_Usage4.I=shutdown [-h <Host>][-p <P
 DRDA_Usage5.I=ping [-h <Host>][-p <Portnummer>] [-ssl <SSL-Modus>]
 DRDA_Usage6.I=sysinfo [-h <Host>][-p <Portnummer>] [-ssl <SSL-Modus>]
 DRDA_Usage7.I=runtimeinfo [-h <Host>][-p <Portnummer>] [-ssl <SSL-Modus>]
-DRDA_Usage8.I=logconnections {on|off}[-h <Host>][-p <Portnummer>] [-ssl <SSL-Modus>]
+DRDA_Usage8.I=logconnections '{on|off}' [-h <Host>][-p <Portnummer>] [-ssl <SSL-Modus>]
 DRDA_Usage9.I=maxthreads <max>[-h <Host>][-p <Portnummer>] [-ssl <SSL-Modus>]
 DRDA_User.I=Benutzer

Modified: db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_en.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_en.properties?rev=1033977&r1=1033976&r2=1033977&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_en.properties (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_en.properties Thu Nov 11 16:06:38 2010
@@ -84,7 +84,7 @@ DRDA_IOException.S=IOException: {0}.
 DRDA_UnknownProtocol=Unknown Command Protocol version: {0}.
 DRDA_MissingLocale.I=Resources not found for current locale; switching to {0}.
 DRDA_MissingNetworkJar.S=Cannot find derbynet.jar on the classpath.
-DRDA_NoAuthentication.S=Network Server startup failed. User authentication must be enabled before the Network Server installs a security manager. You must either enable user authentication or disable the installation of a security manager. For information on enabling user authentication, see the section of the Derby Developer's Guide entitled "Working with user authentication". Disabling the installation of a security manager is strongly discouraged in a client/server environment. However, if you must do this, you can disable the installation of a security manager by specifying the "-noSecurityManager" command line option when you bring up the Network Server.
+DRDA_NoAuthentication.S=Network Server startup failed. User authentication must be enabled before the Network Server installs a security manager. You must either enable user authentication or disable the installation of a security manager. For information on enabling user authentication, see the section of the Derby Developer''s Guide entitled "Working with user authentication". Disabling the installation of a security manager is strongly discouraged in a client/server environment. However, if you must do this, you can disable the installation of a security manager by specifying the "-noSecurityManager" command line option when you bring up the Network Server.
 DRDA_SecurityInstalled.I=Security manager installed using the Basic server security policy.
 
 # Derby Network Server SYSINFO stuff
@@ -119,14 +119,8 @@ DRDA_Usage4.I=shutdown [-h <host>][-p <p
 DRDA_Usage5.I=ping [-h <host>][-p <portnumber>] [-ssl <sslmode>]
 DRDA_Usage6.I=sysinfo [-h <host>][-p <portnumber>] [-ssl <sslmode>]
 DRDA_Usage7.I=runtimeinfo [-h <host>][-p <portnumber>] [-ssl <sslmode>]
-DRDA_Usage8.I=logconnections {on|off}[-h <host>][-p <portnumber>] [-ssl <sslmode>]
+DRDA_Usage8.I=logconnections '{on|off}' [-h <host>][-p <portnumber>] [-ssl <sslmode>]
 DRDA_Usage9.I=maxthreads <max>[-h <host>][-p <portnumber>] [-ssl <sslmode>]
 DRDA_Usage10.I=timeslice <milliseconds>[-h <host>][-p <portnumber>] [-ssl <sslmode>]
-DRDA_Usage11.I=trace {on|off} [-s <session id>][-h <host>][-p <portnumber>] [-ssl <sslmode>]
+DRDA_Usage11.I=trace '{on|off}' [-s <session id>][-h <host>][-p <portnumber>] [-ssl <sslmode>]
 DRDA_Usage12.I=tracedirectory <traceDirectory>[-h <host>][-p <portnumber>] [-ssl <sslmode>]
-
-
-
-
-
-

Modified: db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_es.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_es.properties?rev=1033977&r1=1033976&r2=1033977&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_es.properties (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_es.properties Thu Nov 11 16:06:38 2010
@@ -100,7 +100,7 @@ DRDA_UnknownHostWarning.I=Aviso\: Unknko
 DRDA_UnknownProtocol=Versi\u00F3n de protocolo de mandatos desconocida\: {0}.
 DRDA_Usage1.I=Uso\: NetworkServerControl <mandatos> 
 DRDA_Usage10.I=timeslice <milisegundos>[-h <sistema>][-p <n\u00FAmeropuerto>] [-ssl <modossl>]
-DRDA_Usage11.I=trace {on|off} [-s <id de sesi\u00F3n>][-h <sistema>][-p <n\u00FAmeropuerto>] [-ssl <modossl>]
+DRDA_Usage11.I=trace '{on|off}' [-s <id de sesi\u00F3n>][-h <sistema>][-p <n\u00FAmeropuerto>] [-ssl <modossl>]
 DRDA_Usage12.I=tracedirectory <Directorioseguimiento>[-h <sistema>][-p <n\u00FAmeropuerto>] [-ssl <modossl>]
 DRDA_Usage2.I=Mandatos\:
 DRDA_Usage3.I=start [-h <sistema>] [-p <n\u00FAmeropuerto>] [-noSecurityManager] [-ssl <modossl>]
@@ -108,6 +108,6 @@ DRDA_Usage4.I=shutdown [-h <host>][-p <n
 DRDA_Usage5.I=ping [-h <sistema>][-p <n\u00FAmeropuerto>] [-ssl <modossl>]
 DRDA_Usage6.I=sysinfo [-h <sistema>][-p <n\u00FAmeropuerto>] [-ssl <modossl>]
 DRDA_Usage7.I=runtimeinfo [-h <sistema>][-p <n\u00FAmeropuerto>] [-ssl <modossl>]
-DRDA_Usage8.I=logconnections {on|off}[-h <sistema>][-p <n\u00FAmeropuerto>] [-ssl <modossl>]
+DRDA_Usage8.I=logconnections '{on|off}' [-h <sistema>][-p <n\u00FAmeropuerto>] [-ssl <modossl>]
 DRDA_Usage9.I=maxthreads <m\u00E1ximo>[-h <sistema>][-p <n\u00FAmeropuerto>] [-ssl <modossl>]
 DRDA_User.I=usuario

Modified: db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_fr.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_fr.properties?rev=1033977&r1=1033976&r2=1033977&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_fr.properties (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_fr.properties Thu Nov 11 16:06:38 2010
@@ -34,7 +34,7 @@ DRDA_InvalidReplyHeader2.S=En-t\u00EAte 
 DRDA_InvalidReplyTooShort.S=En-t\u00EAte de r\u00E9ponse non valide du serveur de r\u00E9seau \: donn\u00E9es insuffisantes.
 DRDA_InvalidValue.U=Valeur non valide, {0}, pour {1}.
 DRDA_ListenPort.S=Impossible d''\u00E9couter sur le port {0}, sur l''h\u00F4te {1} \:\n {2}
-DRDA_ListenerClose.S=Impossible de fermer l'unit\u00E9 d'ex\u00E9cution du programme d'\u00E9coute.
+DRDA_ListenerClose.S=Impossible de fermer l''unit\u00E9 d''ex\u00E9cution du programme d''\u00E9coute.
 DRDA_LoadException.S=Exception inattendue lors du chargement du pilote JDBC Derby \:\n {0}
 DRDA_LogConnectionsChange.I=Nouvelles connexions au journal \: {0}.
 DRDA_MaxThreadsChange.I=Nouveau nombre maximal d''unit\u00E9s d''ex\u00E9cution \: {0}.
@@ -100,7 +100,7 @@ DRDA_UnknownHostWarning.I=Avertissement 
 DRDA_UnknownProtocol=Version du protocole de commande inconnue \: {0}.
 DRDA_Usage1.I=Syntaxe \: NetworkServerControl <commandes> 
 DRDA_Usage10.I=timeslice <millisecondes>[-h <h\u00F4te>][-p <num\u00E9ro_port>] [-ssl <mode_ssl>]
-DRDA_Usage11.I=trace {on|off} [-s <id_session>][-h <h\u00F4te>][-p <num\u00E9ro_port>] [-ssl <mode_ssl>]
+DRDA_Usage11.I=trace '{on|off}' [-s <id_session>][-h <h\u00F4te>][-p <num\u00E9ro_port>] [-ssl <mode_ssl>]
 DRDA_Usage12.I=tracedirectory <r\u00E9pertoire_suivi>[-h <h\u00F4te>][-p <num\u00E9ro_port>] [-ssl <mode_ssl>]
 DRDA_Usage2.I=Commandes \:
 DRDA_Usage3.I=start [-h <h\u00F4te>] [-p <num\u00E9ro_port>] [-noSecurityManager] [-ssl <mode_ssl>]
@@ -108,6 +108,6 @@ DRDA_Usage4.I=shutdown [-h <h\u00F4te>][
 DRDA_Usage5.I=ping [-h <h\u00F4te>][-p <num\u00E9ro_port>] [-ssl <mode_ssl>]
 DRDA_Usage6.I=sysinfo [-h <h\u00F4te>][-p <num\u00E9ro_port>] [-ssl <mode_ssl>]
 DRDA_Usage7.I=runtimeinfo [-h <h\u00F4te>][-p <num\u00E9ro_port>] [-ssl <mode_ssl>]
-DRDA_Usage8.I=logconnections {on|off}[-h <h\u00F4te>][-p <num\u00E9ro_port>] [-ssl <mode_ssl>]
+DRDA_Usage8.I=logconnections '{on|off}' [-h <h\u00F4te>][-p <num\u00E9ro_port>] [-ssl <mode_ssl>]
 DRDA_Usage9.I=maxthreads <max>[-h <h\u00F4te>][-p <num\u00E9ro_port>] [-ssl <mode_ssl>]
 DRDA_User.I=utilisateur

Modified: db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_hu.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_hu.properties?rev=1033977&r1=1033976&r2=1033977&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_hu.properties (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_hu.properties Thu Nov 11 16:06:38 2010
@@ -112,14 +112,8 @@ DRDA_Usage4.I=shutdown [-h <hoszt>][-p <
 DRDA_Usage5.I=ping [-h <hoszt>][-p <portsz\u00e1m>]
 DRDA_Usage6.I=sysinfo [-h <hoszt>][-p <portsz\u00e1m>]
 DRDA_Usage7.I=runtimeinfo [-h <hoszt>][-p <portsz\u00e1m>]
-DRDA_Usage8.I=logconnections {on|off}[-h <hoszt>][-p <portsz\u00e1m>]
+DRDA_Usage8.I=logconnections '{on|off}' [-h <hoszt>][-p <portsz\u00e1m>]
 DRDA_Usage9.I=maxthreads <max>[-h <hoszt>][-p <portsz\u00e1m>]
 DRDA_Usage10.I=timeslice <milliseconds>[-h <hoszt>][-p <portsz\u00e1m>]
-DRDA_Usage11.I=trace {on|off} [-s <munkamenet-azonos\u00edt\u00f3>][-h <hoszt>][-p <portsz\u00e1m>]
+DRDA_Usage11.I=trace '{on|off}' [-s <munkamenet-azonos\u00edt\u00f3>][-h <hoszt>][-p <portsz\u00e1m>]
 DRDA_Usage12.I=tracedirectory <nyomk\u00f6vet\u00e9si k\u00f6nyvt\u00e1r>[-h <hoszt>][-p <portsz\u00e1m>]
-
-
-
-
-
-

Modified: db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_it.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_it.properties?rev=1033977&r1=1033976&r2=1033977&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_it.properties (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_it.properties Thu Nov 11 16:06:38 2010
@@ -66,7 +66,7 @@ DRDA_RuntimeInfoNumActiveSessions.I=N. s
 DRDA_RuntimeInfoNumStatements.I=N. istruzioni\:
 DRDA_RuntimeInfoNumThreads.I=N. thread di collegamento \: 
 DRDA_RuntimeInfoNumWaitingSessions.I=N. sessioni in attesa \: 
-DRDA_RuntimeInfoPreparedStatementHeader.I=Informazioni sull'istruzione preparata\: \n\tID Stmt\t\tSQLText\n\t-------------\t-----------\n
+DRDA_RuntimeInfoPreparedStatementHeader.I=Informazioni sull''istruzione preparata\: \n\tID Stmt\t\tSQLText\n\t-------------\t-----------\n
 DRDA_RuntimeInfoSessionBanner.I=---------- Informazioni di sessione ---------------
 DRDA_RuntimeInfoSessionNumber.I=N. sessioni \:
 DRDA_RuntimeInfoTotalMemory.I=Memoria totale \: 
@@ -100,7 +100,7 @@ DRDA_UnknownHostWarning.I=Avvertenza\: U
 DRDA_UnknownProtocol=Versione del protocollo di comando\: {0} sconosciuto.
 DRDA_Usage1.I=Uso\: NetworkServerControl <comandi> 
 DRDA_Usage10.I=timeslice <millisecondi>[-h <host>][-p <numeroporta>] [-ssl <mod_sll>]
-DRDA_Usage11.I=trace {on|off} [-s <id sessione>][-h <host>][-p <numeroporta>] [-ssl <mod_ssl>]
+DRDA_Usage11.I=trace '{on|off}' [-s <id sessione>][-h <host>][-p <numeroporta>] [-ssl <mod_ssl>]
 DRDA_Usage12.I=tracedirectory <directory_traccia>[-h <host>][-p <numeroporta>] [-ssl <mod_ssl>]
 DRDA_Usage2.I=Comandi\:
 DRDA_Usage3.I=start [-h <host>] [-p <numeroporta>] [-noSecurityManager] [-ssl <mod_ssl>]
@@ -108,6 +108,6 @@ DRDA_Usage4.I=shutdown [-h <host>][-p <n
 DRDA_Usage5.I=ping [-h <host>][-p <numeroporta>] [-ssl <mod_ssl>]
 DRDA_Usage6.I=sysinfo [-h <host>][-p <numeroporta>] [-ssl <mod_ssl>]
 DRDA_Usage7.I=runtimeinfo [-h <host>][-p <numeroporta>] [-ssl <mod_ssl>]
-DRDA_Usage8.I=logconnections {on|off}[-h <host>][-p <numeroporta>] [-ssl <mod_ssl>]
+DRDA_Usage8.I=logconnections '{on|off}' [-h <host>][-p <numeroporta>] [-ssl <mod_ssl>]
 DRDA_Usage9.I=maxthreads <max>[-h <host>][-p <numeroporta>] [-ssl <mod_ssl>]
 DRDA_User.I=utente

Modified: db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_ja_JP.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_ja_JP.properties?rev=1033977&r1=1033976&r2=1033977&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_ja_JP.properties (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_ja_JP.properties Thu Nov 11 16:06:38 2010
@@ -42,7 +42,7 @@ DRDA_MissingLocale.I=\u73FE\u884C\u30ED\
 DRDA_MissingNetworkJar.S=\u30AF\u30E9\u30B9\u30D1\u30B9\u306B derbynet.jar \u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002
 DRDA_MissingValue.U={0} \u306B\u5BFE\u3057\u3066\u5FC5\u8981\u306A\u5024\u304C\u3042\u308A\u307E\u305B\u3093\u3002
 DRDA_NeedLocalHost.S=\u30DB\u30B9\u30C8\: {0} \u304C {1} \u3067\u7A3C\u50CD\u4E2D\u306E\u30B5\u30FC\u30D0\u30FC\u306B\u5BFE\u3057\u3066\u30ED\u30FC\u30AB\u30EB\u3067\u306F\u306A\u3044\u305F\u3081\u3001NetworkServerControl \u30B3\u30DE\u30F3\u30C9\u306B\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002  
-DRDA_NoAuthentication.S=\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u30B5\u30FC\u30D0\u30FC\u306E\u8D77\u52D5\u306B\u5931\u6557\u3057\u307E\u3057\u305F\u3002 \u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u30B5\u30FC\u30D0\u30FC\u3067\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u30FC\u30DE\u30CD\u30FC\u30B8\u30E3\u30FC\u3092\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3059\u308B\u524D\u306B\u3001\u30E6\u30FC\u30B6\u30FC\u8A8D\u8A3C\u3092\u6709\u52B9\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002 \u30E6\u30FC\u30B6\u30FC\u8A8D\u8A3C\u3092\u6709\u52B9\u306B\u3059\u308B\u304B\u3001\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u30FC\u30DE\u30CD\u30FC\u30B8\u30E3\u30FC\u306E\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3092\u7121\u52B9\u306B\u3057\u3066\u304F\u3060\u3055\u3044\u3002 \u30E6\u30FC\u30B6\u30FC\u8A8D\u8A3C\u3092\u6709\u52B9\u306B\u3059\u308B\u624B\u9806\u306B\u3064\u3044\u3066\u306F\u3001\u300EDerby Developer's Guide\u300F\u306E\u300CWorking with user authentication\u300D\u306E\u30BB\u30AF\u30B7\
 u30E7\u30F3\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\u3002 \u30AF\u30E9\u30A4\u30A2\u30F3\u30C8/\u30B5\u30FC\u30D0\u30FC\u74B0\u5883\u3067\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u30FC\u30DE\u30CD\u30FC\u30B8\u30E3\u30FC\u306E\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3092\u7121\u52B9\u306B\u3059\u308B\u3053\u3068\u306F\u3001\u3067\u304D\u308B\u304B\u304E\u308A\u907F\u3051\u3066\u304F\u3060\u3055\u3044\u3002 \u3069\u3046\u3057\u3066\u3082\u7121\u52B9\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308B\u5834\u5408\u306F\u3001\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u30B5\u30FC\u30D0\u30FC\u306E\u8D77\u52D5\u6642\u306B\u30B3\u30DE\u30F3\u30C9\u884C\u30AA\u30D7\u30B7\u30E7\u30F3 "-noSecurityManager" \u3092\u6307\u5B9A\u3057\u3066\u3001\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u30FC\u30DE\u30CD\u30FC\u30B8\u30E3\u30FC\u306E\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3092\u7121\u52B9\u306B\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002
+DRDA_NoAuthentication.S=\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u30B5\u30FC\u30D0\u30FC\u306E\u8D77\u52D5\u306B\u5931\u6557\u3057\u307E\u3057\u305F\u3002 \u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u30B5\u30FC\u30D0\u30FC\u3067\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u30FC\u30DE\u30CD\u30FC\u30B8\u30E3\u30FC\u3092\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3059\u308B\u524D\u306B\u3001\u30E6\u30FC\u30B6\u30FC\u8A8D\u8A3C\u3092\u6709\u52B9\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002 \u30E6\u30FC\u30B6\u30FC\u8A8D\u8A3C\u3092\u6709\u52B9\u306B\u3059\u308B\u304B\u3001\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u30FC\u30DE\u30CD\u30FC\u30B8\u30E3\u30FC\u306E\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3092\u7121\u52B9\u306B\u3057\u3066\u304F\u3060\u3055\u3044\u3002 \u30E6\u30FC\u30B6\u30FC\u8A8D\u8A3C\u3092\u6709\u52B9\u306B\u3059\u308B\u624B\u9806\u306B\u3064\u3044\u3066\u306F\u3001\u300EDerby Developer''s Guide\u300F\u306E\u300CWorking with user authentication\u300D\u306E\u30BB\u30AF\u30B7
 \u30E7\u30F3\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\u3002 \u30AF\u30E9\u30A4\u30A2\u30F3\u30C8/\u30B5\u30FC\u30D0\u30FC\u74B0\u5883\u3067\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u30FC\u30DE\u30CD\u30FC\u30B8\u30E3\u30FC\u306E\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3092\u7121\u52B9\u306B\u3059\u308B\u3053\u3068\u306F\u3001\u3067\u304D\u308B\u304B\u304E\u308A\u907F\u3051\u3066\u304F\u3060\u3055\u3044\u3002 \u3069\u3046\u3057\u3066\u3082\u7121\u52B9\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308B\u5834\u5408\u306F\u3001\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u30B5\u30FC\u30D0\u30FC\u306E\u8D77\u52D5\u6642\u306B\u30B3\u30DE\u30F3\u30C9\u884C\u30AA\u30D7\u30B7\u30E7\u30F3 "-noSecurityManager" \u3092\u6307\u5B9A\u3057\u3066\u3001\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u30FC\u30DE\u30CD\u30FC\u30B8\u30E3\u30FC\u306E\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3092\u7121\u52B9\u306B\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002
 DRDA_NoCommand.U=\u30B3\u30DE\u30F3\u30C9\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
 DRDA_NoIO.S=\u30DB\u30B9\u30C8 {0}\u3001\u30DD\u30FC\u30C8 {1} \u306E Derby Network Server \u306B\u63A5\u7D9A\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\: {2}
 DRDA_NoInputStream.S=\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8\u30FB\u30BD\u30B1\u30C3\u30C8\u306E\u5165\u529B\u30B9\u30C8\u30EA\u30FC\u30E0\u3092\u53D6\u5F97\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002
@@ -100,7 +100,7 @@ DRDA_UnknownHostWarning.I=\u8B66\u544A\:
 DRDA_UnknownProtocol=\u7121\u52B9\u306A\u30B3\u30DE\u30F3\u30C9\u30FB\u30D7\u30ED\u30C8\u30B3\u30EB\u7248\u756A\u53F7\: {0}\u3002
 DRDA_Usage1.I=\u4F7F\u7528\u6CD5\: NetworkServerControl <\u30B3\u30DE\u30F3\u30C9> 
 DRDA_Usage10.I=timeslice <\u30DF\u30EA\u79D2>[-h <\u30DB\u30B9\u30C8>][-p <\u30DD\u30FC\u30C8\u756A\u53F7>] [-ssl <SSL \u30E2\u30FC\u30C9>]
-DRDA_Usage11.I=trace {on|off} [-s <\u30BB\u30C3\u30B7\u30E7\u30F3 ID>][-h <\u30DB\u30B9\u30C8>][-p <\u30DD\u30FC\u30C8\u756A\u53F7>] [-ssl <SSL \u30E2\u30FC\u30C9>]
+DRDA_Usage11.I=trace '{on|off}' [-s <\u30BB\u30C3\u30B7\u30E7\u30F3 ID>][-h <\u30DB\u30B9\u30C8>][-p <\u30DD\u30FC\u30C8\u756A\u53F7>] [-ssl <SSL \u30E2\u30FC\u30C9>]
 DRDA_Usage12.I=tracedirectory <\u30C8\u30EC\u30FC\u30B9\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA>[-h <\u30DB\u30B9\u30C8>][-p <\u30DD\u30FC\u30C8\u756A\u53F7>] [-ssl <SSL \u30E2\u30FC\u30C9>]
 DRDA_Usage2.I=\u30B3\u30DE\u30F3\u30C9\:
 DRDA_Usage3.I=start [-h <\u30DB\u30B9\u30C8>] [-p <\u30DD\u30FC\u30C8\u756A\u53F7>] [-noSecurityManager] [-ssl <SSL \u30E2\u30FC\u30C9>]
@@ -108,6 +108,6 @@ DRDA_Usage4.I=shutdown [-h <\u30DB\u30B9
 DRDA_Usage5.I=ping [-h <\u30DB\u30B9\u30C8>][-p <\u30DD\u30FC\u30C8\u756A\u53F7>] [-ssl <SSL \u30E2\u30FC\u30C9>]
 DRDA_Usage6.I=sysinfo [-h <\u30DB\u30B9\u30C8>][-p <\u30DD\u30FC\u30C8\u756A\u53F7>] [-ssl <SSL \u30E2\u30FC\u30C9>]
 DRDA_Usage7.I=runtimeinfo [-h <\u30DB\u30B9\u30C8>][-p <\u30DD\u30FC\u30C8\u756A\u53F7>] [-ssl <SSL \u30E2\u30FC\u30C9>]
-DRDA_Usage8.I=logconnections {on|off}[-h <\u30DB\u30B9\u30C8>][-p <\u30DD\u30FC\u30C8\u756A\u53F7>] [-ssl <SSL \u30E2\u30FC\u30C9>]
+DRDA_Usage8.I=logconnections '{on|off}' [-h <\u30DB\u30B9\u30C8>][-p <\u30DD\u30FC\u30C8\u756A\u53F7>] [-ssl <SSL \u30E2\u30FC\u30C9>]
 DRDA_Usage9.I=maxthreads <\u6700\u5927\u6570>[-h <\u30DB\u30B9\u30C8>][-p <\u30DD\u30FC\u30C8\u756A\u53F7>] [-ssl <SSL \u30E2\u30FC\u30C9>]
 DRDA_User.I=\u30E6\u30FC\u30B6\u30FC

Modified: db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_ko_KR.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_ko_KR.properties?rev=1033977&r1=1033976&r2=1033977&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_ko_KR.properties (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_ko_KR.properties Thu Nov 11 16:06:38 2010
@@ -42,7 +42,7 @@ DRDA_MissingLocale.I=\uD604\uC7AC \uB85C
 DRDA_MissingNetworkJar.S=\uD074\uB798\uC2A4 \uACBD\uB85C\uC5D0\uC11C derbynet.jar\uC744 \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
 DRDA_MissingValue.U={0}\uC5D0 \uB300\uD55C \uD544\uC218 \uAC12\uC774 \uB204\uB77D\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
 DRDA_NeedLocalHost.S=\uD638\uC2A4\uD2B8\: {0}\uC774(\uAC00) {1}\uC5D0\uC11C \uC2E4\uD589 \uC911\uC778 \uC11C\uBC84\uC5D0 \uB300\uD55C \uB85C\uCEEC\uC774 \uC544\uB2C8\uBBC0\uB85C, NetworkServerControl \uBA85\uB839\uC5D0 \uC0AC\uC6A9\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
-DRDA_NoAuthentication.S=\uB124\uD2B8\uC6CC\uD06C \uC11C\uBC84 \uC2DC\uC791\uC5D0 \uC2E4\uD328\uD588\uC2B5\uB2C8\uB2E4. \uB124\uD2B8\uC6CC\uD06C \uC11C\uBC84\uAC00 \uBCF4\uC548 \uAD00\uB9AC\uC790\uB97C \uC124\uCE58\uD558\uAE30 \uC804\uC5D0 \uC0AC\uC6A9\uC790 \uC778\uC99D\uC774 \uD65C\uC131\uD654\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4. \uC0AC\uC6A9\uC790 \uC778\uC99D\uC744 \uD65C\uC131\uD654\uD558\uAC70\uB098 \uBCF4\uC548 \uAD00\uB9AC\uC790 \uC124\uCE58\uB97C \uBE44\uD65C\uC131\uD654\uD574\uC57C \uD569\uB2C8\uB2E4. \uC0AC\uC6A9\uC790 \uC778\uC99D \uD65C\uC131\uD654\uC5D0 \uB300\uD55C \uB0B4\uC6A9\uC740 Derby Developer's Guide\uC5D0\uC11C "Working with user authentication" \uC808\uC744 \uCC38\uC870\uD558\uC2ED\uC2DC\uC624. \uD074\uB77C\uC774\uC5B8\uD2B8/\uC11C\uBC84 \uD658\uACBD\uC5D0\uC11C\uB294 \uBCF4\uC548 \uAD00\uB9AC\uC790 \uC124\uCE58\uB97C \uBE44\uD65C\uC131\uD654\uD558\uC9C0 \uC54A\uB294 \uAC83\uC774 \uC88B\uC2B5\uB2C8\uB2E4. \uADF8\uB7EC\uB098 \uBE44\uD65C\uC131\uD654\uD
 574\uC57C \uD558\uB294 \uACBD\uC6B0 \uB124\uD2B8\uC6CC\uD06C \uC11C\uBC84\uB97C \uC2DC\uB3D9\uD560 \uB54C "-noSecurityManager" \uBA85\uB839\uC904 \uC635\uC158\uC744 \uC9C0\uC815\uD558\uC5EC \uBCF4\uC548 \uAD00\uB9AC\uC790 \uC124\uCE58\uB97C \uBE44\uD65C\uC131\uD654\uD560 \uC218 \uC788\uC2B5\uB2C8\uB2E4.
+DRDA_NoAuthentication.S=\uB124\uD2B8\uC6CC\uD06C \uC11C\uBC84 \uC2DC\uC791\uC5D0 \uC2E4\uD328\uD588\uC2B5\uB2C8\uB2E4. \uB124\uD2B8\uC6CC\uD06C \uC11C\uBC84\uAC00 \uBCF4\uC548 \uAD00\uB9AC\uC790\uB97C \uC124\uCE58\uD558\uAE30 \uC804\uC5D0 \uC0AC\uC6A9\uC790 \uC778\uC99D\uC774 \uD65C\uC131\uD654\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4. \uC0AC\uC6A9\uC790 \uC778\uC99D\uC744 \uD65C\uC131\uD654\uD558\uAC70\uB098 \uBCF4\uC548 \uAD00\uB9AC\uC790 \uC124\uCE58\uB97C \uBE44\uD65C\uC131\uD654\uD574\uC57C \uD569\uB2C8\uB2E4. \uC0AC\uC6A9\uC790 \uC778\uC99D \uD65C\uC131\uD654\uC5D0 \uB300\uD55C \uB0B4\uC6A9\uC740 Derby Developer''s Guide\uC5D0\uC11C "Working with user authentication" \uC808\uC744 \uCC38\uC870\uD558\uC2ED\uC2DC\uC624. \uD074\uB77C\uC774\uC5B8\uD2B8/\uC11C\uBC84 \uD658\uACBD\uC5D0\uC11C\uB294 \uBCF4\uC548 \uAD00\uB9AC\uC790 \uC124\uCE58\uB97C \uBE44\uD65C\uC131\uD654\uD558\uC9C0 \uC54A\uB294 \uAC83\uC774 \uC88B\uC2B5\uB2C8\uB2E4. \uADF8\uB7EC\uB098 \uBE44\uD65C\uC131\uD654\u
 D574\uC57C \uD558\uB294 \uACBD\uC6B0 \uB124\uD2B8\uC6CC\uD06C \uC11C\uBC84\uB97C \uC2DC\uB3D9\uD560 \uB54C "-noSecurityManager" \uBA85\uB839\uC904 \uC635\uC158\uC744 \uC9C0\uC815\uD558\uC5EC \uBCF4\uC548 \uAD00\uB9AC\uC790 \uC124\uCE58\uB97C \uBE44\uD65C\uC131\uD654\uD560 \uC218 \uC788\uC2B5\uB2C8\uB2E4.
 DRDA_NoCommand.U=\uBA85\uB839\uC744 \uC9C0\uC815\uD558\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4.
 DRDA_NoIO.S=\uD638\uC2A4\uD2B8 {0}\uC758 \uD3EC\uD2B8 {1}\uC5D0\uC11C Derby \uB124\uD2B8\uC6CC\uD06C \uC11C\uBC84\uC5D0 \uC5F0\uACB0\uD560 \uC218 \uC5C6\uC74C\: {2}
 DRDA_NoInputStream.S=\uD074\uB77C\uC774\uC5B8\uD2B8 \uC18C\uCF13\uC5D0 \uB300\uD55C \uC785\uB825 \uC2A4\uD2B8\uB9BC\uC744 \uAC00\uC838\uC62C \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
@@ -100,7 +100,7 @@ DRDA_UnknownHostWarning.I=\uACBD\uACE0\:
 DRDA_UnknownProtocol=\uC54C \uC218 \uC5C6\uB294 \uBA85\uB839 \uD504\uB85C\uD1A0\uCF5C \uBC84\uC804\: {0}.
 DRDA_Usage1.I=\uC0AC\uC6A9\uBC95\: NetworkServerControl <commands> 
 DRDA_Usage10.I=timeslice <\uBC00\uB9AC\uCD08>[-h <\uD638\uC2A4\uD2B8>][-p <\uD3EC\uD2B8 \uBC88\uD638>] [-ssl <ssl \uBAA8\uB4DC>]
-DRDA_Usage11.I=trace {on|off} [-s <\uC138\uC158 id>][-h <\uD638\uC2A4\uD2B8>][-p <\uD3EC\uD2B8 \uBC88\uD638>] [-ssl <ssl \uBAA8\uB4DC>]
+DRDA_Usage11.I=trace '{on|off}' [-s <\uC138\uC158 id>][-h <\uD638\uC2A4\uD2B8>][-p <\uD3EC\uD2B8 \uBC88\uD638>] [-ssl <ssl \uBAA8\uB4DC>]
 DRDA_Usage12.I=tracedirectory <\uCD94\uC801 \uB514\uB809\uD1A0\uB9AC>[-h <\uD638\uC2A4\uD2B8>][-p <\uD3EC\uD2B8 \uBC88\uD638>] [-ssl <ssl \uBAA8\uB4DC>]
 DRDA_Usage2.I=\uBA85\uB839\:
 DRDA_Usage3.I=start [-h <\uD638\uC2A4\uD2B8>] [-p <\uD3EC\uD2B8 \uBC88\uD638>] [-noSecurityManager] [-ssl <ssl \uBAA8\uB4DC>]
@@ -108,6 +108,6 @@ DRDA_Usage4.I=shutdown [-h <\uD638\uC2A4
 DRDA_Usage5.I=ping [-h <\uD638\uC2A4\uD2B8>][-p <\uD3EC\uD2B8 \uBC88\uD638>] [-ssl <ssl \uBAA8\uB4DC>]
 DRDA_Usage6.I=sysinfo [-h <\uD638\uC2A4\uD2B8>][-p <\uD3EC\uD2B8 \uBC88\uD638>] [-ssl <ssl \uBAA8\uB4DC>]
 DRDA_Usage7.I=runtimeinfo [-h <\uD638\uC2A4\uD2B8>][-p <\uD3EC\uD2B8 \uBC88\uD638>] [-ssl <ssl \uBAA8\uB4DC>]
-DRDA_Usage8.I=logconnections {on|off}[-h <\uD638\uC2A4\uD2B8>][-p <\uD3EC\uD2B8 \uBC88\uD638>] [-ssl <ssl \uBAA8\uB4DC>]
+DRDA_Usage8.I=logconnections '{on|off}' [-h <\uD638\uC2A4\uD2B8>][-p <\uD3EC\uD2B8 \uBC88\uD638>] [-ssl <ssl \uBAA8\uB4DC>]
 DRDA_Usage9.I=maxthreads <\uCD5C\uB300>[-h <\uD638\uC2A4\uD2B8>][-p <\uD3EC\uD2B8 \uBC88\uD638>] [-ssl <ssl \uBAA8\uB4DC>]
 DRDA_User.I=\uC0AC\uC6A9\uC790

Modified: db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_pl.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_pl.properties?rev=1033977&r1=1033976&r2=1033977&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_pl.properties (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_pl.properties Thu Nov 11 16:06:38 2010
@@ -112,14 +112,8 @@ DRDA_Usage4.I=shutdown [-h <host>][-p <n
 DRDA_Usage5.I=ping [-h <host>][-p <numer_portu>]
 DRDA_Usage6.I=sysinfo [-h <host>][-p <numer_portu>]
 DRDA_Usage7.I=runtimeinfo [-h <host>][-p <numer_portu>]
-DRDA_Usage8.I=logconnections {on|off}[-h <host>][-p <numer_portu>]
+DRDA_Usage8.I=logconnections '{on|off}' [-h <host>][-p <numer_portu>]
 DRDA_Usage9.I=maxthreads <warto\u015b\u0107_maksymalna>[-h <host>][-p <numer_portu>]
 DRDA_Usage10.I=timeslice <milisekundy>[-h <host>][-p <numer_portu>]
-DRDA_Usage11.I=trace {on|off} [-s <id_sesji>][-h <host>][-p <numer_portu>]
+DRDA_Usage11.I=trace '{on|off}' [-s <id_sesji>][-h <host>][-p <numer_portu>]
 DRDA_Usage12.I=tracedirectory <katalog_\u015bledzenia>[-h <host>][-p <numer_portu>]
-
-
-
-
-
-

Modified: db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_pt_BR.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_pt_BR.properties?rev=1033977&r1=1033976&r2=1033977&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_pt_BR.properties (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_pt_BR.properties Thu Nov 11 16:06:38 2010
@@ -112,8 +112,8 @@ DRDA_Usage4.I=shutdown [-h <hospedeiro>]
 DRDA_Usage5.I=ping [-h <hospedeiro>] [-p <n\u00famero_da_porta>]
 DRDA_Usage6.I=sysinfo [-h <hospedeiro>] [-p <n\u00famero_da_porta>]
 DRDA_Usage7.I=runtimeinfo [-h <hospedeiro>] [-p <n\u00famero_da_porta>]
-DRDA_Usage8.I=logconnections {on|off} [-h <hospedeiro>] [-p <n\u00famero_da_porta>]
+DRDA_Usage8.I=logconnections '{on|off}' [-h <hospedeiro>] [-p <n\u00famero_da_porta>]
 DRDA_Usage9.I=maxthreads <max> [-h <hospedeiro>] [-p <n\u00famero_da_porta>]
 DRDA_Usage10.I=timeslice <milissegundos> [-h <hospedeiro>] [-p <n\u00famero_da_porta>]
-DRDA_Usage11.I=trace {on|off} [-s <id_da_sess\u00e3o>] [-h <hospedeiro>] [-p <n\u00famero_da_porta>]
+DRDA_Usage11.I=trace '{on|off}' [-s <id_da_sess\u00e3o>] [-h <hospedeiro>] [-p <n\u00famero_da_porta>]
 DRDA_Usage12.I=tracedirectory <diret\u00f3rio_de_rastreamento> [-h <hospedeiro>] [-p <n\u00famero_da_porta>]

Modified: db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_ru.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_ru.properties?rev=1033977&r1=1033976&r2=1033977&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_ru.properties (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_ru.properties Thu Nov 11 16:06:38 2010
@@ -112,14 +112,8 @@ DRDA_Usage4.I=shutdown [-h <\u0445\u043e
 DRDA_Usage5.I=ping [-h <\u0445\u043e\u0441\u0442>][-p <\u043d\u043e\u043c\u0435\u0440_\u043f\u043e\u0440\u0442\u0430>]
 DRDA_Usage6.I=sysinfo [-h <\u0445\u043e\u0441\u0442>][-p <\u043d\u043e\u043c\u0435\u0440_\u043f\u043e\u0440\u0442\u0430>]
 DRDA_Usage7.I=runtimeinfo [-h <\u0445\u043e\u0441\u0442>][-p <\u043d\u043e\u043c\u0435\u0440_\u043f\u043e\u0440\u0442\u0430>]
-DRDA_Usage8.I=logconnections {on|off}[-h <\u0445\u043e\u0441\u0442>][-p <\u043d\u043e\u043c\u0435\u0440_\u043f\u043e\u0440\u0442\u0430>]
+DRDA_Usage8.I=logconnections '{on|off}' [-h <\u0445\u043e\u0441\u0442>][-p <\u043d\u043e\u043c\u0435\u0440_\u043f\u043e\u0440\u0442\u0430>]
 DRDA_Usage9.I=maxthreads [-h <\u0445\u043e\u0441\u0442>][-p <\u043d\u043e\u043c\u0435\u0440_\u043f\u043e\u0440\u0442\u0430>]
 DRDA_Usage10.I=timeslice <\u0447\u0438\u0441\u043b\u043e_\u043c\u0441\u0435\u043a>[-h <\u0445\u043e\u0441\u0442>][-p <\u043d\u043e\u043c\u0435\u0440_\u043f\u043e\u0440\u0442\u0430>]
-DRDA_Usage11.I=trace {on|off} [-s <id_\u0441\u0435\u0430\u043d\u0441\u0430>][-h <\u0445\u043e\u0441\u0442>][-p <\u043d\u043e\u043c\u0435\u0440_\u043f\u043e\u0440\u0442\u0430>]
+DRDA_Usage11.I=trace '{on|off}' [-s <id_\u0441\u0435\u0430\u043d\u0441\u0430>][-h <\u0445\u043e\u0441\u0442>][-p <\u043d\u043e\u043c\u0435\u0440_\u043f\u043e\u0440\u0442\u0430>]
 DRDA_Usage12.I=tracedirectory <\u043a\u0430\u0442\u0430\u043b\u043e\u0433_\u0442\u0440\u0430\u0441\u0441\u0438\u0440\u043e\u0432\u043a\u0438>[-h <\u0445\u043e\u0441\u0442>][-p <\u043d\u043e\u043c\u0435\u0440_\u043f\u043e\u0440\u0442\u0430>]
-
-
-
-
-
-

Modified: db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_zh_CN.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_zh_CN.properties?rev=1033977&r1=1033976&r2=1033977&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_zh_CN.properties (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_zh_CN.properties Thu Nov 11 16:06:38 2010
@@ -42,7 +42,7 @@ DRDA_MissingLocale.I=\u672A\u627E\u5230\
 DRDA_MissingNetworkJar.S=\u5728\u7C7B\u8DEF\u5F84\u4E2D\u627E\u4E0D\u5230 derbynet.jar\u3002
 DRDA_MissingValue.U={0} \u7F3A\u5C11\u5FC5\u9700\u7684\u503C\u3002
 DRDA_NeedLocalHost.S=\u4E3B\u673A\uFF1A{0} \u5BF9\u4E8E\u8FD0\u884C\u4E8E {1} \u4E0A\u7684\u670D\u52A1\u5668\u800C\u8A00\u4E0D\u662F\u672C\u5730\u7684\uFF0C\u56E0\u6B64\u65E0\u6CD5\u7528\u4E8E NetworkServerControl \u547D\u4EE4  
-DRDA_NoAuthentication.S=\u7F51\u7EDC\u670D\u52A1\u5668\u542F\u52A8\u5931\u8D25\u3002\u5728\u7F51\u7EDC\u670D\u52A1\u5668\u5B89\u88C5\u5B89\u5168\u7BA1\u7406\u7A0B\u5E8F\u524D\uFF0C\u5FC5\u987B\u5148\u542F\u7528\u7528\u6237\u9A8C\u8BC1\u3002\u8981\u4E48\u5FC5\u987B\u542F\u7528\u7528\u6237\u9A8C\u8BC1\uFF0C\u8981\u4E48\u5FC5\u987B\u7981\u6B62\u5B89\u88C5\u5B89\u5168\u7BA1\u7406\u7A0B\u5E8F\u3002\u6709\u5173\u542F\u7528\u7528\u6237\u9A8C\u8BC1\u7684\u4FE1\u606F\uFF0C\u8BF7\u53C2\u89C1\u300ADerby Developer's Guide\u300B\u4E2D\u7684 "Working with user authentication" \u4E00\u8282\u3002\u5728\u5BA2\u6237\u673A/\u670D\u52A1\u5668\u73AF\u5883\u4E2D\uFF0C\u5F3A\u70C8\u5EFA\u8BAE\u4E0D\u8981\u7981\u6B62\u5B89\u88C5\u5B89\u5168\u7BA1\u7406\u7A0B\u5E8F\u3002\u4E0D\u8FC7\uFF0C\u5982\u679C\u60A8\u5FC5\u987B\u8FD9\u4E48\u505A\uFF0C\u53EF\u5728\u521D\u542F\u7F51\u7EDC\u670D\u52A1\u5668\u65F6\uFF0C\u901A\u8FC7\u6307\u5B9A "-noSecurityManager" \u547D\u4EE4\u884C\u9009\u9879\u6765\u7981\u6B62\
 u5B89\u88C5\u5B89\u5168\u7BA1\u7406\u7A0B\u5E8F\u3002
+DRDA_NoAuthentication.S=\u7F51\u7EDC\u670D\u52A1\u5668\u542F\u52A8\u5931\u8D25\u3002\u5728\u7F51\u7EDC\u670D\u52A1\u5668\u5B89\u88C5\u5B89\u5168\u7BA1\u7406\u7A0B\u5E8F\u524D\uFF0C\u5FC5\u987B\u5148\u542F\u7528\u7528\u6237\u9A8C\u8BC1\u3002\u8981\u4E48\u5FC5\u987B\u542F\u7528\u7528\u6237\u9A8C\u8BC1\uFF0C\u8981\u4E48\u5FC5\u987B\u7981\u6B62\u5B89\u88C5\u5B89\u5168\u7BA1\u7406\u7A0B\u5E8F\u3002\u6709\u5173\u542F\u7528\u7528\u6237\u9A8C\u8BC1\u7684\u4FE1\u606F\uFF0C\u8BF7\u53C2\u89C1\u300ADerby Developer''s Guide\u300B\u4E2D\u7684 "Working with user authentication" \u4E00\u8282\u3002\u5728\u5BA2\u6237\u673A/\u670D\u52A1\u5668\u73AF\u5883\u4E2D\uFF0C\u5F3A\u70C8\u5EFA\u8BAE\u4E0D\u8981\u7981\u6B62\u5B89\u88C5\u5B89\u5168\u7BA1\u7406\u7A0B\u5E8F\u3002\u4E0D\u8FC7\uFF0C\u5982\u679C\u60A8\u5FC5\u987B\u8FD9\u4E48\u505A\uFF0C\u53EF\u5728\u521D\u542F\u7F51\u7EDC\u670D\u52A1\u5668\u65F6\uFF0C\u901A\u8FC7\u6307\u5B9A "-noSecurityManager" \u547D\u4EE4\u884C\u9009\u9879\u6765\u7981\u6B62
 \u5B89\u88C5\u5B89\u5168\u7BA1\u7406\u7A0B\u5E8F\u3002
 DRDA_NoCommand.U=\u672A\u63D0\u4F9B\u547D\u4EE4\u3002
 DRDA_NoIO.S=\u65E0\u6CD5\u8FDE\u63A5\u5230\u4E3B\u673A {0} \u7684\u7AEF\u53E3 {1} \u4E0A\u7684 Derby \u7F51\u7EDC\u670D\u52A1\u5668\uFF1A {2}
 DRDA_NoInputStream.S=\u65E0\u6CD5\u83B7\u53D6\u5BA2\u6237\u673A\u5957\u63A5\u5B57\u7684\u8F93\u5165\u6D41\u3002
@@ -100,7 +100,7 @@ DRDA_UnknownHostWarning.I=\u8B66\u544A\u
 DRDA_UnknownProtocol=\u672A\u77E5\u547D\u4EE4\u534F\u8BAE\u7248\u672C\uFF1A{0}\u3002
 DRDA_Usage1.I=\u7528\u6CD5\uFF1ANetworkServerControl <commands> 
 DRDA_Usage10.I=timeslice <\u6BEB\u79D2>[-h <\u4E3B\u673A>][-p <\u7AEF\u53E3\u53F7>] [-ssl <ssl \u6A21\u5F0F>]
-DRDA_Usage11.I=trace {on|off} [-s <\u4F1A\u8BDD id>][-h <\u4E3B\u673A>][-p <\u7AEF\u53E3\u53F7>] [-ssl <ssl \u6A21\u5F0F>]
+DRDA_Usage11.I=trace '{on|off}' [-s <\u4F1A\u8BDD id>][-h <\u4E3B\u673A>][-p <\u7AEF\u53E3\u53F7>] [-ssl <ssl \u6A21\u5F0F>]
 DRDA_Usage12.I=tracedirectory <\u8DDF\u8E2A\u76EE\u5F55>[-h <\u4E3B\u673A>][-p <\u7AEF\u53E3\u53F7>] [-ssl <ssl \u6A21\u5F0F>]
 DRDA_Usage2.I=\u547D\u4EE4\uFF1A
 DRDA_Usage3.I=start [-h <\u4E3B\u673A>] [-p <\u7AEF\u53E3\u53F7>] [-noSecurityManager] [-ssl <ssl \u6A21\u5F0F>]
@@ -108,6 +108,6 @@ DRDA_Usage4.I=shutdown [-h <\u4E3B\u673A
 DRDA_Usage5.I=ping [-h <\u4E3B\u673A>][-p <\u7AEF\u53E3\u53F7>] [-ssl <ssl \u6A21\u5F0F>]
 DRDA_Usage6.I=sysinfo [-h <\u4E3B\u673A>][-p <\u7AEF\u53E3\u53F7>] [-ssl <ssl \u6A21\u5F0F>]
 DRDA_Usage7.I=runtimeinfo [-h <\u4E3B\u673A>][-p <\u7AEF\u53E3\u53F7>] [-ssl <ssl \u6A21\u5F0F>]
-DRDA_Usage8.I=logconnections {on|off}[-h <\u4E3B\u673A>][-p <\u7AEF\u53E3\u53F7>] [-ssl <ssl \u6A21\u5F0F>]
+DRDA_Usage8.I=logconnections '{on|off}' [-h <\u4E3B\u673A>][-p <\u7AEF\u53E3\u53F7>] [-ssl <ssl \u6A21\u5F0F>]
 DRDA_Usage9.I=maxthreads <\u6700\u5927\u503C>[-h <\u4E3B\u673A>][-p <\u7AEF\u53E3\u53F7>] [-ssl <ssl \u6A21\u5F0F>]
 DRDA_User.I=\u7528\u6237

Modified: db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_zh_TW.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_zh_TW.properties?rev=1033977&r1=1033976&r2=1033977&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_zh_TW.properties (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_zh_TW.properties Thu Nov 11 16:06:38 2010
@@ -42,7 +42,7 @@ DRDA_MissingLocale.I=\u627E\u4E0D\u5230\
 DRDA_MissingNetworkJar.S=\u5728\u985E\u5225\u8DEF\u5F91\u4E2D\u627E\u4E0D\u5230 derbynet.jar\u3002
 DRDA_MissingValue.U={0} \u7F3A\u5C11\u5FC5\u8981\u7684\u503C\u3002
 DRDA_NeedLocalHost.S=\u4E3B\u6A5F\uFF1A{0} \u4E0D\u5728\u65BC {1} \u4E0A\u57F7\u884C\u4E4B\u4F3A\u670D\u5668\u7684\u672C\u7AEF\uFF0C\u56E0\u6B64\u7121\u6CD5\u7528\u65BC NetworkServerControl \u6307\u4EE4  
-DRDA_NoAuthentication.S=\u7DB2\u8DEF\u4F3A\u670D\u5668\u555F\u52D5\u5931\u6557\u3002\u5728\u7DB2\u8DEF\u4F3A\u670D\u5668\u5B89\u88DD\u5B89\u5168\u6027\u7BA1\u7406\u54E1\u4E4B\u524D\uFF0C\u5FC5\u9808\u5148\u555F\u7528\u4F7F\u7528\u8005\u8A8D\u8B49\u3002\u60A8\u5FC5\u9808\u555F\u7528\u4F7F\u7528\u8005\u8A8D\u8B49\uFF0C\u6216\u505C\u6B62\u5B89\u5168\u6027\u7BA1\u7406\u54E1\u7684\u5B89\u88DD\u3002\u6709\u95DC\u555F\u7528\u4F7F\u7528\u8005\u8A8D\u8B49\u7684\u76F8\u95DC\u8CC7\u8A0A\uFF0C\u8ACB\u53C3\u95B1\u300CDerby Developer's Guide\u300D\u4E2D\u7684\u300CWorking with user authentication\u300D\u4E00\u7BC0\u3002\u5F37\u70C8\u5EFA\u8B70\u60A8\u4E0D\u8981\u5728\u7528\u6236\u7AEF/\u4F3A\u670D\u5668\u74B0\u5883\u4E2D\u505C\u6B62\u5B89\u5168\u6027\u7BA1\u7406\u54E1\u7684\u5B89\u88DD\u3002\u7136\u800C\u82E5\u6709\u5FC5\u8981\uFF0C\u60A8\u53EF\u4EE5\u5728\u555F\u52D5\u7DB2\u8DEF\u4F3A\u670D\u5668\u6642\u6307\u5B9A\u300C-noSecurityManager\u300D\u6307\u4EE4\u884C\u9078\u9805\uFF0C\u85C9\u4
 EE5\u505C\u6B62\u5B89\u5168\u6027\u7BA1\u7406\u54E1\u7684\u5B89\u88DD\u3002
+DRDA_NoAuthentication.S=\u7DB2\u8DEF\u4F3A\u670D\u5668\u555F\u52D5\u5931\u6557\u3002\u5728\u7DB2\u8DEF\u4F3A\u670D\u5668\u5B89\u88DD\u5B89\u5168\u6027\u7BA1\u7406\u54E1\u4E4B\u524D\uFF0C\u5FC5\u9808\u5148\u555F\u7528\u4F7F\u7528\u8005\u8A8D\u8B49\u3002\u60A8\u5FC5\u9808\u555F\u7528\u4F7F\u7528\u8005\u8A8D\u8B49\uFF0C\u6216\u505C\u6B62\u5B89\u5168\u6027\u7BA1\u7406\u54E1\u7684\u5B89\u88DD\u3002\u6709\u95DC\u555F\u7528\u4F7F\u7528\u8005\u8A8D\u8B49\u7684\u76F8\u95DC\u8CC7\u8A0A\uFF0C\u8ACB\u53C3\u95B1\u300CDerby Developer''s Guide\u300D\u4E2D\u7684\u300CWorking with user authentication\u300D\u4E00\u7BC0\u3002\u5F37\u70C8\u5EFA\u8B70\u60A8\u4E0D\u8981\u5728\u7528\u6236\u7AEF/\u4F3A\u670D\u5668\u74B0\u5883\u4E2D\u505C\u6B62\u5B89\u5168\u6027\u7BA1\u7406\u54E1\u7684\u5B89\u88DD\u3002\u7136\u800C\u82E5\u6709\u5FC5\u8981\uFF0C\u60A8\u53EF\u4EE5\u5728\u555F\u52D5\u7DB2\u8DEF\u4F3A\u670D\u5668\u6642\u6307\u5B9A\u300C-noSecurityManager\u300D\u6307\u4EE4\u884C\u9078\u9805\uFF0C\u85C9\u
 4EE5\u505C\u6B62\u5B89\u5168\u6027\u7BA1\u7406\u54E1\u7684\u5B89\u88DD\u3002
 DRDA_NoCommand.U=\u672A\u6307\u5B9A\u6307\u4EE4\u3002
 DRDA_NoIO.S=\u7121\u6CD5\u9023\u7DDA\u81F3\u4F4D\u65BC\u4E3B\u6A5F {0} \u7684\u9023\u63A5\u57E0 {1} \u4E0A\u7684 Derby \u7DB2\u8DEF\u4F3A\u670D\u5668\uFF1A{2}
 DRDA_NoInputStream.S=\u7121\u6CD5\u5F9E\u7528\u6236\u7AEF Socket \u53D6\u5F97\u8F38\u5165\u4E32\u6D41\u3002
@@ -100,7 +100,7 @@ DRDA_UnknownHostWarning.I=\u8B66\u544A\u
 DRDA_UnknownProtocol=\u300C\u6307\u4EE4\u901A\u8A0A\u5354\u5B9A\u300D\u7248\u672C\u4E0D\u660E\uFF1A{0}\u3002
 DRDA_Usage1.I=\u7528\u6CD5\uFF1ANetworkServerControl <\u6307\u4EE4> 
 DRDA_Usage10.I=timeslice <\u6BEB\u79D2>[-h <\u4E3B\u6A5F>][-p <\u9023\u63A5\u57E0\u865F>] [-ssl <ssl \u6A21\u5F0F>]
-DRDA_Usage11.I=trace {on|off} [-s <\u968E\u6BB5\u4F5C\u696D ID>][-h <\u4E3B\u6A5F>][-p <\u9023\u63A5\u57E0\u865F>] [-ssl <ssl \u6A21\u5F0F>]
+DRDA_Usage11.I=trace '{on|off}' [-s <\u968E\u6BB5\u4F5C\u696D ID>][-h <\u4E3B\u6A5F>][-p <\u9023\u63A5\u57E0\u865F>] [-ssl <ssl \u6A21\u5F0F>]
 DRDA_Usage12.I=tracedirectory <\u8FFD\u8E64\u76EE\u9304>[-h <\u4E3B\u6A5F>][-p <\u9023\u63A5\u57E0\u865F>] [-ssl <ssl \u6A21\u5F0F>]
 DRDA_Usage2.I=\u6307\u4EE4\uFF1A
 DRDA_Usage3.I=start [-h <\u4E3B\u6A5F>] [-p <\u9023\u63A5\u57E0\u865F>] [-noSecurityManager] [-ssl <ssl \u6A21\u5F0F>]
@@ -108,6 +108,6 @@ DRDA_Usage4.I=shutdown [-h <\u4E3B\u6A5F
 DRDA_Usage5.I=ping [-h <\u4E3B\u6A5F>][-p <\u9023\u63A5\u57E0\u865F>] [-ssl <ssl \u6A21\u5F0F>]
 DRDA_Usage6.I=sysinfo [-h <\u4E3B\u6A5F>][-p <\u9023\u63A5\u57E0\u865F>] [-ssl <ssl \u6A21\u5F0F>]
 DRDA_Usage7.I=runtimeinfo [-h <\u4E3B\u6A5F>][-p <\u9023\u63A5\u57E0\u865F>] [-ssl <ssl \u6A21\u5F0F>]
-DRDA_Usage8.I=logconnections {on|off}[-h <\u4E3B\u6A5F>][-p <\u9023\u63A5\u57E0\u865F>] [-ssl <ssl \u6A21\u5F0F>]
+DRDA_Usage8.I=logconnections '{on|off}' [-h <\u4E3B\u6A5F>][-p <\u9023\u63A5\u57E0\u865F>] [-ssl <ssl \u6A21\u5F0F>]
 DRDA_Usage9.I=maxthreads <\u6700\u5927\u503C>[-h <\u4E3B\u6A5F>][-p <\u9023\u63A5\u57E0\u865F>] [-ssl <ssl \u6A21\u5F0F>]
 DRDA_User.I=\u4F7F\u7528\u8005

Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_it.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_it.properties?rev=1033977&r1=1033976&r2=1033977&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_it.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_it.properties Thu Nov 11 16:06:38 2010
@@ -80,7 +80,7 @@
 08006.C.6=Tentativo di materializzare in modo completo dati lob troppo grandi per la JVM.  La connessione \u00E8 stata terminata.
 08006.C=Si \u00E8 verificato un errore del protocollo di rete e la connessione \u00E8 stata terminata\: {0}
 08006.D=Arresto database ''{0}''.
-08006.D.1=Database ''\{\}'' scartato.
+08006.D.1=Database ''{0}'' scartato.
 0A000.C.6=Il comando DRDA {0} non \u00E8 attualmente implementato.  La connessione \u00E8 stata terminata.
 0A000.S.1=Il metodo JDBC non \u00E8 stato ancora implementato.
 0A000.S.2=Il metodo JDBC {0} non \u00E8 supportato dal server. Aggiornare il server.

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/derbyrunjartest.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/derbyrunjartest.out?rev=1033977&r1=1033976&r2=1033977&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/derbyrunjartest.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/derbyrunjartest.out Thu Nov 11 16:06:38 2010
@@ -33,7 +33,7 @@ shutdown [-h <host>][-p <portnumber>] [-
 ping [-h <host>][-p <portnumber>] [-ssl <sslmode>]
 sysinfo [-h <host>][-p <portnumber>] [-ssl <sslmode>]
 runtimeinfo [-h <host>][-p <portnumber>] [-ssl <sslmode>]
-logconnections {on|off}[-h <host>][-p <portnumber>] [-ssl <sslmode>]
+logconnections {on|off} [-h <host>][-p <portnumber>] [-ssl <sslmode>]
 maxthreads <max>[-h <host>][-p <portnumber>] [-ssl <sslmode>]
 timeslice <milliseconds>[-h <host>][-p <portnumber>] [-ssl <sslmode>]
 trace {on|off} [-s <session id>][-h <host>][-p <portnumber>] [-ssl <sslmode>]

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NetworkServerControlApiTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NetworkServerControlApiTest.java?rev=1033977&r1=1033976&r2=1033977&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NetworkServerControlApiTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NetworkServerControlApiTest.java Thu Nov 11 16:06:38 2010
@@ -374,7 +374,7 @@ public class NetworkServerControlApiTest
                 "ping [-h <host>][-p <portnumber>] [-ssl <sslmode>]",
                 "sysinfo [-h <host>][-p <portnumber>] [-ssl <sslmode>]",
                 "runtimeinfo [-h <host>][-p <portnumber>] [-ssl <sslmode>]",
-                "logconnections {on|off}[-h <host>][-p <portnumber>] [-ssl <sslmode>]",
+                "logconnections {on|off} [-h <host>][-p <portnumber>] [-ssl <sslmode>]",
                 "maxthreads <max>[-h <host>][-p <portnumber>] [-ssl <sslmode>]",
                 "timeslice <milliseconds>[-h <host>][-p <portnumber>] [-ssl <sslmode>]",
                 "trace {on|off} [-s <session id>][-h <host>][-p <portnumber>] [-ssl <sslmode>]",
@@ -424,7 +424,7 @@ public class NetworkServerControlApiTest
                 "ping [-h <host>][-p <portnumber>] [-ssl <sslmode>]",
                 "sysinfo [-h <host>][-p <portnumber>] [-ssl <sslmode>]",
                 "runtimeinfo [-h <host>][-p <portnumber>] [-ssl <sslmode>]",
-                "logconnections {on|off}[-h <host>][-p <portnumber>] [-ssl <sslmode>]",
+                "logconnections {on|off} [-h <host>][-p <portnumber>] [-ssl <sslmode>]",
                 "maxthreads <max>[-h <host>][-p <portnumber>] [-ssl <sslmode>]",
                 "timeslice <milliseconds>[-h <host>][-p <portnumber>] [-ssl <sslmode>]",
                 "trace {on|off} [-s <session id>][-h <host>][-p <portnumber>] [-ssl <sslmode>]",
@@ -513,7 +513,7 @@ public class NetworkServerControlApiTest
                 "ping [-h <host>][-p <portnumber>] [-ssl <sslmode>]",
                 "sysinfo [-h <host>][-p <portnumber>] [-ssl <sslmode>]",
                 "runtimeinfo [-h <host>][-p <portnumber>] [-ssl <sslmode>]",
-                "logconnections {on|off}[-h <host>][-p <portnumber>] [-ssl <sslmode>]",
+                "logconnections {on|off} [-h <host>][-p <portnumber>] [-ssl <sslmode>]",
                 "maxthreads <max>[-h <host>][-p <portnumber>] [-ssl <sslmode>]",
                 "timeslice <milliseconds>[-h <host>][-p <portnumber>] [-ssl <sslmode>]",
                 "trace {on|off} [-s <session id>][-h <host>][-p <portnumber>] [-ssl <sslmode>]",
@@ -560,7 +560,7 @@ public class NetworkServerControlApiTest
                 "ping [-h <host>][-p <portnumber>] [-ssl <sslmode>]",
                 "sysinfo [-h <host>][-p <portnumber>] [-ssl <sslmode>]",
                 "runtimeinfo [-h <host>][-p <portnumber>] [-ssl <sslmode>]",
-                "logconnections {on|off}[-h <host>][-p <portnumber>] [-ssl <sslmode>]",
+                "logconnections {on|off} [-h <host>][-p <portnumber>] [-ssl <sslmode>]",
                 "maxthreads <max>[-h <host>][-p <portnumber>] [-ssl <sslmode>]",
                 "timeslice <milliseconds>[-h <host>][-p <portnumber>] [-ssl <sslmode>]",
                 "trace {on|off} [-s <session id>][-h <host>][-p <portnumber>] [-ssl <sslmode>]",

Modified: db/derby/code/trunk/java/tools/org/apache/derby/iapi/tools/i18n/LocalizedResource.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/iapi/tools/i18n/LocalizedResource.java?rev=1033977&r1=1033976&r2=1033977&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/iapi/tools/i18n/LocalizedResource.java (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/iapi/tools/i18n/LocalizedResource.java Thu Nov 11 16:06:38 2010
@@ -269,18 +269,7 @@ public final class LocalizedResource  im
 		return new LocalizedOutput(o, encoding);
 	}
 	public String getTextMessage(String key ) {
-		if ( res == null){
-			setResource();
-		}
-		String s = key;
-		try{
-			s = res.getString(key);
-		} catch (Exception e) {
-			s = key;
-		}
-		//System.out.println(local.toString());
-		//System.out.println("GetKey:"+key+"="+s);
-		return s;
+        return getTextMessage(key, new Object[0]);
 	}
 	public String getTextMessage(String key, Object o){
 			Object [] att=new Object[] {o};

Modified: db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages.properties?rev=1033977&r1=1033976&r2=1033977&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages.properties (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages.properties Thu Nov 11 16:06:38 2010
@@ -52,10 +52,10 @@ IJ_HelpText=\
 \ \n\
 \ Supported commands include:\n\
 \ \n\
-\  PROTOCOL 'JDBC protocol' [ AS ident ];\n\
+\  PROTOCOL ''JDBC protocol'' [ AS ident ];\n\
 \                               -- sets a default or named protocol\n\
-\  DRIVER 'class for driver';   -- loads the named class\n\
-\  CONNECT 'url for database' [ PROTOCOL namedProtocol ] [ AS connectionName ];\n\
+\  DRIVER ''class for driver'';   -- loads the named class\n\
+\  CONNECT ''url for database'' [ PROTOCOL namedProtocol ] [ AS connectionName ];\n\
 \                               -- connects to database URL\n\
 \                               -- and may assign identifier\n\
 \  SET CONNECTION connectionName; -- switches to the specified connection\n\
@@ -66,9 +66,9 @@ IJ_HelpText=\
 \                               -- the default is CURRENT\n\
 \ \n\
 \  SHOW SCHEMAS;                -- lists all schemas in the current database\n\
-\  SHOW [ TABLES | VIEWS | PROCEDURES | FUNCTIONS | SYNONYMS ] { IN schema };\n\
+\  SHOW [ TABLES | VIEWS | PROCEDURES | FUNCTIONS | SYNONYMS ] '{' IN schema '}';\n\
 \                               -- lists tables, views, procedures, functions or synonyms\n\
-\  SHOW INDEXES { IN schema | FROM table };\n\
+\  SHOW INDEXES '{' IN schema | FROM table '}';\n\
 \                               -- lists indexes in a schema, or for a table\n\
 \  SHOW ROLES;                  -- lists all defined roles in the database,\n\
 \                               -- sorted\n\
@@ -82,23 +82,23 @@ IJ_HelpText=\
 \  COMMIT;                      -- commits the current transaction\n\
 \  ROLLBACK;                    -- rolls back the current transaction\n\
 \ \n\
-\  PREPARE name AS 'SQL-J text'; -- prepares the SQL-J text\n\
-\  EXECUTE { name | 'SQL-J text' } [ USING { name | 'SQL-J text' } ] ;\n\
+\  PREPARE name AS ''SQL-J text''; -- prepares the SQL-J text\n\
+\  EXECUTE '{' name | ''SQL-J text'' '}' [ USING '{' name | ''SQL-J text'' '}' ] ;\n\
 \                               -- executes the statement with parameter\n\
 \                               -- values from the USING result set row\n\
 \  REMOVE name;                 -- removes the named previously prepared statement\n\
 \ \n\
-\  RUN 'filename';              -- run commands from the named file\n\
+\  RUN ''filename'';              -- run commands from the named file\n\
 \ \n\
 \  ELAPSEDTIME [ ON | OFF ];    -- sets elapsed time mode for ij\n\
 \  MAXIMUMDISPLAYWIDTH integerValue;\n\
 \                               -- sets the maximum display width for\n\
 \                               -- each column to integerValue\n\
 \ \n\
-\  ASYNC name 'SQL-J text';     -- run the command in another thread\n\
-\  WAIT FOR name;               -- wait for result of ASYNC'd command\n\
+\  ASYNC name ''SQL-J text'';     -- run the command in another thread\n\
+\  WAIT FOR name;               -- wait for result of ASYNC''d command\n\
 \ \n\
-\  GET [SCROLL INSENSITIVE] [WITH  {HOLD | NOHOLD}] CURSOR name AS 'SQL-J query';\n\
+\  GET [SCROLL INSENSITIVE] [WITH  '{HOLD | NOHOLD}'] CURSOR name AS ''SQL-J query'';\n\
 \                               -- gets a cursor (JDBC result set) on the query\n\
 \                               -- the default is a forward-only cursor with holdability\n\
 \  NEXT name;                   -- gets the next row from the named cursor\n\
@@ -193,7 +193,7 @@ IJ_XANoI=EmbeddedXADataSource cannot be 
 IJ_EncoAtLineColu=Encountered "{0}" at line {1}, column {2}
 # From TokenMgrError.java
 IJ_LexiErroAtLine0Colu1=Lexical error at line {0}, column {1}.  Encountered: {2}after :"{3}"
-IJ_SuggestHelp=Issue the 'help' command for general information on IJ command syntax.\nAny unrecognized commands are treated as potential SQL commands and executed directly.\nConsult your DBMS server reference documentation for details of the SQL syntax supported by your server.
+IJ_SuggestHelp=Issue the ''help'' command for general information on IJ command syntax.\nAny unrecognized commands are treated as potential SQL commands and executed directly.\nConsult your DBMS server reference documentation for details of the SQL syntax supported by your server.
 TL_incorCase=Case of the Derby attribute is incorrect.
 TL_unknownAtt=Attribute is unknown to Derby.
 TL_trueFalse=Value should be set to true/false.
@@ -207,7 +207,7 @@ DBLOOK_Usage=\
 \ USAGE:\n\ java org.apache.derby.tools.dblook -d <sourceDBUrl> [OPTIONS]\n\n\
 \ \twhere the source URL is the full URL, including the connection protocol\n\
 \ \tand any connection attributes that might apply.  For example, use\n\
-\ \t'jdbc:derby:myDB', or 'jdbc:derby://localhost:1527/myDB;user=usr;'. \n\n\
+\ \t''jdbc:derby:myDB'', or ''jdbc:derby://localhost:1527/myDB;user=usr;''. \n\n\
 \ \toptions include: \n\n\
 \ \t-z <schemaName> to specify a schema to which the DDL generation\n\
 \ \t should be limited.  Only database objects with that schema will have\n\
@@ -215,7 +215,7 @@ DBLOOK_Usage=\
 \ \t-t <tableOne> <tableTwo> ... to specify a list of tables for which\n\
 \ \t the DDL will be generated; any tables not in the list will be ignored.\n\n\
 \ \t-td <value> to specify what should be appended to the end\n\
-\ \t of each DDL statement.\n\t\tThis defaults to ';'.\n\n\
+\ \t of each DDL statement.\n\t\tThis defaults to '';''.\n\n\
 \ \t-noview to prevent the generation of DDL for views.\n\n\
 \ \t-append to keep from overwriting the output files.\n\n\
 \ \t-verbose to have error messages printed to the console (in addition\n\
@@ -225,7 +225,7 @@ DBLOOK_Usage=\
 \ \t will be written.\n\
 \ \t\tIf not specified, default is the console.\
 \ \n
-DBLOOK_FileCreation=This file was created using Derby's dblook utility.
+DBLOOK_FileCreation=This file was created using Derby''s dblook utility.
 DBLOOK_OutputLocation=Output will be sent to file {0}\n
 DBLOOK_Timestamp=Timestamp: {0}
 DBLOOK_DBName=Source database is: {0}
@@ -266,7 +266,7 @@ DBLOOK_Jar_Note=\
 -- statements will throw errors, and the jar files will NOT be\n\
 -- loaded.
 DBLOOK_FailedToLoadJar=Failed to load jar file {0}
-DBLOOK_DefaultSchema=Reverting back to default schema 'APP'
+DBLOOK_DefaultSchema=Reverting back to default schema ''APP''
 DBLOOK_AtLeastOneDebug=\
 -- Note: At least one unexpected error/warning message was\n\
 -- encountered during DDL generation.  See dblook.log\n\

Modified: db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_cs.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_cs.properties?rev=1033977&r1=1033976&r2=1033977&view=diff
==============================================================================
--- db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_cs.properties (original)
+++ db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_cs.properties Thu Nov 11 16:06:38 2010
@@ -51,10 +51,10 @@ IJ_UnexpResulUnx01=***** NEO\u010cEK\u00
 IJ_HelpText=\ \n\
 \ Podporovan\u00e9 p\u0159\u00edkazy zahrnuj\u00ed:\n\
 \ \n\
-\  PROTOCOL 'protokol JDBC' [ AS ident ];\n\
+\  PROTOCOL ''protokol JDBC'' [ AS ident ];\n\
 \                               -- nastav\u00ed p\u0159edvolen\u00fd nebo zadan\u00fd protokol\n\
-\  DRIVER 't\u0159\u00edda pro ovlada\u010d';  -- zavede zadanou t\u0159\u00eddu\n\
-\  CONNECT 'URL pro datab\u00e1zi' [ PROTOCOL zadan\u00fdProtokol ] [ AS jm\u00e9noP\u0159ipojen\u00ed ];\n\
+\  DRIVER ''t\u0159\u00edda pro ovlada\u010d'';  -- zavede zadanou t\u0159\u00eddu\n\
+\  CONNECT ''URL pro datab\u00e1zi'' [ PROTOCOL zadan\u00fdProtokol ] [ AS jm\u00e9noP\u0159ipojen\u00ed ];\n\
 \                               -- p\u0159ipoj\u00ed k URL datab\u00e1ze\n\
 \                               -- a m\u016f\u017ee p\u0159i\u0159adit identifik\u00e1tor\n\
 \  SET CONNECTION jm\u00e9noP\u0159ipojen\u00ed; -- p\u0159epne na uveden\u00e9 p\u0159ipojen\u00ed\n\
@@ -65,32 +65,32 @@ IJ_HelpText=\ \n\
 \                               -- p\u0159edvolba je CURRENT\n\
 \ \n\
 \  SHOW SCHEMAS;                -- vyp\u00ed\u0161e v\u0161echna sch\u00e9mata v aktu\u00e1ln\u00ed datab\u00e1zi\n\
-\  SHOW [ TABLES | VIEWS | PROCEDURES | SYNONYMS ] { IN sch\u00e9ma };\n\
+\  SHOW [ TABLES | VIEWS | PROCEDURES | SYNONYMS ] '{' IN sch\u00e9ma '}';\n\
 \                               -- vyp\u00ed\u0161e tabulky, pohledy, procedury nebo synonyma\n\
-\  SHOW INDEXES { IN sch\u00e9ma | FROM tabulka };\n\
+\  SHOW INDEXES '{' IN sch\u00e9ma | FROM tabulka '}';\n\
 \                               -- vyp\u00ed\u0161e rejst\u0159\u00edky ve sch\u00e9matu nebo pro tabulku\n\
 \  DESCRIBE jm\u00e9no;              -- vyp\u00ed\u0161e sloupce v zadan\u00e9 tabulce\n\
 \ \n\
 \  COMMIT;                      -- potvrd\u00ed aktu\u00e1ln\u00ed transakci\n\
 \  ROLLBACK;                    -- vr\u00e1t\u00ed zp\u011bt aktu\u00e1ln\u00ed transakci\n\
 \ \n\
-\  PREPARE jm\u00e9no AS 'text SQL-J'; -- p\u0159iprav\u00ed text SQL-J\n\
-\  EXECUTE { jm\u00e9no | 'text SQL-J' } [ USING { jm\u00e9no | 'text SQL-J' } ] ;\n\
+\  PREPARE jm\u00e9no AS ''text SQL-J''; -- p\u0159iprav\u00ed text SQL-J\n\
+\  EXECUTE '{' jm\u00e9no | ''text SQL-J'' '}' [ USING '{' jm\u00e9no | ''text SQL-J'' '}' ] ;\n\
 \                               -- provede p\u0159\u00edkaz s parametrem\n\
 \                               -- hodnoty z \u0159\u00e1dku mno\u017einy v\u00fdsledk\u016f USING\n\
 \  REMOVE jm\u00e9no;                -- odstran\u00ed zadan\u00fd d\u0159\u00edve p\u0159ipraven\u00fd p\u0159\u00edkaz\n\
 \ \n\
-\  RUN 'jm\u00e9noSouboru';          -- spustit p\u0159\u00edkazy ze zadan\u00e9ho souboru\n\
+\  RUN ''jm\u00e9noSouboru'';          -- spustit p\u0159\u00edkazy ze zadan\u00e9ho souboru\n\
 \ \n\
 \  ELAPSEDTIME [ ON | OFF ];    -- nastav\u00ed re\u017eim uplynul\u00e9ho \u010dasu pro ij\n\
 \  MAXIMUMDISPLAYWIDTH celo\u010d\u00edseln\u00e1Hodnota;\n\
 \                               -- nastav\u00ed maxim\u00e1ln\u00ed \u0161\u00ed\u0159ku zobrazen\u00ed pro\n\
 \                               -- ka\u017ed\u00fd sloupec na celo\u010d\u00edselnou hodnotu\n\
 \ \n\
-\  ASYNC jm\u00e9no 'text SQL-J';    -- spustit p\u0159\u00edkaz v jin\u00e9m jednotkov\u00e9m procesu\n\
-\  WAIT FOR jm\u00e9no;              -- \u010dekat na v\u00fdsledek p\u0159\u00edkazu ASYNC'd\n\
+\  ASYNC jm\u00e9no ''text SQL-J'';    -- spustit p\u0159\u00edkaz v jin\u00e9m jednotkov\u00e9m procesu\n\
+\  WAIT FOR jm\u00e9no;              -- \u010dekat na v\u00fdsledek p\u0159\u00edkazu ASYNC''d\n\
 \ \n\
-\  GET [SCROLL INSENSITIVE] [WITH  {HOLD | NOHOLD}] CURSOR jm\u00e9no AS 'dotaz SQL-J';\n\
+\  GET [SCROLL INSENSITIVE] [WITH  '{HOLD | NOHOLD}'] CURSOR jm\u00e9no AS ''dotaz SQL-J'';\n\
 \                               -- z\u00edsk\u00e1 kurzor (mno\u017eina v\u00fdsledk\u016f JDBC) p\u0159i dotazu\n\
 \                               -- v JDBC 2.0 a vy\u0161\u0161\u00edm jsou k dispozici\n\
 \                               -- pouze POSUVN\u00c9 kurzory.\n\
@@ -199,7 +199,7 @@ DBLOOK_Usage=\ \n\
 \n\
 \ \tkde zdrojov\u00e9 URL je cel\u00e9 URL v\u010detn\u011b protokolu p\u0159ipojen\u00ed\n\
 \ \ta v\u0161ech atribut\u016f p\u0159ipojen\u00ed, kter\u00e9 se mohou pou\u017e\u00edt. Nap\u0159\u00edklad pou\u017eijte\n\
-\ \t'jdbc:derby:myDB' nebo 'jdbc:derby://localhost:1527/myDB;user=usr;'. \n\
+\ \t''jdbc:derby:myDB'' nebo ''jdbc:derby://localhost:1527/myDB;user=usr;''. \n\
 \n\
 \ \tvolby zahrnuj\u00ed: \n\
 \n\
@@ -212,7 +212,7 @@ DBLOOK_Usage=\ \n\
 \n\
 \ \t-td <hodnota> pro uveden\u00ed, co m\u00e1 b\u00fdt p\u0159id\u00e1no na konec\n\
 \ \t ka\u017ed\u00e9ho p\u0159\u00edkazu DDL.\n\
-\t\t P\u0159edvolen\u011b nastaveno na ';'.\n\
+\t\t P\u0159edvolen\u011b nastaveno na '';''.\n\
 \n\
 \ \t-noview pro zabr\u00e1n\u011bn\u00ed generov\u00e1n\u00ed DDL pro pohledy.\n\
 \n\
@@ -259,7 +259,7 @@ DBLOOK_Jar_Note=**** POZN\u00c1MKA **** 
 -- budou h\u00e1zet chyby a soubory JAR\n\
 -- NEBUDOU zavedeny.
 DBLOOK_FailedToLoadJar=Selh\u00e1n\u00ed zaveden\u00ed souboru JAR {0}
-DBLOOK_DefaultSchema=Prob\u00edh\u00e1 n\u00e1vrat k p\u0159edvolen\u00e9mu sch\u00e9matu 'APP'
+DBLOOK_DefaultSchema=Prob\u00edh\u00e1 n\u00e1vrat k p\u0159edvolen\u00e9mu sch\u00e9matu ''APP''
 DBLOOK_AtLeastOneDebug=-- Pozn.: B\u011bhem generov\u00e1n\u00ed DDL byla zji\u0161t\u011bna alespo\u0148 jedna\n\
 -- neo\u010dek\u00e1van\u00e1 chybov\u00e1/varovn\u00e1 zpr\u00e1va. Zpr\u00e1vy si m\u016f\u017eete prohl\u00e9dnout\n\
 -- v souboru dblook.log.\n\



Mime
View raw message