From 4dd442010398f4d280ebaa1de3d066185da00daf Mon Sep 17 00:00:00 2001
From: Ivo Hinkelmann <ihi@openoffice.org>
Date: Fri, 12 Jun 2009 18:19:30 +0000
Subject: CWS-TOOLING: integrate CWS hcshared21 2009-05-13 09:49:59 +0200 ufi 
 r271841 : CWS-TOOLING: rebase CWS hcshared21 to trunk@271427 (milestone:
 DEV300:m47) 2009-04-16 11:01:43 +0200 ufi  r270873 : again 2009-03-17
 10:19:50 +0100 ufi  r269575 : before builds 2009-02-13 16:03:59 +0100 ufi 
 r267726 : CWS-TOOLING: rebase CWS hcshared21 to trunk@267171 (milestone:
 DEV300:m41) 2009-02-10 10:30:11 +0100 ufi  r267539 : vor neuem rebase Versuch
 2009-02-03 15:55:58 +0100 ufi  r267334 : before rebase 2009-01-06 10:38:41
 +0100 ufi  r265901 : i97718

---
 helpcontent2/source/auxiliary/sbasic.tree | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'helpcontent2/source/auxiliary')

diff --git a/helpcontent2/source/auxiliary/sbasic.tree b/helpcontent2/source/auxiliary/sbasic.tree
index 5866fdbd27..8766b4a7c6 100755
--- a/helpcontent2/source/auxiliary/sbasic.tree
+++ b/helpcontent2/source/auxiliary/sbasic.tree
@@ -31,7 +31,7 @@
 <topic id="sbasic/text/sbasic/shared/03120000.xhp">Strings</topic>
 <topic id="sbasic/text/sbasic/shared/03130000.xhp">Other Commands</topic>
 			</node>
-			<node id="070201" title="Alphabetic List of Functions, Statements, and Operators">
+			<node id="070201" title="List of common Functions, Statements, and Operators">
 <topic id="sbasic/text/sbasic/shared/03080601.xhp">Abs Function [Runtime]</topic>
 <topic id="sbasic/text/sbasic/shared/03060100.xhp">AND Operator [Runtime]</topic>
 <topic id="sbasic/text/sbasic/shared/03104200.xhp">Array Function [Runtime]</topic>
-- 
cgit 


From 04623c0739fd41eca6382f3534efb5d6332e9bd1 Mon Sep 17 00:00:00 2001
From: Ivo Hinkelmann <ihi@openoffice.org>
Date: Wed, 17 Jun 2009 13:15:46 +0000
Subject: CWS-TOOLING: integrate CWS l10ncleanup04 2009-05-28 13:46:54 +0200
 ihi  r272407 : remove forgotten sdf's 2009-05-25 22:32:35 +0200 ihi  r272273
 : no WITH_LANG fix 2009-05-25 20:45:58 +0200 ihi  r272272 : remove some
 comments 2009-05-25 19:55:21 +0200 ihi  r272271 : svx dialog -> cui l10n move
 2009-05-25 18:30:58 +0200 ihi  r272268 : build fix 2009-05-18 16:32:02 +0200
 ihi  r272033 : bash fix 2009-05-18 16:31:32 +0200 ihi  r272032 : bash fix
 2009-05-14 16:23:39 +0200 ihi  r271901 : #i79750# Translation moved to l10n
 module 2009-05-11 23:36:05 +0200 ihi  r271793 : #i79750# Translation moved
 into own module

---
 helpcontent2/source/auxiliary/makefile.mk | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'helpcontent2/source/auxiliary')

diff --git a/helpcontent2/source/auxiliary/makefile.mk b/helpcontent2/source/auxiliary/makefile.mk
index 386d06305c..5f4369adb1 100644
--- a/helpcontent2/source/auxiliary/makefile.mk
+++ b/helpcontent2/source/auxiliary/makefile.mk
@@ -14,7 +14,7 @@
 #*************************************************************************
 
 PRJ		= ..$/..
-PRJNAME = help2
+PRJNAME = helpcontent2
 TARGET  = auxiliary
 
 # --- Settings -----------------------------------------------------
@@ -33,6 +33,7 @@ TREEFILES  = \
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
+.EXPORT : LOCALIZESDF LOCALIZATION_FOUND TRYSDF
 
 ALLTAR : aux_dirs $(COMMONMISC)$/treefiles.done $(COMMONBIN)$/helpimg.ilst
 
@@ -58,7 +59,7 @@ LOCTREEFILES:=$(foreach,j,$(TREEFILES) $(COMMONMISC)$/en-US$/$j)
 .ENDIF			#IF "$(WITH_LANG)"!=""
 
 $(COMMONMISC)$/treefiles.done : $(LOCTREEFILES)
-    @$(PERL) $(PRJ)$/helpers$/update_tree.pl && $(TOUCH) $@
+    +$(PERL) $(PRJ)$/helpers$/update_tree.pl && $(TOUCH) $@
 
 %.created:
     @-$(MKDIRHIER) $(@:d) && $(TOUCH) $@
@@ -67,7 +68,9 @@ $(LOCTREEFILES) : $(TREEFILES) $$(@:d)$/dir.created
     @$(TOUCH) $@
 
 .IF "$(WITH_LANG)"!=""
-$(LOCTREEFILES) : $(PRJ)$/source$/text$/shared$/localize.sdf
+#$(LOCTREEFILES) : $(PRJ)$/source$/text$/shared$/localize.sdf
+$(LOCTREEFILES) : $(LOCALIZESDF:d:d:d:d)$/text$/shared/localize.sdf
+$(LOCALIZESDF:d:d:d:d)$/text$/shared/localize.sdf : $(LOCALIZESDF)
 .ENDIF			# "$(WITH_LANG)"!=""
 
 aux_dirs .PHONY :
-- 
cgit