[Libreoffice-commits] help.git: source/text
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Sep 12 02:47:31 UTC 2018
source/text/scalc/01/02150000.xhp | 4 +++-
source/text/scalc/01/02160000.xhp | 1 +
source/text/scalc/01/04070100.xhp | 1 +
source/text/scalc/01/04070300.xhp | 3 ++-
source/text/scalc/01/05020600.xhp | 1 +
source/text/scalc/01/05110000.xhp | 7 ++++---
source/text/scalc/01/05120000.xhp | 2 ++
source/text/scalc/01/12010000.xhp | 7 ++++---
source/text/scalc/01/12040300.xhp | 7 ++++---
source/text/scalc/01/12070000.xhp | 7 ++++---
source/text/scalc/01/12090106.xhp | 4 +++-
source/text/scalc/01/data_form.xhp | 1 +
source/text/scalc/01/data_provider.xhp | 1 +
source/text/scalc/01/live_data_stream.xhp | 1 +
source/text/shared/01/02060000.xhp | 1 +
source/text/shared/01/05340200.xhp | 5 +++--
source/text/shared/guide/collab.xhp | 1 +
source/text/shared/optionen/01060401.xhp | 3 ++-
18 files changed, 39 insertions(+), 18 deletions(-)
New commits:
commit 0cfa25cb0494fee382aaa33f8dd0354f8a35b881
Author: Olivier Hallot <olivier.hallot at libreoffice.org>
AuthorDate: Tue Sep 11 23:40:00 2018 -0300
Commit: Olivier Hallot <olivier.hallot at libreoffice.org>
CommitDate: Wed Sep 12 04:47:09 2018 +0200
tdf#115254 Some branch bookmarks are'nt working 23
module sc a - e
Change-Id: I179ea686cf83f31ebc645c2310fca52b222eb66f
Reviewed-on: https://gerrit.libreoffice.org/60365
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hallot at libreoffice.org>
diff --git a/source/text/scalc/01/02150000.xhp b/source/text/scalc/01/02150000.xhp
index 89786fe5a..4fe6b67ce 100644
--- a/source/text/scalc/01/02150000.xhp
+++ b/source/text/scalc/01/02150000.xhp
@@ -36,7 +36,9 @@
<bookmark_value>cell contents; deleting</bookmark_value>
</bookmark>
<bookmark xml-lang="en-US" branch="hid/.uno:Delete" id="bm_id5511579" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/deletecontents/DeleteContentsDialog" id="bm_id3145382" localize="false"/><paragraph role="heading" id="hd_id3143284" xml-lang="en-US" level="1">Deleting Contents</paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/deletecontents/DeleteContentsDialog" id="bm_id3145382" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/deletecontents/@@nowidget@@" id="bm_id3145382" localize="false"/>
+<paragraph role="heading" id="hd_id3143284" xml-lang="en-US" level="1">Deleting Contents</paragraph>
<paragraph role="paragraph" id="par_id3149456" xml-lang="en-US"><variable id="inhalteloeschentext"><ahelp hid=".uno:Delete">Specifies the contents to be deleted from the active cell or from a selected cell range.</ahelp>
</variable> If several sheets are selected, all selected sheets will be affected.</paragraph>
</section>
diff --git a/source/text/scalc/01/02160000.xhp b/source/text/scalc/01/02160000.xhp
index 017655fb7..dd185bef7 100644
--- a/source/text/scalc/01/02160000.xhp
+++ b/source/text/scalc/01/02160000.xhp
@@ -42,6 +42,7 @@
<bookmark xml-lang="en-US" branch="hid/.uno:DeleteCell" id="bm_id3151115" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/deletecells/DeleteCellsDialog" id="bm_id3151116" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/deletecells/@@nowidget@@" id="bm_id3151116" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3153726" role="heading" level="1">Delete Cells</paragraph>
<paragraph xml-lang="en-US" id="par_id3154490" role="paragraph"><variable id="zellenloeschentext"><ahelp hid=".uno:DeleteCell">Completely deletes selected cells, columns or rows. The cells below or to the right of the deleted cells will fill the space.</ahelp>
</variable> Note that the selected delete option is stored and reloaded when the dialog is next called.</paragraph>
diff --git a/source/text/scalc/01/04070100.xhp b/source/text/scalc/01/04070100.xhp
index aafa1d302..f7f0384bd 100644
--- a/source/text/scalc/01/04070100.xhp
+++ b/source/text/scalc/01/04070100.xhp
@@ -29,6 +29,7 @@
<body>
<bookmark xml-lang="en-US" branch="hid/.uno:DefineName" id="bm_id4757802" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/definename/DefineNameDialog" id="bm_id3155922" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/definename/@@nowidget@@" id="bm_id3155922" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/managenamesdialog/ManageNamesDialog" id="bm_id3155923" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/managenamesdialog/@@nowidget@@" id="bm_id3155923" localize="false"/>
<paragraph role="heading" id="hd_id3156330" xml-lang="en-US" level="1">Define Names</paragraph>
diff --git a/source/text/scalc/01/04070300.xhp b/source/text/scalc/01/04070300.xhp
index 0cf9e2a50..f98549434 100644
--- a/source/text/scalc/01/04070300.xhp
+++ b/source/text/scalc/01/04070300.xhp
@@ -18,7 +18,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textscalc0104070300xml" indexer="include" status="PUBLISH">
@@ -35,6 +35,7 @@
</bookmark>
<bookmark xml-lang="en-US" branch="hid/.uno:CreateNames" id="bm_id8912439" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/createnamesdialog/CreateNamesDialog" id="bm_id3150398" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/createnamesdialog/@@nowidget@@" id="bm_id3150398" localize="false"/>
<paragraph role="heading" id="hd_id3147264" xml-lang="en-US" level="1">Creating Names</paragraph>
<paragraph role="paragraph" id="par_id3153969" xml-lang="en-US"><variable id="namenuebernehmentext"><ahelp hid=".uno:CreateNames">Allows you to automatically name multiple cell ranges.</ahelp>
</variable></paragraph>
diff --git a/source/text/scalc/01/05020600.xhp b/source/text/scalc/01/05020600.xhp
index 527fe7eb0..eda20fe3e 100644
--- a/source/text/scalc/01/05020600.xhp
+++ b/source/text/scalc/01/05020600.xhp
@@ -32,6 +32,7 @@
<body>
<section id="zellschutz">
<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/cellprotectionpage/CellProtectionPage" id="bm_id3151385" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/cellprotectionpage/@@nowidget@@" id="bm_id3151385" localize="false"/>
<paragraph role="heading" id="hd_id3145119" xml-lang="en-US" level="1"><link href="text/scalc/01/05020600.xhp" name="Cell Protection">Cell Protection</link></paragraph>
<paragraph role="paragraph" id="par_id3150398" xml-lang="en-US"><ahelp hid="modules/scalc/ui/cellprotectionpage/CellProtectionPage">Defines protection options for selected cells.</ahelp></paragraph>
</section>
diff --git a/source/text/scalc/01/05110000.xhp b/source/text/scalc/01/05110000.xhp
index d7fb7c128..01e03571d 100644
--- a/source/text/scalc/01/05110000.xhp
+++ b/source/text/scalc/01/05110000.xhp
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
* This file is part of the LibreOffice project.
*
@@ -18,8 +18,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-
-
+
+
<meta>
<topic id="textscalc0105110000xml" indexer="include">
<title id="tit" xml-lang="en-US">AutoFormat</title>
@@ -29,6 +29,7 @@
<body>
<bookmark xml-lang="en-US" branch="hid/.uno:AutoFormat" id="bm_id9247611" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/autoformattable/AutoFormatTableDialog" id="bm_id2998138" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/autoformattable/@@nowidget@@" id="bm_id2998138" localize="false"/>
<paragraph role="heading" id="hd_id3149666" xml-lang="en-US" level="1"><variable id="autoformat"><link href="text/scalc/01/05110000.xhp" name="AutoFormat">AutoFormat</link>
</variable></paragraph>
<paragraph role="paragraph" id="par_id3145367" xml-lang="en-US"><variable id="autoformattext"><ahelp hid=".">Use this command to apply an AutoFormat to a selected sheet area or to define your own AutoFormats.</ahelp>
diff --git a/source/text/scalc/01/05120000.xhp b/source/text/scalc/01/05120000.xhp
index 39b241163..7797cd765 100644
--- a/source/text/scalc/01/05120000.xhp
+++ b/source/text/scalc/01/05120000.xhp
@@ -30,6 +30,7 @@
<bookmark xml-lang="en-US" branch="hid/.uno:ConditionalFormatDialog" id="bm_id5008046" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:ConditionalFormatMenu" id="bm_id5008047" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/conditionalformatdialog/ConditionalFormatDialog" id="bm_id3152518" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/conditionalformatdialog/@@nowidget@@" id="bm_id3152518" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3155132" role="heading" level="1">Conditional Formatting</paragraph>
<paragraph xml-lang="en-US" id="par_id3163710" role="paragraph"><variable id="bedingtetext"><ahelp hid=".">Choose <emph>Conditional Formatting</emph> to define format styles depending on certain conditions.</ahelp>
</variable> If a style was already assigned to a cell, it remains unchanged. The style entered here is then evaluated. There are several types of conditional formatting that can be used.</paragraph>
@@ -138,6 +139,7 @@ Apply a color scale to a range consist of displaying a bicolor or tricolor gradi
</list>
<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/condformatmanager/CondFormatManager" id="bm_id3152598" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/condformatmanager/@@nowidget@@" id="bm_id3152598" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3153384" role="heading" level="2">Manage Conditional Formatting</paragraph>
<paragraph xml-lang="en-US" id="par_id3155906" role="paragraph"><ahelp hid=".">This dialog allows you to see all the conditional formatting defined in the spreadsheet.</ahelp></paragraph>
diff --git a/source/text/scalc/01/12010000.xhp b/source/text/scalc/01/12010000.xhp
index 11f53503f..32e295b4b 100644
--- a/source/text/scalc/01/12010000.xhp
+++ b/source/text/scalc/01/12010000.xhp
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
* This file is part of the LibreOffice project.
*
@@ -18,8 +18,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-
-
+
+
<meta>
<topic id="textscalc0112010000xml" indexer="include">
<title id="tit" xml-lang="en-US">Define Database Range</title>
@@ -29,6 +29,7 @@
<body>
<bookmark xml-lang="en-US" branch="hid/.uno:DefineDBName" id="bm_id6632476" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/definedatabaserangedialog/DefineDatabaseRangeDialog" id="bm_id3147335" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/definedatabaserangedialog/@@nowidget@@" id="bm_id3147335" localize="false"/>
<paragraph role="heading" id="hd_id3157909" xml-lang="en-US" level="1">Define Database Range</paragraph>
<paragraph role="paragraph" id="par_id3155922" xml-lang="en-US"><variable id="bereichtext"><ahelp hid=".uno:DefineDBName">Defines a database range based on the selected cells in your sheet.</ahelp>
</variable></paragraph>
diff --git a/source/text/scalc/01/12040300.xhp b/source/text/scalc/01/12040300.xhp
index 27fcb3acb..aa541d45b 100644
--- a/source/text/scalc/01/12040300.xhp
+++ b/source/text/scalc/01/12040300.xhp
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
* This file is part of the LibreOffice project.
*
@@ -18,8 +18,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-
-
+
+
<meta>
<topic id="textscalc0112040300xml" indexer="include">
<title id="tit" xml-lang="en-US">Advanced Filter</title>
@@ -29,6 +29,7 @@
<body>
<bookmark xml-lang="en-US" branch="hid/.uno:DataFilterSpecialFilter" id="bm_id4998774" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/advancedfilterdialog/AdvancedFilterDialog" id="bm_id3154366" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/advancedfilterdialog/@@nowidget@@" id="bm_id3154366" localize="false"/>
<paragraph role="heading" id="hd_id3158394" xml-lang="en-US" level="1">Advanced Filter</paragraph>
<paragraph role="paragraph" id="par_id3156281" xml-lang="en-US"><variable id="spezialfilter"><ahelp hid=".uno:DataFilterSpecialFilter">Defines an advanced filter.</ahelp>
</variable></paragraph>
diff --git a/source/text/scalc/01/12070000.xhp b/source/text/scalc/01/12070000.xhp
index 6c9706cdb..fdbe54615 100644
--- a/source/text/scalc/01/12070000.xhp
+++ b/source/text/scalc/01/12070000.xhp
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
* This file is part of the LibreOffice project.
*
@@ -18,8 +18,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-
-
+
+
<meta>
<topic id="textscalc0112070000xml" indexer="include">
<title id="tit" xml-lang="en-US">Consolidate</title>
@@ -29,6 +29,7 @@
<body>
<bookmark xml-lang="en-US" branch="hid/.uno:DataConsolidate" id="bm_id4927741" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/consolidatedialog/ConsolidateDialog" id="bm_id3148664" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/consolidatedialog/@@nowidget@@" id="bm_id3148664" localize="false"/>
<paragraph role="heading" id="hd_id3148946" xml-lang="en-US" level="1">Consolidate</paragraph>
<paragraph role="paragraph" id="par_id3148798" xml-lang="en-US"><variable id="konsolidieren"><ahelp hid=".uno:DataConsolidate">Combines data from one or more independent cell ranges and calculates a new range using the function that you specify.</ahelp>
</variable></paragraph>
diff --git a/source/text/scalc/01/12090106.xhp b/source/text/scalc/01/12090106.xhp
index ccfa2a657..bd753a949 100644
--- a/source/text/scalc/01/12090106.xhp
+++ b/source/text/scalc/01/12090106.xhp
@@ -33,7 +33,9 @@
<bookmark_value>display options in pivot table</bookmark_value>
<bookmark_value>sorting;options in pivot table</bookmark_value>
<bookmark_value>data field options for pivot table</bookmark_value>
-</bookmark><comment>mw changed "hiding..." entry</comment><paragraph role="heading" id="par_idN10542" xml-lang="en-US" level="1">Data Field Options</paragraph>
+</bookmark><comment>mw changed "hiding..." entry</comment>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/datafieldoptionsdialog/@@nowidget@@" id="@@nowidget@@" localize="false"/>
+<paragraph role="heading" id="par_idN10542" xml-lang="en-US" level="1">Data Field Options</paragraph>
<paragraph role="paragraph" id="par_idN10546" xml-lang="en-US">You can specify additional options for column, row, and page data fields in the <link href="text/scalc/01/12090105.xhp">pivot table</link>.</paragraph>
<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/datafieldoptionsdialog/sortby" id="bm_id6588335" localize="false"/><paragraph role="heading" id="par_idN10557" xml-lang="en-US" level="2">Sort by</paragraph>
<paragraph role="paragraph" id="par_idN1055B" xml-lang="en-US"><ahelp hid="modules/scalc/ui/datafieldoptionsdialog/sortby">Select the data field that you want to sort columns or rows by.</ahelp></paragraph>
diff --git a/source/text/scalc/01/data_form.xhp b/source/text/scalc/01/data_form.xhp
index aa7443e51..ab2105408 100644
--- a/source/text/scalc/01/data_form.xhp
+++ b/source/text/scalc/01/data_form.xhp
@@ -20,6 +20,7 @@
<section id="data_form">
<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/dataform/DataFormDialog" id="bm_id240920171033409926" localize="false"/>
+ <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/dataform/@@nowidget@@" id="bm_id240920171033409926" localize="false"/>
<bookmark xml-lang="en-US" branch="index" id="bm_id240920171018528200">
<bookmark_value>data entry forms;for spreadsheets</bookmark_value>
<bookmark_value>data entry forms;insert data in spreadsheets</bookmark_value>
diff --git a/source/text/scalc/01/data_provider.xhp b/source/text/scalc/01/data_provider.xhp
index be88acb11..f1948be68 100644
--- a/source/text/scalc/01/data_provider.xhp
+++ b/source/text/scalc/01/data_provider.xhp
@@ -30,6 +30,7 @@
<section id="data_form">
<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/dataprovider/DataProviderDialog" id="bm_id240920171033409926" localize="false"/>
+ <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/dataprovider/@@nowidget@@" id="bm_id240920171033409926" localize="false"/>
<bookmark xml-lang="en-US" branch="index" id="bm_id240920171018528200">
<bookmark_value>data provider;for spreadsheets</bookmark_value>
</bookmark>
diff --git a/source/text/scalc/01/live_data_stream.xhp b/source/text/scalc/01/live_data_stream.xhp
index 3377755d5..6f26c9a02 100644
--- a/source/text/scalc/01/live_data_stream.xhp
+++ b/source/text/scalc/01/live_data_stream.xhp
@@ -30,6 +30,7 @@
<section id="live_data_stream">
<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/datastreams/DataStreamDialog" id="bm_id240920171033409926" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/datastreams/@@nowidget@@" id="bm_id240920171033409926" localize="false"/>
<bookmark xml-lang="en-US" branch="index" id="bm_id240920171018528200">
<bookmark_value>Data Stream;Live data stream</bookmark_value>
</bookmark>
diff --git a/source/text/shared/01/02060000.xhp b/source/text/shared/01/02060000.xhp
index 1ca176f5b..da17622ff 100644
--- a/source/text/shared/01/02060000.xhp
+++ b/source/text/shared/01/02060000.xhp
@@ -39,6 +39,7 @@
</bookmark>
<comment>mw deleted "cell ranges,pasting"</comment>
<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/checkwarningdialog/CheckWarningDialog" id="bm_id3149988" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/checkwarningdialog/@@nowidget@@" id="bm_id3149988" localize="false"/>
<switch select="appl">
<case select="CALC">
<paragraph role="paragraph" id="par_id3154044" xml-lang="en-US" localize="false"><ahelp hid="modules/scalc/ui/checkwarningdialog/CheckWarningDialog"></ahelp></paragraph><comment>overwrite dialog in Calc if target is not empty</comment>
diff --git a/source/text/shared/01/05340200.xhp b/source/text/shared/01/05340200.xhp
index b186f019b..4f2b5f4c4 100644
--- a/source/text/shared/01/05340200.xhp
+++ b/source/text/shared/01/05340200.xhp
@@ -30,9 +30,10 @@
</history>
</meta>
<body>
-
-
+
+
<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/colwidthdialog/ColWidthDialog" id="bm_id7108329" localize="false"/>
+ <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/colwidthdialog/@@nowidget@@" id="bm_id7108329" localize="false"/>
<bookmark branch="hid/.uno:ColumnWidth" xml-lang="en-US" id="bm_id3155619" localize="false"/><bookmark branch="hid/DBACCESS_HID_BROWSER_COLUMNWIDTH" xml-lang="en-US" id="bm_id3150756" localize="false"/><paragraph role="heading" level="1" id="hd_id3158397" xml-lang="en-US">Column width</paragraph>
<paragraph role="paragraph" id="par_id3153272" xml-lang="en-US"><variable id="spaltetext"><ahelp hid="modules/scalc/ui/colwidthdialog/ColWidthDialog" visibility="visible">Changes the width of the current column, or the selected columns.</ahelp></variable></paragraph>
<section id="howtoget">
diff --git a/source/text/shared/guide/collab.xhp b/source/text/shared/guide/collab.xhp
index 8a1824aa5..ec2695ce2 100644
--- a/source/text/shared/guide/collab.xhp
+++ b/source/text/shared/guide/collab.xhp
@@ -66,6 +66,7 @@
<paragraph id="par_id5824457" role="paragraph" xml-lang="en-US">The user sees a message that the document is in shared mode and that some features are not available in this mode. The user can disable this message for the future. After clicking OK, the document is opened in shared mode.</paragraph>
</listitem></list><comment>Resolve Conflicts dialog</comment>
<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/conflictsdialog/ConflictsDialog" id="bm_id9671926" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/conflictsdialog/@@nowidget@@" id="bm_id9671926" localize="false"/>
<paragraph id="par_id5800653" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">If the same contents are changed by different users, the Resolve Conflicts dialog opens. For each conflict, decide which changes to keep.</ahelp></paragraph><comment>Keep Mine</comment>
<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/conflictsdialog/keepmine" id="bm_id1640369" localize="false"/>
<paragraph id="par_id6263924" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Keeps your change, voids the other change.</ahelp></paragraph><comment>Keep Other</comment>
diff --git a/source/text/shared/optionen/01060401.xhp b/source/text/shared/optionen/01060401.xhp
index 347731dcc..dbdb298a7 100644
--- a/source/text/shared/optionen/01060401.xhp
+++ b/source/text/shared/optionen/01060401.xhp
@@ -20,7 +20,7 @@
-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsharedoptionen01060401xml" indexer="include" status="PUBLISH">
@@ -35,6 +35,7 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3153341"><bookmark_value>sort lists; copying to in Calc</bookmark_value>
</bookmark>
<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/colorrowdialog/ColOrRowDialog" id="bm_id3156329" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/colorrowdialog/@@nowidget@@" id="bm_id3156329" localize="false"/>
<paragraph role="heading" id="hd_id3153341" xml-lang="en-US" level="1">Copy List</paragraph>
<paragraph role="paragraph" id="par_id3150772" xml-lang="en-US"><ahelp hid="modules/scalc/ui/colorrowdialog/ColOrRowDialog">Allows you to copy marked cells to a sort list.</ahelp></paragraph>
<section id="howtoget">
More information about the Libreoffice-commits
mailing list