diff options
| author | Olivier Hallot <olivier.hallot@libreoffice.org> | 2018-09-11 23:40:00 -0300 |
|---|---|---|
| committer | Olivier Hallot <olivier.hallot@libreoffice.org> | 2018-09-12 04:47:09 +0200 |
| commit | 0cfa25cb0494fee382aaa33f8dd0354f8a35b881 (patch) | |
| tree | 704b294ead8c5ad743b8679f1a1ec048062beb56 /source/text/shared/guide | |
| parent | abdb4b9745c43da805b11e19981b1c00c181d82b (diff) | |
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@libreoffice.org>
Diffstat (limited to 'source/text/shared/guide')
| -rw-r--r-- | source/text/shared/guide/collab.xhp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/text/shared/guide/collab.xhp b/source/text/shared/guide/collab.xhp index 8a1824aa5f..ec2695ce26 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> |