[Libreoffice-commits] help.git: source/text
Stanislav Horacek
stanislav.horacek at gmail.com
Mon Nov 17 01:29:00 PST 2014
source/text/scalc/01/02170000.xhp | 2 +-
source/text/shared/00/00000402.xhp | 20 ++++++++++----------
source/text/shared/01/01100600.xhp | 2 +-
source/text/shared/01/01190000.xhp | 2 +-
source/text/shared/01/02230000.xhp | 4 ++--
source/text/shared/01/02230150.xhp | 4 ++--
source/text/shared/01/02230300.xhp | 4 ++--
source/text/shared/01/02230400.xhp | 4 ++--
source/text/shared/guide/microsoft_terms.xhp | 2 +-
source/text/shared/guide/protection.xhp | 4 ++--
source/text/shared/guide/redlining_accept.xhp | 2 +-
source/text/shared/guide/redlining_doccompare.xhp | 2 +-
source/text/shared/guide/redlining_docmerge.xhp | 2 +-
source/text/shared/guide/redlining_enter.xhp | 6 +++---
source/text/shared/guide/redlining_navigation.xhp | 6 +++---
source/text/shared/guide/redlining_protect.xhp | 6 +++---
source/text/shared/optionen/01040700.xhp | 2 +-
source/text/shared/optionen/01060600.xhp | 2 +-
source/text/swriter/01/05150300.xhp | 2 +-
19 files changed, 39 insertions(+), 39 deletions(-)
New commits:
commit d08fb7ff77e5a054dc6005652159299891fc15ff
Author: Stanislav Horacek <stanislav.horacek at gmail.com>
Date: Sun Nov 16 17:25:57 2014 +0100
fdo#85046 rename items related to recording changes
Change-Id: Ia1068ed4590585cc9cc4a8ece29a761f61c290e9
Reviewed-on: https://gerrit.libreoffice.org/12496
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/source/text/scalc/01/02170000.xhp b/source/text/scalc/01/02170000.xhp
index 8bb8895..2a65596 100644
--- a/source/text/scalc/01/02170000.xhp
+++ b/source/text/scalc/01/02170000.xhp
@@ -44,7 +44,7 @@ YJ: checked</lastedited>
<section id="howtoget">
<embed href="text/scalc/00/00000402.xhp#btaloes"/>
</section>
-<paragraph role="note" id="par_id3145801" xml-lang="en-US" l10n="CHG" oldref="7">You cannot delete a sheet while <emph>Edit - Changes - Record</emph> is activated.</paragraph>
+<paragraph role="note" id="par_id3145801" xml-lang="en-US" l10n="CHG" oldref="7">You cannot delete a sheet while <emph>Edit - Track Changes - Record Changes</emph> is activated.</paragraph>
<paragraph role="heading" id="hd_id3147124" xml-lang="en-US" level="2" l10n="U" oldref="3">Yes</paragraph>
<paragraph role="paragraph" id="par_id3154943" xml-lang="en-US" l10n="U" oldref="4">Deletes the current sheet.</paragraph>
<paragraph role="heading" id="hd_id3149412" xml-lang="en-US" level="2" l10n="U" oldref="5">No</paragraph>
diff --git a/source/text/shared/00/00000402.xhp b/source/text/shared/00/00000402.xhp
index f0e6556..6b8d2c6 100644
--- a/source/text/shared/00/00000402.xhp
+++ b/source/text/shared/00/00000402.xhp
@@ -156,30 +156,30 @@
</section>
</section>
-<paragraph role="paragraph" id="par_id3145251" xml-lang="en-US" l10n="U" oldref="555"><variable id="aenderungen">Choose <emph>Edit - Changes</emph>
+<paragraph role="paragraph" id="par_id3145251" xml-lang="en-US" l10n="U" oldref="555"><variable id="aenderungen">Choose <emph>Edit - Track Changes</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3153336" xml-lang="en-US" l10n="U" oldref="556"><variable id="aufzeichnen">Choose <emph>Edit - Changes - Record</emph>
+<paragraph role="paragraph" id="par_id3153336" xml-lang="en-US" l10n="U" oldref="556"><variable id="aufzeichnen">Choose <emph>Edit - Track Changes - Record Changes</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3150594" xml-lang="en-US" l10n="U" oldref="557"><variable id="anzeigen"><switchinline select="appl"><caseinline select="WRITER">Choose <emph>Edit - Changes - Show</emph>
-</caseinline><caseinline select="CALC">Choose <emph>Edit - Changes - Show</emph>
+<paragraph role="paragraph" id="par_id3150594" xml-lang="en-US" l10n="U" oldref="557"><variable id="anzeigen"><switchinline select="appl"><caseinline select="WRITER">Choose <emph>Edit - Track Changes - Show Changes</emph>
+</caseinline><caseinline select="CALC">Choose <emph>Edit - Track Changes - Show Changes</emph>
</caseinline></switchinline>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3153845" xml-lang="en-US" l10n="U" oldref="558"><variable id="rotlinie">Choose <emph>Edit - Changes - Accept or Reject</emph>
+<paragraph role="paragraph" id="par_id3153845" xml-lang="en-US" l10n="U" oldref="558"><variable id="rotlinie">Choose <emph>Edit - Track Changes - Manage Changes</emph>
</variable></paragraph>
<section id="rotlinieliste">
-<paragraph role="paragraph" id="par_id3148587" xml-lang="en-US" l10n="U" oldref="559">Choose <emph>Edit - Changes - Accept or Reject - List</emph> tab</paragraph>
+<paragraph role="paragraph" id="par_id3148587" xml-lang="en-US" l10n="U" oldref="559">Choose <emph>Edit - Track Changes - Manage Changes - List</emph> tab</paragraph>
<paragraph role="paragraph" id="par_id3150396" xml-lang="en-US" l10n="U" oldref="574">Choose <emph>Format - AutoCorrect - Apply and Edit Changes.</emph> AutoCorrect dialog appears, click <emph>Edit Changes</emph> button, see <emph>List</emph> tab page</paragraph>
</section>
-<paragraph role="paragraph" id="par_id3153878" xml-lang="en-US" l10n="U" oldref="560"><variable id="rotliniefilter">Choose <emph>Edit - Changes - Accept or Reject - Filter</emph> tab
+<paragraph role="paragraph" id="par_id3153878" xml-lang="en-US" l10n="U" oldref="560"><variable id="rotliniefilter">Choose <emph>Edit - Track Changes - Manage Changes - Filter</emph> tab
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3151281" xml-lang="en-US" l10n="U" oldref="561"><variable id="einfuegen">Choose <emph>Edit - Changes - Merge Document</emph>
+<paragraph role="paragraph" id="par_id3151281" xml-lang="en-US" l10n="U" oldref="561"><variable id="einfuegen">Choose <emph>Edit - Track Changes - Merge Document</emph>
</variable></paragraph>
<paragraph role="paragraph" id="par_id3153224" xml-lang="en-US" l10n="U" oldref="562"><variable id="dvergl">Choose <emph>Edit - Compare Document</emph>
</variable></paragraph>
<section id="kommentar">
-<paragraph role="paragraph" id="par_id3148773" xml-lang="en-US" l10n="U" oldref="563">Choose <emph>Edit - Changes - Comment</emph>
+<paragraph role="paragraph" id="par_id3148773" xml-lang="en-US" l10n="U" oldref="563">Choose <emph>Edit - Track Changes - Comment on Change</emph>
</paragraph>
-<paragraph role="paragraph" id="par_id3149488" xml-lang="en-US" l10n="U" oldref="571">Choose <emph>Edit - Changes - Accept or Reject - List</emph> tab. Click an entry in the list and open the context menu. Choose <emph>Edit Comment</emph>
+<paragraph role="paragraph" id="par_id3149488" xml-lang="en-US" l10n="U" oldref="571">Choose <emph>Edit - Track Changes - Manage Changes - List</emph> tab. Click an entry in the list and open the context menu. Choose <emph>Edit Comment</emph>
</paragraph>
</section>
<section id="suchen">
diff --git a/source/text/shared/01/01100600.xhp b/source/text/shared/01/01100600.xhp
index 184a7c3..af97cb3 100644
--- a/source/text/shared/01/01100600.xhp
+++ b/source/text/shared/01/01100600.xhp
@@ -52,7 +52,7 @@
<bookmark xml-lang="en-US" branch="hid/sfx/ui/securityinfopage/recordchanges" id="bm_id868861" localize="false"/>
<paragraph role="heading" id="par_idN106B4" xml-lang="en-US" level="3" l10n="NEW">Record changes</paragraph>
-<paragraph role="paragraph" id="par_idN106B8" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to enable recording changes. This is the same as <emph>Edit - Changes - Record</emph>.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN106B8" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to enable recording changes. This is the same as <emph>Edit - Track Changes - Record Changes</emph>.</ahelp></paragraph>
<paragraph role="tip" id="par_idN106C9" xml-lang="en-US" l10n="NEW">To protect the recording state with a password, click <emph>Protect</emph> and enter a password. Other users of this document can apply their changes, but they cannot disable change recording without knowing the password.</paragraph>
<bookmark xml-lang="en-US" branch="hid/sfx/ui/securityinfopage/unprotect" id="bm_id2517167" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/sfx/ui/securityinfopage/protect" id="bm_id2517166" localize="false"/>
diff --git a/source/text/shared/01/01190000.xhp b/source/text/shared/01/01190000.xhp
index fa60a53..a3e1896 100644
--- a/source/text/shared/01/01190000.xhp
+++ b/source/text/shared/01/01190000.xhp
@@ -67,6 +67,6 @@
<paragraph role="paragraph" id="par_id3149669" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="sfx/ui/versionsofdialog/delete">Deletes the selected version.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/sfx/ui/versionsofdialog/compare" id="bm_id3154389" localize="false"/>
<paragraph role="heading" id="hd_id3148739" xml-lang="en-US" level="2" l10n="U" oldref="21">Compare</paragraph>
-<paragraph role="paragraph" id="par_id3152811" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="sfx/ui/versionsofdialog/compare">Compare the changes that were made in each version.</ahelp> If you want, you can <link href="text/shared/01/02230400.xhp" name="Accept or Reject Changes"><emph>Accept or Reject Changes</emph></link>.</paragraph>
+<paragraph role="paragraph" id="par_id3152811" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="sfx/ui/versionsofdialog/compare">Compare the changes that were made in each version.</ahelp> If you want, you can <link href="text/shared/01/02230400.xhp" name="Manage Changes"><emph>Manage Changes</emph></link>.</paragraph>
</body>
</helpdocument>
diff --git a/source/text/shared/01/02230000.xhp b/source/text/shared/01/02230000.xhp
index c6fffda..c4336ea 100644
--- a/source/text/shared/01/02230000.xhp
+++ b/source/text/shared/01/02230000.xhp
@@ -53,9 +53,9 @@
<case select="CALC"><embed href="text/shared/01/02230200.xhp#text"/>
</case>
</switch>
-<paragraph role="heading" id="hd_id3153527" xml-lang="en-US" level="2" l10n="U" oldref="4"><link href="text/shared/01/02230400.xhp" name="Accept or Reject">Accept or Reject</link></paragraph>
+<paragraph role="heading" id="hd_id3153527" xml-lang="en-US" level="2" l10n="U" oldref="4"><link href="text/shared/01/02230400.xhp" name="Manage Changes">Manage Changes</link></paragraph>
<embed href="text/shared/01/02230400.xhp#redlining"/>
-<paragraph role="heading" id="hd_id3145072" xml-lang="en-US" level="2" l10n="U" oldref="3"><link href="text/shared/01/02230300.xhp" name="Comment">Comment</link></paragraph>
+<paragraph role="heading" id="hd_id3145072" xml-lang="en-US" level="2" l10n="U" oldref="3"><link href="text/shared/01/02230300.xhp" name="Comment on Change">Comment on Change</link></paragraph>
<embed href="text/shared/01/02230300.xhp#kommentartext"/>
<paragraph role="heading" id="hd_id3150694" xml-lang="en-US" level="2" l10n="U" oldref="5"><link href="text/shared/01/02230500.xhp" name="Merge Document">Merge Document</link></paragraph>
<embed href="text/shared/01/02230500.xhp#dokzus"/>
diff --git a/source/text/shared/01/02230150.xhp b/source/text/shared/01/02230150.xhp
index 5ba77f8..fa229c9 100644
--- a/source/text/shared/01/02230150.xhp
+++ b/source/text/shared/01/02230150.xhp
@@ -22,7 +22,7 @@
<helpdocument version="1.0">
<meta>
<topic id="textshared0102230150xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Protect Records</title>
+<title id="tit" xml-lang="en-US">Protect Changes</title>
<filename>/text/shared/01/02230150.xhp</filename>
</topic>
<history>
@@ -35,7 +35,7 @@
<bookmark xml-lang="en-US" branch="hid/SC_HID_CHG_PROTECT" id="bm_id3153116" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:ProtectTraceChangeMode" id="bm_id4566479" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:ProtectTraceChangeMode" id="bm_id3154100" localize="false"/>
-<paragraph role="heading" id="hd_id3154349" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/02230150.xhp" name="Protect Records">Protect Records</link></paragraph>
+<paragraph role="heading" id="hd_id3154349" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/02230150.xhp" name="Protect Changes">Protect Changes</link></paragraph>
<paragraph role="paragraph" id="par_id3150794" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:ProtectTraceChangeMode">Prevents a user from deactivating the record changes feature, or from accepting or rejecting changes unless the user enters a password.</ahelp></paragraph>
</section>
<section id="relatedtopics">
diff --git a/source/text/shared/01/02230300.xhp b/source/text/shared/01/02230300.xhp
index 29ac137..b3f3068 100644
--- a/source/text/shared/01/02230300.xhp
+++ b/source/text/shared/01/02230300.xhp
@@ -42,8 +42,8 @@
</section>
<paragraph role="note" id="par_id3155391" xml-lang="en-US" l10n="U" oldref="3">You can attach a comment when <switchinline select="appl"><caseinline select="WRITER">the cursor is in a changed text passage
</caseinline><caseinline select="CALC">the changed cell is selected
-</caseinline></switchinline>, or in the <emph>Accept or Reject Changes</emph> dialog.</paragraph>
-<paragraph role="paragraph" id="par_id3156426" xml-lang="en-US" l10n="U" oldref="5"><switchinline select="appl"><caseinline select="CALC">Comments are displayed as callouts in the sheet when you rest your mouse pointer over a cell with a recorded change. You can also view comments that are attached to a changed cell in the changes list in the <link href="text/shared/01/02230400.xhp" name="Accept or Reject Changes"><emph>Accept or Reject Changes</emph></link> dialog.
+</caseinline></switchinline>, or in the <emph>Manage Changes</emph> dialog.</paragraph>
+<paragraph role="paragraph" id="par_id3156426" xml-lang="en-US" l10n="U" oldref="5"><switchinline select="appl"><caseinline select="CALC">Comments are displayed as callouts in the sheet when you rest your mouse pointer over a cell with a recorded change. You can also view comments that are attached to a changed cell in the changes list in the <link href="text/shared/01/02230400.xhp" name="Manage Changes"><emph>Manage Changes</emph></link> dialog.
</caseinline></switchinline></paragraph>
</body>
</helpdocument>
diff --git a/source/text/shared/01/02230400.xhp b/source/text/shared/01/02230400.xhp
index 52c6f29..26a0b22 100644
--- a/source/text/shared/01/02230400.xhp
+++ b/source/text/shared/01/02230400.xhp
@@ -22,7 +22,7 @@
<helpdocument version="1.0">
<meta>
<topic id="textshared0102230400xml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Accept or reject changes</title>
+<title xml-lang="en-US" id="tit">Manage changes</title>
<filename>/text/shared/01/02230400.xhp</filename>
</topic>
<history>
@@ -35,7 +35,7 @@
<bookmark xml-lang="en-US" branch="hid/.uno:AcceptTrackedChanges" id="bm_id4680925" localize="false"/><!-- HID added by script -->
<bookmark branch="hid/.uno:AcceptTrackedChanges" xml-lang="en-US" id="bm_id3154689" localize="false"/><bookmark xml-lang="en-US" branch="hid/.uno:AcceptChanges" id="bm_id8573126" localize="false"/><!-- HID added by script -->
-<bookmark branch="hid/.uno:AcceptChanges" xml-lang="en-US" id="bm_id3149991" localize="false"/><paragraph role="heading" level="1" id="hd_id3145138" l10n="U" xml-lang="en-US" oldref="1">Accept or reject changes</paragraph>
+<bookmark branch="hid/.uno:AcceptChanges" xml-lang="en-US" id="bm_id3149991" localize="false"/><paragraph role="heading" level="1" id="hd_id3145138" l10n="U" xml-lang="en-US" oldref="1">Manage changes</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3147240" xml-lang="en-US" oldref="2"><variable id="redlining"><ahelp hid=".uno:AcceptChanges" visibility="visible">Accept or reject recorded changes.</ahelp></variable></paragraph>
<section id="howtoget">
<embed href="text/shared/00/00000402.xhp#rotlinie"/>
diff --git a/source/text/shared/guide/microsoft_terms.xhp b/source/text/shared/guide/microsoft_terms.xhp
index 913fcb9..dbd7b3a 100644
--- a/source/text/shared/guide/microsoft_terms.xhp
+++ b/source/text/shared/guide/microsoft_terms.xhp
@@ -119,7 +119,7 @@
<paragraph role="tablecontent" id="par_id3152940" xml-lang="en-US" l10n="U" oldref="20">Markup</paragraph>
</tablecell>
<tablecell>
-<paragraph role="tablecontent" id="par_id3147048" xml-lang="en-US" l10n="U" oldref="21"><link href="text/shared/01/02230200.xhp" name="Changes - Show">Changes - Show</link></paragraph>
+<paragraph role="tablecontent" id="par_id3147048" xml-lang="en-US" l10n="U" oldref="21"><link href="text/shared/01/02230200.xhp" name="Track Changes - Show Changes">Track Changes - Show Changes</link></paragraph>
</tablecell>
</tablerow>
<tablerow>
diff --git a/source/text/shared/guide/protection.xhp b/source/text/shared/guide/protection.xhp
index 3313cb5..c86cc30 100644
--- a/source/text/shared/guide/protection.xhp
+++ b/source/text/shared/guide/protection.xhp
@@ -73,7 +73,7 @@
<paragraph xml-lang="en-US" id="par_id3154684" role="paragraph" l10n="U" oldref="12">Turning on protection</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3153104" role="paragraph" l10n="U" oldref="13">Choose <emph>Edit - Changes - Protect Records</emph>. Enter and confirm a password of at least one character.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153104" role="paragraph" l10n="U" oldref="13">Choose <emph>Edit - Track Changes - Protect Changes</emph>. Enter and confirm a password of at least one character.</paragraph>
</tablecell>
</tablerow>
<tablerow>
@@ -81,7 +81,7 @@
<paragraph xml-lang="en-US" id="par_id3144760" role="paragraph" l10n="U" oldref="14">Turning off protection</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3152920" role="paragraph" l10n="U" oldref="15">Choose <emph>Edit - Changes - Protect Records</emph>. Enter the correct password.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152920" role="paragraph" l10n="U" oldref="15">Choose <emph>Edit - Track Changes - Protect Changes</emph>. Enter the correct password.</paragraph>
</tablecell>
</tablerow>
</table>
diff --git a/source/text/shared/guide/redlining_accept.xhp b/source/text/shared/guide/redlining_accept.xhp
index 14c02ed..979600d 100644
--- a/source/text/shared/guide/redlining_accept.xhp
+++ b/source/text/shared/guide/redlining_accept.xhp
@@ -44,7 +44,7 @@
<paragraph role="listitem" id="par_id3147008" xml-lang="en-US" l10n="U" oldref="25">If you have put multiple copies of the document in circulation, first merge these into one document (see <embedvar href="text/shared/guide/redlining_docmerge.xhp#redlining_docmerge"/>).</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3153748" xml-lang="en-US" l10n="U" oldref="26">Open the document and choose <emph>Edit - Changes - Accept or Reject</emph>. The <emph>Accept or Reject Changes</emph> dialog appears.</paragraph>
+<paragraph role="listitem" id="par_id3153748" xml-lang="en-US" l10n="U" oldref="26">Open the document and choose <emph>Edit - Track Changes - Manage Changes</emph>. The <emph>Manage Changes</emph> dialog appears.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3156346" xml-lang="en-US" l10n="U" oldref="27">Select a change on the <emph>List</emph> tab. The change is selected and displayed in the document and you can now enter your decision with one of the buttons.</paragraph>
diff --git a/source/text/shared/guide/redlining_doccompare.xhp b/source/text/shared/guide/redlining_doccompare.xhp
index e013524..203465d 100644
--- a/source/text/shared/guide/redlining_doccompare.xhp
+++ b/source/text/shared/guide/redlining_doccompare.xhp
@@ -41,7 +41,7 @@
</variable></paragraph>
<paragraph role="note" id="par_id4186223" xml-lang="en-US" l10n="NEW">The review function is available in %PRODUCTNAME for text documents and spreadsheet documents.</paragraph>
<paragraph role="paragraph" id="par_id3995178" xml-lang="en-US" l10n="NEW">Imagine you have some co-authors or reviewers who collaborate with you writing your original document. One day you send out copies of your document to all reviewers. You ask them to edit the copy and send it back.</paragraph>
-<paragraph role="paragraph" id="par_id9948423" xml-lang="en-US" l10n="NEW">Normally, the reviewers enable change tracking by <emph>Edit - Changes - Record</emph> and you can easily see the changes.</paragraph>
+<paragraph role="paragraph" id="par_id9948423" xml-lang="en-US" l10n="NEW">Normally, the reviewers enable change tracking by <emph>Edit - Track Changes - Record Changes</emph> and you can easily see the changes.</paragraph>
<paragraph role="paragraph" id="par_id3155421" xml-lang="en-US" l10n="U" oldref="33">If one of the authors has made changes to a document without recording them, you can compare the changed document to your original document.</paragraph>
<list type="ordered">
<listitem>
diff --git a/source/text/shared/guide/redlining_docmerge.xhp b/source/text/shared/guide/redlining_docmerge.xhp
index 43d030e..26f67d4 100644
--- a/source/text/shared/guide/redlining_docmerge.xhp
+++ b/source/text/shared/guide/redlining_docmerge.xhp
@@ -44,7 +44,7 @@
<paragraph role="listitem" id="par_id3152425" xml-lang="en-US" l10n="U" oldref="20">Open the original document into which you want to merge all copies.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3149177" xml-lang="en-US" l10n="U" oldref="21">Choose <emph>Edit - Changes - Merge Document</emph>. A file selection dialog appears.</paragraph>
+<paragraph role="listitem" id="par_id3149177" xml-lang="en-US" l10n="U" oldref="21">Choose <emph>Edit - Track Changes - Merge Document</emph>. A file selection dialog appears.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3147576" xml-lang="en-US" l10n="U" oldref="23">Select the copy of the document from the dialog. If there have been no subsequent changes to the original document, the copy is merged into the original.</paragraph>
diff --git a/source/text/shared/guide/redlining_enter.xhp b/source/text/shared/guide/redlining_enter.xhp
index a928086..5976abf 100644
--- a/source/text/shared/guide/redlining_enter.xhp
+++ b/source/text/shared/guide/redlining_enter.xhp
@@ -42,7 +42,7 @@
<paragraph xml-lang="en-US" id="par_id3147088" role="paragraph" l10n="U" oldref="17">1.</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3149095" role="paragraph" l10n="U" oldref="9">To start recording changes, open the document to be edited and choose <link href="text/shared/01/02230000.xhp" name="Edit - Changes"><emph>Edit - Changes</emph></link> and then choose <emph>Record</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149095" role="paragraph" l10n="U" oldref="9">To start recording changes, open the document to be edited and choose <link href="text/shared/01/02230000.xhp" name="Edit - Track Changes"><emph>Edit - Track Changes</emph></link> and then choose <emph>Record Changes</emph>.</paragraph>
</tablecell>
</tablerow>
<tablerow>
@@ -64,8 +64,8 @@
</table>
<paragraph role="paragraph" id="par_id3156119" xml-lang="en-US" l10n="U" oldref="12">Changes in a spreadsheet document are highlighted by a border around the cells; when you point to the cell you can see more detailed information on this change in the Help Tip.</paragraph>
-<paragraph role="paragraph" id="par_id3148473" xml-lang="en-US" l10n="U" oldref="13">You can enter a comment on each recorded change by placing the cursor in the area of the change and then choosing <emph>Edit - Changes - Comment</emph>. In addition to Extended Tips, the comment is also displayed in the list in the <link href="text/shared/01/02230400.xhp" name="Accept or Reject Changes"><emph>Accept or Reject Changes</emph></link> dialog.</paragraph>
-<paragraph role="paragraph" id="par_id3153542" xml-lang="en-US" l10n="U" oldref="14">To stop recording changes, choose <emph>Edit - Changes - Record</emph> again. The check mark is removed and you can now save the document.</paragraph>
+<paragraph role="paragraph" id="par_id3148473" xml-lang="en-US" l10n="U" oldref="13">You can enter a comment on each recorded change by placing the cursor in the area of the change and then choosing <emph>Edit - Track Changes - Comment on Change</emph>. In addition to Extended Tips, the comment is also displayed in the list in the <link href="text/shared/01/02230400.xhp" name="Manage Changes"><emph>Manage Changes</emph></link> dialog.</paragraph>
+<paragraph role="paragraph" id="par_id3153542" xml-lang="en-US" l10n="U" oldref="14">To stop recording changes, choose <emph>Edit - Track Changes - Record Changes</emph> again. The check mark is removed and you can now save the document.</paragraph>
<paragraph role="paragraph" id="par_id3153627" xml-lang="en-US" l10n="U" oldref="15">In a text document, you can highlight all lines that you have changed with an additional colored marking. This can be in the form of a red line in the margin, for example.</paragraph>
<paragraph role="paragraph" id="par_id3147530" xml-lang="en-US" l10n="CHG" oldref="16">To change the settings for tracking changes, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer</emph> - <link href="text/shared/optionen/01040700.xhp" name="Changes"><emph>Changes</emph></link> or on the <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc</emph> - <link href="text/shared/optionen/01060600.xhp" name="Changes"><emph>Changes</emph></link>.</paragraph>
<embed href="text/shared/00/00000004.xhp#related"/>
diff --git a/source/text/shared/guide/redlining_navigation.xhp b/source/text/shared/guide/redlining_navigation.xhp
index 7682f0b..ec26b9a 100644
--- a/source/text/shared/guide/redlining_navigation.xhp
+++ b/source/text/shared/guide/redlining_navigation.xhp
@@ -29,14 +29,14 @@
<list type="unordered">
<listitem>
<bookmark xml-lang="en-US" branch="hid/.uno:NextTrackedChange" id="bm_next_tracked_change" localize="false"/>
- <paragraph id="par_id3153883" role="listitem" xml-lang="en-US"><emph>Edit - Changes - Next Change</emph>: <ahelp hid=".uno:NextTrackedChange">Jumps to and selects the next change in the document, if any.</ahelp></paragraph>
+ <paragraph id="par_id3153883" role="listitem" xml-lang="en-US"><emph>Edit - Track Changes - Next Change</emph>: <ahelp hid=".uno:NextTrackedChange">Jumps to and selects the next change in the document, if any.</ahelp></paragraph>
</listitem>
<listitem>
<bookmark xml-lang="en-US" branch="hid/.uno:PreviousTrackedChange" id="bm_previous_tracked_change" localize="false"/>
- <paragraph id="par_id3153884" role="listitem" xml-lang="en-US"><emph>Edit - Changes - Previous Change</emph>: <ahelp hid=".uno:PreviousTrackedChange">Jumps to and selects the previous change in the document, if any.</ahelp></paragraph>
+ <paragraph id="par_id3153884" role="listitem" xml-lang="en-US"><emph>Edit - Track Changes - Previous Change</emph>: <ahelp hid=".uno:PreviousTrackedChange">Jumps to and selects the previous change in the document, if any.</ahelp></paragraph>
</listitem>
</list>
- <paragraph id="par_id3153885" role="paragraph" xml-lang="en-US">Using these commands in conjunction with the <emph>Accept Change</emph> and <emph>Reject Change</emph> commands allows navigating, accepting and rejecting changes without invoking the <emph>Edit - Changes - Accept or Reject</emph> dialog.</paragraph>
+ <paragraph id="par_id3153885" role="paragraph" xml-lang="en-US">Using these commands in conjunction with the <emph>Accept Change</emph> and <emph>Reject Change</emph> commands allows navigating, accepting and rejecting changes without invoking the <emph>Edit - Track Changes - Manage Changes</emph> dialog.</paragraph>
<section id="relatedtopics">
<embed href="text/shared/guide/redlining.xhp#redlining"/>
<embed href="text/shared/guide/redlining_accept.xhp#redlining_accept"/>
diff --git a/source/text/shared/guide/redlining_protect.xhp b/source/text/shared/guide/redlining_protect.xhp
index 13f4b94..29df3e3 100644
--- a/source/text/shared/guide/redlining_protect.xhp
+++ b/source/text/shared/guide/redlining_protect.xhp
@@ -38,13 +38,13 @@
<bookmark_value>review function;protecting records</bookmark_value>
</bookmark>
<comment>mw added an index entry</comment>
- <paragraph xml-lang="en-US" id="hd_id3159201" role="heading" level="1" l10n="U" oldref="1"><variable id="redlining_protect"><link href="text/shared/guide/redlining_protect.xhp" name="Protecting Records">Protecting Records</link>
+ <paragraph xml-lang="en-US" id="hd_id3159201" role="heading" level="1" l10n="U" oldref="1"><variable id="redlining_protect"><link href="text/shared/guide/redlining_protect.xhp" name="Protecting Changes">Protecting Changes</link>
</variable></paragraph>
<paragraph xml-lang="en-US" id="par_id1631824" role="note" l10n="NEW">The review function is available in %PRODUCTNAME for text documents and spreadsheet documents.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3154751" role="paragraph" l10n="U" oldref="2">To protect the changes made in a document during editing, choose <emph>Edit - Changes - Protect Records</emph>. To turn off the function or to accept or reject changes it is necessary to enter the correct password first.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154751" role="paragraph" l10n="U" oldref="2">To protect the changes made in a document during editing, choose <emph>Edit - Track Changes - Protect Changes</emph>. To turn off the function or to accept or reject changes it is necessary to enter the correct password first.</paragraph>
<list type="ordered">
<listitem>
- <paragraph xml-lang="en-US" id="par_id3147088" role="listitem" l10n="U" oldref="3">Choose <emph>Protect Records</emph>. This opens the <link href="text/shared/01/password_dlg.xhp" name="Password"><emph>Password</emph></link> dialog.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147088" role="listitem" l10n="U" oldref="3">Choose <emph>Protect Changes</emph>. This opens the <link href="text/shared/01/password_dlg.xhp" name="Password"><emph>Password</emph></link> dialog.</paragraph>
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_id3153345" role="listitem" l10n="U" oldref="4">Enter a password consisting of at least one character and confirm it. Click <emph>OK</emph>.</paragraph>
diff --git a/source/text/shared/optionen/01040700.xhp b/source/text/shared/optionen/01040700.xhp
index b77b175..db9c645 100644
--- a/source/text/shared/optionen/01040700.xhp
+++ b/source/text/shared/optionen/01040700.xhp
@@ -32,7 +32,7 @@
<paragraph xml-lang="en-US" id="hd_id3153823" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01040700.xhp" name="Changes">Changes</link></paragraph>
<paragraph xml-lang="en-US" id="par_id3149416" role="paragraph" l10n="U" oldref="2"><ahelp hid="modules/swriter/ui/optredlinepage/OptRedLinePage">Defines the appearance of changes in the document.</ahelp></paragraph>
</section>
- <paragraph xml-lang="en-US" id="par_id3156153" role="paragraph" l10n="U" oldref="27">To record or show changes in your text or spreadsheet document, choose <link href="text/shared/01/02230000.xhp" name="Edit - Changes"><emph>Edit - Changes - Record</emph></link> or <emph>Edit - Changes - Show</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156153" role="paragraph" l10n="U" oldref="27">To record or show changes in your text or spreadsheet document, choose <link href="text/shared/01/02230000.xhp" name="Edit - Track Changes"><emph>Edit - Track Changes - Record Changes</emph></link> or <emph>Edit - Track Changes - Show Changes</emph>.</paragraph>
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#registeraenderungen"/>
</section>
diff --git a/source/text/shared/optionen/01060600.xhp b/source/text/shared/optionen/01060600.xhp
index ed4b9df..32c7076 100644
--- a/source/text/shared/optionen/01060600.xhp
+++ b/source/text/shared/optionen/01060600.xhp
@@ -36,7 +36,7 @@
<paragraph role="heading" id="hd_id3159399" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01060600.xhp" name="Changes">Changes</link></paragraph>
<paragraph role="paragraph" id="par_id3155390" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="modules/scalc/ui/optchangespage/OptChangesPage">The<emph> Changes </emph>dialog specifies various options for highlighting recorded changes in documents.</ahelp></paragraph>
</section>
-<paragraph role="paragraph" id="par_id3156343" xml-lang="en-US" l10n="U" oldref="13">To record changes to your work, choose <link href="text/shared/01/02230000.xhp" name="Edit - Changes"><emph>Edit - Changes</emph></link>.</paragraph>
+<paragraph role="paragraph" id="par_id3156343" xml-lang="en-US" l10n="U" oldref="13">To record changes to your work, choose <link href="text/shared/01/02230000.xhp" name="Edit - Track Changes"><emph>Edit - Track Changes</emph></link>.</paragraph>
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#exopaen"/>
</section>
diff --git a/source/text/swriter/01/05150300.xhp b/source/text/swriter/01/05150300.xhp
index 46a9cc5..253c247 100644
--- a/source/text/swriter/01/05150300.xhp
+++ b/source/text/swriter/01/05150300.xhp
@@ -47,6 +47,6 @@
<paragraph role="heading" id="hd_id3150756" xml-lang="en-US" level="2" l10n="U" oldref="8">Edit Changes</paragraph>
<paragraph role="paragraph" id="par_id3147570" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="HID_AUTOFORMAT_EDIT_CHG">Opens a dialog where you can accept or reject AutoCorrect changes. You can also view the changes made by a specific author or on a specific date.</ahelp></paragraph>
<embed href="text/shared/00/00000004.xhp#related"/>
-<paragraph role="paragraph" id="par_id3151184" xml-lang="en-US" l10n="U" oldref="10"><link href="text/shared/01/02230402.xhp" name="Accept or Reject AutoFormat Changes, Filter tab">Accept or Reject Changes, Filter tab</link></paragraph>
+<paragraph role="paragraph" id="par_id3151184" xml-lang="en-US" l10n="U" oldref="10"><link href="text/shared/01/02230402.xhp" name="Manage AutoFormat Changes, Filter tab">Manage Changes, Filter tab</link></paragraph>
</body>
</helpdocument>
More information about the Libreoffice-commits
mailing list