[Libreoffice-commits] help.git: 6 commits - source/text

[Christian Lohmaier]

 source/text/sbasic/guide/access2base.xhp                    |    2 
 source/text/sbasic/shared/00000002.xhp                      |    2 
 source/text/sbasic/shared/00000003.xhp                      |    2 
 source/text/scalc/01/02140600.xhp                           |    2 
 source/text/scalc/01/03070000.xhp                           |    2 
 source/text/scalc/01/04060102.xhp                           |    4 
 source/text/scalc/01/04060104.xhp                           | 1424 +++----
 source/text/scalc/01/04060106.xhp                           | 2410 ++++++------
 source/text/scalc/01/04060107.xhp                           | 2197 +++++-----
 source/text/scalc/01/04060118.xhp                           |  978 ++--
 source/text/scalc/01/04060181.xhp                           | 1346 +++---
 source/text/scalc/01/05070500.xhp                           |    2 
 source/text/scalc/01/06130000.xhp                           |    4 
 source/text/scalc/01/12090101.xhp                           |    2 
 source/text/scalc/01/func_date.xhp                          |    2 
 source/text/scalc/01/func_weekday.xhp                       |    2 
 source/text/scalc/04/01020000.xhp                           |    2 
 source/text/scalc/guide/address_auto.xhp                    |   75 
 source/text/scalc/guide/calc_date.xhp                       |   97 
 source/text/scalc/guide/calc_series.xhp                     |    2 
 source/text/scalc/guide/cellstyle_by_formula.xhp            |  106 
 source/text/scalc/guide/csv_formula.xhp                     |    4 
 source/text/scalc/guide/currency_format.xhp                 |    2 
 source/text/scalc/guide/formula_value.xhp                   |    2 
 source/text/scalc/guide/integer_leading_zero.xhp            |  138 
 source/text/scalc/guide/note_insert.xhp                     |    2 
 source/text/scalc/guide/rounding_numbers.xhp                |    4 
 source/text/scalc/guide/scenario.xhp                        |    2 
 source/text/scalc/guide/sorted_list.xhp                     |    2 
 source/text/scalc/guide/table_view.xhp                      |    4 
 source/text/scalc/guide/year2000.xhp                        |    2 
 source/text/schart/01/04020000.xhp                          |    2 
 source/text/schart/01/type_xy.xhp                           |    2 
 source/text/sdraw/guide/keyboard.xhp                        |    6 
 source/text/shared/00/00000003.xhp                          |    2 
 source/text/shared/00/00000005.xhp                          |    2 
 source/text/shared/00/00000007.xhp                          |    2 
 source/text/shared/00/00000020.xhp                          |   10 
 source/text/shared/00/00000021.xhp                          |    4 
 source/text/shared/00/00000406.xhp                          |  154 
 source/text/shared/00/00000450.xhp                          |    2 
 source/text/shared/00/00040502.xhp                          |    2 
 source/text/shared/01/01010201.xhp                          |    2 
 source/text/shared/01/01010303.xhp                          |    2 
 source/text/shared/01/01020000.xhp                          |    4 
 source/text/shared/01/01070000.xhp                          |    2 
 source/text/shared/01/01070001.xhp                          |    2 
 source/text/shared/01/01100200.xhp                          |    2 
 source/text/shared/01/02230100.xhp                          |    2 
 source/text/shared/01/04050000.xhp                          |    2 
 source/text/shared/01/04160500.xhp                          |    2 
 source/text/shared/01/05020100.xhp                          |    2 
 source/text/shared/01/05020301.xhp                          |    2 
 source/text/shared/01/05020700.xhp                          |    2 
 source/text/shared/01/06130010.xhp                          |    2 
 source/text/shared/01/06150120.xhp                          |    2 
 source/text/shared/01/06200000.xhp                          |    2 
 source/text/shared/01/about_meta_tags.xhp                   |    2 
 source/text/shared/01/ref_pdf_export.xhp                    |    6 
 source/text/shared/01/webhtml.xhp                           |    4 
 source/text/shared/02/01170000.xhp                          |    2 
 source/text/shared/02/01170003.xhp                          |    2 
 source/text/shared/02/02020000.xhp                          |    2 
 source/text/shared/02/20050000.xhp                          |    2 
 source/text/shared/autopi/01050000.xhp                      |    2 
 source/text/shared/autopi/01050100.xhp                      |    2 
 source/text/shared/explorer/database/dabawiz02jdbc.xhp      |    2 
 source/text/shared/guide/aaa_start.xhp                      |    2 
 source/text/shared/guide/accessibility.xhp                  |    2 
 source/text/shared/guide/active_help_on_off.xhp             |    2 
 source/text/shared/guide/autohide.xhp                       |    2 
 source/text/shared/guide/doc_autosave.xhp                   |    6 
 source/text/shared/guide/doc_open.xhp                       |  132 
 source/text/shared/guide/doc_save.xhp                       |    2 
 source/text/shared/guide/export_ms.xhp                      |    2 
 source/text/shared/guide/fax.xhp                            |    2 
 source/text/shared/guide/flat_icons.xhp                     |    2 
 source/text/shared/guide/hyperlink_rel_abs.xhp              |    2 
 source/text/shared/guide/imagemap.xhp                       |    2 
 source/text/shared/guide/import_ms.xhp                      |    2 
 source/text/shared/guide/keyboard.xhp                       |    2 
 source/text/shared/guide/language_select.xhp                |    4 
 source/text/shared/guide/macro_recording.xhp                |    2 
 source/text/shared/guide/main.xhp                           |   98 
 source/text/shared/guide/measurement_units.xhp              |    2 
 source/text/shared/guide/ms_import_export_limitations.xhp   |    2 
 source/text/shared/guide/ms_user.xhp                        |    6 
 source/text/shared/guide/print_faster.xhp                   |    2 
 source/text/shared/guide/redlining_enter.xhp                |    2 
 source/text/shared/guide/spadmin.xhp                        |    2 
 source/text/shared/guide/standard_template.xhp              |    4 
 source/text/shared/guide/tabs.xhp                           |    2 
 source/text/shared/guide/workfolder.xhp                     |    4 
 source/text/shared/main0650.xhp                             |    4 
 source/text/shared/optionen/01010200.xhp                    |    2 
 source/text/shared/optionen/01040000.xhp                    |    4 
 source/text/shared/optionen/01040300.xhp                    |    2 
 source/text/shared/optionen/01060100.xhp                    |    2 
 source/text/shared/optionen/01060700.xhp                    |    2 
 source/text/shared/optionen/01090000.xhp                    |    2 
 source/text/shared/optionen/experimental.xhp                |    2 
 source/text/shared/optionen/macrosecurity.xhp               |    2 
 source/text/shared/optionen/online_update.xhp               |    2 
 source/text/simpress/01/03130000.xhp                        |    2 
 source/text/simpress/guide/individual.xhp                   |    2 
 source/text/simpress/guide/keyboard.xhp                     |    4 
 source/text/simpress/guide/show.xhp                         |    2 
 source/text/smath/01/03091508.xhp                           |  780 +--
 source/text/swriter/01/03100000.xhp                         |    5 
 source/text/swriter/01/03140000.xhp                         |    2 
 source/text/swriter/01/04090001.xhp                         |    2 
 source/text/swriter/01/04090003.xhp                         |    4 
 source/text/swriter/01/04090200.xhp                         |    4 
 source/text/swriter/01/04120211.xhp                         |    2 
 source/text/swriter/01/04130100.xhp                         |    2 
 source/text/swriter/01/04150000.xhp                         |    2 
 source/text/swriter/01/04200000.xhp                         |    2 
 source/text/swriter/01/05090201.xhp                         |    2 
 source/text/swriter/01/06030000.xhp                         |    4 
 source/text/swriter/02/18030700.xhp                         |    2 
 source/text/swriter/02/18130000.xhp                         |    2 
 source/text/swriter/guide/anchor_object.xhp                 |  157 
 source/text/swriter/guide/autotext.xhp                      |  181 
 source/text/swriter/guide/calculate.xhp                     |   73 
 source/text/swriter/guide/calculate_intext.xhp              |   86 
 source/text/swriter/guide/captions.xhp                      |  111 
 source/text/swriter/guide/captions_numbers.xhp              |   13 
 source/text/swriter/guide/change_header.xhp                 |  118 
 source/text/swriter/guide/chapter_numbering.xhp             |  134 
 source/text/swriter/guide/conditional_text.xhp              |  186 
 source/text/swriter/guide/conditional_text2.xhp             |   97 
 source/text/swriter/guide/delete_from_dict.xhp              |   66 
 source/text/swriter/guide/even_odd_sdw.xhp                  |  166 
 source/text/swriter/guide/fields.xhp                        |    4 
 source/text/swriter/guide/fields_date.xhp                   |   73 
 source/text/swriter/guide/fields_enter.xhp                  |   78 
 source/text/swriter/guide/fields_userdata.xhp               |  413 +-
 source/text/swriter/guide/finding.xhp                       |    2 
 source/text/swriter/guide/footer_nextpage.xhp               |   89 
 source/text/swriter/guide/footnote_usage.xhp                |  183 
 source/text/swriter/guide/footnote_with_line.xhp            |  118 
 source/text/swriter/guide/globaldoc_howtos.xhp              |  280 -
 source/text/swriter/guide/header_footer.xhp                 |   99 
 source/text/swriter/guide/header_pagestyles.xhp             |  154 
 source/text/swriter/guide/header_with_chapter.xhp           |  156 
 source/text/swriter/guide/header_with_line.xhp              |   96 
 source/text/swriter/guide/hyperlinks.xhp                    |   92 
 source/text/swriter/guide/hyphen_prevent.xhp                |    4 
 source/text/swriter/guide/indenting.xhp                     |    2 
 source/text/swriter/guide/indices_delete.xhp                |   92 
 source/text/swriter/guide/indices_edit.xhp                  |    2 
 source/text/swriter/guide/indices_index.xhp                 |  104 
 source/text/swriter/guide/indices_literature.xhp            |  209 -
 source/text/swriter/guide/indices_toc.xhp                   |  124 
 source/text/swriter/guide/indices_userdef.xhp               |  150 
 source/text/swriter/guide/insert_beforetable.xhp            |    4 
 source/text/swriter/guide/join_numbered_lists.xhp           |  106 
 source/text/swriter/guide/number_sequence.xhp               |  115 
 source/text/swriter/guide/numbering_lines.xhp               |  222 -
 source/text/swriter/guide/pagebackground.xhp                |  212 -
 source/text/swriter/guide/pagestyles.xhp                    |  189 
 source/text/swriter/guide/printer_tray.xhp                  |   92 
 source/text/swriter/guide/protection.xhp                    |    4 
 source/text/swriter/guide/references.xhp                    |  222 -
 source/text/swriter/guide/references_modify.xhp             |   71 
 source/text/swriter/guide/section_insert.xhp                |  152 
 source/text/swriter/guide/send2html.xhp                     |   71 
 source/text/swriter/guide/smarttags.xhp                     |    2 
 source/text/swriter/guide/spellcheck_dialog.xhp             |   94 
 source/text/swriter/guide/stylist_fromselect.xhp            |  135 
 source/text/swriter/guide/table_repeat_multiple_headers.xhp |   82 
 source/text/swriter/guide/table_sizing.xhp                  |    9 
 source/text/swriter/guide/tablemode.xhp                     |    2 
 source/text/swriter/guide/template_create.xhp               |   92 
 source/text/swriter/guide/text_animation.xhp                |   71 
 source/text/swriter/guide/text_centervert.xhp               |   94 
 source/text/swriter/guide/text_direct_cursor.xhp            |    2 
 source/text/swriter/guide/text_rotate.xhp                   |   87 
 source/text/swriter/guide/using_numbered_lists.xhp          |   93 
 source/text/swriter/guide/using_numbering.xhp               |   13 
 source/text/swriter/guide/words_count.xhp                   |    2 
 source/text/swriter/guide/wrap.xhp                          |  148 
 182 files changed, 8242 insertions(+), 8268 deletions(-)

New commits:
commit bb4361c2e733c7b5a6a3a4b9d37ec0586c99ccd7
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Mon Jan 25 15:34:53 2016 +0100

    link is no valid child of emph
    
    Change-Id: I24009c8eb766d2e99ff96b8ba803e0d92ee73387

