db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kahat...@apache.org
Subject svn commit: r939730 - in /db/derby/code/trunk/java: engine/org/apache/derby/loc/ testing/org/apache/derbyTesting/functionTests/tests/lang/
Date Fri, 30 Apr 2010 16:17:24 GMT
Author: kahatlen
Date: Fri Apr 30 16:17:23 2010
New Revision: 939730

URL: http://svn.apache.org/viewvc?rev=939730&view=rev
Log:
DERBY-2156: message XSDB8 has references to db2j

Corrected property name from db2j.database.forceDatabaseLock to
derby.database.forceDatabaseLock in error message.

Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/loc/messages.xml
    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/tests/lang/ErrorCodeTest.java

Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages.xml?rev=939730&r1=939729&r2=939730&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages.xml (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages.xml Fri Apr 30 16:17:23 2010
@@ -5568,7 +5568,7 @@ ln=lower-case two-letter ISO-639 languag
 
             <msg>
                 <name>XSDB8.D</name>
-                <text>WARNING: Derby (instance {0}) is attempting to boot the database {1} even though Derby (instance {2}) may still be active.  Only one instance of Derby should boot a database at a time. Severe and non-recoverable corruption can result if 2 instances of Derby boot on the same database at the same time.  The db2j.database.forceDatabaseLock=true property has been set, so the database will not boot until the db.lck is no longer present.  Normally this file is removed when the first instance of Derby to boot on the database exits, but it may be left behind in some shutdowns.  It will be necessary to remove the file by hand in that case.  It is important to verify that no other VM is accessing the database before deleting the db.lck file by hand.</text>
+                <text>WARNING: Derby (instance {0}) is attempting to boot the database {1} even though Derby (instance {2}) may still be active.  Only one instance of Derby should boot a database at a time. Severe and non-recoverable corruption can result if 2 instances of Derby boot on the same database at the same time.  The derby.database.forceDatabaseLock=true property has been set, so the database will not boot until the db.lck is no longer present.  Normally this file is removed when the first instance of Derby to boot on the database exits, but it may be left behind in some shutdowns.  It will be necessary to remove the file by hand in that case.  It is important to verify that no other VM is accessing the database before deleting the db.lck file by hand.</text>
                 <arg>value</arg>
                 <arg>databaseName</arg>
                 <arg>value</arg>

Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_cs.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_cs.properties?rev=939730&r1=939729&r2=939730&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_cs.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_cs.properties Fri Apr 30 16:17:23 2010
@@ -375,7 +375,7 @@ XSDB4.D=Str\u00e1nka {0} je ve verzi {1}
 XSDB5.D=Protokol m\u00e1 z\u00e1znam zm\u011bn na str\u00e1nce {0}, kter\u00e1 je za koncem kontejneru.
 XSDB6.D=Datab\u00e1zi {0} ji\u017e mohla zav\u00e9st jin\u00e1 instance serveru Derby.
 XSDB7.D=VAROV\u00c1N\u00cd: Server Derby (instance {0}) se pokou\u0161\u00ed zav\u00e9st datab\u00e1zi {1}, a\u010dkoliv m\u016f\u017ee b\u00fdt st\u00e1le aktivn\u00ed server Derby (instance {2}). V dan\u00e9m okam\u017eiku by m\u011bla zav\u00e1d\u011bt datab\u00e1zi pouze jedin\u00e1 instance serveru Derby. M\u016f\u017ee nastat z\u00e1va\u017en\u00e9 a neopraviteln\u00e9 poru\u0161en\u00ed, pokud ji\u017e nenastalo.
-XSDB8.D=VAROV\u00c1N\u00cd: Server Derby (instance {0}) se pokou\u0161\u00ed zav\u00e9st datab\u00e1zi {1}, a\u010dkoliv m\u016f\u017ee b\u00fdt st\u00e1le aktivn\u00ed server Derby (instance {2}). V dan\u00e9m okam\u017eiku by m\u011bla zav\u00e1d\u011bt datab\u00e1zi pouze jedin\u00e1 instance serveru Derby. Pokud dv\u011b instance serveru Derby zav\u00e1d\u011bj\u00ed tut\u00e9\u017e datab\u00e1zi sou\u010dasn\u011b, m\u016f\u017ee nastat z\u00e1va\u017en\u00e9 a neopraviteln\u00e9 poru\u0161en\u00ed. Byla nastavena vlastnost db2j.database.forceDatabaseLock=true, tak\u017ee datab\u00e1ze nebude zavedena, dokud nebude odstran\u011bn soubor db.lck. Tento soubor je obvykle odstran\u011bn, kdy\u017e se ukon\u010d\u00ed prvn\u00ed instance serveru Derby, kter\u00e1 m\u00e1 zav\u00e9st datab\u00e1zi, ale v n\u011bkter\u00fdch p\u0159\u00edpadech vypnut\u00ed m\u016f\u017ee b\u00fdt ponech\u00e1n. V t\u011bchto p\u0159\u00edpadech je nutn\u00e9 odstranit soubor ru\u010dn\u011b. 
 P\u0159ed ru\u010dn\u00edm v\u00fdmazem souboru db.lck je d\u016fle\u017eit\u00e9 ov\u011b\u0159it, \u017ee k datab\u00e1zi nep\u0159istupuje \u017e\u00e1dn\u00fd jin\u00fd VM.
+XSDB8.D=VAROV\u00c1N\u00cd: Server Derby (instance {0}) se pokou\u0161\u00ed zav\u00e9st datab\u00e1zi {1}, a\u010dkoliv m\u016f\u017ee b\u00fdt st\u00e1le aktivn\u00ed server Derby (instance {2}). V dan\u00e9m okam\u017eiku by m\u011bla zav\u00e1d\u011bt datab\u00e1zi pouze jedin\u00e1 instance serveru Derby. Pokud dv\u011b instance serveru Derby zav\u00e1d\u011bj\u00ed tut\u00e9\u017e datab\u00e1zi sou\u010dasn\u011b, m\u016f\u017ee nastat z\u00e1va\u017en\u00e9 a neopraviteln\u00e9 poru\u0161en\u00ed. Byla nastavena vlastnost derby.database.forceDatabaseLock=true, tak\u017ee datab\u00e1ze nebude zavedena, dokud nebude odstran\u011bn soubor db.lck. Tento soubor je obvykle odstran\u011bn, kdy\u017e se ukon\u010d\u00ed prvn\u00ed instance serveru Derby, kter\u00e1 m\u00e1 zav\u00e9st datab\u00e1zi, ale v n\u011bkter\u00fdch p\u0159\u00edpadech vypnut\u00ed m\u016f\u017ee b\u00fdt ponech\u00e1n. V t\u011bchto p\u0159\u00edpadech je nutn\u00e9 odstranit soubor ru\u010dn\u011b.
  P\u0159ed ru\u010dn\u00edm v\u00fdmazem souboru db.lck je d\u016fle\u017eit\u00e9 ov\u011b\u0159it, \u017ee k datab\u00e1zi nep\u0159istupuje \u017e\u00e1dn\u00fd jin\u00fd VM.
 XSDB9.D=Kontejner toku dat {0} je poru\u0161en.
 XSDBA.D=Selh\u00e1n\u00ed pokusu o alokaci objektu {0}.
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_de_DE.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_de_DE.properties?rev=939730&r1=939729&r2=939730&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_de_DE.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_de_DE.properties Fri Apr 30 16:17:23 2010
@@ -1220,7 +1220,7 @@ XSDB4.D=Die Seite {0} hat den Versionsst
 XSDB5.D=Der \u00C4nderungssatz befindet sich auf Seite {0} des Protokolls, die sich au\u00DFerhalb des Containerendes befindet.
 XSDB6.D=Die Datenbank {0} wurde m\u00F6glicherweise bereits von einer anderen Derby-Instanz gebootet.
 XSDB7.D=WARNUNG\: Derby (Instanz {0}) versucht, die Datenbank {1} zu booten, obwohl Derby (Instanz {2}) noch aktiv sein k\u00F6nnte. Eine Datenbank sollte immer nur von jeweils einer Derby-Instanz gebootet werden. Es k\u00F6nnen schwerwiegende und irreparable Sch\u00E4den eingetreten sein oder noch eintreten.
-XSDB8.D=WARNUNG\: Derby (Instanz {0}) versucht, die Datenbank {1} zu booten, obwohl Derby (Instanz {2}) noch aktiv sein k\u00F6nnte. Eine Datenbank sollte immer nur von jeweils einer Derby-Instanz gebootet werden. Es k\u00F6nnen schwerwiegende und irreparable Sch\u00E4den eintreten, wenn zwei Instanzen von Derby gleichzeitig dieselbe Datenbank booten. Das Merkmal db2j.database.forceDatabaseLock\=true wurde gesetzt, so dass die Datenbank erst gebootet wird, wenn db.lck nicht mehr vorhanden ist. Diese Datei wird normalerweise entfernt, wenn die erste Derby-Instanz zum Booten der Datenbank vorhanden ist. Es kann jedoch vorkommen, dass sie beim Herunterfahren nicht gel\u00F6scht wird. In diesem Fall muss die Datei manuell entfernt werden. Vergewissern Sie sich vor dem manuellen L\u00F6schen der Datei db.lck unbedingt, dass keine andere VM auf die Datenbank zugreift.
+XSDB8.D=WARNUNG\: Derby (Instanz {0}) versucht, die Datenbank {1} zu booten, obwohl Derby (Instanz {2}) noch aktiv sein k\u00F6nnte. Eine Datenbank sollte immer nur von jeweils einer Derby-Instanz gebootet werden. Es k\u00F6nnen schwerwiegende und irreparable Sch\u00E4den eintreten, wenn zwei Instanzen von Derby gleichzeitig dieselbe Datenbank booten. Das Merkmal derby.database.forceDatabaseLock\=true wurde gesetzt, so dass die Datenbank erst gebootet wird, wenn db.lck nicht mehr vorhanden ist. Diese Datei wird normalerweise entfernt, wenn die erste Derby-Instanz zum Booten der Datenbank vorhanden ist. Es kann jedoch vorkommen, dass sie beim Herunterfahren nicht gel\u00F6scht wird. In diesem Fall muss die Datei manuell entfernt werden. Vergewissern Sie sich vor dem manuellen L\u00F6schen der Datei db.lck unbedingt, dass keine andere VM auf die Datenbank zugreift.
 XSDB9.D=Der Datenstromcontainer {0} ist besch\u00E4digt.
 XSDBA.D=Der Versuch, das Objekt {0} zuzuordnen, ist gescheitert.
 XSDBB.D=Unbekanntes Seitenformat auf der Seite {0}, Seitenspeicherauszug\: {1}

Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_es.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_es.properties?rev=939730&r1=939729&r2=939730&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_es.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_es.properties Fri Apr 30 16:17:23 2010
@@ -1220,7 +1220,7 @@ XSDB4.D=La p\u00E1gina {0} es de la vers
 XSDB5.D=Las anotaciones cronol\u00F3gicas tienen un registro de cambio en la p\u00E1gina {0} que est\u00E1 m\u00E1s all\u00E1 del final del contenedor.
 XSDB6.D=Es posible que otra instancia de Derby haya iniciado ya la base de datos {0}.
 XSDB7.D=AVISO\: Derby (instancia {0}) est\u00E1 intentando arrancar la base datos {1} a pesar de que Derby (instancia {2}) pueda seguir activo.  S\u00F3lo una instancia de Derby debe arrancar una base de datos al mismo tiempo. Pueden producirse da\u00F1os graves y no recuperables aunque podr\u00EDan haberse producido ya.
-XSDB8.D=AVISO\: Derby (instancia {0}) est\u00E1 intentando arrancar la base datos {1} a pesar de que Derby (instancia {2}) pueda seguir activo.  S\u00F3lo una instancia de Derby debe arrancar una base de datos al mismo tiempo. Pueden producirse da\u00F1os graves y no recuperables si 2 instancias de Derby se arrancan en la misma base de datos al mismo tiempo.  Se ha establecido la propiedad db2j.database.forceDatabaseLock\=true para que no arranque la base de datos mientras est\u00E9 presente db.lck.  Normalmente este archivo se elimina cuando termina la primera instancia de Derby que se arranca en la base de datos, pero puede dejarse a veces al concluir.  En este caso ser\u00E1 necesario eliminar el archivo a mano.  Es importante comprobar que no hay ninguna otra VM accediendo a la base de datos antes de suprimir el archivo db.lck a mano.
+XSDB8.D=AVISO\: Derby (instancia {0}) est\u00E1 intentando arrancar la base datos {1} a pesar de que Derby (instancia {2}) pueda seguir activo.  S\u00F3lo una instancia de Derby debe arrancar una base de datos al mismo tiempo. Pueden producirse da\u00F1os graves y no recuperables si 2 instancias de Derby se arrancan en la misma base de datos al mismo tiempo.  Se ha establecido la propiedad derby.database.forceDatabaseLock\=true para que no arranque la base de datos mientras est\u00E9 presente db.lck.  Normalmente este archivo se elimina cuando termina la primera instancia de Derby que se arranca en la base de datos, pero puede dejarse a veces al concluir.  En este caso ser\u00E1 necesario eliminar el archivo a mano.  Es importante comprobar que no hay ninguna otra VM accediendo a la base de datos antes de suprimir el archivo db.lck a mano.
 XSDB9.D=El contenedor de corriente {0} est\u00E1 da\u00F1ado.
 XSDBA.D=Anomal\u00EDa al intentar asignar el objeto {0}.
 XSDBB.D=Formato de p\u00E1gina desconocido en la p\u00E1gina {0}, tiene lugar un volcado de p\u00E1gina\: {1} 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_fr.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_fr.properties?rev=939730&r1=939729&r2=939730&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_fr.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_fr.properties Fri Apr 30 16:17:23 2010
@@ -1220,7 +1220,7 @@ XSDB4.D=La page {0} est en version {1}, 
 XSDB5.D=Le fichier journal comprend un enregistrement de modification \u00E0 la page {0}, c''est-\u00E0-dire au-del\u00E0 de la fin du conteneur.
 XSDB6.D=Il est possible qu''une autre instance de Derby ait d\u00E9j\u00E0 amorc\u00E9 la base de donn\u00E9es {0}.
 XSDB7.D=AVERTISSEMENT \: Derby (instance {0}) tente d''amorcer la base de donn\u00E9es {1} bien que Derby (instance {2}) soit peut-\u00EAtre encore actif.  Une seule instance de Derby peut amorcer une base de donn\u00E9es \u00E0 la fois. Une alt\u00E9ration grave et irr\u00E9m\u00E9diable peut r\u00E9sulter de cette situation et s''est peut-\u00EAtre d\u00E9j\u00E0 produite.
-XSDB8.D=AVERTISSEMENT \: Derby (instance {0}) tente d''amorcer la base de donn\u00E9es {1} bien que Derby (instance {2}) soit peut-\u00EAtre encore actif.  Une seule instance de Derby peut amorcer une base de donn\u00E9es \u00E0 la fois. Une alt\u00E9ration grave et irr\u00E9m\u00E9diable peut r\u00E9sulter si 2 instances de Derby amorcent la m\u00EAme base de donn\u00E9es en m\u00EAme temps.  La propri\u00E9t\u00E9 db2j.database.forceDatabaseLock\=true a \u00E9t\u00E9 d\u00E9finie, de sorte que la base de donn\u00E9es ne s''amorcera pas tant que le fichier db.lck sera pr\u00E9sent.  Normalement, ce fichier est supprim\u00E9 lorsque la premi\u00E8re instance de Derby devant amorcer la base de donn\u00E9es est ferm\u00E9e, mais il est possible qu''il reste pr\u00E9sent suite \u00E0 certaines proc\u00E9dures d''arr\u00EAt.  Dans ce cas, il est n\u00E9cessaire de supprimer le fichier manuellement.  Il est important de v\u00E9rifier qu''aucune autre machine VM n''acc\u00E8de \u0
 0E0 la base de donn\u00E9es tant que le fichier db.lck n''a pas \u00E9t\u00E9 supprim\u00E9 manuellement.
+XSDB8.D=AVERTISSEMENT \: Derby (instance {0}) tente d''amorcer la base de donn\u00E9es {1} bien que Derby (instance {2}) soit peut-\u00EAtre encore actif.  Une seule instance de Derby peut amorcer une base de donn\u00E9es \u00E0 la fois. Une alt\u00E9ration grave et irr\u00E9m\u00E9diable peut r\u00E9sulter si 2 instances de Derby amorcent la m\u00EAme base de donn\u00E9es en m\u00EAme temps.  La propri\u00E9t\u00E9 derby.database.forceDatabaseLock\=true a \u00E9t\u00E9 d\u00E9finie, de sorte que la base de donn\u00E9es ne s''amorcera pas tant que le fichier db.lck sera pr\u00E9sent.  Normalement, ce fichier est supprim\u00E9 lorsque la premi\u00E8re instance de Derby devant amorcer la base de donn\u00E9es est ferm\u00E9e, mais il est possible qu''il reste pr\u00E9sent suite \u00E0 certaines proc\u00E9dures d''arr\u00EAt.  Dans ce cas, il est n\u00E9cessaire de supprimer le fichier manuellement.  Il est important de v\u00E9rifier qu''aucune autre machine VM n''acc\u00E8de \u
 00E0 la base de donn\u00E9es tant que le fichier db.lck n''a pas \u00E9t\u00E9 supprim\u00E9 manuellement.
 XSDB9.D=Le conteneur de flux {0} est alt\u00E9r\u00E9.
 XSDBA.D=Echec de la tentative d''affectation de l''objet {0}.
 XSDBB.D=Format de page inconnu \u00E0 la page {0}, vidage de la page\u00A0\: {1} 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_hu.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_hu.properties?rev=939730&r1=939729&r2=939730&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_hu.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_hu.properties Fri Apr 30 16:17:23 2010
@@ -375,7 +375,7 @@ XSDB4.D=A(z) {0} oldal {1} verzi\u00f3sz
 XSDB5.D=A napl\u00f3 m\u00f3dos\u00edt\u00e1si rekorddal rendelkezik a(z) {0} oldalon, amely a t\u00e1rol\u00f3 v\u00e9ge ut\u00e1n tal\u00e1lhat\u00f3.
 XSDB6.D=Lehets\u00e9ges, hogy a Derby egy m\u00e1sik p\u00e9ld\u00e1nya m\u00e1r bel\u00e9pett a k\u00f6vetkez\u0151 adatb\u00e1zisba: {0}.
 XSDB7.D=FIGYELMEZTET\u00c9S: a Derby (p\u00e9ld\u00e1ny: {0}) megpr\u00f3b\u00e1l bel\u00e9pni a(z) {1} adatb\u00e1zisba, noha lehets\u00e9ges, hogy a Derby (p\u00e9ld\u00e1ny: {2}) m\u00e9g mindig akt\u00edv.  Ugyanazon adatb\u00e1zisba egyszerre csak a Derby egy p\u00e9ld\u00e1nya l\u00e9phet be. Ez s\u00falyos \u00e9s helyre\u00e1ll\u00edthatatlan s\u00e9r\u00fcl\u00e9seket eredm\u00e9nyezhet \u00e9s tal\u00e1n m\u00e1r eredm\u00e9nyezett is.
-XSDB8.D=FIGYELMEZTET\u00c9S: a Derby (p\u00e9ld\u00e1ny: {0}) megpr\u00f3b\u00e1l bel\u00e9pni a(z) {1} adatb\u00e1zisba, noha lehets\u00e9ges, hogy a Derby (p\u00e9ld\u00e1ny: {2}) m\u00e9g mindig akt\u00edv.  Ugyanazon adatb\u00e1zisba egyszerre csak a Derby egy p\u00e9ld\u00e1nya l\u00e9phet be. S\u00falyos \u00e9s helyre\u00e1ll\u00edthatatlan s\u00e9r\u00fcl\u00e9seket eredm\u00e9nyezhet, ha a Derby k\u00e9t p\u00e9ld\u00e1nya l\u00e9p be egyidej\u0171leg ugyanabba az adatb\u00e1zisba.  A db2j.database.forceDatabaseLock=true tulajdons\u00e1g be\u00e1ll\u00edt\u00e1sra ker\u00fclt, \u00edgy az adatb\u00e1zis nem indul el, am\u00edg a db.lck jelen van.  Norm\u00e1lis esetben ez a f\u00e1jl elt\u00e1vol\u00edt\u00e1sra ker\u00fcl a Derby adatb\u00e1zisba bel\u00e9pett els\u0151 p\u00e9ld\u00e1ny\u00e1nak kil\u00e9p\u00e9se ut\u00e1n, de egyes le\u00e1ll\u00edt\u00e1sok eset\u00e9n visszamaradhat.  Ebben az esetben a f\u00e1jlt saj\u00e1t kez\u0171leg kell elt\u00e1vol\u00e
 dtania.  A db.lck t\u00f6rl\u00e9se el\u0151tt fontos ellen\u0151rizni, hogy m\u00e1s VM nem f\u00e9r hozz\u00e1 az adatb\u00e1zishoz.
+XSDB8.D=FIGYELMEZTET\u00c9S: a Derby (p\u00e9ld\u00e1ny: {0}) megpr\u00f3b\u00e1l bel\u00e9pni a(z) {1} adatb\u00e1zisba, noha lehets\u00e9ges, hogy a Derby (p\u00e9ld\u00e1ny: {2}) m\u00e9g mindig akt\u00edv.  Ugyanazon adatb\u00e1zisba egyszerre csak a Derby egy p\u00e9ld\u00e1nya l\u00e9phet be. S\u00falyos \u00e9s helyre\u00e1ll\u00edthatatlan s\u00e9r\u00fcl\u00e9seket eredm\u00e9nyezhet, ha a Derby k\u00e9t p\u00e9ld\u00e1nya l\u00e9p be egyidej\u0171leg ugyanabba az adatb\u00e1zisba.  A derby.database.forceDatabaseLock=true tulajdons\u00e1g be\u00e1ll\u00edt\u00e1sra ker\u00fclt, \u00edgy az adatb\u00e1zis nem indul el, am\u00edg a db.lck jelen van.  Norm\u00e1lis esetben ez a f\u00e1jl elt\u00e1vol\u00edt\u00e1sra ker\u00fcl a Derby adatb\u00e1zisba bel\u00e9pett els\u0151 p\u00e9ld\u00e1ny\u00e1nak kil\u00e9p\u00e9se ut\u00e1n, de egyes le\u00e1ll\u00edt\u00e1sok eset\u00e9n visszamaradhat.  Ebben az esetben a f\u00e1jlt saj\u00e1t kez\u0171leg kell elt\u00e1vol\u00
 edtania.  A db.lck t\u00f6rl\u00e9se el\u0151tt fontos ellen\u0151rizni, hogy m\u00e1s VM nem f\u00e9r hozz\u00e1 az adatb\u00e1zishoz.
 XSDB9.D=A(z) {0} adatfolyam-t\u00e1rol\u00f3 s\u00e9r\u00fclt.
 XSDBA.D=A(z) {0} objektum lefoglal\u00e1s\u00e1ra tett k\u00eds\u00e9rlet meghi\u00fasult.
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_it.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_it.properties?rev=939730&r1=939729&r2=939730&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_it.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_it.properties Fri Apr 30 16:17:23 2010
@@ -1220,7 +1220,7 @@ XSDB4.D=La pagina {0} si trova sulla ver
 XSDB5.D=Il log contiene record modifiche sulla pagina {0}, oltre il limite del contenitore.
 XSDB6.D=Un''altra istanza di Derby potrebbe avere avviato il database ''{0}''.
 XSDB7.D=AVVERTENZA\: Derby (istanza {0}) sta tentando di avviare il database {1} anche se Derby (istanza {2}) potrebbe essere ancora attivo.  Solo un''istanza alla volta di Derby deve avviare un database. Ci\u00F2 pu\u00F2 determinare un errore grave o irreversibile, oppure tale errore potrebbe essersi gi\u00E0 verificato.
-XSDB8.D=AVVERTENZA\: Derby (istanza {0}) sta tentando di avviare il database {1} anche se Derby (istanza {2}) potrebbe essere ancora attivo.  Solo un''istanza alla volta di Derby deve avviare un database. Ci\u00F2 pu\u00F2 determinare un errore grave o irreversibile se due istanze di Derby avviano lo stesso database contemporaneamente.  La propriet\u00E0 db2j.database.forceDatabaseLock\=true \u00E8 stata impostata, quindi il database non verr\u00E0 avviato finch\u00E9 db.lck non \u00E8 presente.  Solitamente questo file viene eliminato alla chiusura della prima istanza di Derby che avvia il database, ma in alcune occasioni la chiusura non elimina tale file.  Quindi, dovr\u00E0 essere eliminato manualmente.  \u00C8 importante verificare che nessun altro VM acceda al database prima di eliminare il file db.lck manualmente.
+XSDB8.D=AVVERTENZA\: Derby (istanza {0}) sta tentando di avviare il database {1} anche se Derby (istanza {2}) potrebbe essere ancora attivo.  Solo un''istanza alla volta di Derby deve avviare un database. Ci\u00F2 pu\u00F2 determinare un errore grave o irreversibile se due istanze di Derby avviano lo stesso database contemporaneamente.  La propriet\u00E0 derby.database.forceDatabaseLock\=true \u00E8 stata impostata, quindi il database non verr\u00E0 avviato finch\u00E9 db.lck non \u00E8 presente.  Solitamente questo file viene eliminato alla chiusura della prima istanza di Derby che avvia il database, ma in alcune occasioni la chiusura non elimina tale file.  Quindi, dovr\u00E0 essere eliminato manualmente.  \u00C8 importante verificare che nessun altro VM acceda al database prima di eliminare il file db.lck manualmente.
 XSDB9.D=Il contenitore di flusso {0} \u00E8 corrotto.
 XSDBA.D=Tentativo di assegnare l''oggetto {0} non riuscito.
 XSDBB.D=Formato pagina sconosciuto alla pagina {0}, segue il dump di pagina\: {1}

Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ja_JP.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ja_JP.properties?rev=939730&r1=939729&r2=939730&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ja_JP.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ja_JP.properties Fri Apr 30 16:17:23 2010
@@ -1220,7 +1220,7 @@ XSDB4.D=\u30DA\u30FC\u30B8 {0} \u306F\u3
 XSDB5.D=\u30ED\u30B0\u306F\u30DA\u30FC\u30B8 {0} \u306B\u5909\u66F4\u30EC\u30B3\u30FC\u30C9\u3092\u6301\u3063\u3066\u3044\u307E\u3059\u304C\u3001\u3053\u308C\u306F\u30B3\u30F3\u30C6\u30CA\u30FC\u306E\u7D42\u308F\u308A\u3092\u8D85\u3048\u3066\u3044\u307E\u3059\u3002
 XSDB6.D=Derby \u306E\u5225\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u304C\u3059\u3067\u306B\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9 {0} \u3092\u30D6\u30FC\u30C8\u3057\u3066\u3044\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002
 XSDB7.D=\u8B66\u544A\: Derby (\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9 {2}) \u304C\u307E\u3060\u30A2\u30AF\u30C6\u30A3\u30D6\u3067\u3042\u308B\u53EF\u80FD\u6027\u304C\u3042\u308B\u306E\u306B\u3082\u304B\u304B\u308F\u3089\u305A\u3001Derby ( \u30A4\u30F3\u30B9\u30BF\u30F3\u30B9 {0}) \u304C\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9 {1} \u3092\u30D6\u30FC\u30C8\u3057\u3088\u3046\u3068\u3057\u3066\u3044\u307E\u3059\u3002  \u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u3092\u30D6\u30FC\u30C8\u3067\u304D\u308B Derby \u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u306F\u30011 \u5EA6\u306B 1 \u3064\u3060\u3051\u3067\u3059\u3002 \u3053\u308C\u306B\u3088\u308A\u91CD\u5927\u306A\u3001\u30EA\u30AB\u30D0\u30EA\u4E0D\u80FD\u306E\u7834\u58CA\u304C\u767A\u751F\u3059\u308B\u304B\u3001\u307E\u305F\u306F\u3059\u3067\u306B\u7834\u58CA\u3055\u308C\u3066\u3044\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002
-XSDB8.D=\u8B66\u544A\: Derby (\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9 {2}) \u304C\u307E\u3060\u30A2\u30AF\u30C6\u30A3\u30D6\u3067\u3042\u308B\u53EF\u80FD\u6027\u304C\u3042\u308B\u306E\u306B\u3082\u304B\u304B\u308F\u3089\u305A\u3001Derby ( \u30A4\u30F3\u30B9\u30BF\u30F3\u30B9 {0}) \u304C\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9 {1} \u3092\u30D6\u30FC\u30C8\u3057\u3088\u3046\u3068\u3057\u3066\u3044\u307E\u3059\u3002  \u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u3092\u30D6\u30FC\u30C8\u3067\u304D\u308B Derby \u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u306F\u30011 \u5EA6\u306B 1 \u3064\u3060\u3051\u3067\u3059\u3002 Derby \u306E 2 \u3064\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u304C\u540C\u6642\u306B\u540C\u3058\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u3092\u30D6\u30FC\u30C8\u3057\u305F\u5834\u5408\u3001\u91CD\u5927\u306A\u3001\u30EA\u30AB\u30D0\u30EA\u4E0D\u80FD\u306A\u7834\u58CA\u304C\u767A\u751F\u3059\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002  db2j.database.forceDatabaseLock\
 =true \u30D7\u30ED\u30D1\u30C6\u30A3\u30FC\u304C\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u308B\u305F\u3081\u3001db.lck \u304C\u5B58\u5728\u3057\u306A\u304F\u306A\u308B\u307E\u3067\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306F\u30D6\u30FC\u30C8\u3057\u307E\u305B\u3093\u3002  \u901A\u5E38\u3001\u3053\u306E\u30D5\u30A1\u30A4\u30EB\u306F\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u3092\u30D6\u30FC\u30C8\u3059\u308B Derby \u306E\u6700\u521D\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u304C\u7D42\u4E86\u3057\u305F\u6642\u70B9\u3067\u9664\u53BB\u3055\u308C\u307E\u3059\u304C\u3001\u30B7\u30E3\u30C3\u30C8\u30C0\u30A6\u30F3\u65B9\u6CD5\u306B\u3088\u3063\u3066\u306F\u5F8C\u306B\u6B8B\u3063\u3066\u3057\u307E\u3046\u3053\u3068\u304C\u3042\u308A\u307E\u3059\u3002  \u305D\u306E\u5834\u5408\u306F\u3001\u624B\u64CD\u4F5C\u3067\u3053\u306E\u30D5\u30A1\u30A4\u30EB\u3092\u9664\u53BB\u3059\u308B\u3053\u3068\u304C\u5FC5\u8981\u306B\u306A\u308A\u307E\u3059\u3002  db.lck \u30D5\u30A1\u30A4\u30EB\u3092\u624B\u64CD\u
 4F5C\u3067\u524A\u9664\u3059\u308B\u524D\u306B\u3001\u3053\u306E\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306B\u30A2\u30AF\u30BB\u30B9\u3057\u3066\u3044\u308B VM \u304C\u307B\u304B\u306B\u306A\u3044\u3053\u3068\u3092\u78BA\u8A8D\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
+XSDB8.D=\u8B66\u544A\: Derby (\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9 {2}) \u304C\u307E\u3060\u30A2\u30AF\u30C6\u30A3\u30D6\u3067\u3042\u308B\u53EF\u80FD\u6027\u304C\u3042\u308B\u306E\u306B\u3082\u304B\u304B\u308F\u3089\u305A\u3001Derby ( \u30A4\u30F3\u30B9\u30BF\u30F3\u30B9 {0}) \u304C\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9 {1} \u3092\u30D6\u30FC\u30C8\u3057\u3088\u3046\u3068\u3057\u3066\u3044\u307E\u3059\u3002  \u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u3092\u30D6\u30FC\u30C8\u3067\u304D\u308B Derby \u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u306F\u30011 \u5EA6\u306B 1 \u3064\u3060\u3051\u3067\u3059\u3002 Derby \u306E 2 \u3064\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u304C\u540C\u6642\u306B\u540C\u3058\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u3092\u30D6\u30FC\u30C8\u3057\u305F\u5834\u5408\u3001\u91CD\u5927\u306A\u3001\u30EA\u30AB\u30D0\u30EA\u4E0D\u80FD\u306A\u7834\u58CA\u304C\u767A\u751F\u3059\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002  derby.database.forceDatabaseLock
 \=true \u30D7\u30ED\u30D1\u30C6\u30A3\u30FC\u304C\u8A2D\u5B9A\u3055\u308C\u3066\u3044\u308B\u305F\u3081\u3001db.lck \u304C\u5B58\u5728\u3057\u306A\u304F\u306A\u308B\u307E\u3067\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306F\u30D6\u30FC\u30C8\u3057\u307E\u305B\u3093\u3002  \u901A\u5E38\u3001\u3053\u306E\u30D5\u30A1\u30A4\u30EB\u306F\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u3092\u30D6\u30FC\u30C8\u3059\u308B Derby \u306E\u6700\u521D\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u304C\u7D42\u4E86\u3057\u305F\u6642\u70B9\u3067\u9664\u53BB\u3055\u308C\u307E\u3059\u304C\u3001\u30B7\u30E3\u30C3\u30C8\u30C0\u30A6\u30F3\u65B9\u6CD5\u306B\u3088\u3063\u3066\u306F\u5F8C\u306B\u6B8B\u3063\u3066\u3057\u307E\u3046\u3053\u3068\u304C\u3042\u308A\u307E\u3059\u3002  \u305D\u306E\u5834\u5408\u306F\u3001\u624B\u64CD\u4F5C\u3067\u3053\u306E\u30D5\u30A1\u30A4\u30EB\u3092\u9664\u53BB\u3059\u308B\u3053\u3068\u304C\u5FC5\u8981\u306B\u306A\u308A\u307E\u3059\u3002  db.lck \u30D5\u30A1\u30A4\u30EB\u3092\u624B\u64CD\
 u4F5C\u3067\u524A\u9664\u3059\u308B\u524D\u306B\u3001\u3053\u306E\u30C7\u30FC\u30BF\u30D9\u30FC\u30B9\u306B\u30A2\u30AF\u30BB\u30B9\u3057\u3066\u3044\u308B VM \u304C\u307B\u304B\u306B\u306A\u3044\u3053\u3068\u3092\u78BA\u8A8D\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002
 XSDB9.D=\u30B9\u30C8\u30EA\u30FC\u30E0\u30FB\u30B3\u30F3\u30C6\u30CA\u30FC {0} \u306F\u7834\u58CA\u3055\u308C\u3066\u3044\u307E\u3059\u3002
 XSDBA.D=\u30AA\u30D6\u30B8\u30A7\u30AF\u30C8 {0} \u306E\u5272\u308A\u632F\u308A\u306B\u5931\u6557\u3057\u307E\u3057\u305F\u3002
 XSDBB.D=\u30DA\u30FC\u30B8 {0} \u306B\u4E0D\u660E\u306E\u30DA\u30FC\u30B8\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8\u304C\u3042\u308A\u307E\u3059\u3002\u30DA\u30FC\u30B8\u30C0\u30F3\u30D7\: {1} 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ko_KR.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ko_KR.properties?rev=939730&r1=939729&r2=939730&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ko_KR.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ko_KR.properties Fri Apr 30 16:17:23 2010
@@ -1220,7 +1220,7 @@ XSDB4.D={0}\uD398\uC774\uC9C0\uC758 \uBC
 XSDB5.D=\uB85C\uADF8\uAC00 {0}\uD398\uC774\uC9C0\uC5D0\uC11C \uBCC0\uACBD \uB808\uCF54\uB4DC\uB97C \uAC00\uC9C0\uACE0 \uC788\uC73C\uBA70 \uCEE8\uD14C\uC774\uB108\uC758 \uB05D\uC744 \uCD08\uACFC\uD558\uB294 \uAC83\uC785\uB2C8\uB2E4.
 XSDB6.D=\uB2E4\uB978 Derby \uC778\uC2A4\uD134\uC2A4\uAC00 \uC774\uBBF8 {0} \uB370\uC774\uD130\uBCA0\uC774\uC2A4\uB97C \uBD80\uD305\uD588\uC744 \uC218 \uC788\uC2B5\uB2C8\uB2E4.
 XSDB7.D=\uACBD\uACE0\: Derby(\uC778\uC2A4\uD134\uC2A4 {2})\uC774(\uAC00) \uD65C\uC131 \uC0C1\uD0DC\uC778 \uC911\uC5D0 Derby(\uC778\uC2A4\uD134\uC2A4 {0})\uC774(\uAC00) {1} \uB370\uC774\uD130\uBCA0\uC774\uC2A4\uB97C \uBD80\uD305\uD558\uB824 \uD569\uB2C8\uB2E4. Derby\uC758 \uD55C \uC778\uC2A4\uD134\uC2A4\uB9CC\uC774 \uD55C \uBC88\uC5D0 \uD558\uB098\uC758 \uB370\uC774\uD130\uBCA0\uC774\uC2A4\uB97C \uBD80\uD305\uD574\uC57C \uD569\uB2C8\uB2E4. \uC2EC\uAC01\uD558\uACE0 \uBCF5\uAD6C \uBD88\uAC00\uB2A5\uD55C \uC190\uC0C1\uC774 \uBC1C\uC0DD\uD560 \uC218 \uC788\uC73C\uBA70 \uC774\uBBF8 \uBC1C\uC0DD\uD588\uC744 \uC218\uB3C4 \uC788\uC2B5\uB2C8\uB2E4.
-XSDB8.D=\uACBD\uACE0\: Derby(\uC778\uC2A4\uD134\uC2A4 {2})\uC774(\uAC00) \uD65C\uC131 \uC0C1\uD0DC\uC778 \uC911\uC5D0 Derby(\uC778\uC2A4\uD134\uC2A4 {0})\uC774(\uAC00) {1} \uB370\uC774\uD130\uBCA0\uC774\uC2A4\uB97C \uBD80\uD305\uD558\uB824 \uD569\uB2C8\uB2E4. Derby\uC758 \uD55C \uC778\uC2A4\uD134\uC2A4\uB9CC\uC774 \uD55C \uBC88\uC5D0 \uD558\uB098\uC758 \uB370\uC774\uD130\uBCA0\uC774\uC2A4\uB97C \uBD80\uD305\uD574\uC57C \uD569\uB2C8\uB2E4. \uB3D9\uC77C\uD55C \uB370\uC774\uD130\uBCA0\uC774\uC2A4\uC5D0\uC11C Derby\uC758 \uB450 \uC778\uC2A4\uD134\uC2A4\uAC00 \uB3D9\uC2DC\uC5D0 \uBD80\uD305\uD558\uB294 \uACBD\uC6B0 \uC2EC\uAC01\uD558\uACE0 \uBCF5\uAD6C \uBD88\uAC00\uB2A5\uD55C \uC190\uC0C1\uC774 \uBC1C\uC0DD\uD560 \uC218 \uC788\uC2B5\uB2C8\uB2E4. db2j.database.forceDatabaseLock\=true \uB4F1\uB85D \uC815\uBCF4\uAC00 \uC124\uC815\uB418\uC5C8\uC73C\uBBC0\uB85C db.lck\uAC00 \uB354 \uC774\uC0C1 \uC874\uC7AC\uD558\uC9C0 \uC54A\uC744 \uB54C\uAE4C\uC9C0 \uB370\uC774\uD130\uBCA0\uC774\uC2
 A4\uAC00 \uBD80\uD305\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. \uC77C\uBC18\uC801\uC73C\uB85C \uB370\uC774\uD130\uBCA0\uC774\uC2A4\uC5D0\uC11C \uBD80\uD305\uD560 Derby\uC758 \uCCAB \uBC88\uC9F8 \uC778\uC2A4\uD134\uC2A4\uAC00 \uC885\uB8CC\uB418\uBA74 \uC774 \uD30C\uC77C\uC774 \uC81C\uAC70\uB418\uC9C0\uB9CC \uC77C\uBD80 \uC2DC\uC2A4\uD15C \uC885\uB8CC \uC2DC\uC5D0\uB294 \uACC4\uC18D \uB0A8\uC544 \uC788\uC744 \uC218 \uC788\uC2B5\uB2C8\uB2E4. \uC774 \uACBD\uC6B0 \uC218\uB3D9\uC73C\uB85C \uD30C\uC77C\uC744 \uC81C\uAC70\uD574\uC57C \uD569\uB2C8\uB2E4. db.lck \uD30C\uC77C\uC744 \uC218\uB3D9\uC73C\uB85C \uC0AD\uC81C\uD558\uAE30 \uC804\uC5D0 \uB2E4\uB978 VM\uC774 \uB370\uC774\uD130\uBCA0\uC774\uC2A4\uC5D0 \uC561\uC138\uC2A4\uD558\uACE0 \uC788\uB294\uC9C0 \uD655\uC778\uD574\uC57C \uD569\uB2C8\uB2E4.
+XSDB8.D=\uACBD\uACE0\: Derby(\uC778\uC2A4\uD134\uC2A4 {2})\uC774(\uAC00) \uD65C\uC131 \uC0C1\uD0DC\uC778 \uC911\uC5D0 Derby(\uC778\uC2A4\uD134\uC2A4 {0})\uC774(\uAC00) {1} \uB370\uC774\uD130\uBCA0\uC774\uC2A4\uB97C \uBD80\uD305\uD558\uB824 \uD569\uB2C8\uB2E4. Derby\uC758 \uD55C \uC778\uC2A4\uD134\uC2A4\uB9CC\uC774 \uD55C \uBC88\uC5D0 \uD558\uB098\uC758 \uB370\uC774\uD130\uBCA0\uC774\uC2A4\uB97C \uBD80\uD305\uD574\uC57C \uD569\uB2C8\uB2E4. \uB3D9\uC77C\uD55C \uB370\uC774\uD130\uBCA0\uC774\uC2A4\uC5D0\uC11C Derby\uC758 \uB450 \uC778\uC2A4\uD134\uC2A4\uAC00 \uB3D9\uC2DC\uC5D0 \uBD80\uD305\uD558\uB294 \uACBD\uC6B0 \uC2EC\uAC01\uD558\uACE0 \uBCF5\uAD6C \uBD88\uAC00\uB2A5\uD55C \uC190\uC0C1\uC774 \uBC1C\uC0DD\uD560 \uC218 \uC788\uC2B5\uB2C8\uB2E4. derby.database.forceDatabaseLock\=true \uB4F1\uB85D \uC815\uBCF4\uAC00 \uC124\uC815\uB418\uC5C8\uC73C\uBBC0\uB85C db.lck\uAC00 \uB354 \uC774\uC0C1 \uC874\uC7AC\uD558\uC9C0 \uC54A\uC744 \uB54C\uAE4C\uC9C0 \uB370\uC774\uD130\uBCA0\uC774\uC
 2A4\uAC00 \uBD80\uD305\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. \uC77C\uBC18\uC801\uC73C\uB85C \uB370\uC774\uD130\uBCA0\uC774\uC2A4\uC5D0\uC11C \uBD80\uD305\uD560 Derby\uC758 \uCCAB \uBC88\uC9F8 \uC778\uC2A4\uD134\uC2A4\uAC00 \uC885\uB8CC\uB418\uBA74 \uC774 \uD30C\uC77C\uC774 \uC81C\uAC70\uB418\uC9C0\uB9CC \uC77C\uBD80 \uC2DC\uC2A4\uD15C \uC885\uB8CC \uC2DC\uC5D0\uB294 \uACC4\uC18D \uB0A8\uC544 \uC788\uC744 \uC218 \uC788\uC2B5\uB2C8\uB2E4. \uC774 \uACBD\uC6B0 \uC218\uB3D9\uC73C\uB85C \uD30C\uC77C\uC744 \uC81C\uAC70\uD574\uC57C \uD569\uB2C8\uB2E4. db.lck \uD30C\uC77C\uC744 \uC218\uB3D9\uC73C\uB85C \uC0AD\uC81C\uD558\uAE30 \uC804\uC5D0 \uB2E4\uB978 VM\uC774 \uB370\uC774\uD130\uBCA0\uC774\uC2A4\uC5D0 \uC561\uC138\uC2A4\uD558\uACE0 \uC788\uB294\uC9C0 \uD655\uC778\uD574\uC57C \uD569\uB2C8\uB2E4.
 XSDB9.D=\uC2A4\uD2B8\uB9BC \uCEE8\uD14C\uC774\uB108 {0}\uC774(\uAC00) \uC190\uC0C1\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
 XSDBA.D={0} \uC624\uBE0C\uC81D\uD2B8 \uD560\uB2F9 \uC2DC\uB3C4\uAC00 \uC2E4\uD328\uD588\uC2B5\uB2C8\uB2E4.
 XSDBB.D={0} \uD398\uC774\uC9C0\uC5D0 \uC54C \uC218 \uC5C6\uB294 \uD398\uC774\uC9C0 \uD615\uC2DD\uC774 \uC788\uC2B5\uB2C8\uB2E4. \uD398\uC774\uC9C0 \uB364\uD504\uB294 \uB2E4\uC74C\uACFC \uAC19\uC2B5\uB2C8\uB2E4. {1} 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_pl.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_pl.properties?rev=939730&r1=939729&r2=939730&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_pl.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_pl.properties Fri Apr 30 16:17:23 2010
@@ -375,7 +375,7 @@ XSDB4.D=Strona {0} jest w wersji {1}, pl
 XSDB5.D=Dziennik zawiera rekord zmian na stronie {0}, kt\u00f3re s\u0105 poza ko\u0144cem kontenera.
 XSDB6.D=Inna instancja bazy danych Derby mog\u0142a ju\u017c uruchomi\u0107 baz\u0119 danych {0}.
 XSDB7.D=OSTRZE\u017bENIE: Baza danych Derby (instancja {0}) usi\u0142uje uruchomi\u0107 baz\u0119 danych {1}, chocia\u017c baza danych Derby (instancja {2}) nadal mo\u017ce by\u0107 aktywna. Tylko jedna instancja bazy danych Derby powinna uruchamia\u0107 baz\u0119 danych w danym momencie. Mo\u017ce z tego wynikn\u0105\u0107, lub ju\u017c wyst\u0105pi\u0142o, powa\u017cne lub niemo\u017cliwe do odzyskania uszkodzenie.
-XSDB8.D=OSTRZE\u017bENIE: Baza danych Derby (instancja {0}) usi\u0142uje uruchomi\u0107 baz\u0119 danych {1}, chocia\u017c baza danych Derby (instancja {2}) nadal mo\u017ce by\u0107 aktywna. Tylko jedna instancja bazy danych Derby powinna uruchamia\u0107 baz\u0119 danych w danym momencie. Powa\u017cne lub niemo\u017cliwe do odzyskania uszkodzenie mo\u017ce wyst\u0105pi\u0107, je\u015bli dwie instancje bazy danych Derby uruchamiaj\u0105 t\u0119 sam\u0105 baz\u0119 danych w tym samym momencie. Ustawiona zosta\u0142a w\u0142a\u015bciwo\u015b\u0107 db2j.database.forceDatabaseLock=true, tak wi\u0119c baza danych nie zostanie uruchomiona, dop\u00f3ki obecny jest plik db.lck. Zazwyczaj ten plik jest usuwany, gdy istnieje pierwsza instancja bazy danych Derby uruchamiaj\u0105ca baz\u0119 danych, ale mo\u017ce pozosta\u0107 w przypadku niekt\u00f3rych wy\u0142\u0105cze\u0144 systemu. W takim przypadku trzeba r\u0119cznie usun\u0105\u0107 ten plik. Przed r\u0119cznym usuni\u0119ciem pl
 iku db.lck nale\u017cy sprawdzi\u0107, czy \u017cadna inna maszyna VM nie korzysta z bazy danych.
+XSDB8.D=OSTRZE\u017bENIE: Baza danych Derby (instancja {0}) usi\u0142uje uruchomi\u0107 baz\u0119 danych {1}, chocia\u017c baza danych Derby (instancja {2}) nadal mo\u017ce by\u0107 aktywna. Tylko jedna instancja bazy danych Derby powinna uruchamia\u0107 baz\u0119 danych w danym momencie. Powa\u017cne lub niemo\u017cliwe do odzyskania uszkodzenie mo\u017ce wyst\u0105pi\u0107, je\u015bli dwie instancje bazy danych Derby uruchamiaj\u0105 t\u0119 sam\u0105 baz\u0119 danych w tym samym momencie. Ustawiona zosta\u0142a w\u0142a\u015bciwo\u015b\u0107 derby.database.forceDatabaseLock=true, tak wi\u0119c baza danych nie zostanie uruchomiona, dop\u00f3ki obecny jest plik db.lck. Zazwyczaj ten plik jest usuwany, gdy istnieje pierwsza instancja bazy danych Derby uruchamiaj\u0105ca baz\u0119 danych, ale mo\u017ce pozosta\u0107 w przypadku niekt\u00f3rych wy\u0142\u0105cze\u0144 systemu. W takim przypadku trzeba r\u0119cznie usun\u0105\u0107 ten plik. Przed r\u0119cznym usuni\u0119ciem p
 liku db.lck nale\u017cy sprawdzi\u0107, czy \u017cadna inna maszyna VM nie korzysta z bazy danych.
 XSDB9.D=Kontener strumienia {0} jest uszkodzony.
 XSDBA.D=Pr\u00f3ba przydzielenia obiektu {0} nie powiod\u0142a si\u0119.
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_pt_BR.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_pt_BR.properties?rev=939730&r1=939729&r2=939730&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_pt_BR.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_pt_BR.properties Fri Apr 30 16:17:23 2010
@@ -376,7 +376,7 @@ XSDB4.D=A p\u00e1gina {0} est\u00e1 na v
 XSDB5.D=O log alterou o registro na p\u00e1gina {0}, o qual est\u00e1 ap\u00f3s o final do cont\u00eainer.
 XSDB6.D=Outra inst\u00e2ncia do Derby j\u00e1 pode ter inicializado o banco de dados {0}.
 XSDB7.D=AVISO: O Derby (inst\u00e2ncia {0}) est\u00e1 tentando inicializar o banco de dados {1}, embora o Derby (inst\u00e2ncia {2}) ainda possa estar ativo.  Apenas uma inst\u00e2ncia do Derby deve inicializar um banco de dados de cada vez, sen\u00e3o pode resultar em danos graves e irrecuper\u00e1veis, o que j\u00e1 pode ter acontecido.
-XSDB8.D=AVISO: O Derby (inst\u00e2ncia {0}) est\u00e1 tentando inicializar o banco de dados {1}, embora o Derby (inst\u00e2ncia {2}) ainda possa estar ativo.  Apenas uma inst\u00e2ncia do Derby deve inicializar um banco de dados de cada vez. Pode resultar em danos graves e irrecuper\u00e1veis quando 2 inst\u00e2ncias do Derby inicializam o mesmo banco de dados ao mesmo tempo.  A propriedade db2j.database.forceDatabaseLock=true foi definida, portanto, o banco de dados n\u00e3o ser\u00e1 inicializado at\u00e9 que db.lck n\u00e3o esteja mais presente.  Normalmente, esse arquivo \u00e9 removido quando a primeira inst\u00e2ncia do Derby que inicializou o banco de dados termina, mas pode ser abandonado no encerramento.  Nesse caso, ser\u00e1 necess\u00e1rio remover o arquivo manualmente.  \u00c9 importante verificar se nenhuma outra VM est\u00e1 acessando o banco de dados antes de remover manualmente o arquivo db.lck.
+XSDB8.D=AVISO: O Derby (inst\u00e2ncia {0}) est\u00e1 tentando inicializar o banco de dados {1}, embora o Derby (inst\u00e2ncia {2}) ainda possa estar ativo.  Apenas uma inst\u00e2ncia do Derby deve inicializar um banco de dados de cada vez. Pode resultar em danos graves e irrecuper\u00e1veis quando 2 inst\u00e2ncias do Derby inicializam o mesmo banco de dados ao mesmo tempo.  A propriedade derby.database.forceDatabaseLock=true foi definida, portanto, o banco de dados n\u00e3o ser\u00e1 inicializado at\u00e9 que db.lck n\u00e3o esteja mais presente.  Normalmente, esse arquivo \u00e9 removido quando a primeira inst\u00e2ncia do Derby que inicializou o banco de dados termina, mas pode ser abandonado no encerramento.  Nesse caso, ser\u00e1 necess\u00e1rio remover o arquivo manualmente.  \u00c9 importante verificar se nenhuma outra VM est\u00e1 acessando o banco de dados antes de remover manualmente o arquivo db.lck.
 XSDB9.D=O cont\u00eainer de fluxo {0} est\u00e1 corrompido.
 XSDBA.D=Falha na tentativa de alocar o objeto {0}.
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ru.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ru.properties?rev=939730&r1=939729&r2=939730&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ru.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_ru.properties Fri Apr 30 16:17:23 2010
@@ -375,7 +375,7 @@ XSDB4.D=\u0421\u0442\u0440\u0430\u043d\u
 XSDB5.D=\u0412 \u0436\u0443\u0440\u043d\u0430\u043b\u0435 \u0435\u0441\u0442\u044c \u0437\u0430\u043f\u0438\u0441\u044c \u043d\u0430 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0435 {0}, \u043a\u043e\u0442\u043e\u0440\u0430\u044f \u043d\u0430\u0445\u043e\u0434\u0438\u0442\u0441\u044f \u043f\u043e\u0441\u043b\u0435 \u043a\u043e\u043d\u0446\u0430 \u043a\u043e\u043d\u0442\u0435\u0439\u043d\u0435\u0440\u0430.
 XSDB6.D=\u0412\u043e\u0437\u043c\u043e\u0436\u043d\u043e, \u0434\u0440\u0443\u0433\u043e\u0439 \u044d\u043a\u0437\u0435\u043c\u043f\u043b\u044f\u0440 Derby \u0443\u0436\u0435 \u0437\u0430\u0433\u0440\u0443\u0437\u0438\u043b \u0431\u0430\u0437\u0443 \u0434\u0430\u043d\u043d\u044b\u0445 {0}.
 XSDB7.D=\u041f\u0420\u0415\u0414\u0423\u041f\u0420\u0415\u0416\u0414\u0415\u041d\u0418\u0415: Derby (\u044d\u043a\u0437\u0435\u043c\u043f\u043b\u044f\u0440 {0}) \u043f\u044b\u0442\u0430\u0435\u0442\u0441\u044f \u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044c \u0431\u0430\u0437\u0443 \u0434\u0430\u043d\u043d\u044b\u0445 {1}, \u0445\u043e\u0442\u044f, \u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e, \u0435\u0449\u0435 \u0430\u043a\u0442\u0438\u0432\u0435\u043d Derby (\u044d\u043a\u0437\u0435\u043c\u043f\u043b\u044f\u0440 {2}).  \u0417\u0430\u0433\u0440\u0443\u0436\u0430\u0442\u044c \u0431\u0430\u0437\u0443 \u0434\u0430\u043d\u043d\u044b\u0445 \u043c\u043e\u0436\u0435\u0442 \u0442\u043e\u043b\u044c\u043a\u043e \u043e\u0434\u0438\u043d \u044d\u043a\u0437\u0435\u043c\u043f\u043b\u044f\u0440 Derby \u043e\u0434\u043d\u043e\u0432\u0440\u0435\u043c\u0435\u043d\u043d\u043e. \u042d\u0442\u043e \u043c\u043e\u0436\u0435\u0442 \u043f\u0440\u0438\u0432\u0435\u0441\u0442\u0438 (\u043
 8 \u043c\u043e\u0433\u043b\u043e \u0443\u0436\u0435 \u043f\u0440\u0438\u0432\u0435\u0441\u0442\u0438) \u043a \u0441\u0435\u0440\u044c\u0435\u0437\u043d\u043e\u043c\u0443 \u0438 \u043d\u0435\u0432\u043e\u0441\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u043c\u043e\u043c\u0443 \u043f\u043e\u0432\u0440\u0435\u0436\u0434\u0435\u043d\u0438\u044e.
-XSDB8.D=\u041f\u0420\u0415\u0414\u0423\u041f\u0420\u0415\u0416\u0414\u0415\u041d\u0418\u0415: Derby (\u044d\u043a\u0437\u0435\u043c\u043f\u043b\u044f\u0440 {0}) \u043f\u044b\u0442\u0430\u0435\u0442\u0441\u044f \u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044c \u0431\u0430\u0437\u0443 \u0434\u0430\u043d\u043d\u044b\u0445 {1}, \u0445\u043e\u0442\u044f, \u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e, \u0435\u0449\u0435 \u0430\u043a\u0442\u0438\u0432\u0435\u043d Derby (\u044d\u043a\u0437\u0435\u043c\u043f\u043b\u044f\u0440 {2}).  \u0417\u0430\u0433\u0440\u0443\u0436\u0430\u0442\u044c \u0431\u0430\u0437\u0443 \u0434\u0430\u043d\u043d\u044b\u0445 \u043c\u043e\u0436\u0435\u0442 \u0442\u043e\u043b\u044c\u043a\u043e \u043e\u0434\u0438\u043d \u044d\u043a\u0437\u0435\u043c\u043f\u043b\u044f\u0440 Derby \u043e\u0434\u043d\u043e\u0432\u0440\u0435\u043c\u0435\u043d\u043d\u043e. \u0415\u0441\u043b\u0438 \u0434\u0432\u0430 \u044d\u043a\u0437\u0435\u043c\u043f\u043b\u044f\u0440\u0430 
 Derby \u043f\u043e\u043f\u044b\u0442\u0430\u044e\u0442\u0441\u044f \u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044c \u043e\u0434\u043d\u0443 \u0438 \u0442\u0443 \u0436\u0435 \u0431\u0430\u0437\u0443 \u043e\u0434\u043d\u043e\u0432\u0440\u0435\u043c\u0435\u043d\u043d\u043e, \u044d\u0442\u043e \u043c\u043e\u0436\u0435\u0442 \u043f\u0440\u0438\u0432\u0435\u0441\u0442\u0438 \u043a \u0441\u0435\u0440\u044c\u0435\u0437\u043d\u043e\u043c\u0443 \u0438 \u043d\u0435\u0432\u043e\u0441\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u043c\u043e\u043c\u0443 \u043f\u043e\u0432\u0440\u0435\u0436\u0434\u0435\u043d\u0438\u044e.  \u0417\u0430\u0434\u0430\u043d\u043e \u0441\u0432\u043e\u0439\u0441\u0442\u0432\u043e db2j.database.forceDatabaseLock=true, \u043f\u043e\u044d\u0442\u043e\u043c\u0443 \u0431\u0430\u0437\u0430 \u0434\u0430\u043d\u043d\u044b\u0445 \u043d\u0435 \u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u0441\u044f, \u043f\u043e\u043a\u0430 \u0431\u0443\u0434\u0435\u0442 \u0441\u04
 43\u0449\u0435\u0441\u0442\u0432\u043e\u0432\u0430\u0442\u044c db.lck.  \u041e\u0431\u044b\u0447\u043d\u043e \u044d\u0442\u043e\u0442 \u0444\u0430\u0439\u043b \u0443\u0434\u0430\u043b\u044f\u0435\u0442\u0441\u044f, \u043a\u043e\u0433\u0434\u0430 \u0437\u0430\u0432\u0435\u0440\u0448\u0430\u0435\u0442 \u0440\u0430\u0431\u043e\u0442\u0443 \u043f\u0435\u0440\u0432\u044b\u0439 \u044d\u043a\u0437\u0435\u043c\u043f\u043b\u044f\u0440 Derby, \u043f\u0440\u043e\u0438\u0437\u0432\u043e\u0434\u044f\u0449\u0438\u0439 \u0437\u0430\u0433\u0440\u0443\u0437\u043a\u0443 \u0431\u0430\u0437\u044b \u0434\u0430\u043d\u043d\u044b\u0445, \u043d\u043e \u0432 \u043d\u0435\u043a\u043e\u0442\u043e\u0440\u044b\u0445 \u0441\u043b\u0443\u0447\u0430\u044f\u0445 \u043e\u043d \u043c\u043e\u0436\u0435\u0442 \u043e\u0441\u0442\u0430\u0432\u0430\u0442\u044c\u0441\u044f \u043f\u0440\u0438 \u0437\u0430\u0432\u0435\u0440\u0448\u0435\u043d\u0438\u0438 \u0440\u0430\u0431\u043e\u0442\u044b.  \u0412 \u0442\u0430\u043a
 \u0438\u0445 \u0441\u043b\u0443\u0447\u0430\u044f\u0445 \u043f\u0440\u0438\u0434\u0435\u0442\u0441\u044f \u0443\u0434\u0430\u043b\u0438\u0442\u044c \u044d\u0442\u043e\u0442 \u0444\u0430\u0439\u043b \u0432\u0440\u0443\u0447\u043d\u0443\u044e.  \u041f\u0440\u0435\u0436\u0434\u0435 \u0447\u0435\u043c \u0443\u0434\u0430\u043b\u044f\u0442\u044c \u0444\u0430\u0439\u043b db.lck \u0432\u0440\u0443\u0447\u043d\u0443\u044e, \u0432\u0430\u0436\u043d\u043e \u0443\u0434\u043e\u0441\u0442\u043e\u0432\u0435\u0440\u0438\u0442\u044c\u0441\u044f, \u0447\u0442\u043e \u043d\u0438\u043a\u0430\u043a\u0430\u044f \u0434\u0440\u0443\u0433\u0430\u044f VM \u043d\u0435 \u043e\u0431\u0440\u0430\u0449\u0430\u0435\u0442\u0441\u044f \u043a \u0431\u0430\u0437\u0435 \u0434\u0430\u043d\u043d\u044b\u0445.
+XSDB8.D=\u041f\u0420\u0415\u0414\u0423\u041f\u0420\u0415\u0416\u0414\u0415\u041d\u0418\u0415: Derby (\u044d\u043a\u0437\u0435\u043c\u043f\u043b\u044f\u0440 {0}) \u043f\u044b\u0442\u0430\u0435\u0442\u0441\u044f \u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044c \u0431\u0430\u0437\u0443 \u0434\u0430\u043d\u043d\u044b\u0445 {1}, \u0445\u043e\u0442\u044f, \u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e, \u0435\u0449\u0435 \u0430\u043a\u0442\u0438\u0432\u0435\u043d Derby (\u044d\u043a\u0437\u0435\u043c\u043f\u043b\u044f\u0440 {2}).  \u0417\u0430\u0433\u0440\u0443\u0436\u0430\u0442\u044c \u0431\u0430\u0437\u0443 \u0434\u0430\u043d\u043d\u044b\u0445 \u043c\u043e\u0436\u0435\u0442 \u0442\u043e\u043b\u044c\u043a\u043e \u043e\u0434\u0438\u043d \u044d\u043a\u0437\u0435\u043c\u043f\u043b\u044f\u0440 Derby \u043e\u0434\u043d\u043e\u0432\u0440\u0435\u043c\u0435\u043d\u043d\u043e. \u0415\u0441\u043b\u0438 \u0434\u0432\u0430 \u044d\u043a\u0437\u0435\u043c\u043f\u043b\u044f\u0440\u0430 
 Derby \u043f\u043e\u043f\u044b\u0442\u0430\u044e\u0442\u0441\u044f \u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044c \u043e\u0434\u043d\u0443 \u0438 \u0442\u0443 \u0436\u0435 \u0431\u0430\u0437\u0443 \u043e\u0434\u043d\u043e\u0432\u0440\u0435\u043c\u0435\u043d\u043d\u043e, \u044d\u0442\u043e \u043c\u043e\u0436\u0435\u0442 \u043f\u0440\u0438\u0432\u0435\u0441\u0442\u0438 \u043a \u0441\u0435\u0440\u044c\u0435\u0437\u043d\u043e\u043c\u0443 \u0438 \u043d\u0435\u0432\u043e\u0441\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u043c\u043e\u043c\u0443 \u043f\u043e\u0432\u0440\u0435\u0436\u0434\u0435\u043d\u0438\u044e.  \u0417\u0430\u0434\u0430\u043d\u043e \u0441\u0432\u043e\u0439\u0441\u0442\u0432\u043e derby.database.forceDatabaseLock=true, \u043f\u043e\u044d\u0442\u043e\u043c\u0443 \u0431\u0430\u0437\u0430 \u0434\u0430\u043d\u043d\u044b\u0445 \u043d\u0435 \u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u0441\u044f, \u043f\u043e\u043a\u0430 \u0431\u0443\u0434\u0435\u0442 \u0441\u0
 443\u0449\u0435\u0441\u0442\u0432\u043e\u0432\u0430\u0442\u044c db.lck.  \u041e\u0431\u044b\u0447\u043d\u043e \u044d\u0442\u043e\u0442 \u0444\u0430\u0439\u043b \u0443\u0434\u0430\u043b\u044f\u0435\u0442\u0441\u044f, \u043a\u043e\u0433\u0434\u0430 \u0437\u0430\u0432\u0435\u0440\u0448\u0430\u0435\u0442 \u0440\u0430\u0431\u043e\u0442\u0443 \u043f\u0435\u0440\u0432\u044b\u0439 \u044d\u043a\u0437\u0435\u043c\u043f\u043b\u044f\u0440 Derby, \u043f\u0440\u043e\u0438\u0437\u0432\u043e\u0434\u044f\u0449\u0438\u0439 \u0437\u0430\u0433\u0440\u0443\u0437\u043a\u0443 \u0431\u0430\u0437\u044b \u0434\u0430\u043d\u043d\u044b\u0445, \u043d\u043e \u0432 \u043d\u0435\u043a\u043e\u0442\u043e\u0440\u044b\u0445 \u0441\u043b\u0443\u0447\u0430\u044f\u0445 \u043e\u043d \u043c\u043e\u0436\u0435\u0442 \u043e\u0441\u0442\u0430\u0432\u0430\u0442\u044c\u0441\u044f \u043f\u0440\u0438 \u0437\u0430\u0432\u0435\u0440\u0448\u0435\u043d\u0438\u0438 \u0440\u0430\u0431\u043e\u0442\u044b.  \u0412 \u0442\u0430\u043
 a\u0438\u0445 \u0441\u043b\u0443\u0447\u0430\u044f\u0445 \u043f\u0440\u0438\u0434\u0435\u0442\u0441\u044f \u0443\u0434\u0430\u043b\u0438\u0442\u044c \u044d\u0442\u043e\u0442 \u0444\u0430\u0439\u043b \u0432\u0440\u0443\u0447\u043d\u0443\u044e.  \u041f\u0440\u0435\u0436\u0434\u0435 \u0447\u0435\u043c \u0443\u0434\u0430\u043b\u044f\u0442\u044c \u0444\u0430\u0439\u043b db.lck \u0432\u0440\u0443\u0447\u043d\u0443\u044e, \u0432\u0430\u0436\u043d\u043e \u0443\u0434\u043e\u0441\u0442\u043e\u0432\u0435\u0440\u0438\u0442\u044c\u0441\u044f, \u0447\u0442\u043e \u043d\u0438\u043a\u0430\u043a\u0430\u044f \u0434\u0440\u0443\u0433\u0430\u044f VM \u043d\u0435 \u043e\u0431\u0440\u0430\u0449\u0430\u0435\u0442\u0441\u044f \u043a \u0431\u0430\u0437\u0435 \u0434\u0430\u043d\u043d\u044b\u0445.
 XSDB9.D=\u041a\u043e\u043d\u0442\u0435\u0439\u043d\u0435\u0440 \u043f\u043e\u0442\u043e\u043a\u043e\u0432 {0} \u043f\u043e\u0432\u0440\u0435\u0436\u0434\u0435\u043d.
 XSDBA.D=\u041f\u043e\u043f\u044b\u0442\u043a\u0430 \u0432\u044b\u0434\u0435\u043b\u0438\u0442\u044c \u043e\u0431\u044a\u0435\u043a\u0442 {0} \u0437\u0430\u0432\u0435\u0440\u0448\u0438\u043b\u0430\u0441\u044c \u043d\u0435\u0443\u0434\u0430\u0447\u043d\u043e.
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_zh_CN.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_zh_CN.properties?rev=939730&r1=939729&r2=939730&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_zh_CN.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_zh_CN.properties Fri Apr 30 16:17:23 2010
@@ -1220,7 +1220,7 @@ XSDB4.D=\u9875 {0} \u7684\u7248\u672C\u4
 XSDB5.D=\u65E5\u5FD7\u4E2D\u6709\u9875 {0} \u7684\u66F4\u6539\u8BB0\u5F55\uFF0C\u8BE5\u8BB0\u5F55\u8D85\u51FA\u5BB9\u5668\u7684\u8303\u56F4\u3002
 XSDB6.D=Derby \u7684\u53E6\u4E00\u4E2A\u5B9E\u4F8B\u53EF\u80FD\u5DF2\u5F15\u5BFC\u6570\u636E\u5E93 {0}\u3002
 XSDB7.D=\u8B66\u544A\uFF1ADerby\uFF08\u5B9E\u4F8B {0}\uFF09\u5C1D\u8BD5\u5F15\u5BFC\u6570\u636E\u5E93 {1}\uFF0C\u5373\u4F7F Derby\uFF08\u5B9E\u4F8B {2}\uFF09\u53EF\u80FD\u4ECD\u7136\u6D3B\u52A8\u3002\u6BCF\u6B21\u5E94\u8BE5\u53EA\u6709\u4E00\u4E2A Derby \u5B9E\u4F8B\u5F15\u5BFC\u6570\u636E\u5E93\u3002\u53EF\u5BFC\u81F4\u4E25\u91CD\u548C\u4E0D\u53EF\u6062\u590D\u7684\u635F\u574F\uFF0C\u800C\u4E14\u53EF\u80FD\u5DF2\u53D1\u751F\u3002
-XSDB8.D=\u8B66\u544A\uFF1ADerby\uFF08\u5B9E\u4F8B {0}\uFF09\u5C1D\u8BD5\u5F15\u5BFC\u6570\u636E\u5E93 {1}\uFF0C\u5373\u4F7F Derby\uFF08\u5B9E\u4F8B {2}\uFF09\u53EF\u80FD\u4ECD\u7136\u6D3B\u52A8\u3002\u6BCF\u6B21\u5E94\u8BE5\u53EA\u6709\u4E00\u4E2A Derby \u5B9E\u4F8B\u5F15\u5BFC\u6570\u636E\u5E93\u3002\u5982\u679C\u4E24\u4E2A Derby \u5B9E\u4F8B\u540C\u65F6\u5F15\u5BFC\u540C\u4E00\u6570\u636E\u5E93\uFF0C\u53EF\u5BFC\u81F4\u4E25\u91CD\u548C\u4E0D\u53EF\u6062\u590D\u7684\u635F\u574F\u3002\u5DF2\u8BBE\u7F6E db2j.database.forceDatabaseLock\=true \u5C5E\u6027\uFF0C\u6240\u4EE5\u6570\u636E\u5E93\u5C06\u4E0D\u5F15\u5BFC\uFF0C\u76F4\u5230 db.lck \u4E0D\u518D\u5B58\u5728\u3002\u901A\u5E38\uFF0C\u5F15\u5BFC\u6570\u636E\u5E93\u7684\u7B2C\u4E00\u4E2A Derby \u5B9E\u4F8B\u9000\u51FA\u65F6\u4F1A\u9664\u53BB\u6B64\u6587\u4EF6\uFF0C\u4F46\u662F\u53EF\u80FD\u5728\u4E00\u4E9B\u5173\u95ED\u540E\u8BE5\u6587\u4EF6\u4ECD\u7136\u5B58\u5728\u3002\u6B64\u60C5\u51B5\u4E0B\uFF0C\u9700\u8981\u624B\u5DE5\u
 9664\u53BB\u6B64\u6587\u4EF6\u3002\u91CD\u8981\u7684\u662F\u5728\u624B\u5DE5\u5220\u9664 db.lck \u6587\u4EF6\u524D\uFF0C\u9A8C\u8BC1\u6CA1\u6709\u5176\u4ED6 VM \u8BBF\u95EE\u6570\u636E\u5E93\u3002
+XSDB8.D=\u8B66\u544A\uFF1ADerby\uFF08\u5B9E\u4F8B {0}\uFF09\u5C1D\u8BD5\u5F15\u5BFC\u6570\u636E\u5E93 {1}\uFF0C\u5373\u4F7F Derby\uFF08\u5B9E\u4F8B {2}\uFF09\u53EF\u80FD\u4ECD\u7136\u6D3B\u52A8\u3002\u6BCF\u6B21\u5E94\u8BE5\u53EA\u6709\u4E00\u4E2A Derby \u5B9E\u4F8B\u5F15\u5BFC\u6570\u636E\u5E93\u3002\u5982\u679C\u4E24\u4E2A Derby \u5B9E\u4F8B\u540C\u65F6\u5F15\u5BFC\u540C\u4E00\u6570\u636E\u5E93\uFF0C\u53EF\u5BFC\u81F4\u4E25\u91CD\u548C\u4E0D\u53EF\u6062\u590D\u7684\u635F\u574F\u3002\u5DF2\u8BBE\u7F6E derby.database.forceDatabaseLock\=true \u5C5E\u6027\uFF0C\u6240\u4EE5\u6570\u636E\u5E93\u5C06\u4E0D\u5F15\u5BFC\uFF0C\u76F4\u5230 db.lck \u4E0D\u518D\u5B58\u5728\u3002\u901A\u5E38\uFF0C\u5F15\u5BFC\u6570\u636E\u5E93\u7684\u7B2C\u4E00\u4E2A Derby \u5B9E\u4F8B\u9000\u51FA\u65F6\u4F1A\u9664\u53BB\u6B64\u6587\u4EF6\uFF0C\u4F46\u662F\u53EF\u80FD\u5728\u4E00\u4E9B\u5173\u95ED\u540E\u8BE5\u6587\u4EF6\u4ECD\u7136\u5B58\u5728\u3002\u6B64\u60C5\u51B5\u4E0B\uFF0C\u9700\u8981\u624B\u5DE5\
 u9664\u53BB\u6B64\u6587\u4EF6\u3002\u91CD\u8981\u7684\u662F\u5728\u624B\u5DE5\u5220\u9664 db.lck \u6587\u4EF6\u524D\uFF0C\u9A8C\u8BC1\u6CA1\u6709\u5176\u4ED6 VM \u8BBF\u95EE\u6570\u636E\u5E93\u3002
 XSDB9.D=\u6D41\u5BB9\u5668 {0} \u5DF2\u635F\u574F\u3002
 XSDBA.D=\u5C1D\u8BD5\u5206\u914D\u5BF9\u8C61 {0} \u5931\u8D25\u3002
 XSDBB.D=\u9875 {0} \u4E0A\u5B58\u5728\u672A\u77E5\u9875\u683C\u5F0F\uFF0C\u9875\u8F6C\u50A8\u9075\u5FAA\uFF1A{1} 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_zh_TW.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_zh_TW.properties?rev=939730&r1=939729&r2=939730&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_zh_TW.properties (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/loc/messages_zh_TW.properties Fri Apr 30 16:17:23 2010
@@ -1220,7 +1220,7 @@ XSDB4.D={0} \u9801\u9762\u7684\u7248\u67
 XSDB5.D=\u65E5\u8A8C\u7684 {0} \u9801\u9762\u6709\u8B8A\u66F4\u8A18\u9304\uFF0C\u5B83\u5728\u5132\u5B58\u5668\u7684\u7D50\u5C3E\u4E4B\u5916\u3002
 XSDB6.D=Derby \u53EF\u80FD\u6709\u53E6\u4E00\u500B\u5BE6\u4F8B\u5DF2\u7D93\u555F\u52D5\u8CC7\u6599\u5EAB {0}\u3002
 XSDB7.D=\u8B66\u544A\uFF1A\u5373\u4F7F Derby (\u5BE6\u4F8B {2}) \u4ECD\u53EF\u80FD\u5728\u4F7F\u7528\u4E2D\uFF0CDerby (\u5BE6\u4F8B {0}) \u4ECD\u7136\u8A66\u5716\u555F\u52D5\u8CC7\u6599\u5EAB {1}\u3002\u4E00\u6B21\u53EA\u80FD\u6709\u4E00\u500B Derby \u5BE6\u4F8B\u53EF\u4EE5\u555F\u52D5\u4E00\u500B\u8CC7\u6599\u5EAB\u3002\u53EF\u80FD\u6703\u9020\u6210\u56B4\u91CD\u4E14\u4E0D\u53EF\u56DE\u5FA9\u7684\u6BC0\u640D\uFF0C\u4E14\u53EF\u80FD\u5DF2\u7D93\u767C\u751F\u3002
-XSDB8.D=\u8B66\u544A\uFF1A\u5373\u4F7F Derby (\u5BE6\u4F8B {2}) \u4ECD\u53EF\u80FD\u5728\u4F7F\u7528\u4E2D\uFF0CDerby (\u5BE6\u4F8B {0}) \u4ECD\u7136\u8A66\u5716\u555F\u52D5\u8CC7\u6599\u5EAB {1}\u3002\u4E00\u6B21\u53EA\u80FD\u6709\u4E00\u500B Derby \u5BE6\u4F8B\u53EF\u4EE5\u555F\u52D5\u4E00\u500B\u8CC7\u6599\u5EAB\u3002\u5982\u679C\u540C\u6642\u5728\u76F8\u540C\u7684\u8CC7\u6599\u5EAB\u555F\u52D5\u5169\u500B Derby \u5BE6\u4F8B\uFF0C\u53EF\u80FD\u6703\u9020\u6210\u56B4\u91CD\u4E14\u7121\u6CD5\u56DE\u5FA9\u7684\u6BC0\u640D\u3002\u5DF2\u8A2D\u5B9A db2j.database.forceDatabaseLock\=true \u5167\u5BB9\uFF0C\u56E0\u6B64\uFF0C\u8CC7\u6599\u5EAB\u4E0D\u6703\u555F\u52D5\uFF0C\u76F4\u5230\u4E0D\u518D\u6709 db.lck \u70BA\u6B62\u3002\u7576\u8CC7\u6599\u5EAB\u555F\u52D5\u7684\u7B2C\u4E00\u500B Derby \u5BE6\u4F8B\u7D50\u675F\u6642\uFF0C\u901A\u5E38\u6703\u79FB\u9664\u9019\u500B\u6A94\u6848\uFF0C\u4F46\u4E5F\u6709\u53EF\u80FD\u56E0\u70BA\u5176\u4ED6\u95DC\u6A5F\u65B9\u5F0F\u800C\u907A\u7559
 \u4E0B\u4F86\u3002\u5728\u9019\u500B\u60C5\u6CC1\u4E0B\uFF0C\u5FC5\u9808\u624B\u52D5\u79FB\u9664\u6A94\u6848\u3002\u8ACB\u52D9\u5FC5\u78BA\u8A8D\u6C92\u6709\u5176\u4ED6 VM \u5728\u5B58\u53D6\u8CC7\u6599\u5EAB\uFF0C\u518D\u624B\u52D5\u522A\u9664 db.lck\u3002
+XSDB8.D=\u8B66\u544A\uFF1A\u5373\u4F7F Derby (\u5BE6\u4F8B {2}) \u4ECD\u53EF\u80FD\u5728\u4F7F\u7528\u4E2D\uFF0CDerby (\u5BE6\u4F8B {0}) \u4ECD\u7136\u8A66\u5716\u555F\u52D5\u8CC7\u6599\u5EAB {1}\u3002\u4E00\u6B21\u53EA\u80FD\u6709\u4E00\u500B Derby \u5BE6\u4F8B\u53EF\u4EE5\u555F\u52D5\u4E00\u500B\u8CC7\u6599\u5EAB\u3002\u5982\u679C\u540C\u6642\u5728\u76F8\u540C\u7684\u8CC7\u6599\u5EAB\u555F\u52D5\u5169\u500B Derby \u5BE6\u4F8B\uFF0C\u53EF\u80FD\u6703\u9020\u6210\u56B4\u91CD\u4E14\u7121\u6CD5\u56DE\u5FA9\u7684\u6BC0\u640D\u3002\u5DF2\u8A2D\u5B9A derby.database.forceDatabaseLock\=true \u5167\u5BB9\uFF0C\u56E0\u6B64\uFF0C\u8CC7\u6599\u5EAB\u4E0D\u6703\u555F\u52D5\uFF0C\u76F4\u5230\u4E0D\u518D\u6709 db.lck \u70BA\u6B62\u3002\u7576\u8CC7\u6599\u5EAB\u555F\u52D5\u7684\u7B2C\u4E00\u500B Derby \u5BE6\u4F8B\u7D50\u675F\u6642\uFF0C\u901A\u5E38\u6703\u79FB\u9664\u9019\u500B\u6A94\u6848\uFF0C\u4F46\u4E5F\u6709\u53EF\u80FD\u56E0\u70BA\u5176\u4ED6\u95DC\u6A5F\u65B9\u5F0F\u800C\u907A\u755
 9\u4E0B\u4F86\u3002\u5728\u9019\u500B\u60C5\u6CC1\u4E0B\uFF0C\u5FC5\u9808\u624B\u52D5\u79FB\u9664\u6A94\u6848\u3002\u8ACB\u52D9\u5FC5\u78BA\u8A8D\u6C92\u6709\u5176\u4ED6 VM \u5728\u5B58\u53D6\u8CC7\u6599\u5EAB\uFF0C\u518D\u624B\u52D5\u522A\u9664 db.lck\u3002
 XSDB9.D=\u4E32\u6D41\u5132\u5B58\u5668 {0} \u5DF2\u6BC0\u640D\u3002
 XSDBA.D=\u8A66\u5716\u914D\u7F6E {0} \u7269\u4EF6\u5931\u6557\u3002
 XSDBB.D=\u9801\u9762 {0} \u51FA\u73FE\u4E0D\u660E\u7684\u9801\u9762\u683C\u5F0F\uFF0C\u9801\u9762\u50BE\u5370\u5982\u4E0B\uFF1A{1} 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ErrorCodeTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ErrorCodeTest.java?rev=939730&r1=939729&r2=939730&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ErrorCodeTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ErrorCodeTest.java Fri Apr 30 16:17:23 2010
@@ -196,7 +196,7 @@ public final class ErrorCodeTest extends
         		{"XSDB5","Log has change record on page {0}, which is beyond the end of the container.","45000"},
         		{"XSDB6","Another instance of Derby may have already booted the database {0}.","45000"},
         		{"XSDB7","WARNING: Derby (instance {0}) is attempting to boot the database {1} even though Derby (instance {2}) may still be active.  Only one instance of Derby should boot a database at a time. Severe and non-recoverable corruption can result and may have already occurred.","45000"},
-        		{"XSDB8","WARNING: Derby (instance {0}) is attempting to boot the database {1} even though Derby (instance {2}) may still be active.  Only one instance of Derby should boot a database at a time. Severe and non-recoverable corruption can result if 2 instances of Derby boot on the same database at the same time.  The db2j.database.forceDatabaseLock=true property has been set, so the database will not boot until the db.lck is no longer present.  Normally this file is removed when the first instance of Derby to boot on the database exits, but it may be left behind in some shutdowns.  It will be necessary to remove the file by hand in that case.  It is important to verify that no other VM is accessing the database before deleting the db.lck file by hand.","45000"},
+        		{"XSDB8","WARNING: Derby (instance {0}) is attempting to boot the database {1} even though Derby (instance {2}) may still be active.  Only one instance of Derby should boot a database at a time. Severe and non-recoverable corruption can result if 2 instances of Derby boot on the same database at the same time.  The derby.database.forceDatabaseLock=true property has been set, so the database will not boot until the db.lck is no longer present.  Normally this file is removed when the first instance of Derby to boot on the database exits, but it may be left behind in some shutdowns.  It will be necessary to remove the file by hand in that case.  It is important to verify that no other VM is accessing the database before deleting the db.lck file by hand.","45000"},
         		{"XSDB9","Stream container {0} is corrupt.","45000"},
         		{"XSDBA","Attempt to allocate object {0} failed.","45000"},
         		{"XSDBB", "Unknown page format at page {0}, page dump follows: {1} ", "45000"},



Mime
View raw message