This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push: new 4702cb6011 Remove 'oldref' entries (work in progress) 4702cb6011 is described below commit 4702cb60114ebefb8bf41f8af03e6cd5d43b28a5 Author: mseidel <msei...@apache.org> AuthorDate: Tue Feb 6 19:08:13 2024 +0100 Remove 'oldref' entries (work in progress) --- .../source/text/sbasic/shared/00000002.xhp | 33 +++--- .../source/text/sbasic/shared/01030100.xhp | 12 +-- .../source/text/sbasic/shared/02/11050000.xhp | 10 +- .../source/text/sbasic/shared/03050300.xhp | 19 ++-- .../source/text/sbasic/shared/03104000.xhp | 19 ++-- .../helpcontent2/source/text/scalc/01/04060104.xhp | 116 +++++++-------------- .../helpcontent2/source/text/scalc/01/05020000.xhp | 8 +- .../helpcontent2/source/text/scalc/01/05050000.xhp | 10 +- .../helpcontent2/source/text/scalc/01/05050300.xhp | 8 +- .../source/text/scalc/01/func_eastersunday.xhp | 21 ++-- .../source/text/scalc/01/func_hour.xhp | 21 ++-- .../source/text/scalc/01/func_networkdays.xhp | 23 ++-- .../source/text/scalc/01/func_weekday.xhp | 28 +++-- .../source/text/scalc/01/func_weeknum.xhp | 24 ++--- .../source/text/scalc/01/func_workday.xhp | 23 ++-- .../source/text/scalc/guide/text_wrap.xhp | 12 +-- .../source/text/shared/01/05100100.xhp | 16 ++- .../source/text/shared/01/05120600.xhp | 10 +- .../source/text/shared/01/06010500.xhp | 6 +- .../source/text/shared/02/03140000.xhp | 10 +- .../source/text/shared/02/10040000.xhp | 8 +- .../source/text/shared/02/14010000.xhp | 8 +- .../source/text/shared/autopi/01040100.xhp | 6 +- .../source/text/shared/autopi/01120300.xhp | 14 +-- .../text/shared/explorer/database/11000002.xhp | 12 +-- .../source/text/shared/guide/email.xhp | 12 +-- .../source/text/swriter/01/02120100.xhp | 16 +-- .../text/swriter/guide/calculate_intable.xhp | 16 +-- .../source/text/swriter/guide/captions_numbers.xhp | 24 ++--- .../source/text/swriter/guide/fields_enter.xhp | 14 +-- .../source/text/swriter/guide/text_emphasize.xhp | 11 +- main/helpcontent2/source/text/swriter/main0208.xhp | 6 +- 32 files changed, 254 insertions(+), 322 deletions(-) diff --git a/main/helpcontent2/source/text/sbasic/shared/00000002.xhp b/main/helpcontent2/source/text/sbasic/shared/00000002.xhp index 6e3f63ae54..88e3e61257 100644 --- a/main/helpcontent2/source/text/sbasic/shared/00000002.xhp +++ b/main/helpcontent2/source/text/sbasic/shared/00000002.xhp @@ -30,36 +30,35 @@ <comment>fixed #i30799#, added sections and sort element</comment> </meta> <body> -<paragraph role="heading" id="hd_id3145068" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/sbasic/shared/00000002.xhp" name="$[officename] Basic Glossary">$[officename] Basic Glossary</link></paragraph> -<paragraph role="paragraph" id="par_id3150792" xml-lang="en-US" l10n="U" oldref="2">This glossary explains some technical terms that you may come across when working with $[officename] Basic.</paragraph> +<paragraph role="heading" id="hd_id3145068" xml-lang="en-US" level="1" l10n="U"><link href="text/sbasic/shared/00000002.xhp" name="$[officename] Basic Glossary">$[officename] Basic Glossary</link></paragraph> +<paragraph role="paragraph" id="par_id3150792" xml-lang="en-US" l10n="U">This glossary explains some technical terms that you may come across when working with $[officename] Basic.</paragraph> <sort order="asc"> <section id="dezimal"> -<paragraph role="heading" id="hd_id3155133" xml-lang="en-US" level="2" l10n="U" oldref="7">Decimal Point</paragraph> -<paragraph role="paragraph" id="par_id3156443" xml-lang="en-US" l10n="U" oldref="8">When converting numbers, $[officename] Basic uses the locale settings of the system for determining the type of decimal and thousand separator.</paragraph> -<paragraph role="paragraph" id="par_id3153092" xml-lang="en-US" l10n="U" oldref="9">The behavior has an effect on both the implicit conversion ( 1 + "2.3" = 3.3 ) as well as the runtime function <link href="text/sbasic/shared/03102700.xhp" name="IsNumeric">IsNumeric</link>.</paragraph> +<paragraph role="heading" id="hd_id3155133" xml-lang="en-US" level="2" l10n="U">Decimal Point</paragraph> +<paragraph role="paragraph" id="par_id3156443" xml-lang="en-US" l10n="U">When converting numbers, $[officename] Basic uses the locale settings of the system for determining the type of decimal and thousand separator.</paragraph> +<paragraph role="paragraph" id="par_id3153092" xml-lang="en-US" l10n="U">The behavior has an effect on both the implicit conversion ( 1 + "2.3" = 3.3 ) as well as the runtime function <link href="text/sbasic/shared/03102700.xhp" name="IsNumeric">IsNumeric</link>.</paragraph> </section> <section id="colors"> -<paragraph role="heading" id="hd_id3155854" xml-lang="en-US" level="2" l10n="U" oldref="29">Colors</paragraph> -<paragraph role="paragraph" id="par_id3145366" xml-lang="en-US" l10n="U" oldref="30">In $[officename] Basic, colors are treated as long integer value. The return value of color queries is also always a long integer value. When defining properties, colors can be specified using their RGB code that is converted to a long integer value using the <link href="text/sbasic/shared/03010305.xhp" name="RGB function">RGB function</link>.</paragraph> +<paragraph role="heading" id="hd_id3155854" xml-lang="en-US" level="2" l10n="U">Colors</paragraph> +<paragraph role="paragraph" id="par_id3145366" xml-lang="en-US" l10n="U">In $[officename] Basic, colors are treated as long integer value. The return value of color queries is also always a long integer value. When defining properties, colors can be specified using their RGB code that is converted to a long integer value using the <link href="text/sbasic/shared/03010305.xhp" name="RGB function">RGB function</link>.</paragraph> </section> <section id="measurementunits"> -<paragraph role="heading" id="hd_id3146119" xml-lang="en-US" level="2" l10n="U" oldref="32">Measurement Units</paragraph> -<paragraph role="paragraph" id="par_id3154013" xml-lang="en-US" l10n="CHG" oldref="33">In $[officename] Basic, a <emph>method parameter</emph> or a <emph>property</emph> expecting unit information can be specified either as integer or long integer expression without a unit, or as a character string containing a unit. If no unit is passed to the method the default unit defined for the active document type will be used. If the parameter is passed as a character string containing a measurem [...] +<paragraph role="heading" id="hd_id3146119" xml-lang="en-US" level="2" l10n="U">Measurement Units</paragraph> +<paragraph role="paragraph" id="par_id3154013" xml-lang="en-US" l10n="CHG">In $[officename] Basic, a <emph>method parameter</emph> or a <emph>property</emph> expecting unit information can be specified either as integer or long integer expression without a unit, or as a character string containing a unit. If no unit is passed to the method the default unit defined for the active document type will be used. If the parameter is passed as a character string containing a measurement unit, th [...] </section> <section id="twips"> <bookmark xml-lang="en-US" branch="index" id="bm_id3145801"> <bookmark_value>twips; definition</bookmark_value> </bookmark> -<paragraph role="heading" id="hd_id3145801" xml-lang="en-US" level="2" oldref="5">Twips</paragraph> -<paragraph role="paragraph" id="par_id3154731" xml-lang="en-US" l10n="U" oldref="6">A twip is a screen-independent unit which is used to define the uniform position and size of screen elements on all display systems. A twip is 1/1440th of an inch or 1/20 of a printer's point. There are 1440 twips to an inch or about 567 twips to a centimeter.</paragraph> +<paragraph role="heading" id="hd_id3145801" xml-lang="en-US" level="2">Twips</paragraph> +<paragraph role="paragraph" id="par_id3154731" xml-lang="en-US" l10n="U">A twip is a screen-independent unit which is used to define the uniform position and size of screen elements on all display systems. A twip is 1/1440th of an inch or 1/20 of a printer's point. There are 1440 twips to an inch or about 567 twips to a centimeter.</paragraph> </section> <section id="urlnotation"> -<paragraph role="heading" id="hd_id3153159" xml-lang="en-US" level="2" l10n="U" oldref="106">URL Notation</paragraph> -<paragraph role="paragraph" id="par_id3153415" xml-lang="en-US" l10n="U" oldref="108">URLs (<emph>Uniform Resource Locators</emph>) are used to determine the location of a resource like a file in a file system, typically inside a network environment. A URL consists of a protocol specifier, a host specifier and a file and path specifier:</paragraph> -<paragraph role="paragraph" id="par_id3149121" xml-lang="en-US" l10n="U" oldref="107"> -<emph>protocol</emph>://<emph>host.name</emph>/<emph>path/to/the/file.html</emph></paragraph> -<paragraph role="paragraph" id="par_id3168612" xml-lang="en-US" l10n="U" oldref="109">The most common usage of URLs is on the internet when specifying web pages. Example for protocols are <emph>http</emph>, <emph>ftp</emph>, or <emph>file</emph>. The <emph>file</emph> protocol specifier is used when referring to a file on the local file system.</paragraph> -<paragraph role="paragraph" id="par_id3150324" xml-lang="en-US" l10n="U" oldref="110">URL notation does not allow certain special characters to be used. These are either replaced by other characters or encoded. A slash (<emph>/</emph>) is used as a path separator. For example, a file referred to as <emph>C:\My File.odt</emph> on the local host in "Windows notation" becomes <emph>file:///C|/My%20File.odt</emph> in URL notation.</paragraph> +<paragraph role="heading" id="hd_id3153159" xml-lang="en-US" level="2" l10n="U">URL Notation</paragraph> +<paragraph role="paragraph" id="par_id3153415" xml-lang="en-US" l10n="U">URLs (<emph>Uniform Resource Locators</emph>) are used to determine the location of a resource like a file in a file system, typically inside a network environment. A URL consists of a protocol specifier, a host specifier and a file and path specifier:</paragraph> +<paragraph role="paragraph" id="par_id3149121" xml-lang="en-US" l10n="U"><emph>protocol</emph>://<emph>host.name</emph>/<emph>path/to/the/file.html</emph></paragraph> +<paragraph role="paragraph" id="par_id3168612" xml-lang="en-US" l10n="U">The most common usage of URLs is on the internet when specifying web pages. Example for protocols are <emph>http</emph>, <emph>ftp</emph>, or <emph>file</emph>. The <emph>file</emph> protocol specifier is used when referring to a file on the local file system.</paragraph> +<paragraph role="paragraph" id="par_id3150324" xml-lang="en-US" l10n="U">URL notation does not allow certain special characters to be used. These are either replaced by other characters or encoded. A slash (<emph>/</emph>) is used as a path separator. For example, a file referred to as <emph>C:\My File.odt</emph> on the local host in "Windows notation" becomes <emph>file:///C|/My%20File.odt</emph> in URL notation.</paragraph> </section> </sort> </body> diff --git a/main/helpcontent2/source/text/sbasic/shared/01030100.xhp b/main/helpcontent2/source/text/sbasic/shared/01030100.xhp index 6a0d183189..5d42570d76 100644 --- a/main/helpcontent2/source/text/sbasic/shared/01030100.xhp +++ b/main/helpcontent2/source/text/sbasic/shared/01030100.xhp @@ -31,14 +31,14 @@ <body> <bookmark xml-lang="en-US" branch="hid/BASCTL_HID_BASICIDE_MODULWINDOW" id="bm_id3093440" localize="false"/> <section id="ueberblick"> -<paragraph role="heading" id="hd_id3147291" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/sbasic/shared/01030100.xhp" name="IDE Overview">IDE Overview</link></paragraph> +<paragraph role="heading" id="hd_id3147291" xml-lang="en-US" level="1" l10n="U"><link href="text/sbasic/shared/01030100.xhp" name="IDE Overview">IDE Overview</link></paragraph> </section> -<paragraph role="paragraph" id="par_id3156344" xml-lang="en-US" l10n="U" oldref="3">The <link href="text/sbasic/shared/main0211.xhp" name="Macro Toolbar"><emph>Macro Toolbar</emph></link> in the IDE provides various icons for editing and testing programs.</paragraph> -<paragraph role="paragraph" id="par_id3151210" xml-lang="en-US" l10n="U" oldref="4">In the <link href="text/sbasic/shared/01030200.xhp" name="Editor window"><emph>Editor window</emph></link>, directly below the Macro toolbar, you can edit the Basic program code. The column on the left side is used to set breakpoints in the program code.</paragraph> -<paragraph role="paragraph" id="par_id3154686" xml-lang="en-US" l10n="U" oldref="5">The <link href="text/sbasic/shared/01050100.xhp" name="Watch"><emph>Watch window</emph></link> (observer) is located below the Editor window at the left, and displays the contents of variables or arrays during a single step process.</paragraph> -<paragraph role="paragraph" id="par_id3145787" xml-lang="en-US" l10n="U" oldref="8">The <emph>Call Stack</emph> window to the right provides information about the call stack of SUBS and FUNCTIONS when a program runs.</paragraph> +<paragraph role="paragraph" id="par_id3156344" xml-lang="en-US" l10n="U">The <link href="text/sbasic/shared/main0211.xhp" name="Macro Toolbar"><emph>Macro Toolbar</emph></link> in the IDE provides various icons for editing and testing programs.</paragraph> +<paragraph role="paragraph" id="par_id3151210" xml-lang="en-US" l10n="U">In the <link href="text/sbasic/shared/01030200.xhp" name="Editor window"><emph>Editor window</emph></link>, directly below the Macro toolbar, you can edit the Basic program code. The column on the left side is used to set breakpoints in the program code.</paragraph> +<paragraph role="paragraph" id="par_id3154686" xml-lang="en-US" l10n="U">The <link href="text/sbasic/shared/01050100.xhp" name="Watch"><emph>Watch window</emph></link> (observer) is located below the Editor window at the left, and displays the contents of variables or arrays during a single step process.</paragraph> +<paragraph role="paragraph" id="par_id3145787" xml-lang="en-US" l10n="U">The <emph>Call Stack</emph> window to the right provides information about the call stack of SUBS and FUNCTIONS when a program runs.</paragraph> <section id="relatedtopics"> -<paragraph role="paragraph" id="par_id3147434" xml-lang="en-US" l10n="U" oldref="6"><link href="text/sbasic/shared/01050000.xhp" name="Basic IDE">Basic IDE</link></paragraph> +<paragraph role="paragraph" id="par_id3147434" xml-lang="en-US" l10n="U"><link href="text/sbasic/shared/01050000.xhp" name="Basic IDE">Basic IDE</link></paragraph> </section> </body> </helpdocument> diff --git a/main/helpcontent2/source/text/sbasic/shared/02/11050000.xhp b/main/helpcontent2/source/text/sbasic/shared/02/11050000.xhp index e7a35db434..e32eb5231f 100644 --- a/main/helpcontent2/source/text/sbasic/shared/02/11050000.xhp +++ b/main/helpcontent2/source/text/sbasic/shared/02/11050000.xhp @@ -32,10 +32,10 @@ <section id="einzelschritt"> <bookmark xml-lang="en-US" branch="hid/.uno:BasicStepInto" id="bm_id3917322" localize="false"/> <bookmark xml-lang="en-US" branch="hid/.uno:BasicStepInto" id="bm_id3149495" localize="false"/> -<paragraph role="heading" id="hd_id3155934" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/sbasic/shared/02/11050000.xhp" name="Single Step">Single Step</link></paragraph> -<paragraph role="paragraph" id="par_id3146117" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:BasicStepInto">Runs the macro and stops it after the next command.</ahelp></paragraph> +<paragraph role="heading" id="hd_id3155934" xml-lang="en-US" level="1" l10n="U"><link href="text/sbasic/shared/02/11050000.xhp" name="Single Step">Single Step</link></paragraph> +<paragraph role="paragraph" id="par_id3146117" xml-lang="en-US" l10n="U"><ahelp hid=".uno:BasicStepInto">Runs the macro and stops it after the next command.</ahelp></paragraph> </section> -<paragraph role="paragraph" id="par_id3152801" xml-lang="en-US" l10n="CHG" oldref="4">You can use this command in conjunction with the <link href="text/sbasic/shared/02/11080000.xhp" name="Watch">Watch</link> command to troubleshoot errors.</paragraph> +<paragraph role="paragraph" id="par_id3152801" xml-lang="en-US" l10n="CHG">You can use this command in conjunction with the <link href="text/sbasic/shared/02/11080000.xhp" name="Watch">Watch</link> command to troubleshoot errors.</paragraph> <section id="syeinzelschritt"> <table id="tbl_id3153527"> <tablerow> @@ -45,13 +45,13 @@ </image></paragraph> </tablecell> <tablecell colspan="" rowspan=""> -<paragraph role="paragraph" id="par_id3147573" xml-lang="en-US" l10n="U" oldref="3">Single Step</paragraph> +<paragraph role="paragraph" id="par_id3147573" xml-lang="en-US" l10n="U">Single Step</paragraph> </tablecell> </tablerow> </table> </section> <section id="relatedtopics"> -<paragraph role="paragraph" id="par_id3149235" xml-lang="en-US" l10n="CHG" oldref="6"><link href="text/sbasic/shared/02/11060000.xhp" name="Procedure Step function">Procedure Step function</link></paragraph> +<paragraph role="paragraph" id="par_id3149235" xml-lang="en-US" l10n="CHG"><link href="text/sbasic/shared/02/11060000.xhp" name="Procedure Step function">Procedure Step function</link></paragraph> </section> </body> </helpdocument> diff --git a/main/helpcontent2/source/text/sbasic/shared/03050300.xhp b/main/helpcontent2/source/text/sbasic/shared/03050300.xhp index 7908cce3c5..70594f584f 100644 --- a/main/helpcontent2/source/text/sbasic/shared/03050300.xhp +++ b/main/helpcontent2/source/text/sbasic/shared/03050300.xhp @@ -33,17 +33,16 @@ <bookmark xml-lang="en-US" branch="index" id="bm_id3159413"> <bookmark_value>Error function</bookmark_value> </bookmark> -<paragraph role="heading" id="hd_id3159413" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/sbasic/shared/03050300.xhp" name="Error Function [Runtime]">Error Function [Runtime]</link></paragraph> -<paragraph role="paragraph" id="par_id3148663" xml-lang="en-US" l10n="U" oldref="2">Returns the error message that corresponds to a given error code.</paragraph> +<paragraph role="heading" id="hd_id3159413" xml-lang="en-US" level="1" l10n="U"><link href="text/sbasic/shared/03050300.xhp" name="Error Function [Runtime]">Error Function [Runtime]</link></paragraph> +<paragraph role="paragraph" id="par_id3148663" xml-lang="en-US" l10n="U">Returns the error message that corresponds to a given error code.</paragraph> </section> -<paragraph role="heading" id="hd_id3153379" xml-lang="en-US" level="2" l10n="U" oldref="3">Syntax:</paragraph> -<paragraph role="paragraph" id="par_id3154366" xml-lang="en-US" l10n="U" oldref="4">Error (Expression)</paragraph> -<paragraph role="heading" id="hd_id3145173" xml-lang="en-US" level="2" l10n="U" oldref="5">Return value:</paragraph> -<paragraph role="paragraph" id="par_id3154125" xml-lang="en-US" l10n="U" oldref="6">String</paragraph> -<paragraph role="heading" id="hd_id3150869" xml-lang="en-US" level="2" l10n="U" oldref="7">Parameters:</paragraph> -<paragraph role="paragraph" id="par_id3153193" xml-lang="en-US" l10n="U" oldref="8"> -<emph>Expression:</emph> Any numeric expression that contains the error code of the error message that you want to return.</paragraph> -<paragraph role="paragraph" id="par_id3159254" xml-lang="en-US" l10n="U" oldref="9">If no parameters are passed, the Error function returns the error message of the most recent error that occurred during program execution.</paragraph> +<paragraph role="heading" id="hd_id3153379" xml-lang="en-US" level="2" l10n="U">Syntax:</paragraph> +<paragraph role="paragraph" id="par_id3154366" xml-lang="en-US" l10n="U">Error (Expression)</paragraph> +<paragraph role="heading" id="hd_id3145173" xml-lang="en-US" level="2" l10n="U">Return value:</paragraph> +<paragraph role="paragraph" id="par_id3154125" xml-lang="en-US" l10n="U">String</paragraph> +<paragraph role="heading" id="hd_id3150869" xml-lang="en-US" level="2" l10n="U">Parameters:</paragraph> +<paragraph role="paragraph" id="par_id3153193" xml-lang="en-US" l10n="U"><emph>Expression:</emph> Any numeric expression that contains the error code of the error message that you want to return.</paragraph> +<paragraph role="paragraph" id="par_id3159254" xml-lang="en-US" l10n="U">If no parameters are passed, the Error function returns the error message of the most recent error that occurred during program execution.</paragraph> <embed href="text/sbasic/shared/00000003.xhp#errorcode"/> <embed href="text/sbasic/shared/00000003.xhp#allerrors"/><comment>fixed i60953</comment> </body> diff --git a/main/helpcontent2/source/text/sbasic/shared/03104000.xhp b/main/helpcontent2/source/text/sbasic/shared/03104000.xhp index 7b3d155ef1..2cc91c2d36 100644 --- a/main/helpcontent2/source/text/sbasic/shared/03104000.xhp +++ b/main/helpcontent2/source/text/sbasic/shared/03104000.xhp @@ -33,17 +33,16 @@ <bookmark xml-lang="en-US" branch="index" id="bm_id3153527"> <bookmark_value>IsMissing function</bookmark_value> </bookmark> -<paragraph role="heading" id="hd_id3153527" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/sbasic/shared/03104000.xhp" name="IsMissing function [Runtime]">IsMissing function [Runtime]</link></paragraph> -<paragraph role="paragraph" id="par_id3153825" xml-lang="en-US" l10n="U" oldref="2">Tests if a function is called with an optional parameter.</paragraph> +<paragraph role="heading" id="hd_id3153527" xml-lang="en-US" level="1" l10n="U"><link href="text/sbasic/shared/03104000.xhp" name="IsMissing function [Runtime]">IsMissing function [Runtime]</link></paragraph> +<paragraph role="paragraph" id="par_id3153825" xml-lang="en-US" l10n="U">Tests if a function is called with an optional parameter.</paragraph> </section> -<paragraph role="paragraph" id="par_id3150669" xml-lang="en-US" l10n="U" oldref="3">See also: <link href="text/sbasic/shared/03104100.xhp" name="Optional">Optional</link></paragraph> -<paragraph role="heading" id="hd_id3145611" xml-lang="en-US" level="2" l10n="U" oldref="4">Syntax:</paragraph> -<paragraph role="paragraph" id="par_id3154924" xml-lang="en-US" l10n="U" oldref="5">IsMissing( ArgumentName )</paragraph> -<paragraph role="heading" id="hd_id3145069" xml-lang="en-US" level="2" l10n="U" oldref="6">Parameters:</paragraph> -<paragraph role="paragraph" id="par_id3149457" xml-lang="en-US" l10n="U" oldref="7"> -<emph>ArgumentName:</emph> the name of an optional argument.</paragraph> -<paragraph role="paragraph" id="par_id3150398" xml-lang="en-US" l10n="U" oldref="8">If the IsMissing function is called by the ArgumentName, then True is returned.</paragraph> -<paragraph role="paragraph" id="par_id3148798" xml-lang="en-US" l10n="U" oldref="9">See also <link href="text/sbasic/guide/sample_code.xhp" name="Examples">Examples</link>.</paragraph> +<paragraph role="paragraph" id="par_id3150669" xml-lang="en-US" l10n="U">See also: <link href="text/sbasic/shared/03104100.xhp" name="Optional">Optional</link></paragraph> +<paragraph role="heading" id="hd_id3145611" xml-lang="en-US" level="2" l10n="U">Syntax:</paragraph> +<paragraph role="paragraph" id="par_id3154924" xml-lang="en-US" l10n="U">IsMissing( ArgumentName )</paragraph> +<paragraph role="heading" id="hd_id3145069" xml-lang="en-US" level="2" l10n="U">Parameters:</paragraph> +<paragraph role="paragraph" id="par_id3149457" xml-lang="en-US" l10n="U"><emph>ArgumentName:</emph> the name of an optional argument.</paragraph> +<paragraph role="paragraph" id="par_id3150398" xml-lang="en-US" l10n="U">If the IsMissing function is called by the ArgumentName, then True is returned.</paragraph> +<paragraph role="paragraph" id="par_id3148798" xml-lang="en-US" l10n="U">See also <link href="text/sbasic/guide/sample_code.xhp" name="Examples">Examples</link>.</paragraph> <embed href="text/sbasic/shared/00000003.xhp#errorcode"/> <embed href="text/sbasic/shared/00000003.xhp#err5"/> </body> diff --git a/main/helpcontent2/source/text/scalc/01/04060104.xhp b/main/helpcontent2/source/text/scalc/01/04060104.xhp index 41afb4281e..2069c77574 100644 --- a/main/helpcontent2/source/text/scalc/01/04060104.xhp +++ b/main/helpcontent2/source/text/scalc/01/04060104.xhp @@ -34,156 +34,110 @@ <bookmark_value>Function Wizard; information</bookmark_value> <bookmark_value>functions; information functions</bookmark_value> </bookmark> -<paragraph role="heading" id="hd_id3147247" xml-lang="en-US" level="1" l10n="U" oldref="1">Information Functions</paragraph> -<paragraph role="paragraph" id="par_id3147499" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="informationtext">This category contains the <emph>Information</emph> functions. +<paragraph role="heading" id="hd_id3147247" xml-lang="en-US" level="1" l10n="U">Information Functions</paragraph> +<paragraph role="paragraph" id="par_id3147499" xml-lang="en-US" l10n="CHG"><variable id="informationtext">This category contains the <emph>Information</emph> functions. </variable></paragraph> <section id="howtoget"> <embed href="text/scalc/00/00000404.xhp#eikain"/> </section> -<paragraph role="paragraph" id="par_id3159128" xml-lang="en-US" l10n="U" oldref="3">The data in the following table serves as the basis for some of the examples in the function descriptions:</paragraph> +<paragraph role="paragraph" id="par_id3159128" xml-lang="en-US" l10n="U">The data in the following table serves as the basis for some of the examples in the function descriptions:</paragraph> <table id="tbl_id3157876"> <tablerow> <tablecell> </tablecell> <tablecell> -<paragraph role="tablehead" id="par_id3146885" xml-lang="en-US" l10n="U" oldref="4">C</paragraph> +<paragraph role="tablehead" id="par_id3146885" xml-lang="en-US" l10n="U">C</paragraph> </tablecell> <tablecell> -<paragraph role="tablehead" id="par_id3149944" xml-lang="en-US" l10n="U" oldref="5">D</paragraph> +<paragraph role="tablehead" id="par_id3149944" xml-lang="en-US" l10n="U">D</paragraph> </tablecell> </tablerow> <tablerow> <tablecell> -<paragraph role="tablecontent" id="par_id3150457" xml-lang="en-US" l10n="U" oldref="6"> -<emph>2</emph> -</paragraph> +<paragraph role="tablecontent" id="par_id3150457" xml-lang="en-US" l10n="U"><emph>2</emph></paragraph> </tablecell> <tablecell> -<paragraph role="tablecontent" id="par_id3150024" xml-lang="en-US" l10n="U" oldref="7">x <item type="input">value</item> -</paragraph> +<paragraph role="tablecontent" id="par_id3150024" xml-lang="en-US" l10n="U">x <item type="input">value</item></paragraph> </tablecell> <tablecell> -<paragraph role="tablecontent" id="par_id3148725" xml-lang="en-US" l10n="U" oldref="8">y <item type="input">value</item> -</paragraph> +<paragraph role="tablecontent" id="par_id3148725" xml-lang="en-US" l10n="U">y <item type="input">value</item></paragraph> </tablecell> </tablerow> <tablerow> <tablecell> -<paragraph role="tablecontent" id="par_id3150480" xml-lang="en-US" l10n="U" oldref="9"> -<emph>3</emph> -</paragraph> +<paragraph role="tablecontent" id="par_id3150480" xml-lang="en-US" l10n="U"><emph>3</emph></paragraph> </tablecell> <tablecell> -<paragraph role="tablecontent" id="par_id3148440" xml-lang="en-US" l10n="U" oldref="10"> -<item type="input">-5</item> -</paragraph> +<paragraph role="tablecontent" id="par_id3148440" xml-lang="en-US" l10n="U"><item type="input">-5</item></paragraph> </tablecell> <tablecell> -<paragraph role="tablecontent" id="par_id3148888" xml-lang="en-US" l10n="U" oldref="11"> -<item type="input">-3</item> -</paragraph> +<paragraph role="tablecontent" id="par_id3148888" xml-lang="en-US" l10n="U"><item type="input">-3</item></paragraph> </tablecell> </tablerow> <tablerow> <tablecell> -<paragraph role="tablecontent" id="par_id3153034" xml-lang="en-US" l10n="U" oldref="12"> -<emph>4</emph> -</paragraph> +<paragraph role="tablecontent" id="par_id3153034" xml-lang="en-US" l10n="U"><emph>4</emph></paragraph> </tablecell> <tablecell> -<paragraph role="tablecontent" id="par_id3150139" xml-lang="en-US" l10n="U" oldref="13"> -<item type="input">-2</item> -</paragraph> +<paragraph role="tablecontent" id="par_id3150139" xml-lang="en-US" l10n="U"><item type="input">-2</item></paragraph> </tablecell> <tablecell> -<paragraph role="tablecontent" id="par_id3149542" xml-lang="en-US" l10n="U" oldref="14"> -<item type="input">0</item> -</paragraph> +<paragraph role="tablecontent" id="par_id3149542" xml-lang="en-US" l10n="U"><item type="input">0</item></paragraph> </tablecell> </tablerow> <tablerow> <tablecell> -<paragraph role="tablecontent" id="par_id3149188" xml-lang="en-US" l10n="U" oldref="15"> -<emph>5</emph> -</paragraph> +<paragraph role="tablecontent" id="par_id3149188" xml-lang="en-US" l10n="U"><emph>5</emph></paragraph> </tablecell> <tablecell> -<paragraph role="tablecontent" id="par_id3153329" xml-lang="en-US" l10n="U" oldref="16"> -<item type="input">-1</item> -</paragraph> +<paragraph role="tablecontent" id="par_id3153329" xml-lang="en-US" l10n="U"><item type="input">-1</item></paragraph> </tablecell> <tablecell> -<paragraph role="tablecontent" id="par_id3155257" xml-lang="en-US" l10n="U" oldref="17"> -<item type="input">1</item> -</paragraph> +<paragraph role="tablecontent" id="par_id3155257" xml-lang="en-US" l10n="U"><item type="input">1</item></paragraph> </tablecell> </tablerow> <tablerow> <tablecell> -<paragraph role="tablecontent" id="par_id3145142" xml-lang="en-US" l10n="U" oldref="18"> -<emph>6</emph> -</paragraph> +<paragraph role="tablecontent" id="par_id3145142" xml-lang="en-US" l10n="U"><emph>6</emph></paragraph> </tablecell> <tablecell> -<paragraph role="tablecontent" id="par_id3149956" xml-lang="en-US" l10n="U" oldref="19"> -<item type="input">0</item> -</paragraph> +<paragraph role="tablecontent" id="par_id3149956" xml-lang="en-US" l10n="U"><item type="input">0</item></paragraph> </tablecell> <tablecell> -<paragraph role="tablecontent" id="par_id3145594" xml-lang="en-US" l10n="U" oldref="20"> -<item type="input">3</item> -</paragraph> +<paragraph role="tablecontent" id="par_id3145594" xml-lang="en-US" l10n="U"><item type="input">3</item></paragraph> </tablecell> </tablerow> <tablerow> <tablecell> -<paragraph role="tablecontent" id="par_id3153113" xml-lang="en-US" l10n="U" oldref="21"> -<emph>7</emph> -</paragraph> +<paragraph role="tablecontent" id="par_id3153113" xml-lang="en-US" l10n="U"><emph>7</emph></paragraph> </tablecell> <tablecell> -<paragraph role="tablecontent" id="par_id3148573" xml-lang="en-US" l10n="U" oldref="22"> -<item type="input">2</item> -</paragraph> +<paragraph role="tablecontent" id="par_id3148573" xml-lang="en-US" l10n="U"><item type="input">2</item></paragraph> </tablecell> <tablecell> -<paragraph role="tablecontent" id="par_id3145166" xml-lang="en-US" l10n="U" oldref="23"> -<item type="input">4</item> -</paragraph> +<paragraph role="tablecontent" id="par_id3145166" xml-lang="en-US" l10n="U"><item type="input">4</item></paragraph> </tablecell> </tablerow> <tablerow> <tablecell> -<paragraph role="tablecontent" id="par_id3157998" xml-lang="en-US" l10n="U" oldref="24"> -<emph>8</emph> -</paragraph> +<paragraph role="tablecontent" id="par_id3157998" xml-lang="en-US" l10n="U"><emph>8</emph></paragraph> </tablecell> <tablecell> -<paragraph role="tablecontent" id="par_id3150018" xml-lang="en-US" l10n="U" oldref="25"> -<item type="input">4</item> -</paragraph> +<paragraph role="tablecontent" id="par_id3150018" xml-lang="en-US" l10n="U"><item type="input">4</item></paragraph> </tablecell> <tablecell> -<paragraph role="tablecontent" id="par_id3150129" xml-lang="en-US" l10n="U" oldref="26"> -<item type="input">6</item> -</paragraph> +<paragraph role="tablecontent" id="par_id3150129" xml-lang="en-US" l10n="U"><item type="input">6</item></paragraph> </tablecell> </tablerow> <tablerow> <tablecell> -<paragraph role="tablecontent" id="par_id3145245" xml-lang="en-US" l10n="U" oldref="27"> -<emph>9</emph> -</paragraph> +<paragraph role="tablecontent" id="par_id3145245" xml-lang="en-US" l10n="U"><emph>9</emph></paragraph> </tablecell> <tablecell> -<paragraph role="tablecontent" id="par_id3148389" xml-lang="en-US" l10n="U" oldref="28"> -<item type="input">6</item> -</paragraph> +<paragraph role="tablecontent" id="par_id3148389" xml-lang="en-US" l10n="U"><item type="input">6</item></paragraph> </tablecell> <tablecell> -<paragraph role="tablecontent" id="par_id3156068" xml-lang="en-US" l10n="U" oldref="29"> -<item type="input">8</item> -</paragraph> +<paragraph role="tablecontent" id="par_id3156068" xml-lang="en-US" l10n="U"><item type="input">8</item></paragraph> </tablecell> </tablerow> </table> @@ -220,7 +174,7 @@ <paragraph role="tablecontent" id="par_id8193914" xml-lang="en-US" l10n="NEW">"system"</paragraph> </tablecell> <tablecell> -<paragraph role="tablecontent" id="par_id9841608" xml-lang="en-US" l10n="NEW">The type of the operating system. <br/>"WNT" for Microsoft Windows <br/>"LINUX" for Linux <br/>"SOLARIS" for Solaris</paragraph> +<paragraph role="tablecontent" id="par_id9841608" xml-lang="en-US" l10n="NEW">The type of the operating system.<br/>"WNT" for Microsoft Windows<br/>"LINUX" for Linux<br/>"SOLARIS" for Solaris</paragraph> </tablecell> </tablerow> <tablerow> @@ -260,11 +214,11 @@ <bookmark_value>CURRENT function</bookmark_value> </bookmark> <bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_AKTUELL" id="bm_id3145295" localize="false"/> -<paragraph role="heading" id="hd_id3155625" xml-lang="en-US" level="2" l10n="U" oldref="30">CURRENT</paragraph> -<paragraph role="paragraph" id="par_id3157975" xml-lang="en-US" l10n="CHG" oldref="31"><ahelp hid="HID_FUNC_AKTUELL">This function returns the result to date of evaluating the formula of which it is a part (in other words the result as far as that evaluation has got). Its main use is together with the STYLE() function to apply selected styles to a cell depending on the cell contents.</ahelp></paragraph> -<paragraph role="heading" id="hd_id3148880" xml-lang="en-US" level="3" l10n="U" oldref="32">Syntax</paragraph> -<paragraph role="code" id="par_id3150930" xml-lang="en-US" l10n="U" oldref="33">CURRENT()</paragraph> -<paragraph role="heading" id="hd_id3145629" xml-lang="en-US" level="3" l10n="U" oldref="34">Example</paragraph> +<paragraph role="heading" id="hd_id3155625" xml-lang="en-US" level="2" l10n="U">CURRENT</paragraph> +<paragraph role="paragraph" id="par_id3157975" xml-lang="en-US" l10n="CHG"><ahelp hid="HID_FUNC_AKTUELL">This function returns the result to date of evaluating the formula of which it is a part (in other words the result as far as that evaluation has got). Its main use is together with the STYLE() function to apply selected styles to a cell depending on the cell contents.</ahelp></paragraph> +<paragraph role="heading" id="hd_id3148880" xml-lang="en-US" level="3" l10n="U">Syntax</paragraph> +<paragraph role="code" id="par_id3150930" xml-lang="en-US" l10n="U">CURRENT()</paragraph> +<paragraph role="heading" id="hd_id3145629" xml-lang="en-US" level="3" l10n="U">Example</paragraph> <paragraph role="paragraph" id="par_id5919064" xml-lang="en-US" l10n="NEW"> <item type="input">=1+2+CURRENT()</item> </paragraph> diff --git a/main/helpcontent2/source/text/scalc/01/05020000.xhp b/main/helpcontent2/source/text/scalc/01/05020000.xhp index ee7c94e46b..e14d8fff82 100644 --- a/main/helpcontent2/source/text/scalc/01/05020000.xhp +++ b/main/helpcontent2/source/text/scalc/01/05020000.xhp @@ -37,15 +37,15 @@ </bookmark> <bookmark xml-lang="en-US" branch="hid/.uno:FormatCellDialog" id="bm_id6056664" localize="false"/> <bookmark xml-lang="en-US" branch="hid/.uno:FormatCellDialog" id="bm_id3150791" localize="false"/> -<paragraph role="heading" id="hd_id3148663" xml-lang="en-US" level="1" l10n="U" oldref="1">Format Cells</paragraph> -<paragraph role="paragraph" id="par_id3150448" xml-lang="en-US" l10n="U" oldref="2"><variable id="zellattributetext"><ahelp hid=".uno:FormatCellDialog">Allows you to specify a variety of formatting options and to apply attributes to the selected cells.</ahelp> +<paragraph role="heading" id="hd_id3148663" xml-lang="en-US" level="1" l10n="U">Format Cells</paragraph> +<paragraph role="paragraph" id="par_id3150448" xml-lang="en-US" l10n="U"><variable id="zellattributetext"><ahelp hid=".uno:FormatCellDialog">Allows you to specify a variety of formatting options and to apply attributes to the selected cells.</ahelp> </variable></paragraph> <section id="howtoget"> <embed href="text/scalc/00/00000405.xhp#fozelle"/> </section> -<paragraph role="heading" id="hd_id3145785" xml-lang="en-US" level="2" l10n="U" oldref="3"><link href="text/shared/01/05020300.xhp" name="Numbers">Numbers</link></paragraph> +<paragraph role="heading" id="hd_id3145785" xml-lang="en-US" level="2" l10n="U"><link href="text/shared/01/05020300.xhp" name="Numbers">Numbers</link></paragraph> <embed href="text/shared/01/05020300.xhp#zahlen"/> -<paragraph role="heading" id="hd_id3146119" xml-lang="en-US" level="2" l10n="U" oldref="4"><link href="text/shared/01/05020100.xhp" name="Font">Font</link></paragraph> +<paragraph role="heading" id="hd_id3146119" xml-lang="en-US" level="2" l10n="U"><link href="text/shared/01/05020100.xhp" name="Font">Font</link></paragraph> <embed href="text/shared/01/05020100.xhp#zn"/> <switch select="appl"> <case select="CHART"> diff --git a/main/helpcontent2/source/text/scalc/01/05050000.xhp b/main/helpcontent2/source/text/scalc/01/05050000.xhp index 77b199e4c4..30d39019f5 100644 --- a/main/helpcontent2/source/text/scalc/01/05050000.xhp +++ b/main/helpcontent2/source/text/scalc/01/05050000.xhp @@ -37,18 +37,18 @@ <bookmark_value>right-to-left text;spreadsheets</bookmark_value> </bookmark><comment>mw changed "right-to-left;..."</comment> <bookmark xml-lang="en-US" branch="hid/.uno:SheetMenu" id="bm_id5620899" localize="false"/> -<paragraph role="heading" id="hd_id3155923" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/scalc/01/05050000.xhp" name="Sheet">Sheet</link></paragraph> -<paragraph role="paragraph" id="par_id3154758" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".">Sets the sheet name and hides or shows selected sheets.</ahelp></paragraph> +<paragraph role="heading" id="hd_id3155923" xml-lang="en-US" level="1" l10n="U"><link href="text/scalc/01/05050000.xhp" name="Sheet">Sheet</link></paragraph> +<paragraph role="paragraph" id="par_id3154758" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Sets the sheet name and hides or shows selected sheets.</ahelp></paragraph> </section> <section id="howtoget"> <embed href="text/scalc/00/00000405.xhp#fot"/> </section> -<paragraph role="heading" id="hd_id3156280" xml-lang="en-US" level="2" l10n="U" oldref="3"><link href="text/scalc/01/05050100.xhp" name="Rename">Rename</link></paragraph> +<paragraph role="heading" id="hd_id3156280" xml-lang="en-US" level="2" l10n="U"><link href="text/scalc/01/05050100.xhp" name="Rename">Rename</link></paragraph> <embed href="text/scalc/01/05050100.xhp#umbenennentext"/> <embed href="text/scalc/01/05030300.xhp#ausblenden"/> -<paragraph role="heading" id="hd_id3145787" xml-lang="en-US" level="2" l10n="U" oldref="4"><link href="text/scalc/01/05050300.xhp" name="Show">Show</link></paragraph> +<paragraph role="heading" id="hd_id3145787" xml-lang="en-US" level="2" l10n="U"><link href="text/scalc/01/05050300.xhp" name="Show">Show</link></paragraph> <embed href="text/scalc/01/05050300.xhp#tabeintext"/> -<paragraph role="paragraph" id="par_id3150542" xml-lang="en-US" l10n="U" oldref="5">If a sheet has been hidden, the Show Sheet dialog opens, which allows you to select a sheet to be shown again.</paragraph> +<paragraph role="paragraph" id="par_id3150542" xml-lang="en-US" l10n="U">If a sheet has been hidden, the Show Sheet dialog opens, which allows you to select a sheet to be shown again.</paragraph> <bookmark xml-lang="en-US" branch="hid/.uno:SheetRightToLeft" id="bm_id9923771" localize="false"/> <bookmark xml-lang="en-US" branch="hid/.uno:SheetRightToLeft" id="bm_id2235175" localize="false"/> <paragraph role="heading" id="par_idN10656" xml-lang="en-US" level="2" l10n="NEW">Right-To-Left</paragraph> diff --git a/main/helpcontent2/source/text/scalc/01/05050300.xhp b/main/helpcontent2/source/text/scalc/01/05050300.xhp index d6de0fd976..d069ed7b57 100644 --- a/main/helpcontent2/source/text/scalc/01/05050300.xhp +++ b/main/helpcontent2/source/text/scalc/01/05050300.xhp @@ -35,13 +35,13 @@ </bookmark> <bookmark xml-lang="en-US" branch="hid/.uno:Show" id="bm_id8296013" localize="false"/><!-- HID added by script --> <bookmark branch="hid/.uno:Show" xml-lang="en-US" id="bm_id3150542"/> -<paragraph role="heading" level="1" id="hd_id3148946" l10n="U" xml-lang="en-US" oldref="1">Show Sheet</paragraph> -<paragraph l10n="U" xml-lang="en-US" role="paragraph" id="par_id3148799" oldref="2"><variable id="tabeintext"><ahelp visibility="visible" hid=".uno:Show">Displays sheets that were previously hidden with the <emph>Hide</emph> command.</ahelp></variable> Select one sheet only to call the command. The current sheet is always selected. If a sheet other than the current sheet is selected, you can deselect it by pressing <switchinline select="sys"> <caseinline select="MAC">Command</caseinline> [...] +<paragraph role="heading" level="1" id="hd_id3148946" l10n="U" xml-lang="en-US">Show Sheet</paragraph> +<paragraph l10n="U" xml-lang="en-US" role="paragraph" id="par_id3148799"><variable id="tabeintext"><ahelp visibility="visible" hid=".uno:Show">Displays sheets that were previously hidden with the <emph>Hide</emph> command.</ahelp></variable> Select one sheet only to call the command. The current sheet is always selected. If a sheet other than the current sheet is selected, you can deselect it by pressing <switchinline select="sys"> <caseinline select="MAC">Command</caseinline> <defaultin [...] <section id="howtoget"> <embed href="text/scalc/00/00000405.xhp#fotenb"/> </section> <bookmark branch="hid/sc:MultiListBox:RID_SCDLG_SHOW_TAB:LB_ENTRYLIST" xml-lang="en-US" id="bm_id3149260"/> -<paragraph role="heading" level="2" id="hd_id3151112" l10n="U" xml-lang="en-US" oldref="3">Hidden sheets</paragraph> -<paragraph l10n="U" role="paragraph" id="par_id3145273" xml-lang="en-US" oldref="4"><ahelp hid="SC:MULTILISTBOX:RID_SCDLG_SHOW_TAB:LB_ENTRYLIST" visibility="visible">Displays a list of all hidden sheets in your spreadsheet document.</ahelp> To show a certain sheet, click the corresponding entry on the list and confirm with OK.</paragraph> +<paragraph role="heading" level="2" id="hd_id3151112" l10n="U" xml-lang="en-US">Hidden sheets</paragraph> +<paragraph l10n="U" role="paragraph" id="par_id3145273" xml-lang="en-US"><ahelp hid="SC:MULTILISTBOX:RID_SCDLG_SHOW_TAB:LB_ENTRYLIST" visibility="visible">Displays a list of all hidden sheets in your spreadsheet document.</ahelp> To show a certain sheet, click the corresponding entry on the list and confirm with OK.</paragraph> </body> </helpdocument> diff --git a/main/helpcontent2/source/text/scalc/01/func_eastersunday.xhp b/main/helpcontent2/source/text/scalc/01/func_eastersunday.xhp index 1b7022d39f..31a26407de 100644 --- a/main/helpcontent2/source/text/scalc/01/func_eastersunday.xhp +++ b/main/helpcontent2/source/text/scalc/01/func_eastersunday.xhp @@ -33,19 +33,18 @@ <bookmark_value>EASTERSUNDAY function</bookmark_value> </bookmark> <bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_OSTERSONNTAG" id="bm_id3156270" localize="false"/> -<paragraph role="heading" id="hd_id3152960" xml-lang="en-US" level="2" l10n="U" oldref="175"><variable id="eastersunday"><link href="text/scalc/01/func_eastersunday.xhp">EASTERSUNDAY</link> +<paragraph role="heading" id="hd_id3152960" xml-lang="en-US" level="2" l10n="U"><variable id="eastersunday"><link href="text/scalc/01/func_eastersunday.xhp">EASTERSUNDAY</link> </variable></paragraph> -<paragraph role="paragraph" id="par_id3154570" xml-lang="en-US" l10n="U" oldref="176"><ahelp hid="HID_FUNC_OSTERSONNTAG">Returns the date of Easter Sunday for the entered year.</ahelp></paragraph> +<paragraph role="paragraph" id="par_id3154570" xml-lang="en-US" l10n="U"><ahelp hid="HID_FUNC_OSTERSONNTAG">Returns the date of Easter Sunday for the entered year.</ahelp></paragraph> <paragraph role="heading" id="hd_id9460127" xml-lang="en-US" level="3" l10n="NEW">Syntax</paragraph> <paragraph role="code" id="par_id2113711" xml-lang="en-US" l10n="NEW">EASTERSUNDAY(Year)</paragraph> -<paragraph role="paragraph" id="par_id3938413" xml-lang="en-US" l10n="NEW"> -<emph>Year</emph> is an integer between 1583 and 9956 or 0 and 99. You can also calculate other holidays by simple addition with this date.</paragraph> -<paragraph role="paragraph" id="par_id3156156" xml-lang="en-US" l10n="U" oldref="177">Easter Monday = EASTERSUNDAY(Year) + 1</paragraph> -<paragraph role="paragraph" id="par_id3147521" xml-lang="en-US" l10n="U" oldref="178">Good Friday = EASTERSUNDAY(Year) - 2</paragraph> -<paragraph role="paragraph" id="par_id3146072" xml-lang="en-US" l10n="U" oldref="179">Pentecost Sunday = EASTERSUNDAY(Year) + 49</paragraph> -<paragraph role="paragraph" id="par_id3149553" xml-lang="en-US" l10n="U" oldref="180">Pentecost Monday = EASTERSUNDAY(Year) + 50</paragraph> -<paragraph role="heading" id="hd_id3155120" xml-lang="en-US" level="3" l10n="U" oldref="181">Examples</paragraph> -<paragraph role="paragraph" id="par_id3154472" xml-lang="en-US" l10n="CHG" oldref="182">=EASTERSUNDAY(2000) returns 2000-04-23.</paragraph> -<paragraph role="paragraph" id="par_id3150940" xml-lang="en-US" l10n="CHG" oldref="184">EASTERSUNDAY(2000)+49 returns the internal serial number 36688. The result is 2000-06-11. Format the serial date number as a date, for example in the format YYYY-MM-DD.</paragraph> +<paragraph role="paragraph" id="par_id3938413" xml-lang="en-US" l10n="NEW"><emph>Year</emph> is an integer between 1583 and 9956 or 0 and 99. You can also calculate other holidays by simple addition with this date.</paragraph> +<paragraph role="paragraph" id="par_id3156156" xml-lang="en-US" l10n="U">Easter Monday = EASTERSUNDAY(Year) + 1</paragraph> +<paragraph role="paragraph" id="par_id3147521" xml-lang="en-US" l10n="U">Good Friday = EASTERSUNDAY(Year) - 2</paragraph> +<paragraph role="paragraph" id="par_id3146072" xml-lang="en-US" l10n="U">Pentecost Sunday = EASTERSUNDAY(Year) + 49</paragraph> +<paragraph role="paragraph" id="par_id3149553" xml-lang="en-US" l10n="U">Pentecost Monday = EASTERSUNDAY(Year) + 50</paragraph> +<paragraph role="heading" id="hd_id3155120" xml-lang="en-US" level="3" l10n="U">Examples</paragraph> +<paragraph role="paragraph" id="par_id3154472" xml-lang="en-US" l10n="CHG">=EASTERSUNDAY(2000) returns 2000-04-23.</paragraph> +<paragraph role="paragraph" id="par_id3150940" xml-lang="en-US" l10n="CHG">EASTERSUNDAY(2000)+49 returns the internal serial number 36688. The result is 2000-06-11. Format the serial date number as a date, for example in the format YYYY-MM-DD.</paragraph> </body> </helpdocument> diff --git a/main/helpcontent2/source/text/scalc/01/func_hour.xhp b/main/helpcontent2/source/text/scalc/01/func_hour.xhp index 7281329333..2bf454fd29 100644 --- a/main/helpcontent2/source/text/scalc/01/func_hour.xhp +++ b/main/helpcontent2/source/text/scalc/01/func_hour.xhp @@ -33,19 +33,16 @@ <bookmark_value>HOUR function</bookmark_value> </bookmark> <bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_STUNDE" id="bm_id3152469" localize="false"/> -<paragraph role="heading" id="hd_id3154725" xml-lang="en-US" level="2" l10n="U" oldref="96"><variable id="hour"><link href="text/scalc/01/func_hour.xhp">HOUR</link> +<paragraph role="heading" id="hd_id3154725" xml-lang="en-US" level="2" l10n="U"><variable id="hour"><link href="text/scalc/01/func_hour.xhp">HOUR</link> </variable></paragraph> -<paragraph role="paragraph" id="par_id3149747" xml-lang="en-US" l10n="U" oldref="97"><ahelp hid="HID_FUNC_STUNDE">Returns the hour for a given time value.</ahelp> The hour is returned as an integer between 0 and 23.</paragraph> -<paragraph role="heading" id="hd_id3149338" xml-lang="en-US" level="3" l10n="U" oldref="98">Syntax</paragraph> -<paragraph role="code" id="par_id3150637" xml-lang="en-US" l10n="U" oldref="99">HOUR(Number)</paragraph> -<paragraph role="paragraph" id="par_id3147547" xml-lang="en-US" l10n="U" oldref="100"> -<emph>Number</emph>, as a time value, is a decimal, for which the hour is to be returned.</paragraph> -<paragraph role="heading" id="hd_id3153264" xml-lang="en-US" level="3" l10n="U" oldref="101">Examples</paragraph> -<paragraph role="paragraph" id="par_id3159215" xml-lang="en-US" l10n="U" oldref="103"> -<item type="input">=HOUR(NOW())</item> returns the current hour</paragraph> -<paragraph role="paragraph" id="par_id3145152" xml-lang="en-US" l10n="U" oldref="104"> -<item type="input">=HOUR(C4)</item> returns 17 if the contents of C4 = <item type="input">17:20:00</item>.</paragraph> +<paragraph role="paragraph" id="par_id3149747" xml-lang="en-US" l10n="U"><ahelp hid="HID_FUNC_STUNDE">Returns the hour for a given time value.</ahelp> The hour is returned as an integer between 0 and 23.</paragraph> +<paragraph role="heading" id="hd_id3149338" xml-lang="en-US" level="3" l10n="U">Syntax</paragraph> +<paragraph role="code" id="par_id3150637" xml-lang="en-US" l10n="U">HOUR(Number)</paragraph> +<paragraph role="paragraph" id="par_id3147547" xml-lang="en-US" l10n="U"><emph>Number</emph>, as a time value, is a decimal, for which the hour is to be returned.</paragraph> +<paragraph role="heading" id="hd_id3153264" xml-lang="en-US" level="3" l10n="U">Examples</paragraph> +<paragraph role="paragraph" id="par_id3159215" xml-lang="en-US" l10n="U"><item type="input">=HOUR(NOW())</item> returns the current hour</paragraph> +<paragraph role="paragraph" id="par_id3145152" xml-lang="en-US" l10n="U"><item type="input">=HOUR(C4)</item> returns 17 if the contents of C4 = <item type="input">17:20:00</item>.</paragraph> <embed href="text/shared/00/00000001.xhp#siehe"/> -<paragraph role="paragraph" id="par_id3154188" xml-lang="en-US" l10n="U" oldref="105"><link href="text/scalc/01/04060102.xhp" name="YEAR">YEAR</link>, <link href="text/scalc/01/04060102.xhp" name="NOW">NOW</link>, <link href="text/scalc/01/04060102.xhp" name="MINUTE">MINUTE</link>, <link href="text/scalc/01/04060102.xhp" name="MONTH">MONTH</link>, <link href="text/scalc/01/04060102.xhp" name="DAY">DAY</link>, <link href="text/scalc/01/04060102.xhp" name="WEEKDAY">WEEKDAY</link>.</paragraph> +<paragraph role="paragraph" id="par_id3154188" xml-lang="en-US" l10n="U"><link href="text/scalc/01/04060102.xhp" name="YEAR">YEAR</link>, <link href="text/scalc/01/04060102.xhp" name="NOW">NOW</link>, <link href="text/scalc/01/04060102.xhp" name="MINUTE">MINUTE</link>, <link href="text/scalc/01/04060102.xhp" name="MONTH">MONTH</link>, <link href="text/scalc/01/04060102.xhp" name="DAY">DAY</link>, <link href="text/scalc/01/04060102.xhp" name="WEEKDAY">WEEKDAY</link>.</paragraph> </body> </helpdocument> diff --git a/main/helpcontent2/source/text/scalc/01/func_networkdays.xhp b/main/helpcontent2/source/text/scalc/01/func_networkdays.xhp index 6ba6203086..b78f64e593 100644 --- a/main/helpcontent2/source/text/scalc/01/func_networkdays.xhp +++ b/main/helpcontent2/source/text/scalc/01/func_networkdays.xhp @@ -33,19 +33,16 @@ <bookmark_value>NETWORKDAYS function</bookmark_value> </bookmark> <bookmark xml-lang="en-US" branch="hid/SC_HID_AAI_FUNC_NETWORKDAYS" id="bm_id3153696" localize="false"/> -<paragraph role="heading" id="hd_id3151254" xml-lang="en-US" level="2" l10n="U" oldref="240"><variable id="networkdays"><link href="text/scalc/01/func_networkdays.xhp">NETWORKDAYS</link> +<paragraph role="heading" id="hd_id3151254" xml-lang="en-US" level="2" l10n="U"><variable id="networkdays"><link href="text/scalc/01/func_networkdays.xhp">NETWORKDAYS</link> </variable></paragraph> -<paragraph role="paragraph" id="par_id3153788" xml-lang="en-US" l10n="U" oldref="241"><ahelp hid="HID_AAI_FUNC_NETWORKDAYS">Returns the number of workdays between a <emph>start date and an end date</emph>. Holidays can be deducted.</ahelp></paragraph> -<paragraph role="heading" id="hd_id3148677" xml-lang="en-US" level="3" l10n="U" oldref="242">Syntax</paragraph> -<paragraph role="code" id="par_id3145775" xml-lang="en-US" l10n="U" oldref="243">NETWORKDAYS(StartDate; EndDate; Holidays)</paragraph> -<paragraph role="paragraph" id="par_id3153885" xml-lang="en-US" l10n="U" oldref="244"> -<emph>StartDate</emph> is the date from when the calculation is carried out. If the start date is a workday, the day is included in the calculation.</paragraph> -<paragraph role="paragraph" id="par_id3151110" xml-lang="en-US" l10n="U" oldref="245"> -<emph>EndDate</emph> is the date up until when the calculation is carried out. If the end date is a workday, the day is included in the calculation.</paragraph> -<paragraph role="paragraph" id="par_id3154115" xml-lang="en-US" l10n="U" oldref="246"> -<emph>Holidays</emph> is an optional list of holidays. These are non-working days. Enter a cell range in which the holidays are listed individually.</paragraph> -<paragraph role="heading" id="hd_id3146902" xml-lang="en-US" level="3" l10n="U" oldref="247">Example</paragraph> -<paragraph role="paragraph" id="par_id3154661" xml-lang="en-US" l10n="CHG" oldref="248">How many workdays fall between 2001-12-15 and 2002-01-15? The start date is located in C3 and the end date in D3. Cells F3 to J3 contain the following Christmas and New Year holidays: "2001-12-24", "2001-12-25", "2001-12-26", "2001-12-31", "2002-01-01".</paragraph> -<paragraph role="paragraph" id="par_id3147328" xml-lang="en-US" l10n="U" oldref="249">=NETWORKDAYS(C3;D3;F3:J3) returns 17 workdays.</paragraph> +<paragraph role="paragraph" id="par_id3153788" xml-lang="en-US" l10n="U"><ahelp hid="HID_AAI_FUNC_NETWORKDAYS">Returns the number of workdays between a <emph>start date and an end date</emph>. Holidays can be deducted.</ahelp></paragraph> +<paragraph role="heading" id="hd_id3148677" xml-lang="en-US" level="3" l10n="U">Syntax</paragraph> +<paragraph role="code" id="par_id3145775" xml-lang="en-US" l10n="U">NETWORKDAYS(StartDate; EndDate; Holidays)</paragraph> +<paragraph role="paragraph" id="par_id3153885" xml-lang="en-US" l10n="U"><emph>StartDate</emph> is the date from when the calculation is carried out. If the start date is a workday, the day is included in the calculation.</paragraph> +<paragraph role="paragraph" id="par_id3151110" xml-lang="en-US" l10n="U"><emph>EndDate</emph> is the date up until when the calculation is carried out. If the end date is a workday, the day is included in the calculation.</paragraph> +<paragraph role="paragraph" id="par_id3154115" xml-lang="en-US" l10n="U"><emph>Holidays</emph> is an optional list of holidays. These are non-working days. Enter a cell range in which the holidays are listed individually.</paragraph> +<paragraph role="heading" id="hd_id3146902" xml-lang="en-US" level="3" l10n="U">Example</paragraph> +<paragraph role="paragraph" id="par_id3154661" xml-lang="en-US" l10n="CHG">How many workdays fall between 2001-12-15 and 2002-01-15? The start date is located in C3 and the end date in D3. Cells F3 to J3 contain the following Christmas and New Year holidays: "2001-12-24", "2001-12-25", "2001-12-26", "2001-12-31", "2002-01-01".</paragraph> +<paragraph role="paragraph" id="par_id3147328" xml-lang="en-US" l10n="U">=NETWORKDAYS(C3;D3;F3:J3) returns 17 workdays.</paragraph> </body> </helpdocument> diff --git a/main/helpcontent2/source/text/scalc/01/func_weekday.xhp b/main/helpcontent2/source/text/scalc/01/func_weekday.xhp index 7af8b84bdf..62d6f7bd23 100644 --- a/main/helpcontent2/source/text/scalc/01/func_weekday.xhp +++ b/main/helpcontent2/source/text/scalc/01/func_weekday.xhp @@ -33,21 +33,19 @@ <bookmark_value>WEEKDAY function</bookmark_value> </bookmark> <bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_WOCHENTAG" id="bm_id3152359" localize="false"/> -<paragraph role="heading" id="hd_id3154925" xml-lang="en-US" level="2" l10n="U" oldref="136"><variable id="weekday"><link href="text/scalc/01/func_weekday.xhp">WEEKDAY</link> +<paragraph role="heading" id="hd_id3154925" xml-lang="en-US" level="2" l10n="U"><variable id="weekday"><link href="text/scalc/01/func_weekday.xhp">WEEKDAY</link> </variable></paragraph> -<paragraph role="paragraph" id="par_id3154228" xml-lang="en-US" l10n="U" oldref="137"><ahelp hid="HID_FUNC_WOCHENTAG">Returns the day of the week for the given date value.</ahelp> The day is returned as an integer between 1 (Sunday) and 7 (Saturday) if no type or type=1 is specified. If type=2, numbering begins at Monday=1; and if type=3 numbering begins at Monday=0.</paragraph> -<paragraph role="heading" id="hd_id3147217" xml-lang="en-US" level="3" l10n="U" oldref="138">Syntax</paragraph> -<paragraph role="code" id="par_id3149033" xml-lang="en-US" l10n="U" oldref="139">WEEKDAY(Number; Type)</paragraph> -<paragraph role="paragraph" id="par_id3149046" xml-lang="en-US" l10n="U" oldref="140"> -<emph>Number</emph>, as a date value, is a decimal for which the weekday is to be returned.</paragraph> -<paragraph role="paragraph" id="par_id3154394" xml-lang="en-US" l10n="U" oldref="141"> -<emph>Type</emph> determines the type of calculation. For Type=1, the weekdays are counted starting from Sunday (this is the default even when the Type parameter is missing). For Type=2, the weekdays are counted starting from Monday=1. For Type=3, the weekdays are counted starting from Monday=0.</paragraph> -<paragraph role="note" id="par_id3156188" xml-lang="en-US" l10n="U" oldref="142">These values apply only to the standard date format that you select under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - Calculate</emph>.</paragraph> -<paragraph role="heading" id="hd_id3153836" xml-lang="en-US" level="3" l10n="U" oldref="143">Examples</paragraph> -<paragraph role="paragraph" id="par_id3150317" xml-lang="en-US" l10n="CHG" oldref="144">=WEEKDAY("2000-06-14") returns 4 (the Type parameter is missing, therefore the standard count is used. The standard count starts with Sunday as day number 1. June 14, 2000 was a Wednesday and therefore day number 4).</paragraph> -<paragraph role="paragraph" id="par_id3153174" xml-lang="en-US" l10n="CHG" oldref="145">=WEEKDAY("1996-07-24";2) returns 3 (the Type parameter is 2, therefore Monday is day number 1. July 24, 1996 was a Wednesday and therefore day number 3).</paragraph> -<paragraph role="paragraph" id="par_id3153525" xml-lang="en-US" l10n="CHG" oldref="146">=WEEKDAY("1996-07-24";1) returns 4 (the Type parameter is 1, therefore Sunday is day number 1. July 24, 1996 was a Wednesday and therefore day number 4).</paragraph> -<paragraph role="paragraph" id="par_id3150575" xml-lang="en-US" l10n="CHG" oldref="147">=WEEKDAY(NOW()) returns the number of the current day.</paragraph> -<paragraph role="tip" id="par_id3150588" xml-lang="en-US" l10n="U" oldref="171">To obtain a function indicating whether a day in A1 is a business day, use the IF and WEEKDAY functions as follows: <br/>IF(WEEKDAY(A1;2)<6;"Business day";"Weekend")</paragraph> +<paragraph role="paragraph" id="par_id3154228" xml-lang="en-US" l10n="U"><ahelp hid="HID_FUNC_WOCHENTAG">Returns the day of the week for the given date value.</ahelp> The day is returned as an integer between 1 (Sunday) and 7 (Saturday) if no type or type=1 is specified. If type=2, numbering begins at Monday=1; and if type=3 numbering begins at Monday=0.</paragraph> +<paragraph role="heading" id="hd_id3147217" xml-lang="en-US" level="3" l10n="U">Syntax</paragraph> +<paragraph role="code" id="par_id3149033" xml-lang="en-US" l10n="U">WEEKDAY(Number; Type)</paragraph> +<paragraph role="paragraph" id="par_id3149046" xml-lang="en-US" l10n="U"><emph>Number</emph>, as a date value, is a decimal for which the weekday is to be returned.</paragraph> +<paragraph role="paragraph" id="par_id3154394" xml-lang="en-US" l10n="U"><emph>Type</emph> determines the type of calculation. For Type=1, the weekdays are counted starting from Sunday (this is the default even when the Type parameter is missing). For Type=2, the weekdays are counted starting from Monday=1. For Type=3, the weekdays are counted starting from Monday=0.</paragraph> +<paragraph role="note" id="par_id3156188" xml-lang="en-US" l10n="U">These values apply only to the standard date format that you select under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - Calculate</emph>.</paragraph> +<paragraph role="heading" id="hd_id3153836" xml-lang="en-US" level="3" l10n="U">Examples</paragraph> +<paragraph role="paragraph" id="par_id3150317" xml-lang="en-US" l10n="CHG">=WEEKDAY("2000-06-14") returns 4 (the Type parameter is missing, therefore the standard count is used. The standard count starts with Sunday as day number 1. June 14, 2000 was a Wednesday and therefore day number 4).</paragraph> +<paragraph role="paragraph" id="par_id3153174" xml-lang="en-US" l10n="CHG">=WEEKDAY("1996-07-24";2) returns 3 (the Type parameter is 2, therefore Monday is day number 1. July 24, 1996 was a Wednesday and therefore day number 3).</paragraph> +<paragraph role="paragraph" id="par_id3153525" xml-lang="en-US" l10n="CHG">=WEEKDAY("1996-07-24";1) returns 4 (the Type parameter is 1, therefore Sunday is day number 1. July 24, 1996 was a Wednesday and therefore day number 4).</paragraph> +<paragraph role="paragraph" id="par_id3150575" xml-lang="en-US" l10n="CHG">=WEEKDAY(NOW()) returns the number of the current day.</paragraph> +<paragraph role="tip" id="par_id3150588" xml-lang="en-US" l10n="U">To obtain a function indicating whether a day in A1 is a business day, use the IF and WEEKDAY functions as follows:<br/>IF(WEEKDAY(A1;2)<6;"Business day";"Weekend")</paragraph> </body> </helpdocument> diff --git a/main/helpcontent2/source/text/scalc/01/func_weeknum.xhp b/main/helpcontent2/source/text/scalc/01/func_weeknum.xhp index ea31f91018..e5ae77535d 100644 --- a/main/helpcontent2/source/text/scalc/01/func_weeknum.xhp +++ b/main/helpcontent2/source/text/scalc/01/func_weeknum.xhp @@ -33,20 +33,18 @@ <bookmark_value>WEEKNUM function</bookmark_value> </bookmark> <bookmark xml-lang="en-US" branch="hid/SC_HID_FUNC_KALENDERWOCHE" id="bm_id3158403" localize="false"/> -<paragraph role="heading" id="hd_id3159161" xml-lang="en-US" level="2" l10n="U" oldref="54"><variable id="weeknum"><link href="text/scalc/01/func_weeknum.xhp">WEEKNUM</link> +<paragraph role="heading" id="hd_id3159161" xml-lang="en-US" level="2" l10n="U"><variable id="weeknum"><link href="text/scalc/01/func_weeknum.xhp">WEEKNUM</link> </variable></paragraph> -<paragraph role="paragraph" id="par_id3149770" xml-lang="en-US" l10n="U" oldref="55"><ahelp hid="HID_FUNC_KALENDERWOCHE">WEEKNUM calculates the week number of the year for the internal date value.</ahelp></paragraph> +<paragraph role="paragraph" id="par_id3149770" xml-lang="en-US" l10n="U"><ahelp hid="HID_FUNC_KALENDERWOCHE">WEEKNUM calculates the week number of the year for the internal date value.</ahelp></paragraph> <paragraph role="note" id="par_idN105E4" xml-lang="en-US" l10n="NEW">The International Standard ISO 8601 has decreed that Monday shall be the first day of the week. A week that lies partly in one year and partly in another is assigned a number in the year in which most of its days lie. That means that week number 1 of any year is the week that contains the January 4th.</paragraph> -<paragraph role="heading" id="hd_id3153055" xml-lang="en-US" level="3" l10n="U" oldref="56">Syntax</paragraph> -<paragraph role="code" id="par_id3147236" xml-lang="en-US" l10n="U" oldref="57">WEEKNUM(Number; Mode)</paragraph> -<paragraph role="paragraph" id="par_id3147511" xml-lang="en-US" l10n="U" oldref="58"> -<emph>Number</emph> is the internal date number.</paragraph> -<paragraph role="paragraph" id="par_id3154269" xml-lang="en-US" l10n="U" oldref="59"> -<emph>Mode</emph> sets the start of the week and the calculation type.</paragraph> -<paragraph role="paragraph" id="par_id3148930" xml-lang="en-US" l10n="U" oldref="60">1 = Sunday</paragraph> -<paragraph role="paragraph" id="par_id3154280" xml-lang="en-US" l10n="U" oldref="61">2 = Monday</paragraph> -<paragraph role="heading" id="hd_id3146948" xml-lang="en-US" level="3" l10n="U" oldref="62">Examples</paragraph> -<paragraph role="paragraph" id="par_id3150704" xml-lang="en-US" l10n="CHG" oldref="65">=WEEKNUM("1995-01-01";1) returns 1</paragraph> -<paragraph role="paragraph" id="par_id3149792" xml-lang="en-US" l10n="CHG" oldref="64">=WEEKNUM("1995-01-01";2) returns 52. If the week starts on Monday, Sunday belongs to the last week of the previous year.</paragraph> +<paragraph role="heading" id="hd_id3153055" xml-lang="en-US" level="3" l10n="U">Syntax</paragraph> +<paragraph role="code" id="par_id3147236" xml-lang="en-US" l10n="U">WEEKNUM(Number; Mode)</paragraph> +<paragraph role="paragraph" id="par_id3147511" xml-lang="en-US" l10n="U"><emph>Number</emph> is the internal date number.</paragraph> +<paragraph role="paragraph" id="par_id3154269" xml-lang="en-US" l10n="U"><emph>Mode</emph> sets the start of the week and the calculation type.</paragraph> +<paragraph role="paragraph" id="par_id3148930" xml-lang="en-US" l10n="U">1 = Sunday</paragraph> +<paragraph role="paragraph" id="par_id3154280" xml-lang="en-US" l10n="U">2 = Monday</paragraph> +<paragraph role="heading" id="hd_id3146948" xml-lang="en-US" level="3" l10n="U">Examples</paragraph> +<paragraph role="paragraph" id="par_id3150704" xml-lang="en-US" l10n="CHG">=WEEKNUM("1995-01-01";1) returns 1</paragraph> +<paragraph role="paragraph" id="par_id3149792" xml-lang="en-US" l10n="CHG">=WEEKNUM("1995-01-01";2) returns 52. If the week starts on Monday, Sunday belongs to the last week of the previous year.</paragraph> </body> </helpdocument> diff --git a/main/helpcontent2/source/text/scalc/01/func_workday.xhp b/main/helpcontent2/source/text/scalc/01/func_workday.xhp index 72a9d8ab86..bd163bb908 100644 --- a/main/helpcontent2/source/text/scalc/01/func_workday.xhp +++ b/main/helpcontent2/source/text/scalc/01/func_workday.xhp @@ -33,19 +33,16 @@ <bookmark_value>WORKDAY function</bookmark_value> </bookmark> <bookmark xml-lang="en-US" branch="hid/SC_HID_AAI_FUNC_WORKDAY" id="bm_id3150028" localize="false"/> -<paragraph role="heading" id="hd_id3149012" xml-lang="en-US" level="2" l10n="U" oldref="186"><variable id="workday"><link href="text/scalc/01/func_workday.xhp">WORKDAY</link> +<paragraph role="heading" id="hd_id3149012" xml-lang="en-US" level="2" l10n="U"><variable id="workday"><link href="text/scalc/01/func_workday.xhp">WORKDAY</link> </variable></paragraph> -<paragraph role="paragraph" id="par_id3149893" xml-lang="en-US" l10n="U" oldref="187"><ahelp hid="HID_AAI_FUNC_WORKDAY"> The result is a date number that can be formatted as a date. You then see the date of a day that is a certain number of <emph>workdays</emph> away from the <emph>start date</emph>.</ahelp></paragraph> -<paragraph role="heading" id="hd_id3146944" xml-lang="en-US" level="3" l10n="U" oldref="188">Syntax</paragraph> -<paragraph role="code" id="par_id3154844" xml-lang="en-US" l10n="U" oldref="189">WORKDAY(StartDate; Days; Holidays)</paragraph> -<paragraph role="paragraph" id="par_id3147469" xml-lang="en-US" l10n="U" oldref="190"> -<emph>StartDate</emph> is the date from when the calculation is carried out. If the start date is a workday, the day is included in the calculation.</paragraph> -<paragraph role="paragraph" id="par_id3153038" xml-lang="en-US" l10n="U" oldref="191"> -<emph>Days</emph> is the number of workdays. Positive value for a result after the start date, negative value for a result before the start date.</paragraph> -<paragraph role="paragraph" id="par_id3150693" xml-lang="en-US" l10n="U" oldref="192"> -<emph>Holidays</emph> is a list of optional holidays. These are non-working days. Enter a cell range in which the holidays are listed individually.</paragraph> -<paragraph role="heading" id="hd_id3150141" xml-lang="en-US" level="3" l10n="U" oldref="193">Example</paragraph> -<paragraph role="paragraph" id="par_id3152782" xml-lang="en-US" l10n="CHG" oldref="194">What date came 17 workdays after 1 December 2001? Enter the start date "2001-12-01" in C3 and the number of workdays in D3. Cells F3 to J3 contain the following Christmas and New Year holidays: "2001-12-24", "2001-12-25", "2001-12-26", "2001-12-31", "2002-01-01".</paragraph> -<paragraph role="paragraph" id="par_id3146142" xml-lang="en-US" l10n="CHG" oldref="195">=WORKDAY(C3;D3;F3:J3) returns 2001-12-28. Format the serial date number as a date, for example in the format YYYY-MM-DD.<comment>UFI: fixed #i30213#</comment></paragraph> +<paragraph role="paragraph" id="par_id3149893" xml-lang="en-US" l10n="U"><ahelp hid="HID_AAI_FUNC_WORKDAY"> The result is a date number that can be formatted as a date. You then see the date of a day that is a certain number of <emph>workdays</emph> away from the <emph>start date</emph>.</ahelp></paragraph> +<paragraph role="heading" id="hd_id3146944" xml-lang="en-US" level="3" l10n="U">Syntax</paragraph> +<paragraph role="code" id="par_id3154844" xml-lang="en-US" l10n="U">WORKDAY(StartDate; Days; Holidays)</paragraph> +<paragraph role="paragraph" id="par_id3147469" xml-lang="en-US" l10n="U"><emph>StartDate</emph> is the date from when the calculation is carried out. If the start date is a workday, the day is included in the calculation.</paragraph> +<paragraph role="paragraph" id="par_id3153038" xml-lang="en-US" l10n="U"><emph>Days</emph> is the number of workdays. Positive value for a result after the start date, negative value for a result before the start date.</paragraph> +<paragraph role="paragraph" id="par_id3150693" xml-lang="en-US" l10n="U"><emph>Holidays</emph> is a list of optional holidays. These are non-working days. Enter a cell range in which the holidays are listed individually.</paragraph> +<paragraph role="heading" id="hd_id3150141" xml-lang="en-US" level="3" l10n="U">Example</paragraph> +<paragraph role="paragraph" id="par_id3152782" xml-lang="en-US" l10n="CHG">What date came 17 workdays after 1 December 2001? Enter the start date "2001-12-01" in C3 and the number of workdays in D3. Cells F3 to J3 contain the following Christmas and New Year holidays: "2001-12-24", "2001-12-25", "2001-12-26", "2001-12-31", "2002-01-01".</paragraph> +<paragraph role="paragraph" id="par_id3146142" xml-lang="en-US" l10n="CHG">=WORKDAY(C3;D3;F3:J3) returns 2001-12-28. Format the serial date number as a date, for example in the format YYYY-MM-DD.<comment>UFI: fixed #i30213#</comment></paragraph> </body> </helpdocument> diff --git a/main/helpcontent2/source/text/scalc/guide/text_wrap.xhp b/main/helpcontent2/source/text/scalc/guide/text_wrap.xhp index e2036d4b48..a9bcf08a98 100644 --- a/main/helpcontent2/source/text/scalc/guide/text_wrap.xhp +++ b/main/helpcontent2/source/text/scalc/guide/text_wrap.xhp @@ -35,26 +35,26 @@ <bookmark_value>breaks in cells</bookmark_value> <bookmark_value>multi-line text in cells</bookmark_value> </bookmark> -<paragraph role="heading" id="hd_id3154346" xml-lang="en-US" level="1" l10n="U" oldref="42"><variable id="text_wrap"><link href="text/scalc/guide/text_wrap.xhp" name="Writing Multi-line Text">Writing Multi-line Text</link> +<paragraph role="heading" id="hd_id3154346" xml-lang="en-US" level="1" l10n="U"><variable id="text_wrap"><link href="text/scalc/guide/text_wrap.xhp" name="Writing Multi-line Text">Writing Multi-line Text</link> </variable></paragraph> <section id="wraptext"> <list type="ordered"> <listitem> -<paragraph role="listitem" id="par_id3156280" xml-lang="en-US" l10n="U" oldref="41">Pressing the <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter keys inserts a manual line break. This shortcut only works directly in the cell, not in the input line.</paragraph> +<paragraph role="listitem" id="par_id3156280" xml-lang="en-US" l10n="U">Pressing the <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter keys inserts a manual line break. This shortcut only works directly in the cell, not in the input line.</paragraph> </listitem> </list> -<paragraph role="paragraph" id="par_id3153142" xml-lang="en-US" l10n="U" oldref="43">If you want the text to automatically break at the right border of the cell, proceed as follows:</paragraph> +<paragraph role="paragraph" id="par_id3153142" xml-lang="en-US" l10n="U">If you want the text to automatically break at the right border of the cell, proceed as follows:</paragraph> <list type="ordered"> <listitem> -<paragraph role="listitem" id="par_id3153951" xml-lang="en-US" l10n="U" oldref="44">Select all the cells where you want the text to break at the right border.</paragraph> +<paragraph role="listitem" id="par_id3153951" xml-lang="en-US" l10n="U">Select all the cells where you want the text to break at the right border.</paragraph> </listitem> <listitem> -<paragraph role="listitem" id="par_id3148575" xml-lang="en-US" l10n="CHG" oldref="45">In <emph>Format - Cells - Alignment</emph>, mark the <emph>Wrap text automatically</emph> option and click OK.</paragraph> +<paragraph role="listitem" id="par_id3148575" xml-lang="en-US" l10n="CHG">In <emph>Format - Cells - Alignment</emph>, mark the <emph>Wrap text automatically</emph> option and click OK.</paragraph> </listitem> </list> </section> <section id="relatedtopics"> -<paragraph role="paragraph" id="par_id3145799" xml-lang="en-US" l10n="U" oldref="46"><link href="text/scalc/01/05020000.xhp" name="Format - Cell">Format - Cell</link></paragraph> +<paragraph role="paragraph" id="par_id3145799" xml-lang="en-US" l10n="U"><link href="text/scalc/01/05020000.xhp" name="Format - Cell">Format - Cell</link></paragraph> </section> </body> </helpdocument> diff --git a/main/helpcontent2/source/text/shared/01/05100100.xhp b/main/helpcontent2/source/text/shared/01/05100100.xhp index 1881d3891e..bbe84211e0 100644 --- a/main/helpcontent2/source/text/shared/01/05100100.xhp +++ b/main/helpcontent2/source/text/shared/01/05100100.xhp @@ -1,5 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> -<helpdocument version="1.0"> <!--*********************************************************** * @@ -22,8 +21,7 @@ * ***********************************************************--> - - +<helpdocument version="1.0"> <meta> <topic id="textshared0105100100xhp" status="PUBLISH"> <title id="tit" xml-lang="en-US">Merge</title> @@ -34,18 +32,18 @@ <section id="verbinden"> <bookmark xml-lang="en-US" branch="hid/.uno:MergeCells" id="bm_id1766491" localize="false"/> <bookmark xml-lang="en-US" branch="hid/.uno:MergeCells" id="bm_id3149051" localize="false"/> -<paragraph role="heading" id="hd_id3154765" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05100100.xhp" name="Merge">Merge</link></paragraph> -<paragraph role="paragraph" id="par_id3147406" xml-lang="en-US" l10n="U" oldref="2"><variable id="verbindentext"><ahelp hid=".">Combines the contents of the selected table cells into a single cell.</ahelp> +<paragraph role="heading" id="hd_id3154765" xml-lang="en-US" level="1" l10n="U"><link href="text/shared/01/05100100.xhp" name="Merge">Merge</link></paragraph> +<paragraph role="paragraph" id="par_id3147406" xml-lang="en-US" l10n="U"><variable id="verbindentext"><ahelp hid=".">Combines the contents of the selected table cells into a single cell.</ahelp> </variable><comment>moved from swriter/01/05100100.xhp, see i86644</comment></paragraph> </section> <section id="howtoget"> <switch select="appl"> <case select="WRITER"> -<paragraph role="paragraph" id="par_id3154351" xml-lang="en-US" l10n="U" oldref="79">Choose <emph>Table - Merge Cells</emph> +<paragraph role="paragraph" id="par_id3154351" xml-lang="en-US" l10n="U">Choose <emph>Table - Merge Cells</emph> </paragraph> </case> </switch> -<paragraph role="paragraph" id="par_id3154370" xml-lang="en-US" l10n="U" oldref="80">On the <emph>Table</emph> Bar, click</paragraph> +<paragraph role="paragraph" id="par_id3154370" xml-lang="en-US" l10n="U">On the <emph>Table</emph> Bar, click</paragraph> <section id="syzellenverbinden"> <table id="tbl_id3154636"> <tablerow> @@ -55,12 +53,12 @@ </image></paragraph> </tablecell> <tablecell> -<paragraph role="paragraph" id="par_id3150662" xml-lang="en-US" l10n="U" oldref="81">Merge Cells</paragraph> +<paragraph role="paragraph" id="par_id3150662" xml-lang="en-US" l10n="U">Merge Cells</paragraph> </tablecell> </tablerow> </table> </section> </section> -<paragraph role="warning" id="par_id3153718" xml-lang="en-US" l10n="U" oldref="3">Merging cells can lead to calculation errors in formulas in the table.</paragraph> +<paragraph role="warning" id="par_id3153718" xml-lang="en-US" l10n="U">Merging cells can lead to calculation errors in formulas in the table.</paragraph> </body> </helpdocument> diff --git a/main/helpcontent2/source/text/shared/01/05120600.xhp b/main/helpcontent2/source/text/shared/01/05120600.xhp index 2664cadf03..c2e20418b6 100644 --- a/main/helpcontent2/source/text/shared/01/05120600.xhp +++ b/main/helpcontent2/source/text/shared/01/05120600.xhp @@ -32,18 +32,18 @@ <section id="gleichverteilen"> <bookmark xml-lang="en-US" branch="hid/.uno:DistributeColumns" id="bm_id2213069" localize="false"/> <bookmark xml-lang="en-US" branch="hid/.uno:DistributeColumns" id="bm_id3149055" localize="false"/> -<paragraph role="heading" id="hd_id3153811" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/shared/01/05120600.xhp" name="Space Equally">Space Columns Equally</link></paragraph> -<paragraph role="paragraph" id="par_id3151389" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="verteilentext"><ahelp hid=".uno:DistributeColumns">Adjusts the width of the selected columns to match the width of the widest column in the selection.</ahelp> The total width of the table cannot exceed the width of the page. +<paragraph role="heading" id="hd_id3153811" xml-lang="en-US" level="1" l10n="CHG"><link href="text/shared/01/05120600.xhp" name="Space Equally">Space Columns Equally</link></paragraph> +<paragraph role="paragraph" id="par_id3151389" xml-lang="en-US" l10n="CHG"><variable id="verteilentext"><ahelp hid=".uno:DistributeColumns">Adjusts the width of the selected columns to match the width of the widest column in the selection.</ahelp> The total width of the table cannot exceed the width of the page. </variable></paragraph> </section> <section id="howtoget"> <switch select="appl"> <case select="WRITER"> -<paragraph role="paragraph" id="par_id3159219" xml-lang="en-US" l10n="U" oldref="107">Choose <emph>Table - Autofit - Distribute Columns Equally</emph> +<paragraph role="paragraph" id="par_id3159219" xml-lang="en-US" l10n="U">Choose <emph>Table - Autofit - Distribute Columns Equally</emph> </paragraph> </case> </switch> -<paragraph role="paragraph" id="par_id3156426" xml-lang="en-US" l10n="U" oldref="108">Open <emph>Optimize</emph> toolbar from <emph>Table</emph> Bar, click</paragraph> +<paragraph role="paragraph" id="par_id3156426" xml-lang="en-US" l10n="U">Open <emph>Optimize</emph> toolbar from <emph>Table</emph> Bar, click</paragraph> <section id="syverteilentext"> <table id="tbl_id3148462"> <tablerow> @@ -53,7 +53,7 @@ </image></paragraph> </tablecell> <tablecell> -<paragraph role="paragraph" id="par_id3151364" xml-lang="en-US" l10n="U" oldref="109">Space Columns Equally</paragraph> +<paragraph role="paragraph" id="par_id3151364" xml-lang="en-US" l10n="U">Space Columns Equally</paragraph> </tablecell> </tablerow> </table> diff --git a/main/helpcontent2/source/text/shared/01/06010500.xhp b/main/helpcontent2/source/text/shared/01/06010500.xhp index 98b7e3006d..c80718e5ae 100644 --- a/main/helpcontent2/source/text/shared/01/06010500.xhp +++ b/main/helpcontent2/source/text/shared/01/06010500.xhp @@ -38,13 +38,13 @@ <case select="WRITER"><comment>Writer menu commands, i80434</comment> <bookmark xml-lang="en-US" branch="hid/.uno:SetLanguageSelectionMenu" id="bm_id3691824" localize="false"/> <paragraph role="heading" id="hd_id5787224" xml-lang="en-US" level="2" l10n="NEW">For Selection</paragraph> -<paragraph role="paragraph" id="par_id1507309" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens a submenu. Choose a language for the selected text. <br/>Choose None to exclude the selected text from spellchecking and hyphenation.<br/>Choose More to open a dialog with more options.</ahelp></paragraph> +<paragraph role="paragraph" id="par_id1507309" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens a submenu. Choose a language for the selected text.<br/>Choose None to exclude the selected text from spellchecking and hyphenation.<br/>Choose More to open a dialog with more options.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/.uno:SetLanguageParagraphMenu" id="bm_id5369426" localize="false"/> <paragraph role="heading" id="hd_id7693411" xml-lang="en-US" level="2" l10n="NEW">For Paragraph</paragraph> -<paragraph role="paragraph" id="par_id3928952" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens a submenu. Choose a language for the current paragraph. <br/>Choose None to exclude the current paragraph from spellchecking and hyphenation.<br/>Choose More to open a dialog with more options.</ahelp></paragraph> +<paragraph role="paragraph" id="par_id3928952" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens a submenu. Choose a language for the current paragraph.<br/>Choose None to exclude the current paragraph from spellchecking and hyphenation.<br/>Choose More to open a dialog with more options.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/.uno:SetLanguageAllTextMenu" id="bm_id1342204" localize="false"/> <paragraph role="heading" id="hd_id5206762" xml-lang="en-US" level="2" l10n="NEW">For all Text</paragraph> -<paragraph role="paragraph" id="par_id5735953" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens a submenu. Choose a language for all text. <br/>Choose None to exclude all text from spellchecking and hyphenation.<br/>Choose More to open a dialog with more options.</ahelp></paragraph> +<paragraph role="paragraph" id="par_id5735953" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens a submenu. Choose a language for all text.<br/>Choose None to exclude all text from spellchecking and hyphenation.<br/>Choose More to open a dialog with more options.</ahelp></paragraph> </case> </switch> <embed href="text/shared/01/06200000.xhp#hangul"/> diff --git a/main/helpcontent2/source/text/shared/02/03140000.xhp b/main/helpcontent2/source/text/shared/02/03140000.xhp index a867090c35..5cbfb2b72b 100644 --- a/main/helpcontent2/source/text/shared/02/03140000.xhp +++ b/main/helpcontent2/source/text/shared/02/03140000.xhp @@ -31,10 +31,10 @@ <body> <section id="linienstil"> <bookmark xml-lang="en-US" branch="hid/.uno:LineStyle" id="bm_id3154545" localize="false"/> -<paragraph role="heading" id="hd_id3146936" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/02/03140000.xhp" name="Line Style">Line Style</link></paragraph> -<paragraph role="paragraph" id="par_id3155577" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:LineStyle">Click this icon to open the <emph>Line Style</emph> toolbar, where you can modify the border line style.</ahelp></paragraph> +<paragraph role="heading" id="hd_id3146936" xml-lang="en-US" level="1" l10n="U"><link href="text/shared/02/03140000.xhp" name="Line Style">Line Style</link></paragraph> +<paragraph role="paragraph" id="par_id3155577" xml-lang="en-US" l10n="U"><ahelp hid=".uno:LineStyle">Click this icon to open the <emph>Line Style</emph> toolbar, where you can modify the border line style.</ahelp></paragraph> </section> -<paragraph role="paragraph" id="par_id3154926" xml-lang="en-US" l10n="CHG" oldref="5">This border can be the border of a frame, graphic or table. The <emph>Line Style</emph> icon will only be visible if a graphic, table, chart object or frame has been selected.</paragraph> +<paragraph role="paragraph" id="par_id3154926" xml-lang="en-US" l10n="CHG">This border can be the border of a frame, graphic or table. The <emph>Line Style</emph> icon will only be visible if a graphic, table, chart object or frame has been selected.</paragraph> <section id="sylinienstil"> <table id="tbl_id3153089"> <tablerow> @@ -44,11 +44,11 @@ </image></paragraph> </tablecell> <tablecell colspan="" rowspan=""> -<paragraph role="paragraph" id="par_id3154398" xml-lang="en-US" l10n="U" oldref="3">Line Style</paragraph> +<paragraph role="paragraph" id="par_id3154398" xml-lang="en-US" l10n="U">Line Style</paragraph> </tablecell> </tablerow> </table> </section> -<paragraph role="paragraph" id="par_id3153114" xml-lang="en-US" l10n="U" oldref="4">For more information, see the <link href="text/shared/01/05030500.xhp" name="Borders">Borders</link> section of the Help.</paragraph> +<paragraph role="paragraph" id="par_id3153114" xml-lang="en-US" l10n="U">For more information, see the <link href="text/shared/01/05030500.xhp" name="Borders">Borders</link> section of the Help.</paragraph> </body> </helpdocument> diff --git a/main/helpcontent2/source/text/shared/02/10040000.xhp b/main/helpcontent2/source/text/shared/02/10040000.xhp index 2555ce92f9..88e2b2a501 100644 --- a/main/helpcontent2/source/text/shared/02/10040000.xhp +++ b/main/helpcontent2/source/text/shared/02/10040000.xhp @@ -33,17 +33,17 @@ <bookmark xml-lang="en-US" branch="hid/.uno:GoToEndOfDoc" id="bm_id5496308" localize="false"/><!-- HID added by script --> <bookmark branch="hid/.uno:GoToEndOfDoc" xml-lang="en-US" id="bm_id3156183"/><bookmark xml-lang="en-US" branch="hid/.uno:LastPage" id="bm_id3306707" localize="false"/><!-- HID added by script --> <bookmark branch="hid/.uno:LastPage" xml-lang="en-US" id="bm_id3149119"/> -<paragraph id="hd_id3154840" role="heading" level="1" oldref="1" l10n="U" xml-lang="en-US"><switchinline select="appl"> <caseinline select="WRITER"><link href="text/shared/02/10040000.xhp" name="To Document End">To Document End</link></caseinline> <defaultinline><link href="text/shared/02/10040000.xhp" name="Last Page">Last Page</link></defaultinline> </switchinline></paragraph> -<paragraph l10n="U" xml-lang="en-US" oldref="2" role="paragraph" id="par_id3149716"><ahelp hid=".uno:LastPage" visibility="visible">Moves to the last page of the document.</ahelp> This function is only active when you select the <emph>Page Preview</emph> function on the <emph>File</emph> menu.</paragraph> +<paragraph id="hd_id3154840" role="heading" level="1" l10n="U" xml-lang="en-US"><switchinline select="appl"> <caseinline select="WRITER"><link href="text/shared/02/10040000.xhp" name="To Document End">To Document End</link></caseinline> <defaultinline><link href="text/shared/02/10040000.xhp" name="Last Page">Last Page</link></defaultinline> </switchinline></paragraph> +<paragraph l10n="U" xml-lang="en-US" role="paragraph" id="par_id3149716"><ahelp hid=".uno:LastPage" visibility="visible">Moves to the last page of the document.</ahelp> This function is only active when you select the <emph>Page Preview</emph> function on the <emph>File</emph> menu.</paragraph> </section> <section id="syletzteseite"> <table id="tbl_id3150789"> <tablerow> <tablecell> -<paragraph l10n="E" role="paragraph" id="par_id3155805" xml-lang="en-US" oldref=""><image src="res/commandimagelist/sc_gotoendofdoc.png" id="img_id3153394"><alt xml-lang="en-US" id="alt_id3153394">Icon</alt></image></paragraph> +<paragraph l10n="E" role="paragraph" id="par_id3155805" xml-lang="en-US"><image src="res/commandimagelist/sc_gotoendofdoc.png" id="img_id3153394"><alt xml-lang="en-US" id="alt_id3153394">Icon</alt></image></paragraph> </tablecell> <tablecell> -<paragraph l10n="U" role="paragraph" id="par_id3145313" xml-lang="en-US" oldref="3"><switchinline select="appl"> <caseinline select="WRITER">To Document End</caseinline> <defaultinline>Last Page</defaultinline> </switchinline></paragraph> +<paragraph l10n="U" role="paragraph" id="par_id3145313" xml-lang="en-US"><switchinline select="appl"> <caseinline select="WRITER">To Document End</caseinline> <defaultinline>Last Page</defaultinline> </switchinline></paragraph> </tablecell> </tablerow> </table> diff --git a/main/helpcontent2/source/text/shared/02/14010000.xhp b/main/helpcontent2/source/text/shared/02/14010000.xhp index 09d795b781..54d544cb7d 100644 --- a/main/helpcontent2/source/text/shared/02/14010000.xhp +++ b/main/helpcontent2/source/text/shared/02/14010000.xhp @@ -33,10 +33,10 @@ <bookmark xml-lang="en-US" branch="hid/.uno:SbaExecuteSql" id="bm_id940934" localize="false"/><!-- HID added by script --> <bookmark xml-lang="en-US" branch="hid/.uno:SbaExecuteSql" id="bm_id3149495" localize="false"/> <!-- removed HID 12307 --> -<paragraph role="heading" id="hd_id3156183" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/shared/02/14010000.xhp" name="Run">Run Query</link></paragraph> -<paragraph role="paragraph" id="par_id3109850" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".uno:SbaExecuteSql">Runs the SQL query and displays the query result.</ahelp> The <emph>Run Query</emph> function does not save the query.</paragraph> +<paragraph role="heading" id="hd_id3156183" xml-lang="en-US" level="1" l10n="CHG"><link href="text/shared/02/14010000.xhp" name="Run">Run Query</link></paragraph> +<paragraph role="paragraph" id="par_id3109850" xml-lang="en-US" l10n="CHG"><ahelp hid=".uno:SbaExecuteSql">Runs the SQL query and displays the query result.</ahelp> The <emph>Run Query</emph> function does not save the query.</paragraph> </section> -<paragraph role="paragraph" id="par_id3149893" xml-lang="en-US" l10n="CHG" oldref="5">The <emph>Run Query</emph> function allows you to check the query. When you save the query, it is stored in the <emph>Query</emph> tab page.</paragraph> +<paragraph role="paragraph" id="par_id3149893" xml-lang="en-US" l10n="CHG">The <emph>Run Query</emph> function allows you to check the query. When you save the query, it is stored in the <emph>Query</emph> tab page.</paragraph> <paragraph role="tip" id="par_idN10621" xml-lang="en-US" l10n="NEW">Choose <emph>View - Preview</emph> to run the query from the menu bar of a query design window.<comment>UFI: see dba-features "Querydesign: Close preview has moved"</comment></paragraph> <section id="syabfrage"> <table id="tbl_id3147226"> @@ -47,7 +47,7 @@ </image></paragraph> </tablecell> <tablecell colspan="" rowspan=""> -<paragraph role="paragraph" id="par_id3153684" xml-lang="en-US" l10n="CHG" oldref="4">Run Query</paragraph> +<paragraph role="paragraph" id="par_id3153684" xml-lang="en-US" l10n="CHG">Run Query</paragraph> </tablecell> </tablerow> </table> diff --git a/main/helpcontent2/source/text/shared/autopi/01040100.xhp b/main/helpcontent2/source/text/shared/autopi/01040100.xhp index ecf5887b7b..545072d563 100644 --- a/main/helpcontent2/source/text/shared/autopi/01040100.xhp +++ b/main/helpcontent2/source/text/shared/autopi/01040100.xhp @@ -31,8 +31,8 @@ <body> <section id="seite1"> <bookmark xml-lang="en-US" branch="hid/SW_HID_AGENDA_PAGE1" id="bm_id3154230" localize="false"/> -<paragraph role="heading" id="hd_id3151100" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/shared/autopi/01040100.xhp" name="Agenda Wizard - Page Design">Agenda Wizard - Page Design</link></paragraph> -<paragraph role="paragraph" id="par_id3152594" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid="HID_AGENDA_PAGE1">Specifies a page design for the agenda.</ahelp></paragraph> +<paragraph role="heading" id="hd_id3151100" xml-lang="en-US" level="1" l10n="CHG"><link href="text/shared/autopi/01040100.xhp" name="Agenda Wizard - Page Design">Agenda Wizard - Page Design</link></paragraph> +<paragraph role="paragraph" id="par_id3152594" xml-lang="en-US" l10n="CHG"><ahelp hid="HID_AGENDA_PAGE1">Specifies a page design for the agenda.</ahelp></paragraph> </section> <section id="howtoget"> <embed href="text/shared/00/00000401.xhp#autopilotagenda1"/> @@ -43,6 +43,6 @@ <bookmark xml-lang="en-US" branch="hid/WIZARDS_HID_AGWIZ_1_CHK_MINUTES" id="bm_id989410" localize="false"/> <paragraph role="heading" id="par_idN105DE" xml-lang="en-US" level="2" l10n="NEW">Include form for recording minutes</paragraph> <paragraph role="paragraph" id="par_idN105E2" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Prints out a page on which you can write down the minutes during the meeting.</ahelp></paragraph> -<paragraph role="paragraph" id="par_id3153087" xml-lang="en-US" l10n="CHG" oldref="23"><link href="text/shared/autopi/01040200.xhp" name="Go to Agenda Wizard - General information">Go to Agenda Wizard - General information</link></paragraph> +<paragraph role="paragraph" id="par_id3153087" xml-lang="en-US" l10n="CHG"><link href="text/shared/autopi/01040200.xhp" name="Go to Agenda Wizard - General information">Go to Agenda Wizard - General information</link></paragraph> </body> </helpdocument> diff --git a/main/helpcontent2/source/text/shared/autopi/01120300.xhp b/main/helpcontent2/source/text/shared/autopi/01120300.xhp index 72cc6f014a..4db99bea87 100644 --- a/main/helpcontent2/source/text/shared/autopi/01120300.xhp +++ b/main/helpcontent2/source/text/shared/autopi/01120300.xhp @@ -30,18 +30,18 @@ </meta> <body> <section id="seite3"> -<paragraph id="hd_id3151097" role="heading" level="1" oldref="1" l10n="U" xml-lang="en-US"><link href="text/shared/autopi/01120300.xhp" name="Group Element Wizard: Field Values">Group Element Wizard: Field Values</link></paragraph> -<paragraph role="paragraph" id="par_id3151100" l10n="U" xml-lang="en-US" oldref="2">Assigns a reference value to each option field.</paragraph> +<paragraph id="hd_id3151097" role="heading" level="1" l10n="U" xml-lang="en-US"><link href="text/shared/autopi/01120300.xhp" name="Group Element Wizard: Field Values">Group Element Wizard: Field Values</link></paragraph> +<paragraph role="paragraph" id="par_id3151100" l10n="U" xml-lang="en-US">Assigns a reference value to each option field.</paragraph> </section> -<paragraph xml-lang="en-US" role="paragraph" id="par_id3153323" l10n="U" oldref="7">Select a field from the option fields list and enter the corresponding <link href="text/shared/02/01170101.xhp" name="reference value">reference value</link>.</paragraph> +<paragraph xml-lang="en-US" role="paragraph" id="par_id3153323" l10n="U">Select a field from the option fields list and enter the corresponding <link href="text/shared/02/01170101.xhp" name="reference value">reference value</link>.</paragraph> <section id="howtoget"> <embed href="text/shared/00/00000401.xhp#gruppen3"/> </section> <!-- removed HID DBP_EDIT_RID_PAGE_OPTIONVALUES_ET_OPTIONVALUE --> -<paragraph role="heading" level="2" id="hd_id3152594" l10n="U" xml-lang="en-US" oldref="3">Which value do you want to assign to each option?</paragraph> -<paragraph l10n="U" role="paragraph" id="par_id3152425" xml-lang="en-US" oldref="4"><ahelp hid="DBP_EDIT_RID_PAGE_OPTIONVALUES_ET_OPTIONVALUE" visibility="visible">Select a number or a text as a reference value for the selected option field.</ahelp></paragraph> +<paragraph role="heading" level="2" id="hd_id3152594" l10n="U" xml-lang="en-US">Which value do you want to assign to each option?</paragraph> +<paragraph l10n="U" role="paragraph" id="par_id3152425" xml-lang="en-US"><ahelp hid="DBP_EDIT_RID_PAGE_OPTIONVALUES_ET_OPTIONVALUE" visibility="visible">Select a number or a text as a reference value for the selected option field.</ahelp></paragraph> <!-- removed HID DBP_LISTBOX_RID_PAGE_OPTIONVALUES_LB_RADIOBUTTONS --> -<paragraph role="heading" level="2" id="hd_id3155555" l10n="U" xml-lang="en-US" oldref="5">Option fields</paragraph> -<paragraph l10n="U" role="paragraph" id="par_id3155941" xml-lang="en-US" oldref="6"><ahelp hid="DBP_LISTBOX_RID_PAGE_OPTIONVALUES_LB_RADIOBUTTONS" visibility="visible">Select the option field for which you want to assign the reference value.</ahelp></paragraph> +<paragraph role="heading" level="2" id="hd_id3155555" l10n="U" xml-lang="en-US">Option fields</paragraph> +<paragraph l10n="U" role="paragraph" id="par_id3155941" xml-lang="en-US"><ahelp hid="DBP_LISTBOX_RID_PAGE_OPTIONVALUES_LB_RADIOBUTTONS" visibility="visible">Select the option field for which you want to assign the reference value.</ahelp></paragraph> </body> </helpdocument> diff --git a/main/helpcontent2/source/text/shared/explorer/database/11000002.xhp b/main/helpcontent2/source/text/shared/explorer/database/11000002.xhp index 99f89e097f..dd6c65416e 100644 --- a/main/helpcontent2/source/text/shared/explorer/database/11000002.xhp +++ b/main/helpcontent2/source/text/shared/explorer/database/11000002.xhp @@ -32,19 +32,19 @@ <bookmark xml-lang="en-US" branch="index" id="bm_id3155449"> <bookmark_value>databases;drag and drop (Base)</bookmark_value> </bookmark><comment>mw added "(Base)"</comment> -<paragraph role="heading" id="hd_id3151299" xml-lang="en-US" level="1" l10n="U" oldref="93"><link href="text/shared/explorer/database/11000002.xhp" name="Data sources in $[officename]">Data sources in $[officename]</link></paragraph> +<paragraph role="heading" id="hd_id3151299" xml-lang="en-US" level="1" l10n="U"><link href="text/shared/explorer/database/11000002.xhp" name="Data sources in $[officename]">Data sources in $[officename]</link></paragraph> <section id="adressbuch"> -<paragraph role="heading" id="hd_id3150616" xml-lang="en-US" level="2" l10n="U" oldref="49">Selecting the Address Book</paragraph> +<paragraph role="heading" id="hd_id3150616" xml-lang="en-US" level="2" l10n="U">Selecting the Address Book</paragraph> <embed href="text/shared/guide/data_addressbook.xhp#adressbuch"/> -<paragraph role="paragraph" id="par_id3153049" xml-lang="en-US" l10n="CHG" oldref="101">To select the address book that you want to use, choose <link href="text/shared/01/01110101.xhp" name="File - Templates - Address Book Source"><emph>File - Templates - Address Book Source</emph></link>.</paragraph> +<paragraph role="paragraph" id="par_id3153049" xml-lang="en-US" l10n="CHG">To select the address book that you want to use, choose <link href="text/shared/01/01110101.xhp" name="File - Templates - Address Book Source"><emph>File - Templates - Address Book Source</emph></link>.</paragraph> </section> -<paragraph role="heading" id="hd_id3147275" xml-lang="en-US" level="2" l10n="U" oldref="26">Opening a Data Source</paragraph> +<paragraph role="heading" id="hd_id3147275" xml-lang="en-US" level="2" l10n="U">Opening a Data Source</paragraph> <list type="unordered"> <listitem> -<paragraph role="paragraph" id="par_id3154143" xml-lang="en-US" l10n="U" oldref="102">To open the data source view, press F4 in a text, spreadsheet or form document.</paragraph> +<paragraph role="paragraph" id="par_id3154143" xml-lang="en-US" l10n="U">To open the data source view, press F4 in a text, spreadsheet or form document.</paragraph> </listitem> <listitem> -<paragraph role="paragraph" id="par_id3154046" xml-lang="en-US" l10n="CHG" oldref="11">To view the contents of a database, click the plus sign (+) in front of the name in the data source view.</paragraph> +<paragraph role="paragraph" id="par_id3154046" xml-lang="en-US" l10n="CHG">To view the contents of a database, click the plus sign (+) in front of the name in the data source view.</paragraph> </listitem> </list> </body> diff --git a/main/helpcontent2/source/text/shared/guide/email.xhp b/main/helpcontent2/source/text/shared/guide/email.xhp index 967d34af6c..97c6a6177f 100644 --- a/main/helpcontent2/source/text/shared/guide/email.xhp +++ b/main/helpcontent2/source/text/shared/guide/email.xhp @@ -41,18 +41,18 @@ <bookmark_value>presentations; sending as e-mail</bookmark_value> <bookmark_value>attachments in e-mails</bookmark_value> </bookmark> -<paragraph role="heading" id="hd_id3153345" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="email"><link href="text/shared/guide/email.xhp" name="Sending Documents as E-mail">Sending Documents as E-mail</link></variable></paragraph> -<paragraph role="paragraph" id="par_id3154897" xml-lang="en-US" l10n="U" oldref="2">Working in $[officename], you can send the current document as an e-mail attachment.</paragraph> +<paragraph role="heading" id="hd_id3153345" xml-lang="en-US" level="1" l10n="U"><variable id="email"><link href="text/shared/guide/email.xhp" name="Sending Documents as E-mail">Sending Documents as E-mail</link></variable></paragraph> +<paragraph role="paragraph" id="par_id3154897" xml-lang="en-US" l10n="U">Working in $[officename], you can send the current document as an e-mail attachment.</paragraph> <list type="ordered"> <listitem> -<paragraph role="listitem" id="par_id3147335" xml-lang="en-US" l10n="U" oldref="3">Choose <emph>File - Send - Document as E-mail</emph>.</paragraph> -<paragraph role="listitem" id="par_id3153127" xml-lang="en-US" l10n="CHG" oldref="4">$[officename] opens your default e-mail program.<switchinline select="sys"><caseinline select="UNIX"> If you want to send the current document with another e-mail program, you can select the program to use with <emph>Internet - E-mail</emph> in the Options dialog box.</caseinline></switchinline></paragraph> +<paragraph role="listitem" id="par_id3147335" xml-lang="en-US" l10n="U">Choose <emph>File - Send - Document as E-mail</emph>.</paragraph> +<paragraph role="listitem" id="par_id3153127" xml-lang="en-US" l10n="CHG">$[officename] opens your default e-mail program.<switchinline select="sys"><caseinline select="UNIX"> If you want to send the current document with another e-mail program, you can select the program to use with <emph>Internet - E-mail</emph> in the Options dialog box.</caseinline></switchinline></paragraph> </listitem> <listitem> -<paragraph role="listitem" id="par_id3150986" xml-lang="en-US" l10n="U" oldref="5">In your e-mail program, enter the recipient, subject and any text you want to add, then send the e-mail.</paragraph> +<paragraph role="listitem" id="par_id3150986" xml-lang="en-US" l10n="U">In your e-mail program, enter the recipient, subject and any text you want to add, then send the e-mail.</paragraph> </listitem> </list> -<paragraph role="tip" id="par_id3595385" xml-lang="en-US" l10n="NEW">In case you want to send the e-mail to a recipient who only has software that cannot read the OpenDocument format, you can send the current document in an often used proprietary format.<br/>For a text document, choose <item type="menuitem">File - Send - Document as Microsoft Word</item>. For a spreadsheet, choose <item type="menuitem">File - Send - Document as Microsoft Excel</item>. And for a presentation, choose <item [...] +<paragraph role="tip" id="par_id3595385" xml-lang="en-US" l10n="NEW">In case you want to send the e-mail to a recipient who only has software that cannot read the OpenDocument format, you can send the current document in an often used proprietary format.<br/>For a text document, choose <item type="menuitem">File - Send - Document as Microsoft Word</item>. For a spreadsheet, choose <item type="menuitem">File - Send - Document as Microsoft Excel</item>. And for a presentation, choose <item [...] </section> <embed href="text/shared/00/00000004.xhp#related"/> <embed href="text/shared/guide/doc_save.xhp#doc_save"/> diff --git a/main/helpcontent2/source/text/swriter/01/02120100.xhp b/main/helpcontent2/source/text/swriter/01/02120100.xhp index fba9f031b9..5b7b087a47 100644 --- a/main/helpcontent2/source/text/swriter/01/02120100.xhp +++ b/main/helpcontent2/source/text/swriter/01/02120100.xhp @@ -29,19 +29,19 @@ </topic> </meta> <body> -<paragraph role="heading" level="1" id="hd_id3155144" l10n="U" xml-lang="en-US" oldref="1">Rename AutoText</paragraph> -<paragraph role="paragraph" id="par_id3149171" l10n="U" xml-lang="en-US" oldref="2">Allows you to change the name of an AutoText entry.</paragraph> +<paragraph role="heading" level="1" id="hd_id3155144" l10n="U" xml-lang="en-US">Rename AutoText</paragraph> +<paragraph role="paragraph" id="par_id3149171" l10n="U" xml-lang="en-US">Allows you to change the name of an AutoText entry.</paragraph> <section id="howtoget"> <embed href="text/swriter/00/00000402.xhp#autotextum"/> </section> <bookmark branch="hid/sw:Edit:DLG_RENAME_GLOS:ED_ON" xml-lang="en-US" id="bm_id3155921"/> -<paragraph role="heading" level="2" id="hd_id3155910" l10n="U" xml-lang="en-US" oldref="3">Name</paragraph> -<paragraph l10n="U" role="paragraph" id="par_id3151372" xml-lang="en-US" oldref="4"><ahelp hid="SW:EDIT:DLG_RENAME_GLOS:ED_ON" visibility="visible">Displays the current name of the selected AutoText item.</ahelp></paragraph> +<paragraph role="heading" level="2" id="hd_id3155910" l10n="U" xml-lang="en-US">Name</paragraph> +<paragraph l10n="U" role="paragraph" id="par_id3151372" xml-lang="en-US"><ahelp hid="SW:EDIT:DLG_RENAME_GLOS:ED_ON" visibility="visible">Displays the current name of the selected AutoText item.</ahelp></paragraph> <bookmark branch="hid/sw:Edit:DLG_RENAME_GLOS:ED_NN" xml-lang="en-US" id="bm_id3155869"/> -<paragraph role="heading" level="2" id="hd_id3155858" l10n="U" xml-lang="en-US" oldref="5">New</paragraph> -<paragraph l10n="U" role="paragraph" id="par_id3150686" xml-lang="en-US" oldref="6"><ahelp hid="SW:EDIT:DLG_RENAME_GLOS:ED_NN" visibility="visible">Type the new name for the selected AutoText component.</ahelp></paragraph> +<paragraph role="heading" level="2" id="hd_id3155858" l10n="U" xml-lang="en-US">New</paragraph> +<paragraph l10n="U" role="paragraph" id="par_id3150686" xml-lang="en-US"><ahelp hid="SW:EDIT:DLG_RENAME_GLOS:ED_NN" visibility="visible">Type the new name for the selected AutoText component.</ahelp></paragraph> <bookmark branch="hid/sw:Edit:DLG_RENAME_GLOS:ED_OS" xml-lang="en-US" id="bm_id3150122"/><bookmark branch="hid/sw:Edit:DLG_RENAME_GLOS:ED_NS" xml-lang="en-US" id="bm_id3145576"/> -<paragraph role="heading" level="2" id="hd_id3150110" l10n="U" xml-lang="en-US" oldref="7">Shortcut</paragraph> -<paragraph l10n="U" role="paragraph" id="par_id3145583" xml-lang="en-US" oldref="8"><ahelp hid="SW:EDIT:DLG_RENAME_GLOS:ED_NS" visibility="visible">Assigns a shortcut to the selected AutoText entry.</ahelp></paragraph> +<paragraph role="heading" level="2" id="hd_id3150110" l10n="U" xml-lang="en-US">Shortcut</paragraph> +<paragraph l10n="U" role="paragraph" id="par_id3145583" xml-lang="en-US"><ahelp hid="SW:EDIT:DLG_RENAME_GLOS:ED_NS" visibility="visible">Assigns a shortcut to the selected AutoText entry.</ahelp></paragraph> </body> </helpdocument> diff --git a/main/helpcontent2/source/text/swriter/guide/calculate_intable.xhp b/main/helpcontent2/source/text/swriter/guide/calculate_intable.xhp index 1c462c6aa2..c250ffc481 100644 --- a/main/helpcontent2/source/text/swriter/guide/calculate_intable.xhp +++ b/main/helpcontent2/source/text/swriter/guide/calculate_intable.xhp @@ -37,27 +37,27 @@ <bookmark_value>table cells;calculating sums</bookmark_value> <bookmark_value>sums of table cell series</bookmark_value> </bookmark><comment>mw deleted "text tables;"</comment> -<paragraph xml-lang="en-US" id="hd_id3147400" role="heading" level="1" l10n="U" oldref="3"><variable id="calculate_intable"><link href="text/swriter/guide/calculate_intable.xhp" name="Calculating Cell Totals in Tables">Calculating the Sum of a Series of Table Cells</link> +<paragraph xml-lang="en-US" id="hd_id3147400" role="heading" level="1" l10n="U"><variable id="calculate_intable"><link href="text/swriter/guide/calculate_intable.xhp" name="Calculating Cell Totals in Tables">Calculating the Sum of a Series of Table Cells</link> </variable></paragraph> <list type="ordered"> <listitem> -<paragraph xml-lang="en-US" id="par_id3154243" role="listitem" l10n="U" oldref="4">Choose <emph>Insert - Table</emph>, and insert a table with one column and more than one row into a text document.</paragraph> +<paragraph xml-lang="en-US" id="par_id3154243" role="listitem" l10n="U">Choose <emph>Insert - Table</emph>, and insert a table with one column and more than one row into a text document.</paragraph> </listitem> <listitem> -<paragraph xml-lang="en-US" id="par_id3154203" role="listitem" l10n="U" oldref="5">Type a number in each cell of the column, but leave the last cell in the column empty.</paragraph> +<paragraph xml-lang="en-US" id="par_id3154203" role="listitem" l10n="U">Type a number in each cell of the column, but leave the last cell in the column empty.</paragraph> </listitem> <listitem> -<paragraph xml-lang="en-US" id="par_id3154222" role="listitem" l10n="U" oldref="6">Place the cursor in the last cell of the column, and then click the <item type="menuitem">Sum</item> icon on the <item type="menuitem">Table Bar</item>.<br/>The <item type="menuitem">Formula Bar</item> appears with the entry "=sum".</paragraph> +<paragraph xml-lang="en-US" id="par_id3154222" role="listitem" l10n="U">Place the cursor in the last cell of the column, and then click the <item type="menuitem">Sum</item> icon on the <item type="menuitem">Table Bar</item>.<br/>The <item type="menuitem">Formula Bar</item> appears with the entry "=sum".</paragraph> </listitem> <listitem> -<paragraph xml-lang="en-US" id="par_id3147775" role="listitem" l10n="U" oldref="15">Click in the first cell of the series you want to sum up, drag to the final cell, and then release.<br/>$[officename] inserts a formula for calculating the sum of the values in the current column.</paragraph> +<paragraph xml-lang="en-US" id="par_id3147775" role="listitem" l10n="U">Click in the first cell of the series you want to sum up, drag to the final cell, and then release.<br/>$[officename] inserts a formula for calculating the sum of the values in the current column.</paragraph> </listitem> <listitem> -<paragraph xml-lang="en-US" id="par_id3150507" role="listitem" l10n="U" oldref="8">Press Enter, or click <emph>Apply</emph> in the Formula bar. <br/>The sum of the values in the current column is entered in the cell.</paragraph> +<paragraph xml-lang="en-US" id="par_id3150507" role="listitem" l10n="U">Press Enter, or click <emph>Apply</emph> in the Formula bar.<br/>The sum of the values in the current column is entered in the cell.</paragraph> </listitem> </list> -<paragraph xml-lang="en-US" id="par_id3150533" role="paragraph" l10n="U" oldref="10">If you enter a different number anywhere in the column, the sum is updated as soon as you click in the last column cell.</paragraph> -<paragraph xml-lang="en-US" id="par_id3155533" role="paragraph" l10n="U" oldref="11">Similarly, you can also quickly calculate the sum of a row of numbers.</paragraph> +<paragraph xml-lang="en-US" id="par_id3150533" role="paragraph" l10n="U">If you enter a different number anywhere in the column, the sum is updated as soon as you click in the last column cell.</paragraph> +<paragraph xml-lang="en-US" id="par_id3155533" role="paragraph" l10n="U">Similarly, you can also quickly calculate the sum of a row of numbers.</paragraph> <embed href="text/shared/00/00000004.xhp#related"/> <embed href="text/swriter/main0214.xhp#releistename"/> <embed href="text/swriter/guide/calculate.xhp#calculate"/> diff --git a/main/helpcontent2/source/text/swriter/guide/captions_numbers.xhp b/main/helpcontent2/source/text/swriter/guide/captions_numbers.xhp index c59e007d87..4fb3a30778 100644 --- a/main/helpcontent2/source/text/swriter/guide/captions_numbers.xhp +++ b/main/helpcontent2/source/text/swriter/guide/captions_numbers.xhp @@ -37,35 +37,33 @@ <bookmark_value>chapter numbers in captions</bookmark_value> <bookmark_value>inserting;chapter numbers in captions</bookmark_value> </bookmark><comment>MW changed "adding;" to "inserting;"</comment> -<paragraph xml-lang="en-US" id="hd_id3147684" role="heading" level="1" l10n="U" -oldref="14"><variable id="captions_numbers"><link href="text/swriter/guide/captions_numbers.xhp" name="Adding Chapter Numbers to Captions">Adding Chapter Numbers to Captions</link> -</variable></paragraph> -<paragraph xml-lang="en-US" id="par_id3147395" role="paragraph" l10n="U" oldref="15">You can include chapter numbers in captions.</paragraph> -<paragraph xml-lang="en-US" id="par_id3147408" role="paragraph" l10n="U" oldref="16">Ensure that the text in your document is organized by chapters, and that the chapter titles and, if you want, the section titles, use one of the predefined heading paragraph styles. You must also assign a numbering option to the heading paragraph styles.</paragraph> +<paragraph xml-lang="en-US" id="hd_id3147684" role="heading" level="1" l10n="U"><variable id="captions_numbers"><link href="text/swriter/guide/captions_numbers.xhp" name="Adding Chapter Numbers to Captions">Adding Chapter Numbers to Captions</link> </variable></paragraph> +<paragraph xml-lang="en-US" id="par_id3147395" role="paragraph" l10n="U">You can include chapter numbers in captions.</paragraph> +<paragraph xml-lang="en-US" id="par_id3147408" role="paragraph" l10n="U">Ensure that the text in your document is organized by chapters, and that the chapter titles and, if you want, the section titles, use one of the predefined heading paragraph styles. You must also assign a numbering option to the heading paragraph styles.</paragraph> <list type="ordered"> <listitem> -<paragraph xml-lang="en-US" id="par_id3154249" role="listitem" l10n="U" oldref="17">Select the item that you want to add a caption to.</paragraph> +<paragraph xml-lang="en-US" id="par_id3154249" role="listitem" l10n="U">Select the item that you want to add a caption to.</paragraph> </listitem> <listitem> -<paragraph xml-lang="en-US" id="par_id3150503" role="listitem" l10n="U" oldref="18">Choose <emph>Insert - Caption</emph>.</paragraph> +<paragraph xml-lang="en-US" id="par_id3150503" role="listitem" l10n="U">Choose <emph>Insert - Caption</emph>.</paragraph> </listitem> <listitem> -<paragraph xml-lang="en-US" id="par_id3150527" role="listitem" l10n="U" oldref="19">Select a caption title from the <item type="menuitem">Category</item> box, and select a numbering style in the <item type="menuitem">Numbering</item> box. <br/>You also can enter a caption text in this dialog. If you want, enter text in the <item type="menuitem">Caption</item> box.</paragraph> +<paragraph xml-lang="en-US" id="par_id3150527" role="listitem" l10n="U">Select a caption title from the <item type="menuitem">Category</item> box, and select a numbering style in the <item type="menuitem">Numbering</item> box.<br/>You also can enter a caption text in this dialog. If you want, enter text in the <item type="menuitem">Caption</item> box.</paragraph> </listitem> <listitem> -<paragraph xml-lang="en-US" id="par_id3153166" role="listitem" l10n="U" oldref="39">Click <emph>Options</emph>.</paragraph> +<paragraph xml-lang="en-US" id="par_id3153166" role="listitem" l10n="U">Click <emph>Options</emph>.</paragraph> </listitem> <listitem> -<paragraph xml-lang="en-US" id="par_id3153190" role="listitem" l10n="U" oldref="45">In the <item type="menuitem">Level</item> box, select the number of heading levels to include in the chapter number.</paragraph> +<paragraph xml-lang="en-US" id="par_id3153190" role="listitem" l10n="U">In the <item type="menuitem">Level</item> box, select the number of heading levels to include in the chapter number.</paragraph> </listitem> <listitem> -<paragraph xml-lang="en-US" id="par_id3155553" role="listitem" l10n="U" oldref="46">Type the character that you want to separate the chapter number(s) from the caption number in the <item type="menuitem">Separator</item> box, and then click <item type="menuitem">OK</item>.</paragraph> +<paragraph xml-lang="en-US" id="par_id3155553" role="listitem" l10n="U">Type the character that you want to separate the chapter number(s) from the caption number in the <item type="menuitem">Separator</item> box, and then click <item type="menuitem">OK</item>.</paragraph> </listitem> <listitem> -<paragraph xml-lang="en-US" id="par_id3155586" role="listitem" l10n="U" oldref="40">In the <emph>Caption</emph> dialog, click <emph>OK</emph>.</paragraph> +<paragraph xml-lang="en-US" id="par_id3155586" role="listitem" l10n="U">In the <emph>Caption</emph> dialog, click <emph>OK</emph>.</paragraph> </listitem> </list> -<paragraph xml-lang="en-US" id="par_id3147226" role="tip" l10n="U" oldref="43">$[officename] can automatically add a caption when you insert an object, graphic, or table. Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - AutoCaption</emph>.</paragraph> +<paragraph xml-lang="en-US" id="par_id3147226" role="tip" l10n="U">$[officename] can automatically add a caption when you insert an object, graphic, or table. Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - AutoCaption</emph>.</paragraph> <section id="relatedtopics"> <embed href="text/swriter/guide/captions.xhp#captions"/> <paragraph xml-lang="en-US" id="par_id3145567" role="paragraph" l10n="CHG"><link href="text/shared/optionen/01041100.xhp" name="Caption dialog">AutoCaption dialog</link></paragraph> diff --git a/main/helpcontent2/source/text/swriter/guide/fields_enter.xhp b/main/helpcontent2/source/text/swriter/guide/fields_enter.xhp index a174c6fb11..2caf74b9e7 100644 --- a/main/helpcontent2/source/text/swriter/guide/fields_enter.xhp +++ b/main/helpcontent2/source/text/swriter/guide/fields_enter.xhp @@ -35,24 +35,24 @@ <bookmark_value>input fields in text</bookmark_value> <bookmark_value>inserting;input fields</bookmark_value> </bookmark><comment>MW deleted "adding;"</comment> -<paragraph xml-lang="en-US" id="hd_id3155916" role="heading" level="1" l10n="U" oldref="1"><variable id="fields_enter"><link href="text/swriter/guide/fields_enter.xhp" name="Adding Input Fields">Adding Input Fields</link> +<paragraph xml-lang="en-US" id="hd_id3155916" role="heading" level="1" l10n="U"><variable id="fields_enter"><link href="text/swriter/guide/fields_enter.xhp" name="Adding Input Fields">Adding Input Fields</link> </variable></paragraph> -<paragraph xml-lang="en-US" id="par_id3153409" role="paragraph" l10n="U" oldref="2">An input field is a variable that you can click in a document to open a dialog where you can edit the variable.</paragraph> +<paragraph xml-lang="en-US" id="par_id3153409" role="paragraph" l10n="U">An input field is a variable that you can click in a document to open a dialog where you can edit the variable.</paragraph> <list type="ordered"> <listitem> -<paragraph xml-lang="en-US" id="par_id3145776" role="listitem" l10n="U" oldref="3">Choose <item type="menuitem">Insert - Fields - Other</item> click the <item type="menuitem">Functions</item> tab.</paragraph> +<paragraph xml-lang="en-US" id="par_id3145776" role="listitem" l10n="U">Choose <item type="menuitem">Insert - Fields - Other</item> click the <item type="menuitem">Functions</item> tab.</paragraph> </listitem> <listitem> -<paragraph xml-lang="en-US" id="par_id3155620" role="listitem" l10n="U" oldref="5">Click “Input field” in the <item type="menuitem">Type</item> list.</paragraph> +<paragraph xml-lang="en-US" id="par_id3155620" role="listitem" l10n="U">Click “Input field” in the <item type="menuitem">Type</item> list.</paragraph> </listitem> <listitem> -<paragraph xml-lang="en-US" id="par_id3154257" role="listitem" l10n="U" oldref="6">Click <item type="menuitem">Insert</item> and type the text for the variable.</paragraph> +<paragraph xml-lang="en-US" id="par_id3154257" role="listitem" l10n="U">Click <item type="menuitem">Insert</item> and type the text for the variable.</paragraph> </listitem> <listitem> -<paragraph xml-lang="en-US" id="par_id3155888" role="listitem" l10n="U" oldref="7">Click <emph>OK</emph>.</paragraph> +<paragraph xml-lang="en-US" id="par_id3155888" role="listitem" l10n="U">Click <emph>OK</emph>.</paragraph> </listitem> </list> -<paragraph xml-lang="en-US" id="par_id3150708" role="tip" l10n="U" oldref="4">To quickly open all input fields in a document for editing, press Ctrl+Shift+F9.</paragraph> +<paragraph xml-lang="en-US" id="par_id3150708" role="tip" l10n="U">To quickly open all input fields in a document for editing, press Ctrl+Shift+F9.</paragraph> <embed href="text/shared/00/00000004.xhp#related"/> <embed href="text/swriter/guide/fields.xhp#fields"/> </body> diff --git a/main/helpcontent2/source/text/swriter/guide/text_emphasize.xhp b/main/helpcontent2/source/text/swriter/guide/text_emphasize.xhp index 4ab65e89a0..9e6b93020f 100644 --- a/main/helpcontent2/source/text/swriter/guide/text_emphasize.xhp +++ b/main/helpcontent2/source/text/swriter/guide/text_emphasize.xhp @@ -33,19 +33,18 @@ <bookmark_value>text; emphasizing</bookmark_value> <bookmark_value>emphasizing text</bookmark_value> </bookmark> -<paragraph xml-lang="en-US" id="hd_id3149820" role="heading" level="1" l10n="U" -oldref="65"><variable id="text_emphasize"><link href="text/swriter/guide/text_emphasize.xhp" name="Emphasizing Text">Emphasizing Text</link> +<paragraph xml-lang="en-US" id="hd_id3149820" role="heading" level="1" l10n="U"><variable id="text_emphasize"><link href="text/swriter/guide/text_emphasize.xhp" name="Emphasizing Text">Emphasizing Text</link> </variable></paragraph> -<paragraph xml-lang="en-US" id="par_id3155922" role="paragraph" l10n="U" oldref="66">Here are a few examples of how to emphasize text in a document:</paragraph> +<paragraph xml-lang="en-US" id="par_id3155922" role="paragraph" l10n="U">Here are a few examples of how to emphasize text in a document:</paragraph> <list type="unordered"> <listitem> -<paragraph xml-lang="en-US" id="par_id3147412" role="listitem" l10n="U" oldref="67">Select the text and apply a different font style or effect, such as <emph>bold</emph>.</paragraph> +<paragraph xml-lang="en-US" id="par_id3147412" role="listitem" l10n="U">Select the text and apply a different font style or effect, such as <emph>bold</emph>.</paragraph> </listitem> <listitem> -<paragraph xml-lang="en-US" id="par_id3149840" role="listitem" l10n="U" oldref="68">Right-click in a paragraph, choose <emph>Paragraph</emph>, set the options that you want, for example, the background color, and then click <emph>OK</emph>.</paragraph> +<paragraph xml-lang="en-US" id="par_id3149840" role="listitem" l10n="U">Right-click in a paragraph, choose <emph>Paragraph</emph>, set the options that you want, for example, the background color, and then click <emph>OK</emph>.</paragraph> </listitem> <listitem> -<paragraph xml-lang="en-US" id="par_id3150084" role="listitem" l10n="U" oldref="69">Select the text, and then choose <item type="menuitem">Insert - Frame</item>.</paragraph> +<paragraph xml-lang="en-US" id="par_id3150084" role="listitem" l10n="U">Select the text, and then choose <item type="menuitem">Insert - Frame</item>.</paragraph> </listitem> <listitem> <paragraph xml-lang="en-US" id="par_id6924649" role="paragraph" l10n="CHG">Use the Text tool on the Drawing toolbar.</paragraph> diff --git a/main/helpcontent2/source/text/swriter/main0208.xhp b/main/helpcontent2/source/text/swriter/main0208.xhp index c381bf4035..79044e3825 100644 --- a/main/helpcontent2/source/text/swriter/main0208.xhp +++ b/main/helpcontent2/source/text/swriter/main0208.xhp @@ -30,14 +30,14 @@ </meta> <body> <section id="status"> -<paragraph xml-lang="en-US" id="hd_id3153397" role="heading" level="1" l10n="U" oldref="1"><link href="text/swriter/main0208.xhp" name="Status Bar">Status Bar</link></paragraph> -<paragraph xml-lang="en-US" id="par_id3153414" role="paragraph" l10n="CHG" oldref="2">The Status Bar contains information about the current document and offers various buttons with special functions.</paragraph> +<paragraph xml-lang="en-US" id="hd_id3153397" role="heading" level="1" l10n="U"><link href="text/swriter/main0208.xhp" name="Status Bar">Status Bar</link></paragraph> +<paragraph xml-lang="en-US" id="par_id3153414" role="paragraph" l10n="CHG">The Status Bar contains information about the current document and offers various buttons with special functions.</paragraph> </section> <embed href="text/swriter/02/08010000.xhp#seitennummer"/> <embed href="text/shared/02/20020000.xhp#aktuelleseitenvorlage"/> <bookmark xml-lang="en-US" branch="hid/.uno:LanguageStatus" id="bm_id8360850" localize="false"/> <paragraph xml-lang="en-US" id="hd_id9648731" role="heading" level="1" l10n="NEW">Language<comment>i80434</comment></paragraph> -<paragraph xml-lang="en-US" id="par_id8193914" role="paragraph" l10n="NEW"><ahelp hid=".">Displays the language for the selected text. <br/>Click to open a menu where you can choose another language for the selected text or for the current paragraph. <br/>Choose None to exclude the text from spellchecking and hyphenation. <br/>Choose Reset to Default Language to re-apply the default language for the selection or the paragraph. <br/>Choose More to open a dialog with more options.</ahelp>< [...] +<paragraph xml-lang="en-US" id="par_id8193914" role="paragraph" l10n="NEW"><ahelp hid=".">Displays the language for the selected text.<br/>Click to open a menu where you can choose another language for the selected text or for the current paragraph.<br/>Choose None to exclude the text from spellchecking and hyphenation.<br/>Choose Reset to Default Language to re-apply the default language for the selection or the paragraph.<br/>Choose More to open a dialog with more options.</ahelp></paragraph> <embed href="text/shared/02/20040000.xhp#einfuegemodus"/> <embed href="text/shared/02/20050000.xhp#selektionsmodus"/> <embed href="text/shared/02/20060000.xhp#dokumentveraenderung"/>