diff --git a/source/text/sbasic/guide/access2base.xhp b/source/text/sbasic/guide/access2base.xhp
index d5ad6ce..9bed653 100644
--- a/source/text/sbasic/guide/access2base.xhp
+++ b/source/text/sbasic/guide/access2base.xhp
@@ -42,7 +42,7 @@
  <paragraph role="paragraph" id="par_idA2B004" xml-lang="en-US" l10n="U">Access2Base is a LibreOffice Basic library of macros for (business or personal) application developers and advanced users. It is one of the libraries stored in "LibreOffice macros and dialogs".</paragraph>
  <paragraph role="paragraph" id="par_idA2B005" xml-lang="en-US" l10n="U">The provided macros implement functionalities, all directly inspired by Microsoft Access. The macros are callable from a LibreOffice <emph>Base</emph> application only.</paragraph>
  <paragraph role="paragraph" id="par_idA2B006" xml-lang="en-US" l10n="U">The API provided by Access2Base is intended to be more concise, intuitive and easy to learn than the standard UNO API (API = Application Programming Interface).</paragraph>
- <paragraph role="warning" id="par_idA2B007" xml-lang="en-US" l10n="U"><emph>The library is documented online on <link href="http://www.access2base.com" name="http://www.access2base.com">http://www.access2base.com</link></emph></paragraph>
+ <paragraph role="warning" id="par_idA2B007" xml-lang="en-US" l10n="U"><emph>The library is documented online on </emph><link href="http://www.access2base.com" name="http://www.access2base.com"><emph>http://www.access2base.com</emph></link></paragraph>
  <paragraph role="heading" id="hd_idA2B008" xml-lang="en-US" level="2" l10n="U">The implemented macros include:</paragraph>
  <list type="ordered" format="1">
   <listitem>
diff --git a/source/text/scalc/01/03070000.xhp b/source/text/scalc/01/03070000.xhp
index 269071b..a9ef012 100644
--- a/source/text/scalc/01/03070000.xhp
+++ b/source/text/scalc/01/03070000.xhp
@@ -51,7 +51,7 @@
 
 <list type="unordered">
   <listitem>
-    <paragraph id="par_id3156441" role="listitem" xml-lang="en-US">You can also set the view of the column and row headers in <switchinline select="sys"><caseinline select="MAC"><item type="menuitem">%PRODUCTNAME - Preferences</item></caseinline><defaultinline><item type="menuitem">Tools - Options</item></defaultinline></switchinline><emph> - <link href="text/shared/optionen/01060100.xhp" name="Spreadsheet - View">%PRODUCTNAME Calc - View</link></emph>.</paragraph>
+    <paragraph id="par_id3156441" role="listitem" xml-lang="en-US">You can also set the view of the column and row headers in <switchinline select="sys"><caseinline select="MAC"><item type="menuitem">%PRODUCTNAME - Preferences</item></caseinline><defaultinline><item type="menuitem">Tools - Options</item></defaultinline></switchinline> - <link href="text/shared/optionen/01060100.xhp" name="Spreadsheet - View"><emph>%PRODUCTNAME Calc - View</emph></link>.</paragraph>
   </listitem></list>
 </body>
 
diff --git a/source/text/shared/01/02230100.xhp b/source/text/shared/01/02230100.xhp
index 0c38849..a7ba284 100644
--- a/source/text/shared/01/02230100.xhp
+++ b/source/text/shared/01/02230100.xhp
@@ -41,7 +41,7 @@
   <embed href="text/shared/00/00000402.xhp#aufzeichnen"/>
 </section>
 <paragraph role="paragraph" id="par_id3155934" xml-lang="en-US" l10n="U" oldref="26"><switchinline select="appl">
-<caseinline select="WRITER">If you choose <emph>Record - Show</emph>, the lines containing changed text passages are indicated by a vertical line in the left page margin. You can set the properties of the vertical line and the other markup elements by choosing <emph><link href="text/shared/optionen/01040700.xhp" name="Writer - Changes">%PRODUCTNAME Writer - Changes</link></emph> in the Options dialog box.</caseinline></switchinline></paragraph>
+<caseinline select="WRITER">If you choose <emph>Record - Show</emph>, the lines containing changed text passages are indicated by a vertical line in the left page margin. You can set the properties of the vertical line and the other markup elements by choosing <link href="text/shared/optionen/01040700.xhp" name="Writer - Changes"><emph>%PRODUCTNAME Writer - Changes</emph></link> in the Options dialog box.</caseinline></switchinline></paragraph>
 <paragraph role="paragraph" id="par_id3147261" xml-lang="en-US" l10n="U" oldref="27"><switchinline select="appl">
 <caseinline select="CALC">You can set the properties of the markup elements by choosing <link href="text/shared/optionen/01060600.xhp" name="Calc - Changes"><emph>%PRODUCTNAME Calc - Changes</emph></link> in the Options dialog box.</caseinline></switchinline></paragraph>
 <paragraph role="paragraph" id="par_id3145669" xml-lang="en-US" l10n="U" oldref="7">The following changes are tracked when the record changes command is active:</paragraph>
diff --git a/source/text/swriter/01/03140000.xhp b/source/text/swriter/01/03140000.xhp
index c20d201..d11b516 100644
--- a/source/text/swriter/01/03140000.xhp
+++ b/source/text/swriter/01/03140000.xhp
@@ -38,7 +38,7 @@
 <section id="howtoget">
 <embed href="text/swriter/00/00000403.xhp#versteckteabs"/>
 </section>
-<paragraph id="par_id3157875" role="note" xml-lang="en-US">To enable this feature, choose <switchinline select="sys"><caseinline select="MAC"><item type="menuitem">%PRODUCTNAME - Preferences</item></caseinline><defaultinline><item type="menuitem">Tools - Options</item></defaultinline></switchinline><emph> - <link href="text/shared/optionen/01040600.xhp" name="Writer - Formatting Aids">%PRODUCTNAME Writer - Formatting Aids</link></emph>, and ensure that the <emph>Hidden paragraphs</emph> check box in the <emph>Display of</emph> area is selected.</paragraph>
+<paragraph id="par_id3157875" role="note" xml-lang="en-US">To enable this feature, choose <switchinline select="sys"><caseinline select="MAC"><item type="menuitem">%PRODUCTNAME - Preferences</item></caseinline><defaultinline><item type="menuitem">Tools - Options</item></defaultinline></switchinline><emph> - </emph><link href="text/shared/optionen/01040600.xhp" name="Writer - Formatting Aids"><emph>%PRODUCTNAME Writer - Formatting Aids</emph></link>, and ensure that the <emph>Hidden paragraphs</emph> check box in the <emph>Display of</emph> area is selected.</paragraph>
 <paragraph id="par_id3154501" role="paragraph" xml-lang="en-US">Use the <link href="text/swriter/01/04090000.xhp" name="field command">field command</link> "Hidden Paragraph" to assign a <link href="text/swriter/01/04090200.xhp" name="condition">condition</link> that must be met to hide a paragraph. If the condition is not met, the paragraph is displayed.</paragraph>
 <paragraph id="par_id3083451" role="paragraph" xml-lang="en-US">When you hide a paragraph, footnotes and frames that are anchored to characters in the paragraph are also hidden.</paragraph>
 </body>
commit f9cb7f4660c039f7bf18bf60f6fb9c77f7e4f54b
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Mon Jan 25 15:26:12 2016 +0100

    switchinline is no valid child of "item" either
    
    sed command used:
    's#\(<item[^>]*>\)\(<switchinline[^>]*><caseinline[^>]*>\)\([^>]*\)\(</caseinline><defaultinline>\)\([^<]*\)\(</defaultinline></switchinline>\)\([^<]*</item>\)#\2\1\3</item>\4\1\5</item>\6\1\7#g'
    
    Change-Id: I386bb105520449b3a9dbb27d9508499af0a21cc9

diff --git a/source/text/scalc/01/06130000.xhp b/source/text/scalc/01/06130000.xhp
index 126e065..89a4a8e 100644
--- a/source/text/scalc/01/06130000.xhp
+++ b/source/text/scalc/01/06130000.xhp
@@ -52,10 +52,10 @@
 <paragraph role="paragraph" id="par_idN10665" xml-lang="en-US" l10n="NEW">To append text or to edit the completion, press <item type="keycode">F2</item>.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="paragraph" id="par_idN1066D" xml-lang="en-US" l10n="NEW">To view more completions, press <item type="keycode"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab</item> to scroll forward, or <item type="keycode"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+Tab</item> to scroll backward.</paragraph>
+<paragraph role="paragraph" id="par_idN1066D" xml-lang="en-US" l10n="NEW">To view more completions, press <switchinline select="sys"><caseinline select="MAC"><item type="keycode">Command</item></caseinline><defaultinline><item type="keycode">Ctrl</item></defaultinline></switchinline><item type="keycode">+Tab</item> to scroll forward, or <switchinline select="sys"><caseinline select="MAC"><item type="keycode">Command</item></caseinline><defaultinline><item type="keycode">Ctrl</item></defaultinline></switchinline><item type="keycode">+Shift+Tab</item> to scroll backward.</paragraph>
 </listitem>
 <listitem>
-	<paragraph role="paragraph" id="par_idN10679" xml-lang="en-US" l10n="NEW">To see a list of all available AutoInput text items for the current column, press <item type="keycode"><switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+Down Arrow</item>.</paragraph>
+	<paragraph role="paragraph" id="par_idN10679" xml-lang="en-US" l10n="NEW">To see a list of all available AutoInput text items for the current column, press <switchinline select="sys"><caseinline select="MAC"><item type="keycode">Option</item></caseinline><defaultinline><item type="keycode">Alt</item></defaultinline></switchinline><item type="keycode">+Down Arrow</item>.</paragraph>
 </listitem>
 </list>
 <paragraph role="paragraph" id="par_id3150439" xml-lang="en-US" l10n="U" oldref="3">When typing formulas using characters that match previous entries, a Help tip will appear listing the last ten functions used from <emph>Function Wizard</emph>, from all defined range names, from all database range names, and from the content of all label ranges.</paragraph>
diff --git a/source/text/scalc/01/func_date.xhp b/source/text/scalc/01/func_date.xhp
index 6cce81f..d56396f 100644
--- a/source/text/scalc/01/func_date.xhp
+++ b/source/text/scalc/01/func_date.xhp
@@ -38,7 +38,7 @@
 <paragraph role="code" id="par_id3150474" xml-lang="en-US" l10n="U" oldref="6">DATE(Year; Month; Day)</paragraph>
 <paragraph role="paragraph" id="par_id3152815" xml-lang="en-US" l10n="CHG" oldref="7">
 <emph>Year</emph> is an integer between 1583 and 9957 or between 0 and 99.</paragraph>
-<paragraph role="paragraph" id="par_id3153222" xml-lang="en-US" l10n="U" oldref="174">In <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - General </item>you can set from which year a two-digit number entry is recognized as 20xx.</paragraph>
+<paragraph role="paragraph" id="par_id3153222" xml-lang="en-US" l10n="U" oldref="174">In <switchinline select="sys"><caseinline select="MAC"><item type="menuitem">%PRODUCTNAME - Preferences</item></caseinline><defaultinline><item type="menuitem">Tools - Options</item></defaultinline></switchinline><item type="menuitem"> - $[officename] - General </item>you can set from which year a two-digit number entry is recognized as 20xx.</paragraph>
 <paragraph role="paragraph" id="par_id3155817" xml-lang="en-US" l10n="CHG" oldref="8">
 <emph>Month</emph> is an integer indicating the month.</paragraph>
 <paragraph role="paragraph" id="par_id3153183" xml-lang="en-US" l10n="CHG" oldref="9">
