Merge commit 'ooo/DEV300_m103'

Conflicts:
helpcontent2/helpers/hid.lst
helpcontent2/source/text/scalc/01/04050000.xhp
helpcontent2/source/text/scalc/guide/text_rotate.xhp
helpcontent2/source/text/shared/01/04110000.xhp
helpcontent2/source/text/shared/01/06040000.xhp
helpcontent2/source/text/shared/02/01170202.xhp
helpcontent2/source/text/shared/main0108.xhp
helpcontent2/source/text/shared/optionen/01030000.xhp
helpcontent2/source/text/swriter/01/05150101.xhp
helpcontent2/util/target.pmk

2 files changed, 25 insertions, 21 deletions

diff --git a/helpcontent2/source/text/simpress/guide/individual.xhp b/helpcontent2/source/text/simpress/guide/individual.xhp
index 9b68a790ab..796c02053e 100755
--- a/helpcontent2/source/text/simpress/guide/individual.xhp
+++ b/helpcontent2/source/text/simpress/guide/individual.xhp
@@ -5,7 +5,7 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,7 +29,7 @@
  *
  ************************************************************************
  -->
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textsimpressguideindividualxml" indexer="include" status="PUBLISH">
@@ -91,9 +91,10 @@
 </list>
 <paragraph role="warning" id="par_id3155372" xml-lang="en-US" l10n="U" oldref="68">Do not select this option if you want to run a custom slide show.</paragraph>
 <paragraph role="heading" id="hd_id3153922" xml-lang="en-US" level="3" l10n="U" oldref="69">To hide a slide:</paragraph>
+<paragraph role="paragraph" id="par_id883150344" xml-lang="en-US" l10n="NEW">To hide the current slide, click the Hide Slide action button.</paragraph>
 <list type="ordered">
 <listitem>
-<paragraph role="listitem" id="par_id3156261" xml-lang="en-US" l10n="U" oldref="57">Choose <emph>View - Slide Sorter</emph>, and then select the slide(s) that you want to hide.</paragraph>
+<paragraph role="listitem" id="par_id3156261" xml-lang="en-US" l10n="CHG" oldref="57">To hide several slides, choose <emph>View - Slide Sorter</emph>, and then select the slide(s) that you want to hide.</paragraph>
 </listitem>
 <listitem>
 <paragraph role="listitem" id="par_id3083278" xml-lang="en-US" l10n="U" oldref="79">Choose <emph>Slide Show - Show/Hide Slide</emph>.</paragraph>
diff --git a/helpcontent2/source/text/simpress/guide/table_insert.xhp b/helpcontent2/source/text/simpress/guide/table_insert.xhp
index f368048d76..02acb49550 100644
--- a/helpcontent2/source/text/simpress/guide/table_insert.xhp
+++ b/helpcontent2/source/text/simpress/guide/table_insert.xhp
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
 ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,8 +29,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
 <topic id="textsimpressguidetable_insertxml" indexer="include">
 <title id="tit" xml-lang="en-US">Including Spreadsheets in Slides</title>
@@ -59,35 +59,38 @@
 <paragraph role="paragraph" id="par_id8626667" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enter the number of rows for the new table.</ahelp></paragraph><comment>Contextmenu of a table in Impress and Draw</comment><comment>Cell</comment>
 <bookmark xml-lang="en-US" branch="hid/.uno:CellMenu" id="bm_id0916200803192795" localize="false"/>
 <paragraph role="paragraph" id="par_id0916200803551581" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Define the vertical alignment of selected or all cell contents. Split or merge cells.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SID_TABLE_MERGE_CELLS" id="bm_id0916200803370158" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:MergeCells" id="bm_id0916200803370158" localize="false"/>
 <paragraph role="paragraph" id="par_id0916200803551553" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">All selected cells are merged into one cell.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SID_TABLE_SPLIT_CELLS" id="bm_id0916200803375165" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:SplitCell" id="bm_id0916200803375165" localize="false"/>
 <paragraph role="paragraph" id="par_id0916200803551535" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">The selected cell is split into several cells. You see the Split Cells dialog box.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SID_TABLE_VERT_NONE" id="bm_id0916200803224438" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:CellVertTop" id="bm_id0916200803224438" localize="false"/>
 <paragraph role="paragraph" id="par_id0916200803551651" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">The cell contents are align at the top of the cells.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SID_TABLE_VERT_CENTER" id="bm_id091620080323379" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:CellVertCenter" id="bm_id091620080323379" localize="false"/>
 <paragraph role="paragraph" id="par_id0916200803551697" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">The cell contents are aligned vertically centered in the cells.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SID_TABLE_VERT_BOTTOM" id="bm_id0916200803242358" localize="false"/>
