summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Hallot <ohallot@collabora.co.uk>2015-11-30 18:22:43 -0200
committerAndras Timar <andras.timar@collabora.com>2015-12-01 09:52:57 +0000
commite5e67c99e8b569eefc91112ff049a89d64affab0 (patch)
treec2e1312280f4ea3a1b0e9a66a95824ff895236e9
parentee86f7cfdc8087c54c592080e50d03ff2c0c9a76 (diff)
tdf#95968 Do not assemble help text with parts
* Fix for tdf#95968 Help content is composed from strings - unacceptable for some languages * Add do-not-translate attribute to a file title. Change-Id: I4b995bf2d9bdc215bdacee8611291e1d2f5bca8b Reviewed-on: https://gerrit.libreoffice.org/20313 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit 212af7230d3cd56185c9ff8548a2e61b78b6bd6f) Reviewed-on: https://gerrit.libreoffice.org/20323
-rw-r--r--source/text/scalc/01/ful_func.xhp17
-rw-r--r--source/text/scalc/01/func_imcos.xhp4
-rw-r--r--source/text/scalc/01/func_imcosh.xhp2
-rw-r--r--source/text/scalc/01/func_imcot.xhp2
-rw-r--r--source/text/scalc/01/func_imcsc.xhp2
-rw-r--r--source/text/scalc/01/func_imcsch.xhp2
-rw-r--r--source/text/scalc/01/func_imsec.xhp2
-rw-r--r--source/text/scalc/01/func_imsech.xhp2
-rw-r--r--source/text/scalc/01/func_imsin.xhp2
-rw-r--r--source/text/scalc/01/func_imsinh.xhp2
-rw-r--r--source/text/scalc/01/func_imtan.xhp2
11 files changed, 17 insertions, 22 deletions
diff --git a/source/text/scalc/01/ful_func.xhp b/source/text/scalc/01/ful_func.xhp
index b6ff653610..093579b232 100644
--- a/source/text/scalc/01/ful_func.xhp
+++ b/source/text/scalc/01/ful_func.xhp
@@ -9,7 +9,7 @@
-->
<meta>
<topic id="textscalc01ful_funcxml">
- <title id="tit" xml-lang="en-US">Frequently Used Lexemes</title>
+ <title id="tit" xml-lang="en-US" localize="false">Frequently Used Lexemes</title>
<filename>text/scalc/01/ful_func.xhp</filename>
</topic>
</meta>
@@ -25,19 +25,19 @@
Examples
</paragraph>
</section>
-
+
<comment> Notes for functions </comment>
<paragraph id="par_id2595283314097" role="note" xml-lang="en-US">
<variable id="func_im_comp_numb">
- <emph>Complex_number</emph> is a complex number that is entered in the form "a+bi" or "a+bj", or is the result of a string operation with other functions, cell references, or expressed by concatenating (&amp;) other strings, resulting in a string in the form "a+bi" or "a+bj".
+ A <emph>complex number</emph> is a string expression resulting in the form "a+bi" or "a+bj", where a and b are numbers.
</variable>
</paragraph>
<paragraph id="par_id26516178768369" role="note" xml-lang="en-US">
<variable id="func_im_real_numb">
- If <emph>Complex_number</emph> is actually a real number (b=0), then it can be either a string expression or a number value.
+ If the <emph>complex number</emph> is actually a real number (b=0), then it can be either a string expression or a number value.
</variable>
</paragraph>
-
+
<comment>Warnings for functions </comment>
<paragraph id="par_id1566939488738" role="warning" xml-lang="en-US">
<variable id="func_im_return_text">
@@ -49,13 +49,8 @@
If the result is a complex number with one of its parts (a or b) equal to zero, that part is not displayed.
</variable>
</paragraph>
-
+
<comment> Other paragraphs </comment>
- <paragraph id="par_id962376762132" role="paragraph" xml-lang="en-US">
- <variable id="func_define_complex">
- <emph>Complex_number</emph> - A string representing a complex number, a real number in either string or number format, or a reference to a cell containing a number
- </variable>
- </paragraph>
<paragraph id="par_id962376732432" role="paragraph" xml-lang="en-US">
<variable id="func_imag_zero">
The imaginary part is equal to zero, so it is not displayed in the result.
diff --git a/source/text/scalc/01/func_imcos.xhp b/source/text/scalc/01/func_imcos.xhp
index 1e491657a5..a5582ec58e 100644
--- a/source/text/scalc/01/func_imcos.xhp
+++ b/source/text/scalc/01/func_imcos.xhp
@@ -41,7 +41,7 @@
<variable id="imcos">IMCOS</variable>(Complex_number)
</paragraph>
<paragraph id="par_id2890729435632" role="paragraph" xml-lang="en-US">
- <embedvar href="text/scalc/01/ful_func.xhp#func_define_complex"/> whose cosine is to be calculated.
+ Complex_number is a complex number whose cosine is to be calculated.
</paragraph>
<paragraph id="par_id11756847629133" role="note" localize="false" xml-lang="en-US">
<embedvar href="text/scalc/01/ful_func.xhp#func_im_comp_numb"/><br />
@@ -72,4 +72,4 @@
</paragraph>
</section>
</body>
-</helpdocument> \ No newline at end of file
+</helpdocument>
diff --git a/source/text/scalc/01/func_imcosh.xhp b/source/text/scalc/01/func_imcosh.xhp
index a8f44f44a4..80ec8a1f38 100644
--- a/source/text/scalc/01/func_imcosh.xhp
+++ b/source/text/scalc/01/func_imcosh.xhp
@@ -41,7 +41,7 @@
<variable id="imcosh">IMCOSH</variable>(Complex_number)
</paragraph>
<paragraph id="par_id766137661376613" role="paragraph" xml-lang="en-US">
- <embedvar href="text/scalc/01/ful_func.xhp#func_define_complex"/> whose hyperbolic cosine is to be calculated.
+ Complex_number is a complex number whose hyperbolic cosine is to be calculated.
</paragraph>
<paragraph id="par_id193292656220842" role="note" localize="false" xml-lang="en-US">
<embedvar href="text/scalc/01/ful_func.xhp#func_im_comp_numb"/><br />
diff --git a/source/text/scalc/01/func_imcot.xhp b/source/text/scalc/01/func_imcot.xhp
index 9b8b425691..0c40ca5d36 100644
--- a/source/text/scalc/01/func_imcot.xhp
+++ b/source/text/scalc/01/func_imcot.xhp
@@ -45,7 +45,7 @@
<variable id="imcot">IMCOT</variable>(Complex_number)
</paragraph>
<paragraph id="par_id766137661376613" role="paragraph" xml-lang="en-US">
- <embedvar href="text/scalc/01/ful_func.xhp#func_define_complex"/> whose cotangent is to be calculated.
+ Complex_number is a complex number whose cotangent is to be calculated.
</paragraph>
<paragraph id="par_id94162948227556" role="note" localize="false" xml-lang="en-US">
<embedvar href="text/scalc/01/ful_func.xhp#func_im_comp_numb"/><br />
diff --git a/source/text/scalc/01/func_imcsc.xhp b/source/text/scalc/01/func_imcsc.xhp
index 11876adda0..b674eb845c 100644
--- a/source/text/scalc/01/func_imcsc.xhp
+++ b/source/text/scalc/01/func_imcsc.xhp
@@ -45,7 +45,7 @@
<variable id="imcsc">IMCSC</variable>(Complex_number)
</paragraph>
<paragraph id="par_id1899971619670" role="paragraph" xml-lang="en-US">
- <embedvar href="text/scalc/01/ful_func.xhp#func_define_complex"/> whose cosecant needs to be calculated.
+ Complex_number is a complex number whose cosecant needs to be calculated.
</paragraph>
<paragraph id="par_id147911951112700" role="note" localize="false" xml-lang="en-US">
<embedvar href="text/scalc/01/ful_func.xhp#func_im_comp_numb"/><br />
diff --git a/source/text/scalc/01/func_imcsch.xhp b/source/text/scalc/01/func_imcsch.xhp
index 1575c98c2d..5c67e04192 100644
--- a/source/text/scalc/01/func_imcsch.xhp
+++ b/source/text/scalc/01/func_imcsch.xhp
@@ -45,7 +45,7 @@
<variable id="imcsch">IMCSCH</variable>(Complex_number)
</paragraph>
<paragraph id="par_id1899971619670" role="paragraph" xml-lang="en-US">
- <embedvar href="text/scalc/01/ful_func.xhp#func_define_complex"/> whose hyperbolic cosecant needs to be calculated.
+ Complex_number is a complex number whose hyperbolic cosecant needs to be calculated.
</paragraph>
<paragraph id="par_id2596524410490" role="note" localize="false" xml-lang="en-US">
<embedvar href="text/scalc/01/ful_func.xhp#func_im_comp_numb"/><br />
diff --git a/source/text/scalc/01/func_imsec.xhp b/source/text/scalc/01/func_imsec.xhp
index 1eac5d7502..34dd5a9dd8 100644
--- a/source/text/scalc/01/func_imsec.xhp
+++ b/source/text/scalc/01/func_imsec.xhp
@@ -45,7 +45,7 @@
<variable id="imsec">IMSEC</variable>(Complex_number)
</paragraph>
<paragraph id="par_id3186739645701" role="paragraph" xml-lang="en-US">
- <embedvar href="text/scalc/01/ful_func.xhp#func_define_complex"/> whose secant needs to be calculated.
+ Complex_number is a complex number whose secant needs to be calculated.
</paragraph>
<paragraph id="par_id155152794716613" role="note" localize="false" xml-lang="en-US">
<embedvar href="text/scalc/01/ful_func.xhp#func_im_comp_numb"/><br />
diff --git a/source/text/scalc/01/func_imsech.xhp b/source/text/scalc/01/func_imsech.xhp
index 37176fbed5..f0744b39be 100644
--- a/source/text/scalc/01/func_imsech.xhp
+++ b/source/text/scalc/01/func_imsech.xhp
@@ -45,7 +45,7 @@
<variable id="imsech">IMSECH</variable>(Complex_number)
</paragraph>
<paragraph id="par_id31259109804356" role="paragraph" xml-lang="en-US">
- <embedvar href="text/scalc/01/ful_func.xhp#func_define_complex"/> whose hyperbolic secant needs to be calculated.
+ Complex_number is a complex number whose hyperbolic secant needs to be calculated.
</paragraph>
<paragraph id="par_id127061438920586" role="note" localize="false" xml-lang="en-US">
<embedvar href="text/scalc/01/ful_func.xhp#func_im_comp_numb"/><br />
diff --git a/source/text/scalc/01/func_imsin.xhp b/source/text/scalc/01/func_imsin.xhp
index 73b1fa6839..81f679f575 100644
--- a/source/text/scalc/01/func_imsin.xhp
+++ b/source/text/scalc/01/func_imsin.xhp
@@ -41,7 +41,7 @@
<variable id="imsin">IMSIN</variable>(Complex_number)
</paragraph>
<paragraph id="par_id31206835928272" role="paragraph" xml-lang="en-US">
- <embedvar href="text/scalc/01/ful_func.xhp#func_define_complex"/> whose sine needs to be calculated.
+ Complex_number is a complex number whose sine needs to be calculated.
</paragraph>
<paragraph id="par_id100182106819457" role="note" localize="false" xml-lang="en-US">
<embedvar href="text/scalc/01/ful_func.xhp#func_im_comp_numb"/><br />
diff --git a/source/text/scalc/01/func_imsinh.xhp b/source/text/scalc/01/func_imsinh.xhp
index e3bd1dc54a..8df95b97a5 100644
--- a/source/text/scalc/01/func_imsinh.xhp
+++ b/source/text/scalc/01/func_imsinh.xhp
@@ -41,7 +41,7 @@
<variable id="imsinh">IMSINH</variable>(Complex_number)
</paragraph>
<paragraph id="par_id31206835928272" role="paragraph" xml-lang="en-US">
- <embedvar href="text/scalc/01/ful_func.xhp#func_define_complex"/> whose hyperbolic sine needs to be calculated.
+ Complex_number is a complex number whose hyperbolic sine needs to be calculated.
</paragraph>
<paragraph id="par_id100182106819457" role="note" localize="false" xml-lang="en-US">
<embedvar href="text/scalc/01/ful_func.xhp#func_im_comp_numb"/><br />
diff --git a/source/text/scalc/01/func_imtan.xhp b/source/text/scalc/01/func_imtan.xhp
index d8b2c114e3..4d09ccc93c 100644
--- a/source/text/scalc/01/func_imtan.xhp
+++ b/source/text/scalc/01/func_imtan.xhp
@@ -45,7 +45,7 @@
<variable id="imtan">IMTAN</variable>(Complex_number)
</paragraph>
<paragraph id="par_id10242899132094" role="paragraph" xml-lang="en-US">
- <embedvar href="text/scalc/01/ful_func.xhp#func_define_complex"/> whose tangent is to be calculated.
+ Complex_number is a complex number whose tangent is to be calculated.
</paragraph>
<paragraph id="par_id21830101306312" role="note" localize="false" xml-lang="en-US">
<embedvar href="text/scalc/01/ful_func.xhp#func_im_comp_numb"/><br />