diff --git a/source/text/scalc/guide/calc_series.xhp b/source/text/scalc/guide/calc_series.xhp
index 9551d83..b88f2d9 100644
--- a/source/text/scalc/guide/calc_series.xhp
+++ b/source/text/scalc/guide/calc_series.xhp
@@ -58,7 +58,7 @@
       <paragraph xml-lang="en-US" id="par_idN106EE" role="tip" l10n="NEW">To quickly create a list of consecutive days, enter <item type="literal">Monday</item> in a cell, and drag the fill handle.</paragraph>
       <paragraph xml-lang="en-US" id="par_id9720145" role="paragraph" l10n="NEW">Hold down <switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline> if you do not want to fill the cells with different values.</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3154490" role="note" l10n="CHG" oldref="18">If you select two or more adjacent cells that contain different numbers, and drag, the remaining cells are filled with the arithmetic pattern that is recognized in the numbers. The AutoFill function also recognizes customized lists that are defined under <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - Sort Lists</item>.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154490" role="note" l10n="CHG" oldref="18">If you select two or more adjacent cells that contain different numbers, and drag, the remaining cells are filled with the arithmetic pattern that is recognized in the numbers. The AutoFill function also recognizes customized lists that are defined under <switchinline select="sys"><caseinline select="MAC"><item type="menuitem">%PRODUCTNAME - Preferences</item></caseinline><defaultinline><item type="menuitem">Tools - Options</item></defaultinline></switchinline><item type="menuitem"> - %PRODUCTNAME Calc - Sort Lists</item>.</paragraph>
       <paragraph xml-lang="en-US" id="par_idN10737" role="tip" l10n="NEW">You can double-click the fill handle to automatically fill all empty columns of the current data block. For example, first enter Jan into A1 and drag the fill handle down to A12 to get the twelve months in the first column. Now enter some values into B1 and C1. Select those two cells, and double-click the fill handle. This fills automatically the data block B1:C12.</paragraph>
       <paragraph xml-lang="en-US" id="par_idN10713" role="heading" level="2" l10n="NEW">Using a Defined Series</paragraph>
       <list type="ordered">
diff --git a/source/text/scalc/guide/currency_format.xhp b/source/text/scalc/guide/currency_format.xhp
index 52e31ce..687011f 100644
--- a/source/text/scalc/guide/currency_format.xhp
+++ b/source/text/scalc/guide/currency_format.xhp
@@ -40,7 +40,7 @@ oldref="46"><variable id="currency_format"><link href="text/scalc/guide/currency
 </variable></paragraph>
 <paragraph xml-lang="en-US" id="par_id3153968" role="paragraph" l10n="CHG" oldref="47">In <item type="productname">%PRODUCTNAME</item> Calc you can give numbers any currency format. When you click the <item type="menuitem">Currency</item> icon 
 <image id="img_id3150791" src="cmd/sc_currencyfield.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3150791">Icon</alt>
-</image> in the <item type="menuitem">Formatting</item> bar to format a number, the cell is given the default currency format set under <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Languages</item>.</paragraph>
+</image> in the <item type="menuitem">Formatting</item> bar to format a number, the cell is given the default currency format set under <switchinline select="sys"><caseinline select="MAC"><item type="menuitem">%PRODUCTNAME - Preferences</item></caseinline><defaultinline><item type="menuitem">Tools - Options</item></defaultinline></switchinline><item type="menuitem"> - Language Settings - Languages</item>.</paragraph>
 <paragraph xml-lang="en-US" id="par_id3150010" role="note" l10n="CHG" oldref="48">Exchanging of <item type="productname">%PRODUCTNAME</item> Calc documents can lead to misunderstandings, if your <item type="productname">%PRODUCTNAME</item> Calc document is loaded by a user who uses a different default currency format.</paragraph>
 <paragraph xml-lang="en-US" id="par_id3156442" role="paragraph" l10n="U" oldref="52">In <item type="productname">%PRODUCTNAME</item> Calc you can define that a number that you have formatted as "1,234.50 €", still remains in euros in another country and does not become dollars.</paragraph>
 <paragraph xml-lang="en-US" id="par_id3151075" role="paragraph" l10n="CHG" oldref="49">You can change the currency format in the <item type="menuitem">Format Cells</item> dialog (choose <item type="menuitem">Format - Cells - Numbers</item> tab) by two country settings. In the <item type="menuitem">Language</item> combo box select the basic setting for decimal and thousands separators. In the <item type="menuitem">Format</item> list box you can select the currency symbol and its position.</paragraph>
diff --git a/source/text/scalc/guide/scenario.xhp b/source/text/scalc/guide/scenario.xhp
index 12b3504..811d6cd 100644
--- a/source/text/scalc/guide/scenario.xhp
+++ b/source/text/scalc/guide/scenario.xhp
@@ -39,7 +39,7 @@
 <paragraph role="paragraph" id="par_id3154704" xml-lang="en-US" l10n="U" oldref="16">To create a scenario, select all the cells that provide the data for the scenario. </paragraph>
 <list type="ordered">
 <listitem>
-<paragraph role="listitem" id="par_id3154020" xml-lang="en-US" l10n="CHG" oldref="17">Select the cells that contain the values that will change between scenarios. To select multiple cells, hold down the <item type="keycode"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline></item> key as you click each cell.</paragraph>
+<paragraph role="listitem" id="par_id3154020" xml-lang="en-US" l10n="CHG" oldref="17">Select the cells that contain the values that will change between scenarios. To select multiple cells, hold down the <switchinline select="sys"><caseinline select="MAC"><item type="keycode">Command</item></caseinline><defaultinline><item type="keycode">Ctrl</item></defaultinline></switchinline><item type="keycode"></item> key as you click each cell.</paragraph>
 </listitem>
 <listitem>
 <paragraph role="listitem" id="par_id3150364" xml-lang="en-US" l10n="U" oldref="18">Choose <emph>Tools - Scenarios</emph>. The <emph>Create Scenario</emph> dialog appears.</paragraph>
diff --git a/source/text/schart/01/04020000.xhp b/source/text/schart/01/04020000.xhp
index f1fd1b3..b8ebeae 100644
--- a/source/text/schart/01/04020000.xhp
+++ b/source/text/schart/01/04020000.xhp
@@ -77,7 +77,7 @@
 <paragraph role="heading" id="hd_id3152871" xml-lang="en-US" level="3" l10n="U" oldref="14">Bottom</paragraph>
 <paragraph role="paragraph" id="par_id3153249" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="modules/schart/ui/tp_LegendPosition/bottom">Positions the legend at the bottom of the chart.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id1106200812072645" xml-lang="en-US" level="2" l10n="NEW">Text Orientation</paragraph>
-<paragraph role="paragraph" id="par_id1106200812072653" xml-lang="en-US" l10n="NEW">This feature is only available if complex text layout support is enabled in <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language settings - Languages</item>.</paragraph>
+<paragraph role="paragraph" id="par_id1106200812072653" xml-lang="en-US" l10n="NEW">This feature is only available if complex text layout support is enabled in <switchinline select="sys"><caseinline select="MAC"><item type="menuitem">%PRODUCTNAME - Preferences</item></caseinline><defaultinline><item type="menuitem">Tools - Options</item></defaultinline></switchinline><item type="menuitem"> - Language settings - Languages</item>.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/modules/schart/ui/tp_LegendPosition/LB_LEGEND_TEXTDIR" id="bm_id1106200812070599" localize="false"/>
 <paragraph role="heading" id="hd_id1106200812112444" xml-lang="en-US" level="3" l10n="NEW">Text Direction</paragraph>
 <paragraph role="paragraph" id="par_id1106200812112530" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specify the text direction for a paragraph that uses complex text layout (CTL). This feature is only available if complex text layout support is enabled.</ahelp></paragraph>
diff --git a/source/text/schart/01/type_xy.xhp b/source/text/schart/01/type_xy.xhp
index a8a4589..396abea 100644
--- a/source/text/schart/01/type_xy.xhp
+++ b/source/text/schart/01/type_xy.xhp
@@ -68,7 +68,7 @@
 <paragraph role="paragraph" id="par_id0805200810492449" xml-lang="en-US" l10n="NEW">For 2D charts, you can choose <item type="menuitem">Insert - Y Error Bars</item> to enable the display of error bars.</paragraph>
 <paragraph role="paragraph" id="par_id6221198" xml-lang="en-US" l10n="NEW">You can enable the display of mean value lines and trend lines using commands on the Insert menu.</paragraph>
 <paragraph role="heading" id="hd_id1393475" xml-lang="en-US" level="3" l10n="NEW">Points only</paragraph>
-<paragraph role="paragraph" id="par_id6571550" xml-lang="en-US" l10n="NEW">Each data point is shown by an icon. %PRODUCTNAME uses default icons with different forms and colors for each data series. The default colors are set in <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Charts - Default Colors</item>. </paragraph>
+<paragraph role="paragraph" id="par_id6571550" xml-lang="en-US" l10n="NEW">Each data point is shown by an icon. %PRODUCTNAME uses default icons with different forms and colors for each data series. The default colors are set in <switchinline select="sys"><caseinline select="MAC"><item type="menuitem">%PRODUCTNAME - Preferences</item></caseinline><defaultinline><item type="menuitem">Tools - Options</item></defaultinline></switchinline><item type="menuitem"> - Charts - Default Colors</item>. </paragraph>
 <paragraph role="heading" id="hd_id5376140" xml-lang="en-US" level="3" l10n="NEW">Lines Only</paragraph>
 <paragraph role="paragraph" id="par_id4408093" xml-lang="en-US" l10n="NEW">This variant draws straight lines from one data point to the next. The data points are not shown by icons. </paragraph>
 <paragraph role="paragraph" id="par_id7261268" xml-lang="en-US" l10n="NEW">The drawing order is the same as the order in the data series. Mark <emph>Sort by X Values</emph> to draw the lines in the order of the x values. This sorting applies only to the chart, not to the data in the table.</paragraph>
diff --git a/source/text/sdraw/guide/keyboard.xhp b/source/text/sdraw/guide/keyboard.xhp
index 74c3889..c341921 100644
--- a/source/text/sdraw/guide/keyboard.xhp
+++ b/source/text/sdraw/guide/keyboard.xhp
@@ -51,18 +51,18 @@
 <paragraph role="paragraph" id="par_idN106CD" xml-lang="en-US" l10n="NEW">If there is an arrow next to the icon, the drawing tool opens a sub toolbar. Press the <item type="keycode">Up</item> or <item type="keycode">Down</item> arrow key to open the sub toolbar, then press the <item type="keycode">Right</item> or <item type="keycode">Left</item> key to select an icon.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="paragraph" id="par_id3147338" xml-lang="en-US" l10n="U" oldref="8">Press <item type="keycode"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter</item>.</paragraph>
+<paragraph role="paragraph" id="par_id3147338" xml-lang="en-US" l10n="U" oldref="8">Press <switchinline select="sys"><caseinline select="MAC"><item type="keycode">Command</item></caseinline><defaultinline><item type="keycode">Ctrl</item></defaultinline></switchinline><item type="keycode">+Enter</item>.</paragraph>
 <paragraph role="paragraph" id="par_id3154705" xml-lang="en-US" l10n="U" oldref="7">The object is created at the center of the current document.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="paragraph" id="par_id3155962" xml-lang="en-US" l10n="U" oldref="6">To return to the document, press <item type="keycode"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F6</item>.</paragraph>
+<paragraph role="paragraph" id="par_id3155962" xml-lang="en-US" l10n="U" oldref="6">To return to the document, press <switchinline select="sys"><caseinline select="MAC"><item type="keycode">Command</item></caseinline><defaultinline><item type="keycode">Ctrl</item></defaultinline></switchinline><item type="keycode">+F6</item>.</paragraph>
 <paragraph role="paragraph" id="par_id3155062" xml-lang="en-US" l10n="U" oldref="5">You can use the arrow keys to position the object where you want. To choose a command from the context menu for the object, press <item type="keycode">Shift+F10</item>.</paragraph>
 </listitem>
 </list>
 <paragraph role="heading" id="hd_id3150306" xml-lang="en-US" level="2" l10n="U" oldref="4">To Select an Object</paragraph>
 <list type="ordered">
 <listitem>
-<paragraph role="listitem" id="par_id3152990" xml-lang="en-US" l10n="U" oldref="3">Press <item type="keycode"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F6</item> to enter the document.</paragraph>
+<paragraph role="listitem" id="par_id3152990" xml-lang="en-US" l10n="U" oldref="3">Press <switchinline select="sys"><caseinline select="MAC"><item type="keycode">Command</item></caseinline><defaultinline><item type="keycode">Ctrl</item></defaultinline></switchinline><item type="keycode">+F6</item> to enter the document.</paragraph>
 </listitem>
 <listitem>
 <paragraph role="listitem" id="par_id3145587" xml-lang="en-US" l10n="U" oldref="2">Press <item type="keycode">Tab</item> until you reach the object you want to select.</paragraph>