-<paragraph role="paragraph" id="par_id0916200803551632" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">The cell contents are aligned at the bottom of the cells.</ahelp></paragraph><comment>Row</comment>
+<bookmark xml-lang="en-US" branch="hid/.uno:CellVertBottom" id="bm_id0916200803242358" localize="false"/>
+<paragraph role="paragraph" id="par_id0916200803551632" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">The cell contents are aligned at the bottom of the cells.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:SelectTable" id="bm_id3954588" localize="false"/>
+<paragraph role="paragraph" id="par_idN10626" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Selects the current table.</ahelp></paragraph>
+<comment>Row</comment>
 <bookmark xml-lang="en-US" branch="hid/.uno:RowMenu" id="bm_id0916200803255185" localize="false"/>
 <paragraph role="paragraph" id="par_id0916200803551734" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Choose commands for the selected or all rows.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SID_TABLE_DISTRIBUTE_ROWS" id="bm_id0916200803565265" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:DistributeRows" id="bm_id0916200803565265" localize="false"/>
 <paragraph role="paragraph" id="par_id0916200804080035" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Distributes the height of the selected or all rows to the same size. The height of the table is not changed.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SID_TABLE_SELECT_ROW" id="bm_id0916200804004173" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:EntireRow" id="bm_id0916200804004173" localize="false"/>
 <paragraph role="paragraph" id="par_id0916200804080063" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">If currently no cell is selected, all rows will be selected. If currently cells are selected, all rows containing the selected cells will be selected.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SID_TABLE_INSERT_ROW" id="bm_id0916200804032566" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:InsertRows" id="bm_id0916200804032566" localize="false"/>
 <paragraph role="paragraph" id="par_id091620080408008" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">If currently no cell is selected, a new row will be inserted at the bottom of the table. If currently cells are selected, as many new rows as the selection has will be inserted below the selection.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SID_TABLE_DELETE_ROW" id="bm_id0916200804073670" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:DeleteRows" id="bm_id0916200804073670" localize="false"/>
 <paragraph role="paragraph" id="par_id0916200804080050" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">All rows of the current selection will be deleted.</ahelp></paragraph><comment>Column</comment>
 <bookmark xml-lang="en-US" branch="hid/.uno:ColumnMenu" id="bm_id0916200804101754" localize="false"/>
 <paragraph role="paragraph" id="par_id0916200804163012" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Choose commands for the selected or all columns.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SID_TABLE_DISTRIBUTE_COLUMNS" id="bm_id0916200804110358" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:DistributeColumns" id="bm_id0916200804110358" localize="false"/>
 <paragraph role="paragraph" id="par_id0916200804163092" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Distributes the width of the selected or all columns to the same size. The width of the table is not changed.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SID_TABLE_SELECT_COL" id="bm_id0916200804114925" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:EntireColumn" id="bm_id0916200804114925" localize="false"/>
 <paragraph role="paragraph" id="par_id0916200804163046" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">If currently no cell is selected, all columns will be selected. If currently cells are selected, all columns containing the selected cells will be selected.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SID_TABLE_INSERT_COL" id="bm_id0916200804122650" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:InsertColumns" id="bm_id0916200804122650" localize="false"/>
 <paragraph role="paragraph" id="par_id0916200804163128" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">If currently no cell is selected, a new column will be inserted at the right border of the table. If currently cells are selected, as many new columns as the selection has will be inserted right of the selection.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SID_TABLE_DELETE_COL" id="bm_id091620080413440" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:DeleteColumns" id="bm_id091620080413440" localize="false"/>
 <paragraph role="paragraph" id="par_id0916200804163127" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">All columns of the current selection will be deleted.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/.uno:AlignObjetMenu" id="bm_id0916200804143882" localize="false"/><comment>sic</comment>
 <paragraph role="paragraph" id="par_id0916200804163151" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Align the table within the page or slide.</ahelp></paragraph>