Thread: [Squirrel-sql-commits] sql12/app/src/net/sourceforge/squirrel_sql/client/mainframe/action I18NString
A Java SQL client for any JDBC compliant database
Brought to you by:
colbell,
gerdwagner
From: Gerd W. <ger...@us...> - 2005-12-27 21:02:06
|
Update of /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/mainframe/action In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7680/app/src/net/sourceforge/squirrel_sql/client/mainframe/action Modified Files: I18NStrings.properties Log Message: Merge mistake Index: I18NStrings.properties =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/mainframe/action/I18NStrings.properties,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** I18NStrings.properties 27 Dec 2005 19:48:38 -0000 1.5 --- I18NStrings.properties 27 Dec 2005 21:01:57 -0000 1.6 *************** *** 9,21 **** MainFrameToolBar.connectto= Connect to: ConnectToAliasCommand.error.cantopen=Unable to open SQL Connection ConnectToAliasCommand.error.driver={0}: JDBC Driver class not found ConnectToAliasCommand.error.opensession=Error opening session ConnectToAliasCommand.error.unexpected=Unexpected Error occured attempting to open an SQL connection. DeleteAliasCommand.confirm=Are you sure to want to delete the alias {0}? DeleteDriverCommand.comfirm=Are you sure to want to delete the driver {0}? ! DeleteDriverCommand.used=The driver {0} is used by one or more aliases and cannot be deleted. DumpApplicationAction.failure=Error occured dumping application --- 9,36 ---- MainFrameToolBar.connectto= Connect to: + ConnectToAliasAction.error.selectingwindow=Error selecting window + ConnectToAliasCommand.error.cantopen=Unable to open SQL Connection ConnectToAliasCommand.error.driver={0}: JDBC Driver class not found ConnectToAliasCommand.error.opensession=Error opening session ConnectToAliasCommand.error.unexpected=Unexpected Error occured attempting to open an SQL connection. + ConnectToAliasCommand.error.closeconnection=Error occured closing Connection + + CopyAliasAction.error.selectingwindow=Error selecting window + + CopyDriverAction.error.selectingwindow=Error selecting window + + CreateAliasAction.error.selectingwindow=Error selecting window + + CreateDriverAction.error.selectingwindow=Error selecting window + + DeleteAliasAction.error.selectingwindow=Error selecting window DeleteAliasCommand.confirm=Are you sure to want to delete the alias {0}? + DeleteDriverAction.error.selectingwindow=Error selecting window + DeleteDriverCommand.comfirm=Are you sure to want to delete the driver {0}? ! DeleteDriverCommand.used=The driver {0} is used by the following alias(es) and cannot be deleted: {1} DumpApplicationAction.failure=Error occured dumping application *************** *** 24,29 **** --- 39,63 ---- DumpApplicationAction.warning=<HTML><BODY><B>Warning:</B> Plain<BR>text passwords<BR> may be saved<BR>in this file.</BODY></HTML> + DumpApplicationCommand.header=SQuirreL SQL Client Application Dump {0} + DumpApplicationCommand.error.combiningtempfiles=Error combining temp files into dump file + DumpApplicationCommand.error.deletetempfile=Couldn't delete temporary DumpSession file + DumpApplicationCommand.error.dumpingaliases=Error dumping aliases + DumpApplicationCommand.error.dumpingdrivers=Error dumping drivers + DumpApplicationCommand.error.dumpingstatus=Error dumping Application Status bean + DumpApplicationCommand.error.dumpingsystemprops=Error dumping metadata + DumpApplicationCommand.error.sessiondump=Error dumping sessions + DumpApplicationCommand.title.aliases=Aliases + DumpApplicationCommand.title.drivers=Drivers + DumpApplicationCommand.title.sessiondump=Session Dump: {0} + DumpApplicationCommand.title.status=Application Status Bean + DumpApplicationCommand.title.systemprops=System Properties + InstallDefaultDriversAction.confirm=Are you sure to want to copy all the default driver definitions into the drivers list? InstallDefaultDriversAction.error.install=Error occured installing default drivers + InstallDefaultDriversAction.error.selectingwindow=Error selecting window + + ModifyAliasAction.error.selectingwindow=Error selecting window + + ModifyDriverAction.error.selectingwindow=Error selecting window ShowLoadedDriversOnlyAction.error=Error |