diff --git a/source/text/shared/01/04050000.xhp b/source/text/shared/01/04050000.xhp
index cbb0f10..6229a04 100644
--- a/source/text/shared/01/04050000.xhp
+++ b/source/text/shared/01/04050000.xhp
@@ -51,7 +51,7 @@
       If a text range is selected, the comment is attached to the text range.</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"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %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="par_id6718649" role="paragraph" l10n="NEW">The comments by different authors get different colors. Choose <switchinline select="sys"><caseinline select="MAC"><item type="menuitem">%PRODUCTNAME - Preferences</item></caseinline><defaultinline><item type="menuitem">Tools - Options</item></defaultinline></switchinline><item type="menuitem"> - %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>
diff --git a/source/text/shared/01/webhtml.xhp b/source/text/shared/01/webhtml.xhp
index cbe78de..c21681b 100644
--- a/source/text/shared/01/webhtml.xhp
+++ b/source/text/shared/01/webhtml.xhp
@@ -38,7 +38,7 @@
 <section id="howtoget">
   <embed href="text/shared/00/00000401.xhp#webhtml"/>
 </section>
-<paragraph role="paragraph" id="par_id9186681" xml-lang="en-US" l10n="NEW">The HTML formatted copy is written to the temporary files folder that you can select in <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - Paths</item>. When you quit %PRODUCTNAME, the HTML file will be deleted.</paragraph>
-<paragraph role="paragraph" id="par_id5871150" xml-lang="en-US" l10n="NEW">You can set the HTML export filter options by choosing <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - HTML Compatibility</item>.</paragraph>
+<paragraph role="paragraph" id="par_id9186681" xml-lang="en-US" l10n="NEW">The HTML formatted copy is written to the temporary files folder that you can select in <switchinline select="sys"><caseinline select="MAC"><item type="menuitem">%PRODUCTNAME - Preferences</item></caseinline><defaultinline><item type="menuitem">Tools - Options</item></defaultinline></switchinline><item type="menuitem"> - %PRODUCTNAME - Paths</item>. When you quit %PRODUCTNAME, the HTML file will be deleted.</paragraph>
+<paragraph role="paragraph" id="par_id5871150" xml-lang="en-US" l10n="NEW">You can set the HTML export filter options by choosing <switchinline select="sys"><caseinline select="MAC"><item type="menuitem">%PRODUCTNAME - Preferences</item></caseinline><defaultinline><item type="menuitem">Tools - Options</item></defaultinline></switchinline><item type="menuitem"> - Load/Save - HTML Compatibility</item>.</paragraph>
 </body>
 </helpdocument>
diff --git a/source/text/shared/02/20050000.xhp b/source/text/shared/02/20050000.xhp
index 58fb755..e26709c 100644
--- a/source/text/shared/02/20050000.xhp
+++ b/source/text/shared/02/20050000.xhp
@@ -82,7 +82,7 @@
 </tablerow>
 <tablerow>
 <tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id6971037" xml-lang="en-US" l10n="NEW">Block selection (<item type="keycode"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+F8</item>)</paragraph>
+<paragraph role="paragraph" id="par_id6971037" xml-lang="en-US" l10n="NEW">Block selection (<switchinline select="sys"><caseinline select="MAC"><item type="keycode">Command</item></caseinline><defaultinline><item type="keycode">Ctrl</item></defaultinline></switchinline><item type="keycode">+Shift+F8</item>)</paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id5258644" xml-lang="en-US" l10n="NEW">A block of text can be selected.</paragraph>
diff --git a/source/text/shared/guide/autohide.xhp b/source/text/shared/guide/autohide.xhp
index a6455e1..cca433a 100644
--- a/source/text/shared/guide/autohide.xhp
+++ b/source/text/shared/guide/autohide.xhp
@@ -50,7 +50,7 @@
 <paragraph role="listitem" id="par_id3150503" xml-lang="en-US" l10n="CHG" oldref="67">Drag the window by its title bar to the side, or</paragraph>
 </listitem>
 <listitem>
-<paragraph role="listitem" id="par_id3150275" xml-lang="en-US" l10n="CHG" oldref="68">Double-click inside a vacant area of the window while holding down the <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> key. In the Styles and Formatting window, double-click a gray part of the window next to the icons while holding down the <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> key. Alternatively, press <item type="keycode"><switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+F10</item>.</paragraph>
+<paragraph role="listitem" id="par_id3150275" xml-lang="en-US" l10n="CHG" oldref="68">Double-click inside a vacant area of the window while holding down the <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> key. In the Styles and Formatting window, double-click a gray part of the window next to the icons while holding down the <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> key. Alternatively, press <switchinline select="sys"><caseinline select="MAC"><item type="keycode">Command</item></caseinline><defaultinline><item type="keycode">Ctrl</item></defaultinline></switchinline><item type="keycode">+Shift+F10</item>.</paragraph>
 </listitem>
 </list>
 <paragraph role="paragraph" id="par_id3147335" xml-lang="en-US" l10n="U" oldref="69">These methods can also be used to undock a currently docked window.</paragraph>
diff --git a/source/text/shared/guide/language_select.xhp b/source/text/shared/guide/language_select.xhp
index dd97f89..ee157a5 100644
--- a/source/text/shared/guide/language_select.xhp
+++ b/source/text/shared/guide/language_select.xhp
@@ -137,7 +137,7 @@
       <paragraph xml-lang="en-US" id="par_id3912778" role="paragraph" l10n="CHG">Most users download the American English version, which gives you English menu commands and English application help. If you want another language for the menus (and for the application help, if available in that language), change the UI language as follows.</paragraph>
       <list type="ordered">
          <listitem>
-            <paragraph xml-lang="en-US" id="par_id3163853" role="paragraph" l10n="NEW">Choose <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Languages</item>.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3163853" role="paragraph" l10n="NEW">Choose <switchinline select="sys"><caseinline select="MAC"><item type="menuitem">%PRODUCTNAME - Preferences</item></caseinline><defaultinline><item type="menuitem">Tools - Options</item></defaultinline></switchinline><item type="menuitem"> - Language Settings - Languages</item>.</paragraph>
          </listitem>
          <listitem>
             <paragraph xml-lang="en-US" id="par_id121158" role="paragraph" l10n="NEW">Select another UI language in the "User interface" listbox.</paragraph>
diff --git a/source/text/shared/guide/ms_import_export_limitations.xhp b/source/text/shared/guide/ms_import_export_limitations.xhp
index 6894052..5d2b1fd 100644
--- a/source/text/shared/guide/ms_import_export_limitations.xhp
+++ b/source/text/shared/guide/ms_import_export_limitations.xhp
@@ -33,7 +33,7 @@
 <paragraph role="paragraph" id="par_id3149760" xml-lang="en-US" l10n="E" oldref="32" localize="false"/>
 <paragraph role="heading" id="hd_id3152425" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="about"><link href="text/shared/guide/ms_import_export_limitations.xhp" name="About Converting Microsoft Office Documents">About Converting Microsoft Office Documents</link></variable></paragraph>
 <paragraph role="paragraph" id="par_id3147834" xml-lang="en-US" l10n="U" oldref="2">$[officename] can automatically open Microsoft Office 97/2000/XP documents. However, some layout features and formatting attributes in more complex Microsoft Office documents are handled differently in $[officename] or are unsupported. As a result, converted files require some degree of manual reformatting. The amount of reformatting that can be expected is proportional to the complexity of the structure and formatting of the source document. $[officename] cannot run Visual Basic Scripts, but can load them for you to analyze.</paragraph>
-<paragraph role="note" id="par_id0804200804174819" xml-lang="en-US" l10n="NEW">The most recent versions of %PRODUCTNAME can load and save the Microsoft Office Open XML document formats with the extensions docx, xlsx, and pptx. The same versions can also run some Excel Visual Basic scripts, if you enable this feature at <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - VBA Properties</item>.</paragraph>
+<paragraph role="note" id="par_id0804200804174819" xml-lang="en-US" l10n="NEW">The most recent versions of %PRODUCTNAME can load and save the Microsoft Office Open XML document formats with the extensions docx, xlsx, and pptx. The same versions can also run some Excel Visual Basic scripts, if you enable this feature at <switchinline select="sys"><caseinline select="MAC"><item type="menuitem">%PRODUCTNAME - Preferences</item></caseinline><defaultinline><item type="menuitem">Tools - Options</item></defaultinline></switchinline><item type="menuitem"> - Load/Save - VBA Properties</item>.</paragraph>
 <paragraph role="paragraph" id="par_id3155934" xml-lang="en-US" l10n="U" oldref="3">The following lists provide a general overview of Microsoft Office features that may cause conversion challenges. These will not affect your ability to use or work with the content of the converted document.</paragraph>
 <paragraph role="heading" id="hd_id3155892" xml-lang="en-US" level="2" l10n="U" oldref="6">Microsoft Word</paragraph>
 <list type="ordered">
diff --git a/source/text/shared/guide/ms_user.xhp b/source/text/shared/guide/ms_user.xhp
index 54790ca..61237b7 100644
--- a/source/text/shared/guide/ms_user.xhp
+++ b/source/text/shared/guide/ms_user.xhp
@@ -111,7 +111,7 @@
 </list>
 <paragraph role="heading" id="hd_id3154319" xml-lang="en-US" level="2" l10n="U" oldref="23">Macros in Microsoft Office and $[officename]</paragraph>
 <paragraph role="paragraph" id="par_id3154921" xml-lang="en-US" l10n="U" oldref="24">With a few exceptions, Microsoft Office and $[officename] cannot run the same macro code. Microsoft Office uses VBA (Visual Basic for Applications) code, and $[officename] uses Basic code based on the $[officename] API (Application Program Interface) environment. Although the programming language is the same, the objects and methods are different.</paragraph>
-<paragraph role="note" id="par_id0804200804173539" xml-lang="en-US" l10n="NEW">The most recent versions of %PRODUCTNAME can run some Excel Visual Basic scripts if you enable this feature at <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - VBA Properties</item>.</paragraph>
+<paragraph role="note" id="par_id0804200804173539" xml-lang="en-US" l10n="NEW">The most recent versions of %PRODUCTNAME can run some Excel Visual Basic scripts if you enable this feature at <switchinline select="sys"><caseinline select="MAC"><item type="menuitem">%PRODUCTNAME - Preferences</item></caseinline><defaultinline><item type="menuitem">Tools - Options</item></defaultinline></switchinline><item type="menuitem"> - Load/Save - VBA Properties</item>.</paragraph>
 <paragraph role="paragraph" id="par_id3152577" xml-lang="en-US" l10n="U" oldref="25">If you use macros in one of the applications and want to use the same functionality in the other application, you must edit the macros. $[officename] can load the macros that are contained within Microsoft Office files and you can then view and edit the macro code in the $[officename] <link href="text/shared/main0600.xhp" name="Basic IDE">Basic IDE</link> editor.</paragraph>
 <paragraph role="heading" id="hd_id3152596" xml-lang="en-US" level="3" l10n="U" oldref="26">You can choose to preserve or delete VBA macros</paragraph>
 <paragraph role="paragraph" id="par_id3153144" xml-lang="en-US" l10n="U" oldref="27">Open a Microsoft Office document that contains VBA macro code. Change only the normal contents (text, cells, graphics), and do not edit the macros. Save the document as a Microsoft Office file type. Open the file in Microsoft Office, and the VBA macros will run as before.</paragraph>
diff --git a/source/text/shared/optionen/online_update.xhp b/source/text/shared/optionen/online_update.xhp
index c6fa70a..e343a77 100644
--- a/source/text/shared/optionen/online_update.xhp
+++ b/source/text/shared/optionen/online_update.xhp
@@ -44,7 +44,7 @@
       </section>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/optonlineupdatepage/autocheck" id="bm_id877101" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id2189397" role="heading" level="2" l10n="NEW">Check for updates automatically</paragraph>
