You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by my...@apache.org on 2013/04/17 00:32:29 UTC
svn commit: r1468647 - in /db/derby/code/trunk/java:
engine/org/apache/derby/loc/
testing/org/apache/derbyTesting/functionTests/tests/lang/
Author: myrnavl
Date: Tue Apr 16 22:32:28 2013
New Revision: 1468647
URL: http://svn.apache.org/r1468647
Log:
DERBY-6157; text for message XSLA4 might encouraging people to delete part of the transaction log.
replacing the message in English with a more elaborate one.
adding translations to de_DE, fr, es and it, removing from all other translated files so
the English message will pop up.
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=1468647&r1=1468646&r2=1468647&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 Tue Apr 16 22:32:28 2013
@@ -5968,7 +5968,7 @@ ln=lower-case two-letter ISO-639 languag
<msg>
<name>XSLA4.D</name>
- <text>Cannot write to the log, most likely the log is full. Please delete unnecessary files. It is also possible that the file system is read only, or the disk has failed, or some other problems with the media. </text>
+ <text>Error encountered when attempting to write the transaction recovery log. Most likely the disk holding the recovery log is full. If the disk is full, the only way to proceed is to free up space on the disk by either expanding it or deleting files not related to Derby. It is also possible that the file system and/or disk where the Derby transaction log resides is read-only. The error can also be encountered if the disk or file system has failed.</text>
</msg>
<msg>
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=1468647&r1=1468646&r2=1468647&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 Tue Apr 16 22:32:28 2013
@@ -252,7 +252,6 @@ XSLA8.D=Nelze rolovat zp\u011bt transakc
XSLA7.D=Nelze opakovat operaci {0} v protokolu.
XSLA6.D=Nelze zotavit datab\u00e1zi.
XSLA5.D=Z n\u011bkter\u00e9ho d\u016fvodu nelze \u010d\u00edst tok dat protokolu pro rolov\u00e1n\u00ed transakce {0} zp\u011bt.
-XSLA4.D=Nelze zapisovat do protokolu. Protokol je nejsp\u00ed\u0161e zapln\u011bn\u00fd. Vyma\u017ete nepot\u0159ebn\u00e9 soubory. Tak\u00e9 je mo\u017en\u00e9, \u017ee syst\u00e9m soubor\u016f slou\u017e\u00ed pouze pro \u010dten\u00ed, \u017ee do\u0161lo k selh\u00e1n\u00ed disku nebo k n\u011bjak\u00fdm jin\u00fdm probl\u00e9m\u016fm s m\u00e9diem.
XSLA3.D=Protokol je poru\u0161en, m\u00e1 neplatn\u00e1 data v toku dat protokolu.
XSLA2.D=Syst\u00e9m se vypne, obdr\u017eel v\u00fdjimku I/O p\u0159i p\u0159\u00edstupu k souboru protokolu.
XSLA1.D=Z\u00e1znam protokolu byl odesl\u00e1n do toku dat, ale nelze jej pou\u017e\u00edt na pam\u011b\u0165 (objekt {0}). To rovn\u011b\u017e m\u016f\u017ee zp\u016fsobit probl\u00e9my se zotaven\u00edm.
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=1468647&r1=1468646&r2=1468647&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 Tue Apr 16 22:32:28 2013
@@ -4583,7 +4583,7 @@ XSLA2.D=System wird heruntergefahren. Be
XSLA3.D=Log ist besch\u00E4digt. Der Logdaten-Stream enth\u00E4lt ung\u00FCltige Daten.
-XSLA4.D=Es kann nicht in das Log geschrieben werden. Wahrscheinlich ist das Log voll. L\u00F6schen Sie nicht ben\u00F6tigte Dateien. Es kann auch sein, dass das Dateisystem schreibgesch\u00FCtzt ist oder ein Datentr\u00E4gerfehler vorliegt.
+XSLA4.D=Fehler beim Versuch zu schreiben in das Transaktionwiederherstellungslog. Wahrscheinlich ist der Datentr\u00E4ger die das Wiederherstellungslog h\u00E4lt voll. Wenn der Datentr\u00E4ger voll ist, soll man Speicherplatz auf dem Datentr\u00E4ger freigeben entweder durch dazuf\u00FCgen von Speicherplatz, oder durch erweiteren von Dateien, die nicht mit Derby zusammenhangen. Es ist auch m\u00F6glich, dass das Dateisystem und/oder den Datentr\u00E4ger worauf den Transaktionwiederherstellungslog sich aufh\u00E4lt, schreibgesch\u00FCtzt ist. Der Fehler kann auch auftreten, wenn der Datentr\u00E4ger oder das Dateisystem fehlgeschlagen ist.
# Arguments:
#
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=1468647&r1=1468646&r2=1468647&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 Tue Apr 16 22:32:28 2013
@@ -4583,7 +4583,7 @@ XSLA2.D=El sistema se cerrar\u00E1, se h
XSLA3.D=Log corrupto. Incluye datos no v\u00E1lidos en el flujo de log.
-XSLA4.D=No se puede escribir en el log, probablemente el log est\u00E9 lleno. Suprima archivos innecesarios. Tambi\u00E9n es posible que el sistema de archivos sea de s\u00F3lo lectura, que el disco haya fallado o que exista alg\u00FAn otro problema con los medios.
+XSLA4.D=Error al intentar escribir el log de recuperaci\u00F3n de transacciones. Probablemente el disco con el log de recuperaci\u00F3n est\u00E1 lleno. Si el disco est\u00E1 lleno, la \u00FAnica forma de avanzar es liberar espacio en el disco por expandirlo o suprimar archivos no relacionados con Derby. Tambi\u00E9n es posible que el sistema de archivos o el disco donde reside el log de transacciones de Derby sea de s\u00F3lo lectura. El error tambi\u00E9n puede encontrarse si haya fallado el disco o el sistema de archivos.
# Arguments:
#
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=1468647&r1=1468646&r2=1468647&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 Tue Apr 16 22:32:28 2013
@@ -4583,7 +4583,7 @@ XSLA2.D=Le syst\u00E8me va \u00EAtre arr
XSLA3.D=Fichier journal endommag\u00E9 ; des donn\u00E9es non valides se trouvent dans le flux de journalisation.
-XSLA4.D=Impossible d''\u00E9crire dans le journal, ce dernier est probablement satur\u00E9. Supprimez les fichiers inutiles. Il est \u00E9galement possible que le syst\u00E8me de fichiers soit en lecture seule, que le disque soit tomb\u00E9 en panne ou qu''un autre incident soit survenu avec le support.
+XSLA4.D=Erreur lorsque tentement d''\u00E9crire le journal de r\u00E9cup\u00E9ration de transaction. Tr\u00E8s probablement le disque contenant le journal de r\u00E9cup\u00E9ration est satur\u00E9. Si le disque est satur\u00E9, la seule possibilit\u00E9 de proc\u00E9der est lib\u00E9rer de l''espace sur le disque par son expansion ou par suppression de fichiers non li\u00E9s \u00E0 Derby. Il est \u00E9galement possible que le syst\u00E8me de fichiers et/ou le disque o\u00F9 r\u00E9side le journal de transaction de Derby soit en lecture seule. L''erreur peut \u00E9galement \u00EAtre produite si le disque ou le syst\u00E8me de fichiers soit tomb\u00E9 en panne.
# Arguments:
#
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=1468647&r1=1468646&r2=1468647&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 Tue Apr 16 22:32:28 2013
@@ -252,7 +252,6 @@ XSLA8.D=A(z) {0} tranzakci\u00f3 nem g\u
XSLA7.D=A napl\u00f3ban nem hajthat\u00f3 v\u00e9gre \u00fajra a(z) {0} m\u0171velet.
XSLA6.D=Az adatb\u00e1zis nem \u00e1ll\u00edthat\u00f3 helyre.
XSLA5.D=A napl\u00f3 adatfolyam valamilyen ok miatt nem olvashat\u00f3 a(z) {0} tranzakci\u00f3 visszag\u00f6rget\u00e9s\u00e9hez.
-XSLA4.D=Nem lehet \u00edrni a napl\u00f3ba, ennek legval\u00f3sz\u00edn\u0171bb oka, hogy a napl\u00f3 megtelt. T\u00f6r\u00f6lje a sz\u00fcks\u00e9gtelen f\u00e1jlokat. Ezen k\u00edv\u00fcl lehets\u00e9ges, hogy a f\u00e1jlrendszer \u00edr\u00e1sv\u00e9dett, a lemez meghib\u00e1sodott vagy m\u00e1s probl\u00e9ma van az adathordoz\u00f3val.
XSLA3.D=A napl\u00f3 s\u00e9r\u00fclt, a napl\u00f3 adatfolyam \u00e9rv\u00e9nytelen adatokat tartalmaz.
XSLA2.D=A rendszer le\u00e1ll, I/O kiv\u00e9tel t\u00f6rt\u00e9nt a napl\u00f3f\u00e1jl el\u00e9r\u00e9se sor\u00e1n.
XSLA1.D=Napl\u00f3bejegyz\u00e9s ker\u00fclt k\u00fcld\u00e9sre az adatfolyamba, de az nem alkalmazhat\u00f3 a t\u00e1rol\u00f3ra (Objektum: {0}). Ez helyre\u00e1ll\u00edt\u00e1si probl\u00e9m\u00e1kat is okozhat.
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=1468647&r1=1468646&r2=1468647&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 Tue Apr 16 22:32:28 2013
@@ -4583,7 +4583,7 @@ XSLA2.D=Il sistema verr\u00E0 arrestato,
XSLA3.D=Log danneggiato, dati non validi presenti nel flusso di log.
-XSLA4.D=Impossibile scrivere sul log, probabilmente il log \u00E8 pieno. Eliminare i file inutili. Inoltre, \u00E8 possibile che il file system sia di sola lettura, che il disco presenti degli errori o che si siano verificati dei problemi con i supporti.
+XSLA4.D=Errore quando si tenta di scrivere il log di recupero delle transazioni. Molto probabilmente il disco tenendo il log di recupero \u00E8 pieno. Se il disco \u00E8 pieno, l''unico modo di procedere \u00E8 quello di liberare spazio sul disco di espansione o l''eliminazione di file non correlati a Derby. Inoltre, \u008E possibile che il file system o disco dove la log transazione Derby risiede sia di sola lettura. L''errore pu\u00F2 essere incontrato anche se il disco o file di sistema presenti degli errori.
# Arguments:
#
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=1468647&r1=1468646&r2=1468647&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 Tue Apr 16 22:32:28 2013
@@ -4583,7 +4583,6 @@ XSLA2.D=\u30B7\u30B9\u30C6\u30E0\u306F\u
XSLA3.D=\u30ED\u30B0\u304C\u7834\u640D\u3057\u3066\u304A\u308A\u3001\u30ED\u30B0\u30FB\u30B9\u30C8\u30EA\u30FC\u30E0\u306B\u7121\u52B9\u306A\u30C7\u30FC\u30BF\u304C\u3042\u308A\u307E\u3059\u3002
-XSLA4.D=\u30ED\u30B0\u306B\u66F8\u304D\u8FBC\u3081\u307E\u305B\u3093\u3002\u30ED\u30B0\u304C\u6E80\u676F\u306E\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002\u4E0D\u5FC5\u8981\u306A\u30D5\u30A1\u30A4\u30EB\u3092\u524A\u9664\u3057\u3066\u304F\u3060\u3055\u3044\u3002\u30D5\u30A1\u30A4\u30EB\u30FB\u30B7\u30B9\u30C6\u30E0\u304C\u8AAD\u53D6\u308A\u5C02\u7528\u3067\u3042\u308B\u3001\u30C7\u30A3\u30B9\u30AF\u306B\u969C\u5BB3\u304C\u3042\u308B\u3001\u307E\u305F\u306F\u30E1\u30C7\u30A3\u30A2\u306B\u306A\u3093\u3089\u304B\u306E\u554F\u984C\u304C\u3042\u308B\u53EF\u80FD\u6027\u3082\u3042\u308A\u307E\u3059\u3002
# Arguments:
#
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=1468647&r1=1468646&r2=1468647&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 Tue Apr 16 22:32:28 2013
@@ -4583,7 +4583,6 @@ XSLA2.D=\uC2DC\uC2A4\uD15C\uC774 \uC885\
XSLA3.D=\uB85C\uADF8\uAC00 \uC190\uC0C1\uB418\uC5C8\uC2B5\uB2C8\uB2E4. \uB85C\uADF8 \uC2A4\uD2B8\uB9BC\uC5D0 \uBD80\uC801\uD569\uD55C \uB370\uC774\uD130\uAC00 \uC788\uC2B5\uB2C8\uB2E4.
-XSLA4.D=\uB85C\uADF8\uC5D0 \uAE30\uB85D\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. \uB85C\uADF8\uAC00 \uAC00\uB4DD \uCC3C\uC744 \uAC00\uB2A5\uC131\uC774 \uB192\uC2B5\uB2C8\uB2E4. \uD544\uC694\uD558\uC9C0 \uC54A\uC740 \uD30C\uC77C\uC744 \uC0AD\uC81C\uD558\uC2ED\uC2DC\uC624. \uB610\uD55C \uD30C\uC77C \uC2DC\uC2A4\uD15C\uC774 \uC77D\uAE30 \uC804\uC6A9\uC774\uAC70\uB098 \uB514\uC2A4\uD06C\uAC00 \uC2E4\uD328\uD588\uAC70\uB098 \uB9E4\uCCB4\uC5D0 \uB2E4\uB978 \uBB38\uC81C\uAC00 \uC788\uC744 \uAC00\uB2A5\uC131\uB3C4 \uC788\uC2B5\uB2C8\uB2E4.
# Arguments:
#
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=1468647&r1=1468646&r2=1468647&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 Tue Apr 16 22:32:28 2013
@@ -252,7 +252,6 @@ XSLA8.D=Nie mo\u017cna wycofa\u0107 tran
XSLA7.D=Nie mo\u017cna przywr\u00f3ci\u0107 operacji {0} w dzienniku.
XSLA6.D=Nie mo\u017cna odzyska\u0107 bazy danych.
XSLA5.D=Nie mo\u017cna odczyta\u0107 strumienia dziennika, aby wycofa\u0107 transakcj\u0119 {0}.
-XSLA4.D=Nie mo\u017cna zapisa\u0107 w dzienniku, kt\u00f3ry najprawdopodobniej jest pe\u0142ny. Usu\u0144 niepotrzebne pliki. Mo\u017cliwe tak\u017ce, \u017ce system plik\u00f3w jest tylko do odczytu albo wyst\u0105pi\u0142o uszkodzenie dysku lub inne problemy z no\u015bnikiem.
XSLA3.D=Dziennik jest uszkodzony. Niepoprawne dane w strumieniu dziennika.
XSLA2.D=System zostanie zamkni\u0119ty. Wyst\u0105pi\u0142 wyj\u0105tek we/wy podczas dost\u0119pu do pliku dziennika.
XSLA1.D=Zapis dziennika zosta\u0142 wys\u0142any do strumienia, ale nie mo\u017ce by\u0107 zastosowany dla bazy (obiekt {0}). Mo\u017ce to powodowa\u0107 tak\u017ce problemy z odtwarzaniem.
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=1468647&r1=1468646&r2=1468647&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 Tue Apr 16 22:32:28 2013
@@ -253,7 +253,6 @@ XSLA8.D=N\u00e3o foi poss\u00edvel desfa
XSLA7.D=N\u00e3o foi poss\u00edvel refazer a opera\u00e7\u00e3o {0} no log.
XSLA6.D=N\u00e3o foi poss\u00edvel recuperar o banco de dados.
XSLA5.D=Por algum motivo n\u00e3o foi poss\u00edvel ler o log para desfazer a transa\u00e7\u00e3o {0}.
-XSLA4.D=N\u00e3o foi poss\u00edvel escrever no log, provavelmente este est\u00e1 cheio. Exclua os arquivos desnecess\u00e1rios. Tamb\u00e9m \u00e9 poss\u00edvel que o sistema de arquivos seja apenas-de-leitura ou que haja falhas no disco ou algum outro problema com a m\u00eddia.
XSLA3.D=Log corrompido, h\u00e1 dados inv\u00e1lidos no fluxo de log.
XSLA2.D=O sistema ser\u00e1 encerrado, ocorreu uma exce\u00e7\u00e3o de E/S ao acessar o arquivo de log.
XSLA1.D=O Registro de Log foi enviado para o fluxo, mas o mesmo n\u00e3o pode ser aplicado no armazenamento (Objeto {0}). Isto tamb\u00e9m pode causar problemas de recupera\u00e7\u00e3o.
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=1468647&r1=1468646&r2=1468647&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 Tue Apr 16 22:32:28 2013
@@ -252,7 +252,6 @@ XSLA8.D=\u041d\u0435\u0432\u043e\u0437\u
XSLA7.D=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u043f\u043e\u0432\u0442\u043e\u0440\u0438\u0442\u044c \u043e\u043f\u0435\u0440\u0430\u0446\u0438\u044e {0} \u0432 \u0436\u0443\u0440\u043d\u0430\u043b\u0435.
XSLA6.D=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0432\u043e\u0441\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c \u0431\u0430\u0437\u0443 \u0434\u0430\u043d\u043d\u044b\u0445.
XSLA5.D=\u041f\u043e \u043a\u0430\u043a\u043e\u0439-\u0442\u043e \u043f\u0440\u0438\u0447\u0438\u043d\u0435 \u043d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u043f\u0440\u043e\u0447\u0438\u0442\u0430\u0442\u044c \u043f\u043e\u0442\u043e\u043a \u0436\u0443\u0440\u043d\u0430\u043b\u0430, \u0447\u0442\u043e\u0431\u044b \u043f\u0440\u043e\u0438\u0437\u0432\u0435\u0441\u0442\u0438 \u043e\u0442\u043a\u0430\u0442 \u0442\u0440\u0430\u043d\u0437\u0430\u043a\u0446\u0438\u0438 {0}.
-XSLA4.D=\u041d\u0435 \u0443\u0434\u0430\u0435\u0442\u0441\u044f \u043f\u0440\u043e\u0438\u0437\u0432\u0435\u0441\u0442\u0438 \u0437\u0430\u043f\u0438\u0441\u044c \u0432 \u0436\u0443\u0440\u043d\u0430\u043b; \u0432\u0435\u0440\u043e\u044f\u0442\u043d\u0435\u0435 \u0432\u0441\u0435\u0433\u043e, \u0436\u0443\u0440\u043d\u0430\u043b \u043f\u0435\u0440\u0435\u043f\u043e\u043b\u043d\u0435\u043d. \u0423\u0434\u0430\u043b\u0438\u0442\u0435 \u043d\u0435\u043d\u0443\u0436\u043d\u044b\u0435 \u0444\u0430\u0439\u043b\u044b. \u0422\u0430\u043a\u0436\u0435 \u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e, \u0447\u0442\u043e \u0444\u0430\u0439\u043b\u043e\u0432\u0430\u044f \u0441\u0438\u0441\u0442\u0435\u043c\u0430 \u043f\u0440\u0435\u0434\u043d\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u0430 \u0442\u043e\u043b\u044c\u043a\u043e \u0434\u043b\u044f \u0447\u0442\u0435\u043d\u0438\u044f, \u043b\u0438\u0431\u043e \u043f\u0440\u043e\u0438\u0437\u043e\u0448\u043b\u0430 \u043e\u0448\u0438\u0431\
u043a\u0430 \u043d\u0430 \u0434\u0438\u0441\u043a\u0435, \u043b\u0438\u0431\u043e \u0432\u043e\u0437\u043d\u0438\u043a\u043b\u0438 \u043a\u0430\u043a\u0438\u0435-\u043b\u0438\u0431\u043e \u0434\u0440\u0443\u0433\u0438\u0435 \u043e\u0448\u0438\u0431\u043a\u0438 \u043d\u0430 \u043d\u043e\u0441\u0438\u0442\u0435\u043b\u0435.
XSLA3.D=\u0416\u0443\u0440\u043d\u0430\u043b \u043f\u043e\u0432\u0440\u0435\u0436\u0434\u0435\u043d; \u0432 \u043f\u043e\u0442\u043e\u043a\u0435 \u0436\u0443\u0440\u043d\u0430\u043b\u0430 \u043d\u0435\u0432\u0435\u0440\u043d\u044b\u0435 \u0434\u0430\u043d\u043d\u044b\u0435.
XSLA2.D=\u0421\u0438\u0441\u0442\u0435\u043c\u0430 \u0437\u0430\u0432\u0435\u0440\u0448\u0430\u0435\u0442 \u0440\u0430\u0431\u043e\u0442\u0443; \u043f\u043e\u043b\u0443\u0447\u0435\u043d\u043e \u0438\u0441\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435 \u0432\u0432\u043e\u0434\u0430-\u0432\u044b\u0432\u043e\u0434\u0430 \u043f\u0440\u0438 \u0434\u043e\u0441\u0442\u0443\u043f\u0435 \u043a \u0444\u0430\u0439\u043b\u0443 \u0436\u0443\u0440\u043d\u0430\u043b\u0430.
XSLA1.D=\u0417\u0430\u043f\u0438\u0441\u044c \u0436\u0443\u0440\u043d\u0430\u043b\u0430 \u043e\u0442\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0430 \u0432 \u043f\u043e\u0442\u043e\u043a, \u043d\u043e \u0435\u0435 \u043d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u043f\u0440\u0438\u043c\u0435\u043d\u0438\u0442\u044c \u043a \u0441\u043a\u043b\u0430\u0434\u0443 (\u043e\u0431\u044a\u0435\u043a\u0442 {0}). \u042d\u0442\u043e \u0442\u0430\u043a\u0436\u0435 \u043c\u043e\u0436\u0435\u0442 \u0432\u044b\u0437\u0432\u0430\u0442\u044c \u043e\u0448\u0438\u0431\u043a\u0438 \u043f\u0440\u0438 \u0432\u043e\u0441\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u0438.
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=1468647&r1=1468646&r2=1468647&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 Tue Apr 16 22:32:28 2013
@@ -4583,7 +4583,6 @@ XSLA2.D=\u7CFB\u7EDF\u5C06\u5173\u95ED\u
XSLA3.D=\u65E5\u5FD7\u5DF2\u635F\u574F\uFF0C\u65E5\u5FD7\u6D41\u4E2D\u5177\u6709\u65E0\u6548\u6570\u636E\u3002
-XSLA4.D=\u65E0\u6CD5\u5199\u5165\u65E5\u5FD7\uFF0C\u5F88\u53EF\u80FD\u65E5\u5FD7\u5DF2\u6EE1\u3002\u8BF7\u5220\u9664\u4E0D\u9700\u8981\u7684\u6587\u4EF6\u3002\u4E5F\u53EF\u80FD\u662F\u6587\u4EF6\u7CFB\u7EDF\u4E3A\u53EA\u8BFB\uFF0C\u6216\u8005\u78C1\u76D8\u53D1\u751F\u6545\u969C\uFF0C\u6216\u8005\u4ECB\u8D28\u51FA\u73B0\u4E86\u4E00\u4E9B\u5176\u4ED6\u95EE\u9898\u3002
# Arguments:
#
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=1468647&r1=1468646&r2=1468647&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 Tue Apr 16 22:32:28 2013
@@ -4583,7 +4583,6 @@ XSLA2.D=\u7CFB\u7D71\u5C07\u95DC\u9589\u
XSLA3.D=\u65E5\u8A8C\u5DF2\u6BC0\u640D\uFF0C\u65E5\u8A8C\u4E32\u6D41\u4E2D\u6709\u7121\u6548\u7684\u8CC7\u6599\u3002
-XSLA4.D=\u7121\u6CD5\u5BEB\u5165\u65E5\u8A8C\uFF0C\u6700\u53EF\u80FD\u7684\u539F\u56E0\u662F\u65E5\u8A8C\u5DF2\u6EFF\u3002\u8ACB\u522A\u9664\u4E0D\u5FC5\u8981\u7684\u6A94\u6848\u3002\u53E6\u5916\uFF0C\u4E5F\u53EF\u80FD\u662F\u6A94\u6848\u7CFB\u7D71\u662F\u552F\u8B80\u7684\uFF0C\u6216\u78C1\u789F\u5931\u6548\uFF0C\u6216\u5A92\u9AD4\u767C\u751F\u5176\u4ED6\u554F\u984C\u3002
# Arguments:
#
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=1468647&r1=1468646&r2=1468647&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 Tue Apr 16 22:32:28 2013
@@ -228,7 +228,7 @@ public final class ErrorCodeTest extends
{"XSLA1","Log Record has been sent to the stream, but it cannot be applied to the store (Object {0}). This may cause recovery problems also.","45000"},
{"XSLA2","System will shutdown, got I/O Exception while accessing log file.","45000"},
{"XSLA3","Log Corrupted, has invalid data in the log stream.","45000"},
- {"XSLA4","Cannot write to the log, most likely the log is full. Please delete unnecessary files. It is also possible that the file system is read only, or the disk has failed, or some other problems with the media. ","45000"},
+ {"XSLA4","Error encountered when attempting to write the transaction recovery log. Most likely the disk holding the recovery log is full. If the disk is full, the only way to proceed is to free up space on the disk by either expanding it or deleting files not related to Derby. It is also possible that the file system and/or disk where the Derby transaction log resides is read-only. The error can also be encountered if the disk or file system has failed.","45000"},
{"XSLA5","Cannot read log stream for some reason to rollback transaction {0}.","45000"},
{"XSLA6","Cannot recover the database.","45000"},
{"XSLA7","Cannot redo operation {0} in the log.","45000"},