db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fuzzylo...@apache.org
Subject svn commit: rev 76095 - in incubator/derby/code/trunk/java: demo tools/org/apache/derby/impl/tools/cslook tools/org/apache/derby/impl/tools/dblook tools/org/apache/derby/impl/tools/sysinfo tools/org/apache/derby/loc tools/org/apache/derby/tools
Date Wed, 17 Nov 2004 02:09:31 GMT
Author: fuzzylogic
Date: Tue Nov 16 18:09:29 2004
New Revision: 76095

Added:
   incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/dblook/
      - copied from rev 76088, incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/cslook/
Removed:
   incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/cslook/
Modified:
   incubator/derby/code/trunk/java/demo/build.xml
   incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/dblook/DB_Check.java
   incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/dblook/DB_Index.java
   incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/dblook/DB_Jar.java
   incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/dblook/DB_Key.java
   incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/dblook/DB_Schema.java
   incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/dblook/DB_StoredProcedure.java
   incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/dblook/DB_Table.java
   incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/dblook/DB_Trigger.java
   incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/dblook/DB_View.java
   incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/dblook/Logs.java
   incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/sysinfo/Main.java
   incubator/derby/code/trunk/java/tools/org/apache/derby/loc/sysinfoMessages.properties
   incubator/derby/code/trunk/java/tools/org/apache/derby/loc/sysinfoMessages_de_DE.properties
   incubator/derby/code/trunk/java/tools/org/apache/derby/loc/sysinfoMessages_es.properties
   incubator/derby/code/trunk/java/tools/org/apache/derby/loc/sysinfoMessages_fr.properties
   incubator/derby/code/trunk/java/tools/org/apache/derby/loc/sysinfoMessages_it.properties
   incubator/derby/code/trunk/java/tools/org/apache/derby/loc/sysinfoMessages_ja_JP.properties
   incubator/derby/code/trunk/java/tools/org/apache/derby/loc/sysinfoMessages_ko_KR.properties
   incubator/derby/code/trunk/java/tools/org/apache/derby/loc/sysinfoMessages_pt_BR.properties
   incubator/derby/code/trunk/java/tools/org/apache/derby/loc/sysinfoMessages_zh_CN.properties
   incubator/derby/code/trunk/java/tools/org/apache/derby/loc/sysinfoMessages_zh_TW.properties
   incubator/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages.properties
   incubator/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_de_DE.properties
   incubator/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_es.properties
   incubator/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_fr.properties
   incubator/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_it.properties
   incubator/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_ja_JP.properties
   incubator/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_ko_KR.properties
   incubator/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_pt_BR.properties
   incubator/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_zh_CN.properties
   incubator/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_zh_TW.properties
   incubator/derby/code/trunk/java/tools/org/apache/derby/tools/URLCheck.java
   incubator/derby/code/trunk/java/tools/org/apache/derby/tools/dblook.java
   incubator/derby/code/trunk/java/tools/org/apache/derby/tools/ij.java
   incubator/derby/code/trunk/java/tools/org/apache/derby/tools/sysinfo.java
Log:
Remove copyright notice from ij startup message. Cleanup other IBM/Cloudscape
references in tools, including moving impl/tools/cslook to impl/tools/dblook.



Modified: incubator/derby/code/trunk/java/demo/build.xml
==============================================================================
--- incubator/derby/code/trunk/java/demo/build.xml	(original)
+++ incubator/derby/code/trunk/java/demo/build.xml	Tue Nov 16 18:09:29 2004
@@ -63,7 +63,7 @@
       optimize="${optimize}"
       proceed="${proceed}"
       verbose="${verbose}"