-      <paragraph xml-lang="en-US" id="par_id7523728" role="paragraph" l10n="NEW"><ahelp hid=".">Mark to check for online updates periodically, then select the time interval how often %PRODUCTNAME will check for online updates.</ahelp> %PRODUCTNAME will check once a day, week, or month, as soon as a working Internet connection is detected. If you connect to the Internet by a proxy server, set the proxy on <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Internet - Proxy</item>.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id7523728" role="paragraph" l10n="NEW"><ahelp hid=".">Mark to check for online updates periodically, then select the time interval how often %PRODUCTNAME will check for online updates.</ahelp> %PRODUCTNAME will check once a day, week, or month, as soon as a working Internet connection is detected. If you connect to the Internet by a proxy server, set the proxy on <switchinline select="sys"><caseinline select="MAC"><item type="menuitem">%PRODUCTNAME - Preferences</item></caseinline><defaultinline><item type="menuitem">Tools - Options</item></defaultinline></switchinline><item type="menuitem"> - Internet - Proxy</item>.</paragraph>
       <paragraph xml-lang="en-US" id="par_id8994109" role="paragraph" l10n="NEW">When an update is available, an icon in the menu bar displays some explaining text. Click the icon to proceed.</paragraph>
       <paragraph xml-lang="en-US" id="par_id476699" role="paragraph" l10n="NEW">If you disable the check, the icon is removed from the menu bar.</paragraph>
       <paragraph xml-lang="en-US" id="par_id4057130" role="note" l10n="CHG">Online Update is a module that can be selected or deselected to be installed. Choose the customized installation in the Setup of %PRODUCTNAME.</paragraph>
diff --git a/source/text/simpress/guide/keyboard.xhp b/source/text/simpress/guide/keyboard.xhp
index addb7a3..bef56e7 100644
--- a/source/text/simpress/guide/keyboard.xhp
+++ b/source/text/simpress/guide/keyboard.xhp
@@ -48,11 +48,11 @@
 </paragraph>
 <paragraph role="heading" id="hd_id3153035" xml-lang="en-US" level="3" l10n="U" oldref="19">Advance to the next slide without playing object animation effects</paragraph>
 <paragraph role="paragraph" id="par_id3155263" xml-lang="en-US" l10n="CHG" oldref="20">
-<item type="keycode"><switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+PageDown</item>
+<switchinline select="sys"><caseinline select="MAC"><item type="keycode">Option</item></caseinline><defaultinline><item type="keycode">Alt</item></defaultinline></switchinline><item type="keycode">+PageDown</item>
 </paragraph>
 <paragraph role="heading" id="hd_id3154558" xml-lang="en-US" level="3" l10n="U" oldref="3">Return to previous slide</paragraph>
 <paragraph role="paragraph" id="par_id3145590" xml-lang="en-US" l10n="CHG" oldref="2">
-<item type="keycode"><switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+PageUp</item>
+<switchinline select="sys"><caseinline select="MAC"><item type="keycode">Option</item></caseinline><defaultinline><item type="keycode">Alt</item></defaultinline></switchinline><item type="keycode">+PageUp</item>
 </paragraph>
 <paragraph role="heading" id="hd_id3153003" xml-lang="en-US" level="3" l10n="U" oldref="12">Go to a specific slide</paragraph>
 <paragraph role="paragraph" id="par_id3154501" xml-lang="en-US" l10n="U" oldref="13">Type the page number of the slide, and then press <item type="keycode">Enter</item>.</paragraph>
diff --git a/source/text/swriter/guide/hyphen_prevent.xhp b/source/text/swriter/guide/hyphen_prevent.xhp
index cfc536c..1106757 100644
--- a/source/text/swriter/guide/hyphen_prevent.xhp
+++ b/source/text/swriter/guide/hyphen_prevent.xhp
@@ -55,7 +55,7 @@
       <paragraph xml-lang="en-US" id="par_id0302200910262761" role="paragraph" l10n="NEW">Some words contain special characters that %PRODUCTNAME treats as a hyphen. If you do not want such words to be hyphenated, you can insert a special code that prevents hyphenation at the position where the special code is inserted. Proceed as follows:</paragraph>
       <list type="ordered">
          <listitem>
-            <paragraph xml-lang="en-US" id="par_id0302200910262850" role="paragraph" l10n="NEW">Enable the special features of complex text layout (CTL) languages: Choose <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Languages</item> and check <emph>Enabled for complex text layout (CTL)</emph>. Click OK.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id0302200910262850" role="paragraph" l10n="NEW">Enable the special features of complex text layout (CTL) languages: Choose <switchinline select="sys"><caseinline select="MAC"><item type="menuitem">%PRODUCTNAME - Preferences</item></caseinline><defaultinline><item type="menuitem">Tools - Options</item></defaultinline></switchinline><item type="menuitem"> - Language Settings - Languages</item> and check <emph>Enabled for complex text layout (CTL)</emph>. Click OK.</paragraph>
          </listitem>
          <listitem>
             <paragraph xml-lang="en-US" id="par_id0302200910262837" role="paragraph" l10n="NEW">Position the cursor at the place where no hyphenation should occur.</paragraph>
diff --git a/source/text/swriter/guide/indenting.xhp b/source/text/swriter/guide/indenting.xhp
index 499ed03..a79d9b5 100644
--- a/source/text/swriter/guide/indenting.xhp
+++ b/source/text/swriter/guide/indenting.xhp
@@ -37,7 +37,7 @@
 </bookmark><comment>mw made indents a two level entry, changed "paragraphs;"  and copied "changing;indents" from writer guide "ruler.xhp"</comment>
 <paragraph xml-lang="en-US" id="hd_id129398" role="heading" level="1" l10n="NEW"><variable id="indenting"><link href="text/swriter/guide/indenting.xhp">Indenting Paragraphs</link>
 </variable></paragraph><comment>see i66307</comment>
-<paragraph xml-lang="en-US" id="par_id5589159" role="note" l10n="NEW">To change the measurement units, choose <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - General</item>, and then select a new measurement unit in the Settings area. </paragraph>
+<paragraph xml-lang="en-US" id="par_id5589159" role="note" l10n="NEW">To change the measurement units, choose <switchinline select="sys"><caseinline select="MAC"><item type="menuitem">%PRODUCTNAME - Preferences</item></caseinline><defaultinline><item type="menuitem">Tools - Options</item></defaultinline></switchinline><item type="menuitem"> - %PRODUCTNAME Writer - General</item>, and then select a new measurement unit in the Settings area. </paragraph>
       <paragraph xml-lang="en-US" id="par_id9936216" role="paragraph" l10n="NEW">You can change the indents for the current paragraph, or for all selected paragraphs, or for a Paragraph Style.</paragraph>
       <paragraph xml-lang="en-US" id="par_id7953123" role="tip" l10n="NEW">You can also <link href="text/swriter/guide/ruler.xhp" name="ruler">set indents using the ruler</link>. To display the ruler, choose <item type="menuitem">View - Ruler</item>.</paragraph>
       <list type="unordered">
diff --git a/source/text/swriter/guide/indices_edit.xhp b/source/text/swriter/guide/indices_edit.xhp
index 3a3687a..8f7a8ab 100644
--- a/source/text/swriter/guide/indices_edit.xhp
+++ b/source/text/swriter/guide/indices_edit.xhp
@@ -39,7 +39,7 @@
       <list type="ordered">
          <listitem>
             <paragraph xml-lang="en-US" id="par_id3155856" role="listitem" l10n="U" oldref="57">Place the cursor in the index or table of contents.</paragraph>
-            <paragraph xml-lang="en-US" id="par_id3155871" role="listitem" l10n="U" oldref="59">If you cannot place your cursor in the index or table of contents, choose <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - Formatting Aids</item>, and then select
+            <paragraph xml-lang="en-US" id="par_id3155871" role="listitem" l10n="U" oldref="59">If you cannot place your cursor in the index or table of contents, choose <switchinline select="sys"><caseinline select="MAC"><item type="menuitem">%PRODUCTNAME - Preferences</item></caseinline><defaultinline><item type="menuitem">Tools - Options</item></defaultinline></switchinline><item type="menuitem"> - %PRODUCTNAME Writer - Formatting Aids</item>, and then select
                <item type="menuitem">Enable</item> in the
                <item type="menuitem">Cursor in protected areas</item> section.</paragraph>
          </listitem>
diff --git a/source/text/swriter/guide/insert_beforetable.xhp b/source/text/swriter/guide/insert_beforetable.xhp
index 175f077..0334bf2 100644
--- a/source/text/swriter/guide/insert_beforetable.xhp
+++ b/source/text/swriter/guide/insert_beforetable.xhp
@@ -36,7 +36,7 @@
 </bookmark>
 <paragraph role="heading" id="hd_id3149688" xml-lang="en-US" level="1" l10n="U" oldref="54"><variable id="insert_beforetable"><link href="text/swriter/guide/insert_beforetable.xhp" name="Inserting Text Before a Table at the Top of Page">Inserting Text Before a Table at the Top of Page</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3155923" xml-lang="en-US" l10n="CHG" oldref="55">If you want to insert text before a table that is at the top of a page, click in the first cell of the table, in front of any contents of that cell, and then press <item type="keycode">Enter</item> or <item type="keycode"><switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+Enter</item>.</paragraph>
-<paragraph role="paragraph" id="par_idN10612" xml-lang="en-US" l10n="NEW">To insert text after a table at the end of the document, go to the last cell of the table and press <item type="keycode"><switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>+Enter</item>.</paragraph>
+<paragraph role="paragraph" id="par_id3155923" xml-lang="en-US" l10n="CHG" oldref="55">If you want to insert text before a table that is at the top of a page, click in the first cell of the table, in front of any contents of that cell, and then press <item type="keycode">Enter</item> or <switchinline select="sys"><caseinline select="MAC"><item type="keycode">Option</item></caseinline><defaultinline><item type="keycode">Alt</item></defaultinline></switchinline><item type="keycode">+Enter</item>.</paragraph>
+<paragraph role="paragraph" id="par_idN10612" xml-lang="en-US" l10n="NEW">To insert text after a table at the end of the document, go to the last cell of the table and press <switchinline select="sys"><caseinline select="MAC"><item type="keycode">Option</item></caseinline><defaultinline><item type="keycode">Alt</item></defaultinline></switchinline><item type="keycode">+Enter</item>.</paragraph>
 </body>
 </helpdocument>
diff --git a/source/text/swriter/guide/smarttags.xhp b/source/text/swriter/guide/smarttags.xhp
index 953dc85..439c121 100644
--- a/source/text/swriter/guide/smarttags.xhp
+++ b/source/text/swriter/guide/smarttags.xhp
@@ -48,7 +48,7 @@
          </listitem>
       </list>
       <paragraph xml-lang="en-US" id="hd_id8142338" role="heading" level="2" l10n="NEW">Smart Tags Menu</paragraph>
-      <paragraph xml-lang="en-US" id="par_id1917477" role="paragraph" l10n="NEW">Any text in a Writer document can be marked with a Smart Tag, by default a magenta colored underline. You can change the color in <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - Application Colors</item>.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id1917477" role="paragraph" l10n="NEW">Any text in a Writer document can be marked with a Smart Tag, by default a magenta colored underline. You can change the color in <switchinline select="sys"><caseinline select="MAC"><item type="menuitem">%PRODUCTNAME - Preferences</item></caseinline><defaultinline><item type="menuitem">Tools - Options</item></defaultinline></switchinline><item type="menuitem"> - %PRODUCTNAME - Application Colors</item>.</paragraph>
       <paragraph xml-lang="en-US" id="par_id192266" role="paragraph" l10n="NEW">When you point to a Smart Tag, a tip help informs you to Ctrl-click to open the Smart Tags menu. If you don't use a mouse, position the cursor inside the marked text and open the context menu by Shift+F10.</paragraph>
       <paragraph xml-lang="en-US" id="par_id1998962" role="paragraph" l10n="NEW">In the Smart Tags menu you see the available actions that are defined for this Smart Tag. Choose an option from the menu. The <item type="menuitem">Smart Tags Options</item> command opens the <link href="text/shared/01/06040700.xhp">Smart Tags</link> page of Tools - Autocorrect Options.</paragraph>
       <paragraph xml-lang="en-US" id="hd_id2376476" role="heading" level="2" l10n="NEW">To Enable and Disable Smart Tags</paragraph>
