diff options
author | Rüdiger Timm <rt@openoffice.org> | 2007-07-06 11:33:40 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2007-07-06 11:33:40 +0000 |
commit | c04dcf7754c2f3e507b8b1dad44574237feb51c3 (patch) | |
tree | e9f19001c37bb9c7a3bc2cd311a9145ce7b38a06 /desktop | |
parent | a49930f4a78592adcdaa9758098e3612b18ff5b7 (diff) |
INTEGRATION: CWS c09tosrc (1.7.132); FILE MERGED
2007/06/29 08:58:58 jl 1.7.132.2: #i79001 Error string for update shared extension on Vista
2007/06/22 15:16:38 jl 1.7.132.1: #i78688# allow to manage shared extension within office
Diffstat (limited to 'desktop')
-rw-r--r-- | desktop/source/deployment/gui/dp_gui.hrc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/desktop/source/deployment/gui/dp_gui.hrc b/desktop/source/deployment/gui/dp_gui.hrc index 5b001e64bb86..5f757dc8f238 100644 --- a/desktop/source/deployment/gui/dp_gui.hrc +++ b/desktop/source/deployment/gui/dp_gui.hrc @@ -4,9 +4,9 @@ * * $RCSfile: dp_gui.hrc,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: kz $ $Date: 2007-06-20 14:15:36 $ + * last change: $Author: rt $ $Date: 2007-07-06 12:33:40 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -134,10 +134,11 @@ #define RID_DLG_UPDATE_NOINSTALL 20 #define RID_DLG_UPDATE_NODEPENDENCY 21 #define RID_DLG_UPDATE_NOPERMISSION 22 -#define RID_DLG_UPDATE_NOUPDATE 23 +#define RID_DLG_UPDATE_NOPERMISSION_VISTA 23 +#define RID_DLG_UPDATE_NOUPDATE 24 #define RID_DLG_UPDATEINSTALL (RID_DEPLOYMENT_GUI_START + 20) - +#define RID_INFOBOX_UPDATE_SHARED_EXTENSION (RID_DEPLOYMENT_GUI_START + 21) #define RID_IMG_DEF_INSTALLATION (RID_DEPLOYMENT_GUI_START+50) #define RID_IMG_DEF_INSTALLATION_HC (RID_DEPLOYMENT_GUI_START+51) @@ -174,7 +175,7 @@ #define RID_STR_DISABLING_PACKAGES (RID_DEPLOYMENT_GUI_START+93) #define RID_STR_EXPORTING_PACKAGES (RID_DEPLOYMENT_GUI_START+94) #define WARNINGBOX_CONCURRENTINSTANCE (RID_DEPLOYMENT_GUI_START+100) - +#define RID_INFOBOX_MODIFY_SHARED_EXTENSION (RID_DEPLOYMENT_GUI_START+101) #define RID_DLG_LICENSE RID_DEPLOYMENT_LICENSE_START |