tdf#116642 Fix COUNTIFS page + help makefiles

+ Add callateral file for COUNTIFS
+ Adjust makefiles
+ some tweaks in XSLT
+ adjust languages to gb_HELP_LANGS.

Change-Id: I9d2684d20804b93fd0671621d28a8d786a101fdf
Reviewed-on: https://gerrit.libreoffice.org/55493
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
(cherry picked from commit 185624ce2dfea227f0357e417bb3615e88c95e8e)
Reviewed-on: https://gerrit.libreoffice.org/55687

2 files changed, 5 insertions, 6 deletions

diff --git a/source/text/scalc/01/func_countifs.xhp b/source/text/scalc/01/func_countifs.xhp
index 8a46e0f592..f47b269ab7 100644
--- a/source/text/scalc/01/func_countifs.xhp
+++ b/source/text/scalc/01/func_countifs.xhp
@@ -25,21 +25,16 @@
   <bookmark_value>counting column;satisfying criteria</bookmark_value>
 </bookmark>
 <paragraph id="hd_id456845684568" role="heading" level="2" xml-lang="en-US"><variable id="countifs_head"><link href="text/scalc/01/func_countifs.xhp">COUNTIFS</link></variable> function</paragraph>
-<paragraph id="par_id462646264626" role="paragraph" xml-lang="en-US"><ahelp hid="."><variable id="countifs_des">Returns the count of rows or columns that meet criteria in multiple ranges.</variable></ahelp></paragraph>
+<paragraph id="par_id462646264626" role="paragraph" xml-lang="en-US"><ahelp hid="."><variable id="countifs_des">Returns the count of cells that meet criteria in multiple ranges.</variable></ahelp></paragraph>
 </section>
 <paragraph id="hd_id465746574657" role="heading" level="3" xml-lang="en-US">Syntax</paragraph>
 <paragraph id="par_id27421466710275" role="code" xml-lang="en-US">COUNTIFS(Range1; Criterion1 [; Range2; Criterion2 [; ...]])</paragraph>
 <paragraph id="par_id242131304318587" role="paragraph" xml-lang="en-US"><emph>Range1</emph> – required argument. It is a range of cells, a name of a named range or a label of a column or a row containing values for counting and finding the corresponding criterion.</paragraph>
-
 <embed href="text/scalc/01/ex_data_stat_func.xhp#par00"/>
-
 <paragraph id="par_id14734320631377" role="warning" xml-lang="en-US"><emph>Range1, Range2, ...</emph> and <emph>Criterion1, Criterion2, ...</emph> must have the same size, otherwise the function returns err:502 - Invalid argument.</paragraph>
-
 <embed href="text/scalc/01/ex_data_stat_func.xhp#note01"/>
 <embed href="text/scalc/01/ex_data_stat_func.xhp#par01"/>
-
 <embed href="text/scalc/01/ODFF.xhp#odff"/>
-
 <embed href="text/scalc/01/ex_data_stat_func.xhp#ex_func_average"/>
 <paragraph id="hd_id3861259759512" role="heading" level="4" xml-lang="en-US">Simple usage</paragraph>
 <paragraph id="par_id15856592423333" role="paragraph" xml-lang="en-US"><item type="input">=COUNTIFS(B2:B6;">=20")</item></paragraph>
@@ -57,6 +52,7 @@
 <paragraph id="par_id3245551524846" role="paragraph" xml-lang="en-US">If you need to change a criterion easily, you may want to specify it in a separate cell and use a reference to this cell in the condition of the COUNTIFS function. For example, the above function can be rewritten as follows:</paragraph>
 <paragraph id="par_id109501907712434" role="paragraph" xml-lang="en-US"><item type="input">=COUNTIFS(A2:A6;E2&amp;".*";B2:B6;"&lt;"&amp;MAX(B2:B6))</item></paragraph>
 <paragraph id="par_id738533068520" role="paragraph" xml-lang="en-US">If E2 = pen, the function returns 1, because the link to the cell is substituted with its content and it works as a function above.</paragraph>
+<embed href="text/scalc/06/calcsamplefiles.xhp#func_ifs"/>
 <section id="relatedtopics">
     <paragraph id="par_id14337286612130" role="paragraph" xml-lang="en-US"><link href="text/scalc/01/04060181.xhp#count">COUNT</link>, <link href="text/scalc/01/04060181.xhp#countif">COUNTIF</link>, <link href="text/scalc/01/04060181.xhp#counta">COUNTA</link>, <embedvar href="text/scalc/01/func_sumifs.xhp#sumifs_head"/>, <embedvar href="text/scalc/01/func_minifs.xhp#minifs_head"/>, <embedvar href="text/scalc/01/func_maxifs.xhp#maxifs_head"/>, <embedvar href="text/scalc/01/func_averageifs.xhp#averageifs_head"/>, <link href="text/scalc/01/04060184.xhp#max">MAX</link>, <link href="text/scalc/01/04060184.xhp#min">MIN</link></paragraph>
 <paragraph id="par_id235992404316585" role="paragraph"  localize="false" xml-lang="en-US"><embedvar href="text/shared/01/02100001.xhp#02100001"/></paragraph>
diff --git a/source/text/scalc/06/calcsamplefiles.xhp b/source/text/scalc/06/calcsamplefiles.xhp
index 230baab03e..e79e02bfcb 100644
--- a/source/text/scalc/06/calcsamplefiles.xhp
+++ b/source/text/scalc/06/calcsamplefiles.xhp
@@ -23,5 +23,8 @@
     <section id="pivot">
         <paragraph role="paragraph" id="par_id161521563314918" xml-lang="en-US"><object data="media/files/scalc/pivot.ods" id="ods_id61521547603544" type="application/vnd.oasis.opendocument.spreadsheet" /></paragraph>
     </section>
+    <section id="func_ifs">
+        <paragraph role="paragraph" id="par_id721528312694192" xml-lang="en-US"><object data="media/files/scalc/functions_ifs.ods" id="ods_id61521547603534" type="application/vnd.oasis.opendocument.spreadsheet" /></paragraph>
+    </section>
     </body>
 </helpdocument>