summaryrefslogtreecommitdiff
path: root/starmath/source/smres.src
diff options
context:
space:
mode:
authorHans-Joachim Lankenau <hjs@openoffice.org>2004-07-05 13:55:12 +0000
committerHans-Joachim Lankenau <hjs@openoffice.org>2004-07-05 13:55:12 +0000
commit58231a12dbe3ab030c5f53394158187b8100df4b (patch)
tree30e09708e229ada4f5774eb21f391d16b3d329a9 /starmath/source/smres.src
parentd9da96af96eb31d155b091e8430bd8b1a9dd768b (diff)
#i10000# merge error
Diffstat (limited to 'starmath/source/smres.src')
-rw-r--r--starmath/source/smres.src13
1 files changed, 10 insertions, 3 deletions
diff --git a/starmath/source/smres.src b/starmath/source/smres.src
index b2ffb1622112..a7ee0b4239e4 100644
--- a/starmath/source/smres.src
+++ b/starmath/source/smres.src
@@ -2,9 +2,9 @@
*
* $RCSfile: smres.src,v $
*
- * $Revision: 1.103 $
+ * $Revision: 1.104 $
*
- * last change: $Author: hjs $ $Date: 2004-06-25 11:29:53 $
+ * last change: $Author: hjs $ $Date: 2004-07-05 14:55:12 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -741,7 +741,7 @@ ModalDialog RID_DISTANCEDIALOG
String 2
{
/* ### ACHTUNG: Neuer Text in Resource? ~Zhlerhhe: : ~Zhlerhhe: */
- Text [ de ] = "~Zhlerhhe" ;
+ Text [ de ] = "~Zählerhhe" ;
Text [ en-US ] = "~Numerator";
};
Bitmap 20
@@ -3987,6 +3987,13 @@ DockingWindow RID_CMDBOXWINDOW
ImageList RID_DEFAULTIMAGELIST_LC
{
+ Prefix = "lc";
+ MaskColor = IMAGE_STDBTN_COLOR ;
+ _ID_LIST
+};
+
+ImageList RID_DEFAULTIMAGELIST_SC
+{
Prefix = "sc";
MaskColor = IMAGE_STDBTN_COLOR ;
_ID_LIST