diff options
| author | Kurt Zenker <kz@openoffice.org> | 2009-09-11 11:45:29 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2009-09-11 11:45:29 +0000 |
| commit | 374efa359ae85dbb65cb78ef91d6569c5587ec11 (patch) | |
| tree | 1476c6befe7f76a08cbbcd529fa309b3bf9ac92a /desktop/inc | |
| parent | ba079682ac262fd45add1a728726baac219a29db (diff) | |
CWS-TOOLING: integrate CWS jl131
2009-09-02 16:42:40 +0200 jl r275720 : #i97896#
2009-08-31 13:01:53 +0200 jl r275599 : CWS-TOOLING: rebase CWS jl131 to trunk@275331 (milestone: DEV300:m56)
2009-07-31 14:35:30 +0200 jl r274531 : CWS-TOOLING: rebase CWS jl131 to trunk@274203 (milestone: DEV300:m53)
2009-07-23 14:20:32 +0200 jl r274272 : #i79839# better error text when trying to modify shared layer without having write permission, eg. unopkg add --shared, unopkg remove --shared, unopkg reinstall --shared
2009-07-22 16:38:02 +0200 jl r274252 : #i97896# localize error message for lock file
2009-07-22 16:37:22 +0200 jl r274251 : #i80462# unprecise wording in updatedialog
2009-07-22 16:36:06 +0200 jl r274250 : #i97896# localize error message for lock file
2009-07-22 16:35:20 +0200 jl r274249 : #i97896# localize error message for lock file
2009-07-22 15:07:30 +0200 jl r274242 : #i98873# minimum java version is 1.5 since OOo 3.0
Diffstat (limited to 'desktop/inc')
| -rw-r--r-- | desktop/inc/deployment.hrc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/desktop/inc/deployment.hrc b/desktop/inc/deployment.hrc index da349b81848b..e29d1229bd18 100644 --- a/desktop/inc/deployment.hrc +++ b/desktop/inc/deployment.hrc @@ -72,7 +72,8 @@ #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_STR_UNOPKG_ERROR (RID_DEPLOYMENT_UNOPKG_START+9) +#define RID_STR_CONCURRENTINSTANCE (RID_DEPLOYMENT_UNOPKG_START+10) #define RID_DEPLOYMENT_DEPENDENCIES_START (RID_DEPLOYMENT_START + 4400) #define RID_DEPLYOMENT_DEPENDENCIES_UNKNOWN RID_DEPLOYMENT_DEPENDENCIES_START |