diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-20 09:48:41 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-20 09:48:41 +0200 |
| commit | 2850da4f8cab294b2f897d170b35ec532e3c4d49 (patch) | |
| tree | 549908e5c5b1d28ba2a6a37369201079c1209a5b /sw/source/ui/envelp/label.hrc | |
| parent | 457fe4e7e83a0fed70a07ddeb2158e02ff1bca7e (diff) | |
| parent | 5f03f0c86933b1372a96d05018610205bbd43db9 (diff) | |
Merge branch 'master' into feature/gnumake4
Conflicts:
starmath/JunitTest_sm_unoapi.mk
starmath/Library_sm.mk
starmath/Library_smd.mk
starmath/Makefile
starmath/prj/build.lst
starmath/prj/makefile.mk
starmath/qa/unoapi/Test.java
starmath/source/detreg.cxx
starmath/source/register.cxx
starmath/source/smdetect.cxx
sw/Library_sw.mk
sw/Library_swd.mk
sw/Library_swui.mk
sw/Library_vbaswobj.mk
sw/inc/iodetect.hxx
sw/inc/swddllapi.h
sw/source/filter/basflt/iodetect.cxx
Diffstat (limited to 'sw/source/ui/envelp/label.hrc')
| -rw-r--r-- | sw/source/ui/envelp/label.hrc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sw/source/ui/envelp/label.hrc b/sw/source/ui/envelp/label.hrc index 3817ff92def4..4b563068cb66 100644 --- a/sw/source/ui/envelp/label.hrc +++ b/sw/source/ui/envelp/label.hrc @@ -28,11 +28,9 @@ #ifndef _LABEL_HRC #define _LABEL_HRC -// #include ***************************************************************** - #include "envelp.hrc" -// Lokale Resourcen ********************************************************* +// local resources ********************************************************* #define TXT_WRITING 1 #define BOX_ADDR 2 @@ -112,11 +110,11 @@ //#define FT_MOBILE 72 #define FT_FAX 73 -// Globale Resourcen ******************************************************** +// global resources ******************************************************** #define STR_DOC_TITLE (RC_LABEL_BEGIN) #define STR_CUSTOM (RC_LABEL_BEGIN + 1) -// Ueberlaufpruefung ******************************************************** +// overflow check ******************************************************** #define LABEL_ACT_END STR_CUSTOM |