From e5e67c99e8b569eefc91112ff049a89d64affab0 Mon Sep 17 00:00:00 2001 From: Olivier Hallot Date: Mon, 30 Nov 2015 18:22:43 -0200 Subject: 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 Tested-by: Andras Timar (cherry picked from commit 212af7230d3cd56185c9ff8548a2e61b78b6bd6f) Reviewed-on: https://gerrit.libreoffice.org/20323 --- source/text/scalc/01/ful_func.xhp | 17 ++++++----------- source/text/scalc/01/func_imcos.xhp | 4 ++-- source/text/scalc/01/func_imcosh.xhp | 2 +- source/text/scalc/01/func_imcot.xhp | 2 +- source/text/scalc/01/func_imcsc.xhp | 2 +- source/text/scalc/01/func_imcsch.xhp | 2 +- source/text/scalc/01/func_imsec.xhp | 2 +- source/text/scalc/01/func_imsech.xhp | 2 +- source/text/scalc/01/func_imsin.xhp | 2 +- source/text/scalc/01/func_imsinh.xhp | 2 +- source/text/scalc/01/func_imtan.xhp | 2 +- 11 files changed, 17 insertions(+), 22 deletions(-) (limited to 'source') 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 @@ --> - Frequently Used Lexemes + Frequently Used Lexemes text/scalc/01/ful_func.xhp @@ -25,19 +25,19 @@ Examples - + Notes for functions - Complex_number 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 (&) other strings, resulting in a string in the form "a+bi" or "a+bj". + A complex number is a string expression resulting in the form "a+bi" or "a+bj", where a and b are numbers. - If Complex_number is actually a real number (b=0), then it can be either a string expression or a number value. + If the complex number is actually a real number (b=0), then it can be either a string expression or a number value. - + Warnings for functions @@ -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. - + Other paragraphs - - - Complex_number - A string representing a complex number, a real number in either string or number format, or a reference to a cell containing a number - - 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 @@ IMCOS(Complex_number) - whose cosine is to be calculated. + Complex_number is a complex number whose cosine is to be calculated.
@@ -72,4 +72,4 @@ - \ No newline at end of file + 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 @@ IMCOSH(Complex_number) - whose hyperbolic cosine is to be calculated. + Complex_number is a complex number whose hyperbolic cosine is to be calculated.
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 @@ IMCOT(Complex_number) - whose cotangent is to be calculated. + Complex_number is a complex number whose cotangent is to be calculated.
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 @@ IMCSC(Complex_number) - whose cosecant needs to be calculated. + Complex_number is a complex number whose cosecant needs to be calculated.
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 @@ IMCSCH(Complex_number) - whose hyperbolic cosecant needs to be calculated. + Complex_number is a complex number whose hyperbolic cosecant needs to be calculated.
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 @@ IMSEC(Complex_number) - whose secant needs to be calculated. + Complex_number is a complex number whose secant needs to be calculated.
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 @@ IMSECH(Complex_number) - whose hyperbolic secant needs to be calculated. + Complex_number is a complex number whose hyperbolic secant needs to be calculated.
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 @@ IMSIN(Complex_number) - whose sine needs to be calculated. + Complex_number is a complex number whose sine needs to be calculated.
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 @@ IMSINH(Complex_number) - whose hyperbolic sine needs to be calculated. + Complex_number is a complex number whose hyperbolic sine needs to be calculated.
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 @@ IMTAN(Complex_number) - whose tangent is to be calculated. + Complex_number is a complex number whose tangent is to be calculated.
-- cgit