diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-18 02:27:27 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-18 02:27:27 +0200 |
| commit | 57272eaaf5776f673b5141354a1d1e1af080d575 (patch) | |
| tree | 9241d5523e03af24cd7ba2e45dd8b0951a9fdeb1 /wizards/source/schedule | |
| parent | 1df024d97cc44155566f8db279e8cdba37e95fcf (diff) | |
| parent | f9d40c2b591215b57ece4ba6e623b7808a7ae717 (diff) | |
Merge commit 'f9d40c2b591215b57ece4ba6e623b7808a7ae717' into feature/gsoc2011_wizards
Conflicts:
wizards/com/sun/star/wizards/common/Resource.java
merged resolved as per:
e52421bc118e9c5f3fce5a32ba9efdcad7627d92
9e91dbca08056fc31f388f5642fdfa3d2b910990
in the old components repository merging the corresponding commit
3b4fe490441f9f77829bc6c1ae30d79a4d50255b there
Diffstat (limited to 'wizards/source/schedule')
| -rw-r--r-- | wizards/source/schedule/schedule.src | 72 |
1 files changed, 36 insertions, 36 deletions
diff --git a/wizards/source/schedule/schedule.src b/wizards/source/schedule/schedule.src index beabe83cf2a4..3116f0f41131 100644 --- a/wizards/source/schedule/schedule.src +++ b/wizards/source/schedule/schedule.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -24,53 +24,53 @@ * for a copy of the LGPLv3 License. * ************************************************************************/// Dialog labels start at 1000 -#define dlgCalTitle 1000 -#define dlgCalTitleBack 1001 -#define dlgCalTitleOwnData 1002 -#define dlgSchdlTitle 1003 -#define dlgOK 1004 -#define dlgCancel 1005 -#define dlgCalFrameOption 1006 -#define dlgCalOptionYear 1007 -#define dlgCalOptionMonth 1008 -#define dlgSchdlDescription 1009 -#define dlgSchdlCountry 1010 -#define dlgTime 1011 -#define dlgYear 1012 -#define dlgCalMonth 1013 -#define dlgSpecificBankholidays 1014 -#define dlgCalOwnData 1015 -#define dlgCalInsert 1016 -#define dlgCalDelete 1017 -#define dlgCalNewEvent 1018 -#define dlgCalEvent 1019 -#define dlgCalEventOnce 1020 -#define dlgCalEventDay 1021 -#define dlgCalEventMonth 1022 -#define dlgCalEventYear 1023 +#define dlgCalTitle 1000 +#define dlgCalTitleBack 1001 +#define dlgCalTitleOwnData 1002 +#define dlgSchdlTitle 1003 +#define dlgOK 1004 +#define dlgCancel 1005 +#define dlgCalFrameOption 1006 +#define dlgCalOptionYear 1007 +#define dlgCalOptionMonth 1008 +#define dlgSchdlDescription 1009 +#define dlgSchdlCountry 1010 +#define dlgTime 1011 +#define dlgYear 1012 +#define dlgCalMonth 1013 +#define dlgSpecificBankholidays 1014 +#define dlgCalOwnData 1015 +#define dlgCalInsert 1016 +#define dlgCalDelete 1017 +#define dlgCalNewEvent 1018 +#define dlgCalEvent 1019 +#define dlgCalEventOnce 1020 +#define dlgCalEventDay 1021 +#define dlgCalEventMonth 1022 +#define dlgCalEventYear 1023 // Bitmap file is 1099 -#define dlgBitmapFile 1099 +#define dlgBitmapFile 1099 // Names of states start at 1100 -#define dlgState 1100 +#define dlgState 1100 // Months start at 1200 -#define dlgMonth 1200 +#define dlgMonth 1200 // Messages start at 1300 -#define msgCalErrorTitle 1300 -#define msgCalError 1301 -#define msgCalRemoveTitle 1302 -#define msgCalRemove 1303 +#define msgCalErrorTitle 1300 +#define msgCalError 1301 +#define msgCalRemoveTitle 1302 +#define msgCalRemove 1303 // Styles start at 1400 -#define stlWorkday 1400 -#define stlWeekend 1401 +#define stlWorkday 1400 +#define stlWeekend 1401 // Sheet names start at 1410 -#define nameCalYear 1410 -#define nameCalMonth 1411 +#define nameCalYear 1410 +#define nameCalMonth 1411 #define sProgress 1500 |