diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-03-07 10:01:50 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-03-07 10:01:50 +0000 |
| commit | aeaf201f7f516c85aac94035b69ab5e71fc09289 (patch) | |
| tree | e80a14cfb8ec2cd86df875a5cb7ae0c42a9d6da7 /desktop/inc | |
| parent | 4ff1a53524e6057c4da8aa2044ba2c01474fde2f (diff) | |
INTEGRATION: CWS jl91_DEV300 (1.4.82); FILE MERGED
2008/02/27 12:58:39 jl 1.4.82.1: #i79333# removing a warning and added string for the case when there is already an unopkg running
Diffstat (limited to 'desktop/inc')
| -rw-r--r-- | desktop/inc/deployment.hrc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/desktop/inc/deployment.hrc b/desktop/inc/deployment.hrc index a18325491908..64d7f3221ae4 100644 --- a/desktop/inc/deployment.hrc +++ b/desktop/inc/deployment.hrc @@ -4,9 +4,9 @@ * * $RCSfile: deployment.hrc,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: ihi $ $Date: 2007-11-19 13:07:41 $ + * last change: $Author: kz $ $Date: 2008-03-07 11:01:50 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -80,6 +80,7 @@ #define RID_STR_UNOPKG_ACCEPT_LIC_Y (RID_DEPLOYMENT_UNOPKG_START+6) #define RID_STR_UNOPKG_ACCEPT_LIC_NO (RID_DEPLOYMENT_UNOPKG_START+7) #define RID_STR_UNOPKG_ACCEPT_LIC_N (RID_DEPLOYMENT_UNOPKG_START+8) +#define RID_STR_CONCURRENTINSTANCE (RID_DEPLOYMENT_UNOPKG_START+9) #define RID_DEPLOYMENT_DEPENDENCIES_START (RID_DEPLOYMENT_START + 4400) #define RID_DEPLYOMENT_DEPENDENCIES_UNKNOWN RID_DEPLOYMENT_DEPENDENCIES_START |