summaryrefslogtreecommitdiff
path: root/dbaccess/source
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2006-07-10 14:37:39 +0000
committerOliver Bolte <obo@openoffice.org>2006-07-10 14:37:39 +0000
commitd54932130ffce214ac01a399a92a4cc77cb1375a (patch)
tree8657bef9c523e4bdd628397f8f407151097c16e6 /dbaccess/source
parenta20ffa15bfc1248d3af9fa69a9abb0a0bcd774e3 (diff)
INTEGRATION: CWS qiq (1.71.42); FILE MERGED
2006/05/24 06:48:06 fs 1.71.42.5: moved two strings to another place (adbt lib) 2006/05/18 09:18:00 fs 1.71.42.4: #i51143# dbumiscres.src 2006/05/17 11:48:04 fs 1.71.42.3: #i51143# STR_NAMED_OBJECT_ALREADY_EXISTS (moved from elsewhere, and renamed) 2006/05/15 14:20:31 fs 1.71.42.2: #i51143 moved STR_WARNINGS_DURING_CONNECT moved from dbu_resource to dbu_misc 2006/05/11 10:39:47 fs 1.71.42.1: #i51143# removed STR_GENERAL_SDB_ERROR
Diffstat (limited to 'dbaccess/source')
-rw-r--r--dbaccess/source/ui/misc/dbumiscres.src29
1 files changed, 17 insertions, 12 deletions
diff --git a/dbaccess/source/ui/misc/dbumiscres.src b/dbaccess/source/ui/misc/dbumiscres.src
index 4e78bde43e1f..0773316ab81b 100644
--- a/dbaccess/source/ui/misc/dbumiscres.src
+++ b/dbaccess/source/ui/misc/dbumiscres.src
@@ -4,9 +4,9 @@
*
* $RCSfile: dbumiscres.src,v $
*
- * $Revision: 1.71 $
+ * $Revision: 1.72 $
*
- * last change: $Author: kz $ $Date: 2006-02-28 10:37:01 $
+ * last change: $Author: obo $ $Date: 2006-07-10 15:37:39 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -248,17 +248,10 @@ String 1
};
};
-//-------------------------------------------------------------------------
-String STR_GENERAL_SDB_ERROR
+String STR_ERROR_DURING_CREATION
{
-Text [ de ] = "Fehler bei der Verbindung mit der Datenquelle";
-Text [ en-US ] = "Error while connecting to the data source";
-};
-
-String STR_OBJECT_ALREADY_EXSISTS
-{
-Text [ de ] = "Fehler beim Erzeugen";
-Text [ en-US ] = "Error during creation";
+ Text [ de ] = "Fehler beim Erzeugen";
+ Text [ en-US ] = "Error during creation";
};
String STR_UNEXPECTED_ERROR
@@ -309,3 +302,15 @@ String STR_FILE_DOES_NOT_EXIST
Text [ de ] ="Die Datei \"$file$\" existiert nicht.";
Text[ en-US ] = "The file \"$file$\" does not exist.";
};
+
+String STR_WARNINGS_DURING_CONNECT
+{
+ Text [ de ] = "Beim Verbindungsaufbau sind Warnungen aufgetreten. Drücken Sie \"Mehr\", um sie anzuzeigen.";
+ Text [ en-US ] = "Warnings were encountered while connecting to the data source. Press \"More\" to view them.";
+};
+
+String STR_NAMED_OBJECT_ALREADY_EXISTS
+{
+ Text [ de ] = "Der Name '$#$' existiert bereits.\nBitte geben Sie einen neuen Namen an." ;
+ Text [ en-US ] = "The name '$#$' already exists.\nPlease enter another name." ;
+};