diff --git a/source/text/swriter/guide/tablemode.xhp b/source/text/swriter/guide/tablemode.xhp
index 55525be..721ec37 100644
--- a/source/text/swriter/guide/tablemode.xhp
+++ b/source/text/swriter/guide/tablemode.xhp
@@ -37,7 +37,7 @@
 <paragraph xml-lang="en-US" id="hd_id3155856" role="heading" level="1" l10n="CHG" oldref="7"><variable id="tablemode"><link href="text/swriter/guide/tablemode.xhp" name="Modifying the Behavior of Rows and Columns for Table">Modifying Rows and Columns by Keyboard</link></variable></paragraph>
       <paragraph xml-lang="en-US" id="par_id3149835" role="paragraph" l10n="U" oldref="12">When you insert or delete cells, rows or columns in a table, the <item type="menuitem">Behavior of rows/columns</item> options determine how the neighboring elements are affected. For example, you can only insert new rows and columns into a table with fixed row and column dimensions if space permits.</paragraph>
       <paragraph xml-lang="en-US" id="par_id7344279" role="note" l10n="NEW">Note that these properties are valid only for changes to the column width that are made using the keyboard. Using the mouse, you are free to make any column width changes.<comment>UFI: fixes bugtraq 4971582</comment></paragraph>
-      <paragraph xml-lang="en-US" id="par_id3156110" role="paragraph" l10n="U" oldref="8">To set the <item type="menuitem">Behavior of rows/columns</item> options for tables in text documents, choose <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - Table</item>, or use the <item type="menuitem">Fixed</item>, <item type="menuitem">Fixed/Proportional</item>, and <item type="menuitem">Variable</item> icons on the <item type="menuitem">Table</item> Bar. There are three display modes for tables:</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3156110" role="paragraph" l10n="U" oldref="8">To set the <item type="menuitem">Behavior of rows/columns</item> options for tables in text documents, choose <switchinline select="sys"><caseinline select="MAC"><item type="menuitem">%PRODUCTNAME - Preferences</item></caseinline><defaultinline><item type="menuitem">Tools - Options</item></defaultinline></switchinline><item type="menuitem"> - %PRODUCTNAME Writer - Table</item>, or use the <item type="menuitem">Fixed</item>, <item type="menuitem">Fixed/Proportional</item>, and <item type="menuitem">Variable</item> icons on the <item type="menuitem">Table</item> Bar. There are three display modes for tables:</paragraph>
       <list type="unordered">
          <listitem>
             <paragraph xml-lang="en-US" id="par_id3149638" role="listitem" l10n="U" oldref="9"><emph>Fixed</emph> - changes only affect the adjacent cell, and not the entire table. For example, when you widen a cell, the adjacent cell becomes narrower, but the width of the table remains constant.</paragraph>
commit ac1db7fbf890d5393d5a2132d6bafe13dbc1c7a9
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Mon Jan 25 15:24:01 2016 +0100

    more "switchinline (and link) not being valid child of emph" fixes
    
    Change-Id: I58212c56b4301bb260b3787b1afdffbfc710ca2c

diff --git a/source/text/shared/00/00000021.xhp b/source/text/shared/00/00000021.xhp
index 155d846..18e4c8f 100644
--- a/source/text/shared/00/00000021.xhp
+++ b/source/text/shared/00/00000021.xhp
@@ -232,7 +232,7 @@
       </table>
 <paragraph role="paragraph" id="par_id0514200811525591" xml-lang="en-US" l10n="NEW">In current versions, you can select to save your documents using ODF 1.2 (default) or ODF 1.0/1.1 (for backward compatibility). Choose <item type="menuitem">Tools - Options - Load/Save - General</item> and select the ODF format version.</paragraph>
 <paragraph role="paragraph" id="par_idN107E9" xml-lang="en-US" l10n="CHG">If you want to exchange documents with users that still use OpenOffice.org 1 or StarOffice 7, save the document using the respectively named filter in the <emph>File type</emph> listbox.</paragraph>
-<paragraph role="tip" id="par_id3146907" xml-lang="en-US" l10n="CHG" oldref="1">If you want to define another file format as the default, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010200.xhp" name="Load/Save - General">Load/Save - General</link></emph> to find alternative file formats for each $[officename] document type.</paragraph>
+<paragraph role="tip" id="par_id3146907" xml-lang="en-US" l10n="CHG" oldref="1">If you want to define another file format as the default, choose <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - </emph><link href="text/shared/optionen/01010200.xhp" name="Load/Save - General"><emph>Load/Save - General</emph></link> to find alternative file formats for each $[officename] document type.</paragraph>
 <paragraph role="heading" id="hd_id3150398" xml-lang="en-US" level="2" l10n="U" oldref="28">XML file structure</paragraph>
 <paragraph role="paragraph" id="par_id3149649" xml-lang="en-US" l10n="CHG" oldref="29">Documents in OpenDocument file format are stored as compressed zip archives that contain XML files. To view these XML files, you can open the OpenDocument file with an unzip program. The following files and directories are contained within the OpenDocument files:</paragraph>
 <list type="ordered">
diff --git a/source/text/shared/01/01010201.xhp b/source/text/shared/01/01010201.xhp
index 69c1f6b..21ad612 100644
--- a/source/text/shared/01/01010201.xhp
+++ b/source/text/shared/01/01010201.xhp
@@ -45,7 +45,7 @@
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/cardmediumpage/address" id="bm_id3154682" localize="false"/>
 <paragraph role="heading" id="hd_id3150603" xml-lang="en-US" level="3" l10n="U" oldref="7">Address</paragraph>
 <paragraph role="paragraph" id="par_id3153089" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="modules/swriter/ui/cardmediumpage/address">Creates a label with your return address. Text that is currently in the <emph>Label text</emph> box is overwritten.</ahelp></paragraph>
-<paragraph role="note" id="par_id3155555" xml-lang="en-US" l10n="U" oldref="9">To change your return address, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010100.xhp" name="%PRODUCTNAME">%PRODUCTNAME</link></emph>, and then click on the <emph>User Data</emph> tab.</paragraph>
+<paragraph role="note" id="par_id3155555" xml-lang="en-US" l10n="U" oldref="9">To change your return address, choose <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - </emph><link href="text/shared/optionen/01010100.xhp" name="%PRODUCTNAME"><emph>%PRODUCTNAME</emph></link>, and then click on the <emph>User Data</emph> tab.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/cardmediumpage/database" id="bm_id3153748" localize="false"/>
 <paragraph role="heading" id="hd_id3147557" xml-lang="en-US" level="3" l10n="U" oldref="10">Database</paragraph>
 <paragraph role="paragraph" id="par_id3148620" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="modules/swriter/ui/cardmediumpage/database">Select the database that you want to use as the data source for your label. </ahelp></paragraph>
diff --git a/source/text/shared/01/01020000.xhp b/source/text/shared/01/01020000.xhp
index c9a1238..c3c5689 100644
--- a/source/text/shared/01/01020000.xhp
+++ b/source/text/shared/01/01020000.xhp
@@ -50,7 +50,7 @@
 <section id="howtoget">
 <embed href="text/shared/00/00000401.xhp#oeffnen"/>
 </section>
-<paragraph role="paragraph" id="par_id3149877" xml-lang="en-US" l10n="U" oldref="109">The following sections describe the <item type="productname">%PRODUCTNAME</item> <emph>Open</emph> dialog box. To activate the <item type="productname">%PRODUCTNAME</item> <emph>Open</emph> and <emph>Save</emph> dialog boxes, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010600.xhp" name="%PRODUCTNAME - General">%PRODUCTNAME- General</link></emph>, and then select the <emph>Use %PRODUCTNAME dialogs</emph> in the <emph>Open/Save dialogs</emph> area.</paragraph>
+<paragraph role="paragraph" id="par_id3149877" xml-lang="en-US" l10n="U" oldref="109">The following sections describe the <item type="productname">%PRODUCTNAME</item> <emph>Open</emph> dialog box. To activate the <item type="productname">%PRODUCTNAME</item> <emph>Open</emph> and <emph>Save</emph> dialog boxes, choose <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - </emph><link href="text/shared/optionen/01010600.xhp" name="%PRODUCTNAME - General"><emph>%PRODUCTNAME- General</emph></link>, and then select the <emph>Use %PRODUCTNAME dialogs</emph> in the <emph>Open/Save dialogs</emph> area.</paragraph>
 <paragraph role="note" id="par_id3150713" xml-lang="en-US" l10n="U" oldref="52">If the file that you want to open contains Styles, <link href="text/shared/01/01020000.xhp#vorlagen" name="special rules">special rules</link> apply.</paragraph>
 <embed href="text/shared/01/01070000.xhp#connecttoserver"/>
 <bookmark xml-lang="en-US" branch="hid/SVT_HID_FILEOPEN_LEVELUP" id="bm_id1104770" localize="false"/>
@@ -139,7 +139,7 @@
 </caseinline><defaultinline>in the Documents and Settings folder</defaultinline></switchinline></paragraph>
 </listitem>
 <listitem>
-<paragraph role="listitem" id="par_id3146905" xml-lang="en-US" l10n="U" oldref="122">all template folders as defined in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010300.xhp" name="%PRODUCTNAME - Paths">%PRODUCTNAME - Paths</link></emph></paragraph>
+<paragraph role="listitem" id="par_id3146905" xml-lang="en-US" l10n="U" oldref="122">all template folders as defined in <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - </emph><link href="text/shared/optionen/01010300.xhp" name="%PRODUCTNAME - Paths"><emph>%PRODUCTNAME - Paths</emph></link></paragraph>
 </listitem>
 </list>
 <paragraph role="note" id="par_id7375713" xml-lang="en-US" l10n="NEW">When you use <item type="menuitem">File - Template - Save</item> to save a template, the template will be stored in your user template folder. When you open a document that is based on such a template, the document will be checked for a changed template as decribed below. The template is associated with the document, it may be called a "sticky template".</paragraph>
diff --git a/source/text/shared/01/01070000.xhp b/source/text/shared/01/01070000.xhp
index 0512864..e4ab584 100644
--- a/source/text/shared/01/01070000.xhp
+++ b/source/text/shared/01/01070000.xhp
@@ -41,7 +41,7 @@
 <section id="howtoget">
   <embed href="text/shared/00/00000401.xhp#saveas"/>
 </section>
-<paragraph role="paragraph" id="par_id3155934" xml-lang="en-US" l10n="U" oldref="64">The following sections describe the <emph><item type="productname">%PRODUCTNAME</item> Save as</emph> dialog. To activate the <emph><item type="productname">%PRODUCTNAME</item> Open</emph> and <emph>Save</emph> dialog boxes, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010600.xhp" name="%PRODUCTNAME - General">%PRODUCTNAME- General</link></emph>, and then select the <emph>Use %PRODUCTNAME dialogs</emph> in the <emph>Open/Save dialogs</emph> area.</paragraph>
+<paragraph role="paragraph" id="par_id3155934" xml-lang="en-US" l10n="U" oldref="64">The following sections describe the <emph><item type="productname">%PRODUCTNAME</item> Save as</emph> dialog. To activate the <emph><item type="productname">%PRODUCTNAME</item> Open</emph> and <emph>Save</emph> dialog boxes, choose <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - </emph><link href="text/shared/optionen/01010600.xhp" name="%PRODUCTNAME - General"><emph>%PRODUCTNAME- General</emph></link>, and then select the <emph>Use %PRODUCTNAME dialogs</emph> in the <emph>Open/Save dialogs</emph> area.</paragraph>
 <paragraph role="note" id="par_id3147654" xml-lang="en-US" l10n="U" oldref="59">To save a document as a template, use the command <emph>File - Save As Template</emph>.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/fpicker/ui/explorerfiledialog/connect_to_server" id="bm_id3154381" localize="false"/>
 <section id="connecttoserver">
diff --git a/source/text/shared/01/01070001.xhp b/source/text/shared/01/01070001.xhp
index ec00edf..28e39ae 100644
--- a/source/text/shared/01/01070001.xhp
+++ b/source/text/shared/01/01070001.xhp
@@ -42,7 +42,7 @@
 <section id="howtoget">
   <embed href="text/shared/00/00000401.xhp#export"/>
 </section>
