Merge remote-tracking branch 'origin/master'
This commit is contained in:
Hosted Weblate
commit
cb155612bf
3 changed files with 35 additions and 6 deletions
|
|
@ -98,7 +98,6 @@ DOC_SRCS_EN := \
|
|||
gui/filter_programs.adoc \
|
||||
gui/gladevcp.adoc \
|
||||
gui/gmoccapy.adoc \
|
||||
gui/gmoccapy-hu.adoc \
|
||||
gui/gscreen.adoc \
|
||||
gui/qtdragon.adoc \
|
||||
gui/qtvcp.adoc \
|
||||
|
|
@ -171,15 +170,20 @@ DOC_SRCS_ES := $(subst $(DOC_SRCDIR)/,, \
|
|||
$(wildcard $(DOC_SRCDIR)/*_es.adoc) \
|
||||
$(wildcard $(DOC_SRCDIR)/*/*_es.adoc))
|
||||
|
||||
DOC_SRCS_HU := $(subst $(DOC_SRCDIR)/,, \
|
||||
$(wildcard $(DOC_SRCDIR)/*_hu.adoc) \
|
||||
$(wildcard $(DOC_SRCDIR)/*/*_hu.adoc))
|
||||
|
||||
DOC_SRCS_ZH_CN := $(subst $(DOC_SRCDIR)/,, \
|
||||
$(wildcard $(DOC_SRCDIR)*_zh_CN.adoc) \
|
||||
$(wildcard $(DOC_SRCDIR)*/*_zh_CN.adoc))
|
||||
|
||||
DOC_SRCS = $(DOC_SRCS_EN) $(DOC_SRCS_FR) $(DOC_SRCS_ES) $(DOC_SRCS_ZH_CN)
|
||||
DOC_SRCS = $(DOC_SRCS_EN) $(DOC_SRCS_FR) $(DOC_SRCS_ES) $(DOC_SRCS_HU) $(DOC_SRCS_ZH_CN)
|
||||
|
||||
DOC_SRCS_ES_SMALL := $(filter-out Master_%,$(DOC_SRCS_ES))
|
||||
DOC_SRCS_FR_SMALL := $(filter-out Master_%,$(DOC_SRCS_FR))
|
||||
DOC_SRCS_EN_SMALL := $(filter-out Master_%,$(DOC_SRCS_EN))
|
||||
DOC_SRCS_HU_SMALL := $(filter-out Master_%,$(DOC_SRCS_HU))
|
||||
DOC_SRCS_ZH_CN_SMALL := $(filter-out Master_%,$(DOC_SRCS_ZH_CN))
|
||||
|
||||
DOC_SRCS_HTML := $(patsubst %.adoc, %.html, $(filter-out Master_%, $(DOC_SRCS)))
|
||||
|
|
@ -188,13 +192,15 @@ DOC_TARGETS_XML := $(patsubst $(DOC_DIR)/html/%.html, objects/%.xml, $(DOC_TARGE
|
|||
|
||||
DOC_TARGETS_XML_ES := $(filter %_es.xml, $(DOC_TARGETS_XML))
|
||||
DOC_TARGETS_XML_FR := $(filter %_fr.xml, $(DOC_TARGETS_XML))
|
||||
DOC_TARGETS_XML_HU := $(filter %_hu.xml, $(DOC_TARGETS_XML))
|
||||
DOC_TARGETS_XML_ZH_CN := $(filter %_zh_CN.xml, $(DOC_TARGETS_XML))
|
||||
DOC_TARGETS_XML_EN := $(filter-out $(DOC_TARGETS_XML_ZH_CN), $(filter-out$(DOC_TARGETS_XML_ES), $(filter-out $(DOC_TARGETS_XML_FR), $(DOC_TARGETS_XML))))
|
||||
DOC_TARGETS_XML_EN := $(filter-out $(DOC_TARGETS_XML_ZH_CN), $(filter-out$(DOC_TARGETS_XML_ES), $(filter-out $(DOC_TARGETS_XML_FR), $(filter-out $(DOC_TARGETS_XML_HU), $(DOC_TARGETS_XML)))))
|
||||
DOC_TARGETS_HTML_ES := $(filter %_es.html, $(DOC_TARGETS_HTML))
|
||||
DOC_TARGETS_HTML_ZH_CN := $(filter %_zh_CN.html, $(DOC_TARGETS_HTML))
|
||||
DOC_TARGETS_HTML_FR := $(filter %_fr.html, $(DOC_TARGETS_HTML))
|
||||
DOC_TARGETS_HTML_HU := $(filter %_hu.html, $(DOC_TARGETS_HTML))
|
||||
DOC_TARGETS_HTML_VI := $(filter %_vi.html, $(DOC_TARGETS_HTML))
|
||||
DOC_TARGETS_HTML_EN := $(filter-out $(DOC_TARGETS_HTML_ZH_CN), $(filter-out $(DOC_TARGETS_HTML_ES), $(filter-out $(DOC_TARGETS_HTML_FR), $(filter-out $(DOC_TARGETS_HTML_VI), $(DOC_TARGETS_HTML)))))
|
||||
DOC_TARGETS_HTML_EN := $(filter-out $(DOC_TARGETS_HTML_ZH_CN), $(filter-out $(DOC_TARGETS_HTML_ES), $(filter-out $(DOC_TARGETS_HTML_FR), $(filter-out $(DOC_TARGETS_HTML_HU), $(filter-out $(DOC_TARGETS_HTML_VI), $(DOC_TARGETS_HTML))))))
|
||||
|
||||
MAN_HTML_TARGETS = $(patsubst $(DOC_DIR)/man/%, $(DOC_DIR)/html/man/%.html, $(MAN_SRCS))
|
||||
|
||||
|
|
@ -281,7 +287,7 @@ copy_asciidoc_files:
|
|||
cp -f /etc/asciidoc/stylesheets/*.css $(DOC_DIR)/html
|
||||
cp -f /etc/asciidoc/javascripts/*.js $(DOC_DIR)/html
|
||||
|
||||
checkref: checkref_en checkref_fr checkref_es checkref_vi checkref_zh_CN
|
||||
checkref: checkref_en checkref_es checkref_fr checkref_hu checkref_vi checkref_zh_CN
|
||||
|
||||
checkref_en: $(DOC_TARGETS_HTML_EN) $(DOC_DIR)/html/index.html $(DOC_DIR)/html/gcode.html .htmldoc-stamp
|
||||
@$(DOC_SRCDIR)/checkref English $^
|
||||
|
|
@ -289,6 +295,9 @@ checkref_en: $(DOC_TARGETS_HTML_EN) $(DOC_DIR)/html/index.html $(DOC_DIR)/html/g
|
|||
checkref_fr: $(DOC_TARGETS_HTML_FR) $(DOC_DIR)/html/gcode_fr.html .htmldoc-stamp
|
||||
@$(DOC_SRCDIR)/checkref French $^
|
||||
|
||||
checkref_hu: $(DOC_TARGETS_HTML_HU) .htmldoc-stamp
|
||||
@$(DOC_SRCDIR)/checkref Hungarian $^
|
||||
|
||||
checkref_es: $(DOC_TARGETS_HTML_ES) $(DOC_DIR)/html/gcode_es.html .htmldoc-stamp
|
||||
@$(DOC_SRCDIR)/checkref Spanish $^
|
||||
|
||||
|
|
@ -433,6 +442,9 @@ objects/xref_es.links: $(patsubst %.adoc,objects/%.links,$(DOC_SRCS_ES_SMALL))
|
|||
objects/xref_fr.links: $(patsubst %.adoc,objects/%.links,$(DOC_SRCS_FR_SMALL))
|
||||
$(PYTHON) $(DOC_SRCDIR)/links_db_gen.py objects/ $^ > $@
|
||||
|
||||
objects/xref_hu.links: $(patsubst %.adoc,objects/%.links,$(DOC_SRCS_HU_SMALL))
|
||||
$(PYTHON) $(DOC_SRCDIR)/links_db_gen.py objects/ $^ > $@
|
||||
|
||||
objects/xref_zh_CN.links: $(patsubst %.adoc,objects/%.links,$(DOC_SRCS_ZH_CN_SMALL))
|
||||
$(PYTHON) $(DOC_SRCDIR)/links_db_gen.py objects/ $^ > $@
|
||||
|
||||
|
|
@ -491,6 +503,19 @@ $(patsubst %.adoc,$(DOC_SRCDIR)/%.html,$(DOC_SRCS_FR_SMALL)): $(DOC_SRCDIR)/%.ht
|
|||
-a stylesheet=linuxcnc.css \
|
||||
-d book -a toc -a numbered -b xhtml11 $< || (X=$$?; rm -f $@; exit $$X)
|
||||
|
||||
$(patsubst %.adoc,$(DOC_SRCDIR)/%.html,$(DOC_SRCS_HU_SMALL)): $(DOC_SRCDIR)/%.html: $(DOC_SRCDIR)/%.adoc objects/xref_hu.links $(LOC_LANG_MAP)
|
||||
asciidoc -f $(DOC_SRCDIR)/xhtml11.conf \
|
||||
-f $(DOC_SRCDIR)/asciidoc-dont-replace-arrows.conf \
|
||||
-f $(LOC_HL_DIR)/emc-langs-source-highlight.conf \
|
||||
-a "source_highlight_dir=$(LOC_HL_DIR)/local" \
|
||||
-a linkcss \
|
||||
$(STYLES_SCRIPTS) \
|
||||
-a "scriptdir=$(DOC_SRCDIR)/" \
|
||||
-a "relindir=$(shell dirname $*)" \
|
||||
-a "linksfile=objects/xref_hu.links" \
|
||||
-a stylesheet=linuxcnc.css \
|
||||
-d book -a toc -a numbered -b xhtml11 $< || (X=$$?; rm -f $@; exit $$X)
|
||||
|
||||
$(patsubst %.adoc,$(DOC_SRCDIR)/%.html,$(DOC_SRCS_ES_SMALL)): $(DOC_SRCDIR)/%.html: $(DOC_SRCDIR)/%.adoc objects/xref_es.links $(LOC_LANG_MAP)
|
||||
asciidoc -f $(DOC_SRCDIR)/xhtml11.conf \
|
||||
-f $(DOC_SRCDIR)/asciidoc-dont-replace-arrows.conf \
|
||||
|
|
@ -520,6 +545,10 @@ $(DOC_DIR)/html/xref_fr.html: objects/xref_fr.xml $(DOC_SRCDIR)/xref.xsl $(DOC_S
|
|||
$(ECHO) Converting $< to HTML
|
||||
@xsltproc --stringparam docname "xref_fr" --stringparam language french --path objects -o $@ $(DOC_SRCDIR)/xref.xsl $<
|
||||
|
||||
$(DOC_DIR)/html/xref_hu.html: objects/xref_hu.xml $(DOC_SRCDIR)/xref.xsl $(DOC_SRCDIR)/docs.xml $(DOC_SRCDIR)/terms.xml
|
||||
$(ECHO) Converting $< to HTML
|
||||
@xsltproc --stringparam docname "xref_hu" --stringparam language hungarien --path objects -o $@ $(DOC_SRCDIR)/xref.xsl $<
|
||||
|
||||
$(DOC_DIR)/html/xref_es.html: objects/xref_es.xml $(DOC_SRCDIR)/xref.xsl $(DOC_SRCDIR)/docs.xml $(DOC_SRCDIR)/terms.xml
|
||||
$(ECHO) Converting $< to HTML
|
||||
@xsltproc --stringparam docname "xref_es" --stringparam language spanish --path objects -o $@ $(DOC_SRCDIR)/xref.xsl $<
|
||||
|
|
|
|||
|
|
@ -139,7 +139,7 @@ function setup_page(){
|
|||
<div id="sec3">
|
||||
<ul>
|
||||
<li><a href="gui/axis.html">Axis, Keyboard GUI</a></li>
|
||||
<li><a href="gui/gmoccapy.html">Gmoccapy, Touchscreen GUI</a> <a href="gui/gmoccapy-hu.html"> hu(Magyar)</a></li>
|
||||
<li><a href="gui/gmoccapy.html">Gmoccapy, Touchscreen GUI</a> <a href="gui/gmoccapy_hu.html"> hu(Magyar)</a></li>
|
||||
<li><a href="gui/touchy.html">Touchy, Touchscreen GUI</a></li>
|
||||
<li><a href="gui/gscreen.html">Gscreen, Customizable Touchscreen GUI</a></li>
|
||||
<li><a href="gui/qtdragon.html">QtDragon, Customizable QT based GUI</a></li>
|
||||
|
|
|
|||
Loading…
Reference in a new issue