-      srcdir="simple"
+      srcdir="${derby.demo.src.dir}/simple"
       destdir="${out.dir}">
       <classpath>
         <pathelement location="${javasrc.dir};${jcc};${jta1_2}"/>

Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/dblook/DB_Check.java
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/cslook/DB_Check.java	(original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/dblook/DB_Check.java	Tue Nov 16 18:09:29 2004
@@ -1,6 +1,6 @@
 /*
 
-   Derby - Class org.apache.derby.impl.tools.cslook.DB_Check
+   Derby - Class org.apache.derby.impl.tools.dblook.DB_Check
 
    Copyright 2004 The Apache Software Foundation or its licensors, as applicable.
 
@@ -18,7 +18,7 @@
 
  */
 
-package org.apache.derby.impl.tools.cslook;
+package org.apache.derby.impl.tools.dblook;
 
 import java.sql.Connection;
 import java.sql.Statement;

Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/dblook/DB_Index.java
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/cslook/DB_Index.java	(original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/dblook/DB_Index.java	Tue Nov 16 18:09:29 2004
@@ -1,6 +1,6 @@
 /*
 
-   Derby - Class org.apache.derby.impl.tools.cslook.DB_Index
+   Derby - Class org.apache.derby.impl.tools.dblook.DB_Index
 
    Copyright 2004 The Apache Software Foundation or its licensors, as applicable.
 
@@ -18,7 +18,7 @@
 
  */
 
-package org.apache.derby.impl.tools.cslook;
+package org.apache.derby.impl.tools.dblook;
 
 import java.sql.Connection;
 import java.sql.Statement;

Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/dblook/DB_Jar.java
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/cslook/DB_Jar.java	(original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/dblook/DB_Jar.java	Tue Nov 16 18:09:29 2004
@@ -1,6 +1,6 @@
 /*
 
-   Derby - Class org.apache.derby.impl.tools.cslook.DB_Jar
+   Derby - Class org.apache.derby.impl.tools.dblook.DB_Jar
 
    Copyright 2004 The Apache Software Foundation or its licensors, as applicable.
 
@@ -18,7 +18,7 @@
 
  */
 
-package org.apache.derby.impl.tools.cslook;
+package org.apache.derby.impl.tools.dblook;
 
 import java.sql.Connection;
 import java.sql.Statement;

Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/dblook/DB_Key.java
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/cslook/DB_Key.java	(original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/dblook/DB_Key.java	Tue Nov 16 18:09:29 2004
@@ -1,6 +1,6 @@
 /*
 
-   Derby - Class org.apache.derby.impl.tools.cslook.DB_Key
+   Derby - Class org.apache.derby.impl.tools.dblook.DB_Key
 
    Copyright 2004 The Apache Software Foundation or its licensors, as applicable.
 
@@ -18,7 +18,7 @@
 
  */
 
-package org.apache.derby.impl.tools.cslook;
+package org.apache.derby.impl.tools.dblook;
 
 import java.sql.Connection;
 import java.sql.Statement;

Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/dblook/DB_Schema.java
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/cslook/DB_Schema.java	(original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/dblook/DB_Schema.java	Tue Nov 16 18:09:29 2004
@@ -1,6 +1,6 @@
 /*
 
-   Derby - Class org.apache.derby.impl.tools.cslook.DB_Schema
+   Derby - Class org.apache.derby.impl.tools.dblook.DB_Schema
 
    Copyright 2004 The Apache Software Foundation or its licensors, as applicable.
 
@@ -18,7 +18,7 @@
 
  */
 
-package org.apache.derby.impl.tools.cslook;
+package org.apache.derby.impl.tools.dblook;
 
 import java.sql.Connection;
 import java.sql.Statement;

Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/dblook/DB_StoredProcedure.java
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/cslook/DB_StoredProcedure.java	(original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/dblook/DB_StoredProcedure.java	Tue Nov 16 18:09:29 2004
@@ -1,6 +1,6 @@
 /*
 
-   Derby - Class org.apache.derby.impl.tools.cslook.DB_StoredProcedure
+   Derby - Class org.apache.derby.impl.tools.dblook.DB_StoredProcedure
 
    Copyright 2004 The Apache Software Foundation or its licensors, as applicable.
 
@@ -18,7 +18,7 @@
 
  */
 
-package org.apache.derby.impl.tools.cslook;
+package org.apache.derby.impl.tools.dblook;
 
 import java.sql.Connection;
 import java.sql.Statement;

Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/dblook/DB_Table.java
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/cslook/DB_Table.java	(original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/dblook/DB_Table.java	Tue Nov 16 18:09:29 2004
@@ -1,6 +1,6 @@
 /*
 
-   Derby - Class org.apache.derby.impl.tools.cslook.DB_Table
+   Derby - Class org.apache.derby.impl.tools.dblook.DB_Table
 
    Copyright 2004 The Apache Software Foundation or its licensors, as applicable.
 
@@ -18,7 +18,7 @@
 
  */
 
-package org.apache.derby.impl.tools.cslook;
+package org.apache.derby.impl.tools.dblook;
 
 import java.sql.Connection;
 import java.sql.Statement;

Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/dblook/DB_Trigger.java
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/cslook/DB_Trigger.java	(original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/dblook/DB_Trigger.java	Tue Nov 16 18:09:29 2004
@@ -1,6 +1,6 @@
 /*
 
-   Derby - Class org.apache.derby.impl.tools.cslook.DB_Trigger
+   Derby - Class org.apache.derby.impl.tools.dblook.DB_Trigger
 
    Copyright 2004 The Apache Software Foundation or its licensors, as applicable.
 
@@ -18,7 +18,7 @@
 
  */
 
-package org.apache.derby.impl.tools.cslook;
+package org.apache.derby.impl.tools.dblook;
 
 import java.sql.Connection;
 import java.sql.Statement;

Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/dblook/DB_View.java
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/cslook/DB_View.java	(original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/dblook/DB_View.java	Tue Nov 16 18:09:29 2004
@@ -1,6 +1,6 @@
 /*
 
-   Derby - Class org.apache.derby.impl.tools.cslook.DB_View
+   Derby - Class org.apache.derby.impl.tools.dblook.DB_View
 
    Copyright 2004 The Apache Software Foundation or its licensors, as applicable.
 
@@ -18,7 +18,7 @@
 
  */
 
-package org.apache.derby.impl.tools.cslook;
+package org.apache.derby.impl.tools.dblook;
 
 import java.sql.Connection;
 import java.sql.Statement;

Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/dblook/Logs.java
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/cslook/Logs.java	(original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/dblook/Logs.java	Tue Nov 16 18:09:29 2004
@@ -1,6 +1,6 @@
 /*
 
-   Derby - Class org.apache.derby.impl.tools.cslook.Logs
+   Derby - Class org.apache.derby.impl.tools.dblook.Logs
 
    Copyright 2004 The Apache Software Foundation or its licensors, as applicable.
 
@@ -18,7 +18,7 @@
 
  */
 
-package org.apache.derby.impl.tools.cslook;
+package org.apache.derby.impl.tools.dblook;
 
 import java.io.PrintWriter;
 import java.io.FileOutputStream;

Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/sysinfo/Main.java
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/sysinfo/Main.java	(original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/impl/tools/sysinfo/Main.java	Tue Nov 16 18:09:29 2004
@@ -63,7 +63,7 @@
   This class can be used to print out system information at the
   command line by issuing the command:
   <PRE>
-    java com.ibm.db2j.tools.SysInfo.main
+    java org.apache.derby.tools.sysinfo
   </PRE>
   Alternatively, you can use SysInfo within your program to display
   Cloudscape information; a Cloudscape version string is returned by this Java code:

Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/loc/sysinfoMessages.properties
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/loc/sysinfoMessages.properties	(original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/loc/sysinfoMessages.properties	Tue Nov 16 18:09:29 2004
@@ -5,7 +5,7 @@
 ###############################################################################
 
 # Sysinfo, SysInfoWriter, and PropertyNames messages are SIF01.*
-SIF01.B=Please contact Cloudscape Technical Support.
+SIF01.B=Please contact Technical Support.
 SIF01.C=Press <return> to continue
 SIF01.D=No Derby System info found!
 SIF01.H=<info unavailable>
@@ -50,7 +50,7 @@
 SIF08.H=user-specified class ({0})
 SIF08.I=Derby Network Server library ({0})
 SIF08.J=Derby embedded engine library ({0})
-SIF08.L=Cloudscape Client libraries ({0})
+SIF08.L=Derby Client libraries ({0})
 SIF08.Q=Derby tools library ({0})
 SIF08.U=({0} not found.)
 SIF08.A=USAGE: {0} anyClass{1}

Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/loc/sysinfoMessages_de_DE.properties
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/loc/sysinfoMessages_de_DE.properties	(original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/loc/sysinfoMessages_de_DE.properties	Tue Nov 16 18:09:29 2004
@@ -5,7 +5,7 @@
 ###############################################################################
 
 # Sysinfo, SysInfoWriter, and PropertyNames messages are SIF01.*
-SIF01.B=Wenden Sie sich an die technische Unterst\u00fctzung f\u00fcr Cloudscape.
+SIF01.B=Wenden Sie sich an die technische Unterst\u00fctzung f\u00fcr Derby.
 SIF01.C=Dr\u00fccken Sie zum Fortfahren die <Eingabetaste>.
 SIF01.D=Es wurde keine Derby-Systeminformation gefunden!
 SIF01.H=<keine Informationen verf\u00fcgbar>
@@ -50,7 +50,7 @@
 SIF08.H=Benutzerdefinierte Klasse ({0})
 SIF08.I=Bibliothek von Derby Network Server ({0})
 SIF08.J=Eingebettete Derby-Engine-Bibliothek ({0})
-SIF08.L=Cloudscape-Client-Bibliotheken ({0})
+SIF08.L=Derby-Client-Bibliotheken ({0})
 SIF08.Q=Derby-Tools-Bibliothek ({0})
 SIF08.U=({0} nicht gefunden.)
 SIF08.A=SYNTAX: {0} eineKlasse{1}

Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/loc/sysinfoMessages_es.properties
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/loc/sysinfoMessages_es.properties	(original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/loc/sysinfoMessages_es.properties	Tue Nov 16 18:09:29 2004
@@ -5,7 +5,7 @@
 ###############################################################################
 
 # Sysinfo, SysInfoWriter, and PropertyNames messages are SIF01.*
-SIF01.B=P\u00f3ngase en contacto con el soporte t\u00e9cnico de Cloudscape.
+SIF01.B=P\u00f3ngase en contacto con el soporte t\u00e9cnico de Derby.
 SIF01.C=Pulse <Intro> para continuar
 SIF01.D=\u00a1No se ha encontrado informaci\u00f3n del sistema Derby!
 SIF01.H=<informaci\u00f3n no disponible>
@@ -50,7 +50,7 @@
 SIF08.H=clase especificada por el usuario ({0})
 SIF08.I=Biblioteca de Derby Network Server ({0})
 SIF08.J=Biblioteca del motor integrado de Derby ({0})
-SIF08.L=Bibliotecas de cliente de Cloudscape ({0})
+SIF08.L=Bibliotecas de cliente de Derby ({0})
 SIF08.Q=Biblioteca de herramientas de Derby ({0})
 SIF08.U=(No se encontr\u00f3 {0}).
 SIF08.A=Uso: {0} anyClass{1}

Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/loc/sysinfoMessages_fr.properties
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/loc/sysinfoMessages_fr.properties	(original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/loc/sysinfoMessages_fr.properties	Tue Nov 16 18:09:29 2004
@@ -5,7 +5,7 @@
 ###############################################################################
 
 # Sysinfo, SysInfoWriter, and PropertyNames messages are SIF01.*
-SIF01.B=Prenez contact avec le support technique Cloudscape.
+SIF01.B=Prenez contact avec le support technique Derby.
 SIF01.C=Appuyez sur <Entr\u00e9e> pour continuer
 SIF01.D=Aucune information sur Derby System n''a \u00e9t\u00e9 trouv\u00e9e.
 SIF01.H=<informations non disponibles>
@@ -50,7 +50,7 @@
 SIF08.H=classes sp\u00e9cifi\u00e9e par l''utilisateur ({0})
 SIF08.I=Biblioth\u00e8que Derby Network Server ({0})
 SIF08.J=Biblioth\u00e8que de moteur int\u00e9gr\u00e9 Derby ({0})
-SIF08.L=Biblioth\u00e8ques principales Cloudscape ({0})
+SIF08.L=Biblioth\u00e8ques principales Derby ({0})
 SIF08.Q=Biblioth\u00e8que d''outils Derby ({0})
 SIF08.U=({0} est introuvable.)
 SIF08.A=SYNTAXE : {0} touteClasse{1}

Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/loc/sysinfoMessages_it.properties
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/loc/sysinfoMessages_it.properties	(original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/loc/sysinfoMessages_it.properties	Tue Nov 16 18:09:29 2004
@@ -5,7 +5,7 @@
 ###############################################################################
 
 # Sysinfo, SysInfoWriter, and PropertyNames messages are SIF01.*
-SIF01.B=Rivolgersi al servizio di assistenza tecnica di Cloudscape.
+SIF01.B=Rivolgersi al servizio di assistenza tecnica di Derby.
 SIF01.C=Premere <invio> per continuare
 SIF01.D=Non \u00e8 stato trovato alcun sistema Derby
 SIF01.H=<informazioni non disponibili>
@@ -50,7 +50,7 @@
 SIF08.H=classe specificata dall''utente ({0})
 SIF08.I=Libreria di Network Server di Derby, ({0})
 SIF08.J=Libreria di engine di Derby ({0})
-SIF08.L=Librerie del client di Cloudscape ({0})
+SIF08.L=Librerie del client di Derby ({0})
 SIF08.Q=Libreria di strumenti di Derby ({0})
 SIF08.U=({0} non trovato)
 SIF08.A=UTILIZZO: {0} anyClass{1}

Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/loc/sysinfoMessages_ja_JP.properties
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/loc/sysinfoMessages_ja_JP.properties	(original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/loc/sysinfoMessages_ja_JP.properties	Tue Nov 16 18:09:29 2004
@@ -5,7 +5,7 @@
 ###############################################################################
 
 # Sysinfo, SysInfoWriter, and PropertyNames messages are SIF01.*
-SIF01.B=Cloudscape \u30c6\u30af\u30cb\u30ab\u30eb\u30fb\u30b5\u30dd\u30fc\u30c8\u306b\u9023\u7d61\u3057\u3066\u304f\u3060\u3055\u3044\u3002
+SIF01.B=Derby \u30c6\u30af\u30cb\u30ab\u30eb\u30fb\u30b5\u30dd\u30fc\u30c8\u306b\u9023\u7d61\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 SIF01.C=<return> \u3092\u62bc\u3057\u3066\u7d9a\u884c\u3057\u307e\u3059
 SIF01.D=Derby \u30b7\u30b9\u30c6\u30e0\u60c5\u5831\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093!
 SIF01.H=<\u60c5\u5831\u304c\u4f7f\u7528\u4e0d\u53ef>
@@ -50,7 +50,7 @@
 SIF08.H=\u30e6\u30fc\u30b6\u30fc\u6307\u5b9a\u30af\u30e9\u30b9 ({0})
 SIF08.I=Derby Network Server \u30e9\u30a4\u30d6\u30e9\u30ea\u30fc ({0})
 SIF08.J=Derby \u7d44\u307f\u8fbc\u307f\u30a8\u30f3\u30b8\u30f3\u30fb\u30e9\u30a4\u30d6\u30e9\u30ea\u30fc ({0})
-SIF08.L=Cloudscape Client \u30e9\u30a4\u30d6\u30e9\u30ea\u30fc ({0})
+SIF08.L=Derby Client \u30e9\u30a4\u30d6\u30e9\u30ea\u30fc ({0})
 SIF08.Q=Derby \u30c4\u30fc\u30eb\u30fb\u30e9\u30a4\u30d6\u30e9\u30ea\u30fc ({0})
 SIF08.U=({0} \u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002)
 SIF08.A=\u4f7f\u7528\u6cd5: {0} anyClass{1}

Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/loc/sysinfoMessages_ko_KR.properties
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/loc/sysinfoMessages_ko_KR.properties	(original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/loc/sysinfoMessages_ko_KR.properties	Tue Nov 16 18:09:29 2004
@@ -5,7 +5,7 @@
 ###############################################################################
 
 # Sysinfo, SysInfoWriter, and PropertyNames messages are SIF01.*
-SIF01.B=Cloudscape \uae30\uc220 \uc9c0\uc6d0\uc5d0 \ubb38\uc758\ud558\uc2ed\uc2dc\uc624.
+SIF01.B=Derby \uae30\uc220 \uc9c0\uc6d0\uc5d0 \ubb38\uc758\ud558\uc2ed\uc2dc\uc624.
 SIF01.C=\uacc4\uc18d\ud558\ub824\uba74 <return>\uc744 \ub204\ub974\uc2ed\uc2dc\uc624.
 SIF01.D=Derby \uc2dc\uc2a4\ud15c \uc815\ubcf4\ub97c \ucc3e\uc744 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4!
 SIF01.H=<\uc815\ubcf4\uac00 \uc0ac\uc6a9 \uac00\ub2a5\ud558\uc9c0 \uc54a\uc74c>
@@ -50,7 +50,7 @@
 SIF08.H=\uc0ac\uc6a9\uc790 \uc9c0\uc815 \ud074\ub798\uc2a4({0})
 SIF08.I=Derby Network Server \ub77c\uc774\ube0c\ub7ec\ub9ac({0})
 SIF08.J=Derby \uc784\ubca0\ub514\ub4dc \uc5d4\uc9c4 \ub77c\uc774\ube0c\ub7ec\ub9ac({0})
-SIF08.L=Cloudscape \ud074\ub77c\uc774\uc5b8\ud2b8 \ub77c\uc774\ube0c\ub7ec\ub9ac({0})
+SIF08.L=Derby \ud074\ub77c\uc774\uc5b8\ud2b8 \ub77c\uc774\ube0c\ub7ec\ub9ac({0})
 SIF08.Q=Derby \ub3c4\uad6c \ub77c\uc774\ube0c\ub7ec\ub9ac({0})
 SIF08.U=({0}\uc744(\ub97c) \ucc3e\uc744 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.)
 SIF08.A=\uc0ac\uc6a9\ubc95: {0} anyClass{1}

Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/loc/sysinfoMessages_pt_BR.properties
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/loc/sysinfoMessages_pt_BR.properties	(original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/loc/sysinfoMessages_pt_BR.properties	Tue Nov 16 18:09:29 2004
@@ -5,7 +5,7 @@
 ###############################################################################
 
 # Sysinfo, SysInfoWriter, and PropertyNames messages are SIF01.*
-SIF01.B=Entre em contato com o Suporte T\u00e9cnico do Cloudscape.
+SIF01.B=Entre em contato com o Suporte T\u00e9cnico do Derby.
 SIF01.C=Pressione <return> para continuar
 SIF01.D=N\u00e3o foi encontrada nenhuma informa\u00e7\u00e3o sobre o Sistema Derby!
 SIF01.H=<info unavailable>
@@ -42,7 +42,7 @@
 SIF04.C=<null>
 
 # ClasspathTester messages are SIF08
-SIF08.B=Procurando todas as bibliotecas relacionadas ao Cloudscape; geralmente, apenas algumas s\u00e3o necess\u00e1rias.
+SIF08.B=Procurando todas as bibliotecas relacionadas ao Derby; geralmente, apenas algumas s\u00e3o necess\u00e1rias.
 SIF08.C=Para obter uma lista de poss\u00edveis argumentos, digite {0}
 SIF08.D=ENCONTRADO NO CAMINHO DA CLASSE:
 SIF08.E=N\u00c3O ENCONTRADO NO CAMINHO DA CLASSE:
@@ -50,7 +50,7 @@
 SIF08.H=classe especificada pelo usu\u00e1rio ({0})
 SIF08.I=Biblioteca do Derby Network Server ({0})
 SIF08.J=Biblioteca de mecanismos incorporada ao Derby ({0})
-SIF08.L=Bibliotecas do Cliente Cloudscape ({0})
+SIF08.L=Bibliotecas do Cliente Derby ({0})
 SIF08.Q=Biblioteca de ferramentas do Derby ({0})
 SIF08.U=({0} n\u00e3o encontrado.)
 SIF08.A=USO: {0} anyClass{1}

Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/loc/sysinfoMessages_zh_CN.properties
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/loc/sysinfoMessages_zh_CN.properties	(original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/loc/sysinfoMessages_zh_CN.properties	Tue Nov 16 18:09:29 2004
@@ -5,7 +5,7 @@
 ###############################################################################
 
 # Sysinfo, SysInfoWriter, and PropertyNames messages are SIF01.*
-SIF01.B=\u8bf7\u8054\u7cfb Cloudscape \u6280\u672f\u652f\u6301\u4eba\u5458\u3002
+SIF01.B=\u8bf7\u8054\u7cfb Derby \u6280\u672f\u652f\u6301\u4eba\u5458\u3002
 SIF01.C=\u6309 <\u8fd4\u56de\u952e> \u4ee5\u7ee7\u7eed
 SIF01.D=\u672a\u627e\u5230 Derby \u7cfb\u7edf\u4fe1\u606f\uff01
 SIF01.H=<\u4fe1\u606f\u4e0d\u53ef\u7528>

Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/loc/sysinfoMessages_zh_TW.properties
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/loc/sysinfoMessages_zh_TW.properties	(original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/loc/sysinfoMessages_zh_TW.properties	Tue Nov 16 18:09:29 2004
@@ -5,7 +5,7 @@
 ###############################################################################
 
 # Sysinfo, SysInfoWriter, and PropertyNames messages are SIF01.*
-SIF01.B=\u8acb\u6d3d\u8a62 Cloudscape \u6280\u8853\u652f\u63f4\u4e2d\u5fc3\u3002
+SIF01.B=\u8acb\u6d3d\u8a62 Derby \u6280\u8853\u652f\u63f4\u4e2d\u5fc3\u3002
 SIF01.C=\u8acb\u6309 <return>\uff0c\u7e7c\u7e8c\u4f5c\u696d
 SIF01.D=\u627e\u4e0d\u5230 Derby \u7cfb\u7d71\u8cc7\u8a0a\uff01
 SIF01.H=<\u8cc7\u8a0a\u7121\u6cd5\u4f7f\u7528>
@@ -50,7 +50,7 @@
 SIF08.H=\u4f7f\u7528\u8005\u6307\u5b9a\u7684\u985e\u5225 ({0})
 SIF08.I=Derby Network Server \u7a0b\u5f0f\u5eab ({0})
 SIF08.J=Derby \u5167\u5d4c\u5f15\u64ce\u7a0b\u5f0f\u5eab ({0})
-SIF08.L=Cloudscape \u7528\u6236\u7aef\u7a0b\u5f0f\u5eab ({0})
+SIF08.L=Derby \u7528\u6236\u7aef\u7a0b\u5f0f\u5eab ({0})
 SIF08.Q=Derby \u5de5\u5177\u7a0b\u5f0f\u5eab ({0})
 SIF08.U=\uff08\u627e\u4e0d\u5230 {0}\u3002\uff09
 SIF08.A=\u7528\u6cd5\uff1a{0} anyClass{1}

Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages.properties
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages.properties	(original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages.properties	Tue Nov 16 18:09:29 2004
@@ -1,5 +1,4 @@
-# Directory com/ibm/db2j/tools
-# Directory com/ibm/db2j/util
+# Directory org/apache/derby/tools
 # From JDBCDisplayUtil.java
 UT_Error0=\ (errorCode = {0})
 UT_NoSqlst=(no SQLState)
@@ -19,10 +18,7 @@
 UT_NoCurreRow=No current row
 UT_NoCurreRow_19=No current row
 UT_Resul0_20=ResultSet #{0}
-# Directory com/ibm/db2j/internalUtil
-# From AppStreamReader.java
-UT_InvaEscaChar=Invalid escape character.
-# Directory com/ibm/db2j/tools/ijImpl
+# Directory org/apache/derby/impl/tools/ij
 # From Main.java
 IJ_IjErroResoNo=IJ ERROR: resource not found: {0}
 IJ_IjErroFileNo=IJ ERROR: file not found: {0}
@@ -144,7 +140,7 @@
 IJ_UsageJavaComCloudToolsIjPPropeInput=Usage: java org.apache.derby.tools.ij [-p propertyfile] [-ca connectionAttributePropertyFile] [inputfile]
 IJ_IjWarniAutocMayCloseUsingResulSet=IJ WARNING: Autocommit may close using result set
 # From utilMain.java
-IJ_IjVers30C199=ij version {0} (C) Copyright IBM Corp. 1997, 2004.
+IJ_IjVers30C199=ij version {0}
 IJ_ElapTime0Mil=ELAPSED TIME = {0} milliseconds
 IJ_IjErro0=IJ ERROR: {0}
 IJ_JavaErro0=JAVA ERROR: {0}
@@ -162,21 +158,21 @@
 IJ_IlleValu=ILLEGAL VALUE
 IJ_01SeeClouLog={0} : {1} (see cloudcape.LOG)
 IJ_Pool=PooledConnection
-IJ_XAClass=EmbeddedXADataSource not in classpath, please put cs.jar file in your classpath
-IJ_XANoI=EmbeddedXADataSource cannot be instantiated, please put cs.jar file in your classpath
+IJ_XAClass=EmbeddedXADataSource not in classpath, please put derby.jar file in your classpath
+IJ_XANoI=EmbeddedXADataSource cannot be instantiated, please put derby.jar file in your classpath
 # From ParseException.java
 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}"
-TL_incorCase=Case of the Cloudscape attribute is incorrect.
-TL_unknownAtt=Attribute is unknown to Cloudscape.
+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.
 TL_dupAtt=Attribute is a duplicate.
 TL_urlLabel1=URL Attribute {0}{1}{2}
-# Directory com/ibm/db2j/tools
-# From cslook.java
-CSLOOK_MissingLocale=Resources not found for current locale; switching to {0}.
-CSLOOK_Usage=\
+# Directory org/apache/derby/tools
+# From dblook.java
+DBLOOK_MissingLocale=Resources not found for current locale; switching to {0}.
+DBLOOK_Usage=\
 \ \n\
 \ 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\
@@ -199,38 +195,38 @@
 \ \t will be written.\n\
 \ \t\tIf not specified, default is the console.\
 \ \n
-CSLOOK_FileCreation=This file was created using Derby's dblook utility.
-CSLOOK_OutputLocation=Output will be sent to file {0}\n
-CSLOOK_Timestamp=Timestamp: {0}
-CSLOOK_DBName=Source database is: {0}
-CSLOOK_DBUrl=Connection URL is: {0}
-CSLOOK_TargetTables=The dblook utility will consider only specified tables.
-CSLOOK_TargetSchema=Specified schema is: {0}
-# Directory com/ibm/db2j/tools/cslookImpl/...
-CSLOOK_TablesHeader=DDL Statements for tables
-CSLOOK_ChecksHeader=DDL Statements for checks
-CSLOOK_IndexesHeader=DDL Statements for indexes
-CSLOOK_JarsHeader=DDL Statements for jars
-CSLOOK_KeysHeader=DDL Statements for keys
-CSLOOK_PrimUniqueHeader=primary/unique
-CSLOOK_ForeignHeader=foreign
-CSLOOK_SchemasHeader=DDL Statements for schemas
-CSLOOK_StoredProcHeader=DDL Statements for stored procedures
-CSLOOK_TriggersHeader=DDL Statements for triggers
-CSLOOK_ViewsHeader=DDL Statements for views
-CSLOOK_Jar_Note=\
+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}
+DBLOOK_DBUrl=Connection URL is: {0}
+DBLOOK_TargetTables=The dblook utility will consider only specified tables.
+DBLOOK_TargetSchema=Specified schema is: {0}
+# Directory org/apache/derby/tools/impl/dblook
+DBLOOK_TablesHeader=DDL Statements for tables
+DBLOOK_ChecksHeader=DDL Statements for checks
+DBLOOK_IndexesHeader=DDL Statements for indexes
+DBLOOK_JarsHeader=DDL Statements for jars
+DBLOOK_KeysHeader=DDL Statements for keys
+DBLOOK_PrimUniqueHeader=primary/unique
+DBLOOK_ForeignHeader=foreign
+DBLOOK_SchemasHeader=DDL Statements for schemas
+DBLOOK_StoredProcHeader=DDL Statements for stored procedures
+DBLOOK_TriggersHeader=DDL Statements for triggers
+DBLOOK_ViewsHeader=DDL Statements for views
+DBLOOK_Jar_Note=\
 **** NOTE **** In order for jar files to be loaded correctly,\n\
--- you must either 1) ensure that the CSJARS directory (created\n\
+-- you must either 1) ensure that the DBJARS directory (created\n\
 -- automatically by dblook) exists where it was created (i.e. at\n\
 -- the path shown in the statements below), or else 2) change the\n\
 -- path in the statements below to reflect the current location of\n\
--- CSJARS.  If the CSJARS directory does not exist, or if it\n\
+-- DBJARS.  If the DBJARS directory does not exist, or if it\n\
 -- has been moved and the path is not correct, the following DDL\n\
 -- statements will throw errors, and the jar files will NOT be\n\
 -- loaded.
-CSLOOK_FailedToLoadJar=Failed to load jar file {0}
-CSLOOK_DefaultSchema=Reverting back to default schema 'APP'
-CSLOOK_AtLeastOneDebug=\
+DBLOOK_FailedToLoadJar=Failed to load jar file {0}
+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\
 -- to review the message(s).\n\

Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_de_DE.properties
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_de_DE.properties	(original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_de_DE.properties	Tue Nov 16 18:09:29 2004
@@ -143,7 +143,7 @@
 IJ_UsageJavaComCloudToolsIjPPropeInput=Syntax: java org.apache.derby.tools.ij [-p Merkmaldatei] [-ca Merkmaldatei_f\u00fcr_Verbindungsattribut] [Eingabedatei]
 IJ_IjWarniAutocMayCloseUsingResulSet=IJ-WARNUNG: Beim automatischen Festschreiben kann die verwendete Ergebnismenge geschlossen werden.
 # From utilMain.java
-IJ_IjVers30C199=IJ Version {0} (C) Copyright IBM Corp. 1997, 2004.
+IJ_IjVers30C199=IJ Version {0}
 IJ_ElapTime0Mil=ABGELAUFENE ZEIT = {0} Millisekunden
 IJ_IjErro0=IJ-FEHLER: {0}
 IJ_JavaErro0=JAVA-FEHLER: {0}
@@ -167,15 +167,15 @@
 IJ_EncoAtLineColu=In Zeile {1}, Spalte {2}, wurde "{0}" gefunden
 # From TokenMgrError.java
 IJ_LexiErroAtLine0Colu1=Lexikalischer Fehler in Zeile {0}, Spalte {1}. Gefunden: {2} nach: "{3}"
-TL_incorCase=Die Gro\u00df-/Kleinschreibung des Cloudscape-Attributs ist falsch.
-TL_unknownAtt=Das Attribut ist in Cloudscape unbekannt.
+TL_incorCase=Die Gro\u00df-/Kleinschreibung des Derby-Attributs ist falsch.
+TL_unknownAtt=Das Attribut ist in Derby unbekannt.
 TL_trueFalse=Der Wert muss auf wahr/falsch gesetzt werden.
 TL_dupAtt=Das Attribut ist ein Duplikat.
 TL_urlLabel1=URL-Attribut {0}{1}{2}
 # Directory com/ibm/db2j/tools
-# From cslook.java
-CSLOOK_MissingLocale=F\u00fcr die aktuelle L\u00e4ndereinstellung wurden keine Ressourcen gefunden. Es wird auf {0} umgeschaltet.
-CSLOOK_Usage=\ \n\
+# From dblook.java
+DBLOOK_MissingLocale=F\u00fcr die aktuelle L\u00e4ndereinstellung wurden keine Ressourcen gefunden. Es wird auf {0} umgeschaltet.
+DBLOOK_Usage=\ \n\
 \ SYNTAX:\n\
 \ java org.apache.derby.tools.dblook -d <Quellen-DB-URL> [OPTIONEN]\n\
 \n\
@@ -207,37 +207,37 @@
 \ \t-o <Dateiname> f\u00fcr die Angabe des Namens der Datei, in die die generierte\n\
 \ \t DDL geschrieben werden soll. \n\
 \ \t\tIst diese Option nicht angegeben, erfolgt die Ausgabe standardm\u00e4\u00dfig auf der Konsole.\ \n
-CSLOOK_FileCreation=Diese Datei wurde mit dem Cloudscape-Dienstprogramm cslook erstellt.
-CSLOOK_OutputLocation=Die Ausgabe wird an die Datei {0} gesendet.\n
-CSLOOK_Timestamp=Zeitmarke: {0}
-CSLOOK_DBName=Quellendatenbank: {0}
-CSLOOK_DBUrl=Verbindungs-URL: {0}
-CSLOOK_TargetTables=Das Dienstprogramm cslook ber\u00fccksichtigt nur die angegebenen Tabellen.
-CSLOOK_TargetSchema=Angegebenes Schema: {0}
-# Directory com/ibm/db2j/tools/cslookImpl/...
-CSLOOK_TablesHeader=DDL-Anweisungen f\u00fcr Tabellen
-CSLOOK_ChecksHeader=DDL-Anweisungen f\u00fcr \u00dcberpr\u00fcfungen
-CSLOOK_IndexesHeader=DDL-Anweisungen f\u00fcr Indizes
-CSLOOK_JarsHeader=DDL-Anweisungen f\u00fcr JARs
-CSLOOK_KeysHeader=DDL-Anweisungen f\u00fcr Schl\u00fcssel
-CSLOOK_PrimUniqueHeader=prim\u00e4r/eindeutig
-CSLOOK_ForeignHeader=fremd
-CSLOOK_SchemasHeader=DDL-Anweisungen f\u00fcr Schemata
-CSLOOK_StoredProcHeader=DDL-Anweisungen f\u00fcr gespeicherte Prozeduren
-CSLOOK_TriggersHeader=DDL-Anweisungen f\u00fcr Ausl\u00f6ser
-CSLOOK_ViewsHeader=DDL-Anweisungen f\u00fcr Ansichten
-CSLOOK_Jar_Note=**** ANMERKUNG **** F\u00fcr das ordnungsgem\u00e4\u00dfe Laden von JAR-Dateien m\u00fcssen\n\
--- Sie 1) sicherstellen, dass das (von cslook automatisch erstellte)\n\
--- Verzeichnis CSJARS an der Erstellungsposition (d. h. in dem in\n\
+DBLOOK_FileCreation=Diese Datei wurde mit dem Derby-Dienstprogramm dblook erstellt.
+DBLOOK_OutputLocation=Die Ausgabe wird an die Datei {0} gesendet.\n
+DBLOOK_Timestamp=Zeitmarke: {0}
+DBLOOK_DBName=Quellendatenbank: {0}
+DBLOOK_DBUrl=Verbindungs-URL: {0}
+DBLOOK_TargetTables=Das Dienstprogramm dblook ber\u00fccksichtigt nur die angegebenen Tabellen.
+DBLOOK_TargetSchema=Angegebenes Schema: {0}
+# Directory com/ibm/db2j/tools/dblookImpl/...
+DBLOOK_TablesHeader=DDL-Anweisungen f\u00fcr Tabellen
+DBLOOK_ChecksHeader=DDL-Anweisungen f\u00fcr \u00dcberpr\u00fcfungen
+DBLOOK_IndexesHeader=DDL-Anweisungen f\u00fcr Indizes
+DBLOOK_JarsHeader=DDL-Anweisungen f\u00fcr JARs
+DBLOOK_KeysHeader=DDL-Anweisungen f\u00fcr Schl\u00fcssel
+DBLOOK_PrimUniqueHeader=prim\u00e4r/eindeutig
+DBLOOK_ForeignHeader=fremd
+DBLOOK_SchemasHeader=DDL-Anweisungen f\u00fcr Schemata
+DBLOOK_StoredProcHeader=DDL-Anweisungen f\u00fcr gespeicherte Prozeduren
+DBLOOK_TriggersHeader=DDL-Anweisungen f\u00fcr Ausl\u00f6ser
+DBLOOK_ViewsHeader=DDL-Anweisungen f\u00fcr Ansichten
+DBLOOK_Jar_Note=**** ANMERKUNG **** F\u00fcr das ordnungsgem\u00e4\u00dfe Laden von JAR-Dateien m\u00fcssen\n\
+-- Sie 1) sicherstellen, dass das (von dblook automatisch erstellte)\n\
+-- Verzeichnis DBJARS an der Erstellungsposition (d. h. in dem in\n\
 -- den folgenden Anweisungen angegebenen Pfad) vorhanden ist, oder\n\
 -- 2) den in den folgenden Anweisungen angegebenen Pfad auf die \n\
--- aktuelle Position von CSJARS setzen. Wenn das Verzeichnis CSJARS\n\
+-- aktuelle Position von DBJARS setzen. Wenn das Verzeichnis DBJARS\n\
 -- nicht vorhanden ist oder verschoben wurde und der Pfad nicht stimmt,\n\
 -- l\u00f6sen die folgenden DDL-Anweisungen Fehler aus, die das Laden der\n\
 -- JAR-Dateien verhindern.
-CSLOOK_FailedToLoadJar=Die JAR-Datei {0} konnte nicht geladen werden
-CSLOOK_DefaultSchema=R\u00fcckkehr zum Standardschema 'APP'
-CSLOOK_AtLeastOneDebug=-- Anmerkung: Beim Generieren der DDL wurde mindestens eine\n\
+DBLOOK_FailedToLoadJar=Die JAR-Datei {0} konnte nicht geladen werden
+DBLOOK_DefaultSchema=R\u00fcckkehr zum Standardschema 'APP'
+DBLOOK_AtLeastOneDebug=-- Anmerkung: Beim Generieren der DDL wurde mindestens eine\n\
 -- unerwartete Fehlernachricht/Warnung festgestellt. \u00dcberpr\u00fcfen Sie die\n\
--- Nachrichten in cslook.log.\n\
+-- Nachrichten in dblook.log.\n\
 \n

Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_es.properties
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_es.properties	(original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_es.properties	Tue Nov 16 18:09:29 2004
@@ -146,7 +146,7 @@
 IJ_UsageJavaComCloudToolsIjPPropeInput=Uso: java org.apache.derby.tools.ij [-p archivopropiedades] [-ca archivo_propiedades_atributo_conexi\u00f3n] [archivoEntrada]
 IJ_IjWarniAutocMayCloseUsingResulSet=AVISO IJ: AutoCommit puede cerrar utilizando el juego de resultados
 # From utilMain.java
-IJ_IjVers30C199=ij versi\u00f3n {0} (C) Copyright IBM Corp. 1997, 2004.
+IJ_IjVers30C199=ij versi\u00f3n {0}
 IJ_ElapTime0Mil=TIEMPO TRANSCURRIDO = {0} milisegundos
 IJ_IjErro0=ERROR IJ: {0}
 IJ_JavaErro0=ERROR JAVA: {0}
@@ -170,15 +170,15 @@
 IJ_EncoAtLineColu=Se ha encontrado "{0}" en la l\u00ednea {1}, columna {2}
 # From TokenMgrError.java
 IJ_LexiErroAtLine0Colu1=Error l\u00e9xico en la l\u00ednea {0}, columna {1}.  Se ha encontrado: {2} despu\u00e9s de :"{3}"
-TL_incorCase=Las may\u00fasculas/min\u00fasculas del atributo Cloudscape son incorrectas.
-TL_unknownAtt=Atributo desconocido para Cloudscape.
+TL_incorCase=Las may\u00fasculas/min\u00fasculas del atributo Derby son incorrectas.
+TL_unknownAtt=Atributo desconocido para Derby.
 TL_trueFalse=El valor debe establecerse como verdadero/falso.
 TL_dupAtt=El atributo es un duplicado.
 TL_urlLabel1=Atributo de URL {0}{1}{2}
 # Directory com/ibm/db2j/tools
-# From cslook.java
-CSLOOK_MissingLocale=No se han encontrado recursos para el entorno local actual, cambiando a {0}.
-CSLOOK_Usage=\ \n\
+# From dblook.java
+DBLOOK_MissingLocale=No se han encontrado recursos para el entorno local actual, cambiando a {0}.
+DBLOOK_Usage=\ \n\
 \ USO:\n\
 \ java org.apache.derby.tools.dblook -d <URL_BD_origen> [OPCIONES]\n\
 \n\
@@ -210,36 +210,36 @@
 \ \t-o <nombrearchivo> para especificar el nombre del archivo en el que\n\
 \ \t se escribir\u00e1n las DDL generadas. \n\
 \ \t\tSi no se especifica, el valor por omisi\u00f3n es la consola.\ \n
-CSLOOK_FileCreation=Este archivo se cre\u00f3 con el programa de utilidad cslook de Cloudscape.
-CSLOOK_OutputLocation=Se enviar\u00e1 la salida al archivo {0}\n
-CSLOOK_Timestamp=Indicaci\u00f3n de hora: {0}
-CSLOOK_DBName=Base de datos origen: {0}
-CSLOOK_DBUrl=URL de conexi\u00f3n: {0}
-CSLOOK_TargetTables=El programa de utilidad cslook s\u00f3lo considerar\u00e1 las tablas especificadas.
-CSLOOK_TargetSchema=Esquema especificado: {0}
-# Directory com/ibm/db2j/tools/cslookImpl/...
-CSLOOK_TablesHeader=Sentencias DDL para tablas
-CSLOOK_ChecksHeader=Sentencias DDL para comprobaciones
-CSLOOK_IndexesHeader=Sentencias DDL para \u00edndices
-CSLOOK_JarsHeader=Sentencias DDL para jars
-CSLOOK_KeysHeader=Sentencias DDL para claves
-CSLOOK_PrimUniqueHeader=primaria/exclusiva
-CSLOOK_ForeignHeader=for\u00e1nea
-CSLOOK_SchemasHeader=Sentencias DDL para esquemas
-CSLOOK_StoredProcHeader=Sentencias DDL para procedimientos almacenados
-CSLOOK_TriggersHeader=Sentencias DDL para desencadenantes
-CSLOOK_ViewsHeader=Sentencias DDL para vistas
-CSLOOK_Jar_Note=**** NOTA **** Para que los archivos jar se carguen correctamente,\n\
--- debe 1) asegurarse de que el directorio CSJARS (creado autom\u00e1ticamente por\n\
--- cslook) existe donde se cre\u00f3 (es decir, en la v\u00eda de acceso\n\
+DBLOOK_FileCreation=Este archivo se cre\u00f3 con el programa de utilidad dblook de Derby.
+DBLOOK_OutputLocation=Se enviar\u00e1 la salida al archivo {0}\n
+DBLOOK_Timestamp=Indicaci\u00f3n de hora: {0}
+DBLOOK_DBName=Base de datos origen: {0}
+DBLOOK_DBUrl=URL de conexi\u00f3n: {0}
+DBLOOK_TargetTables=El programa de utilidad dblook s\u00f3lo considerar\u00e1 las tablas especificadas.
+DBLOOK_TargetSchema=Esquema especificado: {0}
+# Directory com/ibm/db2j/tools/dblookImpl/...
+DBLOOK_TablesHeader=Sentencias DDL para tablas
+DBLOOK_ChecksHeader=Sentencias DDL para comprobaciones
+DBLOOK_IndexesHeader=Sentencias DDL para \u00edndices
+DBLOOK_JarsHeader=Sentencias DDL para jars
+DBLOOK_KeysHeader=Sentencias DDL para claves
+DBLOOK_PrimUniqueHeader=primaria/exclusiva
+DBLOOK_ForeignHeader=for\u00e1nea
+DBLOOK_SchemasHeader=Sentencias DDL para esquemas
+DBLOOK_StoredProcHeader=Sentencias DDL para procedimientos almacenados
+DBLOOK_TriggersHeader=Sentencias DDL para desencadenantes
+DBLOOK_ViewsHeader=Sentencias DDL para vistas
+DBLOOK_Jar_Note=**** NOTA **** Para que los archivos jar se carguen correctamente,\n\
+-- debe 1) asegurarse de que el directorio DBJARS (creado autom\u00e1ticamente por\n\
+-- dblook) existe donde se cre\u00f3 (es decir, en la v\u00eda de acceso\n\
 -- que se muestra en las sentencias siguientes), o bien 2) cambiar la\n\
 -- v\u00eda de acceso en la sentencia siguiente para reflejar la ubicaci\u00f3n actual \n\
--- de CSJARS.  Si el directorio CSJARS no existe o si se ha movido y la v\u00eda\n\
+-- de DBJARS.  Si el directorio DBJARS no existe o si se ha movido y la v\u00eda\n\
 -- de acceso no es correcta, las siguiente sentencias DDL generar\u00e1n\n\
 -- errores y los archivos jar NO se cargar\u00e1n.
-CSLOOK_FailedToLoadJar=No se pudo cargar el archivo jar {0}.
-CSLOOK_DefaultSchema=Volviendo de nuevo al esquema por omisi\u00f3n 'APP'.
-CSLOOK_AtLeastOneDebug=-- Nota: Se encontr\u00f3 por lo menos un mensaje de error/aviso\n\
--- en la generaci\u00f3n de DLL.  Consulte cslook.log\n\
+DBLOOK_FailedToLoadJar=No se pudo cargar el archivo jar {0}.
+DBLOOK_DefaultSchema=Volviendo de nuevo al esquema por omisi\u00f3n 'APP'.
+DBLOOK_AtLeastOneDebug=-- Nota: Se encontr\u00f3 por lo menos un mensaje de error/aviso\n\
+-- en la generaci\u00f3n de DLL.  Consulte dblook.log\n\
 -- para ver los mensajes.\n\
 \n

Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_fr.properties
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_fr.properties	(original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_fr.properties	Tue Nov 16 18:09:29 2004
@@ -143,7 +143,7 @@
 IJ_UsageJavaComCloudToolsIjPPropeInput=Syntaxe : java org.apache.derby.tools.ij [-p fichier_propri\u00e9t\u00e9s] [-ca fichier_propri\u00e9t\u00e9s_attributs_connexion] [fichier_entr\u00e9e]
 IJ_IjWarniAutocMayCloseUsingResulSet=AVERTISSEMENT IJ : La validation automatique peut se fermer \u00e0 l'aide de l'ensemble de r\u00e9sultats
 # From utilMain.java
-IJ_IjVers30C199=Version ij {0} (C) Copyright IBM Corp. 1997, 2004.
+IJ_IjVers30C199=Version ij {0}
 IJ_ElapTime0Mil=TEMPS ECOULE = {0} millisecondes
 IJ_IjErro0=ERREUR IJ : {0}
 IJ_JavaErro0=ERREUR JAVA : {0}
@@ -167,15 +167,15 @@
 IJ_EncoAtLineColu="{0}" d\u00e9tect\u00e9 \u00e0 la ligne {1}, colonne {2}
 # From TokenMgrError.java
 IJ_LexiErroAtLine0Colu1=Erreur lexicale \u00e0 la ligne {0}, colonne {1}.  D\u00e9tect\u00e9e : {2}apr\u00e8s :"{3}"
-TL_incorCase=La casse de l'attribut Cloudscape est incorrecte.
-TL_unknownAtt=Attribut inconnu de Cloudscape.
+TL_incorCase=La casse de l'attribut Derby est incorrecte.
+TL_unknownAtt=Attribut inconnu de Derby.
 TL_trueFalse=La valeur doit \u00eatre true/false.
 TL_dupAtt=L'attribut est en double.
 TL_urlLabel1=Attribut URL {0}{1}{2}
 # Directory com/ibm/db2j/tools
-# From cslook.java
-CSLOOK_MissingLocale=Ressources introuvables pour l''environnement local actuel. Passage \u00e0 {0}.
-CSLOOK_Usage=\ \n\
+# From dblook.java
+DBLOOK_MissingLocale=Ressources introuvables pour l''environnement local actuel. Passage \u00e0 {0}.
+DBLOOK_Usage=\ \n\
 \ SYNTAXE :\n\
 \ java org.apache.derby.tools.dblook -d <URLBDsource> [OPTIONS]\n\
 \n\
@@ -209,36 +209,36 @@
 \ \t-o <nom_fichier> pour sp\u00e9cifier le nom du fichier dans lequel la DDL\n\
 \ \t g\u00e9n\u00e9r\u00e9e sera enregistr\u00e9e.\n\
 \ \t\tSi rien n'est indiqu\u00e9, la valeur par d\u00e9faut est la console.\ \n
-CSLOOK_FileCreation=Ce fichier a \u00e9t\u00e9 cr\u00e9\u00e9 \u00e0 l'aide de l'utilitaire cslook de Cloudscape.
-CSLOOK_OutputLocation=La sortie sera envoy\u00e9e au fichier {0}\n
-CSLOOK_Timestamp=Horodatage : {0}
-CSLOOK_DBName=La base de donn\u00e9es source est : {0}
-CSLOOK_DBUrl=L''URL de connexion est : {0}
-CSLOOK_TargetTables=L'utilitaire cslook prendra en compte uniquement les tables sp\u00e9cifi\u00e9es.
-CSLOOK_TargetSchema=Le sch\u00e9ma sp\u00e9cifi\u00e9 est : {0}
-# Directory com/ibm/db2j/tools/cslookImpl/...
-CSLOOK_TablesHeader=Instructions DDL pour tables
-CSLOOK_ChecksHeader=Instructions DDL pour v\u00e9rifications
-CSLOOK_IndexesHeader=Instructions DDL pour index
-CSLOOK_JarsHeader=Instructions DDL pour JAR
-CSLOOK_KeysHeader=Instructions DDL pour cl\u00e9s
-CSLOOK_PrimUniqueHeader=primaire/unique
-CSLOOK_ForeignHeader=externe
-CSLOOK_SchemasHeader=Instructions DDL pour sch\u00e9mas
-CSLOOK_StoredProcHeader=Instructions DDL pour proc\u00e9dures stock\u00e9es
-CSLOOK_TriggersHeader=Instructions DDL pour d\u00e9clencheurs
-CSLOOK_ViewsHeader=Instructions DDL pour vues
-CSLOOK_Jar_Note=**** REMARQUE **** Pour que les fichiers jar soient charg\u00e9s correctement,\n\
--- vous devez 1) vous assurer que le r\u00e9pertoire CSJARS (cr\u00e9\u00e9\n\
--- automatiquement par cslook) existe \u00e0 l'emplacement o\u00f9 il a \u00e9t\u00e9 cr\u00e9\u00e9 (ex : dans\n\
+DBLOOK_FileCreation=Ce fichier a \u00e9t\u00e9 cr\u00e9\u00e9 \u00e0 l'aide de l'utilitaire dblook de Derby.
+DBLOOK_OutputLocation=La sortie sera envoy\u00e9e au fichier {0}\n
+DBLOOK_Timestamp=Horodatage : {0}
+DBLOOK_DBName=La base de donn\u00e9es source est : {0}
+DBLOOK_DBUrl=L''URL de connexion est : {0}
+DBLOOK_TargetTables=L'utilitaire dblook prendra en compte uniquement les tables sp\u00e9cifi\u00e9es.
+DBLOOK_TargetSchema=Le sch\u00e9ma sp\u00e9cifi\u00e9 est : {0}
+# Directory com/ibm/db2j/tools/dblookImpl/...
+DBLOOK_TablesHeader=Instructions DDL pour tables
+DBLOOK_ChecksHeader=Instructions DDL pour v\u00e9rifications
+DBLOOK_IndexesHeader=Instructions DDL pour index
+DBLOOK_JarsHeader=Instructions DDL pour JAR
+DBLOOK_KeysHeader=Instructions DDL pour cl\u00e9s
+DBLOOK_PrimUniqueHeader=primaire/unique
+DBLOOK_ForeignHeader=externe
+DBLOOK_SchemasHeader=Instructions DDL pour sch\u00e9mas
+DBLOOK_StoredProcHeader=Instructions DDL pour proc\u00e9dures stock\u00e9es
+DBLOOK_TriggersHeader=Instructions DDL pour d\u00e9clencheurs
+DBLOOK_ViewsHeader=Instructions DDL pour vues
+DBLOOK_Jar_Note=**** REMARQUE **** Pour que les fichiers jar soient charg\u00e9s correctement,\n\
+-- vous devez 1) vous assurer que le r\u00e9pertoire DBJARS (cr\u00e9\u00e9\n\
+-- automatiquement par dblook) existe \u00e0 l'emplacement o\u00f9 il a \u00e9t\u00e9 cr\u00e9\u00e9 (ex : dans\n\
 -- le chemin affich\u00e9 dans les instructions ci-dessous) ou 2) modifier le\n\
 -- chemin dans les instructions ci-dessous de sorte qu'il corresponde \u00e0 l'emplacement de\n\
---  CSJARS.  Si le r\u00e9pertoire CSJARS n'existe pas ou s'il a \u00e9t\u00e9 d\u00e9plac\u00e9 et que le chemin\n\
+--  DBJARS.  Si le r\u00e9pertoire DBJARS n'existe pas ou s'il a \u00e9t\u00e9 d\u00e9plac\u00e9 et que le chemin\n\
 -- n'est pas correct, les instructions de DLL suivantes enverront des erreurs et les\n\
 -- fichiers jar ne seront PAS charg\u00e9s\n
-CSLOOK_FailedToLoadJar=Le chargement du fichier jar {0} a \u00e9chou\u00e9
-CSLOOK_DefaultSchema=Retour au sch\u00e9ma 'APP' par d\u00e9faut
-CSLOOK_AtLeastOneDebug=-- Remarque : au moins un message d'erreur/d'avertissement\n\
--- inattendu a \u00e9t\u00e9 rencontr\u00e9 au cours de la g\u00e9n\u00e9ration de la DDL.  Consultez le fichier cslook.log\n\
+DBLOOK_FailedToLoadJar=Le chargement du fichier jar {0} a \u00e9chou\u00e9
+DBLOOK_DefaultSchema=Retour au sch\u00e9ma 'APP' par d\u00e9faut
+DBLOOK_AtLeastOneDebug=-- Remarque : au moins un message d'erreur/d'avertissement\n\
+-- inattendu a \u00e9t\u00e9 rencontr\u00e9 au cours de la g\u00e9n\u00e9ration de la DDL.  Consultez le fichier dblook.log\n\
 -- pour lire le ou les messages.\n\
 \n

Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_it.properties
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_it.properties	(original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_it.properties	Tue Nov 16 18:09:29 2004
@@ -143,7 +143,7 @@
 IJ_UsageJavaComCloudToolsIjPPropeInput=Utilizzo: java org.apache.derby.tools.ij [-p propertyfile] [-ca connectionAttributePropertyFile] [inputfile]
 IJ_IjWarniAutocMayCloseUsingResulSet=AVVERTENZA IJ: l''autocommit pu\u00f2 eseguire la chiusura utilizzando l''insieme di risultati
 # From utilMain.java
-IJ_IjVers30C199=ij versione {0} (C) Copyright IBM Corp. 1997, 2004.
+IJ_IjVers30C199=ij versione {0}
 IJ_ElapTime0Mil=TEMPO TRASCORSO = {0} millisecondi
 IJ_IjErro0=ERRORE IJ: {0}
 IJ_JavaErro0=ERRORE JAVA: {0}
@@ -167,15 +167,15 @@
 IJ_EncoAtLineColu=Riscontrato "{0}" sulla riga {1}, colonna {2}
 # From TokenMgrError.java
 IJ_LexiErroAtLine0Colu1=Errore lessicale alla riga {0}, colonna {1}.  Riscontrato: {2}dopo :"{3}"
-TL_incorCase=L''uso delle maiuscole e delle minuscole nell''attributo di Cloudscape non \u00e8 corretto.
-TL_unknownAtt=L''attributo \u00e8 sconosciuto in Cloudscape.
+TL_incorCase=L''uso delle maiuscole e delle minuscole nell''attributo di Derby non \u00e8 corretto.
+TL_unknownAtt=L''attributo \u00e8 sconosciuto in Derby.
 TL_trueFalse=Il valore deve essere impostato su true/false.
 TL_dupAtt=L''attributo \u00e8 un duplicato.
 TL_urlLabel1=Attributo URL {0}{1}{2}
 # Directory com/ibm/db2j/tools
-# From cslook.java
-CSLOOK_MissingLocale=Risorse non trovate per la locale corrente, verr\u00e0 utilizzato {0}.
-CSLOOK_Usage=\ \n\
+# From dblook.java
+DBLOOK_MissingLocale=Risorse non trovate per la locale corrente, verr\u00e0 utilizzato {0}.
+DBLOOK_Usage=\ \n\
 \ UTILIZZO:\n\
 \ java org.apache.derby.tools.dblook -d <sourceDBUrl> [OPTIONS]\n\
 \n\
@@ -207,37 +207,37 @@
 \ \t-o <filename> per specificare il nome file in cui l'istruzione DDL\n\
 \ \t generata sar\u00e0 scritta.\n\
 \ \t\tSe non viene specificato, il valore predefinito \u00e8 la console.\ \n
-CSLOOK_FileCreation=Questo file \u00e8 stato creato mediante il programma di utilit\u00e0 cslook di Cloudscape.
-CSLOOK_OutputLocation=L''output sar\u00e0 inviato al file {0}\n
-CSLOOK_Timestamp=Data/Ora: {0}
-CSLOOK_DBName=Database di origine: {0}
-CSLOOK_DBUrl=URL di connessione: {0}
-CSLOOK_TargetTables=Il programma di utilit\u00e0 cslook prender\u00e0 in analisi solo specifiche tabelle.
-CSLOOK_TargetSchema=Schema specificato: {0}
-# Directory com/ibm/db2j/tools/cslookImpl/...
-CSLOOK_TablesHeader=Istruzioni DDL per le tabelle
-CSLOOK_ChecksHeader=Istruzioni DDL per le verifiche
-CSLOOK_IndexesHeader=Istruzioni DDL per gli indici
-CSLOOK_JarsHeader=Istruzioni DDL per file jar
-CSLOOK_KeysHeader=Istruzioni DDL per le chiavi
-CSLOOK_PrimUniqueHeader=primario/univoco
-CSLOOK_ForeignHeader=esterno
-CSLOOK_SchemasHeader=Istruzioni DDL per gli schemi
-CSLOOK_StoredProcHeader=Istruzioni DDL per le procedure memorizzate
-CSLOOK_TriggersHeader=Istruzioni DDL per trigger
-CSLOOK_ViewsHeader=Istruzioni DDL per le viste
-CSLOOK_Jar_Note=**** NOTA **** Per caricare i file jar correttamente,\n\
--- \u00e8 necessario 1) verificare che la directory CSJARS (creata\n\
--- automaticamente da cslook) sia presente nel percorso in cui \u00e8 stata creata (ad esempio, nel\n\
+DBLOOK_FileCreation=Questo file \u00e8 stato creato mediante il programma di utilit\u00e0 dblook di Derby.
+DBLOOK_OutputLocation=L''output sar\u00e0 inviato al file {0}\n
+DBLOOK_Timestamp=Data/Ora: {0}
+DBLOOK_DBName=Database di origine: {0}
+DBLOOK_DBUrl=URL di connessione: {0}
+DBLOOK_TargetTables=Il programma di utilit\u00e0 dblook prender\u00e0 in analisi solo specifiche tabelle.
+DBLOOK_TargetSchema=Schema specificato: {0}
+# Directory com/ibm/db2j/tools/dblookImpl/...
+DBLOOK_TablesHeader=Istruzioni DDL per le tabelle
+DBLOOK_ChecksHeader=Istruzioni DDL per le verifiche
+DBLOOK_IndexesHeader=Istruzioni DDL per gli indici
+DBLOOK_JarsHeader=Istruzioni DDL per file jar
+DBLOOK_KeysHeader=Istruzioni DDL per le chiavi
+DBLOOK_PrimUniqueHeader=primario/univoco
+DBLOOK_ForeignHeader=esterno
+DBLOOK_SchemasHeader=Istruzioni DDL per gli schemi
+DBLOOK_StoredProcHeader=Istruzioni DDL per le procedure memorizzate
+DBLOOK_TriggersHeader=Istruzioni DDL per trigger
+DBLOOK_ViewsHeader=Istruzioni DDL per le viste
+DBLOOK_Jar_Note=**** NOTA **** Per caricare i file jar correttamente,\n\
+-- \u00e8 necessario 1) verificare che la directory DBJARS (creata\n\
+-- automaticamente da dblook) sia presente nel percorso in cui \u00e8 stata creata (ad esempio, nel\n\
 -- percorso mostrato nelle seguenti istruzioni) oppure 2) modificare il\n\
 -- percorso nelle seguenti istruzioni per riflettere il percorso corrente di\n\
--- CSJARS.  Se la directory CSJARS non esiste o se \u00e8 stata\n\
+-- DBJARS.  Se la directory DBJARS non esiste o se \u00e8 stata\n\
 -- spostata ed il percorso non \u00e8 corretto, le seguenti istruzioni DDL\n\
 -- generano errori ed i file jar NON saranno\n\
 -- caricati.
-CSLOOK_FailedToLoadJar=Errore in fase di caricamento del file jar {0}
-CSLOOK_DefaultSchema=Ripristino dello schema predefinito 'APP'
-CSLOOK_AtLeastOneDebug=-- Nota: E' stato rilevato almeno un messaggio di errore/avvertenza\n\
--- durante la creazione di DDL.  Consultare il file cslook.log\n\
+DBLOOK_FailedToLoadJar=Errore in fase di caricamento del file jar {0}
+DBLOOK_DefaultSchema=Ripristino dello schema predefinito 'APP'
+DBLOOK_AtLeastOneDebug=-- Nota: E' stato rilevato almeno un messaggio di errore/avvertenza\n\
+-- durante la creazione di DDL.  Consultare il file dblook.log\n\
 -- per consultare il(i) messaggio(i).\n\
 \n

Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_ja_JP.properties
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_ja_JP.properties	(original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_ja_JP.properties	Tue Nov 16 18:09:29 2004
@@ -143,7 +143,7 @@
 IJ_UsageJavaComCloudToolsIjPPropeInput=\u4f7f\u7528\u6cd5: java org.apache.derby.tools.ij [-p propertyfile] [-ca connectionAttributePropertyFile] [inputfile]
 IJ_IjWarniAutocMayCloseUsingResulSet=IJ \u8b66\u544a: \u81ea\u52d5\u30b3\u30df\u30c3\u30c8\u306f\u7d50\u679c\u30bb\u30c3\u30c8\u3092\u4f7f\u3063\u3066\u30af\u30ed\u30fc\u30ba\u3059\u308b\u53ef\u80fd\u6027\u304c\u3042\u308a\u307e\u3059
 # From utilMain.java
-IJ_IjVers30C199=ij \u30d0\u30fc\u30b8\u30e7\u30f3 {0} (C) Copyright IBM Corp. 1997, 2004.
+IJ_IjVers30C199=ij \u30d0\u30fc\u30b8\u30e7\u30f3 {0}
 IJ_ElapTime0Mil=\u7d4c\u904e\u6642\u9593 = {0} \u30df\u30ea\u79d2
 IJ_IjErro0=IJ \u30a8\u30e9\u30fc: {0}
 IJ_JavaErro0=JAVA \u30a8\u30e9\u30fc: {0}
@@ -167,15 +167,15 @@
 IJ_EncoAtLineColu="{0}" \u3092\u691c\u51fa\u3057\u307e\u3057\u305f\u3002\u884c {1}\u3001\u5217 {2}\u3002
 # From TokenMgrError.java
 IJ_LexiErroAtLine0Colu1=\u5b57\u53e5\u30a8\u30e9\u30fc\u3002\u884c {0}\u3001\u5217 {1}\u3002  \u691c\u51fa: "{3}" \u306e\u5f8c\u306e {2}
-TL_incorCase=Cloudscape \u5c5e\u6027\u306e\u5927\u6587\u5b57\u5c0f\u6587\u5b57\u306b\u8aa4\u308a\u304c\u3042\u308a\u307e\u3059\u3002
-TL_unknownAtt=\u5c5e\u6027\u306f Cloudscape \u306b\u8a8d\u8b58\u3055\u308c\u307e\u305b\u3093\u3002
+TL_incorCase=Derby \u5c5e\u6027\u306e\u5927\u6587\u5b57\u5c0f\u6587\u5b57\u306b\u8aa4\u308a\u304c\u3042\u308a\u307e\u3059\u3002
+TL_unknownAtt=\u5c5e\u6027\u306f Derby \u306b\u8a8d\u8b58\u3055\u308c\u307e\u305b\u3093\u3002
 TL_trueFalse=\u5024\u306f\u3001true/false \u306b\u8a2d\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 TL_dupAtt=\u5c5e\u6027\u304c\u91cd\u8907\u3057\u3066\u3044\u307e\u3059\u3002
 TL_urlLabel1=URL \u5c5e\u6027 {0}{1}{2}
 # Directory com/ibm/db2j/tools
-# From cslook.java
-CSLOOK_MissingLocale=\u73fe\u884c\u30ed\u30b1\u30fc\u30eb\u306e\u30ea\u30bd\u30fc\u30b9\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002{0} \u306b\u5207\u308a\u66ff\u3048\u307e\u3059\u3002
-CSLOOK_Usage=\ \n\
+# From dblook.java
+DBLOOK_MissingLocale=\u73fe\u884c\u30ed\u30b1\u30fc\u30eb\u306e\u30ea\u30bd\u30fc\u30b9\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3002{0} \u306b\u5207\u308a\u66ff\u3048\u307e\u3059\u3002
+DBLOOK_Usage=\ \n\
 \ \u4f7f\u7528\u6cd5:\n\
 \ java org.apache.derby.tools.dblook -d <sourceDBUrl> [OPTIONS]\n\
 \n\
@@ -207,37 +207,37 @@
 \ \t-o <filename>: \u751f\u6210\u3055\u308c\u305f DDL \u3092\u66f8\u304d\u8fbc\u3080\u30d5\u30a1\u30a4\u30eb\u540d\u3092\n\
 \ \t \u6307\u5b9a\u3057\u307e\u3059\u3002\n\
 \ \t\t\u3053\u308c\u3092\u6307\u5b9a\u3057\u306a\u3044\u5834\u5408\u306e\u30c7\u30d5\u30a9\u30eb\u30c8\u306f\u3001\u30b3\u30f3\u30bd\u30fc\u30eb\u3067\u3059\u3002\ \n
-CSLOOK_FileCreation=\u3053\u306e\u30d5\u30a1\u30a4\u30eb\u306f\u3001Cloudscape \u306e cslook \u30e6\u30fc\u30c6\u30a3\u30ea\u30c6\u30a3\u30fc\u3092\u4f7f\u7528\u3057\u3066\u4f5c\u6210\u3055\u308c\u307e\u3057\u305f\u3002
-CSLOOK_OutputLocation=\u51fa\u529b\u306f\u3001\u30d5\u30a1\u30a4\u30eb {0} \u306b\u9001\u4fe1\u3055\u308c\u307e\u3059\u3002\n
-CSLOOK_Timestamp=\u30bf\u30a4\u30e0\u30fb\u30b9\u30bf\u30f3\u30d7: {0}
-CSLOOK_DBName=\u30bd\u30fc\u30b9\u30fb\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9: {0}
-CSLOOK_DBUrl=\u63a5\u7d9a URL: {0}
-CSLOOK_TargetTables=cslook \u30e6\u30fc\u30c6\u30a3\u30ea\u30c6\u30a3\u30fc\u306f\u3001\u6307\u5b9a\u3055\u308c\u305f\u8868\u306e\u307f\u3092\u5bfe\u8c61\u3068\u3057\u307e\u3059\u3002
-CSLOOK_TargetSchema=\u6307\u5b9a\u3055\u308c\u305f\u30b9\u30ad\u30fc\u30de: {0}
-# Directory com/ibm/db2j/tools/cslookImpl/...
-CSLOOK_TablesHeader=\u8868\u7528\u306e DDL \u30b9\u30c6\u30fc\u30c8\u30e1\u30f3\u30c8
-CSLOOK_ChecksHeader=\u30c1\u30a7\u30c3\u30af\u7528\u306e DDL \u30b9\u30c6\u30fc\u30c8\u30e1\u30f3\u30c8
-CSLOOK_IndexesHeader=\u7d22\u5f15\u7528\u306e DDL \u30b9\u30c6\u30fc\u30c8\u30e1\u30f3\u30c8
-CSLOOK_JarsHeader=jar \u7528\u306e DDL \u30b9\u30c6\u30fc\u30c8\u30e1\u30f3\u30c8
-CSLOOK_KeysHeader=\u30ad\u30fc\u7528\u306e DDL \u30b9\u30c6\u30fc\u30c8\u30e1\u30f3\u30c8
-CSLOOK_PrimUniqueHeader=primary/unique
-CSLOOK_ForeignHeader=foreign
-CSLOOK_SchemasHeader=\u30b9\u30ad\u30fc\u30de\u7528\u306e DDL \u30b9\u30c6\u30fc\u30c8\u30e1\u30f3\u30c8
-CSLOOK_StoredProcHeader=\u30b9\u30c8\u30a2\u30fc\u30c9\u30fb\u30d7\u30ed\u30b7\u30fc\u30b8\u30e3\u30fc\u7528\u306e DDL \u30b9\u30c6\u30fc\u30c8\u30e1\u30f3\u30c8
-CSLOOK_TriggersHeader=\u30c8\u30ea\u30ac\u30fc\u7528\u306e DDL \u30b9\u30c6\u30fc\u30c8\u30e1\u30f3\u30c8
-CSLOOK_ViewsHeader=\u30d3\u30e5\u30fc\u7528\u306e DDL \u30b9\u30c6\u30fc\u30c8\u30e1\u30f3\u30c8
-CSLOOK_Jar_Note=**** \u6ce8 **** jar \u30d5\u30a1\u30a4\u30eb\u3092\u6b63\u3057\u304f\u30ed\u30fc\u30c9\u3059\u308b\u305f\u3081\u306b\u306f\u3001\n\
--- 1) CSJARS \u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30fc (cslook \u306b\u3088\u3063\u3066\n\
+DBLOOK_FileCreation=\u3053\u306e\u30d5\u30a1\u30a4\u30eb\u306f\u3001Derby \u306e dblook \u30e6\u30fc\u30c6\u30a3\u30ea\u30c6\u30a3\u30fc\u3092\u4f7f\u7528\u3057\u3066\u4f5c\u6210\u3055\u308c\u307e\u3057\u305f\u3002
+DBLOOK_OutputLocation=\u51fa\u529b\u306f\u3001\u30d5\u30a1\u30a4\u30eb {0} \u306b\u9001\u4fe1\u3055\u308c\u307e\u3059\u3002\n
+DBLOOK_Timestamp=\u30bf\u30a4\u30e0\u30fb\u30b9\u30bf\u30f3\u30d7: {0}
+DBLOOK_DBName=\u30bd\u30fc\u30b9\u30fb\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9: {0}
+DBLOOK_DBUrl=\u63a5\u7d9a URL: {0}
+DBLOOK_TargetTables=dblook \u30e6\u30fc\u30c6\u30a3\u30ea\u30c6\u30a3\u30fc\u306f\u3001\u6307\u5b9a\u3055\u308c\u305f\u8868\u306e\u307f\u3092\u5bfe\u8c61\u3068\u3057\u307e\u3059\u3002
+DBLOOK_TargetSchema=\u6307\u5b9a\u3055\u308c\u305f\u30b9\u30ad\u30fc\u30de: {0}
+# Directory com/ibm/db2j/tools/dblookImpl/...
+DBLOOK_TablesHeader=\u8868\u7528\u306e DDL \u30b9\u30c6\u30fc\u30c8\u30e1\u30f3\u30c8
+DBLOOK_ChecksHeader=\u30c1\u30a7\u30c3\u30af\u7528\u306e DDL \u30b9\u30c6\u30fc\u30c8\u30e1\u30f3\u30c8
+DBLOOK_IndexesHeader=\u7d22\u5f15\u7528\u306e DDL \u30b9\u30c6\u30fc\u30c8\u30e1\u30f3\u30c8
+DBLOOK_JarsHeader=jar \u7528\u306e DDL \u30b9\u30c6\u30fc\u30c8\u30e1\u30f3\u30c8
+DBLOOK_KeysHeader=\u30ad\u30fc\u7528\u306e DDL \u30b9\u30c6\u30fc\u30c8\u30e1\u30f3\u30c8
+DBLOOK_PrimUniqueHeader=primary/unique
+DBLOOK_ForeignHeader=foreign
+DBLOOK_SchemasHeader=\u30b9\u30ad\u30fc\u30de\u7528\u306e DDL \u30b9\u30c6\u30fc\u30c8\u30e1\u30f3\u30c8
+DBLOOK_StoredProcHeader=\u30b9\u30c8\u30a2\u30fc\u30c9\u30fb\u30d7\u30ed\u30b7\u30fc\u30b8\u30e3\u30fc\u7528\u306e DDL \u30b9\u30c6\u30fc\u30c8\u30e1\u30f3\u30c8
+DBLOOK_TriggersHeader=\u30c8\u30ea\u30ac\u30fc\u7528\u306e DDL \u30b9\u30c6\u30fc\u30c8\u30e1\u30f3\u30c8
+DBLOOK_ViewsHeader=\u30d3\u30e5\u30fc\u7528\u306e DDL \u30b9\u30c6\u30fc\u30c8\u30e1\u30f3\u30c8
+DBLOOK_Jar_Note=**** \u6ce8 **** jar \u30d5\u30a1\u30a4\u30eb\u3092\u6b63\u3057\u304f\u30ed\u30fc\u30c9\u3059\u308b\u305f\u3081\u306b\u306f\u3001\n\
+-- 1) DBJARS \u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30fc (dblook \u306b\u3088\u3063\u3066\n\
 -- \u81ea\u52d5\u7684\u306b\u4f5c\u6210\u3055\u308c\u307e\u3059) \u304c\u524d\u306b\u4f5c\u6210\u3055\u308c\u3066\u3044\u305f\u5834\u6240 (\u3064\u307e\u308a\u3001\n\
 -- \u4ee5\u4e0b\u306e\u30b9\u30c6\u30fc\u30c8\u30e1\u30f3\u30c8\u306b\u8868\u793a\u3055\u308c\u308b\u30d1\u30b9) \u306b\u3042\u308b\u3053\u3068\u3092\u78ba\u8a8d\u3057\u307e\u3059\u3002\u307e\u305f\u306f\u30012) \u4ee5\u4e0b\u306e\n\
--- \u30b9\u30c6\u30fc\u30c8\u30e1\u30f3\u30c8\u306e\u30d1\u30b9\u3092\u5909\u66f4\u3057\u3001CSJARS \u304c\u73fe\u5728\u3042\u308b\u5834\u6240\u3092\u53cd\u6620\u3057\u307e\u3059\u3002\n\
--- CSJARS \u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30fc\u304c\u7121\u3044\u5834\u5408\u3001\u307e\u305f\u306f\u3001\u305d\u306e\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30fc\u304c\u79fb\u52d5\u3057\u305f\u305f\u3081\u3001\n\
+-- \u30b9\u30c6\u30fc\u30c8\u30e1\u30f3\u30c8\u306e\u30d1\u30b9\u3092\u5909\u66f4\u3057\u3001DBJARS \u304c\u73fe\u5728\u3042\u308b\u5834\u6240\u3092\u53cd\u6620\u3057\u307e\u3059\u3002\n\
+-- DBJARS \u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30fc\u304c\u7121\u3044\u5834\u5408\u3001\u307e\u305f\u306f\u3001\u305d\u306e\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30fc\u304c\u79fb\u52d5\u3057\u305f\u305f\u3081\u3001\n\
 -- \u30d1\u30b9\u304c\u6b63\u3057\u304f\u306a\u3044\u5834\u5408\u3001\u6b21\u306e DDL \u30b9\u30c6\u30fc\u30c8\u30e1\u30f3\u30c8\u306f\n\
 -- \u30a8\u30e9\u30fc\u3092\u30b9\u30ed\u30fc\u3057\u3001jar \u30d5\u30a1\u30a4\u30eb\u306f\u30ed\u30fc\u30c9\n\
 -- \u3055\u308c\u307e\u305b\u3093\u3002
-CSLOOK_FailedToLoadJar=JAR \u30d5\u30a1\u30a4\u30eb {0} \u306e\u30ed\u30fc\u30c9\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
-CSLOOK_DefaultSchema=\u30c7\u30d5\u30a9\u30eb\u30c8\u306e\u30b9\u30ad\u30fc\u30de 'APP' \u306b\u5fa9\u5e30\u3057\u307e\u3059\u3002
-CSLOOK_AtLeastOneDebug=-- \u6ce8: \u5c11\u306a\u304f\u3068\u3082 1 \u3064\u306e\u4e88\u671f\u3057\u306a\u3044\u30a8\u30e9\u30fc/\u30e1\u30c3\u30bb\u30fc\u30b8\u304c\n\
--- DDL \u306e\u751f\u6210\u4e2d\u306b\u767a\u751f\u3057\u307e\u3057\u305f\u3002  cslook.log \u3067\n\
+DBLOOK_FailedToLoadJar=JAR \u30d5\u30a1\u30a4\u30eb {0} \u306e\u30ed\u30fc\u30c9\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002
+DBLOOK_DefaultSchema=\u30c7\u30d5\u30a9\u30eb\u30c8\u306e\u30b9\u30ad\u30fc\u30de 'APP' \u306b\u5fa9\u5e30\u3057\u307e\u3059\u3002
+DBLOOK_AtLeastOneDebug=-- \u6ce8: \u5c11\u306a\u304f\u3068\u3082 1 \u3064\u306e\u4e88\u671f\u3057\u306a\u3044\u30a8\u30e9\u30fc/\u30e1\u30c3\u30bb\u30fc\u30b8\u304c\n\
+-- DDL \u306e\u751f\u6210\u4e2d\u306b\u767a\u751f\u3057\u307e\u3057\u305f\u3002  dblook.log \u3067\n\
 -- \u30e1\u30c3\u30bb\u30fc\u30b8\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002\n\
 \n

Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_ko_KR.properties
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_ko_KR.properties	(original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_ko_KR.properties	Tue Nov 16 18:09:29 2004
@@ -143,7 +143,7 @@
 IJ_UsageJavaComCloudToolsIjPPropeInput=\uc0ac\uc6a9\ubc95: java org.apache.derby.tools.ij [-p propertyfile] [-ca connectionAttributePropertyFile] [inputfile]
 IJ_IjWarniAutocMayCloseUsingResulSet=IJ \uacbd\uace0: \uc790\ub3d9 \ud655\uc57d\uc740 \uacb0\uacfc \uc138\ud2b8\ub97c \uc0ac\uc6a9\ud558\uc5ec \ub2eb\ud790 \uc218 \uc788\uc2b5\ub2c8\ub2e4.
 # From utilMain.java
-IJ_IjVers30C199=ij \ubc84\uc804 {0} (C) Copyright IBM Corp. 1997, 2004.
+IJ_IjVers30C199=ij \ubc84\uc804 {0}
 IJ_ElapTime0Mil=\uacbd\uacfc \uc2dc\uac04 = {0}\ubc00\ub9ac\ucd08
 IJ_IjErro0=IJ \uc624\ub958: {0}
 IJ_JavaErro0=JAVA \uc624\ub958: {0}
@@ -167,15 +167,15 @@
 IJ_EncoAtLineColu={1}\ud589 {2}\uc5f4\uc5d0\uc11c "{0}"\uc744(\ub97c) \ubc1c\uacac\ud588\uc2b5\ub2c8\ub2e4.
 # From TokenMgrError.java
 IJ_LexiErroAtLine0Colu1={0}\ud589 {1}\uc5f4\uc5d0 \uc5b4\ud718 \uc624\ub958.  "{3}" \ub4a4\uc5d0\uc11c {2}\uc744(\ub97c) \ubc1c\uacac\ud588\uc2b5\ub2c8\ub2e4.
-TL_incorCase=Cloudscape \uc18d\uc131\uc758 \ub300\uc18c\ubb38\uc790\uac00 \uc62c\ubc14\ub974\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4.
-TL_unknownAtt=Cloudscape\uc5d0 \uc18d\uc131\uc774 \uc54c\ub824\uc9c0\uc9c0 \uc54a\uc558\uc2b5\ub2c8\ub2e4.
+TL_incorCase=Derby \uc18d\uc131\uc758 \ub300\uc18c\ubb38\uc790\uac00 \uc62c\ubc14\ub974\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4.
+TL_unknownAtt=Derby\uc5d0 \uc18d\uc131\uc774 \uc54c\ub824\uc9c0\uc9c0 \uc54a\uc558\uc2b5\ub2c8\ub2e4.
 TL_trueFalse=\uac12\uc744 true/false\ub85c \uc124\uc815\ud574\uc57c \ud569\ub2c8\ub2e4.
 TL_dupAtt=\uc18d\uc131\uc774 \uc911\ubcf5\ub429\ub2c8\ub2e4.
 TL_urlLabel1=URL \uc18d\uc131 {0}{1}{2}
 # Directory com/ibm/db2j/tools
-# From cslook.java
-CSLOOK_MissingLocale=\ud604\uc7ac \ub85c\ucf00\uc77c\uc758 \uc790\uc6d0\uc744 \ucc3e\uc744 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. {0}(\uc73c)\ub85c \uc804\ud658\ud569\ub2c8\ub2e4.
-CSLOOK_Usage=\ \n\
+# From dblook.java
+DBLOOK_MissingLocale=\ud604\uc7ac \ub85c\ucf00\uc77c\uc758 \uc790\uc6d0\uc744 \ucc3e\uc744 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. {0}(\uc73c)\ub85c \uc804\ud658\ud569\ub2c8\ub2e4.
+DBLOOK_Usage=\ \n\
 \ \uc0ac\uc6a9\ubc95:\n\
 \ java org.apache.derby.tools.dblook -d <sourceDBUrl> [OPTIONS]\n\
 \n\
@@ -207,37 +207,37 @@
 \ \t-o <filename>\uc744 \uc0ac\uc6a9\ud558\uc5ec \uc0dd\uc131\ub41c DDL\uc774 \uc4f0\uc5ec\uc9c8 \ud30c\uc77c \uc774\ub984\uc744\n\
 \ \t \uc9c0\uc815\ud569\ub2c8\ub2e4.\n\
 \ \t\t\uc9c0\uc815\ub418\uc9c0 \uc54a\uc744 \uacbd\uc6b0, \uae30\ubcf8\uac12\uc740 \ucf58\uc194\uc785\ub2c8\ub2e4.\ \n
-CSLOOK_FileCreation=\uc774 \ud30c\uc77c\uc740 Cloudscape cslook \uc720\ud2f8\ub9ac\ud2f0\ub97c \uc0ac\uc6a9\ud558\uc5ec \uc791\uc131\ud588\uc2b5\ub2c8\ub2e4.
-CSLOOK_OutputLocation=\ucd9c\ub825\uc740 {0} \ud30c\uc77c\ub85c \uc804\uc1a1\ub429\ub2c8\ub2e4.\n
-CSLOOK_Timestamp=\uc2dc\uac04 \uc18c\uc778: {0}
-CSLOOK_DBName=\uc18c\uc2a4 \ub370\uc774\ud130\ubca0\uc774\uc2a4: {0}
-CSLOOK_DBUrl=\uc5f0\uacb0 URL: {0}
-CSLOOK_TargetTables=cslook \uc720\ud2f8\ub9ac\ud2f0\ub294 \uc9c0\uc815\ub41c \ud14c\uc774\ube14\ub9cc\uc744 \uace0\ub824\ud569\ub2c8\ub2e4.
-CSLOOK_TargetSchema=\uc9c0\uc815\ub41c \uc2a4\ud0a4\ub9c8: {0}
-# Directory com/ibm/db2j/tools/cslookImpl/...
-CSLOOK_TablesHeader=\ud14c\uc774\ube14\uc5d0 \ub300\ud55c DDL\ubb38
-CSLOOK_ChecksHeader=\uc120\ud0dd\uc5d0 \ub300\ud55c DDL\ubb38
-CSLOOK_IndexesHeader=\uc0c9\uc778\uc5d0 \ub300\ud55c DDL\ubb38
-CSLOOK_JarsHeader=jar\uc5d0 \ub300\ud55c DDL\ubb38
-CSLOOK_KeysHeader=\ud0a4\uc5d0 \ub300\ud55c DDL\ubb38
-CSLOOK_PrimUniqueHeader=1\ucc28/\uace0\uc720
-CSLOOK_ForeignHeader=\uc678\ubd80
-CSLOOK_SchemasHeader=\uc2a4\ud0a4\ub9c8\uc5d0 \ub300\ud55c DDL\ubb38
-CSLOOK_StoredProcHeader=\uc2a4\ud1a0\uc5b4\ub4dc \ud504\ub85c\uc2dc\uc800\uc5d0 \ub300\ud55c DDL\ubb38
-CSLOOK_TriggersHeader=\ud2b8\ub9ac\uac70\uc5d0 \ub300\ud55c DDL\ubb38
-CSLOOK_ViewsHeader=\ubdf0\uc5d0 \ub300\ud55c DDL\ubb38
-CSLOOK_Jar_Note=**** \ucc38\uace0 **** jar \ud30c\uc77c\uc744 \uc62c\ubc14\ub85c \ub85c\ub4dc\ud558\ub824\uba74\n\
--- 1) CSJARS \ub514\ub809\ud1a0\ub9ac(cslook\uc5d0 \uc758\ud574 \uc790\ub3d9\uc73c\ub85c \uc791\uc131\ub428)\uac00\n\
+DBLOOK_FileCreation=\uc774 \ud30c\uc77c\uc740 Derby dblook \uc720\ud2f8\ub9ac\ud2f0\ub97c \uc0ac\uc6a9\ud558\uc5ec \uc791\uc131\ud588\uc2b5\ub2c8\ub2e4.
+DBLOOK_OutputLocation=\ucd9c\ub825\uc740 {0} \ud30c\uc77c\ub85c \uc804\uc1a1\ub429\ub2c8\ub2e4.\n
+DBLOOK_Timestamp=\uc2dc\uac04 \uc18c\uc778: {0}
+DBLOOK_DBName=\uc18c\uc2a4 \ub370\uc774\ud130\ubca0\uc774\uc2a4: {0}
+DBLOOK_DBUrl=\uc5f0\uacb0 URL: {0}
+DBLOOK_TargetTables=dblook \uc720\ud2f8\ub9ac\ud2f0\ub294 \uc9c0\uc815\ub41c \ud14c\uc774\ube14\ub9cc\uc744 \uace0\ub824\ud569\ub2c8\ub2e4.
+DBLOOK_TargetSchema=\uc9c0\uc815\ub41c \uc2a4\ud0a4\ub9c8: {0}
+# Directory com/ibm/db2j/tools/dblookImpl/...
+DBLOOK_TablesHeader=\ud14c\uc774\ube14\uc5d0 \ub300\ud55c DDL\ubb38
+DBLOOK_ChecksHeader=\uc120\ud0dd\uc5d0 \ub300\ud55c DDL\ubb38
+DBLOOK_IndexesHeader=\uc0c9\uc778\uc5d0 \ub300\ud55c DDL\ubb38
+DBLOOK_JarsHeader=jar\uc5d0 \ub300\ud55c DDL\ubb38
+DBLOOK_KeysHeader=\ud0a4\uc5d0 \ub300\ud55c DDL\ubb38
+DBLOOK_PrimUniqueHeader=1\ucc28/\uace0\uc720
+DBLOOK_ForeignHeader=\uc678\ubd80
+DBLOOK_SchemasHeader=\uc2a4\ud0a4\ub9c8\uc5d0 \ub300\ud55c DDL\ubb38
+DBLOOK_StoredProcHeader=\uc2a4\ud1a0\uc5b4\ub4dc \ud504\ub85c\uc2dc\uc800\uc5d0 \ub300\ud55c DDL\ubb38
+DBLOOK_TriggersHeader=\ud2b8\ub9ac\uac70\uc5d0 \ub300\ud55c DDL\ubb38
+DBLOOK_ViewsHeader=\ubdf0\uc5d0 \ub300\ud55c DDL\ubb38
+DBLOOK_Jar_Note=**** \ucc38\uace0 **** jar \ud30c\uc77c\uc744 \uc62c\ubc14\ub85c \ub85c\ub4dc\ud558\ub824\uba74\n\
+-- 1) DBJARS \ub514\ub809\ud1a0\ub9ac(dblook\uc5d0 \uc758\ud574 \uc790\ub3d9\uc73c\ub85c \uc791\uc131\ub428)\uac00\n\
 -- \uc791\uc131\ub41c \uc704\uce58\uc5d0 \uc874\uc7ac\ud558\ub294\uc9c0 \ud655\uc778\ud558\uac70\ub098,\n\
 -- 2) \uc544\ub798\uc758 \uba85\ub839\ubb38\uc5d0 \uc788\ub294 \uacbd\ub85c\uac00\n\
--- CSJARS\uc758 \ud604\uc7ac \uc704\uce58\ub97c \ubc18\uc601\ud558\ub3c4\ub85d\n\
--- \ubcc0\uacbd\ud574\uc57c \ud569\ub2c8\ub2e4. CSJARS \ub514\ub809\ud1a0\ub9ac\uac00 \uc874\uc7ac\ud558\uc9c0 \uc54a\uac70\ub098\n\
+-- DBJARS\uc758 \ud604\uc7ac \uc704\uce58\ub97c \ubc18\uc601\ud558\ub3c4\ub85d\n\
+-- \ubcc0\uacbd\ud574\uc57c \ud569\ub2c8\ub2e4. DBJARS \ub514\ub809\ud1a0\ub9ac\uac00 \uc874\uc7ac\ud558\uc9c0 \uc54a\uac70\ub098\n\
 -- \uc774\ub3d9\ub418\uc5b4 \uacbd\ub85c\uac00 \uc62c\ubc14\ub974\uc9c0 \uc54a\uc740 \uacbd\uc6b0,\n\
 -- \ub2e4\uc74c DDL\ubb38\uc774 \uc624\ub958\ub97c \ubc1c\uc0dd\uc2dc\ud0a4\uace0\n\
 -- jar \ud30c\uc77c\uc774 \ub85c\ub4dc\ub418\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4.
-CSLOOK_FailedToLoadJar={0}jar \ud30c\uc77c \ub85c\ub4dc \uc2e4\ud328
-CSLOOK_DefaultSchema='APP' \uae30\ubcf8 \uc2a4\ud0a4\ub9c8\ub85c \ub418\ub3cc\ub9ac\uae30
-CSLOOK_AtLeastOneDebug=-- \ucc38\uace0: DDL \uc0dd\uc131 \uc911\uc5d0 \ucd5c\uc18c \ud55c\uac1c\uc758 \uc624\ub958/\uacbd\uace0 \uba54\uc2dc\uc9c0\uac00\n\
+DBLOOK_FailedToLoadJar={0}jar \ud30c\uc77c \ub85c\ub4dc \uc2e4\ud328
+DBLOOK_DefaultSchema='APP' \uae30\ubcf8 \uc2a4\ud0a4\ub9c8\ub85c \ub418\ub3cc\ub9ac\uae30
+DBLOOK_AtLeastOneDebug=-- \ucc38\uace0: DDL \uc0dd\uc131 \uc911\uc5d0 \ucd5c\uc18c \ud55c\uac1c\uc758 \uc624\ub958/\uacbd\uace0 \uba54\uc2dc\uc9c0\uac00\n\
 -- \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4. \uba54\uc2dc\uc9c0\ub97c \uac80\ud1a0\ud558\ub824\uba74\n\
--- cslook.log\ub97c \ucc38\uc870\ud558\uc2ed\uc2dc\uc624.\n\
+-- dblook.log\ub97c \ucc38\uc870\ud558\uc2ed\uc2dc\uc624.\n\
 \n

Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_pt_BR.properties
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_pt_BR.properties	(original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_pt_BR.properties	Tue Nov 16 18:09:29 2004
@@ -140,7 +140,7 @@
 IJ_UsageJavaComCloudToolsIjPPropeInput=Uso: java org.apache.derby.tools.ij [-p propertyfile] [-ca connectionAttributePropertyFile] [inputfile]
 IJ_IjWarniAutocMayCloseUsingResulSet=AVISO IJ: Autocommit pode ser encerrado utilizando o conjunto de resultados
 # From utilMain.java
-IJ_IjVers30C199=ij vers\u00e3o {0} (C) Copyright IBM Corp. 1997, 2004.
+IJ_IjVers30C199=ij vers\u00e3o {0}
 IJ_ElapTime0Mil=TEMPO DECORRIDO = {0} milissegundos
 IJ_IjErro0=ERRO IJ: {0}
 IJ_JavaErro0=ERRO JAVA: {0}
@@ -164,15 +164,15 @@
 IJ_EncoAtLineColu=Encontrado "{0}" na linha {1}, coluna {2}
 # From TokenMgrError.java
 IJ_LexiErroAtLine0Colu1=Erro lexical na linha {0}, coluna {1}.  Encontrado: {2} depois de:"{3}"
-TL_incorCase=O caso do atributo Cloudscape est\u00e1 incorreto.
-TL_unknownAtt=Atributo desconhecido para Cloudscape.
+TL_incorCase=O caso do atributo Derby est\u00e1 incorreto.
+TL_unknownAtt=Atributo desconhecido para Derby.
 TL_trueFalse=O valor deve ser definido como true ou false.
 TL_dupAtt=O atributo est\u00e1 duplicado.
 TL_urlLabel1=Atributo da URL {0}{1}{2}
 # Directory com/ibm/db2j/tools
-# From cslook.java
-CSLOOK_MissingLocale=Recursos n\u00e3o localizados para o locale atual; alternando para {0}.
-CSLOOK_Usage=\ \n\
+# From dblook.java
+DBLOOK_MissingLocale=Recursos n\u00e3o localizados para o locale atual; alternando para {0}.
+DBLOOK_Usage=\ \n\
 \ UTILIZA\u00c7\u00c3O:\n\
 \ java org.apache.derby.tools.dblook -d <UrlBDorigem> [OPTIONS]\n\
 \n\
@@ -204,37 +204,37 @@
 \ \t-o <nome_do_arquivo> para especificar o nome do arquivo para qual o DDL\n\
 \ \t gerado ser\u00e1 gravado.\n\
 \ \t\tSe este valor n\u00e3o for especificado, o padr\u00e3o \u00e9 o console.\ \n
-CSLOOK_FileCreation=Este arquivo foi criado com o utilit\u00e1rio cslook do Cloudscape.
-CSLOOK_OutputLocation=A sa\u00edda ser\u00e1 enviada para o arquivo {0}\n
-CSLOOK_Timestamp=Data e hora:  {0}
-CSLOOK_DBName=O banco de dados de origem \u00e9: {0}
-CSLOOK_DBUrl=O URL de conex\u00e3o \u00e9: {0}
-CSLOOK_TargetTables=O utilit\u00e1rio cslook ir\u00e1 considerar apenas as tabelas especificadas.
-CSLOOK_TargetSchema=O esquema especificado \u00e9: {0}
-# Directory com/ibm/db2j/tools/cslookImpl/...
-CSLOOK_TablesHeader=Instru\u00e7\u00f5es DDL para tabelas
-CSLOOK_ChecksHeader=Instru\u00e7\u00f5es DDL para verifica\u00e7\u00f5es
-CSLOOK_IndexesHeader=Instru\u00e7\u00f5es DDL para \u00edndices
-CSLOOK_JarsHeader=Instru\u00e7\u00f5es DDL para jars
-CSLOOK_KeysHeader=Instru\u00e7\u00f5es DDL para chaves
-CSLOOK_PrimUniqueHeader=principal/exclusivo
-CSLOOK_ForeignHeader=estrangeiro
-CSLOOK_SchemasHeader=Instru\u00e7\u00f5es DDL para esquemas
-CSLOOK_StoredProcHeader=Instru\u00e7\u00f5es DDL para procedimentos armazenados
-CSLOOK_TriggersHeader=Instru\u00e7\u00f5es DDL para disparadores
-CSLOOK_ViewsHeader=Instru\u00e7\u00f5es DDL para visualiza\u00e7\u00f5es
-CSLOOK_Jar_Note=**** NOTA **** para que os arquivos jar sejam carregados corretamente,\n\
--- voc\u00ea deve 1) assegurar-se de que o diret\u00f3rio CSJARS (criado automaticamente\n\
--- por cslook) exista onde foi criado (ou seja, no caminho\n\
+DBLOOK_FileCreation=Este arquivo foi criado com o utilit\u00e1rio dblook do Derby.
+DBLOOK_OutputLocation=A sa\u00edda ser\u00e1 enviada para o arquivo {0}\n
+DBLOOK_Timestamp=Data e hora:  {0}
+DBLOOK_DBName=O banco de dados de origem \u00e9: {0}
+DBLOOK_DBUrl=O URL de conex\u00e3o \u00e9: {0}
+DBLOOK_TargetTables=O utilit\u00e1rio dblook ir\u00e1 considerar apenas as tabelas especificadas.
+DBLOOK_TargetSchema=O esquema especificado \u00e9: {0}
+# Directory com/ibm/db2j/tools/dblookImpl/...
+DBLOOK_TablesHeader=Instru\u00e7\u00f5es DDL para tabelas
+DBLOOK_ChecksHeader=Instru\u00e7\u00f5es DDL para verifica\u00e7\u00f5es
+DBLOOK_IndexesHeader=Instru\u00e7\u00f5es DDL para \u00edndices
+DBLOOK_JarsHeader=Instru\u00e7\u00f5es DDL para jars
+DBLOOK_KeysHeader=Instru\u00e7\u00f5es DDL para chaves
+DBLOOK_PrimUniqueHeader=principal/exclusivo
+DBLOOK_ForeignHeader=estrangeiro
+DBLOOK_SchemasHeader=Instru\u00e7\u00f5es DDL para esquemas
+DBLOOK_StoredProcHeader=Instru\u00e7\u00f5es DDL para procedimentos armazenados
+DBLOOK_TriggersHeader=Instru\u00e7\u00f5es DDL para disparadores
+DBLOOK_ViewsHeader=Instru\u00e7\u00f5es DDL para visualiza\u00e7\u00f5es
+DBLOOK_Jar_Note=**** NOTA **** para que os arquivos jar sejam carregados corretamente,\n\
+-- voc\u00ea deve 1) assegurar-se de que o diret\u00f3rio DBJARS (criado automaticamente\n\
+-- por dblook) exista onde foi criado (ou seja, no caminho\n\
 -- mostrado nas instru\u00e7\u00f5es abaixo), ou 2) altere o caminho\n\
 -- nas instru\u00e7\u00f5es abaixo para refletir o local correto \n\
--- de CSJARS.  Se o diret\u00f3rio CSJARS n\u00e3o existir, ou caso ele tenha sido\n\
+-- de DBJARS.  Se o diret\u00f3rio DBJARS n\u00e3o existir, ou caso ele tenha sido\n\
 -- movido e o caminho n\u00e3o estiver correto, as seguintes instru\u00e7\u00f5es DDL\n\
 -- lan\u00e7ar\u00e3o erros, e os arquivos jar N\u00c3O ser\u00e3o \n\
 -- carregados.
-CSLOOK_FailedToLoadJar=Falha em carregar o arquivo jar {0}
-CSLOOK_DefaultSchema=Revertendo novamente para o esquema 'APP' padr\u00e3o
-CSLOOK_AtLeastOneDebug=-- Nota: Ao menos uma mensagem de erro/aviso inesperada\n\
--- foi encontrada durante a gera\u00e7\u00e3o da DDL.  Consulte cslook.log\n\
+DBLOOK_FailedToLoadJar=Falha em carregar o arquivo jar {0}
+DBLOOK_DefaultSchema=Revertendo novamente para o esquema 'APP' padr\u00e3o
+DBLOOK_AtLeastOneDebug=-- Nota: Ao menos uma mensagem de erro/aviso inesperada\n\
+-- foi encontrada durante a gera\u00e7\u00e3o da DDL.  Consulte dblook.log\n\
 -- para ler a(s) mensagem(ns) novamente.\n\
 \n

Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_zh_CN.properties
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_zh_CN.properties	(original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_zh_CN.properties	Tue Nov 16 18:09:29 2004
@@ -143,7 +143,7 @@
 IJ_UsageJavaComCloudToolsIjPPropeInput=\u7528\u6cd5\uff1ajava org.apache.derby.tools.ij [-p propertyfile] [-ca connectionAttributePropertyFile] [inputfile]
 IJ_IjWarniAutocMayCloseUsingResulSet=IJ \u8b66\u544a\uff1a\u81ea\u52a8\u843d\u5b9e\u53ef\u80fd\u5173\u95ed\u4f7f\u7528\u7ed3\u679c\u96c6
 # From utilMain.java
-IJ_IjVers30C199=ij v{0} (C) Copyright IBM Corp. 1997, 2004.
+IJ_IjVers30C199=ij v{0}
 IJ_ElapTime0Mil=\u7ecf\u8fc7\u65f6\u95f4 = {0} \u6beb\u79d2
 IJ_IjErro0=IJ \u9519\u8bef\uff1a{0}
 IJ_JavaErro0=JAVA \u9519\u8bef\uff1a{0}
@@ -167,15 +167,15 @@
 IJ_EncoAtLineColu=\u7b2c {1} \u884c\uff0c\u7b2c {2} \u5217\u4e0a\u9047\u5230\u201c{0}\u201d
 # From TokenMgrError.java
 IJ_LexiErroAtLine0Colu1=\u7b2c {0} \u884c\uff0c\u7b2c {1} \u5217\u4e0a\u6709\u8bcd\u6cd5\u9519\u8bef\u3002\u5728\u201c{3}\u201d\u540e\u9047\u5230\uff1a{2}
-TL_incorCase=Cloudscape \u5c5e\u6027\u7684\u5927\u5c0f\u5199\u4e0d\u6b63\u786e\u3002
-TL_unknownAtt=\u5c5e\u6027\u662f Cloudscape \u672a\u77e5\u7684\u3002
+TL_incorCase=Derby \u5c5e\u6027\u7684\u5927\u5c0f\u5199\u4e0d\u6b63\u786e\u3002
+TL_unknownAtt=\u5c5e\u6027\u662f Derby \u672a\u77e5\u7684\u3002
 TL_trueFalse=\u503c\u5e94\u8be5\u8bbe\u7f6e\u4e3a true/false\u3002
 TL_dupAtt=\u5c5e\u6027\u662f\u91cd\u590d\u7684\u3002
 TL_urlLabel1=URL \u5c5e\u6027 {0}{1}{2}
 # Directory com/ibm/db2j/tools
-# From cslook.java
-CSLOOK_MissingLocale=\u672a\u627e\u5230\u5f53\u524d\u8bed\u8a00\u73af\u5883\u7684\u8d44\u6e90\uff1b\u5207\u6362\u5230 {0}\u3002
-CSLOOK_Usage=\ \n\
+# From dblook.java
+DBLOOK_MissingLocale=\u672a\u627e\u5230\u5f53\u524d\u8bed\u8a00\u73af\u5883\u7684\u8d44\u6e90\uff1b\u5207\u6362\u5230 {0}\u3002
+DBLOOK_Usage=\ \n\
 \ \u7528\u6cd5\uff1a\n\
 \ java org.apache.derby.tools.dblook -d <sourceDBUrl> [OPTIONS]\n\
 \n\
@@ -207,37 +207,37 @@
 \ \t-o <filename> \u6307\u5b9a\u5c06\u751f\u6210\u7684 DDL \u5199\u5165\u5176\u4e2d\u7684\n\
 \ \t \u6587\u4ef6\u540d\u3002\n\
 \ \t\t\u5982\u679c\u6ca1\u6709\u6307\u5b9a\uff0c\u7f3a\u7701\u503c\u662f\u63a7\u5236\u53f0\u3002\ \n
-CSLOOK_FileCreation=\u6b64\u6587\u4ef6\u662f\u4f7f\u7528 Cloudscape \u7684 cslook \u5b9e\u7528\u7a0b\u5e8f\u521b\u5efa\u7684\u3002
-CSLOOK_OutputLocation=\u8f93\u51fa\u5c06\u53d1\u9001\u5230\u6587\u4ef6 {0}\n
-CSLOOK_Timestamp=\u65f6\u95f4\u6233\u8bb0\uff1a{0}
-CSLOOK_DBName=\u6e90\u6570\u636e\u5e93\u4e3a\uff1a{0}
-CSLOOK_DBUrl=\u8fde\u63a5 URL \u4e3a\uff1a{0}
-CSLOOK_TargetTables=cslook \u5b9e\u7528\u7a0b\u5e8f\u5c06\u4ec5\u8003\u8651\u6307\u5b9a\u7684\u8868\u3002
-CSLOOK_TargetSchema=\u6307\u5b9a\u7684\u6a21\u5f0f\u4e3a\uff1a{0}
-# Directory com/ibm/db2j/tools/cslookImpl/...
-CSLOOK_TablesHeader=\u8868\u7684 DDL \u8bed\u53e5
-CSLOOK_ChecksHeader=\u68c0\u67e5\u7684 DDL \u8bed\u53e5
-CSLOOK_IndexesHeader=\u7d22\u5f15\u7684 DDL \u8bed\u53e5
-CSLOOK_JarsHeader=jar \u7684 DDL \u8bed\u53e5
-CSLOOK_KeysHeader=\u952e\u7684 DDL \u8bed\u53e5
-CSLOOK_PrimUniqueHeader=\u4e3b\u952e\uff0f\u552f\u4e00\u952e
-CSLOOK_ForeignHeader=\u5916
-CSLOOK_SchemasHeader=\u6a21\u5f0f\u7684 DDL \u8bed\u53e5
-CSLOOK_StoredProcHeader=\u5b58\u50a8\u8fc7\u7a0b\u7684 DDL \u8bed\u53e5
-CSLOOK_TriggersHeader=\u89e6\u53d1\u5668\u7684 DDL \u8bed\u53e5
-CSLOOK_ViewsHeader=\u89c6\u56fe\u7684 DDL \u8bed\u53e5
-CSLOOK_Jar_Note=**** \u6ce8\u610f **** \u4e3a\u4e86\u6b63\u786e\u88c5\u5165 jar \u6587\u4ef6\uff0c\n\
--- \u60a8\u5fc5\u987b 1) \u786e\u4fdd CSJARS \u76ee\u5f55\n\
--- \uff08\u7531 cslook \u81ea\u52a8\u521b\u5efa\uff09\u5b58\u5728\u4e8e\u521b\u5efa\u5b83\u7684\u5730\u65b9\uff08\u4f8b\u5982\uff0c\u5728 \n\
+DBLOOK_FileCreation=\u6b64\u6587\u4ef6\u662f\u4f7f\u7528 Derby \u7684 dblook \u5b9e\u7528\u7a0b\u5e8f\u521b\u5efa\u7684\u3002
+DBLOOK_OutputLocation=\u8f93\u51fa\u5c06\u53d1\u9001\u5230\u6587\u4ef6 {0}\n
+DBLOOK_Timestamp=\u65f6\u95f4\u6233\u8bb0\uff1a{0}
+DBLOOK_DBName=\u6e90\u6570\u636e\u5e93\u4e3a\uff1a{0}
+DBLOOK_DBUrl=\u8fde\u63a5 URL \u4e3a\uff1a{0}
+DBLOOK_TargetTables=dblook \u5b9e\u7528\u7a0b\u5e8f\u5c06\u4ec5\u8003\u8651\u6307\u5b9a\u7684\u8868\u3002
+DBLOOK_TargetSchema=\u6307\u5b9a\u7684\u6a21\u5f0f\u4e3a\uff1a{0}
+# Directory com/ibm/db2j/tools/dblookImpl/...
+DBLOOK_TablesHeader=\u8868\u7684 DDL \u8bed\u53e5
+DBLOOK_ChecksHeader=\u68c0\u67e5\u7684 DDL \u8bed\u53e5
+DBLOOK_IndexesHeader=\u7d22\u5f15\u7684 DDL \u8bed\u53e5
+DBLOOK_JarsHeader=jar \u7684 DDL \u8bed\u53e5
+DBLOOK_KeysHeader=\u952e\u7684 DDL \u8bed\u53e5
+DBLOOK_PrimUniqueHeader=\u4e3b\u952e\uff0f\u552f\u4e00\u952e
+DBLOOK_ForeignHeader=\u5916
+DBLOOK_SchemasHeader=\u6a21\u5f0f\u7684 DDL \u8bed\u53e5
+DBLOOK_StoredProcHeader=\u5b58\u50a8\u8fc7\u7a0b\u7684 DDL \u8bed\u53e5
+DBLOOK_TriggersHeader=\u89e6\u53d1\u5668\u7684 DDL \u8bed\u53e5
+DBLOOK_ViewsHeader=\u89c6\u56fe\u7684 DDL \u8bed\u53e5
+DBLOOK_Jar_Note=**** \u6ce8\u610f **** \u4e3a\u4e86\u6b63\u786e\u88c5\u5165 jar \u6587\u4ef6\uff0c\n\
+-- \u60a8\u5fc5\u987b 1) \u786e\u4fdd DBJARS \u76ee\u5f55\n\
+-- \uff08\u7531 dblook \u81ea\u52a8\u521b\u5efa\uff09\u5b58\u5728\u4e8e\u521b\u5efa\u5b83\u7684\u5730\u65b9\uff08\u4f8b\u5982\uff0c\u5728 \n\
 -- \u4e0b\u9762\u8bed\u53e5\u4e2d\u6240\u663e\u793a\u7684\u8def\u5f84\u4e2d\uff09\uff0c\u6216\u8005 2) \u66f4\u6539\u4e0b\u9762\u8bed\u53e5\u4e2d\u7684\n\
--- \u8def\u5f84\uff0c\u4ee5\u53cd\u6620 CSJARS \u7684\u5f53\u524d\n\
--- \u4f4d\u7f6e\u3002\u5982\u679c CSJARS \u76ee\u5f55\u4e0d\u5b58\u5728\uff0c\u6216\u8005\u5982\u679c\u5b83\n\
+-- \u8def\u5f84\uff0c\u4ee5\u53cd\u6620 DBJARS \u7684\u5f53\u524d\n\
+-- \u4f4d\u7f6e\u3002\u5982\u679c DBJARS \u76ee\u5f55\u4e0d\u5b58\u5728\uff0c\u6216\u8005\u5982\u679c\u5b83\n\
 -- \u5df2\u7ecf\u88ab\u79fb\u52a8\u4e14\u8def\u5f84\u4e0d\u6b63\u786e\uff0c\u5219\u4e0b\u5217 DDL\n\
 -- \u8bed\u53e5\u5c06\u629b\u51fa\u9519\u8bef\uff0c\u800c\u4e14 jar \u6587\u4ef6\n\
 -- \u5c06\u4e0d\u4f1a\u88ab\u88c5\u5165\u3002
-CSLOOK_FailedToLoadJar=\u88c5\u5165 JAR \u6587\u4ef6 {0} \u5931\u8d25
-CSLOOK_DefaultSchema=\u8fd8\u539f\u5230\u7f3a\u7701\u6a21\u5f0f\u201cAPP\u201d
-CSLOOK_AtLeastOneDebug=-- \u6ce8\uff1a\u5728 DDL \u751f\u6210\u671f\u95f4\u81f3\u5c11\u9047\u5230\u4e00\u4e2a\n\
--- \u610f\u5916\u7684\u9519\u8bef\uff0f\u8b66\u544a\u6d88\u606f\u3002\u8bf7\u53c2\u9605 cslook.log\n\
+DBLOOK_FailedToLoadJar=\u88c5\u5165 JAR \u6587\u4ef6 {0} \u5931\u8d25
+DBLOOK_DefaultSchema=\u8fd8\u539f\u5230\u7f3a\u7701\u6a21\u5f0f\u201cAPP\u201d
+DBLOOK_AtLeastOneDebug=-- \u6ce8\uff1a\u5728 DDL \u751f\u6210\u671f\u95f4\u81f3\u5c11\u9047\u5230\u4e00\u4e2a\n\
+-- \u610f\u5916\u7684\u9519\u8bef\uff0f\u8b66\u544a\u6d88\u606f\u3002\u8bf7\u53c2\u9605 dblook.log\n\
 -- \u67e5\u770b\u8be5\u6d88\u606f\u3002\n\
 \n

Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_zh_TW.properties
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_zh_TW.properties	(original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_zh_TW.properties	Tue Nov 16 18:09:29 2004
@@ -143,7 +143,7 @@
 IJ_UsageJavaComCloudToolsIjPPropeInput=\u7528\u6cd5\uff1ajava org.apache.derby.tools.ij [-p propertyfile] [-ca connectionAttributePropertyFile] [inputfile]
 IJ_IjWarniAutocMayCloseUsingResulSet=IJ \u8b66\u544a\uff1a\u81ea\u52d5\u78ba\u5b9a\u53ef\u80fd\u6703\u5229\u7528\u7d50\u679c\u96c6\u95dc\u9589
 # From utilMain.java
-IJ_IjVers30C199=ij version {0} (C) Copyright IBM Corp. 1997, 2004.
+IJ_IjVers30C199=ij version {0}
 IJ_ElapTime0Mil=ELAPSED TIME = {0} \u6beb\u79d2
 IJ_IjErro0=IJ \u932f\u8aa4\uff1a{0}
 IJ_JavaErro0=JAVA \u932f\u8aa4\uff1a{0}
@@ -167,15 +167,15 @@
 IJ_EncoAtLineColu=\u5728\u7b2c {1} \u884c\u7b2c {2} \u6b04\u4e2d\uff0c\u767c\u73fe "{0}"
 # From TokenMgrError.java
 IJ_LexiErroAtLine0Colu1=\u5728\u7b2c {0} \u884c\u7b2c {1} \u6b04\u4e2d\uff0c\u767c\u751f\u8a9e\u5f59\u932f\u8aa4\u3002\u5728 {3} \u4e4b\u5f8c\uff0c\u9047\u5230 {2}
-TL_incorCase=Cloudscape \u5c6c\u6027\u7684\u5927\u5c0f\u5beb\u4e0d\u6b63\u78ba\u3002
-TL_unknownAtt=Cloudscape \u7121\u6cd5\u8b58\u5225\u5c6c\u6027\u3002
+TL_incorCase=Derby \u5c6c\u6027\u7684\u5927\u5c0f\u5beb\u4e0d\u6b63\u78ba\u3002
+TL_unknownAtt=Derby \u7121\u6cd5\u8b58\u5225\u5c6c\u6027\u3002
 TL_trueFalse=\u503c\u61c9\u8a72\u8a2d\u70ba true/false\u3002
 TL_dupAtt=\u5c6c\u6027\u91cd\u8907\u3002
 TL_urlLabel1=URL \u5c6c\u6027 {0}{1}{2}
 # Directory com/ibm/db2j/tools
-# From cslook.java
-CSLOOK_MissingLocale=\u627e\u4e0d\u5230\u73fe\u884c\u8a9e\u8a00\u74b0\u5883\u7684\u8cc7\u6e90\uff1b\u5207\u63db\u70ba {0}\u3002
-CSLOOK_Usage=\ \n\
+# From dblook.java
+DBLOOK_MissingLocale=\u627e\u4e0d\u5230\u73fe\u884c\u8a9e\u8a00\u74b0\u5883\u7684\u8cc7\u6e90\uff1b\u5207\u63db\u70ba {0}\u3002
+DBLOOK_Usage=\ \n\
 \ \u7528\u6cd5\uff1a\n\
 \ java org.apache.derby.tools.dblook -d <sourceDBUrl> [OPTIONS]\n\
 \n\
@@ -207,37 +207,37 @@
 \ \t-o <filename>\uff0c\u53ef\u6307\u5b9a\u6703\u5beb\u5165\u6240\u7522\u751f DDL \u7684\n\
 \ \t\u6a94\u6848\u540d\u7a31\u3002\n\
 \ \t\t\u82e5\u6c92\u6709\u6307\u5b9a\uff0c\u9810\u8a2d\u70ba\u4e3b\u63a7\u53f0\u3002\ \n
-CSLOOK_FileCreation=\u6b64\u6a94\u6848\u4ee5 Cloudscape \u7684 cslook \u516c\u7528\u7a0b\u5f0f\u5efa\u7acb\u3002
-CSLOOK_OutputLocation=\u6703\u628a\u8f38\u51fa\u9001\u81f3 {0}\n \u6a94\u6848
-CSLOOK_Timestamp=\u6642\u9593\u6233\u8a18\uff1a{0}
-CSLOOK_DBName=\u539f\u59cb\u6a94\u8cc7\u6599\u5eab\u70ba\uff1a{0}
-CSLOOK_DBUrl=\u9023\u7dda URL \u70ba\uff1a{0}
-CSLOOK_TargetTables=cslook \u516c\u7528\u7a0b\u5f0f\u50c5\u8003\u91cf\u6307\u5b9a\u7684\u8868\u683c\u3002
-CSLOOK_TargetSchema=\u6307\u5b9a\u7684\u7db1\u76ee\u70ba\uff1a{0}
-# Directory com/ibm/db2j/tools/cslookImpl/...
-CSLOOK_TablesHeader=DDL \u8868\u683c\u9673\u8ff0\u5f0f
-CSLOOK_ChecksHeader=DDL \u6aa2\u67e5\u9673\u8ff0\u5f0f
-CSLOOK_IndexesHeader=DDL \u7d22\u5f15\u9673\u8ff0\u5f0f
-CSLOOK_JarsHeader=DDL jar \u9673\u8ff0\u5f0f
-CSLOOK_KeysHeader=DDL \u9375\u503c\u9673\u8ff0\u5f0f
-CSLOOK_PrimUniqueHeader=\u4e3b\u8981/\u552f\u4e00
-CSLOOK_ForeignHeader=\u5916\u90e8
-CSLOOK_SchemasHeader=DDL \u7db1\u76ee\u9673\u8ff0\u5f0f
-CSLOOK_StoredProcHeader=DDL \u5132\u5b58\u7a0b\u5e8f\u9673\u8ff0\u5f0f
-CSLOOK_TriggersHeader=DDL \u89f8\u767c\u9673\u8ff0\u5f0f
-CSLOOK_ViewsHeader=DDL \u6982\u7565\u8868\u9673\u8ff0\u5f0f
-CSLOOK_Jar_Note=**** \u9644\u8a3b **** \u70ba\u4e86\u6b63\u78ba\u8f09\u5165 JAR \u6a94\uff0c\n\
--- \u60a8\u5fc5\u9808 1) \u78ba\u5b9a CSJARS \u76ee\u9304\uff08\u7531 cslook \u6240\u81ea\u52d5\n\
+DBLOOK_FileCreation=\u6b64\u6a94\u6848\u4ee5 Derby \u7684 dblook \u516c\u7528\u7a0b\u5f0f\u5efa\u7acb\u3002
+DBLOOK_OutputLocation=\u6703\u628a\u8f38\u51fa\u9001\u81f3 {0}\n \u6a94\u6848
+DBLOOK_Timestamp=\u6642\u9593\u6233\u8a18\uff1a{0}
+DBLOOK_DBName=\u539f\u59cb\u6a94\u8cc7\u6599\u5eab\u70ba\uff1a{0}
+DBLOOK_DBUrl=\u9023\u7dda URL \u70ba\uff1a{0}
+DBLOOK_TargetTables=dblook \u516c\u7528\u7a0b\u5f0f\u50c5\u8003\u91cf\u6307\u5b9a\u7684\u8868\u683c\u3002
+DBLOOK_TargetSchema=\u6307\u5b9a\u7684\u7db1\u76ee\u70ba\uff1a{0}
+# Directory com/ibm/db2j/tools/dblookImpl/...
+DBLOOK_TablesHeader=DDL \u8868\u683c\u9673\u8ff0\u5f0f
+DBLOOK_ChecksHeader=DDL \u6aa2\u67e5\u9673\u8ff0\u5f0f
+DBLOOK_IndexesHeader=DDL \u7d22\u5f15\u9673\u8ff0\u5f0f
+DBLOOK_JarsHeader=DDL jar \u9673\u8ff0\u5f0f
+DBLOOK_KeysHeader=DDL \u9375\u503c\u9673\u8ff0\u5f0f
+DBLOOK_PrimUniqueHeader=\u4e3b\u8981/\u552f\u4e00
+DBLOOK_ForeignHeader=\u5916\u90e8
+DBLOOK_SchemasHeader=DDL \u7db1\u76ee\u9673\u8ff0\u5f0f
+DBLOOK_StoredProcHeader=DDL \u5132\u5b58\u7a0b\u5e8f\u9673\u8ff0\u5f0f
+DBLOOK_TriggersHeader=DDL \u89f8\u767c\u9673\u8ff0\u5f0f
+DBLOOK_ViewsHeader=DDL \u6982\u7565\u8868\u9673\u8ff0\u5f0f
+DBLOOK_Jar_Note=**** \u9644\u8a3b **** \u70ba\u4e86\u6b63\u78ba\u8f09\u5165 JAR \u6a94\uff0c\n\
+-- \u60a8\u5fc5\u9808 1) \u78ba\u5b9a DBJARS \u76ee\u9304\uff08\u7531 dblook \u6240\u81ea\u52d5\n\
 -- \u5efa\u7acb\uff09\u5b58\u5728\u65bc\u5176\u539f\u5148\u5efa\u7acb\u7684\u4f4d\u7f6e\uff08\u4ea6\u5373\uff0c\n\
 -- \u5728\u4ee5\u4e0b\u7684\u9673\u8ff0\u5f0f\u4e2d\u986f\u793a\u7684\u8def\u5f91\u4e0a\uff09\uff0c\u6216\u662f 2) \u8b8a\u66f4\n\
 -- \u4ee5\u4e0b\u9673\u8ff0\u5f0f\u4e2d\u7684\u8def\u5f91\u4f86\n\
--- \u53cd\u6620 CSJARS \u7684\u73fe\u884c\u4f4d\u7f6e\u3002\u5982\u679c CSJARS \u76ee\u9304\u4e0d\u5b58\u5728\uff0c\n\
+-- \u53cd\u6620 DBJARS \u7684\u73fe\u884c\u4f4d\u7f6e\u3002\u5982\u679c DBJARS \u76ee\u9304\u4e0d\u5b58\u5728\uff0c\n\
 -- \u6216\u662f\u5b83\u5df2\u88ab\u79fb\u52d5\uff0c\u8def\u5f91\u4e0d\u6b63\u78ba\uff0c\u5247\u4e0b\u5217 DDL\n\
 -- \u9673\u8ff0\u5f0f\u5c07\u6703\u64f2\u51fa\u932f\u8aa4\uff0c\u800c\u4e14\u5c07\u4e0d\u6703\n\
 -- \u8f09\u5165 JAR \u6a94\u3002
-CSLOOK_FailedToLoadJar=\u7121\u6cd5\u8f09\u5165 Jar \u6a94 {0}
-CSLOOK_DefaultSchema=\u56de\u5fa9\u5230\u9810\u8a2d\u7684\u7db1\u76ee 'APP'
-CSLOOK_AtLeastOneDebug=-- \u9644\u8a3b\uff1a\u7522\u751f DDL \u7684\u6642\u5019\uff0c\n\
--- \u81f3\u5c11\u767c\u73fe\u4e86\u4e00\u500b\u975e\u9810\u671f\u7684\u932f\u8aa4/\u8b66\u544a\u3002\u8acb\u53c3\u95b1 cslook.log\n\
+DBLOOK_FailedToLoadJar=\u7121\u6cd5\u8f09\u5165 Jar \u6a94 {0}
+DBLOOK_DefaultSchema=\u56de\u5fa9\u5230\u9810\u8a2d\u7684\u7db1\u76ee 'APP'
+DBLOOK_AtLeastOneDebug=-- \u9644\u8a3b\uff1a\u7522\u751f DDL \u7684\u6642\u5019\uff0c\n\
+-- \u81f3\u5c11\u767c\u73fe\u4e86\u4e00\u500b\u975e\u9810\u671f\u7684\u932f\u8aa4/\u8b66\u544a\u3002\u8acb\u53c3\u95b1 dblook.log\n\
 -- \u4ee5\u6aa2\u8996\u8a0a\u606f\u3002\n\
 \n

Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/tools/URLCheck.java
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/tools/URLCheck.java	(original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/tools/URLCheck.java	Tue Nov 16 18:09:29 2004
@@ -104,7 +104,7 @@
         else if( url.startsWith( "jdbc:derby:"))
 		{
 			protocol = "jdbc:derby:";
-            validProps = getValidCloudscapeProps();
+            validProps = getValidDerbyProps();
 		}
         else
             validProps = null;
@@ -149,10 +149,10 @@
     return booleanAttributes;
   }
 
-    private static Vector validCloudscapeProps;
-    private Vector getValidCloudscapeProps()
+    private static Vector validDerbyProps;
+    private Vector getValidDerbyProps()
     {
-        if( validCloudscapeProps == null)
+        if( validDerbyProps == null)
         {
             try
             {
@@ -167,14 +167,14 @@
                     Field aField = (Field)fields[i];
                     props.addElement(aField.get(att));
                 }
-                validCloudscapeProps = props;
+                validDerbyProps = props;
             }
             catch (Exception ex)
             {
                 ex.printStackTrace();
             }
         }
-        return validCloudscapeProps;
-    } // end of getValidCloudscapeProps
+        return validDerbyProps;
+    } // end of getValidDerbyProps
 
 }

Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/tools/dblook.java
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/tools/dblook.java	(original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/tools/dblook.java	Tue Nov 16 18:09:29 2004
@@ -38,16 +38,16 @@
 
 import org.apache.derby.iapi.tools.i18n.LocalizedResource;
 
-import org.apache.derby.impl.tools.cslook.DB_Check;
-import org.apache.derby.impl.tools.cslook.DB_Index;
-import org.apache.derby.impl.tools.cslook.DB_Jar;
-import org.apache.derby.impl.tools.cslook.DB_Key;
-import org.apache.derby.impl.tools.cslook.DB_Table;
-import org.apache.derby.impl.tools.cslook.DB_Schema;
-import org.apache.derby.impl.tools.cslook.DB_StoredProcedure;
-import org.apache.derby.impl.tools.cslook.DB_Trigger;
-import org.apache.derby.impl.tools.cslook.DB_View;
-import org.apache.derby.impl.tools.cslook.Logs;
+import org.apache.derby.impl.tools.dblook.DB_Check;
+import org.apache.derby.impl.tools.dblook.DB_Index;
+import org.apache.derby.impl.tools.dblook.DB_Jar;
+import org.apache.derby.impl.tools.dblook.DB_Key;
+import org.apache.derby.impl.tools.dblook.DB_Table;
+import org.apache.derby.impl.tools.dblook.DB_Schema;
+import org.apache.derby.impl.tools.dblook.DB_StoredProcedure;
+import org.apache.derby.impl.tools.dblook.DB_Trigger;
+import org.apache.derby.impl.tools.dblook.DB_View;
+import org.apache.derby.impl.tools.dblook.Logs;
 
 public class dblook {
 
@@ -102,7 +102,7 @@
 	/* ************************************************
 	 * Constructor:
 	 * Parse the command line, initialize logs, echo program variables,
-	 * and load the Cloudscape driver.
+	 * and load the Derby driver.
 	 * @param args args[0] is the database URL.  All other command-line
 	 *  parameters are read as system properties.
 	 * ****/

Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/tools/ij.java
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/tools/ij.java	(original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/tools/ij.java	Tue Nov 16 18:09:29 2004
@@ -28,8 +28,8 @@
 
 /**
 	
-	ij is Cloudscape's interactive JDBC scripting tool.
-	It is a simple utility for running scripts against a Cloudscape database.
+	ij is Derby's interactive JDBC scripting tool.
+	It is a simple utility for running scripts against a Derby database.
 	You can also use it interactively to run ad hoc queries.
 	ij provides several commands for ease in accessing a variety of JDBC features.
 	<P>

Modified: incubator/derby/code/trunk/java/tools/org/apache/derby/tools/sysinfo.java
==============================================================================
--- incubator/derby/code/trunk/java/tools/org/apache/derby/tools/sysinfo.java	(original)
+++ incubator/derby/code/trunk/java/tools/org/apache/derby/tools/sysinfo.java	Tue Nov 16 18:09:29 2004
@@ -35,9 +35,9 @@
 	<p>
 	Also available on this class are methods which allow you to determine
 	the version of the code for the system without actually booting a database.
-	Please note that this is the Cloudscape version of the .jar files, not of your databases.
+	Please note that this is the Derby version of the .jar files, not of your databases.
 	<p>
-	The numbering scheme for released Cloudscape products is <b><code>m1.m2.m3 </code></b>
+	The numbering scheme for released Derby products is <b><code>m1.m2.m3 </code></b>
 	where <b><code>m1</code></b> is the major release version, <b><code>m2</code></b> is the minor release version,
 	and <b><code>m3</code></b> is the maintenance level. Versions of the product with the same
 	major and minor version numbers are considered feature compatible. 
@@ -56,8 +56,8 @@
   }
 
 	/**
-		The genus name for the IBM Cloudscape code. Use this to determine the version of the
-		IBM Cloudscape embedded code in cs.jar.
+		The genus name for the Apache Derby code. Use this to determine the version of the
+		Apache Derby embedded code in cs.jar.
 	*/
 	public static final String DBMS="DBMS";
 
@@ -69,7 +69,7 @@
 
 
 	/**
-		gets the major version of the IBM Cloudscape embedded code.
+		gets the major version of the Apache Derby embedded code.
 		@return	the major version. Returns -1 if not found.
 	 */
   static public int getMajorVersion()
@@ -97,7 +97,7 @@
 
 
 	/**
-		gets the minor version of the IBM Cloudscape embedded code.
+		gets the minor version of the Apache Derby embedded code.
 		@return	the minor version. Returns -1 if not found.
 	 */
   static public int getMinorVersion()
@@ -123,7 +123,7 @@
   }
 
 	/**
-		gets the build number for the IBM Cloudscape embedded library
+		gets the build number for the Apache Derby embedded library
 		@return the build number, or -1 if the information is not found.
 	*/
   static public String getBuildNumber()
@@ -150,7 +150,7 @@
 
 
 	/**
-		gets the product name for the IBM Cloudscape embedded library
+		gets the product name for the Apache Derby embedded library
 		@return the name
 	*/
   static public String getProductName()
@@ -183,7 +183,7 @@
   }
 
   /**
-	Return the version information string for the IBM Cloudscape embedded library including alpha or beta indicators.
+	Return the version information string for the Apache Derby embedded library including alpha or beta indicators.
   */
   static public String getVersionString(String genus) {
 

Mime
View raw message