-<paragraph role="paragraph" id="par_id3150710" xml-lang="en-US" l10n="U" oldref="2">The following sections describe the <emph>$[officename] Export</emph> dialog box. To activate the <emph>$[officename] Open</emph> and <emph>Save</emph> dialog boxes, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010600.xhp" name="$[officename] - General">$[officename] - General</link></emph>, and then select the <emph>Use $[officename] dialogs</emph> in the <emph>Open/Save dialogs</emph> area.</paragraph>
+<paragraph role="paragraph" id="par_id3150710" xml-lang="en-US" l10n="U" oldref="2">The following sections describe the <emph>$[officename] Export</emph> dialog box. To activate the <emph>$[officename] Open</emph> and <emph>Save</emph> dialog boxes, choose <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - </emph><link href="text/shared/optionen/01010600.xhp" name="$[officename] - General"><emph>$[officename] - General</emph></link>, and then select the <emph>Use $[officename] dialogs</emph> in the <emph>Open/Save dialogs</emph> area.</paragraph>
 <paragraph role="heading" id="hd_id3150693" xml-lang="en-US" level="2" l10n="U" oldref="4">Up One Level</paragraph>
 <embed href="text/shared/01/01070000.xhp#levelup"/>
 <paragraph role="heading" id="hd_id3153312" xml-lang="en-US" level="2" l10n="U" oldref="5">Create New Directory</paragraph>
diff --git a/source/text/shared/01/05020700.xhp b/source/text/shared/01/05020700.xhp
index ae3c604..1b7951b 100644
--- a/source/text/shared/01/05020700.xhp
+++ b/source/text/shared/01/05020700.xhp
@@ -45,7 +45,7 @@
 <paragraph role="heading" id="hd_id3147571" xml-lang="en-US" level="2" l10n="U" oldref="3">Line change</paragraph>
 <paragraph role="paragraph" id="par_id3147834" xml-lang="en-US" l10n="U" oldref="4">Set the options for line breaks in Asian language documents.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/asiantypography/checkForbidList" id="bm_id3155355" localize="false"/><paragraph role="heading" id="hd_id3145072" xml-lang="en-US" level="3" l10n="U" oldref="9">Apply list of forbidden characters to the beginning and end of line</paragraph>
-<paragraph role="paragraph" id="par_id3153683" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="cui/ui/asiantypography/checkForbidList">Prevents the characters in the list from starting or ending a line. The characters are relocated to either the previous or the next line.</ahelp> To edit the list of restricted characters, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - <link href="text/shared/optionen/01150100.xhp" name="Asian Layout">Asian Layout</link></emph>.</paragraph>
+<paragraph role="paragraph" id="par_id3153683" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="cui/ui/asiantypography/checkForbidList">Prevents the characters in the list from starting or ending a line. The characters are relocated to either the previous or the next line.</ahelp> To edit the list of restricted characters, choose <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - Language Settings - </emph><link href="text/shared/optionen/01150100.xhp" name="Asian Layout"><emph>Asian Layout</emph></link>.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/asiantypography/checkHangPunct" id="bm_id3156410" localize="false"/><paragraph role="heading" id="hd_id3149751" xml-lang="en-US" level="3" l10n="U" oldref="5">Allow hanging punctuation</paragraph>
 <paragraph role="paragraph" id="par_id3149096" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="cui/ui/asiantypography/checkHangPunct">Prevents commas and periods from breaking the line. Instead, these characters are added to the end of the line, even in the page margin.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/asiantypography/checkApplySpacing" id="bm_id3149811" localize="false"/><paragraph role="heading" id="par_id3147275" xml-lang="en-US" level="3" l10n="U" oldref="7">
diff --git a/source/text/shared/autopi/01050000.xhp b/source/text/shared/autopi/01050000.xhp
index 93bf0fa..80c01fb 100644
--- a/source/text/shared/autopi/01050000.xhp
+++ b/source/text/shared/autopi/01050000.xhp
@@ -39,7 +39,7 @@
 <section id="howtoget">
   <embed href="text/shared/00/00000401.xhp#dtapt"/>
 </section>
-<paragraph role="tip" id="par_id3154289" xml-lang="en-US" l10n="U" oldref="11">To start the Presentation Wizard automatically when opening a new presentation, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01070500.xhp" name="Presentation - General">%PRODUCTNAME Impress - General</link></emph> and check the <emph>Start with Wizard</emph> box.</paragraph>
+<paragraph role="tip" id="par_id3154289" xml-lang="en-US" l10n="U" oldref="11">To start the Presentation Wizard automatically when opening a new presentation, choose <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - </emph><link href="text/shared/optionen/01070500.xhp" name="Presentation - General"><emph>%PRODUCTNAME Impress - General</emph></link> and check the <emph>Start with Wizard</emph> box.</paragraph>
 <paragraph role="paragraph" id="par_id3166410" xml-lang="en-US" l10n="U" oldref="3">Within each wizard page, you can undo, modify, or skip altogether the editing steps. If you decide to skip over one of the pages, the wizard uses the default settings.</paragraph>
 <embed href="text/shared/autopi/01050100.xhp#autopilotseite1"/>
 <embed href="text/shared/autopi/01050200.xhp#autopilotseite2"/>
diff --git a/source/text/shared/guide/accessibility.xhp b/source/text/shared/guide/accessibility.xhp
index 0f5871b..886960d 100644
--- a/source/text/shared/guide/accessibility.xhp
+++ b/source/text/shared/guide/accessibility.xhp
@@ -40,7 +40,7 @@
    </listitem>
    <listitem>
     <paragraph role="listitem" id="par_id3146957" l10n="U" xml-lang="en-US" oldref="8">Zooming of on-screen user interface for menus, icons, and documents</paragraph>
-    <paragraph xml-lang="en-US" oldref="12" l10n="U" role="listitem" id="par_id3145071">The user interface is scalable through your <switchinline select="sys"><caseinline select="UNIX">Window Manager</caseinline><defaultinline>operating system</defaultinline></switchinline> settings. The default font size for dialogs is 12pt, corresponding to a scale of 100%. You can also change the font size for dialogs in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <item type="productname">%PRODUCTNAME</item> - View</emph>. The zoom factor of a document can be changed in <emph>View - Zoom</emph>, or by double-clicking the zoom factor displayed in the Status Bar.</paragraph>
+    <paragraph xml-lang="en-US" oldref="12" l10n="U" role="listitem" id="par_id3145071">The user interface is scalable through your <switchinline select="sys"><caseinline select="UNIX">Window Manager</caseinline><defaultinline>operating system</defaultinline></switchinline> settings. The default font size for dialogs is 12pt, corresponding to a scale of 100%. You can also change the font size for dialogs in <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - <item type="productname">%PRODUCTNAME</item> - View</emph>. The zoom factor of a document can be changed in <emph>View - Zoom</emph>, or by double-clicking the zoom factor displayed in the Status Bar.</paragraph>
    </listitem>
   </list>
   <paragraph role="note" id="par_id3152349" l10n="U" xml-lang="en-US" oldref="2">Please note that accessibility support relies on Java technology for communications with assistive technology tools. This means that the first program startup may take a few seconds longer, because the Java runtime environment has to be started as well.</paragraph>
diff --git a/source/text/shared/guide/doc_autosave.xhp b/source/text/shared/guide/doc_autosave.xhp
index 45413a7..ea662b9 100644
--- a/source/text/shared/guide/doc_autosave.xhp
+++ b/source/text/shared/guide/doc_autosave.xhp
@@ -49,7 +49,7 @@
 <paragraph role="heading" id="hd_id3166410" xml-lang="en-US" level="2" l10n="U" oldref="3">To create a backup file every time you save a document</paragraph>
 <list type="ordered">
 <listitem>
-<paragraph role="listitem" id="par_id3152780" xml-lang="en-US" l10n="U" oldref="4">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010200.xhp" name="Load/Save - General">Load/Save - General</link></emph>.</paragraph>
+<paragraph role="listitem" id="par_id3152780" xml-lang="en-US" l10n="U" oldref="4">Choose <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - </emph><link href="text/shared/optionen/01010200.xhp" name="Load/Save - General"><emph>Load/Save - General</emph></link>.</paragraph>
 </listitem>
 <listitem>
 <paragraph role="listitem" id="par_id3148474" xml-lang="en-US" l10n="U" oldref="5">Mark <emph>Always create backup copy</emph>.</paragraph>
@@ -67,7 +67,7 @@
 <paragraph role="heading" id="hd_id3149514" xml-lang="en-US" level="2" l10n="CHG" oldref="9">To save recovery information automatically every n minutes</paragraph>
 <list type="ordered">
 <listitem>
-<paragraph role="listitem" id="par_id3148563" xml-lang="en-US" l10n="U" oldref="10">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010200.xhp" name="Load/Save - General">Load/Save - General</link></emph>.</paragraph>
+<paragraph role="listitem" id="par_id3148563" xml-lang="en-US" l10n="U" oldref="10">Choose <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - </emph><link href="text/shared/optionen/01010200.xhp" name="Load/Save - General"><emph>Load/Save - General</emph></link>.</paragraph>
 </listitem>
 <listitem>
 <paragraph role="listitem" id="par_id3154760" xml-lang="en-US" l10n="CHG" oldref="11">Mark <emph>Save AutoRecovery information every</emph> and select the time interval.</paragraph>
diff --git a/source/text/shared/guide/doc_save.xhp b/source/text/shared/guide/doc_save.xhp
index 52d0ef1..29f0555 100644
--- a/source/text/shared/guide/doc_save.xhp
+++ b/source/text/shared/guide/doc_save.xhp
@@ -57,7 +57,7 @@
 </tablerow>
 </table>
 <paragraph role="paragraph" id="par_id3150984" xml-lang="en-US" l10n="U" oldref="2">When you save a new file for the first time, the <link href="text/shared/01/01070000.xhp" name="Save As">Save As</link> dialog opens, in which you can enter a name, folder and drive or volume for the file. To open this dialog, choose <emph>File - Save As</emph>.</paragraph>
-<paragraph role="note" id="par_id3152472" xml-lang="en-US" l10n="CHG" oldref="3">You can set the automatic creation of a backup copy under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010200.xhp" name="Load/Save - General">Load/Save - General</link></emph>.</paragraph>
+<paragraph role="note" id="par_id3152472" xml-lang="en-US" l10n="CHG" oldref="3">You can set the automatic creation of a backup copy under <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - </emph><link href="text/shared/optionen/01010200.xhp" name="Load/Save - General"><emph>Load/Save - General</emph></link>.</paragraph>
 <paragraph role="heading" id="hd_id7146824" xml-lang="en-US" level="2" l10n="NEW">Automatic extension to the file name</paragraph>
 <paragraph role="paragraph" id="par_id9359111" xml-lang="en-US" l10n="NEW">When saving a file, %PRODUCTNAME always appends an extension to the file name, except when the file name already has an extension that matches the file type. See the list of <link href="text/shared/00/00000021.xhp">ODF extensions</link>. </paragraph>
 <paragraph role="paragraph" id="par_id6709494" xml-lang="en-US" l10n="NEW">Some examples for the automatic extensions are listed in the following table:</paragraph>
diff --git a/source/text/shared/guide/fax.xhp b/source/text/shared/guide/fax.xhp
index f81a7a5..924aacc 100644
--- a/source/text/shared/guide/fax.xhp
+++ b/source/text/shared/guide/fax.xhp
@@ -51,7 +51,7 @@
 <paragraph role="paragraph" id="par_id3153822" xml-lang="en-US" l10n="U" oldref="10">You can configure $[officename] so that a single click on an icon automatically sends the current document as a fax:</paragraph>
 <list type="ordered">
 <listitem>
-<paragraph role="listitem" id="par_id3145315" xml-lang="en-US" l10n="U" oldref="11">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01040400.xhp" name="Writer - Print">%PRODUCTNAME Writer - Print</link></emph>.</paragraph>
+<paragraph role="listitem" id="par_id3145315" xml-lang="en-US" l10n="U" oldref="11">Choose <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - </emph><link href="text/shared/optionen/01040400.xhp" name="Writer - Print"><emph>%PRODUCTNAME Writer - Print</emph></link>.</paragraph>
 </listitem>
 <listitem>
 <paragraph role="listitem" id="par_id3150985" xml-lang="en-US" l10n="U" oldref="12">Select the fax driver from the <emph>Fax</emph> list box and click <emph>OK</emph>.</paragraph>
