db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fuzzylo...@apache.org
Subject svn commit: r483356 [1/16] - in /db/derby/code/trunk: ./ java/drda/org/apache/derby/loc/drda/ java/engine/org/apache/derby/loc/ java/testing/org/apache/derbyTesting/functionTests/master/ java/testing/org/apache/derbyTesting/functionTests/master/DerbyNe...
Date Thu, 07 Dec 2006 06:27:36 GMT
Author: fuzzylogic
Date: Wed Dec  6 22:27:34 2006
New Revision: 483356

URL: http://svn.apache.org/viewvc?view=rev&rev=483356
Log:
DERBY-2143: Merge revision 483352 to trunk, adds updated localized messages
developed during 10.2 release cycle to trunk.

Modified:
    db/derby/code/trunk/build.xml
    db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_de_DE.properties
    db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_es.properties
    db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_fr.properties
    db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_it.properties
    db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_ja_JP.properties
    db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_ko_KR.properties
    db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_pt_BR.properties
    db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_zh_CN.properties
    db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_zh_TW.properties
    db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/servlet_de_DE.properties
    db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/servlet_es.properties
    db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/servlet_fr.properties
    db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/servlet_it.properties
    db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/servlet_ja_JP.properties
    db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/servlet_ko_KR.properties
    db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/servlet_zh_CN.properties
    db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/servlet_zh_TW.properties
    db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_cs.properties
    db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_de_DE.properties
    db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_es.properties
    db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_fr.properties
    db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_hu.properties
    db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_it.properties
    db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ja_JP.properties
    db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ko_KR.properties
    db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_pl.properties
    db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_pt_BR.properties
    db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ru.properties
    db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_zh_CN.properties
    db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_zh_TW.properties
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/sysinfo.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/sysinfo.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/iepnegativetests_ES.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/sysinfo_withproperties.out
    db/derby/code/trunk/java/tools/org/apache/derby/loc/sysinfoMessages_de_DE.properties
    db/derby/code/trunk/java/tools/org/apache/derby/loc/sysinfoMessages_es.properties
    db/derby/code/trunk/java/tools/org/apache/derby/loc/sysinfoMessages_fr.properties
    db/derby/code/trunk/java/tools/org/apache/derby/loc/sysinfoMessages_it.properties
    db/derby/code/trunk/java/tools/org/apache/derby/loc/sysinfoMessages_ja_JP.properties
    db/derby/code/trunk/java/tools/org/apache/derby/loc/sysinfoMessages_ko_KR.properties
    db/derby/code/trunk/java/tools/org/apache/derby/loc/sysinfoMessages_zh_CN.properties
    db/derby/code/trunk/java/tools/org/apache/derby/loc/sysinfoMessages_zh_TW.properties
    db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_de_DE.properties
    db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_es.properties
    db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_fr.properties
    db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_it.properties
    db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_ja_JP.properties
    db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_ko_KR.properties
    db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_pt_BR.properties
    db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_zh_CN.properties
    db/derby/code/trunk/java/tools/org/apache/derby/loc/toolsmessages_zh_TW.properties

Modified: db/derby/code/trunk/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/build.xml?view=diff&rev=483356&r1=483355&r2=483356
==============================================================================
--- db/derby/code/trunk/build.xml (original)
+++ db/derby/code/trunk/build.xml Wed Dec  6 22:27:34 2006
@@ -210,6 +210,12 @@
   <target name="localeinfo" depends="checklocaleinfo" unless="localeinfo.available">
 
     <antcall target="buildlocaleinfo">
+      <param name="locale.iname" value="cs"/>
+      <param name="locale.ename" value="Czech/International [cs]"/>
+      <param name="info.buildnumber" value="1"/>
+      <param name="info.productfile" value="codeline"/>
+    </antcall>
+    <antcall target="buildlocaleinfo">
       <param name="locale.iname" value="de_DE"/>
       <param name="locale.ename" value="German/Germany [de_DE]"/>
       <param name="info.buildnumber" value="1"/>
@@ -228,6 +234,12 @@
       <param name="info.productfile" value="codeline"/>
     </antcall>
     <antcall target="buildlocaleinfo">
+      <param name="locale.iname" value="hu"/>
+      <param name="locale.ename" value="Hungarian/International [hu]"/>
+      <param name="info.buildnumber" value="1"/>
+      <param name="info.productfile" value="codeline"/>
+    </antcall>
+    <antcall target="buildlocaleinfo">
       <param name="locale.iname" value="it"/>
       <param name="locale.ename" value="Italian/International [it]"/>
       <param name="info.buildnumber" value="1"/>
@@ -246,12 +258,24 @@
       <param name="info.productfile" value="codeline"/>
     </antcall>
     <antcall target="buildlocaleinfo">
+      <param name="locale.iname" value="pl"/>
+      <param name="locale.ename" value="Polish/International [pl]"/>
+      <param name="info.buildnumber" value="1"/>
+      <param name="info.productfile" value="codeline"/>
+    </antcall>
+    <antcall target="buildlocaleinfo">
       <param name="locale.iname" value="pt_BR"/>
       <param name="locale.ename" value="Portuguese/Brazil [pt_BR]"/>
       <param name="info.buildnumber" value="1"/>
       <param name="info.productfile" value="codeline"/>
     </antcall>
     <antcall target="buildlocaleinfo">
+      <param name="locale.iname" value="ru"/>
+      <param name="locale.ename" value="Russian/International [ru]"/>
+      <param name="info.buildnumber" value="1"/>
+      <param name="info.productfile" value="codeline"/>
+    </antcall>
+    <antcall target="buildlocaleinfo">
       <param name="locale.iname" value="zh_CN"/>
       <param name="locale.ename" value="Simplified_Chinese/PR_China [zh_CN]"/>
       <param name="info.buildnumber" value="1"/>
@@ -268,13 +292,17 @@
   <target name="checklocaleinfo">
     <condition property="localeinfo.available">
       <and>
+        <available file="${out.dir}/org/apache/derby/info/locale_cs.properties"/>
         <available file="${out.dir}/org/apache/derby/info/locale_de_DE.properties"/>
         <available file="${out.dir}/org/apache/derby/info/locale_es.properties"/>
         <available file="${out.dir}/org/apache/derby/info/locale_fr.properties"/>
+        <available file="${out.dir}/org/apache/derby/info/locale_hu.properties"/>
         <available file="${out.dir}/org/apache/derby/info/locale_it.properties"/>
         <available file="${out.dir}/org/apache/derby/info/locale_ja_JP.properties"/>
         <available file="${out.dir}/org/apache/derby/info/locale_ko_KR.properties"/>
+        <available file="${out.dir}/org/apache/derby/info/locale_pl.properties"/>
         <available file="${out.dir}/org/apache/derby/info/locale_pt_BR.properties"/>
+        <available file="${out.dir}/org/apache/derby/info/locale_hu.properties"/>
         <available file="${out.dir}/org/apache/derby/info/locale_zh_CN.properties"/>
         <available file="${out.dir}/org/apache/derby/info/locale_zh_TW.properties"/>
       </and>
@@ -282,13 +310,17 @@
   </target>
 
   <target name="cleanlocale">
+    <delete file="${out.dir}/org/apache/derby/info/locale_cs.properties"/>
     <delete file="${out.dir}/org/apache/derby/info/locale_de_DE.properties"/>
     <delete file="${out.dir}/org/apache/derby/info/locale_es.properties"/>
     <delete file="${out.dir}/org/apache/derby/info/locale_fr.properties"/>
+    <delete file="${out.dir}/org/apache/derby/info/locale_hu.properties"/>
     <delete file="${out.dir}/org/apache/derby/info/locale_it.properties"/>
     <delete file="${out.dir}/org/apache/derby/info/locale_ja_JP.properties"/>
     <delete file="${out.dir}/org/apache/derby/info/locale_ko_KR.properties"/>
+    <delete file="${out.dir}/org/apache/derby/info/locale_pl.properties"/>
     <delete file="${out.dir}/org/apache/derby/info/locale_pt_BR.properties"/>
+    <delete file="${out.dir}/org/apache/derby/info/locale_ru.properties"/>
     <delete file="${out.dir}/org/apache/derby/info/locale_zh_CN.properties"/>
     <delete file="${out.dir}/org/apache/derby/info/locale_zh_TW.properties"/>
   </target>
@@ -1074,7 +1106,7 @@
       <attribute name="Bundle-Vendor" value="Apache Software Foundation"/>
       <attribute name="Bundle-Name" value="Apache Derby ${major}.${minor}"/>
       <attribute name="Bundle-Version" value="${major}.${minor}.${maint}.${changenumber}"/>
-      <attribute name="Class-Path" value="derbyLocale_de_DE.jar derbyLocale_es.jar derbyLocale_fr.jar derbyLocale_it.jar derbyLocale_ja_JP.jar derbyLocale_ko_KR.jar derbyLocale_pt_BR.jar derbyLocale_zh_CN.jar derbyLocale_zh_TW.jar"/>
+      <attribute name="Class-Path" value="derbyLocale_cs.jar derbyLocale_de_DE.jar derbyLocale_es.jar derbyLocale_fr.jar derbyLocale_hu.jar derbyLocale_it.jar derbyLocale_ja_JP.jar derbyLocale_ko_KR.jar derbyLocale_pl.jar derbyLocale_pt_BR.jar derbyLocale_ru.jar derbyLocale_zh_CN.jar derbyLocale_zh_TW.jar"/>
 
       	<attribute name="Sealed" value="true"/>
     	<section name="org/apache/derby/impl/tools/sysinfo/">
@@ -1339,6 +1371,10 @@
     <!-- call localejar for each locale -->
 
     <antcall target="localejar">
+      <param name="locale.iname" value="cs"/>
+      <param name="locale.ename" value="Czech/International [cs]"/>
+    </antcall>
+    <antcall target="localejar">
       <param name="locale.iname" value="de_DE"/>
       <param name="locale.ename" value="German/Germany [de_DE]"/>
     </antcall>
@@ -1351,6 +1387,10 @@
       <param name="locale.ename" value="French/International [fr]"/>
     </antcall>
     <antcall target="localejar">
+      <param name="locale.iname" value="hu"/>
+      <param name="locale.ename" value="Hungarian/International [hu]"/>
+    </antcall>
+    <antcall target="localejar">
       <param name="locale.iname" value="it"/>
       <param name="locale.ename" value="Italian/International [it]"/>
     </antcall>
@@ -1363,8 +1403,16 @@
       <param name="locale.ename" value="Korean/Korea [ko_KR]"/>
     </antcall>
     <antcall target="localejar">
+      <param name="locale.iname" value="pl"/>
+      <param name="locale.ename" value="Polish/International [pl]"/>
+    </antcall>
+    <antcall target="localejar">
       <param name="locale.iname" value="pt_BR"/>
       <param name="locale.ename" value="Portuguese/Brazil [pt_BR]"/>
+    </antcall>
+    <antcall target="localejar">
+      <param name="locale.iname" value="ru"/>
+      <param name="locale.ename" value="Russian/International [ru]"/>
     </antcall>
     <antcall target="localejar">
       <param name="locale.iname" value="zh_CN"/>

