User: hr Date: 2007-11-01 15:23:39+0000 Modified: dba/dbaccess/source/ui/misc/dbumiscres.src
Log: INTEGRATION: CWS dba24b (1.75.26); FILE MERGED 2007/09/28 11:59:21 oj 1.75.26.2: RESYNC: (1.75-1.76); FILE MERGED 2007/08/29 11:59:51 fs 1.75.26.1: during #i80930#: DST_EMBEDDED -> DST_EMBEDDED_HSQLDB. The approach to read the concrete type of the embedded DB from the configuration does not work, there are enough places where we silently assume 'embedded == embedded HSQLDB' File Changes: Directory: /dba/dbaccess/source/ui/misc/ ======================================== File [changed]: dbumiscres.src Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/dbumiscres.src?r1=1.76&r2=1.77 Delta lines: +9 -9 ------------------- --- dbumiscres.src 2007-09-13 17:59:31+0000 1.76 +++ dbumiscres.src 2007-11-01 15:23:37+0000 1.77 @@ -91,10 +91,6 @@ { Text ="sdbc:address:mozilla:"; }; - String STR_THUNDERBIRD - { - Text ="sdbc:address:thunderbird:"; - }; String STR_LDAP { Text ="sdbc:address:ldap:"; @@ -123,15 +119,18 @@ { Text ="sdbc:address:kab"; }; + String STR_EMBEDDED_HSQLDB + { + Text = "sdbc:embedded:hsqldb"; + }; String STR_MACAB { Text ="sdbc:address:macab"; }; - String STR_EMBEDDED + String STR_THUNDERBIRD { - Text = "sdbc:embedded:"; + Text ="sdbc:address:thunderbird:"; }; - }; Resource RSC_DATASOURCE_TYPE_UINAMES { @@ -216,9 +215,9 @@ { Text[ en-US ] = "Mac OS X Address Book"; }; - String STR_EMBEDDED + String STR_EMBEDDED_HSQLDB { - Text[ en-US ] = "Embedded database"; + Text[ en-US ] = "HSQL database engine"; }; String STR_THUNDERBIRD { @@ -289,3 +288,4 @@ { Text [ en-US ] = "The name '$#$' already exists.\nPlease enter another name." ; }; + --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
