source/text/scalc/00/00000406.xhp | 10 +-
source/text/scalc/01/shared_spreadsheet.xhp | 60 +++++++-------
source/text/shared/guide/collab.xhp | 113 ++++++++++++++--------------
source/text/shared/menu/forms.xhp | 4
4 files changed, 99 insertions(+), 88 deletions(-)
New commits:
commit 80ff954f498082eba69545e47f855a64f1964773
Author: Olivier Hallot <olivier.hal...@libreoffice.org>
AuthorDate: Mon Jan 8 12:44:56 2024 -0300
Commit: Olivier Hallot <olivier.hal...@libreoffice.org>
CommitDate: Mon Jan 8 17:11:25 2024 +0100
tdf#155876 UI cmds Calc-Tools menu (56)
+ Tools menu for Calc, Form _ Share Spreadsheet
+ fixes
+ refactoring
Change-Id: I62b37cf492300cd92ca069496c76a3d3b85c69a4
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/161793
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org>
diff --git a/source/text/scalc/00/00000406.xhp
b/source/text/scalc/00/00000406.xhp
index 5e55d53ab7..c9cee36363 100644
--- a/source/text/scalc/00/00000406.xhp
+++ b/source/text/scalc/00/00000406.xhp
@@ -269,9 +269,15 @@
<paragraph id="par_id3156277" role="paragraph"><variable id="exsze">Choose
<emph>Tools - Scenarios</emph>.</variable></paragraph>
</section>
-<paragraph role="paragraph" id="par_id971647297529392"><variable
id="tools_forms">Choose <emph>Tools - Forms</emph>.</variable></paragraph>
+<section id="tools_forms">
+ <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+ <paragraph role="paragraph" id="par_id971647297529392">Choose
<menuitem>Tools - Forms</menuitem>.</paragraph>
+</section>
-<paragraph role="paragraph" id="par_id371647273694433"><variable
id="share_spreadsheet">Choose <menuitem>Tools - Share
Spreadsheet</menuitem></variable></paragraph>
+<section id="share_spreadsheet">
+ <embed href="text/shared/00/00000004.xhp#from_menu_bar"/>
+ <paragraph role="paragraph" id="par_id371647273694433">Choose
<menuitem>Tools - Share Spreadsheet</menuitem></paragraph>
+</section>
<paragraph id="par_id3149020" role="paragraph"><variable
id="protect_sheet">Choose <emph>Tools - Protect
Sheet</emph>.</variable></paragraph>
<paragraph id="par_id3154256" role="paragraph"><variable
id="protect_spreadsheet">Choose <emph>Tools - Protect Spreadsheet
Structure</emph>.</variable></paragraph>
diff --git a/source/text/scalc/01/shared_spreadsheet.xhp
b/source/text/scalc/01/shared_spreadsheet.xhp
index 04180bcfbb..f3cd997932 100644
--- a/source/text/scalc/01/shared_spreadsheet.xhp
+++ b/source/text/scalc/01/shared_spreadsheet.xhp
@@ -11,37 +11,37 @@
<meta>
<topic id="sharespreadsheet" indexer="include" status="PUBLISH">
- <title id="tit" xml-lang="en-US">Sharing Spreadsheets</title>
+ <title id="tit">Sharing Spreadsheets</title>
<filename>/text/scalc/01/shared_spreadsheet.xhp</filename>
</topic>
- </meta>
- <body>
- <bookmark xml-lang="en-US" branch="index" id="bm_id671647274159909">
- <bookmark_value>share spreadsheet</bookmark_value>
- <bookmark_value>spreadsheet;collaboration</bookmark_value>
- <bookmark_value>spreadsheet;share</bookmark_value>
- </bookmark>
- <section id="shared_spreadsheet_head">
- <bookmark id="bm_id551647272004703" xml-lang="en-US"
branch="hid/.uno:ShareDocument" localize="false"/>
- <h1 id="hd_id461647272004705"><variable id="h1"><link
href="text/scalc/01/shared_spreadsheet.xhp">Share
Spreadsheet</link></variable></h1>
- <paragraph id="par_id551647272004709" role="paragraph"
xml-lang="en-US">Sharing a spreadsheet allows several users to open the same
file for editing at the same time.</paragraph>
- </section>
- <section id="howtoget">
- <embed href="text/scalc/00/00000406.xhp#share_spreadsheet"/>
- </section>
- <paragraph role="paragraph" id="par_id211647275285230">The spreadsheet
needs to be on a shared drive, server, website, or similar. Some conditions
must be met on operating systems with user permission management:</paragraph>
- <list type="unordered">
- <listitem>
- <paragraph id="par_id621647275321672" role="listitem">The shared
file needs to reside in a location which is accessible by all
collaborators.</paragraph>
- </listitem>
- <listitem>
- <paragraph id="par_id731647275360618" role="listitem">The file
permissions for both the document and the corresponding lock file need to be
set so that all collaborators can create, delete, and change the
files.</paragraph>
- </listitem>
- </list>
- <tip id="par_id631647275500217">In order to correctly identify the
changes, each collaborator should enter their name in <switchinline
select="sys"><caseinline select="MAC"><menuitem>%PRODUCTNAME -
Preferences</menuitem></caseinline><defaultinline><menuitem>Tools -
Options</menuitem></defaultinline></switchinline><menuitem> - %PRODUCTNAME -
User Data</menuitem> on the Menu bar.</tip>
-
- <section id="relatedtopics">
- <paragraph localize="false" role="paragraph"
id="par_id991647272437516"><embedvar
href="text/shared/guide/collab.xhp#collab"/></paragraph>
- </section>
+</meta>
+<body>
+<bookmark id="bm_id301704725530453" branch="hid/.uno:ShareDocument"
localize="false"/>
+<bookmark branch="index" id="bm_id671647274159909">
+ <bookmark_value>share spreadsheet</bookmark_value>
+ <bookmark_value>spreadsheet;collaboration</bookmark_value>
+ <bookmark_value>spreadsheet;share</bookmark_value>
+</bookmark>
+<section id="shared_spreadsheet_head">
+ <h1 id="hd_id461647272004705"><variable id="h1"><link
href="text/scalc/01/shared_spreadsheet.xhp">Share
Spreadsheet</link></variable></h1>
+ <paragraph id="par_id9590136" role="paragraph"><ahelp hid=".">Opens the
Share Document dialog where you can enable or disable collaborative sharing of
the document.</ahelp></paragraph><comment>Share Document dialog - Share this
spreadsheet with other users</comment>
+ <paragraph id="par_id551647272004709" role="paragraph">Sharing a
spreadsheet allows several users to open the same file for editing at the same
time.</paragraph>
+</section>
+<section id="howtoget">
+ <embed href="text/scalc/00/00000406.xhp#share_spreadsheet"/>
+</section>
+<paragraph role="paragraph" id="par_id211647275285230">The spreadsheet needs
to be on a shared drive, server, website, or similar. Some conditions must be
met on operating systems with user permission management:</paragraph>
+<list type="unordered">
+ <listitem>
+ <paragraph id="par_id621647275321672" role="listitem">The shared file
needs to reside in a location which is accessible by all
collaborators.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id731647275360618" role="listitem">The file
permissions for both the document and the corresponding lock file need to be
set so that all collaborators can create, delete, and change the
files.</paragraph>
+ </listitem>
+</list>
+<tip id="par_id631647275500217">In order to correctly identify the changes,
each collaborator should enter their name in <switchinline
select="sys"><caseinline select="MAC"><menuitem>%PRODUCTNAME -
Preferences</menuitem></caseinline><defaultinline><menuitem>Tools -
Options</menuitem></defaultinline></switchinline><menuitem> - %PRODUCTNAME -
User Data</menuitem> on the Menu bar.</tip>
+<section id="relatedtopics">
+ <paragraph localize="false" role="paragraph"
id="par_id991647272437516"><embedvar
href="text/shared/guide/collab.xhp#collab"/></paragraph>
+</section>
</body>
</helpdocument>
diff --git a/source/text/shared/guide/collab.xhp
b/source/text/shared/guide/collab.xhp
index abc7397d83..44db6dfe27 100644
--- a/source/text/shared/guide/collab.xhp
+++ b/source/text/shared/guide/collab.xhp
@@ -20,108 +20,113 @@
<meta>
<topic id="textsharedguidecollabxml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Collaboration</title>
+<title id="tit">Collaboration</title>
<filename>/text/shared/guide/collab.xhp</filename>
</topic>
</meta>
<body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id4459669">
+<bookmark branch="index" id="bm_id4459669">
<bookmark_value>sharing documents</bookmark_value>
<bookmark_value>collaboration</bookmark_value>
<bookmark_value>file locking with collaboration</bookmark_value>
<bookmark_value>locked documents</bookmark_value>
</bookmark><comment>MW changed the index entries to one level
entries.</comment><comment>MW added two index entries with "lock"</comment>
+
+
+<bookmark branch="hid/modules/scalc/ui/sharedocumentdlg/ShareDocumentDialog"
id="bm_id8779565" localize="false"/>
+<bookmark branch="hid/modules/scalc/ui/sharedocumentdlg/@@nowidget@@"
id="bm_id8779565" localize="false"/>
<h1 id="hd_id130008"><variable id="collab"><link
href="text/shared/guide/collab.xhp">Collaboration</link></variable></h1>
-<paragraph id="par_id5821710" role="paragraph" xml-lang="en-US">In
%PRODUCTNAME Writer, Impress, and Draw, only one user at a time can open any
document for writing. In Calc, many users can open the same spreadsheet for
writing at the same time.</paragraph><comment>Tools - Share Document
menu</comment>
-<bookmark xml-lang="en-US" branch="hid/.uno:ShareDocument" id="bm_id8779564"
localize="false"/>
-<bookmark xml-lang="en-US"
branch="hid/modules/scalc/ui/sharedocumentdlg/ShareDocumentDialog"
id="bm_id8779565" localize="false"/>
-<bookmark xml-lang="en-US"
branch="hid/modules/scalc/ui/sharedocumentdlg/@@nowidget@@" id="bm_id8779565"
localize="false"/>
-<paragraph id="par_id9590136" role="paragraph" xml-lang="en-US"><ahelp hid="."
visibility="hidden">Opens the Share Document dialog where you can enable or
disable collaborative sharing of the
document.</ahelp></paragraph><comment>Share Document dialog - Share this
spreadsheet with other users</comment>
-<bookmark xml-lang="en-US"
branch="hid/modules/scalc/ui/sharedocumentdlg/share" id="bm_id7900021"
localize="false"/>
-<paragraph id="par_id2519913" role="paragraph" xml-lang="en-US"><ahelp hid="."
visibility="hidden">Enable to share the current document with other users.
Disable to use the document unshared. This will invalidate the not yet saved
edits that other users applied in the time since you last opened or saved this
document.</ahelp></paragraph>
+<paragraph id="par_id5821710" role="paragraph">In %PRODUCTNAME Writer,
Impress, and Draw, only one user at a time can open any document for writing.
In Calc, many users can open the same spreadsheet for writing at the same
time.</paragraph><comment>Tools - Share Document menu</comment>
+
+<bookmark branch="hid/modules/scalc/ui/sharedocumentdlg/share"
id="bm_id7900021" localize="false"/>
<h2 id="hd_id6917020">Collaboration in Calc</h2>
-<paragraph id="par_id4411145" role="paragraph" xml-lang="en-US">In
%PRODUCTNAME Calc, document sharing allows simultaneous write access for many
users. Every user who wants to collaborate should enter a name on the
<switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME -
Preferences</emph>
+<paragraph id="par_id4411145" role="paragraph">In %PRODUCTNAME Calc, document
sharing allows simultaneous write access for many users. Every user who wants
to collaborate should enter a name on the <switchinline
select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph>
</caseinline><defaultinline><emph>Tools -
Options</emph></defaultinline></switchinline><emph> - %PRODUCTNAME - User
Data</emph> tab page.</paragraph>
<warning id="par_id6799218">Some commands are not available (grayed out) when
change tracking or document sharing is activated. For a new spreadsheet you
cannot apply or insert the grayed out elements. <comment>Spec Doc owner told me
that this is work in progress and may change any time</comment></warning>
<h3 id="hd_id3274941">Creating a new spreadsheet</h3>
-<paragraph id="par_id9804681" role="paragraph" xml-lang="en-US">User A creates
a new spreadsheet document. The following conditions can apply:</paragraph>
+<paragraph id="par_id9804681" role="paragraph">User A creates a new
spreadsheet document. The following conditions can apply:</paragraph>
<list type="unordered">
<listitem>
-<paragraph id="par_id2109744" role="paragraph" xml-lang="en-US">The user does
not want to share the spreadsheet for collaboration.</paragraph>
-<paragraph id="par_id5374614" role="paragraph" xml-lang="en-US">User A opens,
edits, and saves the document as described above for Writer, Impress, and Draw
document.</paragraph>
+<paragraph id="par_id2109744" role="paragraph">The user does not want to share
the spreadsheet for collaboration.</paragraph>
+<paragraph id="par_id5374614" role="paragraph">User A opens, edits, and saves
the document as described above for Writer, Impress, and Draw
document.</paragraph>
</listitem>
<listitem>
-<paragraph id="par_id768761" role="paragraph" xml-lang="en-US">The user wants
to share the document for collaboration.</paragraph>
-<paragraph id="par_id6844691" role="paragraph" xml-lang="en-US">The user
chooses <item type="menuitem">Tools - Share Document</item> to activate the
collaboration features for this document. A dialog opens where the user can
choose to enable or disable sharing. If the user enables sharing, the document
will be saved in shared mode, which is also shown on the title bar.</paragraph>
+<paragraph id="par_id768761" role="paragraph">The user wants to share the
document for collaboration.</paragraph>
+<paragraph id="par_id6844691" role="paragraph">The user chooses <item
type="menuitem">Tools - Share Document</item> to activate the collaboration
features for this document. A dialog opens where the user can choose to enable
or disable sharing. If the user enables sharing, the document will be saved in
shared mode, which is also shown on the title bar.</paragraph>
</listitem></list>
-<paragraph id="par_id5288857" role="paragraph" xml-lang="en-US">The <item
type="menuitem">Tools - Share Document</item> command can be used to switch the
mode for the current document from unshared mode to shared mode. If you want to
use a shared document in unshared mode, you would save the shared document
using another name or path. This creates a copy of the spreadsheet that is not
shared.</paragraph>
+<paragraph id="par_id5288857" role="paragraph">The <item type="menuitem">Tools
- Share Document</item> command can be used to switch the mode for the current
document from unshared mode to shared mode. If you want to use a shared
document in unshared mode, you would save the shared document using another
name or path. This creates a copy of the spreadsheet that is not
shared.</paragraph>
<h3 id="hd_id8842127">Opening a spreadsheet</h3>
-<paragraph id="par_id7276528" role="paragraph" xml-lang="en-US">User A opens a
spreadsheet document. The following conditions can apply:</paragraph>
+<paragraph id="par_id7276528" role="paragraph">User A opens a spreadsheet
document. The following conditions can apply:</paragraph>
<list type="unordered">
<listitem>
-<paragraph id="par_id8363902" role="paragraph" xml-lang="en-US">The
spreadsheet document is not in shared mode.</paragraph>
-<paragraph id="par_id5974303" role="paragraph" xml-lang="en-US">The user can
open, edit, and save the document as described above for Writer, Impress, and
Draw documents.</paragraph>
+<paragraph id="par_id8363902" role="paragraph">The spreadsheet document is not
in shared mode.</paragraph>
+<paragraph id="par_id5974303" role="paragraph">The user can open, edit, and
save the document as described above for Writer, Impress, and Draw
documents.</paragraph>
</listitem>
<listitem>
-<paragraph id="par_id5323343" role="paragraph" xml-lang="en-US">The
spreadsheet document is in shared mode.</paragraph>
-<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>
-<bookmark xml-lang="en-US"
branch="hid/modules/scalc/ui/conflictsdialog/keepother" id="bm_id1640360"
localize="false"/>
-<paragraph id="par_id3609118" role="paragraph" xml-lang="en-US"><ahelp hid="."
visibility="hidden">Keeps the change of the other user, voids your
change.</ahelp></paragraph><comment>Keep All Mine</comment>
-<bookmark xml-lang="en-US"
branch="hid/modules/scalc/ui/conflictsdialog/keepallmine" id="bm_id1640361"
localize="false"/>
-<paragraph id="par_id7184057" role="paragraph" xml-lang="en-US"><ahelp hid="."
visibility="hidden">Keeps all your changes, voids all other
changes.</ahelp></paragraph><comment>Keep All Others</comment>
-<bookmark xml-lang="en-US"
branch="hid/modules/scalc/ui/conflictsdialog/keepallothers" id="bm_id1640363"
localize="false"/>
-<paragraph id="par_id786767" role="paragraph" xml-lang="en-US"><ahelp hid="."
visibility="hidden">Keeps the changes of all other users, voids your
changes.</ahelp></paragraph>
+<paragraph id="par_id5323343" role="paragraph">The spreadsheet document is in
shared mode.</paragraph>
+<paragraph id="par_id5824457" role="paragraph">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>
+<bookmark branch="hid/modules/scalc/ui/conflictsdialog/ConflictsDialog"
id="bm_id9671926" localize="false"/>
+<bookmark branch="hid/modules/scalc/ui/conflictsdialog/@@nowidget@@"
id="bm_id9671926" localize="false"/>
+<h2 id="hd_id401704727687777">Resolve Conflicts dialog</h2>
+<paragraph id="par_id5800653" role="paragraph"><ahelp hid=".">If the same
contents are changed by different users, the Resolve Conflicts dialog opens.
For each conflict, decide which changes to keep.</ahelp></paragraph>
+<bookmark branch="hid/modules/scalc/ui/conflictsdialog/keepmine"
id="bm_id1640369" localize="false"/>
+<h3 id="hd_id1001704727711775">Keep Mine</h3>
+<paragraph id="par_id6263924" role="paragraph"><ahelp hid=".">Keeps your
change, voids the other change.</ahelp></paragraph>
+<bookmark branch="hid/modules/scalc/ui/conflictsdialog/keepother"
id="bm_id1640360" localize="false"/>
+<h3 id="hd_id781704727739081">Keep Other</h3>
+<paragraph id="par_id3609118" role="paragraph"><ahelp hid=".">Keeps the change
of the other user, voids your change.</ahelp></paragraph>
+<bookmark branch="hid/modules/scalc/ui/conflictsdialog/keepallmine"
id="bm_id1640361" localize="false"/>
+<h3 id="hd_id931704727781391">Keep All Mine</h3>
+<paragraph id="par_id7184057" role="paragraph"><ahelp hid=".">Keeps all your
changes, voids all other changes.</ahelp></paragraph>
+<bookmark branch="hid/modules/scalc/ui/conflictsdialog/keepallothers"
id="bm_id1640363" localize="false"/>
+<h3 id="hd_id681704727819702">Keep All Others</h3>
+<paragraph id="par_id786767" role="paragraph"><ahelp hid=".">Keeps the changes
of all other users, voids your changes.</ahelp></paragraph>
<h3 id="hd_id2934965">Saving a shared spreadsheet document</h3>
-<paragraph id="par_id1174657" role="paragraph" xml-lang="en-US">User A saves a
shared document. The following conditions can apply:</paragraph>
+<paragraph id="par_id1174657" role="paragraph">User A saves a shared document.
The following conditions can apply:</paragraph>
<list type="unordered">
<listitem>
-<paragraph id="par_id2577593" role="paragraph" xml-lang="en-US">The document
was not modified and saved by another user since user A opened the
document.</paragraph>
-<paragraph id="par_id5883968" role="paragraph" xml-lang="en-US">The document
is saved.</paragraph>
+<paragraph id="par_id2577593" role="paragraph">The document was not modified
and saved by another user since user A opened the document.</paragraph>
+<paragraph id="par_id5883968" role="paragraph">The document is
saved.</paragraph>
</listitem>
<listitem>
-<paragraph id="par_id9049653" role="paragraph" xml-lang="en-US">The document
was modified and saved by another user since user A opened the
document.</paragraph>
-<paragraph id="par_id1976683" role="paragraph" xml-lang="en-US">If the changes
do not conflict, the document is saved.</paragraph>
-<paragraph id="par_id43946" role="paragraph" xml-lang="en-US">If the changes
conflict, the Resolve Conflicts dialog will be shown. User A must decide for
the conflicts which version to keep, "Keep Mine" or "Keep Other". When all
conflicts are resolved, the document is saved. While user A resolves the
conflicts, no other user is able to save the shared document.</paragraph>
+<paragraph id="par_id9049653" role="paragraph">The document was modified and
saved by another user since user A opened the document.</paragraph>
+<paragraph id="par_id1976683" role="paragraph">If the changes do not conflict,
the document is saved.</paragraph>
+<paragraph id="par_id43946" role="paragraph">If the changes conflict, the
Resolve Conflicts dialog will be shown. User A must decide for the conflicts
which version to keep, "Keep Mine" or "Keep Other". When all conflicts are
resolved, the document is saved. While user A resolves the conflicts, no other
user is able to save the shared document.</paragraph>
</listitem>
<listitem>
-<paragraph id="par_id6449171" role="paragraph" xml-lang="en-US">Another user
tries to save the shared document and resolves conflicts in this
moment.</paragraph>
-<paragraph id="par_id7101046" role="paragraph" xml-lang="en-US">User A sees a
message that a merge-in is in progress. User A can choose to cancel the save
command for now, or retry saving some time later.</paragraph>
+<paragraph id="par_id6449171" role="paragraph">Another user tries to save the
shared document and resolves conflicts in this moment.</paragraph>
+<paragraph id="par_id7101046" role="paragraph">User A sees a message that a
merge-in is in progress. User A can choose to cancel the save command for now,
or retry saving some time later.</paragraph>
</listitem></list>
-<paragraph id="par_id7186498" role="paragraph" xml-lang="en-US">When a user
successfully saves a shared spreadsheet, the document will be reloaded after
the save command, so that the spreadsheet shows the latest version of all
changes that got saved by all users. A message shows that "foreign changes have
been added" when another user did change some contents.</paragraph>
+<paragraph id="par_id7186498" role="paragraph">When a user successfully saves
a shared spreadsheet, the document will be reloaded after the save command, so
that the spreadsheet shows the latest version of all changes that got saved by
all users. A message shows that "foreign changes have been added" when another
user did change some contents.</paragraph>
<h2 id="hd_id2871791">Collaboration in Writer, Impress, and Draw</h2>
-<paragraph id="par_id2675862" role="paragraph" xml-lang="en-US">For all
modules Writer, Impress, Draw, and for Calc when document sharing is not
enabled, a file locking is possible. This file locking is available even when
accessing the same document from different operating systems:</paragraph>
-<paragraph id="par_id7333597" role="paragraph" xml-lang="en-US">User A opens a
document. The following conditions can apply:</paragraph>
+<paragraph id="par_id2675862" role="paragraph">For all modules Writer,
Impress, Draw, and for Calc when document sharing is not enabled, a file
locking is possible. This file locking is available even when accessing the
same document from different operating systems:</paragraph>
+<paragraph id="par_id7333597" role="paragraph">User A opens a document. The
following conditions can apply:</paragraph>
<list type="unordered">
<listitem>
-<paragraph id="par_id9976195" role="paragraph" xml-lang="en-US">The document
is not locked by any other user.</paragraph>
-<paragraph id="par_id2507400" role="paragraph" xml-lang="en-US">This document
will be opened for read and write access by user A. The document will be locked
for other users until user A closes the document.</paragraph>
+<paragraph id="par_id9976195" role="paragraph">The document is not locked by
any other user.</paragraph>
+<paragraph id="par_id2507400" role="paragraph">This document will be opened
for read and write access by user A. The document will be locked for other
users until user A closes the document.</paragraph>
</listitem>
<listitem>
-<paragraph id="par_id216681" role="paragraph" xml-lang="en-US">The document is
marked as "read-only" by the file system.</paragraph>
-<paragraph id="par_id7709585" role="paragraph" xml-lang="en-US">This document
will be opened in read-only mode. Editing is not allowed. User A can save the
document using another document name or another path. User A can edit this
copy.</paragraph>
+<paragraph id="par_id216681" role="paragraph">The document is marked as
"read-only" by the file system.</paragraph>
+<paragraph id="par_id7709585" role="paragraph">This document will be opened in
read-only mode. Editing is not allowed. User A can save the document using
another document name or another path. User A can edit this copy.</paragraph>
</listitem>
<listitem>
-<paragraph id="par_id4309518" role="paragraph" xml-lang="en-US">The document
is locked by another user.</paragraph>
-<paragraph id="par_id206610" role="paragraph" xml-lang="en-US">User A sees a
dialog that tells the user the document is locked. The dialog offers to open
the document in read-only mode, or to open a copy for editing, or to cancel the
Open command.</paragraph>
+<paragraph id="par_id4309518" role="paragraph">The document is locked by
another user.</paragraph>
+<paragraph id="par_id206610" role="paragraph">User A sees a dialog that tells
the user the document is locked. The dialog offers to open the document in
read-only mode, or to open a copy for editing, or to cancel the Open
command.</paragraph>
</listitem></list>
<h2 id="hd_id29349651">User access permissions and sharing documents</h2>
-<paragraph id="par_id11746571" role="paragraph" xml-lang="en-US">Some
conditions must be met on operating systems with a user permission
management.</paragraph>
+<paragraph id="par_id11746571" role="paragraph">Some conditions must be met on
operating systems with a user permission management.</paragraph>
<list type="unordered">
<listitem>
-<paragraph id="par_id25775931" role="paragraph" xml-lang="en-US">The shared
file needs to reside in a location which is accessible by all
collaborators.</paragraph>
+<paragraph id="par_id25775931" role="paragraph">The shared file needs to
reside in a location which is accessible by all collaborators.</paragraph>
</listitem>
<listitem>
-<paragraph id="par_id90496531" role="paragraph" xml-lang="en-US">The file
permissions for both the document and the corresponding lock file need to be
set so that all collaborators can create, delete, and change the
files.</paragraph>
+<paragraph id="par_id90496531" role="paragraph">The file permissions for both
the document and the corresponding lock file need to be set so that all
collaborators can create, delete, and change the files.</paragraph>
</listitem></list>
<warning id="par_id71864981">Write access also enables other users to
(accidentally or deliberately) delete or change a file.</warning>
<section id="relatedtopics">
-<paragraph id="par_id4263740" role="paragraph" xml-lang="en-US"><link
href="text/shared/01/01070000.xhp">Save As</link></paragraph>
+<paragraph id="par_id4263740" role="paragraph"><link
href="text/shared/01/01070000.xhp">Save As</link></paragraph>
</section>
</body>
</helpdocument>
diff --git a/source/text/shared/menu/forms.xhp
b/source/text/shared/menu/forms.xhp
index e273b70df1..13f5e9ba7a 100644
--- a/source/text/shared/menu/forms.xhp
+++ b/source/text/shared/menu/forms.xhp
@@ -11,13 +11,13 @@
<meta>
<topic id="formssubmenu" indexer="include" status="PUBLISH">
- <title id="tit" xml-lang="en-US">Forms submenu</title>
+ <title id="tit">Forms submenu</title>
<filename>/text/shared/menu/forms.xhp</filename>
</topic>
</meta>
<body>
<section id="forms_submenu_Head">
- <bookmark id="bm_id381647289210347" xml-lang="en-US" branch="hid/zzzz"
localize="false"/>
+ <bookmark id="bm_id381647289210347" branch="hid/.uno:ToolsFormsMenu"
localize="false"/>
<h1 id="hd_id491647289210348"><variable id="h1"><link
href="text/shared/menu/forms.xhp">Forms Submenu</link></variable></h1>
<embed href="text/swriter/main0120.xhp#form_intro"/>
</section>