Modified: db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_de_DE.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_de_DE.properties?view=diff&rev=483356&r1=483355&r2=483356
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_de_DE.properties (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_de_DE.properties Wed Dec  6 22:27:34 2006
@@ -13,6 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# NLS_ENCODING=UTF-8
+# NLS_MESSAGEFORMAT_ALL
+
 # This file contains messages for NetworkServerControl
 # The format is DRDA_X[xxxxx].Y where X[xxxxx] is the message id and Y is the severity
 # Severity values are I - information, S - severe, U - user
@@ -22,12 +25,12 @@
 DRDA_UnexpectedException.S=Unerwartete Ausnahme:\n {0}
 DRDA_ListenPort.S=Am Port {0} auf dem Host {1} war kein Empfang m\u00f6glich.
 DRDA_NoInputStream.S=F\u00fcr den Client-Socket konnte kein Eingabedatenstrom angefordert werden.
-DRDA_Ready.I=Der Server ist bereit, am Port {0} Verbindungen zu akzeptieren.
+DRDA_Ready.I={1} Network Server {2} wurde gestartet und ist seit {3} bereit, Verbindungen am Port {0} zu akzeptieren. 
 DRDA_UnableToAccept.S=Es k\u00f6nnen keine Verbindungen akzeptiert werden.
 DRDA_ConnNumber.I=Verbindungsnummer: {0}.
 DRDA_ClientSocketError.S=Fehler beim Client-Socket:\n {0}
 DRDA_ListenerClose.S=Der Listener-Thread kann nicht geschlossen werden.
-DRDA_ShutdownSuccess.I=Erfolgreich heruntergefahren.
+DRDA_ShutdownSuccess.I={0} Network Server {1} wurde heruntergefahren am {2}.
 DRDA_ShutdownWarning.I=Warnung zur Derby-Beendigung:\n {0}
 DRDA_ShutdownError.S=Der Server am Port {0} auf dem Host {1} konnte nicht heruntergefahren werden.
 DRDA_BootSuccess.I=Die Datenbank {0} wurde erfolgreich gebootet.

Modified: db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_es.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_es.properties?view=diff&rev=483356&r1=483355&r2=483356
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_es.properties (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_es.properties Wed Dec  6 22:27:34 2006
@@ -13,6 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# NLS_ENCODING=UTF-8
+# NLS_MESSAGEFORMAT_ALL
+
 # This file contains messages for NetworkServerControl
 # The format is DRDA_X[xxxxx].Y where X[xxxxx] is the message id and Y is the severity
 # Severity values are I - information, S - severe, U - user
@@ -22,12 +25,12 @@
 DRDA_UnexpectedException.S=Excepci\u00f3n no esperada:\n {0}
 DRDA_ListenPort.S=No se pudo escuchar en el puerto {0} en el sistema principal {1}.
 DRDA_NoInputStream.S=No se pudo obtener una corriente de datos de entrada para el socket de cliente.
-DRDA_Ready.I=El servidor est\u00e1 listo para aceptar conexiones en el puerto {0}.
+DRDA_Ready.I=Servidor de red {1} - {2} se ha iniciado y est\u00e1 listo para aceptar conexiones en el puerto {0} a las {3} 
 DRDA_UnableToAccept.S=No se pueden aceptar conexiones.
 DRDA_ConnNumber.I=N\u00famero de conexi\u00f3n: {0}.
 DRDA_ClientSocketError.S=Error en el socket de cliente: \n {0}
 DRDA_ListenerClose.S=No se pudo cerrar la hebra de escucha.
-DRDA_ShutdownSuccess.I=Conclusi\u00f3n satisfactoria.
+DRDA_ShutdownSuccess.I=Servidor de red {0} - {1} ha concluido a las {2}
 DRDA_ShutdownWarning.I=Aviso de conclusi\u00f3n de Derby:\n {0}
 DRDA_ShutdownError.S=No se puede cerrar el servidor en el puerto {0} en el sistema principal {1}.
 DRDA_BootSuccess.I=La iniciaci\u00f3n de la base de datos {0} ha sido satisfactoria.
@@ -56,7 +59,7 @@
 DRDA_OFF.I=desactivado
 DRDA_UnknownHost.S=No se pudo encontrar el sistema principal: {0}.
 DRDA_UnknownHostWarning.I=Aviso: UnknkownHostException: {0}.
-DRDA_NeedLocalHost.S=sistema principal: {0} no es local para el servidor que se ejecuta en {1}, as\u00ed que no se puede utilizar para mandatos NetworkServerControl 
+DRDA_NeedLocalHost.S=sistema principal: {0} no es local para el servidor que se ejecuta en {1}, as\u00ed que no se puede utilizar para mandatos NetworkServerControl  
 DRDA_NoIO.S=No se ha podido conectar con Derby Network Server en el sistema principal {0}, puerto {1}.
 DRDA_InvalidReplyHeader1.S=Cabecera de respuesta no v\u00e1lida del servidor de red. Longitud demasiado corta con {0}.
 DRDA_InvalidReplyHeader2.S=Cabecera de respuesta no v\u00e1lida del servidor de red. Serie no v\u00e1lida con {0}.

Modified: db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_fr.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_fr.properties?view=diff&rev=483356&r1=483355&r2=483356
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_fr.properties (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_fr.properties Wed Dec  6 22:27:34 2006
@@ -13,6 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# NLS_ENCODING=UTF-8
+# NLS_MESSAGEFORMAT_ALL
+
 # This file contains messages for NetworkServerControl
 # The format is DRDA_X[xxxxx].Y where X[xxxxx] is the message id and Y is the severity
 # Severity values are I - information, S - severe, U - user
@@ -21,13 +24,13 @@
 DRDA_PropertyException.S=Exception inattendue lors de la lecture du fichier cloudscape.properties :\n {0}
 DRDA_UnexpectedException.S=Exception inattendue :\n {0}
 DRDA_ListenPort.S=Ecoute impossible sur le port {0} sur l''h\u00f4te {1}.
-DRDA_NoInputStream.S=Impossible d'obtenir le flux de donn\u00e9es en entr\u00e9e pour le socket client.
-DRDA_Ready.I=Le serveur est pr\u00eat \u00e0 accepter les connexions au port {0}.
-DRDA_UnableToAccept.S=Impossible d'accepter les connexions.
+DRDA_NoInputStream.S=Impossible d''obtenir le flux de donn\u00e9es en entr\u00e9e pour le socket client.
+DRDA_Ready.I=Serveur r\u00e9seau {1} - {2} d\u00e9marr\u00e9 et pr\u00eat \u00e0 accepter les connexions au port {0} \u00e0 {3} 
+DRDA_UnableToAccept.S=Impossible d''accepter les connexions.
 DRDA_ConnNumber.I=Num\u00e9ro de connexion : {0}.
 DRDA_ClientSocketError.S=Erreur sur le socket client :\n {0}
-DRDA_ListenerClose.S=Impossible de fermer l'unit\u00e9 d'ex\u00e9cution du programme d'\u00e9coute.
-DRDA_ShutdownSuccess.I=Arr\u00eat r\u00e9ussi.
+DRDA_ListenerClose.S=Impossible de fermer l''unit\u00e9 d''ex\u00e9cution du programme d''\u00e9coute.
+DRDA_ShutdownSuccess.I=Serveur r\u00e9seau {0} - {1} arr\u00eat\u00e9 \u00e0 {2}
 DRDA_ShutdownWarning.I=Avertissement d''arr\u00eat de Derby :\n {0}
 DRDA_ShutdownError.S=Arr\u00eat du serveur impossible sur le port {0} sur l''h\u00f4te {1}.
 DRDA_BootSuccess.I=La base de donn\u00e9es {0} a \u00e9t\u00e9 amorc\u00e9e.
@@ -61,10 +64,10 @@
 DRDA_InvalidReplyHeader1.S=En-t\u00eate de r\u00e9ponse non valide du serveur de r\u00e9seau : la longueur {0} est insuffisante.
 DRDA_InvalidReplyHeader2.S=En-t\u00eate de r\u00e9ponse non valide du serveur de r\u00e9seau : cha\u00eene {0} non valide.
 DRDA_InvalidReplyTooShort.S=En-t\u00eate de r\u00e9ponse non valide du serveur de r\u00e9seau : donn\u00e9es insuffisantes.
-DRDA_SysInfoError.S=Erreur d'obtention des informations syst\u00e8me SysInfo.
+DRDA_SysInfoError.S=Erreur d''obtention des informations syst\u00e8me SysInfo.
 DRDA_SysInfoWriteError.S=Erreur d''\u00e9criture des informations syst\u00e8me SysInfo :\n{0}
-DRDA_RuntimeInfoError.S=Erreur lors de l'extraction des informations d'ex\u00e9cution RuntimeInfo.
-DRDA_PropInfoError.S=Erreur d'obtention des informations de propri\u00e9t\u00e9s.
+DRDA_RuntimeInfoError.S=Erreur lors de l''extraction des informations d''ex\u00e9cution RuntimeInfo.
+DRDA_PropInfoError.S=Erreur d''obtention des informations de propri\u00e9t\u00e9s.
 DRDA_PropInfoWriteError.S=Erreur d''\u00e9criture des informations de propri\u00e9t\u00e9s :\n{0}
 DRDA_ProductVersionReadError.S=Erreur de lecture des informations produit lors de l''installation de Derby. {0}.
 DRDA_ConnectionTested.I=Connexion obtenue pour l''h\u00f4te : {0}, num\u00e9ro de port {1}.
@@ -90,15 +93,15 @@
 DRDA_SysInfoDrdaPRDID.I=ID produit DRDA :
 #
 # Derby Network Server RUNTIMEINFO stuff
-DRDA_RuntimeInfoBanner.I=--- Informations d'ex\u00e9cution de Derby Network Server ---
+DRDA_RuntimeInfoBanner.I=--- Informations d''ex\u00e9cution de Derby Network Server ---
 DRDA_RuntimeInfoSessionBanner.I=---------- Informations sur les sessions ---------------
-DRDA_RuntimeInfoNumThreads.I=Nombre d'unit\u00e9s d'ex\u00e9cution de connexion : 
+DRDA_RuntimeInfoNumThreads.I=Nombre d''unit\u00e9s d''ex\u00e9cution de connexion : 
 DRDA_RuntimeInfoNumActiveSessions.I=Nombre de sessions actives : 
 DRDA_RuntimeInfoNumWaitingSessions.I=Nombre de sessions en attente : 
 DRDA_RuntimeInfoSessionNumber.I=Nombre de sessions :
 DRDA_RuntimeInfoDatabase.I=Base de donn\u00e9es :
 DRDA_RuntimeInfoUser.I=Utilisateur :
-DRDA_RuntimeInfoNumStatements.I=Nombre d'instructions :
+DRDA_RuntimeInfoNumStatements.I=Nombre d''instructions :
 DRDA_RuntimeInfoPreparedStatementHeader.I=Informations sur les instructions pr\u00e9par\u00e9es : \n\tID instruction\t\tTexte SQL\n\t--------------\t-----------\n
 
 DRDA_RuntimeInfoTotalMemory.I=M\u00e9moire totale : 

Modified: db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_it.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_it.properties?view=diff&rev=483356&r1=483355&r2=483356
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_it.properties (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_it.properties Wed Dec  6 22:27:34 2006
@@ -13,6 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# NLS_ENCODING=UTF-8
+# NLS_MESSAGEFORMAT_ALL
+
 # This file contains messages for NetworkServerControl
 # The format is DRDA_X[xxxxx].Y where X[xxxxx] is the message id and Y is the severity
 # Severity values are I - information, S - severe, U - user
@@ -22,12 +25,12 @@
 DRDA_UnexpectedException.S=Eccezione imprevista:\n {0}
 DRDA_ListenPort.S=Ascolto impossibile sulla porta {0} dell''host {1}.
 DRDA_NoInputStream.S=Impossibile richiamare il flusso di input per il socket client.
-DRDA_Ready.I=Il server \u00e8 pronto ad accettare i collegamenti sulla porta {0}.
+DRDA_Ready.I={1} Server di rete - {2} avviato e pronto ad accettare connessioni sulla porta {0} a {3} 
 DRDA_UnableToAccept.S=Impossibile accettare i collegamenti.
 DRDA_ConnNumber.I=Numero di collegamenti: {0}.
 DRDA_ClientSocketError.S=Errore sul socket client:\n {0}
 DRDA_ListenerClose.S=Impossibile chiudere il thread listener.
-DRDA_ShutdownSuccess.I=Arresto corretto.
+DRDA_ShutdownSuccess.I={0} Server di rete - {1} chiuso a {2}
 DRDA_ShutdownWarning.I=Avvertenza chiusura Derby:\n {0}
 DRDA_ShutdownError.S=Impossibile chiudere il server sulla porta {0} dell''host {1}.
 DRDA_BootSuccess.I=Avvio database, {0}, corretto.
@@ -56,7 +59,7 @@
 DRDA_OFF.I=off
 DRDA_UnknownHost.S=impossibile trovare l''host: {0}.
 DRDA_UnknownHostWarning.I=Avvertenza: UnknkownHostException: {0}.
-DRDA_NeedLocalHost.S=host: {0} non \u00e8 un host locale rispetto al server in esecuzione su {1}, per cui non pu\u00f2 essere utilizzato per i comandi  NetworkServerControl
+DRDA_NeedLocalHost.S=host: {0} non \u00e8 un host locale rispetto al server in esecuzione su {1}, per cui non pu\u00f2 essere utilizzato per i comandi  NetworkServerControl  
 DRDA_NoIO.S=Impossibile collegarsi a Derby Network Server sull''host {0}, porta {1}.
 DRDA_InvalidReplyHeader1.S=Intestazione della risposta non valida dal server di rete: lunghezza {0} troppo breve.
 DRDA_InvalidReplyHeader2.S=Intestazione della risposta non valida dal server di rete: stringa {0} non valida.
@@ -66,7 +69,7 @@
 DRDA_RuntimeInfoError.S=Errore durante il richiamo delle informazioni RuntimeInfo.
 DRDA_PropInfoError.S=Errore durante il richiamo delle informazioni sulle propriet\u00e0.
 DRDA_PropInfoWriteError.S=Errore durante la scrittura delle informazioni sulle propriet\u00e0:\n {0}
-DRDA_ProductVersionReadError.S=Errore durante la lettura delle informazioni sulla versione del prodotto dall''installazione di Derby.{0}.
+DRDA_ProductVersionReadError.S=Errore durante la lettura delle informazioni sulla versione del prodotto dall''installazione di Derby. {0}.
 DRDA_ConnectionTested.I=Connessione ottenuta per l''host: {0}, numero porta {1}.
 DRDA_ConnectionTested2.I=Connessione ottenuta per l''host: {0}, la porta {1}, il database {2}.
 DRDA_ConnectionTested3.I=Connessione ottenuta per l''host: {0}, la porta {1}, il database {2}, l''utente {3}.
@@ -92,14 +95,14 @@
 # Derby Network Server RUNTIMEINFO stuff
 DRDA_RuntimeInfoBanner.I=--- Informazioni di runtime sul server di rete Derby ---
 DRDA_RuntimeInfoSessionBanner.I=---------- Informazioni di sessione ---------------
-DRDA_RuntimeInfoNumThreads.I=N. thread di collegamento :
-DRDA_RuntimeInfoNumActiveSessions.I=N. sessioni attive :
-DRDA_RuntimeInfoNumWaitingSessions.I=N. sessioni in attesa :
+DRDA_RuntimeInfoNumThreads.I=N. thread di collegamento : 
+DRDA_RuntimeInfoNumActiveSessions.I=N. sessioni attive : 
+DRDA_RuntimeInfoNumWaitingSessions.I=N. sessioni in attesa : 
 DRDA_RuntimeInfoSessionNumber.I=N. sessioni :
-DRDA_RuntimeInfoDatabase.I=Database :
-DRDA_RuntimeInfoUser.I=Utente :
+DRDA_RuntimeInfoDatabase.I=Database:
+DRDA_RuntimeInfoUser.I=Utente:
 DRDA_RuntimeInfoNumStatements.I=N. istruzioni:
-DRDA_RuntimeInfoPreparedStatementHeader.I=Informazioni sull'istruzione preparata: \n\tID Stmt\t\tSQLText\n\t-------------\t-----------\n
+DRDA_RuntimeInfoPreparedStatementHeader.I=Informazioni sull''istruzione preparata: \n\tID Stmt\t\tSQLText\n\t-------------\t-----------\n
 
 DRDA_RuntimeInfoTotalMemory.I=Memoria totale : 
 DRDA_RuntimeInfoFreeMemory.I=Memoria disponibile : 

Modified: db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_ja_JP.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_ja_JP.properties?view=diff&rev=483356&r1=483355&r2=483356
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_ja_JP.properties (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_ja_JP.properties Wed Dec  6 22:27:34 2006
@@ -13,22 +13,25 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# NLS_ENCODING=UTF-8
+# NLS_MESSAGEFORMAT_ALL
+
 # This file contains messages for NetworkServerControl
 # The format is DRDA_X[xxxxx].Y where X[xxxxx] is the message id and Y is the severity
 # Severity values are I - information, S - severe, U - user
 
-DRDA_LoadException.S=Derby JDBC \u30c9\u30e9\u30a4\u30d0\u30fc\u306e\u30ed\u30fc\u30c9\u4e2d\u306b\u4e88\u671f\u3057\u306a\u3044\u4f8b\u5916\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\n {0}
+DRDA_LoadException.S=Cloudscape JDBC \u30c9\u30e9\u30a4\u30d0\u30fc\u306e\u30ed\u30fc\u30c9\u4e2d\u306b\u4e88\u671f\u3057\u306a\u3044\u4f8b\u5916\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\n {0}
 DRDA_PropertyException.S=cloudscape.properties \u306e\u8aad\u307f\u53d6\u308a\u4e2d\u306b\u4e88\u671f\u3057\u306a\u3044\u4f8b\u5916\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002\n {0}
 DRDA_UnexpectedException.S=\u4e88\u671f\u3057\u306a\u3044\u4f8b\u5916:\n {0}
 DRDA_ListenPort.S=\u30db\u30b9\u30c8 {1} \u306e\u30dd\u30fc\u30c8 {0} \u3092 listen \u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002
 DRDA_NoInputStream.S=\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u30fb\u30bd\u30b1\u30c3\u30c8\u306e\u5165\u529b\u30b9\u30c8\u30ea\u30fc\u30e0\u3092\u53d6\u5f97\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002
-DRDA_Ready.I=\u30b5\u30fc\u30d0\u30fc\u306f\u3001\u30dd\u30fc\u30c8 {0} \u3067\u63a5\u7d9a\u3092\u53d7\u3051\u5165\u308c\u308b\u6e96\u5099\u304c\u3067\u304d\u307e\u3057\u305f\u3002
+DRDA_Ready.I={1} Network Server - {3} \u306b {2} \u304c\u958b\u59cb\u3055\u308c\u3001\u30dd\u30fc\u30c8 {0} \u3067\u63a5\u7d9a\u3092\u53d7\u3051\u5165\u308c\u308b\u6e96\u5099\u304c\u3067\u304d\u307e\u3057\u305f\u3002 
 DRDA_UnableToAccept.S=\u63a5\u7d9a\u3092\u53d7\u3051\u5165\u308c\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3002
 DRDA_ConnNumber.I=\u63a5\u7d9a\u756a\u53f7: {0}\u3002
 DRDA_ClientSocketError.S=\u30af\u30e9\u30a4\u30a2\u30f3\u30c8\u30fb\u30bd\u30b1\u30c3\u30c8\u3067\u30a8\u30e9\u30fc\u3067\u3059:\n {0}
 DRDA_ListenerClose.S=\u30ea\u30b9\u30ca\u30fc\u30fb\u30b9\u30ec\u30c3\u30c9\u3092\u30af\u30ed\u30fc\u30ba\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3002
-DRDA_ShutdownSuccess.I=\u30b7\u30e3\u30c3\u30c8\u30c0\u30a6\u30f3\u304c\u6b63\u5e38\u306b\u884c\u308f\u308c\u307e\u3057\u305f\u3002
-DRDA_ShutdownWarning.I=Derby \u30b7\u30e3\u30c3\u30c8\u30c0\u30a6\u30f3\u306e\u8b66\u544a:\n {0}
+DRDA_ShutdownSuccess.I={0} Network Server - {1} \u306f\u3001{2} \u306b\u30b7\u30e3\u30c3\u30c8\u30c0\u30a6\u30f3\u3057\u307e\u3057\u305f\u3002
+DRDA_ShutdownWarning.I=Cloudscape \u30b7\u30e3\u30c3\u30c8\u30c0\u30a6\u30f3\u306e\u8b66\u544a:\n {0}
 DRDA_ShutdownError.S=\u30db\u30b9\u30c8 {1} \u306e\u30dd\u30fc\u30c8 {0} \u306e\u30b5\u30fc\u30d0\u30fc\u3092\u30b7\u30e3\u30c3\u30c8\u30c0\u30a6\u30f3\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002
 DRDA_BootSuccess.I=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9 {0} \u306e\u30d6\u30fc\u30c8\u304c\u6b63\u5e38\u306b\u884c\u308f\u308c\u307e\u3057\u305f\u3002
 DRDA_DBShutdownSuccess.I=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9 {0} \u306e\u30b7\u30e3\u30c3\u30c8\u30c0\u30a6\u30f3\u304c\u6b63\u5e38\u306b\u884c\u308f\u308c\u307e\u3057\u305f\u3002
@@ -38,7 +41,7 @@
 DRDA_UnknownArgument.U=\u5f15\u6570 {0} \u304c\u4e0d\u660e\u3067\u3059\u3002
 DRDA_UnknownCommand.U=\u30b3\u30de\u30f3\u30c9 {0} \u304c\u4e0d\u660e\u3067\u3059\u3002
 DRDA_InvalidValue.U={0} \u306f\u3001{1} \u306b\u5bfe\u3057\u3066\u7121\u52b9\u306a\u5024\u3067\u3059\u3002
-DRDA_OnOffValue.U={0} \u306f\u7121\u52b9\u306a\u5024\u3067\u3059\u3002 \u5024\u306f\u3001'on'' \u307e\u305f\u306f ''off'' \u3067\u3042\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
+DRDA_OnOffValue.U={0} \u306f\u7121\u52b9\u306a\u5024\u3067\u3059\u3002 \u5024\u306f\u3001''on'' \u307e\u305f\u306f ''off'' \u3067\u3042\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002
 DRDA_PortNumber.I=\u30dd\u30fc\u30c8\u756a\u53f7
 DRDA_Host.I=\u30db\u30b9\u30c8
 DRDA_DatabaseDirectory.I=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u30fb\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30fc
@@ -57,7 +60,7 @@
 DRDA_UnknownHost.S=\u30db\u30b9\u30c8\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093: {0}\u3002
 DRDA_UnknownHostWarning.I=\u8b66\u544a: UnknkownHostException: {0}\u3002
 DRDA_NeedLocalHost.S=\u30db\u30b9\u30c8: {0} \u304c {1} \u3067\u7a3c\u50cd\u4e2d\u306e\u30b5\u30fc\u30d0\u30fc\u306b\u5bfe\u3057\u3066\u30ed\u30fc\u30ab\u30eb\u3067\u306f\u306a\u3044\u305f\u3081\u3001NetworkServerControl \u30b3\u30de\u30f3\u30c9\u306b\u306f\u4f7f\u7528\u3067\u304d\u307e\u305b\u3093\u3002  
-DRDA_NoIO.S=\u30db\u30b9\u30c8 {0}\u3001\u30dd\u30fc\u30c8 {1} \u306e Derby Network Server \u306b\u63a5\u7d9a\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002
+DRDA_NoIO.S=\u30db\u30b9\u30c8 {0}\u3001\u30dd\u30fc\u30c8 {1} \u306e Cloudscape Network Server \u306b\u63a5\u7d9a\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002
 DRDA_InvalidReplyHeader1.S=\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u30fb\u30b5\u30fc\u30d0\u30fc\u304b\u3089\u306e\u5fdc\u7b54\u30d8\u30c3\u30c0\u30fc\u304c\u7121\u52b9\u3067\u3059: \u9577\u3055 {0} \u306f\u77ed\u3059\u304e\u307e\u3059\u3002
 DRDA_InvalidReplyHeader2.S=\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u30fb\u30b5\u30fc\u30d0\u30fc\u304b\u3089\u306e\u5fdc\u7b54\u30d8\u30c3\u30c0\u30fc\u304c\u7121\u52b9\u3067\u3059: \u30b9\u30c8\u30ea\u30f3\u30b0 {0} \u306f\u7121\u52b9\u3067\u3059\u3002
 DRDA_InvalidReplyTooShort.S=\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u30fb\u30b5\u30fc\u30d0\u30fc\u304b\u3089\u306e\u5fdc\u7b54\u304c\u7121\u52b9\u3067\u3059: \u30c7\u30fc\u30bf\u304c\u4e0d\u5341\u5206\u3067\u3059\u3002
@@ -66,7 +69,7 @@
 DRDA_RuntimeInfoError.S=RuntimeInfo \u60c5\u5831\u306e\u53d6\u5f97\u4e2d\u306b\u30a8\u30e9\u30fc\u3067\u3059\u3002
 DRDA_PropInfoError.S=\u30d7\u30ed\u30d1\u30c6\u30a3\u30fc\u60c5\u5831\u306e\u53d6\u5f97\u4e2d\u306b\u30a8\u30e9\u30fc\u3067\u3059\u3002
 DRDA_PropInfoWriteError.S=\u30d7\u30ed\u30d1\u30c6\u30a3\u30fc\u60c5\u5831\u306e\u66f8\u304d\u8fbc\u307f\u4e2d\u306b\u30a8\u30e9\u30fc\u3067\u3059:\n {0}
-DRDA_ProductVersionReadError.S=Derby \u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u304b\u3089\u306e\u88fd\u54c1\u30d0\u30fc\u30b8\u30e7\u30f3\u60c5\u5831\u306e\u53d6\u5f97\u4e2d\u306b\u30a8\u30e9\u30fc\u3067\u3059\u3002 {0}\u3002
+DRDA_ProductVersionReadError.S=Cloudscape \u30a4\u30f3\u30b9\u30c8\u30fc\u30eb\u304b\u3089\u306e\u88fd\u54c1\u30d0\u30fc\u30b8\u30e7\u30f3\u60c5\u5831\u306e\u53d6\u5f97\u4e2d\u306b\u30a8\u30e9\u30fc\u3067\u3059\u3002 {0}\u3002
 DRDA_ConnectionTested.I=\u6b21\u306e\u30db\u30b9\u30c8\u306e\u63a5\u7d9a\u3092\u78ba\u7acb\u3057\u307e\u3057\u305f: {0}\u3001\u30dd\u30fc\u30c8\u756a\u53f7 {1}\u3002
 DRDA_ConnectionTested2.I=\u6b21\u306e\u30db\u30b9\u30c8\u306e\u63a5\u7d9a\u3092\u78ba\u7acb\u3057\u307e\u3057\u305f: {0}\u3001\u30dd\u30fc\u30c8 {1}\u3001\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9 {2}\u3002
 DRDA_ConnectionTested3.I=\u6b21\u306e\u30db\u30b9\u30c8\u306e\u63a5\u7d9a\u3092\u78ba\u7acb\u3057\u307e\u3057\u305f: {0}\u3001\u30dd\u30fc\u30c8 {1}\u3001\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9 {2}\u3001\u30e6\u30fc\u30b6\u30fc {3}\u3002
@@ -84,13 +87,13 @@
 
 # Derby Network Server SYSINFO stuff
 #
-DRDA_SysInfoBanner.I=--------- Derby Network Server \u60c5\u5831 --------
+DRDA_SysInfoBanner.I=--------- Cloudscape Network Server \u60c5\u5831 --------
 DRDA_SysInfoVersion.I=\u30d0\u30fc\u30b8\u30e7\u30f3:
 DRDA_SysInfoBuild.I=\u30d3\u30eb\u30c9:
 DRDA_SysInfoDrdaPRDID.I=DRDA \u88fd\u54c1 ID:
 #
 # Derby Network Server RUNTIMEINFO stuff
-DRDA_RuntimeInfoBanner.I=--- Derby Network Server \u30e9\u30f3\u30bf\u30a4\u30e0\u60c5\u5831 ---
+DRDA_RuntimeInfoBanner.I=--- Cloudscape Network Server \u30e9\u30f3\u30bf\u30a4\u30e0\u60c5\u5831 ---
 DRDA_RuntimeInfoSessionBanner.I=---------- \u30bb\u30c3\u30b7\u30e7\u30f3\u60c5\u5831 ---------------
 DRDA_RuntimeInfoNumThreads.I=# \u63a5\u7d9a\u30b9\u30ec\u30c3\u30c9: 
 DRDA_RuntimeInfoNumActiveSessions.I=# \u30a2\u30af\u30c6\u30a3\u30d6\u30fb\u30bb\u30c3\u30b7\u30e7\u30f3: 

Modified: db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_ko_KR.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_ko_KR.properties?view=diff&rev=483356&r1=483355&r2=483356
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_ko_KR.properties (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_ko_KR.properties Wed Dec  6 22:27:34 2006
@@ -13,21 +13,24 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# NLS_ENCODING=UTF-8
+# NLS_MESSAGEFORMAT_ALL
+
 # This file contains messages for NetworkServerControl
 # The format is DRDA_X[xxxxx].Y where X[xxxxx] is the message id and Y is the severity
 # Severity values are I - information, S - severe, U - user
 
-DRDA_LoadException.S=Derby JDBC Driver\ub85c\ub4dc \uc911\uc5d0 \uc608\uae30\uce58 \uc54a\uc740 \uc608\uc678\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4.\n {0}
+DRDA_LoadException.S=Derby JDBC Driver \ub85c\ub4dc \uc911\uc5d0 \uc608\uae30\uce58 \uc54a\uc740 \uc608\uc678\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4.\n {0}
 DRDA_PropertyException.S=cloudscape.properties\ub97c \uc77d\ub294 \uc911\uc5d0 \uc608\uae30\uce58 \uc54a\uc740 \uc608\uc678\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4.\n {0}
 DRDA_UnexpectedException.S=\uc608\uae30\uce58 \uc54a\uc740 \uc608\uc678:\n{0}
 DRDA_ListenPort.S={1} \ud638\uc2a4\ud2b8\uc5d0\uc11c {0} \ud3ec\ud2b8\ub97c \ub300\uae30\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
 DRDA_NoInputStream.S=\ud074\ub77c\uc774\uc5b8\ud2b8 \uc18c\ucf13\uc5d0 \ub300\ud55c \uc785\ub825 \uc2a4\ud2b8\ub9bc\uc744 \uac00\uc838\uc62c \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
-DRDA_Ready.I=\uc11c\ubc84\uac00 {0} \ud3ec\ud2b8\uc5d0\uc11c\uc758 \uc5f0\uacb0\uc744 \uc2b9\uc778\ud560 \uc900\ube44\uac00 \ub418\uc5c8\uc2b5\ub2c8\ub2e4.
+DRDA_Ready.I={1} Network Server - {2}\uc774(\uac00) {3}\uc5d0 {0} \ud3ec\ud2b8\uc5d0\uc11c\uc758 \uc5f0\uacb0\uc744 \uc2b9\uc778\ud560 \uc900\ube44\uac00 \ub418\uc5c8\uc2b5\ub2c8\ub2e4. 
 DRDA_UnableToAccept.S=\uc5f0\uacb0\uc744 \uc2b9\uc778\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
 DRDA_ConnNumber.I=\uc5f0\uacb0 \ubc88\ud638: {0}.
 DRDA_ClientSocketError.S=\ud074\ub77c\uc774\uc5b8\ud2b8 \uc18c\ucf13 \uc624\ub958:\n{0}
 DRDA_ListenerClose.S=\ub9ac\uc2a4\ub108 \uc2a4\ub808\ub4dc\ub97c \ub2eb\uc744 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
-DRDA_ShutdownSuccess.I=\uc2dc\uc2a4\ud15c\uc774 \uc885\ub8cc\ub418\uc5c8\uc2b5\ub2c8\ub2e4.
+DRDA_ShutdownSuccess.I={0} Network Server - {1}\uc774(\uac00) {2}\uc5d0 \uc885\ub8cc\ub418\uc5c8\uc2b5\ub2c8\ub2e4.
 DRDA_ShutdownWarning.I=Derby \uc2dc\uc2a4\ud15c \uc885\ub8cc \uacbd\uace0:\n {0}
 DRDA_ShutdownError.S={1} \ud638\uc2a4\ud2b8\uc5d0\uc11c {0} \ud3ec\ud2b8\uc758 \uc2dc\uc2a4\ud15c \uc885\ub8cc\ub97c \ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
 DRDA_BootSuccess.I={0} \ub370\uc774\ud130\ubca0\uc774\uc2a4 \ubd80\ud305\uc774 \uc644\ub8cc\ub418\uc5c8\uc2b5\ub2c8\ub2e4.

Modified: db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_pt_BR.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_pt_BR.properties?view=diff&rev=483356&r1=483355&r2=483356
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_pt_BR.properties (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_pt_BR.properties Wed Dec  6 22:27:34 2006
@@ -22,12 +22,12 @@
 DRDA_UnexpectedException.S=Exce\u00e7\u00e3o inesperada:\n {0}
 DRDA_ListenPort.S=N\u00e3o foi poss\u00edvel atender na porta {0} do hospedeiro {1}.
 DRDA_NoInputStream.S=N\u00e3o foi poss\u00edvel obter fluxo de entrada para o soquete do cliente.
-DRDA_Ready.I=O servidor est\u00e1 pronto para aceitar conex\u00f5es na porta {0}.
+DRDA_Ready.I={1} Servidor de Rede - {2} iniciado e pronto para aceitar conex\u00f5es na porta {0} em {3}
 DRDA_UnableToAccept.S=N\u00e3o \u00e9 poss\u00edvel aceitar conex\u00f5es.
 DRDA_ConnNumber.I=N\u00famero da conex\u00e3o: {0}.
 DRDA_ClientSocketError.S=Erro no soquete do cliente:\n {0}
 DRDA_ListenerClose.S=N\u00e3o foi poss\u00edvel fechar a thread do atendente.
-DRDA_ShutdownSuccess.I=Encerramento bem-sucedido.
+DRDA_ShutdownSuccess.I=Servidor de Rede {0} - encerramento de {1} em {2}
 DRDA_ShutdownWarning.I=Aviso de encerramento do Derby:\n {0}
 DRDA_ShutdownError.S=N\u00e3o foi poss\u00edvel encerrar servidor na porta {0} do hospedeiro {1}.
 DRDA_BootSuccess.I=Inicializa\u00e7\u00e3o do banco de dados, {0}, bem-sucedida.

Modified: db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_zh_CN.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_zh_CN.properties?view=diff&rev=483356&r1=483355&r2=483356
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_zh_CN.properties (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_zh_CN.properties Wed Dec  6 22:27:34 2006
@@ -13,6 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# NLS_ENCODING=UTF-8
+# NLS_MESSAGEFORMAT_ALL
+
 # This file contains messages for NetworkServerControl
 # The format is DRDA_X[xxxxx].Y where X[xxxxx] is the message id and Y is the severity
 # Severity values are I - information, S - severe, U - user
@@ -22,12 +25,12 @@
 DRDA_UnexpectedException.S=\u610f\u5916\u5f02\u5e38\uff1a\n {0}
 DRDA_ListenPort.S=\u65e0\u6cd5\u4fa6\u542c\u4e3b\u673a {1} \u4e0a\u7684\u7aef\u53e3 {0}\u3002
 DRDA_NoInputStream.S=\u65e0\u6cd5\u83b7\u53d6\u5ba2\u6237\u673a\u5957\u63a5\u5b57\u7684\u8f93\u5165\u6d41\u3002
-DRDA_Ready.I=\u670d\u52a1\u5668\u51c6\u5907\u5728\u7aef\u53e3 {0} \u4e0a\u63a5\u53d7\u8fde\u63a5\u3002
+DRDA_Ready.I={1} Network Server \uff0d {2} \u5df2\u542f\u52a8\u5e76\u4e14\u5df2\u51c6\u5907\u597d {3} \u65f6\u5728\u7aef\u53e3 {0} \u4e0a\u63a5\u53d7\u8fde\u63a5
 DRDA_UnableToAccept.S=\u65e0\u6cd5\u63a5\u53d7\u8fde\u63a5\u3002
 DRDA_ConnNumber.I=\u8fde\u63a5\u6570\uff1a{0}\u3002
 DRDA_ClientSocketError.S=\u5ba2\u6237\u673a\u5957\u63a5\u5b57\u4e0a\u51fa\u9519\uff1a\n {0}
 DRDA_ListenerClose.S=\u65e0\u6cd5\u7ed3\u675f\u4fa6\u542c\u5668\u7ebf\u7a0b\u3002
-DRDA_ShutdownSuccess.I=\u5173\u95ed\u6210\u529f\u3002
+DRDA_ShutdownSuccess.I={0} \u7f51\u7edc\u670d\u52a1\u5668 \uff0d {1} \u5728 {2} \u65f6\u5173\u95ed
 DRDA_ShutdownWarning.I=Derby \u5173\u95ed\u65f6\u53d1\u51fa\u8b66\u544a\uff1a\n {0}
 DRDA_ShutdownError.S=\u65e0\u6cd5\u5173\u95ed\u4f4d\u4e8e\u4e3b\u673a {1} \u7684\u7aef\u53e3 {0} \u4e0a\u7684\u670d\u52a1\u5668\u3002
 DRDA_BootSuccess.I=\u5f15\u5bfc\u6570\u636e\u5e93 {0} \u6210\u529f\u3002
@@ -35,8 +38,8 @@
 DRDA_CommandError.S=\u5904\u7406\u547d\u4ee4 {0} \u65f6\u53d1\u751f\u9519\u8bef\u3002
 DRDA_NotImplemented.S={0} \u672a\u5b9e\u73b0\u3002
 DRDA_NoArgs.U=\u672a\u7ed9\u5b9a\u81ea\u53d8\u91cf\u3002
-DRDA_UnknownArgument.U=\u81ea\u53d8\u91cf {0} \u662f\u672a\u77e5\u7684\u3002
-DRDA_UnknownCommand.U=\u547d\u4ee4 {0} \u662f\u672a\u77e5\u7684\u3002
+DRDA_UnknownArgument.U=\u81ea\u53d8\u91cf {0} \u672a\u77e5\u3002
+DRDA_UnknownCommand.U=\u547d\u4ee4 {0} \u672a\u77e5\u3002
 DRDA_InvalidValue.U={1} \u7684\u503c {0} \u65e0\u6548\u3002
 DRDA_OnOffValue.U=\u503c {0} \u65e0\u6548\u3002\u503c\u5fc5\u987b\u4e3a\u201con\u201d\u6216\u201coff\u201d\u3002
 DRDA_PortNumber.I=\u7aef\u53e3\u53f7
@@ -49,34 +52,34 @@
 DRDA_Session.I=\u4f1a\u8bdd
 DRDA_TraceDirectoryChange.I=\u8ddf\u8e2a\u76ee\u5f55\u66f4\u6539\u4e3a {0}\u3002
 DRDA_InvalidNoArgs.U=\u547d\u4ee4 {0} \u7684\u81ea\u53d8\u91cf\u6570\u65e0\u6548\u3002
-DRDA_LogConnectionsChange.I=\u65e5\u5fd7\u8fde\u63a5\u66f4\u6539\u4e3a {0}\u3002
-DRDA_TraceChangeAll.I=\u8ddf\u8e2a\u4e3a\u6240\u6709\u4f1a\u8bdd\u8f6c\u6362\u4e3a {0}\u3002
-DRDA_TraceChangeOne.I=\u8ddf\u8e2a\u4e3a\u4f1a\u8bdd {1} \u8f6c\u6362\u4e3a {0}\u3002
+DRDA_LogConnectionsChange.I=\u65e5\u5fd7\u8fde\u63a5\u5df2\u66f4\u6539\u4e3a {0}\u3002
+DRDA_TraceChangeAll.I=\u6240\u6709\u4f1a\u8bdd\u7684\u8ddf\u8e2a\u5df2\u8f6c\u6362\u4e3a {0}\u3002
+DRDA_TraceChangeOne.I=\u4f1a\u8bdd {1} \u7684\u8ddf\u8e2a\u5df2\u8f6c\u6362\u4e3a {0}\u3002
 DRDA_ON.I=on
 DRDA_OFF.I=off
 DRDA_UnknownHost.S=\u627e\u4e0d\u5230\u4e3b\u673a\uff1a{0}\u3002
 DRDA_UnknownHostWarning.I=\u8b66\u544a\uff1aUnknkownHostException\uff1a{0}\u3002
 DRDA_NeedLocalHost.S=\u4e3b\u673a\uff1a{0} \u5bf9\u4e8e\u8fd0\u884c\u4e8e {1} \u4e0a\u7684\u670d\u52a1\u5668\u800c\u8a00\u4e0d\u662f\u672c\u5730\u7684\uff0c\u56e0\u6b64\u65e0\u6cd5\u7528\u4e8e NetworkServerControl \u547d\u4ee4  
 DRDA_NoIO.S=\u65e0\u6cd5\u8fde\u63a5\u5230\u4e3b\u673a {0} \u7684\u7aef\u53e3 {1} \u4e0a\u7684 Derby \u7f51\u7edc\u670d\u52a1\u5668\u3002
-DRDA_InvalidReplyHeader1.S=\u6765\u81ea\u7f51\u7edc\u670d\u52a1\u5668\u7684\u65e0\u6548\u5e94\u7b54\u62a5\u5934\uff1a\u957f\u5ea6 {0} \u592a\u77ed\u3002
-DRDA_InvalidReplyHeader2.S=\u6765\u81ea\u7f51\u7edc\u670d\u52a1\u5668\u7684\u65e0\u6548\u5e94\u7b54\u62a5\u5934\uff1a\u65e0\u6548\u5b57\u7b26\u4e32 {0}\u3002
-DRDA_InvalidReplyTooShort.S=\u6765\u81ea\u7f51\u7edc\u670d\u52a1\u5668\u7684\u65e0\u6548\u5e94\u7b54\uff1a\u6570\u636e\u4e0d\u8db3\u3002
+DRDA_InvalidReplyHeader1.S=\u6765\u81ea\u7f51\u7edc\u670d\u52a1\u5668\u7684\u5e94\u7b54\u5934\u65e0\u6548\uff1a\u957f\u5ea6 {0} \u592a\u77ed\u3002
+DRDA_InvalidReplyHeader2.S=\u6765\u81ea\u7f51\u7edc\u670d\u52a1\u5668\u7684\u5e94\u7b54\u5934\u65e0\u6548\uff1a\u5b57\u7b26\u4e32 {0} \u65e0\u6548\u3002
+DRDA_InvalidReplyTooShort.S=\u6765\u81ea\u7f51\u7edc\u670d\u52a1\u5668\u7684\u5e94\u7b54\u65e0\u6548\uff1a\u6570\u636e\u4e0d\u8db3\u3002
 DRDA_SysInfoError.S=\u83b7\u53d6 SysInfo \u4fe1\u606f\u65f6\u51fa\u9519\u3002
 DRDA_SysInfoWriteError.S=\u5199 SysInfo \u4fe1\u606f\u65f6\u51fa\u9519\uff1a\n {0}
 DRDA_RuntimeInfoError.S=\u83b7\u53d6 RuntimeInfo \u4fe1\u606f\u65f6\u51fa\u9519\u3002
 DRDA_PropInfoError.S=\u83b7\u53d6\u5c5e\u6027\u4fe1\u606f\u65f6\u51fa\u9519\u3002
 DRDA_PropInfoWriteError.S=\u5199\u5c5e\u6027\u4fe1\u606f\u65f6\u51fa\u9519\uff1a\n {0}
 DRDA_ProductVersionReadError.S=\u4ece Derby \u5b89\u88c5\u8bfb\u53d6\u4ea7\u54c1\u7248\u672c\u4fe1\u606f\u65f6\u51fa\u9519\u3002{0}\u3002
-DRDA_ConnectionTested.I=\u4e3a\u4e3b\u673a\uff1a{0}\uff0c\u7aef\u53e3\u53f7 {1} \u83b7\u53d6\u8fde\u63a5\u3002
-DRDA_ConnectionTested2.I=\u4e3a\u4e3b\u673a\uff1a{0}\uff0c\u7aef\u53e3 {1}\uff0c\u6570\u636e\u5e93 {2} \u83b7\u53d6\u8fde\u63a5\u3002
-DRDA_ConnectionTested3.I=\u4e3a\u4e3b\u673a\uff1a{0}\uff0c\u7aef\u53e3 {1}\uff0c\u6570\u636e\u5e93 {2}\uff0c\u7528\u6237 {3} \u83b7\u53d6\u8fde\u63a5\u3002
+DRDA_ConnectionTested.I=\u5df2\u4e3a\u4e3b\u673a {0}\uff0c\u7aef\u53e3\u53f7 {1} \u83b7\u53d6\u8fde\u63a5\u3002
+DRDA_ConnectionTested2.I=\u5df2\u4e3a\u4e3b\u673a {0}\uff0c\u7aef\u53e3 {1}\uff0c\u6570\u636e\u5e93 {2} \u83b7\u53d6\u8fde\u63a5\u3002
+DRDA_ConnectionTested3.I=\u5df2\u4e3a\u4e3b\u673a {0}\uff0c\u7aef\u53e3 {1}\uff0c\u6570\u636e\u5e93 {2}\uff0c\u7528\u6237 {3} \u83b7\u53d6\u8fde\u63a5\u3002
 DRDA_SQLException.S={0}
 DRDA_SQLWarning.I={0}
 DRDA_MissingValue.U={0} \u7f3a\u5c11\u5fc5\u9700\u7684\u503c\u3002
 DRDA_InvalidPropVal.S=\u5c5e\u6027 {0} \u7684\u503c\u65e0\u6548\uff0c\u503c\uff1a{1}\u3002
-DRDA_SessionNotFound.U=\u4f1a\u8bdd {0} \u672a\u627e\u5230\u3002
-DRDA_MaxThreadsChange.I=\u6700\u5927\u7ebf\u7a0b\u6570\u66f4\u6539\u4e3a {0}\u3002
-DRDA_TimeSliceChange.I=\u65f6\u95f4\u7247\u66f4\u6539\u4e3a {0}\u3002
+DRDA_SessionNotFound.U=\u672a\u627e\u5230\u4f1a\u8bdd {0}\u3002
+DRDA_MaxThreadsChange.I=\u6700\u5927\u7ebf\u7a0b\u6570\u5df2\u66f4\u6539\u4e3a {0}\u3002
+DRDA_TimeSliceChange.I=\u65f6\u95f4\u7247\u5df2\u66f4\u6539\u4e3a {0}\u3002
 DRDA_InvalidValue.U={1} \u7684\u503c {0} \u65e0\u6548\u3002
 DRDA_IOException.S=IOException\uff1a{0}\u3002
 DRDA_UnknownProtocol=\u672a\u77e5\u547d\u4ee4\u534f\u8bae\u7248\u672c\uff1a{0}\u3002

Modified: db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_zh_TW.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_zh_TW.properties?view=diff&rev=483356&r1=483355&r2=483356
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_zh_TW.properties (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/messages_zh_TW.properties Wed Dec  6 22:27:34 2006
@@ -13,6 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# NLS_ENCODING=UTF-8
+# NLS_MESSAGEFORMAT_ALL
+
 # This file contains messages for NetworkServerControl
 # The format is DRDA_X[xxxxx].Y where X[xxxxx] is the message id and Y is the severity
 # Severity values are I - information, S - severe, U - user
@@ -22,12 +25,12 @@
 DRDA_UnexpectedException.S=\u975e\u9810\u671f\u7684\u7570\u5e38\u72c0\u6cc1\uff1a\n {0}
 DRDA_ListenPort.S=\u7121\u6cd5\u63a5\u807d\u57e0 {0}\u3001\u4e3b\u6a5f {1}\u3002
 DRDA_NoInputStream.S=\u7121\u6cd5\u5f9e\u7528\u6236\u7aef Socket \u53d6\u5f97\u8f38\u5165\u4e32\u6d41\u3002
-DRDA_Ready.I=\u4f3a\u670d\u5668\u5df2\u5099\u59a5\uff0c\u53ef\u63a5\u53d7\u57e0 {0} \u7684\u9023\u7dda\u3002
+DRDA_Ready.I={1} \u7db2\u8def\u4f3a\u670d\u5668 - {2} \u5df2\u555f\u52d5\u4e14\u53ef\u63a5\u53d7\u57e0 {0} \u7684\u9023\u7dda\uff0c\u65bc {3} 
 DRDA_UnableToAccept.S=\u7121\u6cd5\u63a5\u53d7\u9023\u7dda\u3002
 DRDA_ConnNumber.I=\u9023\u7dda\u865f\u78bc\uff1a{0}\u3002
 DRDA_ClientSocketError.S=\u5728\u7528\u6236\u7aef Socket \u4e0a\u767c\u751f\u932f\u8aa4\uff1a\n {0}
 DRDA_ListenerClose.S=\u7121\u6cd5\u95dc\u9589\u63a5\u807d\u5668\u57f7\u884c\u7dd2\u3002
-DRDA_ShutdownSuccess.I=\u5df2\u9806\u5229\u5b8c\u6210\u95dc\u6a5f\u3002
+DRDA_ShutdownSuccess.I={0} \u7db2\u8def\u4f3a\u670d\u5668 - {1} \u5df2\u95dc\u6a5f\uff0c\u65bc {2}
 DRDA_ShutdownWarning.I=Derby \u95dc\u9589\u8b66\u544a\uff1a\n {0}
 DRDA_ShutdownError.S=\u7121\u6cd5\u95dc\u9589\u5728\u57e0 {0}\u3001\u4e3b\u6a5f {1} \u4e0a\u7684\u4f3a\u670d\u5668\u3002
 DRDA_BootSuccess.I=\u5df2\u9806\u5229\u5b8c\u6210\u555f\u52d5\u8cc7\u6599\u5eab {0}\u3002

Modified: db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/servlet_de_DE.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/servlet_de_DE.properties?view=diff&rev=483356&r1=483355&r2=483356
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/servlet_de_DE.properties (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/servlet_de_DE.properties Wed Dec  6 22:27:34 2006
@@ -13,11 +13,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# NLS_ENCODING=UTF-8
+# NLS_MESSAGEFORMAT_ALL
+
 # This file contains the text for Net Server servlet
 # The format is SRV_<short desc>
 
-SRV_Banner= Derby Network Server 
-SRV_Started= Derby Network Server wurde gestartet.
+SRV_Banner=Derby Network Server 
+SRV_Started=Derby Network Server wurde gestartet.
 SRV_StopButton=Klicken Sie auf den Knopf, um Network Server zu stoppen.
 SRV_NotStarted=Derby Network Server wurde nicht gestartet.
 SRV_LogOnButton=Klicken Sie auf den Knopf, um die Protokollierung beim Start des Servers einzuschalten.
@@ -66,5 +69,4 @@
 SRV_MissingParam=Ein erforderlicher Parameter ist nicht gesetzt ("{0}")
 SRV_BackToMain=Zur\u00fcck zur Hauptseite
 SRV_SkipToContent=Weiter zum Inhalt
-SRV_PortNumber=Der Server l\u00e4uft am Port {0}.
-
+SRV_PortNumber=Der Server ist am Port {0} aktiv.

Modified: db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/servlet_es.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/servlet_es.properties?view=diff&rev=483356&r1=483355&r2=483356
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/servlet_es.properties (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/servlet_es.properties Wed Dec  6 22:27:34 2006
@@ -13,11 +13,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# NLS_ENCODING=UTF-8
+# NLS_MESSAGEFORMAT_ALL
+
 # This file contains the text for Net Server servlet
 # The format is SRV_<short desc>
 
-SRV_Banner= Derby Network Server 
-SRV_Started= Derby Network Server se ha iniciado.
+SRV_Banner=Derby Network Server 
+SRV_Started=Derby Network Server se ha iniciado.
 SRV_StopButton=Pulse el bot\u00f3n para detener Network Server.
 SRV_NotStarted=Derby Network Server no se ha iniciado.
 SRV_LogOnButton=Pulse el bot\u00f3n para activar la anotaci\u00f3n de mensajes cuando se inicie el servidor.
@@ -52,8 +55,7 @@
 SRV_Continue=Continuar
 SRV_SetParam=Establecer par\u00e1metros
 SRV_SetParam2=Establecer valores
-SRV_InvalidVal=Valor no v\u00e1lido, {0}, para {1}.
-
+SRV_InvalidVal=Valor no v\u00e1lido, {0}, para {1}.  
 SRV_NetParam=Establecer par\u00e1metros de Network Server
 SRV_MaxThreads=Actualmente el n\u00famero m\u00e1ximo de hebras es: {0}
 SRV_TimeSlice=Actualmente el intervalo de tiempo de hebra es: {0}
@@ -66,5 +68,4 @@
 SRV_MissingParam=No se ha establecido un par\u00e1metro obligatorio (''{0}'')
 SRV_BackToMain=Volver a la p\u00e1gina principal
 SRV_SkipToContent=Ir al contenido
-SRV_PortNumber=El servidor se ejecuta en el puerto {0}.
-
+SRV_PortNumber=El servidor est\u00e1 en ejecuci\u00f3n en el puerto {0}.

Modified: db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/servlet_fr.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/servlet_fr.properties?view=diff&rev=483356&r1=483355&r2=483356
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/servlet_fr.properties (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/servlet_fr.properties Wed Dec  6 22:27:34 2006
@@ -13,16 +13,19 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# NLS_ENCODING=UTF-8
+# NLS_MESSAGEFORMAT_ALL
+
 # This file contains the text for Net Server servlet
 # The format is SRV_<short desc>
 
-SRV_Banner= Derby Network Server 
-SRV_Started= Derby Network Server a \u00e9t\u00e9 d\u00e9marr\u00e9.
+SRV_Banner=Derby Network Server 
+SRV_Started=Derby Network Server a \u00e9t\u00e9 d\u00e9marr\u00e9.
 SRV_StopButton=Appuyez sur le bouton pour arr\u00eater Network Server.
-SRV_NotStarted=Derby Network Server n'a pas \u00e9t\u00e9 d\u00e9marr\u00e9.
+SRV_NotStarted=Derby Network Server n''a pas \u00e9t\u00e9 d\u00e9marr\u00e9.
 SRV_LogOnButton=Cliquez sur ce bouton pour activer la journalisation lors du d\u00e9marrage du serveur.
 SRV_LogOffButton=Cliquez sur ce bouton pour d\u00e9sactiver la journalisation lors du d\u00e9marrage du serveur.
-SRV_TraceOnButton=Cliquez sur ce bouton afin d'activer le tra\u00e7age pour toutes les sessions lors du d\u00e9marrage du serveur.
+SRV_TraceOnButton=Cliquez sur ce bouton afin d''activer le tra\u00e7age pour toutes les sessions lors du d\u00e9marrage du serveur.
 SRV_TraceOffButton=Cliquez sur ce bouton afin de d\u00e9sactiver le tra\u00e7age pour toutes les sessions lors du d\u00e9marrage du serveur.
 SRV_StartButton=Cliquez sur ce bouton pour d\u00e9marrer le serveur.
 SRV_Start=D\u00e9marrer
@@ -43,7 +46,7 @@
 SRV_TraceSession=Cliquez sur ce bouton pour indiquer les sessions \u00e0 tracer.
 SRV_TraceSessButton=Tracer la session
 SRV_TraceDirButton=Cliquez sur ce bouton pour changer le r\u00e9pertoire de trace.
-SRV_ThreadButton=Cliquez sur ce bouton pour indiquer les param\u00e8tres de cr\u00e9ation d'unit\u00e9s d'ex\u00e9cution pour Network Server.
+SRV_ThreadButton=Cliquez sur ce bouton pour indiquer les param\u00e8tres de cr\u00e9ation d''unit\u00e9s d''ex\u00e9cution pour Network Server.
 SRV_StopButton= Cliquez sur ce bouton pour arr\u00eater Network Server.
 SRV_Return=Retour \u00e0 la page principale du servlet
 SRV_SessionID=ID de session :
@@ -56,8 +59,8 @@
 SRV_NetParam=D\u00e9finir les param\u00e8tres Network Server
 SRV_MaxThreads=Nombre maximal d''unit\u00e9s d''ex\u00e9cution en cours : {0}
 SRV_TimeSlice=Intervalle d''activation des unit\u00e9s d''ex\u00e9cution en cours : {0}
-SRV_NewMaxThreads=Nouveau nombre maximal d'unit\u00e9s d'ex\u00e9cution :
-SRV_NewTimeSlice=Nouvel intervalle d'activation des unit\u00e9s d'ex\u00e9cution :
+SRV_NewMaxThreads=Nouveau nombre maximal d''unit\u00e9s d''ex\u00e9cution :
+SRV_NewTimeSlice=Nouvel intervalle d''activation des unit\u00e9s d''ex\u00e9cution :
 SRV_Interupt=Connexion interrompue.
 SRV_MaxTrys=Impossible de se connecter au serveur apr\u00e8s {0} tentatives.
 SRV_NetworkServerError=Erreur Network Server
@@ -65,5 +68,4 @@
 SRV_MissingParam=Param\u00e8tre requis non d\u00e9fini ("{0}")
 SRV_BackToMain=Retour \u00e0 la page principale
 SRV_SkipToContent=Passer au contenu
-SRV-PortNumber=Serveur est en cours d''ex\u00e9cution sur le port {0}.
-
+SRV_PortNumber=Le serveur est en cours de fonctionnement sur le port{0}.

Modified: db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/servlet_it.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/servlet_it.properties?view=diff&rev=483356&r1=483355&r2=483356
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/servlet_it.properties (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/servlet_it.properties Wed Dec  6 22:27:34 2006
@@ -13,17 +13,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# NLS_ENCODING=UTF-8
+# NLS_MESSAGEFORMAT_ALL
+
 # This file contains the text for Net Server servlet
 # The format is SRV_<short desc>
 
-SRV_Banner= Derby Network Server 
-SRV_Started= Derby Network Server \u00e8 stato avviato.
+SRV_Banner=Derby Network Server 
+SRV_Started=Derby Network Server \u00e8 stato avviato.
 SRV_StopButton=Premere il pulsante per arrestare Network Server.
 SRV_NotStarted=Derby Network Server non \u00e8 stato avviato.
-SRV_LogOnButton=Premere il pulsante per attivare la registrazione all'avvio del server.
-SRV_LogOffButton=Premere il pulsante per disattivare la registrazione all'avvio del server.
-SRV_TraceOnButton=Premere il pulsante per attivare la traccia per tutte le sessioni all'avvio del server.
-SRV_TraceOffButton=Premere il pulsante per disattivare la traccia per tutte le sessioni all'avvio del server.
+SRV_LogOnButton=Premere il pulsante per attivare la registrazione all''avvio del server.
+SRV_LogOffButton=Premere il pulsante per disattivare la registrazione all''avvio del server.
+SRV_TraceOnButton=Premere il pulsante per attivare la traccia per tutte le sessioni all''avvio del server.
+SRV_TraceOffButton=Premere il pulsante per disattivare la traccia per tutte le sessioni all''avvio del server.
 SRV_StartButton=Premere il pulsante per avviare il server.
 SRV_Start=Avvia
 SRV_Stop=Arresta
@@ -55,7 +58,7 @@
 SRV_InvalidVal=Valore non valido, {0}, per {1}.  
 SRV_NetParam=Imposta i parametri di Network Server
 SRV_MaxThreads=Il numero massimo corrente di thread \u00e8: {0}
-SRV_TimeSlice=L''intervallo di tempo corrente del thread \u00e8: {0}
+SRV_TimeSlice=L''''intervallo di tempo corrente del thread \u00e8: {0}
 SRV_NewMaxThreads=Nuovo numero massimo di thread:
 SRV_NewTimeSlice=Nuovo intervallo di tempo del thread:
 SRV_Interupt=Connessione interrotta.
@@ -65,5 +68,4 @@
 SRV_MissingParam=Parametro obbligatorio non impostato ("{0}")
 SRV_BackToMain=Torna a Pagina principale
 SRV_SkipToContent=Passa a Indice
-SRV_PortNumber=Il server eseguito sulla porta {0}.
-
+SRV_PortNumber=Server in esecuzione sulla porta {0}.

Modified: db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/servlet_ja_JP.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/servlet_ja_JP.properties?view=diff&rev=483356&r1=483355&r2=483356
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/servlet_ja_JP.properties (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/servlet_ja_JP.properties Wed Dec  6 22:27:34 2006
@@ -13,13 +13,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# NLS_ENCODING=UTF-8
+# NLS_MESSAGEFORMAT_ALL
+
 # This file contains the text for Net Server servlet
 # The format is SRV_<short desc>
 
-SRV_Banner= Derby Network Server 
-SRV_Started= Derby Network Server \u304c\u958b\u59cb\u3055\u308c\u307e\u3057\u305f\u3002
-SRV_StopButton=\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u30fb\u30b5\u30fc\u30d0\u30fc\u3092\u505c\u6b62\u3059\u308b\u306b\u306f\u3001\u30dc\u30bf\u30f3\u3092\u62bc\u3057\u3066\u304f\u3060\u3055\u3044\u3002
-SRV_NotStarted=Derby Network Server \u304c\u958b\u59cb\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002
+SRV_Banner=Cloudscape Network Server 
+SRV_Started=Cloudscape Network Server \u304c\u958b\u59cb\u3055\u308c\u307e\u3057\u305f\u3002
+SRV_StopButton=Network Server \u3092\u505c\u6b62\u3059\u308b\u306b\u306f\u3001\u30dc\u30bf\u30f3\u3092\u62bc\u3057\u3066\u304f\u3060\u3055\u3044\u3002
+SRV_NotStarted=Cloudscape Network Server \u304c\u958b\u59cb\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002
 SRV_LogOnButton=\u30b5\u30fc\u30d0\u30fc\u304c\u958b\u59cb\u3055\u308c\u305f\u6642\u306b\u30ed\u30ae\u30f3\u30b0\u3092\u30aa\u30f3\u306b\u5207\u308a\u66ff\u3048\u308b\u306b\u306f\u3001\u30dc\u30bf\u30f3\u3092\u62bc\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 SRV_LogOffButton=\u30b5\u30fc\u30d0\u30fc\u304c\u958b\u59cb\u3055\u308c\u305f\u6642\u306b\u30ed\u30ae\u30f3\u30b0\u3092\u30aa\u30d5\u306b\u5207\u308a\u66ff\u3048\u308b\u306b\u306f\u3001\u30dc\u30bf\u30f3\u3092\u62bc\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 SRV_TraceOnButton=\u30b5\u30fc\u30d0\u30fc\u304c\u958b\u59cb\u3055\u308c\u305f\u6642\u306b\u3059\u3079\u3066\u306e\u30bb\u30c3\u30b7\u30e7\u30f3\u306e\u30c8\u30ec\u30fc\u30b9\u3092\u30aa\u30f3\u306b\u5207\u308a\u66ff\u3048\u308b\u306b\u306f\u3001\u30dc\u30bf\u30f3\u3092\u62bc\u3057\u3066\u304f\u3060\u3055\u3044\u3002
@@ -43,8 +46,8 @@
 SRV_TraceSession=\u30c8\u30ec\u30fc\u30b9\u3059\u308b\u30bb\u30c3\u30b7\u30e7\u30f3\u3092\u6307\u5b9a\u3059\u308b\u306b\u306f\u3001\u30dc\u30bf\u30f3\u3092\u62bc\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 SRV_TraceSessButton=\u30c8\u30ec\u30fc\u30b9\u30fb\u30bb\u30c3\u30b7\u30e7\u30f3
 SRV_TraceDirButton=\u30c8\u30ec\u30fc\u30b9\u30fb\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30fc\u3092\u5909\u66f4\u3059\u308b\u306b\u306f\u30dc\u30bf\u30f3\u3092\u62bc\u3057\u3066\u304f\u3060\u3055\u3044\u3002
-SRV_ThreadButton=\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u30fb\u30b5\u30fc\u30d0\u30fc\u306e\u30b9\u30ec\u30c3\u30c9\u5316\u30d1\u30e9\u30e1\u30fc\u30bf\u30fc\u3092\u6307\u5b9a\u3059\u308b\u306b\u306f\u3001\u30dc\u30bf\u30f3\u3092\u62bc\u3057\u3066\u304f\u3060\u3055\u3044\u3002
-SRV_StopButton= \u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u30fb\u30b5\u30fc\u30d0\u30fc\u3092\u505c\u6b62\u3059\u308b\u306b\u306f\u3001\u30dc\u30bf\u30f3\u3092\u62bc\u3057\u3066\u304f\u3060\u3055\u3044\u3002
+SRV_ThreadButton=Network Server \u306e\u30b9\u30ec\u30c3\u30c9\u5316\u30d1\u30e9\u30e1\u30fc\u30bf\u30fc\u3092\u6307\u5b9a\u3059\u308b\u306b\u306f\u3001\u30dc\u30bf\u30f3\u3092\u62bc\u3057\u3066\u304f\u3060\u3055\u3044\u3002
+SRV_StopButton= Network Server \u3092\u505c\u6b62\u3059\u308b\u306b\u306f\u3001\u30dc\u30bf\u30f3\u3092\u62bc\u3057\u3066\u304f\u3060\u3055\u3044\u3002
 SRV_Return=\u30e1\u30a4\u30f3\u30fb\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u30fb\u30da\u30fc\u30b8\u306b\u623b\u308b
 SRV_SessionID=\u30bb\u30c3\u30b7\u30e7\u30f3 ID:
 SRV_TraceDir=\u30c8\u30ec\u30fc\u30b9\u30fb\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u30fc
@@ -65,4 +68,4 @@
 SRV_MissingParam=\u5fc5\u8981\u30d1\u30e9\u30e1\u30fc\u30bf\u30fc\u304c\u8a2d\u5b9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093 ("{0}")
 SRV_BackToMain=\u30e1\u30a4\u30f3\u30da\u30fc\u30b8\u306b\u623b\u308b
 SRV_SkipToContent=\u30b3\u30f3\u30c6\u30f3\u30c4\u306b\u30b9\u30ad\u30c3\u30d7
-
+SRV_PortNumber=\u30b5\u30fc\u30d0\u30fc\u306f\u3001\u30dd\u30fc\u30c8 {0} \u3067\u7a3c\u50cd\u3057\u3066\u3044\u307e\u3059\u3002

Modified: db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/servlet_ko_KR.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/servlet_ko_KR.properties?view=diff&rev=483356&r1=483355&r2=483356
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/servlet_ko_KR.properties (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/servlet_ko_KR.properties Wed Dec  6 22:27:34 2006
@@ -13,11 +13,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# NLS_ENCODING=UTF-8
+# NLS_MESSAGEFORMAT_ALL
+
 # This file contains the text for Net Server servlet
 # The format is SRV_<short desc>
 
-SRV_Banner= Derby Network Server 
-SRV_Started= Derby Network Server\uac00 \uc2dc\uc791\ub418\uc5c8\uc2b5\ub2c8\ub2e4.
+SRV_Banner=Derby Network Server 
+SRV_Started=Derby Network Server\uac00 \uc2dc\uc791\ub418\uc5c8\uc2b5\ub2c8\ub2e4.
 SRV_StopButton=Network Server\ub97c \uc911\uc9c0\ud558\ub824\uba74 \ub2e8\ucd94\ub97c \ub204\ub974\uc2ed\uc2dc\uc624.
 SRV_NotStarted=Derby Network Server\uac00 \uc2dc\uc791\ub418\uc9c0 \uc54a\uc558\uc2b5\ub2c8\ub2e4.
 SRV_LogOnButton=\uc11c\ubc84\uac00 \uc2dc\uc791\ub420 \ub54c \ub85c\uae45\uc744 \uc2dc\uc791\uc73c\ub85c \uc804\ud658\ud558\ub824\uba74 \ub2e8\ucd94\ub97c \ub204\ub974\uc2ed\uc2dc\uc624.
@@ -60,10 +63,10 @@
 SRV_NewMaxThreads=\uc0c8 \ucd5c\ub300 \uc2a4\ub808\ub4dc \uc218:
 SRV_NewTimeSlice=\uc0c8 \uc2a4\ub808\ub4dc \uc2dc\uac04 \uc2ac\ub77c\uc774\uc2a4:
 SRV_Interupt=\uc5f0\uacb0\uc774 \uc778\ud130\ub7fd\ud2b8\ub418\uc5c8\uc2b5\ub2c8\ub2e4.
-SRV_MaxTrys={0} \ubc88\uc744 \uc2dc\ub3c4\ud55c \ud6c4\uc5d0\ub3c4 \uc11c\ubc84\uc5d0 \uc5f0\uacb0\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
+SRV_MaxTrys={0}\ubc88\uc744 \uc2dc\ub3c4\ud55c \ud6c4\uc5d0\ub3c4 \uc11c\ubc84\uc5d0 \uc5f0\uacb0\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.
 SRV_NetworkServerError=\ub124\ud2b8\uc6cc\ud06c \uc11c\ubc84 \uc624\ub958
 SRV_Message=\uba54\uc2dc\uc9c0:{0}
-SRV_MissingParam=\ud544\uc218 \ub9e4\uac1c\ubcc0\uc218\uac00 \uc124\uc815\ub418\uc9c0 \uc54a\uc74c(''''{0}'''')
+SRV_MissingParam=\ud544\uc218 \ub9e4\uac1c\ubcc0\uc218\uac00 \uc124\uc815\ub418\uc9c0 \uc54a\uc74c(''{0}'')
 SRV_BackToMain=\uae30\ubcf8 \ud398\uc774\uc9c0\ub85c \ub3cc\uc544\uac00\uae30
 SRV_SkipToContent=\ubaa9\ucc28\ub85c \uac74\ub108\ub6f0\uae30
-
+SRV_PortNumber=\uc11c\ubc84\uac00 {0} \ud3ec\ud2b8\uc5d0\uc11c \uc2e4\ud589 \uc911\uc785\ub2c8\ub2e4.

Modified: db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/servlet_zh_CN.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/servlet_zh_CN.properties?view=diff&rev=483356&r1=483355&r2=483356
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/servlet_zh_CN.properties (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/servlet_zh_CN.properties Wed Dec  6 22:27:34 2006
@@ -13,32 +13,35 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# NLS_ENCODING=UTF-8
+# NLS_MESSAGEFORMAT_ALL
+
 # This file contains the text for Net Server servlet
 # The format is SRV_<short desc>
 
-SRV_Banner= Derby \u7f51\u7edc\u670d\u52a1\u5668
-SRV_Started= Derby \u7f51\u7edc\u670d\u52a1\u5668\u5df2\u7ecf\u542f\u52a8\u3002
+SRV_Banner=Derby \u7f51\u7edc\u670d\u52a1\u5668
+SRV_Started=Derby \u7f51\u7edc\u670d\u52a1\u5668\u5df2\u7ecf\u542f\u52a8\u3002
 SRV_StopButton=\u6309\u6b64\u6309\u94ae\u505c\u6b62\u7f51\u7edc\u670d\u52a1\u5668\u3002
 SRV_NotStarted=Derby \u7f51\u7edc\u670d\u52a1\u5668\u5c1a\u672a\u542f\u52a8\u3002
-SRV_LogOnButton=\u5f53\u670d\u52a1\u5668\u542f\u52a8\u65f6\uff0c\u6309\u6b64\u6309\u94ae\u6253\u5f00\u8bb0\u5f55\u3002
-SRV_LogOffButton=\u5f53\u670d\u52a1\u5668\u542f\u52a8\u65f6\uff0c\u6309\u6b64\u6309\u94ae\u5173\u95ed\u8bb0\u5f55\u3002
+SRV_LogOnButton=\u5f53\u670d\u52a1\u5668\u542f\u52a8\u65f6\uff0c\u6309\u6b64\u6309\u94ae\u6253\u5f00\u65e5\u5fd7\u8bb0\u5f55\u3002
+SRV_LogOffButton=\u5f53\u670d\u52a1\u5668\u542f\u52a8\u65f6\uff0c\u6309\u6b64\u6309\u94ae\u5173\u95ed\u65e5\u5fd7\u8bb0\u5f55\u3002
 SRV_TraceOnButton=\u5f53\u670d\u52a1\u5668\u542f\u52a8\u65f6\uff0c\u6309\u6b64\u6309\u94ae\u4e3a\u6240\u6709\u4f1a\u8bdd\u6253\u5f00\u8ddf\u8e2a\u3002
 SRV_TraceOffButton=\u5f53\u670d\u52a1\u5668\u542f\u52a8\u65f6\uff0c\u6309\u6b64\u6309\u94ae\u4e3a\u6240\u6709\u4f1a\u8bdd\u5173\u95ed\u8ddf\u8e2a\u3002
 SRV_StartButton=\u6309\u6b64\u6309\u94ae\u542f\u52a8\u670d\u52a1\u5668\u3002
 SRV_Start=\u542f\u52a8
 SRV_Stop=\u505c\u6b62
-SRV_LogOn=\u8bb0\u5f55\u6253\u5f00
-SRV_LogOff=\u8bb0\u5f55\u5173\u95ed
-SRV_TraceOn=\u8ddf\u8e2a\u6253\u5f00
-SRV_TraceOff=\u8ddf\u8e2a\u5173\u95ed
-SRV_TraceOnOff=\u8ddf\u8e2a\u6253\u5f00\uff0f\u5173\u95ed
-SRV_StatusLogOn=\u8bb0\u5f55\u5f53\u524d\u6253\u5f00\u3002
-SRV_StatusLogOff=\u8bb0\u5f55\u5f53\u524d\u5173\u95ed\u3002
-SRV_StatusTraceOn=\u8ddf\u8e2a\u5f53\u524d\u4e3a\u6240\u6709\u4f1a\u8bdd\u6253\u5f00\u3002
-SRV_StatusTraceOff=\u8ddf\u8e2a\u5f53\u524d\u4e3a\u6240\u6709\u4f1a\u8bdd\u5173\u95ed\u3002
-SRV_StatusTraceNoOn=\u8ddf\u8e2a\u5f53\u524d\u4e3a\u4f1a\u8bdd {0} \u6253\u5f00\u3002
-SRV_StatusTraceNoOff=\u8ddf\u8e2a\u5f53\u524d\u4e3a\u4f1a\u8bdd {0} \u5173\u95ed\u3002
-SRV_LogButton2=\u6309\u6b64\u6309\u94ae\u542f\u52a8\u6216\u505c\u6b62\u8bb0\u5f55\u3002
+SRV_LogOn=\u6253\u5f00\u65e5\u5fd7\u8bb0\u5f55
+SRV_LogOff=\u5173\u95ed\u65e5\u5fd7\u8bb0\u5f55
+SRV_TraceOn=\u6253\u5f00\u8ddf\u8e2a
+SRV_TraceOff=\u5173\u95ed\u8ddf\u8e2a
+SRV_TraceOnOff=\u6253\u5f00\uff0f\u5173\u95ed\u8ddf\u8e2a
+SRV_StatusLogOn=\u5f53\u524d\u5df2\u6253\u5f00\u65e5\u5fd7\u8bb0\u5f55\u3002
+SRV_StatusLogOff=\u5f53\u524d\u5df2\u5173\u95ed\u65e5\u5fd7\u8bb0\u5f55\u3002
+SRV_StatusTraceOn=\u5f53\u524d\u5df2\u4e3a\u6240\u6709\u4f1a\u8bdd\u6253\u5f00\u8ddf\u8e2a\u3002
+SRV_StatusTraceOff=\u5f53\u524d\u5df2\u4e3a\u6240\u6709\u4f1a\u8bdd\u5173\u95ed\u8ddf\u8e2a\u3002
+SRV_StatusTraceNoOn=\u5f53\u524d\u5df2\u4e3a\u4f1a\u8bdd {0} \u6253\u5f00\u8ddf\u8e2a\u3002
+SRV_StatusTraceNoOff=\u5f53\u524d\u5df2\u4e3a\u4f1a\u8bdd {0} \u5173\u95ed\u8ddf\u8e2a\u3002
+SRV_LogButton2=\u6309\u6b64\u6309\u94ae\u542f\u52a8\u6216\u505c\u6b62\u65e5\u5fd7\u8bb0\u5f55\u3002
 SRV_TraceButton2=\u6309\u6b64\u6309\u94ae\u542f\u52a8\u6216\u505c\u6b62\u8ddf\u8e2a\u6240\u6709\u4f1a\u8bdd\u3002
 SRV_TraceSession=\u6309\u6b64\u6309\u94ae\u6307\u5b9a\u8981\u8ddf\u8e2a\u7684\u4f1a\u8bdd\u3002
 SRV_TraceSessButton=\u8ddf\u8e2a\u4f1a\u8bdd
@@ -48,7 +51,7 @@
 SRV_Return=\u8fd4\u56de\u5230\u4e3b Servlet \u9875
 SRV_SessionID=\u4f1a\u8bdd\u6807\u8bc6\uff1a
 SRV_TraceDir=\u8ddf\u8e2a\u76ee\u5f55
-SRV_TraceDirDone=\u8ddf\u8e2a\u76ee\u5f55 {0} \u5df2\u8bbe\u7f6e\u3002
+SRV_TraceDirDone=\u5df2\u8bbe\u7f6e\u8ddf\u8e2a\u76ee\u5f55 {0}\u3002
 SRV_Continue=\u7ee7\u7eed
 SRV_SetParam=\u8bbe\u7f6e\u53c2\u6570
 SRV_SetParam2=\u8bbe\u7f6e\u503c
@@ -66,4 +69,4 @@
 SRV_MissingParam=\u672a\u8bbe\u7f6e\u5fc5\u9700\u53c2\u6570\uff08\u201c{0}\u201d\uff09
 SRV_BackToMain=\u8fd4\u56de\u5230\u4e3b\u9875
 SRV_SkipToContent=\u8df3\u81f3\u76ee\u5f55
-
+SRV_PortNumber=\u670d\u52a1\u5668\u6b63\u5728\u7aef\u53e3 {0} \u4e0a\u8fd0\u884c\u3002

Modified: db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/servlet_zh_TW.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/servlet_zh_TW.properties?view=diff&rev=483356&r1=483355&r2=483356
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/servlet_zh_TW.properties (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/loc/drda/servlet_zh_TW.properties Wed Dec  6 22:27:34 2006
@@ -13,11 +13,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# NLS_ENCODING=UTF-8
+# NLS_MESSAGEFORMAT_ALL
+
 # This file contains the text for Net Server servlet
 # The format is SRV_<short desc>
 
-SRV_Banner= Derby Network Server 
-SRV_Started= Derby Network Server \u5df2\u555f\u52d5\u3002
+SRV_Banner=Derby Network Server 
+SRV_Started=Derby Network Server \u5df2\u555f\u52d5\u3002
 SRV_StopButton=\u6309\u6b64\u6309\u9215\u53ef\u505c\u6b62 Network Server\u3002
 SRV_NotStarted=Derby Network Server \u672a\u555f\u52d5\u3002
 SRV_LogOnButton=\u7576\u4f3a\u670d\u5668\u555f\u52d5\u6642\uff0c\u6309\u6b64\u6309\u9215\u53ef\u958b\u555f\u8a18\u8f09\u3002
@@ -66,4 +69,4 @@
 SRV_MissingParam=\u5c1a\u672a\u8a2d\u5b9a\u5fc5\u8981\u7684\u53c3\u6578 ("{0}")
 SRV_BackToMain=\u56de\u5230\u4e3b\u9801
 SRV_SkipToContent=\u8df3\u81f3\u5167\u5bb9
-
+SRV_PortNumber=\u4f3a\u670d\u5668\u6b63\u5728\u57e0 {0} \u4e0a\u57f7\u884c\u3002



Mime
View raw message