|
 |
5bdbcea |
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
|
|
|
5bdbcea |
index 65d5a80..b544f74 100644
|
|
|
5bdbcea |
--- a/solenv/gbuild/gbuild.mk
|
|
|
5bdbcea |
+++ b/solenv/gbuild/gbuild.mk
|
|
|
5bdbcea |
@@ -313,6 +313,14 @@ gb_XSLTPROCTARGET := $(call gb_Executable_get_target_for_build,xsltproc)
|
|
|
5bdbcea |
gb_XSLTPROC := $(gb_Helper_set_ld_path) $(gb_XSLTPROCTARGET)
|
|
|
5bdbcea |
endif
|
|
|
5bdbcea |
|
|
|
5bdbcea |
+ifeq ($(SYSTEM_LIBXML_FOR_BUILD),YES)
|
|
|
5bdbcea |
+gb_XMLLINTTARGET :=
|
|
|
5bdbcea |
+gb_XMLLINT := xsltproc
|
|
|
5bdbcea |
+else
|
|
|
5bdbcea |
+gb_XMLLINTTARGET := $(call gb_Executable_get_target_for_build,xsltproc)
|
|
|
5bdbcea |
+gb_XMLLINT := $(gb_Helper_set_ld_path) $(gb_XMLLINTTARGET)
|
|
|
5bdbcea |
+endif
|
|
|
5bdbcea |
+
|
|
|
5bdbcea |
ifeq ($(SYSTEM_PYTHON),YES)
|
|
|
5bdbcea |
gb_PYTHONTARGET :=
|
|
|
5bdbcea |
gb_PYTHON := $(PYTHON)
|
|
|
5bdbcea |
diff --git a/solenv/inc/unitools.mk b/solenv/inc/unitools.mk
|
|
|
5bdbcea |
index 0418fc1..4de797c 100644
|
|
|
5bdbcea |
--- a/solenv/inc/unitools.mk
|
|
|
5bdbcea |
+++ b/solenv/inc/unitools.mk
|
|
|
4959577 |
@@ -41,6 +41,14 @@
|
|
|
4959577 |
XSLTPROC*=$(AUGMENT_LIBRARY_PATH) xsltproc
|
|
|
5bdbcea |
.ENDIF # "$(SYSTEM_LIBXSLT)"!="YES"
|
|
|
5bdbcea |
|
|
|
5bdbcea |
+.IF "$(XMLLINT)"==""
|
|
|
5bdbcea |
+.IF "$(SYSTEM_LIBXML)"!="YES"
|
|
|
5bdbcea |
+XMLLINT=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xmllint
|
|
|
5bdbcea |
+.ELSE # "$(SYSTEM_LIBXML)"!="YES"
|
|
|
5bdbcea |
+XMLLINT=$(AUGMENT_LIBRARY_PATH) xmllint
|
|
|
5bdbcea |
+.ENDIF # "$(SYSTEM_LIBXML)"!="YES"
|
|
|
5bdbcea |
+.ENDIF
|
|
|
5bdbcea |
+
|
|
|
4959577 |
ULFCONV*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/ulfconv
|
|
|
4959577 |
|
|
|
4959577 |
MAKEDEPEND*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/makedepend
|
|
|
5bdbcea |
diff --git a/translations/source/nn/helpcontent2/source/text/scalc.po b/translations/source/nn/helpcontent2/source/text/scalc.po
|
|
|
5bdbcea |
index 9105195..d8573a3 100644
|
|
|
5bdbcea |
--- a/translations/source/nn/helpcontent2/source/text/scalc.po
|
|
|
5bdbcea |
+++ b/translations/source/nn/helpcontent2/source/text/scalc.po
|
|
|
5bdbcea |
@@ -179,7 +179,7 @@ msgstr "<ahelp hid=\".\"><emph>Biletlinja</emph> blir vist når du set inn eller
|
|
|
5bdbcea |
|
|
|
5bdbcea |
#: main0203.xhp#tit.help.text
|
|
|
5bdbcea |
msgid "Drawing Object Properties Bar"
|
|
|
5bdbcea |
-msgstr "Linja <emph>Eigenskapar for teikneobjekt</emph>"
|
|
|
5bdbcea |
+msgstr "Linja \"Eigenskapar for teikneobjekt\""
|
|
|
5bdbcea |
|
|
|
5bdbcea |
#: main0203.xhp#hd_id3154346.1.help.text
|
|
|
5bdbcea |
msgid "<link href=\"text/scalc/main0203.xhp\" name=\"Drawing Object Properties Bar\">Drawing Object Properties Bar</link>"
|
|
|
5bdbcea |
@@ -207,7 +207,7 @@ msgstr "<link href=\"text/shared/01/05210100.xhp\" name=\"Background Color\">Bak
|
|
|
5bdbcea |
|
|
|
5bdbcea |
#: main0210.xhp#tit.help.text
|
|
|
5bdbcea |
msgid "Page Preview Bar"
|
|
|
5bdbcea |
-msgstr "Linja <emph>Førehandsvis sida</emph>"
|
|
|
5bdbcea |
+msgstr "Linja \"Førehandsvis sida\""
|
|
|
5bdbcea |
|
|
|
5bdbcea |
#: main0210.xhp#hd_id3156023.1.help.text
|
|
|
5bdbcea |
msgid "<link href=\"text/scalc/main0210.xhp\" name=\"Page Preview Bar\">Page Preview Bar</link>"
|
|
|
5bdbcea |
diff --git a/translations/source/nn/helpcontent2/source/text/swriter.po b/translations/source/nn/helpcontent2/source/text/swriter.po
|
|
|
5bdbcea |
index 80768e6..4aaf28f 100644
|
|
|
5bdbcea |
--- a/translations/source/nn/helpcontent2/source/text/swriter.po
|
|
|
5bdbcea |
+++ b/translations/source/nn/helpcontent2/source/text/swriter.po
|
|
|
5bdbcea |
@@ -516,7 +516,7 @@ msgstr "Desse hjelpeemna er tilgjengelege for menyar og dialogvindauge."
|
|
|
5bdbcea |
|
|
|
5bdbcea |
#: main0205.xhp#tit.help.text
|
|
|
5bdbcea |
msgid "Drawing Object Properties Bar"
|
|
|
5bdbcea |
-msgstr "Verktøylinja <emph>Eigenskapar for teikneobjekt</emph>"
|
|
|
5bdbcea |
+msgstr "Verktøylinja \"Eigenskapar for teikneobjekt\"
|
|
|
5bdbcea |
|
|
|
5bdbcea |
#: main0205.xhp#hd_id3154275.1.help.text
|
|
|
5bdbcea |
msgid "<link href=\"text/swriter/main0205.xhp\" name=\"Drawing Object Properties Bar\">Drawing Object Properties Bar</link>"
|
|
|
5bdbcea |
@@ -597,7 +597,7 @@ msgstr "Dette er ei oversikt over verktøylinjene i $[officename] Writer.
|
|
|
5bdbcea |
|
|
|
5bdbcea |
#: main0204.xhp#tit.help.text
|
|
|
5bdbcea |
msgid "Table Bar"
|
|
|
5bdbcea |
-msgstr "Verktøylinja <emph>Tabell</emph>"
|
|
|
5bdbcea |
+msgstr "Verktøylinja \"Tabell\""
|
|
|
5bdbcea |
|
|
|
5bdbcea |
#: main0204.xhp#hd_id3145587.1.help.text
|
|
|
5bdbcea |
msgid "<link href=\"text/swriter/main0204.xhp\" name=\"Table Bar\">Table Bar</link>"
|
|
|
5bdbcea |
diff --git a/helpcontent2/helpers/update_tree.pl b/helpcontent2/helpers/update_tree.pl
|
|
|
5bdbcea |
index 8dc7bf4..80befc2 100644
|
|
|
5bdbcea |
--- a/helpcontent2/helpers/update_tree.pl
|
|
|
5bdbcea |
+++ b/helpcontent2/helpers/update_tree.pl
|
|
|
5bdbcea |
@@ -46,6 +46,7 @@ terminate() if ( ! defined $inpath );
|
|
|
5bdbcea |
|
|
|
5bdbcea |
my $destpath = $inpath;
|
|
|
5bdbcea |
my $with_lang = $ENV{WITH_LANG};
|
|
|
5bdbcea |
+my $xmllint = $ENV{XMLLINT};
|
|
|
5bdbcea |
|
|
|
5bdbcea |
|
|
|
5bdbcea |
# Always use / directory separators
|
|
|
5bdbcea |
@@ -308,6 +309,7 @@ sub processtreefiles {
|
|
|
5bdbcea |
unlink "$tree_dest/$lng/$tv" ;
|
|
|
5bdbcea |
my $ret=mv $treetmpfile , "$tree_dest/$lng/$tv$inpath" or &terminate("Cannot write to $tree_dest/$lng/$tv$inpath - Error $!");
|
|
|
5bdbcea |
my $ret=mv "$tree_dest/$lng/$tv$inpath" , "$tree_dest/$lng/$tv" or &terminate("Cannot write to $tree_dest/$lng/$tv - Error $!");
|
|
|
5bdbcea |
+ system("$xmllint --noout --noent $tree_dest/$lng/$tv") == 0 or &terminate("$tree_dest/$lng/$tv is illformed xml (xmllint)" );
|
|
|
5bdbcea |
}
|
|
|
5bdbcea |
} else {
|
|
|
5bdbcea |
&terminate("Cannot write to $tvout");
|
|
|
5bdbcea |
diff --git a/helpcontent2/source/auxiliary/makefile.mk b/helpcontent2/source/auxiliary/makefile.mk
|
|
|
5bdbcea |
index 45ab373..049879b 100644
|
|
|
5bdbcea |
--- a/helpcontent2/source/auxiliary/makefile.mk
|
|
|
5bdbcea |
+++ b/helpcontent2/source/auxiliary/makefile.mk
|
|
|
5bdbcea |
@@ -60,9 +60,11 @@ aux_alllangiso_all:=$(foreach,i,$(alllangiso) $(foreach,j,$(aux_langdirs) $(eq,$
|
|
|
5bdbcea |
aux_alllangiso:=$(foreach,i,$(aux_alllangiso_all) $(foreach,j,$(help_exist) $(eq,$i,$j $i $(NULL))))
|
|
|
5bdbcea |
|
|
|
5bdbcea |
WITH_LANG!:=$(aux_alllangiso)
|
|
|
5bdbcea |
-
|
|
|
5bdbcea |
.EXPORT : WITH_LANG
|
|
|
5bdbcea |
|
|
|
5bdbcea |
+XMLLINT !:=$(XMLLINT)
|
|
|
5bdbcea |
+.EXPORT : XMLLINT
|
|
|
5bdbcea |
+
|
|
|
5bdbcea |
LOCTREEFILES:=$(foreach,i,$(aux_alllangiso) $(foreach,j,$(TREEFILES) $(COMMONMISC)$/$i$/$j))
|
|
|
5bdbcea |
.ELSE #IF "$(WITH_LANG)"!=""
|
|
|
5bdbcea |
aux_langdirs:=en-US
|