diff --git a/source/text/shared/guide/ms_user.xhp b/source/text/shared/guide/ms_user.xhp
index 5943199..54790ca 100644
--- a/source/text/shared/guide/ms_user.xhp
+++ b/source/text/shared/guide/ms_user.xhp
@@ -89,7 +89,7 @@
 <paragraph role="heading" id="hd_id3154138" xml-lang="en-US" level="2" l10n="CHG" oldref="15">Saving Documents by Default in Microsoft Office Formats</paragraph>
 <list type="ordered">
 <listitem>
-<paragraph role="listitem" id="par_id3144760" xml-lang="en-US" l10n="U" oldref="16">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010200.xhp" name="Load/Save - General">Load/Save - General</link></emph>.</paragraph>
+<paragraph role="listitem" id="par_id3144760" xml-lang="en-US" l10n="U" oldref="16">Choose <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - </emph><link href="text/shared/optionen/01010200.xhp" name="Load/Save - General"><emph>Load/Save - General</emph></link>.</paragraph>
 </listitem>
 <listitem>
 <paragraph role="listitem" id="par_id3148453" xml-lang="en-US" l10n="U" oldref="17">In the <emph>Default file format and ODF settings</emph> area, first select a document type, then select the file type for saving.</paragraph>
@@ -118,7 +118,7 @@
 <paragraph role="paragraph" id="par_id3150011" xml-lang="en-US" l10n="U" oldref="28">You may delete the VBA macros from the Microsoft Office file on loading or on saving.</paragraph>
 <list type="ordered">
 <listitem>
-<paragraph role="listitem" id="par_id3155366" xml-lang="en-US" l10n="U" oldref="29">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01130100.xhp" name="Load/Save - VBA Properties">Load/Save - VBA Properties</link></emph> to set the VBA macro handling of $[officename].</paragraph>
+<paragraph role="listitem" id="par_id3155366" xml-lang="en-US" l10n="U" oldref="29">Choose <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - </emph><link href="text/shared/optionen/01130100.xhp" name="Load/Save - VBA Properties"><emph>Load/Save - VBA Properties</emph></link> to set the VBA macro handling of $[officename].</paragraph>
 </listitem>
 </list>
 <embed href="text/shared/00/00000004.xhp#related"/>
diff --git a/source/text/shared/main0650.xhp b/source/text/shared/main0650.xhp
index d61a38e..413119c 100644
--- a/source/text/shared/main0650.xhp
+++ b/source/text/shared/main0650.xhp
@@ -37,7 +37,7 @@
 <paragraph role="paragraph" id="par_id3155338" xml-lang="en-US" l10n="U" oldref="4">The Java platform support needs to be activated under $[officename] to run Java applications.</paragraph>
 <list type="unordered">
 <listitem>
-<paragraph role="listitem" id="par_id3155892" xml-lang="en-US" l10n="U" oldref="5">Activate Java platform support by choosing <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/java.xhp" name="$[officename] - Advanced">$[officename] - Advanced</link></emph>.</paragraph>
+<paragraph role="listitem" id="par_id3155892" xml-lang="en-US" l10n="U" oldref="5">Activate Java platform support by choosing <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - </emph><link href="text/shared/optionen/java.xhp" name="$[officename] - Advanced"><emph>$[officename] - Advanced</emph></link>.</paragraph>
 </listitem>
 </list>
 <paragraph role="note" id="par_id9116183" xml-lang="en-US" l10n="NEW">Before you can use a JDBC driver, you need to add its class path. Choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - Advanced, and click the Class Path button. After you add the path information, restart %PRODUCTNAME.</paragraph>
diff --git a/source/text/shared/optionen/macrosecurity.xhp b/source/text/shared/optionen/macrosecurity.xhp
index f9d3945..320c1eb 100644
--- a/source/text/shared/optionen/macrosecurity.xhp
+++ b/source/text/shared/optionen/macrosecurity.xhp
@@ -30,7 +30,7 @@
 </meta>
 <body>
 <paragraph role="heading" id="par_idN1054C" xml-lang="en-US" level="1" l10n="NEW"><variable id="macrosecurity"><link href="text/shared/optionen/macrosecurity.xhp">Macro Security</link></variable></paragraph>
-<paragraph role="paragraph" id="par_idN1056A" xml-lang="en-US" l10n="NEW">The Macro Security dialog appears when a document contains one or more macros. You can also call the dialog from the <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01030300.xhp">%PRODUCTNAME - Security</link></emph> page.</paragraph>
+<paragraph role="paragraph" id="par_idN1056A" xml-lang="en-US" l10n="NEW">The Macro Security dialog appears when a document contains one or more macros. You can also call the dialog from the <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - </emph><link href="text/shared/optionen/01030300.xhp"><emph>%PRODUCTNAME - Security</emph></link> page.</paragraph>
 <embed href="text/shared/optionen/macrosecurity_sl.xhp#macrosecurity_sl"/>
 <embed href="text/shared/optionen/macrosecurity_ts.xhp#macrosecurity_ts"/>
 <section id="relatedtopics">
diff --git a/source/text/swriter/01/04090001.xhp b/source/text/swriter/01/04090001.xhp
index 1515f12..75088f5 100644
--- a/source/text/swriter/01/04090001.xhp
+++ b/source/text/swriter/01/04090001.xhp
@@ -95,7 +95,7 @@
                <paragraph xml-lang="en-US" id="par_id3150561" role="tablecontent" l10n="U" oldref="8">Sender</paragraph>
             </tablecell>
             <tablecell>
-               <paragraph xml-lang="en-US" id="par_id3146341" role="tablecontent" l10n="U" oldref="9">Inserts fields containing user data. You can change the user-data that is displayed by choosing <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010100.xhp" name="$[officename] - User Data">$[officename] - User Data</link></emph>.</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3146341" role="tablecontent" l10n="U" oldref="9">Inserts fields containing user data. You can change the user-data that is displayed by choosing <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - </emph><link href="text/shared/optionen/01010100.xhp" name="$[officename] - User Data"><emph>$[officename] - User Data</emph></link>.</paragraph>
             </tablecell>
          </tablerow>
          <tablerow>
diff --git a/source/text/swriter/01/04090003.xhp b/source/text/swriter/01/04090003.xhp
index 24e81b7..60a1cf7 100644
--- a/source/text/swriter/01/04090003.xhp
+++ b/source/text/swriter/01/04090003.xhp
@@ -95,7 +95,7 @@
 <paragraph role="tablecontent" id="par_id3150973" xml-lang="en-US" l10n="U" oldref="13">Hidden text</paragraph>
 </tablecell>
 <tablecell>
-<paragraph role="tablecontent" id="par_id3147524" xml-lang="en-US" l10n="CHG" oldref="14">Inserts a text field that is hidden when the condition that you specify is met. To use this function, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01040600.xhp" name="Text Document - Formatting Aids">%PRODUCTNAME Writer - Formatting Aids</link></emph> and clear the <emph>Fields: Hidden text</emph> check box.</paragraph>
+<paragraph role="tablecontent" id="par_id3147524" xml-lang="en-US" l10n="CHG" oldref="14">Inserts a text field that is hidden when the condition that you specify is met. To use this function, choose <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - </emph><link href="text/shared/optionen/01040600.xhp" name="Text Document - Formatting Aids"><emph>%PRODUCTNAME Writer - Formatting Aids</emph></link> and clear the <emph>Fields: Hidden text</emph> check box.</paragraph>
 </tablecell>
 </tablerow>
 <tablerow>
@@ -103,7 +103,7 @@
 <paragraph role="tablecontent" id="par_id3154480" xml-lang="en-US" l10n="U" oldref="15">Hidden Paragraph</paragraph>
 </tablecell>
 <tablecell>
-<paragraph role="tablecontent" id="par_id3153677" xml-lang="en-US" l10n="CHG" oldref="16">Hides a paragraph when the condition that you specify is met. To use this function, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01040600.xhp" name="Text Document - Formatting Aids">%PRODUCTNAME Writer - Formatting Aids</link></emph> and clear the <emph>Fields: Hidden paragraph</emph> check box.</paragraph>
+<paragraph role="tablecontent" id="par_id3153677" xml-lang="en-US" l10n="CHG" oldref="16">Hides a paragraph when the condition that you specify is met. To use this function, choose <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - </emph><link href="text/shared/optionen/01040600.xhp" name="Text Document - Formatting Aids"><emph>%PRODUCTNAME Writer - Formatting Aids</emph></link> and clear the <emph>Fields: Hidden paragraph</emph> check box.</paragraph>
 </tablecell>
 </tablerow>
 <tablerow>
diff --git a/source/text/swriter/01/04130100.xhp b/source/text/swriter/01/04130100.xhp
index 6e69ab0..2a18f5a 100644
--- a/source/text/swriter/01/04130100.xhp
+++ b/source/text/swriter/01/04130100.xhp
@@ -36,7 +36,7 @@
 <paragraph role="paragraph" id="par_id3145248" xml-lang="en-US" l10n="U" oldref="2">You can resize and move selected frames and objects with the keyboard.</paragraph>
 <paragraph role="paragraph" id="par_id3148771" xml-lang="en-US" l10n="U" oldref="4">To move a selected frame or object, press an arrow key. To move by one pixel, hold down <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>, and then press an arrow key.</paragraph>
 <paragraph role="paragraph" id="par_id3150762" xml-lang="en-US" l10n="U" oldref="5">To resize a selected frame or object, first press Ctrl+Tab. Now one of the handles blinks to show that it is selected. To select another handle, press Ctrl+Tab again. Press an arrow key to resize the object by one grid unit. To resize by one pixel, hold down <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>, and then press an arrow key.</paragraph>
-<paragraph role="paragraph" id="par_id3149294" xml-lang="en-US" l10n="U" oldref="6">The increment by which you move an object with the keyboard is determined by the document grid. To change the properties of the document grid, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01050100.xhp" name="Text document - Grid">%PRODUCTNAME Writer - Grid</link></emph>.</paragraph>
+<paragraph role="paragraph" id="par_id3149294" xml-lang="en-US" l10n="U" oldref="6">The increment by which you move an object with the keyboard is determined by the document grid. To change the properties of the document grid, choose <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - </emph><link href="text/shared/optionen/01050100.xhp" name="Text document - Grid"><emph>%PRODUCTNAME Writer - Grid</emph></link>.</paragraph>
 <embed href="text/shared/00/00000004.xhp#related"/>
 <embed href="text/swriter/guide/keyboard.xhp#keyboard"/>
 </body>
diff --git a/source/text/swriter/01/04200000.xhp b/source/text/swriter/01/04200000.xhp
index 045de4b..44a26fb 100644
--- a/source/text/swriter/01/04200000.xhp
+++ b/source/text/swriter/01/04200000.xhp
@@ -35,7 +35,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><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer/Web - <link href="text/shared/optionen/01040200.xhp" name="View">View</link></emph>, 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_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 <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - %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/modules/swriter/ui/insertscript/previous" 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/source/text/swriter/01/05090201.xhp b/source/text/swriter/01/05090201.xhp
index e642dbd..1c53a23 100644
--- a/source/text/swriter/01/05090201.xhp
+++ b/source/text/swriter/01/05090201.xhp
@@ -65,7 +65,7 @@
 <paragraph role="listitem" id="par_id3153531" xml-lang="en-US" l10n="U" oldref="15">To delete a row, place the cursor in the row that you want to delete, hold down <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline> and press Delete, release, and then press the up or the down arrow.</paragraph>
 </listitem>
 </list>
-<paragraph role="note" id="par_id3150983" xml-lang="en-US" l10n="U" oldref="10">To change the behavior of tables in a text document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01040500.xhp" name="Text Document - Table">%PRODUCTNAME Writer - Table</link></emph>.</paragraph>
+<paragraph role="note" id="par_id3150983" xml-lang="en-US" l10n="U" oldref="10">To change the behavior of tables in a text document, choose <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - </emph><link href="text/shared/optionen/01040500.xhp" name="Text Document - Table"><emph>%PRODUCTNAME Writer - Table</emph></link>.</paragraph>
 <embed href="text/shared/00/00000004.xhp#related"/>
 <paragraph role="paragraph" id="par_id3154196" xml-lang="en-US" l10n="CHG" oldref="16"><link href="text/swriter/main0204.xhp" name="Table Bar">Table Bar</link></paragraph>
 </body>

... etc. - the rest is truncated