diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-07-10 14:31:40 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-07-10 14:31:40 +0000 |
| commit | 38cadfa762d5cc289a9cc815c1c4fb3421de1226 (patch) | |
| tree | d6fd302dcb066aefff06c5dc6bed552c0d2096ad /dbaccess/source | |
| parent | c71f979b6d5c9c4225b1d14075a1b2e0fd9d2c49 (diff) | |
INTEGRATION: CWS qiq (1.93.12); FILE MERGED
2006/05/17 11:46:20 fs 1.93.12.4: #i51143#
2006/05/15 14:20:02 fs 1.93.12.3: #i51143 moved STR_WARNINGS_DURING_CONNECT moved from dbu_resource to dbu_misc
2006/05/11 11:27:41 fs 1.93.12.2: #i51143# +STR_WARNINGS_DURING_CONNECT
2006/05/11 10:38:45 fs 1.93.12.1: #i51143# removed STR_GENERAL_SDB_ERROR
Diffstat (limited to 'dbaccess/source')
| -rw-r--r-- | dbaccess/source/ui/inc/dbu_resource.hrc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc index 21ba7c5d2e75..a20da47226f2 100644 --- a/dbaccess/source/ui/inc/dbu_resource.hrc +++ b/dbaccess/source/ui/inc/dbu_resource.hrc @@ -4,9 +4,9 @@ * * $RCSfile: dbu_resource.hrc,v $ * - * $Revision: 1.93 $ + * $Revision: 1.94 $ * - * last change: $Author: hr $ $Date: 2006-04-19 13:21:49 $ + * last change: $Author: obo $ $Date: 2006-07-10 15:31:40 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -345,9 +345,9 @@ //======================================================================== // strings #define STR_TBL_TITLE RID_STR_GEN_START -#define STR_OBJECT_ALREADY_EXSISTS RID_STR_GEN_START + 1 +#define STR_ERROR_DURING_CREATION RID_STR_GEN_START + 1 #define RID_STR_CONNECTION_LOST RID_STR_GEN_START + 2 -#define STR_OBJECT_ALREADY_EXISTS RID_STR_GEN_START + 3 +#define STR_NAME_ALREADY_EXISTS RID_STR_GEN_START + 3 // free #define STR_TITLE_CONFIRM_DELETION RID_STR_GEN_START + 5 #define STR_STAT_WARNING RID_STR_GEN_START + 6 @@ -369,7 +369,7 @@ // FREE #define STR_QRY_TITLE RID_STR_GEN_START + 23 #define STR_VIEW_TITLE RID_STR_GEN_START + 24 -#define STR_GENERAL_SDB_ERROR RID_STR_GEN_START + 25 + // FREE #define STR_TABLEDESIGN_DUPLICATE_NAME RID_STR_GEN_START + 26 #define STR_COULDNOTCONNECT_DATASOURCE RID_STR_GEN_START + 27 #define STR_NO_TABLE_FORMAT_INSIDE RID_STR_GEN_START + 28 |