summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2009-09-16 12:38:01 +0000
committerIvo Hinkelmann <ihi@openoffice.org>2009-09-16 12:38:01 +0000
commitc1958bfc25cb83f71177068ca6061929eeb8e9d5 (patch)
tree2a352a2ea5c5c0775a70ab1c7c920eff34fe70a5
parent11cb3bfa75503c47baf5685a769c4a9d6ef3954e (diff)
CWS-TOOLING: integrate CWS impressnotes02
-rwxr-xr-xhelpcontent2/source/auxiliary/scalc.tree2
-rw-r--r--helpcontent2/source/text/scalc/01/02150000.xhp4
-rw-r--r--helpcontent2/source/text/scalc/01/05070500.xhp4
-rwxr-xr-xhelpcontent2/source/text/scalc/04/01020000.xhp2
-rwxr-xr-xhelpcontent2/source/text/scalc/guide/note_insert.xhp28
-rwxr-xr-xhelpcontent2/source/text/scalc/guide/print_details.xhp4
-rwxr-xr-xhelpcontent2/source/text/scalc/guide/validity.xhp2
-rwxr-xr-xhelpcontent2/source/text/scalc/main0104.xhp2
-rwxr-xr-xhelpcontent2/source/text/sdraw/main0104.xhp4
-rw-r--r--helpcontent2/source/text/shared/00/00000004.xhp4
-rw-r--r--helpcontent2/source/text/shared/00/00000020.xhp2
-rw-r--r--helpcontent2/source/text/shared/00/00000404.xhp2
-rw-r--r--helpcontent2/source/text/shared/01/02070000.xhp8
-rw-r--r--helpcontent2/source/text/shared/01/02100000.xhp12
-rw-r--r--helpcontent2/source/text/shared/01/04050000.xhp103
-rw-r--r--helpcontent2/source/text/shared/01/about_meta_tags.xhp4
-rw-r--r--helpcontent2/source/text/shared/01/ref_pdf_export.xhp2
-rwxr-xr-xhelpcontent2/source/text/shared/guide/microsoft_terms.xhp8
-rwxr-xr-xhelpcontent2/source/text/shared/guide/navigator.xhp2
-rw-r--r--helpcontent2/source/text/shared/optionen/01010200.xhp252
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/01010600.xhp2
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/01030300.xhp8
-rw-r--r--helpcontent2/source/text/shared/optionen/01040200.xhp6
-rw-r--r--helpcontent2/source/text/shared/optionen/01040400.xhp14
-rw-r--r--helpcontent2/source/text/shared/optionen/01060100.xhp14
-rwxr-xr-xhelpcontent2/source/text/simpress/01/03110000.xhp2
-rwxr-xr-xhelpcontent2/source/text/simpress/main0104.xhp4
-rw-r--r--helpcontent2/source/text/swriter/01/02110100.xhp2
-rw-r--r--helpcontent2/source/text/swriter/01/04200000.xhp2
-rwxr-xr-xhelpcontent2/source/text/swriter/main0104.xhp4
30 files changed, 255 insertions, 254 deletions
diff --git a/helpcontent2/source/auxiliary/scalc.tree b/helpcontent2/source/auxiliary/scalc.tree
index debc5221e..d1c1507d9 100755
--- a/helpcontent2/source/auxiliary/scalc.tree
+++ b/helpcontent2/source/auxiliary/scalc.tree
@@ -91,7 +91,7 @@
<topic id="scalc/text/scalc/guide/rounding_numbers.xhp">Using Rounded Off Numbers</topic>
<topic id="scalc/text/scalc/guide/currency_format.xhp">Cells in Currency Format</topic>
<topic id="scalc/text/scalc/guide/autoformat.xhp">Using AutoFormat for Tables</topic>
-<topic id="scalc/text/scalc/guide/note_insert.xhp">Inserting and Editing Notes</topic>
+<topic id="scalc/text/scalc/guide/note_insert.xhp">Inserting and Editing Comments</topic>
<topic id="scalc/text/scalc/guide/design.xhp">Selecting Themes for Sheets</topic>
<topic id="scalc/text/scalc/guide/fraction_enter.xhp">Entering Fractions </topic>
</node>
diff --git a/helpcontent2/source/text/scalc/01/02150000.xhp b/helpcontent2/source/text/scalc/01/02150000.xhp
index 109e6dd4e..f30277b54 100644
--- a/helpcontent2/source/text/scalc/01/02150000.xhp
+++ b/helpcontent2/source/text/scalc/01/02150000.xhp
@@ -70,8 +70,8 @@
<paragraph role="paragraph" id="par_id3149567" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SC_CHECKBOX_RID_SCDLG_DELCONT_BTN_DELDATETIME">Deletes date and time values. Formats, text, numbers and formulas remain unchanged.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCDLG_DELCONT_BTN_DELFORMULAS" id="bm_id3149256" localize="false"/><paragraph role="heading" id="hd_id3154703" xml-lang="en-US" level="3" l10n="U" oldref="13">Formulas</paragraph>
<paragraph role="paragraph" id="par_id3148485" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SC_CHECKBOX_RID_SCDLG_DELCONT_BTN_DELFORMULAS">Deletes formulas. Text, numbers, formats, dates and times remain unchanged.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCDLG_DELCONT_BTN_DELNOTES" id="bm_id3152775" localize="false"/><paragraph role="heading" id="hd_id3150300" xml-lang="en-US" level="3" l10n="U" oldref="15">Notes</paragraph>
-<paragraph role="paragraph" id="par_id3154658" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SC_CHECKBOX_RID_SCDLG_DELCONT_BTN_DELNOTES">Deletes notes added to cells. All other elements remain unchanged.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCDLG_DELCONT_BTN_DELNOTES" id="bm_id3152775" localize="false"/><paragraph role="heading" id="hd_id3150300" xml-lang="en-US" level="3" l10n="U" oldref="15">Comments</paragraph>
+<paragraph role="paragraph" id="par_id3154658" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SC_CHECKBOX_RID_SCDLG_DELCONT_BTN_DELNOTES">Deletes comments added to cells. All other elements remain unchanged.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCDLG_DELCONT_BTN_DELATTRS" id="bm_id3145258" localize="false"/><paragraph role="heading" id="hd_id3155112" xml-lang="en-US" level="3" l10n="U" oldref="17">Formats</paragraph>
<paragraph role="paragraph" id="par_id3146134" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SC_CHECKBOX_RID_SCDLG_DELCONT_BTN_DELATTRS">Deletes format attributes applied to cells. All cell content remains unchanged.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCDLG_DELCONT_BTN_DELOBJECTS" id="bm_id3152582" localize="false"/><paragraph role="heading" id="hd_id3150088" xml-lang="en-US" level="3" l10n="U" oldref="19">Objects</paragraph>
diff --git a/helpcontent2/source/text/scalc/01/05070500.xhp b/helpcontent2/source/text/scalc/01/05070500.xhp
index f58ccc801..17b11f38d 100644
--- a/helpcontent2/source/text/scalc/01/05070500.xhp
+++ b/helpcontent2/source/text/scalc/01/05070500.xhp
@@ -59,8 +59,8 @@
<paragraph role="paragraph" id="par_id3147228" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_TABLE:BTN_HEADER">Specifies whether you want the column and row headers to be printed.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCPAGE_TABLE:BTN_GRID" id="bm_id3154320" localize="false"/><paragraph role="heading" id="hd_id3150439" xml-lang="en-US" level="3" l10n="U" oldref="7">Grid</paragraph>
<paragraph role="paragraph" id="par_id3147436" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_TABLE:BTN_GRID">Prints out the borders of the individual cells as a grid.</ahelp> For the view on screen, make your choice under <emph>Tools - Options - %PRODUCTNAME Calc</emph> - <link href="text/shared/optionen/01060100.xhp" name="View"><emph>View</emph></link> - <emph>Grid lines</emph>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCPAGE_TABLE:BTN_NOTES" id="bm_id3159153" localize="false"/><paragraph role="heading" id="hd_id3145750" xml-lang="en-US" level="3" l10n="U" oldref="9">Notes</paragraph>
-<paragraph role="paragraph" id="par_id3150010" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_TABLE:BTN_NOTES">Prints the notes defined in your spreadsheet.</ahelp> They will be printed on a separate page, along with the corresponding cell reference.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCPAGE_TABLE:BTN_NOTES" id="bm_id3159153" localize="false"/><paragraph role="heading" id="hd_id3145750" xml-lang="en-US" level="3" l10n="U" oldref="9">Comments</paragraph>
+<paragraph role="paragraph" id="par_id3150010" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_TABLE:BTN_NOTES">Prints the comments defined in your spreadsheet.</ahelp> They will be printed on a separate page, along with the corresponding cell reference.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCPAGE_TABLE:BTN_OBJECTS" id="bm_id3144764" localize="false"/><paragraph role="heading" id="hd_id3154944" xml-lang="en-US" level="3" l10n="U" oldref="11">Objects/graphics</paragraph>
<paragraph role="paragraph" id="par_id3149581" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SC:CHECKBOX:RID_SCPAGE_TABLE:BTN_OBJECTS">Includes all inserted objects (if printable) and graphics with the printed document.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCPAGE_TABLE:BTN_CHARTS" id="bm_id3156283" localize="false"/><paragraph role="heading" id="hd_id3149377" xml-lang="en-US" level="3" l10n="U" oldref="13">Charts</paragraph>
diff --git a/helpcontent2/source/text/scalc/04/01020000.xhp b/helpcontent2/source/text/scalc/04/01020000.xhp
index 37f9a7986..5ee42a370 100755
--- a/helpcontent2/source/text/scalc/04/01020000.xhp
+++ b/helpcontent2/source/text/scalc/04/01020000.xhp
@@ -265,7 +265,7 @@
<paragraph role="tablecontent" id="hd_id3154809" xml-lang="en-US" l10n="U" oldref="139"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F1</paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3145140" xml-lang="en-US" l10n="U" oldref="138">Displays the note that is attached to the current cell</paragraph>
+<paragraph role="tablecontent" id="par_id3145140" xml-lang="en-US" l10n="U" oldref="138">Displays the comment that is attached to the current cell</paragraph>
</tablecell>
</tablerow>
<tablerow>
diff --git a/helpcontent2/source/text/scalc/guide/note_insert.xhp b/helpcontent2/source/text/scalc/guide/note_insert.xhp
index 2e177fe75..a06b85a25 100755
--- a/helpcontent2/source/text/scalc/guide/note_insert.xhp
+++ b/helpcontent2/source/text/scalc/guide/note_insert.xhp
@@ -36,7 +36,7 @@
<helpdocument version="1.0">
<meta>
<topic id="textscalcguidenote_insertxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Inserting and Editing Notes</title>
+<title id="tit" xml-lang="en-US">Inserting and Editing Comments</title>
<filename>/text/scalc/guide/note_insert.xhp</filename>
</topic>
<history>
@@ -45,39 +45,39 @@
</history>
</meta>
<body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3153968"><bookmark_value>notes; on cells</bookmark_value>
-<bookmark_value>cells;notes</bookmark_value>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3153968"><bookmark_value>comments; on cells</bookmark_value>
+<bookmark_value>cells;comments</bookmark_value>
<bookmark_value>comments; on cells</bookmark_value>
<bookmark_value>remarks on cells</bookmark_value>
-<bookmark_value>formatting;notes on cells</bookmark_value>
-<bookmark_value>viewing;notes on cells</bookmark_value>
+<bookmark_value>formatting;comments on cells</bookmark_value>
+<bookmark_value>viewing;comments on cells</bookmark_value>
</bookmark>
-<paragraph role="heading" id="hd_id3153968" xml-lang="en-US" level="1" l10n="U" oldref="31"><variable id="note_insert"><link href="text/scalc/guide/note_insert.xhp" name="Inserting and Editing Notes">Inserting and Editing Notes</link>
+<paragraph role="heading" id="hd_id3153968" xml-lang="en-US" level="1" l10n="U" oldref="31"><variable id="note_insert"><link href="text/scalc/guide/note_insert.xhp" name="Inserting and Editing Comments">Inserting and Editing Comments</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3150440" xml-lang="en-US" l10n="U" oldref="32">You can assign a note to each cell by choosing <link href="text/shared/01/04050000.xhp" name="Insert - Note"><emph>Insert - Note</emph></link>. The note is indicated by a small red square, the note indicator, in the cell.</paragraph>
+<paragraph role="paragraph" id="par_id3150440" xml-lang="en-US" l10n="U" oldref="32">You can assign a comment to each cell by choosing <link href="text/shared/01/04050000.xhp" name="Insert - Comment"><emph>Insert - Comment</emph></link>. The comment is indicated by a small red square, the comment indicator, in the cell.</paragraph>
<list type="unordered">
<listitem>
-<paragraph role="listitem" id="par_id3145750" xml-lang="en-US" l10n="U" oldref="34">The note is visible whenever the mouse pointer is over the cell, provided you have activated <emph>Help - Tips</emph> or - <emph>Extended Tips</emph>.</paragraph>
+<paragraph role="listitem" id="par_id3145750" xml-lang="en-US" l10n="U" oldref="34">The comment is visible whenever the mouse pointer is over the cell, provided you have activated <emph>Help - Tips</emph> or - <emph>Extended Tips</emph>.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3148575" xml-lang="en-US" l10n="U" oldref="33">When you select the cell, you can choose <emph>Show Note</emph> from the context menu of the cell. Doing so keeps the note visible until you deactivate the <emph>Show Note</emph> command from the same context menu.</paragraph>
+<paragraph role="listitem" id="par_id3148575" xml-lang="en-US" l10n="U" oldref="33">When you select the cell, you can choose <emph>Show Comment</emph> from the context menu of the cell. Doing so keeps the comment visible until you deactivate the <emph>Show Comment</emph> command from the same context menu.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3149958" xml-lang="en-US" l10n="U" oldref="35">To edit a permanently visible note, just click in it. If you delete the entire text of the note, the note itself is deleted.</paragraph>
+<paragraph role="listitem" id="par_id3149958" xml-lang="en-US" l10n="U" oldref="35">To edit a permanently visible comment, just click in it. If you delete the entire text of the comment, the comment itself is deleted.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_idN10699" xml-lang="en-US" l10n="NEW">Move or resize each note as you like.</paragraph>
+<paragraph role="listitem" id="par_idN10699" xml-lang="en-US" l10n="NEW">Move or resize each comment as you like.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_idN1069D" xml-lang="en-US" l10n="NEW">Format each note by specifying background color, transparency, border style, and text alignment. Choose the commands from the context menu of the note.</paragraph>
+<paragraph role="listitem" id="par_idN1069D" xml-lang="en-US" l10n="NEW">Format each comment by specifying background color, transparency, border style, and text alignment. Choose the commands from the context menu of the comment.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3144764" xml-lang="en-US" l10n="U" oldref="38">To show or hide the note indicator, choose <emph>Tools - Options - %PRODUCTNAME Calc - View</emph> and mark or unmark the <emph>Note indicator</emph> check box.</paragraph>
+<paragraph role="listitem" id="par_id3144764" xml-lang="en-US" l10n="U" oldref="38">To show or hide the comment indicator, choose <emph>Tools - Options - %PRODUCTNAME Calc - View</emph> and mark or unmark the <emph>Comment indicator</emph> check box.</paragraph>
</listitem>
</list>
<paragraph role="paragraph" id="par_id3150715" xml-lang="en-US" l10n="U" oldref="39">To display a help tip for a selected cell, use <emph>Data - Validity - Input Help</emph>.</paragraph>
<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id3153707" xml-lang="en-US" l10n="U" oldref="36"><link href="text/shared/01/04050000.xhp" name="Insert - Note">Insert - Note</link></paragraph>
+<paragraph role="paragraph" id="par_id3153707" xml-lang="en-US" l10n="U" oldref="36"><link href="text/shared/01/04050000.xhp" name="Insert - Comment">Insert - Comment</link></paragraph>
<embed href="text/scalc/guide/validity.xhp#validity"/>
</section>
</body>
diff --git a/helpcontent2/source/text/scalc/guide/print_details.xhp b/helpcontent2/source/text/scalc/guide/print_details.xhp
index 1a640884f..10a6209d4 100755
--- a/helpcontent2/source/text/scalc/guide/print_details.xhp
+++ b/helpcontent2/source/text/scalc/guide/print_details.xhp
@@ -49,7 +49,7 @@
<bookmark_value>sheets; printing details</bookmark_value>
<bookmark_value>grids; printing sheet grids</bookmark_value>
<bookmark_value>formulas; printing, instead of results</bookmark_value>
-<bookmark_value>notes; printing</bookmark_value>
+<bookmark_value>comments; printing</bookmark_value>
<bookmark_value>charts;printing</bookmark_value>
<bookmark_value>sheet grids; printing</bookmark_value>
<bookmark_value>cells; printing grids</bookmark_value>
@@ -69,7 +69,7 @@
<paragraph role="listitem" id="par_id3154013" xml-lang="en-US" l10n="U" oldref="4">Sheet grid</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3145273" xml-lang="en-US" l10n="U" oldref="5">Notes</paragraph>
+<paragraph role="listitem" id="par_id3145273" xml-lang="en-US" l10n="U" oldref="5">Comments</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3145801" xml-lang="en-US" l10n="U" oldref="6">Objects and graphics</paragraph>
diff --git a/helpcontent2/source/text/scalc/guide/validity.xhp b/helpcontent2/source/text/scalc/guide/validity.xhp
index 3dc86e547..a159a8b34 100755
--- a/helpcontent2/source/text/scalc/guide/validity.xhp
+++ b/helpcontent2/source/text/scalc/guide/validity.xhp
@@ -53,7 +53,7 @@
<bookmark_value>error messages; defining for incorrect input</bookmark_value>
<bookmark_value>actions in case of incorrect input</bookmark_value>
<bookmark_value>Help tips; defining text for cell input</bookmark_value>
-<bookmark_value>notes;help text for cells</bookmark_value>
+<bookmark_value>comments;help text for cells</bookmark_value>
<bookmark_value>cells; defining input help</bookmark_value>
<bookmark_value>macros; running when incorrect input</bookmark_value>
<bookmark_value>data; validity check</bookmark_value>
diff --git a/helpcontent2/source/text/scalc/main0104.xhp b/helpcontent2/source/text/scalc/main0104.xhp
index 0dce5acb5..3f60bbb96 100755
--- a/helpcontent2/source/text/scalc/main0104.xhp
+++ b/helpcontent2/source/text/scalc/main0104.xhp
@@ -67,7 +67,7 @@
oldref="12"><link href="text/scalc/01/04080000.xhp" name="Function List">Function List</link></paragraph>
<embed href="text/scalc/01/04080000.xhp#funktionslistetext"/>
<embed href="text/scalc/01/04070000.xhp#namen"/>
- <paragraph xml-lang="en-US" id="hd_id3145640" role="heading" level="2" l10n="U" oldref="6"><link href="text/shared/01/04050000.xhp" name="Note">Note</link></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3145640" role="heading" level="2" l10n="U" oldref="6"><link href="text/shared/01/04050000.xhp" name="Comment">Comment</link></paragraph>
<embed href="text/shared/01/04050000.xhp#notizbearbeitentext"/>
<embed href="text/shared/01/04990000.xhp#grafik"/>
<embed href="text/shared/01/moviesound.xhp#moviesound"/>
diff --git a/helpcontent2/source/text/sdraw/main0104.xhp b/helpcontent2/source/text/sdraw/main0104.xhp
index 8cc10567a..6eb95180f 100755
--- a/helpcontent2/source/text/sdraw/main0104.xhp
+++ b/helpcontent2/source/text/sdraw/main0104.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.10 $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -53,6 +53,8 @@
<paragraph xml-lang="en-US" id="hd_id3147397" role="heading" level="2" l10n="U" oldref="5"><link href="text/simpress/01/04030000.xhp" name="Insert Snap Point/Line">Insert Snap Point/Line</link></paragraph>
<embed href="text/simpress/01/04030000.xhp#fangtext"/>
<embed href="text/simpress/01/04990000.xhp#feldbefehl"/>
+ <paragraph xml-lang="en-US" id="hd_id0915200910361385" role="heading" level="2" l10n="NEW"><link href="text/shared/01/04050000.xhp" name="Comment">Comment</link></paragraph>
+ <embed href="text/shared/01/04050000.xhp#notizbearbeitentext"/>
<paragraph xml-lang="en-US" id="hd_id3154018" role="heading" level="2" l10n="U" oldref="6"><link href="text/shared/01/04100000.xhp" name="Special Character">Special Character</link></paragraph>
<embed href="text/shared/01/04100000.xhp#sonder"/>
<embed href="text/shared/01/formatting_mark.xhp#formatting_mark"/>
diff --git a/helpcontent2/source/text/shared/00/00000004.xhp b/helpcontent2/source/text/shared/00/00000004.xhp
index 36343e60f..b8baaa4a9 100644
--- a/helpcontent2/source/text/shared/00/00000004.xhp
+++ b/helpcontent2/source/text/shared/00/00000004.xhp
@@ -371,7 +371,7 @@
</image></paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3146915" xml-lang="en-US" l10n="U" oldref="35"><ahelp hid=".">Go to the previous note</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3146915" xml-lang="en-US" l10n="U" oldref="35"><ahelp hid=".">Go to the previous comment</ahelp></paragraph>
</tablecell>
</tablerow>
</table>
@@ -386,7 +386,7 @@
</image></paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3159184" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid=".">Go to the next note</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3159184" xml-lang="en-US" l10n="U" oldref="36"><ahelp hid=".">Go to the next comment</ahelp></paragraph>
</tablecell>
</tablerow>
</table>
diff --git a/helpcontent2/source/text/shared/00/00000020.xhp b/helpcontent2/source/text/shared/00/00000020.xhp
index aed86801f..a9b4bb6bd 100644
--- a/helpcontent2/source/text/shared/00/00000020.xhp
+++ b/helpcontent2/source/text/shared/00/00000020.xhp
@@ -87,7 +87,7 @@
<paragraph role="heading" id="hd_id3149763" xml-lang="en-US" level="3" l10n="U" oldref="11">Importing and Exporting in HTML Format </paragraph>
<paragraph role="paragraph" id="par_id3153825" xml-lang="en-US" l10n="U" oldref="12">When borders in HTML documents are exported, lines are exported in a width of exactly 1 pixel since Netscape Navigator and MS Internet Explorer do not recognize smaller lines. When importing, a border of 1 pixel width will appear with 0.05 pt width.<comment>still true? this para is very old.</comment></paragraph>
<paragraph role="paragraph" id="par_id3150244" xml-lang="en-US" l10n="U" oldref="198">With $[officename] Writer, you can insert footnotes and endnotes in your HTML document. They are exported as meta tags. The footnote and endnote characters are exported as hyperlinks.</paragraph>
-<paragraph role="paragraph" id="par_id3149800" xml-lang="en-US" l10n="U" oldref="199">Notes are used to include unknown characters in an HTML document. Every note that begins with "HTML:..." and ends with "&gt;" is treated as an HTML code, but is exported without these designations. Several tags around text can be included after "HTML:..." Accented characters are converted into the ANSI character set. Notes are created during import (for example, for meta tags that have no room in the file properties or unknown tags).</paragraph>
+<paragraph role="paragraph" id="par_id3149800" xml-lang="en-US" l10n="U" oldref="199">Comments are used to include unknown characters in an HTML document. Every note that begins with "HTML:..." and ends with "&gt;" is treated as an HTML code, but is exported without these designations. Several tags around text can be included after "HTML:..." Accented characters are converted into the ANSI character set. Comments are created during import (for example, for meta tags that have no room in the file properties or unknown tags).</paragraph>
<paragraph role="paragraph" id="par_id3149734" xml-lang="en-US" l10n="U" oldref="201">The HTML import of $[officename] Writer is able to read files that have UTF-8 or UCS2 character coding. All characters that are contained in the ANSI character set or in the system's character set can be displayed.</paragraph>
<paragraph role="paragraph" id="par_id3149578" xml-lang="en-US" l10n="U" oldref="240">When exporting to HTML, the character set selected in <emph>Tools - Options - Load/Save - HTML Compatibility</emph> is used. Characters not present there are written in a substitute form, which is displayed correctly in modern web browsers. When exporting such characters, you will receive an appropriate warning.</paragraph>
<paragraph role="paragraph" id="par_id3153146" xml-lang="en-US" l10n="CHG" oldref="197">If, in <emph>Tools - Options - Load/Save - HTML Compatibility</emph>, you select Netscape Navigator, MS Internet Explorer, or $[officename] Writer as the export option, upon export all important font attributes are exported as direct attributes (for example, text color, font size, bold, italic, and so on) in CSS1 styles. (<link href="text/shared/00/00000002.xhp" name="CSS">CSS</link> stands for Cascading Style Sheets.) Importing is also carried out according to this standard.</paragraph>
diff --git a/helpcontent2/source/text/shared/00/00000404.xhp b/helpcontent2/source/text/shared/00/00000404.xhp
index f1a98a00e..c8f94eb54 100644
--- a/helpcontent2/source/text/shared/00/00000404.xhp
+++ b/helpcontent2/source/text/shared/00/00000404.xhp
@@ -44,7 +44,7 @@
</meta>
<body>
<paragraph role="heading" id="hd_id3156324" xml-lang="en-US" level="1" l10n="U" oldref="1">Insert Menu</paragraph>
-<paragraph role="paragraph" id="par_id3153808" xml-lang="en-US" l10n="CHG" oldref="28"><variable id="notiz">Choose <emph>Insert - Note</emph> (in Writer or Calc)
+<paragraph role="paragraph" id="par_id3153808" xml-lang="en-US" l10n="CHG" oldref="28"><variable id="notiz">Choose <emph>Insert - Comment</emph> (in Writer or Calc)
</variable></paragraph>
<section id="scannen">
<paragraph role="paragraph" id="par_id3155619" xml-lang="en-US" l10n="CHG" oldref="71">Choose <emph>Insert - Picture - Scan</emph>
diff --git a/helpcontent2/source/text/shared/01/02070000.xhp b/helpcontent2/source/text/shared/01/02070000.xhp
index a26bcab3b..bb0c8bf53 100644
--- a/helpcontent2/source/text/shared/01/02070000.xhp
+++ b/helpcontent2/source/text/shared/01/02070000.xhp
@@ -100,7 +100,7 @@
<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_INSALL" id="bm_id3148991" localize="false"/>
<paragraph role="heading" id="hd_id3145120" xml-lang="en-US" level="3" l10n="U" oldref="41"><switchinline select="appl"><caseinline select="CALC">Paste all
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3146848" xml-lang="en-US" l10n="U" oldref="42"><switchinline select="appl"><caseinline select="CALC"><ahelp hid="SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_INSALL">Pastes all cell contents, notes, formats, and objects into the current document.</ahelp>
+<paragraph role="paragraph" id="par_id3146848" xml-lang="en-US" l10n="U" oldref="42"><switchinline select="appl"><caseinline select="CALC"><ahelp hid="SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_INSALL">Pastes all cell contents, comments, formats, and objects into the current document.</ahelp>
</caseinline></switchinline></paragraph>
<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_INSSTRINGS" id="bm_id3149796" localize="false"/>
<paragraph role="heading" id="hd_id3155449" xml-lang="en-US" level="3" l10n="CHG" oldref="43"><switchinline select="appl"><caseinline select="CALC">Text
@@ -123,9 +123,9 @@
<paragraph role="paragraph" id="par_id3145744" xml-lang="en-US" l10n="U" oldref="50"><switchinline select="appl"><caseinline select="CALC"><ahelp hid="SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_INSFORMULAS">Inserts cells containing formulae.</ahelp>
</caseinline></switchinline></paragraph>
<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_INSNOTES" id="bm_id3159149" localize="false"/>
-<paragraph role="heading" id="hd_id3153968" xml-lang="en-US" level="3" l10n="U" oldref="51"><switchinline select="appl"><caseinline select="CALC">Notes
+<paragraph role="heading" id="hd_id3153968" xml-lang="en-US" level="3" l10n="U" oldref="51"><switchinline select="appl"><caseinline select="CALC">Comments
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3156422" xml-lang="en-US" l10n="U" oldref="52"><ahelp hid="SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_INSNOTES"><switchinline select="appl"><caseinline select="CALC">Inserts notes that are attached to cells. If you want to add the notes to the existing cell content, select the "Add" operation.
+<paragraph role="paragraph" id="par_id3156422" xml-lang="en-US" l10n="U" oldref="52"><ahelp hid="SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_INSNOTES"><switchinline select="appl"><caseinline select="CALC">Inserts comments that are attached to cells. If you want to add the comments to the existing cell content, select the "Add" operation.
</caseinline></switchinline></ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SC:CHECKBOX:RID_SCDLG_INSCONT:BTN_INSATTRS" id="bm_id3145171" localize="false"/>
<paragraph role="heading" id="hd_id3152935" xml-lang="en-US" level="3" l10n="U" oldref="53"><switchinline select="appl"><caseinline select="CALC">Formats
@@ -149,7 +149,7 @@
<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_OP_ADD" id="bm_id3149064" localize="false"/>
<paragraph role="heading" id="hd_id3154988" xml-lang="en-US" level="3" l10n="U" oldref="22"><switchinline select="appl"><caseinline select="CALC">Add
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3159196" xml-lang="en-US" l10n="CHG" oldref="23"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_OP_ADD"><switchinline select="appl"><caseinline select="CALC">Adds the values in the clipboard cells to the values in the target cells. Also, if the clipboard only contains notes, adds the notes to the target cells.
+<paragraph role="paragraph" id="par_id3159196" xml-lang="en-US" l10n="CHG" oldref="23"><ahelp hid="SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_OP_ADD"><switchinline select="appl"><caseinline select="CALC">Adds the values in the clipboard cells to the values in the target cells. Also, if the clipboard only contains comments, adds the comments to the target cells.
</caseinline></switchinline></ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_OP_SUB" id="bm_id3152576" localize="false"/>
<paragraph role="heading" id="hd_id3145263" xml-lang="en-US" level="3" l10n="U" oldref="24"><switchinline select="appl"><caseinline select="CALC">Subtract
diff --git a/helpcontent2/source/text/shared/01/02100000.xhp b/helpcontent2/source/text/shared/01/02100000.xhp
index ff1f08672..bdf298e0b 100644
--- a/helpcontent2/source/text/shared/01/02100000.xhp
+++ b/helpcontent2/source/text/shared/01/02100000.xhp
@@ -129,8 +129,8 @@ Ext help text not found within switches. Solution: Keep switched text for normal
<paragraph xml-lang="en-US" id="par_idN109CC" role="note" l10n="NEW">After you select the attributes that you want to search for, the <emph>Search for Styles</emph> box in the <emph>Options </emph>area of the %PRODUCTNAME Writer <emph>Find &amp; Replace </emph>dialog changes to <emph>Including Styles</emph>.</paragraph>
<paragraph xml-lang="en-US" id="par_idN109DF" role="note" l10n="NEW">If you want to search for text in which attributes were set by using direct formatting and styles, select the <emph>Including Styles</emph> box.</paragraph>
<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXDLG_SEARCH_CB_NOTES" id="bm_id0302200901445934" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id0302200901464169" role="heading" level="2" l10n="NEW">Notes</paragraph>
- <paragraph xml-lang="en-US" id="par_id0302200901464150" role="paragraph" l10n="NEW"><ahelp hid=".">In Writer, you can select to include the notes texts in your searches.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id0302200901464169" role="heading" level="3" l10n="NEW">Comments</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0302200901464150" role="paragraph" l10n="NEW"><ahelp hid=".">In Writer, you can select to include the comment texts in your searches.</ahelp></paragraph>
<embed href="text/shared/guide/find_attributes.xhp#find_attributes"/>
</default>
</switch><embed href="text/shared/01/02100100.xhp#aehnlichkeit"/>
@@ -217,11 +217,11 @@ Ext help text not found within switches. Solution: Keep switched text for normal
<paragraph xml-lang="en-US" id="par_id6064943" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Searches for the characters that you specify in values and in the results of formulas.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXDLG_SEARCH:BTN_NOTES" id="bm_id3148496" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3145650" role="heading" level="2" l10n="U"
- oldref="146"><switchinline select="appl"><caseinline select="CALC">Notes
+ oldref="146"><switchinline select="appl"><caseinline select="CALC">Comments
</caseinline></switchinline></paragraph>
- <paragraph xml-lang="en-US" id="par_id3153947" role="paragraph" l10n="CHG" oldref="147"><switchinline select="appl"><caseinline select="CALC">Searches for the characters that you specify in the notes that are attached to the cells.
+ <paragraph xml-lang="en-US" id="par_id3153947" role="paragraph" l10n="CHG" oldref="147"><switchinline select="appl"><caseinline select="CALC">Searches for the characters that you specify in the comments that are attached to the cells.
</caseinline></switchinline></paragraph>
- <paragraph xml-lang="en-US" id="par_id9799798" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Searches for the characters that you specify in the notes that are attached to the cells.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id9799798" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Searches for the characters that you specify in the comments that are attached to the cells.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="hd_id3153004" role="heading" level="2" l10n="U"
oldref="148"><switchinline select="appl"><caseinline select="CALC">Search direction
</caseinline></switchinline></paragraph>
@@ -265,4 +265,4 @@ Ext help text not found within switches. Solution: Keep switched text for normal
<embed href="text/swriter/guide/finding.xhp#finding"/>
</section>
</body>
-</helpdocument> \ No newline at end of file
+</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/04050000.xhp b/helpcontent2/source/text/shared/01/04050000.xhp
index 30d508236..50fdbe184 100644
--- a/helpcontent2/source/text/shared/01/04050000.xhp
+++ b/helpcontent2/source/text/shared/01/04050000.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.10 $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -36,72 +36,69 @@
<meta>
<topic id="textshared0104050000xml" indexer="include">
- <title xml-lang="en-US" id="tit">Notes</title>
+ <title xml-lang="en-US" id="tit">Comment</title>
<filename>/text/shared/01/04050000.xhp</filename>
</topic>
</meta>
<body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3154100"><bookmark_value>notes;inserting/editing/deleting/printing</bookmark_value>
- <bookmark_value>inserting; notes</bookmark_value>
- <bookmark_value>editing; notes</bookmark_value>
- <bookmark_value>deleting;notes</bookmark_value>
- <bookmark_value>Navigator;notes</bookmark_value>
- <bookmark_value>printing;notes</bookmark_value>
- <bookmark_value>records; inserting notes </bookmark_value>
- <bookmark_value>remarks, see also notes</bookmark_value>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3154100"><bookmark_value>comments;inserting/editing/deleting/printing</bookmark_value>
+ <bookmark_value>inserting; comments</bookmark_value>
+ <bookmark_value>editing; comments</bookmark_value>
+ <bookmark_value>deleting;comments</bookmark_value>
+ <bookmark_value>Navigator;comments</bookmark_value>
+ <bookmark_value>printing;comments</bookmark_value>
+ <bookmark_value>records; inserting comments </bookmark_value>
+ <bookmark_value>remarks, see also comments</bookmark_value>
</bookmark><comment>mw changed "notes;" and added 3 entries</comment>
<bookmark xml-lang="en-US" branch="hid/SID_INSERT_POSTIT" id="bm_id8906707" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:InsertAnnotation" id="bm_id3156045" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3154100" role="heading" level="1" l10n="CHG"
- oldref="1">Notes</paragraph>
- <paragraph xml-lang="en-US" id="par_id3151100" role="paragraph" l10n="CHG" oldref="2"><variable id="notizbearbeitentext"><ahelp hid=".uno:InsertAnnotation">Inserts a note anchored to the current cursor position.</ahelp>
+ oldref="1">Comment</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151100" role="paragraph" l10n="CHG" oldref="2"><variable id="notizbearbeitentext"><ahelp hid=".uno:InsertAnnotation">Inserts a comment.</ahelp>
</variable></paragraph>
<section id="howtoget">
<embed href="text/shared/00/00000404.xhp#notiz"/>
</section>
-<switch select="appl">
-<case select="WRITER"><comment>Writer</comment>
-<paragraph xml-lang="en-US" id="hd_id9851680" role="heading" level="2" l10n="NEW">Inserting notes</paragraph>
- <paragraph xml-lang="en-US" id="par_id1830500" role="paragraph" l10n="NEW">In Writer, the command <item type="menuitem">Insert - Note</item> or the <switchinline select="sys"><caseinline select="MAC">Command+Option
-</caseinline><defaultinline>Ctrl+Alt</defaultinline></switchinline>+N key combination inserts a note anchor at the current cursor position. A note box is shown at the page margin, where you can enter the text of your note. A line connects anchor and note box.</paragraph>
- <paragraph xml-lang="en-US" id="par_id1831" role="paragraph" l10n="NEW">The author name and the date and time of creating this note is shown at the bottom of the note box.</paragraph>
- <paragraph xml-lang="en-US" id="par_id6718649" role="paragraph" l10n="NEW">The notes by different authors get different colors. Choose <item type="menuitem">Tools - Options - %PRODUCTNAME - User Data</item> to enter your name so that it can show up as the note author.</paragraph>
- <paragraph xml-lang="en-US" id="hd_id2929166" role="heading" level="2" l10n="NEW">Editing notes</paragraph>
- <paragraph xml-lang="en-US" id="par_id5201879" role="paragraph" l10n="NEW">Every user with write permission to the text document can edit and delete notes of all authors.</paragraph>
- <paragraph xml-lang="en-US" id="par_id2571794" role="paragraph" l10n="NEW">The note box contains an icon with a down arrow. Click the icon to open a menu with some commands to delete notes.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id9851680" role="heading" level="2" l10n="NEW">Inserting comments</paragraph>
+ <paragraph xml-lang="en-US" id="par_id1830500" role="paragraph" l10n="NEW">In Writer, the command <item type="menuitem">Insert - Comment</item> or the <switchinline select="sys"><caseinline select="MAC">Command+Option
+</caseinline><defaultinline>Ctrl+Alt</defaultinline></switchinline>+N key combination inserts a comment anchor at the current cursor position. A comment box is shown at the page margin, where you can enter the text of your comment. A line connects anchor and comment box.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0915200910571516" role="paragraph" l10n="NEW">In Calc, Draw, and Impress, the command <item type="menuitem">Insert - Comment</item> inserts a comment.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id1831" role="paragraph" l10n="NEW">The author name and the date and time of creating this comment is shown at the bottom of the comment box.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id6718649" role="paragraph" l10n="NEW">The comments by different authors get different colors. Choose <item type="menuitem">Tools - Options - %PRODUCTNAME - User Data</item> to enter your name so that it can show up as the comment author.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id2929166" role="heading" level="2" l10n="NEW">Editing comments</paragraph>
+ <paragraph xml-lang="en-US" id="par_id5201879" role="paragraph" l10n="NEW">Every user with write permission to the document can edit and delete comments of all authors.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id2571794" role="paragraph" l10n="NEW">The comment box contains an icon with a down arrow. Click the icon to open a menu with some commands to delete comments.</paragraph>
<bookmark xml-lang="en-US" branch="hid/FN_DELETE_NOTE" id="bm_id0429200810584478" localize="false"/>
-<paragraph xml-lang="en-US" id="par_id0522200809383431" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Delete the current note.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SID_DELETE_NOTE" id="bm_id0915200910461391" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/11094" id="bm_id0915200910464881" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0522200809383431" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Delete the current comment.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/FN_DELETE_NOTE_AUTHOR" id="bm_id0429200810592549" localize="false"/>
-<paragraph xml-lang="en-US" id="par_id0522200809383485" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Delete all notes by this author in the current document.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/11100" id="bm_id0915200910471559" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0522200809383485" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Delete all comments by this author in the current document.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/FN_DELETE_ALL_NOTES" id="bm_id0429200810593994" localize="false"/>
-<paragraph xml-lang="en-US" id="par_id0522200809383428" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Delete all notes in the current document.</ahelp></paragraph>
- <paragraph xml-lang="en-US" id="par_id1857051" role="paragraph" l10n="NEW"><ahelp hid=".">Choose a command to delete the current note, or all notes from the same author as the current note, or all notes in the document.</ahelp></paragraph><comment>22500 shown for Reply, which is the same as Delete.</comment>
-<paragraph xml-lang="en-US" id="par_id0305200911090684" role="paragraph" l10n="NEW">If the note was written by another author, there is a Reply command in the context menu. <ahelp hid=".">This command inserts a new note adjacent to the note to which you want to reply.</ahelp> The note anchor is the same for both notes. Type your reply text in the new note. Save and send your document to other authors, then those authors can add replies, too.</paragraph><comment>View - Notes command</comment>
+<bookmark xml-lang="en-US" branch="hid/11097" id="bm_id0915200910474796" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id0522200809383428" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Delete all comments in the current document.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id1857051" role="paragraph" l10n="NEW"><ahelp hid=".">Choose a command to delete the current comment, or all comments from the same author as the current comment, or all comments in the document.</ahelp></paragraph><comment>22500 shown for Reply, which is the same as Delete.</comment>
+<paragraph xml-lang="en-US" id="par_id0305200911090684" role="paragraph" l10n="NEW">If the comment in a text document was written by another author, there is a Reply command in the context menu. <ahelp hid=".">This command inserts a new comment adjacent to the comment to which you want to reply.</ahelp> The comment anchor is the same for both comments. Type your reply text in the new comment. Save and send your document to other authors, then those authors can add replies, too.</paragraph><comment>View - Comments command</comment>
<bookmark xml-lang="en-US" branch="hid/.uno:ShowAnnotations" id="bm_id0804200803411260" localize="false"/>
-<paragraph xml-lang="en-US" id="par_id0804200803435883" role="paragraph" l10n="NEW"><ahelp hid=".">Use <item type="menuitem">View - Notes</item> to show or hide all notes.</ahelp></paragraph>
- <paragraph xml-lang="en-US" id="par_id0302200901430918" role="paragraph" l10n="NEW">In the Find &amp; Replace dialog, you can select to include the notes texts in your searches.</paragraph>
- <paragraph xml-lang="en-US" id="hd_id3445539" role="heading" level="2" l10n="NEW">Navigating from note to note</paragraph>
- <paragraph xml-lang="en-US" id="par_id4271370" role="paragraph" l10n="NEW">When the cursor is inside a note, you can press <switchinline select="sys"><caseinline select="MAC">Command+Option
-</caseinline><defaultinline>Ctrl+Alt</defaultinline></switchinline>+Page Down to jump to the next note, or press <switchinline select="sys"><caseinline select="MAC">Command+Option
-</caseinline><defaultinline>Ctrl+Alt</defaultinline></switchinline>+Page Up to jump to the previous note.</paragraph>
- <paragraph xml-lang="en-US" id="par_id2116153" role="paragraph" l10n="NEW">When the cursor is inside the normal text, press the above mentioned keys to jump to the next or previous note anchor. You can also use the small Navigation window below the vertical scrollbar to jump from one note anchor to the next note anchor.</paragraph>
- <paragraph xml-lang="en-US" id="par_id5381328" role="tip" l10n="NEW">You can also open the Navigator to see a list of all notes. Right-click a note name in the Navigator to edit or delete the note.</paragraph>
- <paragraph xml-lang="en-US" id="hd_id5664235" role="heading" level="2" l10n="NEW">Printing notes</paragraph>
- <paragraph xml-lang="en-US" id="par_id2254402" role="paragraph" l10n="NEW">To set the printing options for notes in your text document, choose <item type="menuitem">File - Print</item>, then click <emph>Options</emph>. To change the printing option for notes for all your text documents, choose <item type="menuitem">Tools - Options - %PRODUCTNAME Writer - Print</item>.</paragraph>
-</case>
-<case select="CALC"><comment>Calc</comment>
-<paragraph xml-lang="en-US" id="par_id3166460" role="paragraph" l10n="CHG" oldref="6">When you attach a note to a cell, a callout appears where you can enter your text. A small square in the upper right corner of a cell marks the position of a note. To display the note permanently, right-click the cell, and choose <emph>Show Note</emph>.</paragraph>
- <paragraph xml-lang="en-US" id="par_id8336741" role="paragraph" l10n="NEW">To change the object properties of a note, for example the background color, choose <emph>Show Note</emph> as above, then right-click the note (do not double-click the text).</paragraph>
- <paragraph xml-lang="en-US" id="par_id3155390" role="paragraph" l10n="CHG" oldref="7">To edit a shown note, double-click the note text. To edit a note that is not shown permanently, click in the cell that contains the note, and then choose <emph>Insert - Note</emph>. To specify the formatting of the note text, right-click the note text in edit mode.</paragraph>
- <paragraph xml-lang="en-US" id="par_idN107A1" role="paragraph" l10n="NEW">To change the position or size of a note, drag a border or corner of the note. <comment>UFI: see specs.openoffice.org/calc/compatibility/AnnotationPosition.sxw</comment></paragraph>
- <paragraph xml-lang="en-US" id="par_id9499496" role="paragraph" l10n="NEW">To delete a note, right-click the cell, then choose <emph>Delete Note</emph>.</paragraph>
- <paragraph xml-lang="en-US" id="par_id2036805" role="paragraph" l10n="NEW">You can also right-click a note name in the Navigator window to choose some editing commands.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3153716" role="paragraph" l10n="U" oldref="8">To set the printing options for notes in your spreadsheet, choose <emph>Format - Page</emph>, and then click the <emph>Sheet</emph> tab.</paragraph>
-</case>
-<default><comment>Draw, Impress</comment>
-<paragraph xml-lang="en-US" id="par_id4844508" role="paragraph" l10n="NEW">In Draw, there are no notes. If you want some annotations, use a custom layer and set the layer to visible or invisible as desired.</paragraph>
- <paragraph xml-lang="en-US" id="par_id2419507" role="paragraph" l10n="NEW">In Impress, you can use the Notes view to write a page of notes for every slide.</paragraph>
-</default>
-</switch>
-</body>
+<paragraph xml-lang="en-US" id="par_id0804200803435883" role="paragraph" l10n="NEW"><ahelp hid=".">Use <item type="menuitem">View - Comments</item> to show or hide all comments (not available in Calc).</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id0302200901430918" role="paragraph" l10n="NEW">In the Find &amp; Replace dialog of text documents, you can select to include the comments texts in your searches.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3445539" role="heading" level="2" l10n="NEW">Navigating from comment to comment in text documents</paragraph>
+ <paragraph xml-lang="en-US" id="par_id4271370" role="paragraph" l10n="NEW">When the cursor is inside a comment, you can press <switchinline select="sys"><caseinline select="MAC">Command+Option
+</caseinline><defaultinline>Ctrl+Alt</defaultinline></switchinline>+Page Down to jump to the next comment, or press <switchinline select="sys"><caseinline select="MAC">Command+Option
+</caseinline><defaultinline>Ctrl+Alt</defaultinline></switchinline>+Page Up to jump to the previous comment.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id2116153" role="paragraph" l10n="NEW">When the cursor is inside the normal text, press the above mentioned keys to jump to the next or previous comment anchor. You can also use the small Navigation window below the vertical scrollbar to jump from one comment anchor to the next comment anchor.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id5381328" role="tip" l10n="NEW">You can also open the Navigator to see a list of all comments. Right-click a comment name in the Navigator to edit or delete the comment.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id5664235" role="heading" level="2" l10n="NEW">Printing comments</paragraph>
+ <paragraph xml-lang="en-US" id="par_id2254402" role="paragraph" l10n="NEW">To set the printing options for comments in your text document, choose <item type="menuitem">File - Print</item>, then click <emph>Options</emph>. To change the printing option for comments for all your text documents, choose <item type="menuitem">Tools - Options - %PRODUCTNAME Writer - Print</item>.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id0915200910571612" role="heading" level="2" l10n="NEW">Comments in spreadsheets</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3166460" role="paragraph" l10n="CHG" oldref="6">When you attach a comment to a cell, a callout appears where you can enter your text. A small square in the upper right corner of a cell marks the position of a comment. To display the comment permanently, right-click the cell, and choose <emph>Show Comment</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id8336741" role="paragraph" l10n="NEW">To change the object properties of a comment, for example the background color, choose <emph>Show Comment</emph> as above, then right-click the comment (do not double-click the text).</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155390" role="paragraph" l10n="CHG" oldref="7">To edit a shown comment, double-click the comment text. To edit a comment that is not shown permanently, click in the cell that contains the comment, and then choose <emph>Insert - Comment</emph>. To specify the formatting of the comment text, right-click the comment text in edit mode.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN107A1" role="paragraph" l10n="NEW">To change the position or size of a comment, drag a border or corner of the comment. <comment>UFI: see specs.openoffice.org/calc/compatibility/AnnotationPosition.sxw</comment></paragraph>
+ <paragraph xml-lang="en-US" id="par_id9499496" role="paragraph" l10n="NEW">To delete a comment, right-click the cell, then choose <emph>Delete Comment</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id2036805" role="paragraph" l10n="NEW">You can also right-click a comment name in the Navigator window to choose some editing commands.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153716" role="paragraph" l10n="U" oldref="8">To set the printing options for comments in your spreadsheet, choose <emph>Format - Page</emph>, and then click the <emph>Sheet</emph> tab.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id2419507" role="note" l10n="NEW">In Impress, you can choose to use the Notes view to write a page of notes for every slide. Additionally, you can insert comments to your slides. </paragraph>
+ </body>
</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/about_meta_tags.xhp b/helpcontent2/source/text/shared/01/about_meta_tags.xhp
index e83b1d19d..9bd1feeda 100644
--- a/helpcontent2/source/text/shared/01/about_meta_tags.xhp
+++ b/helpcontent2/source/text/shared/01/about_meta_tags.xhp
@@ -100,8 +100,8 @@
<paragraph role="paragraph" id="par_id3155307" xml-lang="en-US" l10n="U" oldref="13">When you import an HTML document, following META tags are automatically converted to $[officename] fields: &lt;META HTTP-EQUIV="REFRESH"...&gt; and &lt;META NAME="..." ...&gt; , where NAME equals to AUTHOR, CREATED, CHANGED, CHANGEDBY, DESCRIPTION, KEYWORDS or CLASSIFICATION.</paragraph>
<paragraph role="paragraph" id="par_id3146146" xml-lang="en-US" l10n="U" oldref="15">Scripts, comments, and META tags that are positioned directly before a TABLE tag are inserted in the first cell of the table.</paragraph>
<paragraph role="paragraph" id="par_id3155366" xml-lang="en-US" l10n="U" oldref="16">Scripts and META tags in the header of an HTML document are imported and anchored to the first paragraph in the document.</paragraph>
-<paragraph role="paragraph" id="par_id3152885" xml-lang="en-US" l10n="U" oldref="14">To set the options for importing HTML tags, choose <emph>Tools - Options - Load/Save - HTML Compatibility</emph>. A known META tag contains either "HTTP-EQUIV" or "NAME", and are imported as $[officename] notes. The only exception is &lt;META NAME="GENERATOR"...&gt;, which is ignored.</paragraph>
+<paragraph role="paragraph" id="par_id3152885" xml-lang="en-US" l10n="U" oldref="14">To set the options for importing HTML tags, choose <emph>Tools - Options - Load/Save - HTML Compatibility</emph>. A known META tag contains either "HTTP-EQUIV" or "NAME", and are imported as $[officename] comments. The only exception is &lt;META NAME="GENERATOR"...&gt;, which is ignored.</paragraph>
<paragraph role="heading" id="hd_id3163717" xml-lang="en-US" level="3" l10n="U" oldref="17">Export Tips</paragraph>
-<paragraph role="paragraph" id="par_id3159180" xml-lang="en-US" l10n="U" oldref="19">Notes and script fields at the beginning of the first paragraph in a document are exported to the header of an HTML document. If the document begins with a table, the first paragraph in the first cell of the table is exported to the header of the HTML document.</paragraph>
+<paragraph role="paragraph" id="par_id3159180" xml-lang="en-US" l10n="U" oldref="19">Comments and script fields at the beginning of the first paragraph in a document are exported to the header of an HTML document. If the document begins with a table, the first paragraph in the first cell of the table is exported to the header of the HTML document.</paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/ref_pdf_export.xhp b/helpcontent2/source/text/shared/01/ref_pdf_export.xhp
index 4aaafc867..5d47d0c2a 100644
--- a/helpcontent2/source/text/shared/01/ref_pdf_export.xhp
+++ b/helpcontent2/source/text/shared/01/ref_pdf_export.xhp
@@ -112,7 +112,7 @@
<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_EXPORT_DLG_CB_EXPORTNOTES" id="bm_id5767998" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_TAB_GENER_CB_EXPORTNOTES" id="bm_id7971129" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN107BE" role="heading" level="2" l10n="NEW">Export notes</paragraph>
- <paragraph xml-lang="en-US" id="par_idN107C2" role="paragraph" l10n="NEW"><ahelp hid=".">Selects to export notes of Writer and Calc documents as PDF notes.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_idN107C2" role="paragraph" l10n="NEW"><ahelp hid=".">Selects to export comments of Writer and Calc documents as PDF notes.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_TAB_GENER_CB_EXPORTBOOKMARKS" id="bm_id8694112" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id8257087" role="heading" level="2" l10n="NEW">Export bookmarks</paragraph>
<paragraph xml-lang="en-US" id="par_id3479415" role="paragraph" l10n="CHG"><ahelp hid=".">Selects to export bookmarks of Writer documents as PDF bookmarks. Bookmarks are created for all outline paragraphs (Tools - Outline Numbering) and for all table of contents entries for which you did assign hyperlinks in the source document.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/guide/microsoft_terms.xhp b/helpcontent2/source/text/shared/guide/microsoft_terms.xhp
index 0c4b9f7ee..cbcba4da5 100755
--- a/helpcontent2/source/text/shared/guide/microsoft_terms.xhp
+++ b/helpcontent2/source/text/shared/guide/microsoft_terms.xhp
@@ -81,14 +81,6 @@
</tablerow>
<tablerow>
<tablecell>
-<paragraph role="tablecontent" id="par_id3145674" xml-lang="en-US" l10n="U" oldref="8">Comments</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3144510" xml-lang="en-US" l10n="U" oldref="9"><link href="text/shared/01/04050000.xhp" name="Notes">Notes</link></paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
<paragraph role="tablecontent" id="par_id3148946" xml-lang="en-US" l10n="U" oldref="10">Compare and Merge Documents</paragraph>
</tablecell>
<tablecell>
diff --git a/helpcontent2/source/text/shared/guide/navigator.xhp b/helpcontent2/source/text/shared/guide/navigator.xhp
index f5845582e..2727ce500 100755
--- a/helpcontent2/source/text/shared/guide/navigator.xhp
+++ b/helpcontent2/source/text/shared/guide/navigator.xhp
@@ -48,7 +48,7 @@
</bookmark>
<paragraph role="heading" id="hd_id3147008" xml-lang="en-US" level="1" l10n="U" oldref="4"><variable id="navigator"><link href="text/shared/guide/navigator.xhp" name="Navigator for Document Overview">Navigator for Document Overview</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3154823" xml-lang="en-US" l10n="U" oldref="3">All contents of the Navigator window are referred to here as "categories," whether titles, sheets, tables, text frames, graphics, OLE objects, sections, hyperlinks, references, indexes or notes.</paragraph>
+<paragraph role="paragraph" id="par_id3154823" xml-lang="en-US" l10n="U" oldref="3">All contents of the Navigator window are referred to here as "categories," whether titles, sheets, tables, text frames, graphics, OLE objects, sections, hyperlinks, references, indexes or comments.</paragraph>
<paragraph role="paragraph" id="par_id3153662" xml-lang="en-US" l10n="U" oldref="5">The Navigator displays all types of objects contained in a document. If a plus sign appears next to a category, this indicates that at least one object of this kind exists. If you rest the mouse pointer on the category name, the number of objects is displayed in an extended tip.</paragraph>
<paragraph role="paragraph" id="par_id3146797" xml-lang="en-US" l10n="U" oldref="6">Open a category by clicking on the plus sign. If you only want to view the entries in a certain category, select the category and click the <emph>Content View</emph> icon. Until you click the icon again, only the objects of this category will be displayed.</paragraph>
<paragraph role="paragraph" id="par_id3166461" xml-lang="en-US" l10n="CHG" oldref="7">You may dock the Navigator to any document border or turn it back into a free window (double click on the gray area). You can change the size of the Navigator when it is a free window.</paragraph>
diff --git a/helpcontent2/source/text/shared/optionen/01010200.xhp b/helpcontent2/source/text/shared/optionen/01010200.xhp
index da5ba9258..5af76c2f3 100644
--- a/helpcontent2/source/text/shared/optionen/01010200.xhp
+++ b/helpcontent2/source/text/shared/optionen/01010200.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<helpdocument version="1.0">
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,9 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01010200.xhp,v $
- *
- * $Revision: 1.20.4.1 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -37,138 +35,148 @@
<meta>
-<topic id="textsharedoptionen01010200xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">General</title>
-<filename>/text/shared/optionen/01010200.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="speichern">
+ <topic id="textsharedoptionen01010200xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">General</title>
+ <filename>/text/shared/optionen/01010200.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="speichern">
<bookmark xml-lang="en-US" branch="index" id="bm_id3143284"><bookmark_value>saving; options</bookmark_value>
-<bookmark_value>defaults;of saving</bookmark_value>
-<bookmark_value>URL; saving absolute/relative paths</bookmark_value>
-<bookmark_value>relative saving of URLs</bookmark_value>
-<bookmark_value>absolute saving of URLs</bookmark_value>
+ <bookmark_value>defaults;of saving</bookmark_value>
+ <bookmark_value>URL; saving absolute/relative paths</bookmark_value>
+ <bookmark_value>relative saving of URLs</bookmark_value>
+ <bookmark_value>absolute saving of URLs</bookmark_value>
</bookmark>
<bookmark xml-lang="en-US" branch="hid/HID_OPTIONS_SAVE" id="bm_id3109850" localize="false"/>
-<paragraph role="head1" id="hd_id3143284" xml-lang="en-US" l10n="U" oldref="1"><link href="text/shared/optionen/01010200.xhp" name="General">General</link></paragraph>
-<paragraph role="paragraph" id="par_id3145669" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_OPTIONS_SAVE">In the<emph> General</emph> section, you can select default settings for saving documents, and can select default file formats.</ahelp></paragraph>
-</section>
-<section id="howtoget">
-<embed href="text/shared/00/00000406.xhp#rsave"/>
-</section>
-<paragraph role="heading" id="hd_id3154824" xml-lang="en-US" level="2" l10n="U" oldref="65">Load</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3143284" role="head1" l10n="U" oldref="1"><link href="text/shared/optionen/01010200.xhp" name="General">General</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145669" role="paragraph" l10n="U" oldref="2"><ahelp hid="HID_OPTIONS_SAVE">In the<emph> General</emph> section, you can select default settings for saving documents, and can select default file formats.</ahelp></paragraph>
+ </section>
+ <section id="howtoget">
+ <embed href="text/shared/00/00000406.xhp#rsave"/>
+ </section>
+ <paragraph xml-lang="en-US" id="hd_id3154824" role="heading" level="2" l10n="U"
+ oldref="65">Load</paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SFXPAGE_SAVE_CB_LOAD_SETTINGS" id="bm_id3150444" localize="false"/>
-<paragraph role="heading" id="hd_id3153311" xml-lang="en-US" level="3" l10n="U" oldref="66">Load user-specific settings with the document</paragraph>
-<paragraph role="paragraph" id="par_id3147209" xml-lang="en-US" l10n="U" oldref="67"><ahelp hid="SVX_CHECKBOX_RID_SFXPAGE_SAVE_CB_LOAD_SETTINGS">Loads the user-specific settings saved in a document with the document.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3166460" xml-lang="en-US" l10n="U" oldref="68">If <emph>Load user-specific settings with the document </emph>is not selected, the following user-specific settings still apply:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3155388" xml-lang="en-US" l10n="U" oldref="69">Settings available in <emph>File - Print - Options</emph>,</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153348" xml-lang="en-US" l10n="U" oldref="70">Name of Fax,</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150276" xml-lang="en-US" l10n="U" oldref="71">Spacing options for paragraphs before text tables,</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3148686" xml-lang="en-US" l10n="U" oldref="72">Information about automatic updating for links, field functions and charts,</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3153254" xml-lang="en-US" l10n="U" oldref="73">Information about working with Asian character formats.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3153666" xml-lang="en-US" l10n="U" oldref="74">The following settings are <emph>always</emph> loaded with a document, whether or not this option is marked:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3148946" xml-lang="en-US" l10n="U" oldref="76">Data source linked to the document and its view.</paragraph>
-</listitem>
-</list>
+<paragraph xml-lang="en-US" id="hd_id3153311" role="heading" level="3" l10n="U"
+ oldref="66">Load user-specific settings with the document</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147209" role="paragraph" l10n="U" oldref="67"><ahelp hid="SVX_CHECKBOX_RID_SFXPAGE_SAVE_CB_LOAD_SETTINGS">Loads the user-specific settings saved in a document with the document.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3166460" role="paragraph" l10n="U" oldref="68">If <emph>Load user-specific settings with the document </emph>is not selected, the following user-specific settings still apply:</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3155388" role="listitem" l10n="U" oldref="69">Settings available in <emph>File - Print - Options</emph>,</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3153348" role="listitem" l10n="U" oldref="70">Name of Fax,</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3150276" role="listitem" l10n="U" oldref="71">Spacing options for paragraphs before text tables,</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3148686" role="listitem" l10n="U" oldref="72">Information about automatic updating for links, field functions and charts,</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3153254" role="listitem" l10n="U" oldref="73">Information about working with Asian character formats.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_id3153666" role="paragraph" l10n="U" oldref="74">The following settings are <emph>always</emph> loaded with a document, whether or not this option is marked:</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3148946" role="listitem" l10n="U" oldref="76">Data source linked to the document and its view.</paragraph>
+ </listitem>
+ </list>
<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SFXPAGE_SAVE_CB_LOAD_DOCPRINTER" id="bm_id813156" localize="false"/>
-<paragraph role="heading" id="hd_id927152" xml-lang="en-US" level="3" l10n="NEW">Load printer settings with the document</paragraph>
-<paragraph role="paragraph" id="par_id5684987" xml-lang="en-US" l10n="NEW"><ahelp hid=".">If enabled, the printer settings will be loaded with the document. This can cause a document to be printed on a distant printer, if you do not change the printer manually in the Print dialog. If disabled, your standard printer will be used to print this document. The current printer settings will be stored with the document whether or not this option is checked.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3146794" xml-lang="en-US" level="2" l10n="U" oldref="3">Save</paragraph>
-<embed href="text/shared/guide/doc_autosave.xhp#doc_autosave"/>
+<paragraph xml-lang="en-US" id="hd_id927152" role="heading" level="3" l10n="NEW">Load printer settings with the document</paragraph>
+ <paragraph xml-lang="en-US" id="par_id5684987" role="paragraph" l10n="NEW"><ahelp hid=".">If enabled, the printer settings will be loaded with the document. This can cause a document to be printed on a distant printer, if you do not change the printer manually in the Print dialog. If disabled, your standard printer will be used to print this document. The current printer settings will be stored with the document whether or not this option is checked.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3146794" role="heading" level="2" l10n="U" oldref="3">Save</paragraph>
+ <embed href="text/shared/guide/doc_autosave.xhp#doc_autosave"/>
<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SFXPAGE_SAVE_BTN_DOCINFO" id="bm_id3154939" localize="false"/>
-<paragraph role="heading" id="hd_id3154071" xml-lang="en-US" level="3" l10n="U" oldref="5">Edit document properties before saving</paragraph>
-<paragraph role="paragraph" id="par_id3148798" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SVX_CHECKBOX_RID_SFXPAGE_SAVE_BTN_DOCINFO">Specifies that the <emph>Properties</emph> dialog will appear every time you select the <emph>Save As</emph> command.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3154071" role="heading" level="3" l10n="U" oldref="5">Edit document properties before saving</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148798" role="paragraph" l10n="U" oldref="6"><ahelp hid="SVX_CHECKBOX_RID_SFXPAGE_SAVE_BTN_DOCINFO">Specifies that the <emph>Properties</emph> dialog will appear every time you select the <emph>Save As</emph> command.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SFXPAGE_SAVE_BTN_BACKUP" id="bm_id3151380" localize="false"/>
-<paragraph role="heading" id="hd_id3145606" xml-lang="en-US" level="3" l10n="U" oldref="7">Always create backup copy</paragraph>
-<paragraph role="paragraph" id="par_id3154123" xml-lang="en-US" l10n="CHG" oldref="8"><ahelp hid="SVX_CHECKBOX_RID_SFXPAGE_SAVE_BTN_BACKUP">Saves the previous version of a document as a backup copy whenever you save a document. Every time <item type="productname">%PRODUCTNAME</item> creates a backup copy, the previous backup copy is replaced. The backup copy gets the extension .BAK.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3153192" xml-lang="en-US" l10n="U" oldref="37">To change the location of the backup copy, choose <emph>Tools - Options - %PRODUCTNAME</emph>
-<emph>- Paths</emph>, and then enter a new path for the backup file.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3145606" role="heading" level="3" l10n="U" oldref="7">Always create backup copy</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154123" role="paragraph" l10n="CHG" oldref="8"><ahelp hid="SVX_CHECKBOX_RID_SFXPAGE_SAVE_BTN_BACKUP">Saves the previous version of a document as a backup copy whenever you save a document. Every time <item type="productname">%PRODUCTNAME</item> creates a backup copy, the previous backup copy is replaced. The backup copy gets the extension .BAK.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153192" role="paragraph" l10n="U" oldref="37">To change the location of the backup copy, choose <emph>Tools - Options - %PRODUCTNAME</emph>
+ <emph>- Paths</emph>, and then enter a new path for the backup file.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SFXPAGE_SAVE_BTN_AUTOSAVE" id="bm_id3159252" localize="false"/>
-<paragraph role="heading" id="hd_id3154908" xml-lang="en-US" level="3" l10n="CHG" oldref="9">Save AutoRecovery information every<comment>UFI: see http://specs.openoffice.org/appwide/recovery/Autorecovery.sxw</comment><comment>UFI: write guide "Auto backup and recovery"</comment></paragraph>
-<paragraph role="paragraph" id="par_id3149560" xml-lang="en-US" l10n="CHG" oldref="10"><ahelp hid="SVX_CHECKBOX_RID_SFXPAGE_SAVE_BTN_AUTOSAVE">Specifies that <item type="productname">%PRODUCTNAME</item> saves the information needed to restore all open documents in case of a crash. You can specify the saving time interval.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3154908" role="heading" level="3" l10n="CHG"
+ oldref="9">Save AutoRecovery information every<comment>UFI: see http://specs.openoffice.org/appwide/recovery/Autorecovery.sxw</comment><comment>UFI: write guide "Auto backup and recovery"</comment></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149560" role="paragraph" l10n="CHG" oldref="10"><ahelp hid="SVX_CHECKBOX_RID_SFXPAGE_SAVE_BTN_AUTOSAVE">Specifies that <item type="productname">%PRODUCTNAME</item> saves the information needed to restore all open documents in case of a crash. You can specify the saving time interval.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX_NUMERICFIELD_RID_SFXPAGE_SAVE_ED_AUTOSAVE" id="bm_id3155855" localize="false"/>
-<paragraph role="heading" id="hd_id3146147" xml-lang="en-US" level="3" l10n="U" oldref="11">Minutes</paragraph>
-<paragraph role="paragraph" id="par_id3152460" xml-lang="en-US" l10n="CHG" oldref="12"><ahelp hid="SVX_NUMERICFIELD_RID_SFXPAGE_SAVE_ED_AUTOSAVE">Specifies the time interval in minutes for the automatic recovery option.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3153575" xml-lang="en-US" level="3" l10n="CHG" oldref="17">Save URLs relative to file system</paragraph>
-<paragraph role="paragraph" id="par_id3149484" xml-lang="en-US" l10n="U" oldref="18">This option allows you to select the default for <link href="text/shared/00/00000005.xhp#speichern" name="relative">relative</link> addressing of URLs in the file system and on the Internet. Relative addressing is only possible if the source document and the referenced document are both on the same drive.</paragraph>
-<paragraph role="paragraph" id="par_id3145799" xml-lang="en-US" l10n="U" oldref="52">A relative address always starts from the directory in which the current document is located. In contrast, absolute addressing always starts from a root directory. The following table demonstrates the difference in syntax between relative and absolute referencing:</paragraph>
-<table id="">
-<tablerow>
-<tablecell>
-<paragraph role="tablehead" id="par_id3149413" xml-lang="en-US" l10n="U" oldref="53">Examples</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_id3148455" xml-lang="en-US" l10n="U" oldref="54">File system</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablehead" id="par_id3150715" xml-lang="en-US" l10n="U" oldref="55">Internet</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3155602" xml-lang="en-US" l10n="U" oldref="56">relative</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3147176" xml-lang="en-US" l10n="U" oldref="57">../images/img.jpg</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3145652" xml-lang="en-US" l10n="U" oldref="58">../images/img.jpg</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3155064" xml-lang="en-US" l10n="U" oldref="59">absolute</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3154361" xml-lang="en-US" l10n="U" oldref="60">file:///c|/work/images/img.jpg</paragraph>
-</tablecell>
-<tablecell>
-<paragraph role="tablecontent" id="par_id3148408" xml-lang="en-US" l10n="U" oldref="61">http://myserver.com/work/images/img.jpg</paragraph>
-</tablecell>
-</tablerow>
-</table>
+<paragraph xml-lang="en-US" id="hd_id3146147" role="heading" level="3" l10n="U"
+ oldref="11">Minutes</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152460" role="paragraph" l10n="CHG" oldref="12"><ahelp hid="SVX_NUMERICFIELD_RID_SFXPAGE_SAVE_ED_AUTOSAVE">Specifies the time interval in minutes for the automatic recovery option.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3153575" role="heading" level="3" l10n="CHG"
+ oldref="17">Save URLs relative to file system</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149484" role="paragraph" l10n="U" oldref="18">This option allows you to select the default for <link href="text/shared/00/00000005.xhp#speichern" name="relative">relative</link> addressing of URLs in the file system and on the Internet. Relative addressing is only possible if the source document and the referenced document are both on the same drive.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145799" role="paragraph" l10n="U" oldref="52">A relative address always starts from the directory in which the current document is located. In contrast, absolute addressing always starts from a root directory. The following table demonstrates the difference in syntax between relative and absolute referencing:</paragraph>
+ <table id="">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149413" role="tablehead" l10n="U" oldref="53">Examples</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3148455" role="tablehead" l10n="U" oldref="54">File system</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3150715" role="tablehead" l10n="U" oldref="55">Internet</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3155602" role="tablecontent" l10n="U" oldref="56">relative</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3147176" role="tablecontent" l10n="U" oldref="57">../images/img.jpg</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3145652" role="tablecontent" l10n="U" oldref="58">../images/img.jpg</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3155064" role="tablecontent" l10n="U" oldref="59">absolute</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154361" role="tablecontent" l10n="U" oldref="60">file:///c|/work/images/img.jpg</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3148408" role="tablecontent" l10n="U" oldref="61">http://myserver.com/work/images/img.jpg</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
-<paragraph role="warning" id="par_id3145148" xml-lang="en-US" l10n="U" oldref="36">The Help tip always displays an absolute path. However, if a document is saved in HTML format, <item type="productname">%PRODUCTNAME</item> will enter a relative path if the appropriate check box is selected.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145148" role="warning" l10n="U" oldref="36">The Help tip always displays an absolute path. However, if a document is saved in HTML format, <item type="productname">%PRODUCTNAME</item> will enter a relative path if the appropriate check box is selected.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SFXPAGE_SAVE_BTN_RELATIVE_FSYS" id="bm_id3151187" localize="false"/>
-<paragraph role="paragraph" id="par_id3155176" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SVX_CHECKBOX_RID_SFXPAGE_SAVE_BTN_RELATIVE_FSYS">Select this box for <link href="text/shared/00/00000005.xhp#speichern" name="relative saving">relative saving</link> of URLs in the file system.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_id3155176" role="paragraph" l10n="U" oldref="20"><ahelp hid="SVX_CHECKBOX_RID_SFXPAGE_SAVE_BTN_RELATIVE_FSYS">Select this box for <link href="text/shared/00/00000005.xhp#speichern" name="relative saving">relative saving</link> of URLs in the file system.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SFXPAGE_SAVE_BTN_RELATIVE_INET" id="bm_id3154664" localize="false"/>
-<paragraph role="heading" id="hd_id3155334" xml-lang="en-US" level="3" l10n="CHG" oldref="21">Save URLs relative to internet</paragraph>
-<paragraph role="paragraph" id="par_id3155608" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SVX_CHECKBOX_RID_SFXPAGE_SAVE_BTN_RELATIVE_INET">Select this box for <link href="text/shared/00/00000005.xhp#speichern" name="relative saving">relative saving</link> of URLs to the Internet.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id2016968" xml-lang="en-US" level="2" l10n="NEW">Default file format and ODF settings</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3155334" role="heading" level="3" l10n="CHG"
+ oldref="21">Save URLs relative to internet</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155608" role="paragraph" l10n="U" oldref="22"><ahelp hid="SVX_CHECKBOX_RID_SFXPAGE_SAVE_BTN_RELATIVE_INET">Select this box for <link href="text/shared/00/00000005.xhp#speichern" name="relative saving">relative saving</link> of URLs to the Internet.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id2016968" role="heading" level="2" l10n="NEW">Default file format and ODF settings</paragraph>
<bookmark xml-lang="en-US" branch="hid/svx_ListBox_RID_SFXPAGE_SAVE_LB_ODF_VERSION" id="bm_id810266" localize="false"/>
-<paragraph role="heading" id="hd_id2659077" xml-lang="en-US" level="3" l10n="NEW">ODF format version</paragraph>
-<paragraph role="paragraph" id="par_id6944181" xml-lang="en-US" l10n="NEW">OpenOffice.org 3 and StarOffice 9 introduce new features which have to be saved using the <link href="http://en.wikipedia.org/wiki/OpenDocument">OpenDocument</link> format (ODF) version 1.2. The prior versions of OpenOffice.org 2 and StarOffice 8 support the file formats ODF 1.0/1.1. Those prior file formats cannot store all new features of the new software.</paragraph>
-<paragraph role="paragraph" id="par_id886257" xml-lang="en-US" l10n="NEW">OpenOffice.org 3 and StarOffice 9 can open documents in ODF formats 1.0/1.1 and 1.2.</paragraph>
-<paragraph role="paragraph" id="par_id8892483" xml-lang="en-US" l10n="NEW">When you save a document in OpenOffice.org 3 or StarOffice 9, you can select whether to save the document in the new format ODF 1.2 or in the prior format ODF 1.0/1.1.</paragraph>
-<paragraph role="paragraph" id="par_id7198400" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Some companies or organizations may require ODF documents in the ODF 1.0/1.1 format. You can select that format to save in the listbox. This older format cannot store all new features, so the new format ODF 1.2 is recommended where possible.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id2659077" role="heading" level="3" l10n="NEW">ODF format version</paragraph>
+ <paragraph xml-lang="en-US" id="par_id6944181" role="paragraph" l10n="NEW">OpenOffice.org 3 and StarOffice 9 introduce new features which have to be saved using the <link href="http://en.wikipedia.org/wiki/OpenDocument">OpenDocument</link> format (ODF) version 1.2. The prior versions of OpenOffice.org 2 and StarOffice 8 support the file formats ODF 1.0/1.1. Those prior file formats cannot store all new features of the new software.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id886257" role="paragraph" l10n="NEW">OpenOffice.org 3 and StarOffice 9 can open documents in ODF formats 1.0/1.1 and 1.2.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id8892483" role="paragraph" l10n="NEW">When you save a document in OpenOffice.org 3 or StarOffice 9, you can select whether to save the document in the format ODF 1.2, ODF 1.2 (Extended), or in the prior format ODF 1.0/1.1.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0915200911205367" role="note" l10n="NEW">Currently, the ODF 1.2 (Extended) format enables files of Draw and Impress to contain comments. Those comments can be inserted by <item type="menuitem">Insert - Comment</item> in the latest software version. The comments get lost when loading files into prior software versions that were saved by the latest software version.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id7198400" role="paragraph" l10n="CHG"><ahelp hid=".">Some companies or organizations may require ODF documents in the ODF 1.0/1.1 format. You can select that format to save in the listbox. This older format cannot store all new features, so the new format ODF 1.2 (Extended) is recommended where possible.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SFXPAGE_SAVE_BTN_NOPRETTYPRINTING" id="bm_id3155414" localize="false"/>
-<paragraph role="heading" id="hd_id3154920" xml-lang="en-US" level="3" l10n="CHG" oldref="77">Size optimization for ODF format</paragraph>
-<paragraph role="paragraph" id="par_id3150488" xml-lang="en-US" l10n="U" oldref="78"><ahelp hid="SVX_CHECKBOX_RID_SFXPAGE_SAVE_BTN_NOPRETTYPRINTING">When saving the document, <item type="productname">%PRODUCTNAME</item> writes the XML data without indents and extra line breaks.</ahelp> This allows documents to be saved and opened more quickly, and the file size is smaller.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3154920" role="heading" level="3" l10n="CHG"
+ oldref="77">Size optimization for ODF format</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150488" role="paragraph" l10n="U" oldref="78"><ahelp hid="SVX_CHECKBOX_RID_SFXPAGE_SAVE_BTN_NOPRETTYPRINTING">When saving the document, <item type="productname">%PRODUCTNAME</item> writes the XML data without indents and extra line breaks.</ahelp> This allows documents to be saved and opened more quickly, and the file size is smaller.</paragraph>
<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SFXPAGE_SAVE_BTN_WARNALIENFORMAT" id="bm_id6262092" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/sfx2_CheckBox_RID_DLG_ALIEN_WARNING_CB_WARNING_OFF" id="bm_id7885982" localize="false"/>
-<paragraph role="heading" id="par_idN1091E" xml-lang="en-US" level="3" l10n="CHG">Warn when not saving in ODF or default format</paragraph>
-<paragraph role="paragraph" id="par_idN10922" xml-lang="en-US" l10n="CHG"><ahelp hid=".">You can choose to get a warning message when you save a document in a format that is not OpenDocument or which you did not set as default format in <emph>Tools - Options - Load/Save - General</emph>.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3158444" xml-lang="en-US" l10n="U" oldref="62">You can choose which file format will be applied as the default when saving documents of various document types. If you always exchange your documents with other persons who use Microsoft Office, for example, you may specify here that %PRODUCTNAME only uses the Microsoft Office file formats as a default.</paragraph>
+<paragraph xml-lang="en-US" id="par_idN1091E" role="heading" level="3" l10n="CHG">Warn when not saving in ODF or default format</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10922" role="paragraph" l10n="CHG"><ahelp hid=".">You can choose to get a warning message when you save a document in a format that is not OpenDocument or which you did not set as default format in <emph>Tools - Options - Load/Save - General</emph>.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3158444" role="paragraph" l10n="U" oldref="62">You can choose which file format will be applied as the default when saving documents of various document types. If you always exchange your documents with other persons who use Microsoft Office, for example, you may specify here that %PRODUCTNAME only uses the Microsoft Office file formats as a default.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SFXPAGE_SAVE_LB_APP" id="bm_id3149207" localize="false"/>
-<paragraph role="heading" id="hd_id3153270" xml-lang="en-US" level="3" l10n="U" oldref="50">Document type</paragraph>
-<paragraph role="paragraph" id="par_id3150828" xml-lang="en-US" l10n="U" oldref="63"><ahelp hid="SVX_LISTBOX_RID_SFXPAGE_SAVE_LB_APP">Specifies the document type for which you want to define the default file format.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3153270" role="heading" level="3" l10n="U"
+ oldref="50">Document type</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150828" role="paragraph" l10n="U" oldref="63"><ahelp hid="SVX_LISTBOX_RID_SFXPAGE_SAVE_LB_APP">Specifies the document type for which you want to define the default file format.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SFXPAGE_SAVE_LB_FILTER" id="bm_id3152775" localize="false"/>
-<paragraph role="heading" id="hd_id3149527" xml-lang="en-US" level="3" l10n="CHG" oldref="51">Always save as<comment>UFI: changed in #i46895</comment><comment>again many changes in specs.openoffice.org/appwide/odf/odf_1-2_migration.odt</comment></paragraph>
-<paragraph role="paragraph" id="par_id3149035" xml-lang="en-US" l10n="U" oldref="64"><ahelp hid="SVX_LISTBOX_RID_SFXPAGE_SAVE_LB_FILTER">Specifies how documents of the type selected on the left will always be saved as this file type. You may select another file type for the current document in the <emph>Save as</emph> dialog.</ahelp></paragraph>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="hd_id3149527" role="heading" level="3" l10n="CHG"
+ oldref="51">Always save as<comment>UFI: changed in #i46895</comment><comment>again many changes in specs.openoffice.org/appwide/odf/odf_1-2_migration.odt</comment></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149035" role="paragraph" l10n="U" oldref="64"><ahelp hid="SVX_LISTBOX_RID_SFXPAGE_SAVE_LB_FILTER">Specifies how documents of the type selected on the left will always be saved as this file type. You may select another file type for the current document in the <emph>Save as</emph> dialog.</ahelp></paragraph>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/optionen/01010600.xhp b/helpcontent2/source/text/shared/optionen/01010600.xhp
index c6c194c0b..8a7fe55cd 100755
--- a/helpcontent2/source/text/shared/optionen/01010600.xhp
+++ b/helpcontent2/source/text/shared/optionen/01010600.xhp
@@ -71,7 +71,7 @@
<paragraph role="paragraph" id="par_id3153525" xml-lang="en-US" l10n="CHG" oldref="38">Specifies the behavior of the installed help.</paragraph>
<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_OFA_TP_MISC_CB_TOOLTIP" id="bm_id3539841" localize="false"/>
<paragraph role="heading" id="par_idN106DB" xml-lang="en-US" level="3" l10n="NEW">Tips</paragraph>
-<paragraph role="paragraph" id="par_idN106DF" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Displays the icon names and more bubble help information, for example, notes and chapter names, when you scroll through a document with chapters.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN106DF" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Displays the icon names and more bubble help information, for example, chapter names when you scroll through a document with chapters.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_OFA_TP_MISC_CB_EXTHELP" id="bm_id1425519" localize="false"/>
<paragraph role="heading" id="par_idN106F6" xml-lang="en-US" level="3" l10n="NEW">Extended tips</paragraph>
<paragraph role="paragraph" id="par_idN106FA" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Displays a help text when you rest the cursor on an icon, a menu command, or a control on a dialog.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/optionen/01030300.xhp b/helpcontent2/source/text/shared/optionen/01030300.xhp
index 2adcb3770..891265cc8 100755
--- a/helpcontent2/source/text/shared/optionen/01030300.xhp
+++ b/helpcontent2/source/text/shared/optionen/01030300.xhp
@@ -63,16 +63,16 @@
<paragraph role="paragraph" id="par_id5616626" xml-lang="en-US" l10n="NEW">The Security options and warnings dialog contains the following controls:</paragraph>
<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXPAGE_INET_SECURITY_CB_SEC_SAVEORSENDDOCS" id="bm_id5852534" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/1242498061" id="bm_id1976683" localize="false"/><paragraph role="heading" id="par_idN10647" xml-lang="en-US" level="3" l10n="NEW">When saving or sending</paragraph>
-<paragraph role="paragraph" id="par_idN1064B" xml-lang="en-US" l10n="NEW"><ahelp hid="703988739">Select to see a warning dialog when you try to save or send a document that contains recorded changes, versions, or notes.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN1064B" xml-lang="en-US" l10n="NEW"><ahelp hid="703988739">Select to see a warning dialog when you try to save or send a document that contains recorded changes, versions, or comments.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXPAGE_INET_SECURITY_CB_SEC_PRINTDOCS" id="bm_id2789696" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/1242498065" id="bm_id43946" localize="false"/><paragraph role="heading" id="par_idN1064E" xml-lang="en-US" level="3" l10n="NEW">When printing</paragraph>
-<paragraph role="paragraph" id="par_idN10652" xml-lang="en-US" l10n="NEW"><ahelp hid="703988740">Select to see a warning dialog when you try to print a document that contains recorded changes or notes.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN10652" xml-lang="en-US" l10n="NEW"><ahelp hid="703988740">Select to see a warning dialog when you try to print a document that contains recorded changes or comments.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXPAGE_INET_SECURITY_CB_SEC_SIGNDOCS" id="bm_id1294289" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/1242498063" id="bm_id6449171" localize="false"/><paragraph role="heading" id="par_idN10655" xml-lang="en-US" level="3" l10n="NEW">When signing</paragraph>
-<paragraph role="paragraph" id="par_idN10659" xml-lang="en-US" l10n="NEW"><ahelp hid="703988741">Select to see a warning dialog when you try to sign a document that contains recorded changes, versions, fields, references to other sources (for example linked sections or linked pictures), or notes.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN10659" xml-lang="en-US" l10n="NEW"><ahelp hid="703988741">Select to see a warning dialog when you try to sign a document that contains recorded changes, versions, fields, references to other sources (for example linked sections or linked pictures), or comments.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXPAGE_INET_SECURITY_CB_SEC_CREATEPDF" id="bm_id1584215" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/1242498067" id="bm_id7101046" localize="false"/><paragraph role="heading" id="par_idN1065C" xml-lang="en-US" level="3" l10n="NEW">When creating PDF files</paragraph>
-<paragraph role="paragraph" id="par_idN10660" xml-lang="en-US" l10n="NEW"><ahelp hid="703988742">Select to see a warning dialog when you try to export a document to PDF format that displays recorded changes in Writer, or that displays notes.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN10660" xml-lang="en-US" l10n="NEW"><ahelp hid="703988742">Select to see a warning dialog when you try to export a document to PDF format that displays recorded changes in Writer, or that displays comments.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXPAGE_INET_SECURITY_CB_SEC_REMOVEPERSINFO" id="bm_id7565233" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/1242498070" id="bm_id4263740" localize="false"/><paragraph role="heading" id="par_idN10663" xml-lang="en-US" level="3" l10n="NEW">Remove personal information on saving</paragraph>
<paragraph role="paragraph" id="par_idN10667" xml-lang="en-US" l10n="CHG"><ahelp hid="703988743">Select to always remove user data from the file properties. If this option is not selected, you can still remove the personal information for the current document with the <emph>Reset</emph> button on <emph>File - Properties - General</emph>.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/optionen/01040200.xhp b/helpcontent2/source/text/shared/optionen/01040200.xhp
index 862109002..38b36cb2b 100644
--- a/helpcontent2/source/text/shared/optionen/01040200.xhp
+++ b/helpcontent2/source/text/shared/optionen/01040200.xhp
@@ -64,7 +64,7 @@
<bookmark_value>drawings; showing (Writer)</bookmark_value>
<bookmark_value>controls; showing (Writer)</bookmark_value>
<bookmark_value>fields;displaying field codes (Writer)</bookmark_value>
-<bookmark_value>displaying; notes in text documents</bookmark_value>
+<bookmark_value>displaying; comments in text documents</bookmark_value>
</bookmark><comment>mw made "field..." a two level entry</comment><paragraph role="heading" id="hd_id3145090" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01040200.xhp" name="View">View</link></paragraph>
<paragraph role="paragraph" id="par_id3147088" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".">Defines the default settings for displaying objects in your text documents and also the default settings for the window elements.</ahelp></paragraph>
</section>
@@ -113,8 +113,8 @@
<paragraph role="paragraph" id="par_id3151249" xml-lang="en-US" l10n="U" oldref="43"><ahelp hid="SW:CHECKBOX:TP_CONTENT_OPT:CB_DRWFAST">Displays the drawings and controls contained in your document.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_CONTENT_OPT:CB_FIELD" id="bm_id3145230" localize="false"/><paragraph role="heading" id="hd_id3155937" xml-lang="en-US" level="3" l10n="U" oldref="44">Field codes</paragraph>
<paragraph role="paragraph" id="par_id3155959" xml-lang="en-US" l10n="CHG" oldref="45"><ahelp hid="SW:CHECKBOX:TP_CONTENT_OPT:CB_FIELD">Displays the field names in the document instead of the contents of the fields.</ahelp> You can also choose <link href="text/swriter/01/03090000.xhp" name="View - Fields"><emph>View - Fields</emph></link> in a text document.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_CONTENT_OPT:CB_POSTIT" id="bm_id3150298" localize="false"/><paragraph role="heading" id="hd_id3150647" xml-lang="en-US" level="3" l10n="U" oldref="46">Notes</paragraph>
-<paragraph role="paragraph" id="par_id3159335" xml-lang="en-US" l10n="CHG" oldref="47"><ahelp hid="SW:CHECKBOX:TP_CONTENT_OPT:CB_POSTIT">Displays notes. Click a note to edit the text. Use the context menu in Navigator to locate or delete a note. Use the note's context menu to delete this note or all notes or all notes of this author.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_CONTENT_OPT:CB_POSTIT" id="bm_id3150298" localize="false"/><paragraph role="heading" id="hd_id3150647" xml-lang="en-US" level="3" l10n="U" oldref="46">Comments</paragraph>
+<paragraph role="paragraph" id="par_id3159335" xml-lang="en-US" l10n="CHG" oldref="47"><ahelp hid="SW:CHECKBOX:TP_CONTENT_OPT:CB_POSTIT">Displays comments. Click a comment to edit the text. Use the context menu in Navigator to locate or delete a comment. Use the comments's context menu to delete this comment or all comments or all comments of this author.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3147001" xml-lang="en-US" level="2" l10n="U" oldref="63">Settings (for HTML document only)</paragraph>
<bookmark xml-lang="en-US" branch="hid/SW_LISTBOX_TP_CONTENT_OPT_LB_METRIC" id="bm_id3149814" localize="false"/><paragraph role="heading" id="hd_id3149926" xml-lang="en-US" level="3" l10n="U" oldref="58">Measurement unit (for HTML document only)</paragraph>
<paragraph role="paragraph" id="par_id3154716" xml-lang="en-US" l10n="U" oldref="59"><ahelp hid="SW_LISTBOX_TP_CONTENT_OPT_LB_METRIC">Specifies the <link href="text/shared/00/00000003.xhp#metrik" name="Unit">Unit</link> for HTML documents.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/optionen/01040400.xhp b/helpcontent2/source/text/shared/optionen/01040400.xhp
index cbb14aa02..87eb80fcc 100644
--- a/helpcontent2/source/text/shared/optionen/01040400.xhp
+++ b/helpcontent2/source/text/shared/optionen/01040400.xhp
@@ -57,7 +57,7 @@
<bookmark_value>reversing printing order</bookmark_value>
<bookmark_value>brochures; printing several</bookmark_value>
<bookmark_value>printing; brochures</bookmark_value>
- <bookmark_value>notes; printing in text</bookmark_value>
+ <bookmark_value>comments; printing in text</bookmark_value>
<bookmark_value>printing; creating individual jobs</bookmark_value>
<bookmark_value>faxes;selecting a fax machine</bookmark_value>
</bookmark><comment>mw made "fax machine selection" a two level entry</comment>
@@ -124,23 +124,23 @@
<paragraph xml-lang="en-US" id="hd_id9475386" role="heading" level="3" l10n="NEW">Right to left</paragraph>
<paragraph xml-lang="en-US" id="par_id7894222" role="paragraph" l10n="NEW"><ahelp hid=".">Check to print the pages of the brochure in the correct order for a right-to-left script.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="hd_id3149300" role="heading" level="2" l10n="U"
- oldref="26">Notes</paragraph>
+ oldref="26">Comments</paragraph>
<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_NO" id="bm_id3157847" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3150095" role="heading" level="3" l10n="U"
oldref="28">None</paragraph>
- <paragraph xml-lang="en-US" id="par_id3151320" role="paragraph" l10n="U" oldref="29"><ahelp hid="SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_NO">Specifies that notes in your document are not printed.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151320" role="paragraph" l10n="U" oldref="29"><ahelp hid="SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_NO">Specifies that comments in your document are not printed.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_ONLY" id="bm_id3153948" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3155601" role="heading" level="3" l10n="U"
- oldref="30">Notes only</paragraph>
- <paragraph xml-lang="en-US" id="par_id3146988" role="paragraph" l10n="U" oldref="31"><ahelp hid="SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_ONLY">Specifies that notes in your document are printed, but not the actual text.</ahelp></paragraph>
+ oldref="30">Comments only</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3146988" role="paragraph" l10n="U" oldref="31"><ahelp hid="SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_ONLY">Specifies that comments in your document are printed, but not the actual text.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_END" id="bm_id3154272" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3153839" role="heading" level="3" l10n="U"
oldref="32">End of document</paragraph>
- <paragraph xml-lang="en-US" id="par_id3146789" role="paragraph" l10n="U" oldref="33"><ahelp hid="SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_END">Specifies that notes are printed at the end of the document, after the actual text. </ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3146789" role="paragraph" l10n="U" oldref="33"><ahelp hid="SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_END">Specifies that comments are printed at the end of the document, after the actual text. </ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_PAGEEND" id="bm_id3157868" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3155066" role="heading" level="3" l10n="U"
oldref="34">End of page</paragraph>
- <paragraph xml-lang="en-US" id="par_id3154360" role="paragraph" l10n="U" oldref="35"><ahelp hid="SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_PAGEEND">Specifies that notes are printed on an extra page that follows each page containing notes.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154360" role="paragraph" l10n="U" oldref="35"><ahelp hid="SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_PAGEEND">Specifies that comments are printed on an extra page that follows each page containing comments.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="hd_id3148916" role="heading" level="2" l10n="U"
oldref="45">Other</paragraph>
<bookmark xml-lang="en-US" branch="hid/sw_CheckBox_TP_OPTPRINT_PAGE_CB_PRINTEMPTYPAGES" id="bm_id2646870" localize="false"/>
diff --git a/helpcontent2/source/text/shared/optionen/01060100.xhp b/helpcontent2/source/text/shared/optionen/01060100.xhp
index 66fec3791..a7787f91f 100644
--- a/helpcontent2/source/text/shared/optionen/01060100.xhp
+++ b/helpcontent2/source/text/shared/optionen/01060100.xhp
@@ -51,8 +51,8 @@
<bookmark_value>handles; showing simple/large handles (Calc)</bookmark_value>
<bookmark_value>displaying; zero values (Calc)</bookmark_value>
<bookmark_value>zero values; displaying (Calc)</bookmark_value>
-<bookmark_value>displaying; notes (Calc)</bookmark_value>
-<bookmark_value>notes; displaying (Calc)</bookmark_value>
+<bookmark_value>displaying; comments (Calc)</bookmark_value>
+<bookmark_value>comments; displaying (Calc)</bookmark_value>
<bookmark_value>tables in spreadsheets; value highlighting</bookmark_value>
<bookmark_value>cells; formatting without effect (Calc)</bookmark_value>
<bookmark_value>cells; coloring (Calc)</bookmark_value>
@@ -109,15 +109,15 @@
<paragraph role="heading" id="hd_id3155132" xml-lang="en-US" level="3" l10n="U" oldref="7">Zero values</paragraph>
<paragraph role="paragraph" id="par_id3147318" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_NIL">Specifies whether to show numbers with the value of 0.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_ANNOT" id="bm_id3163711" localize="false"/>
-<paragraph role="heading" id="hd_id3147348" xml-lang="en-US" level="3" l10n="U" oldref="9">Note indicator</paragraph>
-<paragraph role="paragraph" id="par_id3146974" xml-lang="en-US" l10n="CHG" oldref="10"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_ANNOT">Specifies that a small rectangle in the top right corner of the cell indicates that a note exists. The note will be shown only when you enable tips under <emph>Tools - Options - %PRODUCTNAME - General</emph>.</ahelp></paragraph>
+<paragraph role="heading" id="hd_id3147348" xml-lang="en-US" level="3" l10n="U" oldref="9">Comment indicator</paragraph>
+<paragraph role="paragraph" id="par_id3146974" xml-lang="en-US" l10n="CHG" oldref="10"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_ANNOT">Specifies that a small rectangle in the top right corner of the cell indicates that a comment exists. The comment will be shown only when you enable tips under <emph>Tools - Options - %PRODUCTNAME - General</emph>.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/FID_NOTE_VISIBLE" id="bm_id2862651" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:NoteVisible" id="bm_id3153574" localize="false"/>
-<paragraph role="paragraph" id="par_id3150487" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid=".uno:NoteVisible">To display a note permanently, select the <emph>Show note</emph> command from the cell's context menu.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3149667" xml-lang="en-US" l10n="CHG" oldref="25">You can type and edit notes with the <link href="text/shared/01/04050000.xhp" name="Insert - Note"><emph>Insert - Note</emph></link> command. Notes that are permanently displayed can be edited by clicking the note box. Click the Navigator and under the <emph>Notes</emph> entry you can view all notes in the current document. By double clicking a note in Navigator, the cursor will jump to the corresponding cell containing the note.</paragraph>
+<paragraph role="paragraph" id="par_id3150487" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid=".uno:NoteVisible">To display a comment permanently, select the <emph>Show comment</emph> command from the cell's context menu.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3149667" xml-lang="en-US" l10n="CHG" oldref="25">You can type and edit comments with the <link href="text/shared/01/04050000.xhp" name="Insert - Comment"><emph>Insert - Comment</emph></link> command. Comments that are permanently displayed can be edited by clicking the comment box. Click the Navigator and under the <emph>Comments</emph> entry you can view all comments in the current document. By double clicking a comment in Navigator, the cursor will jump to the corresponding cell containing the comment.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_VALUE" id="bm_id3155306" localize="false"/>
<paragraph role="heading" id="hd_id3150872" xml-lang="en-US" level="3" l10n="U" oldref="11">Value highlighting</paragraph>
-<paragraph role="paragraph" id="par_id3154792" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_VALUE">Mark the<emph> Value highlighting </emph>box to highlight all values in the sheet. Text cells are highlighted in black, cells with numbers in blue, and cells containing formulas, logical values, dates, and so on, in green.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3154792" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_VALUE">Mark the <emph>Value highlighting</emph> box to highlight all values in the sheet. Text cells are highlighted in black, cells with numbers in blue, and cells containing formulas, logical values, dates, and so on, in green.</ahelp></paragraph>
<paragraph role="warning" id="par_id3151319" xml-lang="en-US" l10n="U" oldref="13">When this command is active, any colors assigned in the document will not be displayed until the function is deactivated.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_ANCHOR" id="bm_id3146972" localize="false"/>
<paragraph role="heading" id="hd_id3157846" xml-lang="en-US" level="3" l10n="U" oldref="14">Anchor</paragraph>
diff --git a/helpcontent2/source/text/simpress/01/03110000.xhp b/helpcontent2/source/text/simpress/01/03110000.xhp
index ba7be360b..4e9a83fef 100755
--- a/helpcontent2/source/text/simpress/01/03110000.xhp
+++ b/helpcontent2/source/text/simpress/01/03110000.xhp
@@ -45,7 +45,7 @@
<body>
<section id="notizen">
<bookmark xml-lang="en-US" branch="index" id="bm_id3153190"><bookmark_value>notes; adding to slides</bookmark_value>
-<bookmark_value>slides;inserting notes</bookmark_value>
+<bookmark_value>slides;inserting speaker notes</bookmark_value>
<bookmark_value>speaker notes;inserting</bookmark_value>
</bookmark>
<bookmark xml-lang="en-US" branch="hid/HID_SD_BTN_NOTES" id="bm_id3154322" localize="false"/>
diff --git a/helpcontent2/source/text/simpress/main0104.xhp b/helpcontent2/source/text/simpress/main0104.xhp
index 6f5d84b5d..5e08f5ed4 100755
--- a/helpcontent2/source/text/simpress/main0104.xhp
+++ b/helpcontent2/source/text/simpress/main0104.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.10 $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -56,6 +56,8 @@
<paragraph xml-lang="en-US" id="par_idN105D7" role="heading" level="2" l10n="NEW"><link href="text/simpress/01/03152000.xhp">Date and Time</link></paragraph>
<paragraph xml-lang="en-US" id="par_idN10624" role="paragraph" l10n="NEW">Adds the date and time as a field.</paragraph>
<embed href="text/simpress/01/04990000.xhp#feldbefehl"/>
+ <paragraph xml-lang="en-US" id="hd_id0915200910362363" role="heading" level="2" l10n="NEW"><link href="text/shared/01/04050000.xhp" name="Comment">Comment</link></paragraph>
+ <embed href="text/shared/01/04050000.xhp#notizbearbeitentext"/>
<paragraph xml-lang="en-US" id="hd_id3153964" role="heading" level="2" l10n="U" oldref="4"><link href="text/shared/01/04100000.xhp" name="Special Character">Special Character</link></paragraph>
<embed href="text/shared/01/04100000.xhp#sonder"/>
<embed href="text/shared/01/formatting_mark.xhp#formatting_mark"/>
diff --git a/helpcontent2/source/text/swriter/01/02110100.xhp b/helpcontent2/source/text/swriter/01/02110100.xhp
index c43e868d7..7720520fb 100644
--- a/helpcontent2/source/text/swriter/01/02110100.xhp
+++ b/helpcontent2/source/text/swriter/01/02110100.xhp
@@ -89,7 +89,7 @@
<bookmark xml-lang="en-US" branch="hid/HID_NID_PGE" id="bm_id6152836" localize="false"/>
<paragraph role="paragraph" id="par_idN107DD" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select this icon to browse through pages.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_NID_POSTIT" id="bm_id5230567" localize="false"/>
-<paragraph role="paragraph" id="par_idN107F4" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select this icon to browse through notes.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN107F4" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select this icon to browse through comments.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_NID_PREV" id="bm_id1692556" localize="false"/>
<paragraph role="paragraph" id="par_idN1080B" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Sets the cursor to the previous object of the selected type.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_NID_REG" id="bm_id9508651" localize="false"/>
diff --git a/helpcontent2/source/text/swriter/01/04200000.xhp b/helpcontent2/source/text/swriter/01/04200000.xhp
index f292a83af..f12c72cc7 100644
--- a/helpcontent2/source/text/swriter/01/04200000.xhp
+++ b/helpcontent2/source/text/swriter/01/04200000.xhp
@@ -50,7 +50,7 @@
<section id="howtoget">
<embed href="text/swriter/00/00000404.xhp#einfscript"/>
</section>
- <paragraph xml-lang="en-US" id="par_id3149880" role="paragraph" l10n="CHG" oldref="4">An inserted script is indicated by a small green rectangle. If you do not see the rectangle, choose <emph>Tools - Options - %PRODUCTNAME Writer/Web - </emph><link href="text/shared/optionen/01040200.xhp" name="View"><emph>View</emph></link>, and select the <emph>Notes </emph>check box. To edit a script, double-click the green rectangle.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149880" role="paragraph" l10n="CHG" oldref="4">An inserted script is indicated by a small green rectangle. If you do not see the rectangle, choose <emph>Tools - Options - %PRODUCTNAME Writer/Web - </emph><link href="text/shared/optionen/01040200.xhp" name="View"><emph>View</emph></link>, and select the <emph>Comments</emph> check box. To edit a script, double-click the green rectangle.</paragraph>
<paragraph xml-lang="en-US" id="par_id3150572" role="paragraph" l10n="U" oldref="5">If your document contains more than one script, the <emph>Edit Script</emph> dialog contains previous and next buttons to jump from script to script.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SW:IMAGEBUTTON:DLG_JAVAEDIT:BTN_PREV" id="bm_id3149710" localize="false"/>
<paragraph xml-lang="en-US" id="par_id0903200802541668" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Jump to Previous Script.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/swriter/main0104.xhp b/helpcontent2/source/text/swriter/main0104.xhp
index 578245665..afe08fa12 100755
--- a/helpcontent2/source/text/swriter/main0104.xhp
+++ b/helpcontent2/source/text/swriter/main0104.xhp
@@ -44,7 +44,7 @@
<section id="einfuegen">
<bookmark xml-lang="en-US" branch="hid/.uno:InsertMenu" id="bm_id2305978" localize="false"/>
<paragraph role="heading" id="hd_id3155341" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/main0104.xhp" name="Insert">Insert</link></paragraph>
-<paragraph role="paragraph" id="par_id3155358" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".">The Insert menu contains commands for inserting new elements in your document. This includes sections, footnotes, notes, special characters, graphics, and objects from other applications.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3155358" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".">The Insert menu contains commands for inserting new elements in your document. This includes sections, footnotes, comments, special characters, graphics, and objects from other applications.</ahelp></paragraph>
</section>
<paragraph role="heading" id="hd_id3155376" xml-lang="en-US" level="2" l10n="U" oldref="3"><link href="text/swriter/01/04010000.xhp" name="Manual Break">Manual Break</link></paragraph>
<embed href="text/swriter/01/04010000.xhp#umbruch"/>
@@ -66,7 +66,7 @@
<embed href="text/swriter/01/04040000.xhp#textmarkeein"/>
<paragraph role="heading" id="hd_id3147543" xml-lang="en-US" level="2" l10n="U" oldref="25"><link href="text/swriter/01/04090002.xhp" name="Cross-reference">Cross-reference</link></paragraph>
<embed href="text/swriter/01/04090002.xhp#reftext"/>
-<paragraph role="heading" id="hd_id3147569" xml-lang="en-US" level="2" l10n="U" oldref="7"><link href="text/shared/01/04050000.xhp" name="Note">Note</link></paragraph>
+<paragraph role="heading" id="hd_id3147569" xml-lang="en-US" level="2" l10n="U" oldref="7"><link href="text/shared/01/04050000.xhp" name="Comment">Comment</link></paragraph>
<embed href="text/shared/01/04050000.xhp#notizbearbeitentext"/>
<paragraph role="heading" id="hd_id3147595" xml-lang="en-US" level="2" l10n="U" oldref="24"><link href="text/swriter/01/04200000.xhp" name="Script">Script</link></paragraph>
<embed href="text/swriter/01/04200000.xhp#scripttext"/>