[Libreoffice-commits] .: 2 commits - nlpsolver/makefile.mk sdext/source
Andras Timar
timar at kemper.freedesktop.org
Thu Oct 20 02:10:27 PDT 2011
nlpsolver/makefile.mk | 2 +-
sdext/source/presenter/description.txt | 2 ++
sdext/source/presenter/description.xml | 2 +-
sdext/source/presenter/help/component.txt | 2 --
sdext/source/presenter/makefile.mk | 18 +++++++++++-------
5 files changed, 15 insertions(+), 11 deletions(-)
New commits:
commit ffb91342fc667d0f1d4ef43384bfcfc176cab774
Author: Andras Timar <atimar at suse.com>
Date: Thu Oct 20 11:09:24 2011 +0200
fix localization of NLPSolver
diff --git a/nlpsolver/makefile.mk b/nlpsolver/makefile.mk
index a7d0996..ddbe7aa 100644
--- a/nlpsolver/makefile.mk
+++ b/nlpsolver/makefile.mk
@@ -46,7 +46,7 @@ PATCH_FILES=nlpsolver-0.9.patch
ANT_FLAGS+=-Dplatforms.JDK_1.5.home=$(JAVA_HOME) -Doffice.program.dir=$(SOLARBINDIR)
-CONFIGURE_ACTION=(cd ../../../../locale && $(GNUTAR) -cf - .) | (cd src/ && $(GNUTAR) xf -)
+CONFIGURE_ACTION=(cd ../../../../locale && $(GNUTAR) -cf - .) | (cd src/locale/ && rm *de_DE* && $(GNUTAR) xf -)
.IF "$(JAVACISGCJ)"=="yes"
JAVA_HOME=
commit 89f7e17692d019a68d251d39bcc592a4ee8ba0dc
Author: Andras Timar <atimar at suse.com>
Date: Sat Oct 8 21:20:31 2011 +0200
localize description.xml of presenter-screen extension
diff --git a/sdext/source/presenter/description.txt b/sdext/source/presenter/description.txt
new file mode 100644
index 0000000..26a10c6
--- /dev/null
+++ b/sdext/source/presenter/description.txt
@@ -0,0 +1,2 @@
+The Presenter Console Extension provides more control over your slide show presentation, such as the ability to see the upcoming slide, the slide notes, and a presentation timer whereas the audience see only the current slide.
+To avoid confusions by displaying a large number of presentation elements, the Presenter Console displays the elements on three different easily changeable views.
diff --git a/sdext/source/presenter/description.xml b/sdext/source/presenter/description.xml
index bf9ce72..14a8a18 100644
--- a/sdext/source/presenter/description.xml
+++ b/sdext/source/presenter/description.xml
@@ -28,7 +28,7 @@
</icon>
<extension-description>
- <src xlink:href="help/component.txt" lang="en-US" />
+ <src xlink:href="description.txt" lang="en-US" />
</extension-description>
</description>
diff --git a/sdext/source/presenter/help/component.txt b/sdext/source/presenter/help/component.txt
deleted file mode 100755
index 26a10c6..0000000
--- a/sdext/source/presenter/help/component.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-The Presenter Console Extension provides more control over your slide show presentation, such as the ability to see the upcoming slide, the slide notes, and a presentation timer whereas the audience see only the current slide.
-To avoid confusions by displaying a large number of presentation elements, the Presenter Console displays the elements on three different easily changeable views.
diff --git a/sdext/source/presenter/makefile.mk b/sdext/source/presenter/makefile.mk
index 1afbb1e..df6c633 100644
--- a/sdext/source/presenter/makefile.mk
+++ b/sdext/source/presenter/makefile.mk
@@ -247,9 +247,12 @@ COMPONENT_LIBRARY= \
PLATFORMID:=$(RTL_OS:l)_$(RTL_ARCH:l)
COMPONENT_HELP= \
- $(ZIP1DIR)$/help/component.txt \
$(foreach,l,$(alllangiso) $(ZIP1DIR)$/help$/$l$/com.sun.PresenterScreen-$(PLATFORMID)$/presenter.xhp)
+COMPONENT_DESCRIPTION= \
+ $(foreach,l,$(alllangiso:s/en-US//) $(ZIP1DIR)$/$l-description.txt) \
+ $(ZIP1DIR)$/description.txt
+
ZIP1DEPS= \
$(DESCRIPTION) \
$(COMPONENT_MANIFEST) \
@@ -257,7 +260,8 @@ ZIP1DEPS= \
$(COMPONENT_BITMAPS) \
$(COMPONENT_IMAGES) \
$(COMPONENT_LIBRARY) \
- $(COMPONENT_HELP)
+ $(COMPONENT_HELP) \
+ $(COMPONENT_DESCRIPTION)
LINKNAME:=help
XHPLINKSRC:=$(ZIP1DIR)/help
@@ -284,10 +288,6 @@ $(COMPONENT_MANIFEST) : $$(@:f)
@-$(MKDIRHIER) $(@:d)
+$(TYPE) $< | $(SED) "s/SHARED_EXTENSION/$(DLLPOST)/" > $@
-$(ZIP1DIR)$/help$/component.txt : help$/$$(@:f)
- @@-$(MKDIRHIER) $(@:d)
- $(COPY) $< $@
-
$(ZIP1DIR)$/help$/%$/com.sun.PresenterScreen-$(PLATFORMID)$/presenter.xhp : $(COMMONMISC)$/%$/com.sun.PresenterScreen$/presenter.xhp
@echo creating $@
@-$(MKDIRHIER) $(@:d)
@@ -368,7 +368,11 @@ PHONYDESC=.PHONY
$(DESCRIPTION) $(PHONYDESC) : $$(@:f)
@-$(MKDIRHIER) $(@:d)
@echo LAST_WITH_LANG=$(WITH_LANG) > $(ZIP1DIR)_lang_track.mk
- $(TYPE) description.xml | sed s/UPDATED_PLATFORM/$(PLATFORMID)/ > $@
+ $(GNUCOPY) description.txt $(ZIP1DIR)/description.txt
+ $(XRMEX) -p $(PRJNAME) -i description.xml -o $@ -m $(LOCALIZESDF) -l all
+ $(TYPE) $@ | sed s/UPDATED_PLATFORM/$(PLATFORMID)/ > $@.new
+ mv $@.new $@
+
ALLTAR: $(MISC)/../bin/presenter-screen.oxt
# hotfix to missing localizations
More information about the Libreoffice-commits
mailing list