hcshared25: intermediate commit

18 files changed, 161 insertions, 114 deletions

diff --git a/helpcontent2/source/text/shared/01/05030600.xhp b/helpcontent2/source/text/shared/01/05030600.xhp
index 01ce3305d6..1219a7b00c 100644
--- a/helpcontent2/source/text/shared/01/05030600.xhp
+++ b/helpcontent2/source/text/shared/01/05030600.xhp
@@ -67,7 +67,7 @@
 <bookmark xml-lang="en-US" branch="hid/HID_BACKGROUND_CTL_BGDCOLORSET" id="bm_id3159414" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3148946" role="heading" level="3" l10n="U" oldref="8">Color Background</paragraph>
       <paragraph xml-lang="en-US" id="par_id3152361" role="paragraph" l10n="U" oldref="9"><ahelp hid="HID_BACKGROUND_CTL_BGDCOLORSET">Click the color that you want to use as a background. To remove a background color, click <emph>No Fill</emph>.</ahelp></paragraph>
-      <embed href="text/shared/00/00000007.xhp#objektleiste"/>
+
       <embed href="text/shared/02/02160000.xhp#syzeichenhintergrund"/>
       <embed href="text/shared/02/02170000.xhp#syabsatzhintergrund"/>
       <embed href="text/shared/02/02160000.xhp#zeichenhintergrundtext"/>
diff --git a/helpcontent2/source/text/shared/01/05040200.xhp b/helpcontent2/source/text/shared/01/05040200.xhp
index 82982c3e3b..e63065b1f9 100755
--- a/helpcontent2/source/text/shared/01/05040200.xhp
+++ b/helpcontent2/source/text/shared/01/05040200.xhp
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <helpdocument version="1.0">
-	
+
 <!--
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,8 +34,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
 <topic id="textshared0105040200xml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">Page</title>
@@ -100,6 +100,37 @@
 <bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_PAGE:ED_BOTTOM_MARGIN" id="bm_id3153797" localize="false"/>
 <paragraph role="heading" id="hd_id3153381" xml-lang="en-US" level="3" l10n="U" oldref="13">Bottom</paragraph>
 <paragraph role="paragraph" id="par_id3154138" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_PAGE:ED_BOTTOM_MARGIN">Enter the amount of space to leave between the lower edge of the page and the document text.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_PAGE:CB_REGISTER" id="bm_id3159123" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_PAGE:CB_REGISTER" id="bm_id0428200802395615" localize="false"/>
+<paragraph role="paragraph" id="par_id0522200809473735" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Aligns the text on the selected Page Style to a vertical page grid.</ahelp></paragraph>
+<paragraph role="heading" id="hd_id3150488" xml-lang="en-US" level="3" l10n="U" oldref="55"><switchinline select="appl"><caseinline select="WRITER">Register-true
+</caseinline></switchinline></paragraph>
+<paragraph role="paragraph" id="par_id3151112" xml-lang="en-US" l10n="CHG" oldref="56"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_PAGE:CB_REGISTER">Aligns the text on the selected Page Style to a vertical page grid.</ahelp> The spacing of the grid is defined by the <emph>Reference Style</emph>.
+</caseinline></switchinline></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_PAGE:LB_REGISTER" id="bm_id3147426" localize="false"/>
+<paragraph role="paragraph" id="par_id0522200809473732" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select the Paragraph Style that you want to use as a reference for lining up the text on the selected Page style. The height of the font that is specified in the reference style sets the spacing of the vertical page grid. </ahelp></paragraph>
+<paragraph role="heading" id="hd_id3150686" xml-lang="en-US" level="3" l10n="U" oldref="57"><switchinline select="appl"><caseinline select="WRITER">Reference Style
+</caseinline></switchinline></paragraph>
+<paragraph role="paragraph" id="par_id3146146" xml-lang="en-US" l10n="CHG" oldref="58"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_PAGE:LB_REGISTER"><switchinline select="appl"><caseinline select="WRITER">Select the Paragraph Style that you want to use as a reference for lining up the text on the selected Page style. The height of the font that is specified in the reference style sets the spacing of the vertical page grid.
+</caseinline></switchinline></ahelp></paragraph>
+<paragraph role="heading" id="hd_id3147480" xml-lang="en-US" level="2" l10n="U" oldref="47"><switchinline select="appl"><caseinline select="CALC">Table alignment
+</caseinline></switchinline></paragraph>
+<paragraph role="paragraph" id="par_id3150417" xml-lang="en-US" l10n="U" oldref="48"><switchinline select="appl"><caseinline select="CALC">Specify the alignment options for the cells on a printed page.
+</caseinline></switchinline></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_PAGE:CB_HORZ" id="bm_id3149270" localize="false"/>
+<paragraph role="paragraph" id="par_id0522200809473845" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Centers the cells horizontally on the printed page.</ahelp></paragraph>
+<paragraph role="heading" id="hd_id3147047" xml-lang="en-US" level="3" l10n="U" oldref="49"><switchinline select="appl"><caseinline select="CALC">Horizontal
+</caseinline></switchinline></paragraph>
+<paragraph role="paragraph" id="par_id3153878" xml-lang="en-US" l10n="U" oldref="50"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_PAGE:CB_HORZ"><switchinline select="appl"><caseinline select="CALC">Centers the cells horizontally on the printed page.
+</caseinline></switchinline></ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_PAGE:CB_VERT" id="bm_id3154063" localize="false"/>
+<paragraph role="paragraph" id="par_id0522200809473811" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Centers the cells vertically on the printed page.</ahelp></paragraph>
+<paragraph role="heading" id="hd_id3153522" xml-lang="en-US" level="3" l10n="U" oldref="51"><switchinline select="appl"><caseinline select="CALC">Vertical
+</caseinline></switchinline></paragraph>
+<paragraph role="paragraph" id="par_id3149413" xml-lang="en-US" l10n="U" oldref="52"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_PAGE:CB_VERT"><switchinline select="appl"><caseinline select="CALC">Centers the cells vertically on the printed page.
+</caseinline></switchinline></ahelp></paragraph>
+<paragraph role="heading" id="hd_id3147381" xml-lang="en-US" level="2" l10n="CHG" oldref="63">Layout settings</paragraph>
+
 <paragraph role="heading" id="hd_id3151041" xml-lang="en-US" level="2" l10n="U" oldref="15"><switchinline select="appl"><caseinline select="DRAW">
 </caseinline><caseinline select="IMPRESS">
 </caseinline><defaultinline>Page Layout</defaultinline></switchinline></paragraph>
@@ -138,38 +169,9 @@
 <paragraph role="paragraph" id="par_id3147326" xml-lang="en-US" l10n="U" oldref="26"><switchinline select="appl"><caseinline select="DRAW">
 </caseinline><caseinline select="IMPRESS">
 </caseinline><defaultinline>The current page style shows only even (left) pages. Odd pages are shown as blank pages.</defaultinline></switchinline></paragraph>
-<paragraph role="heading" id="hd_id3155366" xml-lang="en-US" level="2" l10n="U" oldref="53"><switchinline select="appl"><caseinline select="WRITER">Register-true 
-</caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_PAGE:CB_REGISTER" id="bm_id3159123" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_PAGE:CB_REGISTER" id="bm_id0428200802395615" localize="false"/>
-<paragraph role="paragraph" id="par_id0522200809473735" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Aligns the text on the selected Page Style to a vertical page grid.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3150488" xml-lang="en-US" level="3" l10n="U" oldref="55"><switchinline select="appl"><caseinline select="WRITER">Register-true 
-</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3151112" xml-lang="en-US" l10n="CHG" oldref="56"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_PAGE:CB_REGISTER">Aligns the text on the selected Page Style to a vertical page grid.</ahelp> The spacing of the grid is defined by the <emph>Reference Style</emph>. 
-</caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_PAGE:LB_REGISTER" id="bm_id3147426" localize="false"/>
-<paragraph role="paragraph" id="par_id0522200809473732" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select the Paragraph Style that you want to use as a reference for lining up the text on the selected Page style. The height of the font that is specified in the reference style sets the spacing of the vertical page grid. </ahelp></paragraph>
-<paragraph role="heading" id="hd_id3150686" xml-lang="en-US" level="3" l10n="U" oldref="57"><switchinline select="appl"><caseinline select="WRITER">Reference Style 
-</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3146146" xml-lang="en-US" l10n="CHG" oldref="58"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_PAGE:LB_REGISTER"><switchinline select="appl"><caseinline select="WRITER">Select the Paragraph Style that you want to use as a reference for lining up the text on the selected Page style. The height of the font that is specified in the reference style sets the spacing of the vertical page grid. 
-</caseinline></switchinline></ahelp></paragraph>
-<paragraph role="heading" id="hd_id3147480" xml-lang="en-US" level="2" l10n="U" oldref="47"><switchinline select="appl"><caseinline select="CALC">Table alignment 
+<paragraph role="heading" id="hd_id3155366" xml-lang="en-US" level="2" l10n="U" oldref="53"><switchinline select="appl"><caseinline select="WRITER">Register-true
 </caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3150417" xml-lang="en-US" l10n="U" oldref="48"><switchinline select="appl"><caseinline select="CALC">Specify the alignment options for the cells on a printed page. 
-</caseinline></switchinline></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_PAGE:CB_HORZ" id="bm_id3149270" localize="false"/>
-<paragraph role="paragraph" id="par_id0522200809473845" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Centers the cells horizontally on the printed page.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3147047" xml-lang="en-US" level="3" l10n="U" oldref="49"><switchinline select="appl"><caseinline select="CALC">Horizontal 
-</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3153878" xml-lang="en-US" l10n="U" oldref="50"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_PAGE:CB_HORZ"><switchinline select="appl"><caseinline select="CALC">Centers the cells horizontally on the printed page. 
-</caseinline></switchinline></ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_PAGE:CB_VERT" id="bm_id3154063" localize="false"/>
-<paragraph role="paragraph" id="par_id0522200809473811" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Centers the cells vertically on the printed page.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3153522" xml-lang="en-US" level="3" l10n="U" oldref="51"><switchinline select="appl"><caseinline select="CALC">Vertical 
-</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3149413" xml-lang="en-US" l10n="U" oldref="52"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_PAGE:CB_VERT"><switchinline select="appl"><caseinline select="CALC">Centers the cells vertically on the printed page. 
-</caseinline></switchinline></ahelp></paragraph>
-<paragraph role="heading" id="hd_id3147381" xml-lang="en-US" level="2" l10n="CHG" oldref="63">Layout settings</paragraph>
+
 <bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_PAGE:LB_NUMBER_FORMAT" id="bm_id3149417" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_PAGE:LB_NUMBER_FORMAT" id="bm_id5692312" localize="false"/><comment>ufi: removed switches</comment>
 <paragraph role="heading" id="hd_id3083281" xml-lang="en-US" level="3" l10n="CHG" oldref="27">Format</paragraph>
diff --git a/helpcontent2/source/text/shared/01/05200200.xhp b/helpcontent2/source/text/shared/01/05200200.xhp
index 4a1fd63aa7..f6bf3d51f0 100755
--- a/helpcontent2/source/text/shared/01/05200200.xhp
+++ b/helpcontent2/source/text/shared/01/05200200.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 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,8 +32,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
 <topic id="textshared0105200200xml" indexer="include">
 <title id="tit" xml-lang="en-US">Line Styles</title>
@@ -76,7 +76,7 @@
 <paragraph role="paragraph" id="par_id3149827" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SVX_PUSHBUTTON_RID_SVXPAGE_LINE_DEF_BTN_ADD">Creates a new line style using the current settings.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXDLG_NAME:EDT_STRING" id="bm_id3145313" localize="false"/>
 <paragraph role="heading" id="hd_id3155338" xml-lang="en-US" level="3" l10n="U" oldref="19">Name</paragraph>
-<paragraph role="paragraph" id="par_id3153681" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SVX_EDIT_RID_SVXDLG_NAME_EDT_STRING">Enter a name for the new line style.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3153681" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="">Enter a name.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_LINE_DEF:BTN_MODIFY" id="bm_id3147011" localize="false"/>
 <paragraph role="heading" id="hd_id3155893" xml-lang="en-US" level="2" l10n="U" oldref="21">Modify</paragraph>
 <paragraph role="paragraph" id="par_id3157863" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SVX_PUSHBUTTON_RID_SVXPAGE_LINE_DEF_BTN_MODIFY">Updates the selected line style using the current settings. To change the name of the selected line style, enter a new name when prompted.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/01/06140000.xhp b/helpcontent2/source/text/shared/01/06140000.xhp
index e471c3fea3..75303d6776 100644
--- a/helpcontent2/source/text/shared/01/06140000.xhp
+++ b/helpcontent2/source/text/shared/01/06140000.xhp
@@ -6,7 +6,7 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -39,7 +39,7 @@
 		<helpdocument version="1.0">
 <meta>
 <topic id="textshared0106140000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Configuration</title>
+<title id="tit" xml-lang="en-US">Customize</title>
 <filename>/text/shared/01/06140000.xhp</filename>
 </topic>
 </meta>
diff --git a/helpcontent2/source/text/shared/01/06140100.xhp b/helpcontent2/source/text/shared/01/06140100.xhp
index ce5d696e08..d22b6e87bc 100644
--- a/helpcontent2/source/text/shared/01/06140100.xhp
+++ b/helpcontent2/source/text/shared/01/06140100.xhp
@@ -6,7 +6,7 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -90,11 +90,15 @@
 <paragraph role="heading" id="par_idN106F9" xml-lang="en-US" level="3" l10n="NEW">Delete</paragraph>
 <paragraph role="paragraph" id="par_idN106FD" xml-lang="en-US" l10n="NEW">Deletes the selected menu or menu entry.</paragraph>
 <paragraph role="note" id="par_idN10910" xml-lang="en-US" l10n="NEW">You can only delete custom menus and custom menu entries.</paragraph>
-<!-- removed HID HID_MENUCONFIG_LISTBOX --><paragraph role="heading" id="hd_id3154408" xml-lang="en-US" level="2" l10n="CHG" oldref="5">Entries</paragraph>
+<!-- removed HID HID_MENUCONFIG_LISTBOX -->
+<paragraph role="heading" id="hd_id3154408" xml-lang="en-US" level="2" l10n="CHG" oldref="5">Entries</paragraph>
 <paragraph role="paragraph" id="par_id3150999" xml-lang="en-US" l10n="CHG" oldref="6"><ahelp hid="HID_MENUCONFIG_LISTBOX">Displays a list of the available menu commands for the selected menu in the current application or document.</ahelp></paragraph>
 <section id="updown">
 <paragraph role="paragraph" id="par_id3150838" xml-lang="en-US" l10n="CHG" oldref="39">To rearrange the order of menu entries, select an entry, and then click the up or down arrow button.</paragraph>
-<!-- removed HID SFX2_IMAGEBUTTON_TP_CONFIG_MENU_BTN_MN_UP --><paragraph role="heading" id="hd_id3147620" xml-lang="en-US" level="2" l10n="U" oldref="63">Arrow Up</paragraph>
+<!-- removed HID SFX2_IMAGEBUTTON_TP_CONFIG_MENU_BTN_MN_UP -->
+<bookmark xml-lang="en-US" branch="hid/cui:ImageButton:MD_MENU_ORGANISER:BTN_MENU_UP" id="bm_id16574620" localize="false"/>
+
+<paragraph role="heading" id="hd_id3147620" xml-lang="en-US" level="2" l10n="U" oldref="63">Arrow Up</paragraph>
 <paragraph role="paragraph" id="par_id3153585" xml-lang="en-US" l10n="U" oldref="64"><ahelp hid="SFX2_IMAGEBUTTON_TP_CONFIG_MENU_BTN_MN_UP">Moves the selected item up one position.</ahelp></paragraph>
 <table id="tbl_id3154897">
 <tablerow>
@@ -108,7 +112,9 @@
 </tablecell>
 </tablerow>
 </table>
-<!-- removed HID SFX2_IMAGEBUTTON_TP_CONFIG_MENU_BTN_MN_DOWN --><paragraph role="heading" id="hd_id3155388" xml-lang="en-US" level="2" l10n="U" oldref="66">Arrow Down</paragraph>
+<!-- removed HID SFX2_IMAGEBUTTON_TP_CONFIG_MENU_BTN_MN_DOWN -->
+<bookmark xml-lang="en-US" branch="hid/cui:ImageButton:MD_MENU_ORGANISER:BTN_MENU_DOWN" id="bm_id16574640" localize="false"/>
+<paragraph role="heading" id="hd_id3155388" xml-lang="en-US" level="2" l10n="U" oldref="66">Arrow Down</paragraph>
 <paragraph role="paragraph" id="par_id3147335" xml-lang="en-US" l10n="U" oldref="67"><ahelp hid="SFX2_IMAGEBUTTON_TP_CONFIG_MENU_BTN_MN_DOWN">Moves the selected item down one position.</ahelp></paragraph>
 <table id="tbl_id3149795">
 <tablerow>
@@ -124,7 +130,13 @@
 </table>
 </section>
 <bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_MENUS:BTN_ADD_COMMANDS" id="bm_id1657460" localize="false"/><paragraph role="heading" id="par_idN107EA" xml-lang="en-US" level="2" l10n="NEW">Add Commands</paragraph>
-<paragraph role="paragraph" id="par_idN107EE" xml-lang="en-US" l10n="NEW"><ahelp hid="705499974">Opens the Add Commands dialog. Select the command that you want to add to the menu, and then click <emph>Add</emph>. You can also drag-and-drop the command into the <emph>Customize</emph> dialog box.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN107EE" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the Add Commands dialog. Select any command, then click <emph>Add</emph> or drag-and-drop the command into the <emph>Customize</emph> dialog box.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/HID_SELECTOR_CATEGORIES" id="bm_id1657465" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_SELECTOR_COMMANDS" id="bm_id1657467" localize="false"/>
+<paragraph role="paragraph" id="par_idN40723" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select any command, then click <emph>Add</emph> or drag-and-drop the command into the <emph>Customize</emph> dialog box.</ahelp></paragraph>
+
+
 <bookmark xml-lang="en-US" branch="hid/cui:MenuButton:RID_SVXPAGE_MENUS:BTN_CHANGE_ENTRY" id="bm_id8946195" localize="false"/><paragraph role="heading" id="par_idN107F9" xml-lang="en-US" level="2" l10n="NEW">Command</paragraph>
 <paragraph role="paragraph" id="par_idN107FD" xml-lang="en-US" l10n="NEW"><ahelp hid="705507646">Opens a menu that contains additional commands.</ahelp></paragraph>
 <paragraph role="heading" id="par_idN10800" xml-lang="en-US" level="3" l10n="NEW">Add Submenu</paragraph>
diff --git a/helpcontent2/source/text/shared/01/06140101.xhp b/helpcontent2/source/text/shared/01/06140101.xhp
index a1481027e4..4a5f52c899 100755
--- a/helpcontent2/source/text/shared/01/06140101.xhp
+++ b/helpcontent2/source/text/shared/01/06140101.xhp
@@ -4,7 +4,7 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -30,25 +30,23 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************-->
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textshared0106140101xml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">New Menu</title>
 <filename>/text/shared/01/06140101.xhp</filename>
 </topic>
-<history>
-<created date="2004-07-12T14:32:22">UFI: New Menu dialog of Customize dialog</created>
-<lastedited date="2004-09-21T09:40:43">dedr: reviewed</lastedited>
-</history>
 </meta>
 <body>
 <paragraph role="heading" id="par_idN10540" xml-lang="en-US" level="1" l10n="NEW">New Menu</paragraph>
 <section id="howtoget">
   <embed href="text/shared/00/00000406.xhp#menuenew"/>
 </section>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:MD_MENU_ORGANISER:EDIT_MENU_NAME" id="bm_id1657461" localize="false"/>
 <paragraph role="heading" id="par_idN10558" xml-lang="en-US" level="2" l10n="NEW">Menu name</paragraph>
-<paragraph role="paragraph" id="par_idN1055C" xml-lang="en-US" l10n="NEW">Enter a name for the menu. To specify a letter in the name as an accelerator key, enter a tilde (~) before the letter.</paragraph>
+<paragraph role="paragraph" id="par_idN1055C" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter a name for the menu. To specify a letter in the name as an accelerator key, enter a tilde (~) before the letter.</ahelp></paragraph>
+
 <paragraph role="heading" id="par_idN1055F" xml-lang="en-US" level="2" l10n="NEW">Menu position</paragraph>
 <paragraph role="paragraph" id="par_idN10563" xml-lang="en-US" l10n="NEW">Moves the selected menu entry up one position or down one position in the menu when you click the arrow buttons.</paragraph>
 <embed href="text/shared/01/06140100.xhp#updown"/>
diff --git a/helpcontent2/source/text/shared/01/06140102.xhp b/helpcontent2/source/text/shared/01/06140102.xhp
index 491f4d2bd6..d2137cbfb3 100755
--- a/helpcontent2/source/text/shared/01/06140102.xhp
+++ b/helpcontent2/source/text/shared/01/06140102.xhp
@@ -4,7 +4,7 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -30,25 +30,24 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************-->
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textshared0106140102xml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">Move Menu</title>
 <filename>/text/shared/01/06140102.xhp</filename>
 </topic>
-<history>
-<created date="2004-07-12T14:47:43">UFI: Move Menu dialog from Customize dialog</created>
-<lastedited date="2004-09-21T09:40:29">dedr: reviewed</lastedited>
-</history>
 </meta>
 <body>
 <paragraph role="heading" id="par_idN10540" xml-lang="en-US" level="1" l10n="NEW">Move Menu</paragraph>
 <section id="howtoget">
   <embed href="text/shared/00/00000406.xhp#menuemove"/>
 </section>
+
+<bookmark xml-lang="en-US" branch="hid/HID_SVX_CONFIG_MENU_LISTBOX" id="bm_id16574660" localize="false"/>
+
 <paragraph role="heading" id="par_idN10558" xml-lang="en-US" level="2" l10n="NEW">Menu position</paragraph>
-<paragraph role="paragraph" id="par_idN1055C" xml-lang="en-US" l10n="NEW">Moves the selected menu entry up one position or down one position in the menu when you click the arrow buttons.</paragraph>
+<paragraph role="paragraph" id="par_idN1055C" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Moves the selected menu entry up one position or down one position in the menu when you click an arrow button.</ahelp></paragraph>
 <embed href="text/shared/01/06140100.xhp#updown"/>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/01/06140200.xhp b/helpcontent2/source/text/shared/01/06140200.xhp
index 9eb893fb84..0b92da87ee 100644
--- a/helpcontent2/source/text/shared/01/06140200.xhp
+++ b/helpcontent2/source/text/shared/01/06140200.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 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,8 +32,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
 <topic id="textshared0106140200xml" indexer="include">
 <title id="tit" xml-lang="en-US">Keyboard</title>
@@ -59,14 +59,16 @@
 <paragraph role="note" id="par_id3150144" xml-lang="en-US" l10n="U" oldref="29">Avoid assigning shortcut keys that are currently used by your operating system.</paragraph>
 </section>
 <!-- removed HID SFX2_RADIOBUTTON_TP_CONFIG_ACCEL_RB_OFFICE -->
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_KEYBOARD:RB_OFFICE" id="bm_id393425" localize="false"/>
 <paragraph role="heading" id="hd_id3147250" xml-lang="en-US" level="2" l10n="U" oldref="27">$[officename]</paragraph>
 <paragraph role="paragraph" id="par_id3152425" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SFX2_RADIOBUTTON_TP_CONFIG_ACCEL_RB_OFFICE">Displays shortcut keys that are common to all $[officename] applications.</ahelp></paragraph>
 <!-- removed HID SFX2_RADIOBUTTON_TP_CONFIG_ACCEL_RB_MODULE -->
-<paragraph role="heading" id="hd_id3149095" xml-lang="en-US" level="2" l10n="U" oldref="25"><switchinline select="appl"><caseinline select="WRITER">Writer 
-</caseinline><caseinline select="CALC">Calc 
-</caseinline><caseinline select="IMPRESS">Impress 
-</caseinline><caseinline select="DRAW">Draw 
-</caseinline><caseinline select="MATH">Math 
+<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_KEYBOARD:RB_MODULE" id="bm_id315425" localize="false"/>
+<paragraph role="heading" id="hd_id3149095" xml-lang="en-US" level="2" l10n="U" oldref="25"><switchinline select="appl"><caseinline select="WRITER">Writer
+</caseinline><caseinline select="CALC">Calc
+</caseinline><caseinline select="IMPRESS">Impress
+</caseinline><caseinline select="DRAW">Draw
+</caseinline><caseinline select="MATH">Math
 </caseinline></switchinline></paragraph>
 <paragraph role="paragraph" id="par_id3155892" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SFX2_RADIOBUTTON_TP_CONFIG_ACCEL_RB_MODULE">Displays shortcut keys for the current $[officename] application.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_ACCELCONFIG_LISTBOX" id="bm_id3150355" localize="false"/>
@@ -81,20 +83,26 @@
 <paragraph role="heading" id="hd_id3154380" xml-lang="en-US" level="3" l10n="U" oldref="9">Function</paragraph>
 <paragraph role="paragraph" id="par_id3159148" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="HID_CONFIGFUNCTION_ACC_LISTBOX">Select a function that you want to assign a shortcut key to, click a key combination in the <emph>Shortcut keys</emph> list, and then click <emph>Modify</emph>. If the selected function already has a shortcut key, it is displayed in the <emph>Keys </emph>list.</ahelp></paragraph>
 <!-- removed HID SFX2:LISTBOX:TP_CONFIG_ACCEL:BOX_ACC_KEY -->
+
 <paragraph role="heading" id="hd_id3153332" xml-lang="en-US" level="3" l10n="U" oldref="11">Keys</paragraph>
 <paragraph role="paragraph" id="par_id3150084" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SFX2:LISTBOX:TP_CONFIG_ACCEL:BOX_ACC_KEY">Displays the shortcut keys that are assigned to the selected function.</ahelp></paragraph>
 <!-- removed HID SFX2:PUSHBUTTON:TP_CONFIG_ACCEL:BTN_ACC_CHANGE -->
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_ACC_CHANGE" id="bm_id31593425" localize="false"/>
 <paragraph role="heading" id="hd_id3150772" xml-lang="en-US" level="2" l10n="U" oldref="15">Modify</paragraph>
 <paragraph role="paragraph" id="par_id3152909" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SFX2:PUSHBUTTON:TP_CONFIG_ACCEL:BTN_ACC_CHANGE">Assigns the key combination selected in the <emph>Shortcut keys</emph> list to the command selected in the <emph>Function </emph>list.</ahelp></paragraph>
 <!-- removed HID SFX2:PUSHBUTTON:TP_CONFIG_ACCEL:BTN_ACC_REMOVE -->
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_ACC_REMOVE" id="bm_id31593424" localize="false"/>
 <paragraph role="paragraph" id="par_id7730033" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Deletes the selected element or elements without requiring confirmation.</ahelp></paragraph>
 <!-- removed HID SFX2:PUSHBUTTON:TP_CONFIG_ACCEL:BTN_LOAD -->
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_LOAD" id="bm_id31593423" localize="false"/>
 <paragraph role="heading" id="hd_id3154307" xml-lang="en-US" level="2" l10n="U" oldref="17">Load</paragraph>
 <paragraph role="paragraph" id="par_id3145609" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SFX2:PUSHBUTTON:TP_CONFIG_ACCEL:BTN_LOAD">Replaces the shortcut key configuration with one that was previously saved.</ahelp></paragraph>
 <!-- removed HID SFX2:PUSHBUTTON:TP_CONFIG_ACCEL:BTN_SAVE -->
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_SAVE" id="bm_id31593422" localize="false"/>
 <paragraph role="heading" id="hd_id3150823" xml-lang="en-US" level="2" l10n="U" oldref="19">Save</paragraph>
 <paragraph role="paragraph" id="par_id3149655" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SFX2:PUSHBUTTON:TP_CONFIG_ACCEL:BTN_SAVE">Saves the current shortcut key configuration, so that you can load it later.</ahelp></paragraph>
 <!-- removed HID sfx2_PushButton_TP_CONFIG_ACCEL_BTN_RESET -->
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_RESET" id="bm_id31593421" localize="false"/>
 <paragraph role="paragraph" id="par_id756248" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Resets modified values back to the default values.</ahelp></paragraph><comment>i48946</comment>
 <section id="relatedtopics">
 <embed href="text/shared/guide/configure_overview.xhp#configure_overview"/>
diff --git a/helpcontent2/source/text/shared/01/06140400.xhp b/helpcontent2/source/text/shared/01/06140400.xhp
index 110971a23a..b7d8dcc573 100755
--- a/helpcontent2/source/text/shared/01/06140400.xhp
+++ b/helpcontent2/source/text/shared/01/06140400.xhp
@@ -6,7 +6,7 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -53,9 +53,15 @@
 </section>
 <paragraph role="heading" id="par_idN10601" xml-lang="en-US" level="2" l10n="NEW">Toolbar</paragraph>
 <paragraph role="paragraph" id="par_idN10604" xml-lang="en-US" l10n="NEW">Select the toolbar you want to edit.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_SVX_NEW_TOOLBAR" id="bm_id7147434" localize="false"/><paragraph role="heading" id="par_idN10607" xml-lang="en-US" level="2" l10n="NEW">New</paragraph>
-<paragraph role="paragraph" id="par_idN1060A" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Opens the Name dialog, where you enter the name of a new toolbar and select the location of the new toolbar.</ahelp>Opens the <link href="text/shared/01/06140101.xhp">Name</link> dialog, where you enter the name of a new toolbar and select the location of the new toolbar.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_SVX_MODIFY_TOOLBAR" id="bm_id6964323" localize="false"/><paragraph role="heading" id="par_idN1061B" xml-lang="en-US" level="2" l10n="NEW">Toolbar</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SVX_NEW_TOOLBAR" id="bm_id7147434" localize="false"/>
+<paragraph role="heading" id="par_idN10607" xml-lang="en-US" level="2" l10n="NEW">New</paragraph>
+<paragraph role="paragraph" id="par_idN1060A" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Opens the Name dialog, where you enter the name of a new toolbar and select the location of the new toolbar.</ahelp>Opens the Name dialog, where you enter the name of a new toolbar and select the location of the new toolbar.</paragraph>
+
+<paragraph role="paragraph" id="par_idN106011" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enter the name of a new toolbar.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN106012" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Select the location of the new toolbar.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/HID_SVX_MODIFY_TOOLBAR" id="bm_id6964323" localize="false"/>
+<paragraph role="heading" id="par_idN1061B" xml-lang="en-US" level="2" l10n="NEW">Toolbar</paragraph>
 <paragraph role="paragraph" id="par_idN1061E" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The Toolbar button opens a submenu</ahelp> with the following commands:</paragraph>
 <paragraph role="heading" id="par_idN10621" xml-lang="en-US" level="3" l10n="NEW">Rename</paragraph>
 <paragraph role="paragraph" id="par_idN10624" xml-lang="en-US" l10n="NEW">Opens the <emph>Name</emph> dialog, where you enter a new name for the selected toolbar.</paragraph>
@@ -73,8 +79,9 @@
 <paragraph role="paragraph" id="par_idN1065E" xml-lang="en-US" l10n="NEW">Shows icons and text.</paragraph>
 <paragraph role="heading" id="par_idN10661" xml-lang="en-US" level="2" l10n="NEW">Commands</paragraph>
 <paragraph role="paragraph" id="par_idN10664" xml-lang="en-US" l10n="NEW">Displays a list of commands for the selected toolbar of the current application or document.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_SVX_NEW_TOOLBAR_ITEM" id="bm_id3407696" localize="false"/><paragraph role="heading" id="par_idN10667" xml-lang="en-US" level="2" l10n="NEW">Add</paragraph>
-<paragraph role="paragraph" id="par_idN1066A" xml-lang="en-US" l10n="NEW">Opens the Add Commands dialog. Select any command, then click <emph>Add</emph> or drag-and-drop the command into the <emph>Customize</emph> dialog.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_SVX_NEW_TOOLBAR_ITEM" id="bm_id3407696" localize="false"/>
+<paragraph role="heading" id="par_idN10667" xml-lang="en-US" level="2" l10n="NEW">Add</paragraph>
+<paragraph role="paragraph" id="par_idN1066A" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the Add Commands dialog. Select any command, then click <emph>Add</emph> or drag-and-drop the command into the <emph>Customize</emph> dialog.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SVX_MODIFY_TOOLBAR_ITEM" id="bm_id3650929" localize="false"/><paragraph role="heading" id="par_idN10675" xml-lang="en-US" level="2" l10n="NEW">Modify</paragraph>
 <paragraph role="paragraph" id="par_idN10678" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The Modify button opens a submenu</ahelp> with the following commands:</paragraph>
 <paragraph role="heading" id="par_idN1067B" xml-lang="en-US" level="3" l10n="NEW">Rename</paragraph>
diff --git a/helpcontent2/source/text/shared/01/06140402.xhp b/helpcontent2/source/text/shared/01/06140402.xhp
index b348c2c52c..c18cb0a4c7 100755
--- a/helpcontent2/source/text/shared/01/06140402.xhp
+++ b/helpcontent2/source/text/shared/01/06140402.xhp
@@ -6,7 +6,7 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -44,11 +44,13 @@
 </meta>
 <body>
 <paragraph role="heading" id="par_idN10543" xml-lang="en-US" level="1" l10n="NEW">Change Icon</paragraph>
-<paragraph role="heading" id="par_idN10547" xml-lang="en-US" level="2" l10n="NEW">Buttons</paragraph>
+<paragraph role="heading" id="par_idN10547" xml-lang="en-US" level="2" l10n="CHG">Icons</paragraph>
 <paragraph role="paragraph" id="par_idN1054B" xml-lang="en-US" l10n="NEW">Displays the available icons in %PRODUCTNAME. To replace the icon that you selected in the <link href="text/shared/01/06140400.xhp">Customize</link> dialog, click an icon, then click the <emph>OK</emph> button.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui:PushButton:MD_ICONSELECTOR:BTN_IMPORT" id="bm_id1383709" localize="false"/><paragraph role="heading" id="par_idN1055C" xml-lang="en-US" level="2" l10n="NEW">Import</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:MD_ICONSELECTOR:BTN_IMPORT" id="bm_id1383709" localize="false"/>
+<paragraph role="heading" id="par_idN1055C" xml-lang="en-US" level="2" l10n="NEW">Import</paragraph>
 <paragraph role="paragraph" id="par_idN10560" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Adds new icons to the list of icons. You see a file open dialog that imports the selected icon or icons into the internal icon directory of %PRODUCTNAME.</ahelp></paragraph>
 <paragraph role="note" id="par_idN10575" xml-lang="en-US" l10n="NEW">You can only import icons that are in the PNG file format and that are 16x16 or 26x26 pixels in size.</paragraph>
-<!-- removed HID svx_PushButton_MD_ICONSELECTOR_BTN_REMOVE --><comment>just guessing the help id</comment><paragraph role="paragraph" id="par_id8224433" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click to remove the selected icon from the list. Only user-defined icons can be removed.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:MD_ICONSELECTOR:BTN_DELETE" id="bm_id1383799" localize="false"/>
+<paragraph role="paragraph" id="par_id8224433" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click to remove the selected icon from the list. Only user-defined icons can be removed.</ahelp></paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/01/mediaplayer.xhp b/helpcontent2/source/text/shared/01/mediaplayer.xhp
index 04c1e0b814..46a7b93392 100755
--- a/helpcontent2/source/text/shared/01/mediaplayer.xhp
+++ b/helpcontent2/source/text/shared/01/mediaplayer.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 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,8 +32,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
       <topic id="textshared01mediaplayerxml" indexer="include" status="PUBLISH">
          <title xml-lang="en-US" id="tit">Media Player</title>
@@ -48,7 +48,7 @@
 <bookmark xml-lang="en-US" branch="hid/.uno:AVMediaPlayer" id="bm_id3334452" localize="false"/>
 <paragraph xml-lang="en-US" id="par_idN10550" role="heading" level="1" l10n="NEW"><variable id="mediaplayertitle"><link href="text/shared/01/mediaplayer.xhp">Media Player</link>
 </variable></paragraph>
-         <paragraph xml-lang="en-US" id="par_idN10560" role="paragraph" l10n="NEW"><ahelp hid="6694">Opens the Media Player window where you can preview movie and sound files as well as insert these files into the current document.</ahelp></paragraph>
+         <paragraph xml-lang="en-US" id="par_idN10560" role="paragraph" l10n="NEW"><ahelp hid=".">Opens the Media Player window where you can preview movie and sound files as well as insert these files into the current document.</ahelp></paragraph>
       </section>
       <section id="howtoget">
          <embed href="text/shared/00/00000406.xhp#mediaplayer"/>
@@ -78,7 +78,7 @@
       <paragraph xml-lang="en-US" id="par_idN105A8" role="paragraph" l10n="NEW">Turns sound off and on.</paragraph>
       <paragraph xml-lang="en-US" id="par_idN105AB" role="heading" level="2" l10n="NEW">Volume slider</paragraph>
       <paragraph xml-lang="en-US" id="par_idN105AF" role="paragraph" l10n="NEW">Adjusts the volume.</paragraph>
-      <paragraph xml-lang="en-US" id="par_idN105B2" role="heading" level="2" l10n="NEW">Zoom</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN105B2" role="heading" level="2" l10n="CHG">View</paragraph>
       <paragraph xml-lang="en-US" id="par_idN105B6" role="paragraph" l10n="NEW">Adjusts the size of the movie playback.</paragraph>
       <paragraph xml-lang="en-US" id="par_idN105B9" role="heading" level="2" l10n="NEW">Position slider</paragraph>
       <paragraph xml-lang="en-US" id="par_idN105BD" role="paragraph" l10n="NEW">Moves to a different position in the file.</paragraph>
diff --git a/helpcontent2/source/text/shared/autopi/01130000.xhp b/helpcontent2/source/text/shared/autopi/01130000.xhp
index 12227de0d4..76f8d0d9aa 100755
--- a/helpcontent2/source/text/shared/autopi/01130000.xhp
+++ b/helpcontent2/source/text/shared/autopi/01130000.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 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,8 +32,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
 <topic id="textsharedautopi01130000xml" indexer="include">
 <title id="tit" xml-lang="en-US">Document Converter</title>
@@ -43,6 +43,7 @@
 <body><comment>mw deleted all index entries because of guide import_ms.xhp</comment>
 <paragraph role="paragraph" id="par_id3151097" xml-lang="en-US" l10n="E" oldref="1" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_DLGIMPORT_0_CMDHELP" id="bm_id3154751" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGIMPORT_DIALOG" id="bm_id3150478" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/macro:///ImportWizard.Main.Main" id="bm_id4087038" localize="false"/>
 <paragraph role="heading" id="hd_id3149798" xml-lang="en-US" level="1" l10n="U" oldref="9">Document Converter</paragraph>
 <paragraph role="paragraph" id="par_id3149346" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="ms"><ahelp hid=".">Copies and converts documents into the OpenDocument XML format used by $[officename].</ahelp>
diff --git a/helpcontent2/source/text/shared/autopi/01150000.xhp b/helpcontent2/source/text/shared/autopi/01150000.xhp
index 4e180daa23..e2735e910c 100644
--- a/helpcontent2/source/text/shared/autopi/01150000.xhp
+++ b/helpcontent2/source/text/shared/autopi/01150000.xhp
@@ -6,7 +6,7 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,8 +34,7 @@
  ************************************************************************
  -->
 
-
-		<helpdocument version="1.0">
+<helpdocument version="1.0">
 <meta>
 <topic id="textsharedautopi01150000xml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">Euro Converter Wizard</title>
@@ -50,7 +49,9 @@
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/SID_EURO_CONVERTER" id="bm_id7067290" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:EuroConverter" id="bm_id3150476" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/macro:///Euro.AutoPilotRun.StartAutoPilot" id="bm_id6101870" localize="false"/><paragraph role="heading" id="hd_id3154840" xml-lang="en-US" level="1" l10n="U" oldref="1">Euro Converter Wizard</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGCONVERT_DIALOG" id="bm_id3150477" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/macro:///Euro.AutoPilotRun.StartAutoPilot" id="bm_id6101870" localize="false"/>
+<paragraph role="heading" id="hd_id3154840" xml-lang="en-US" level="1" l10n="U" oldref="1">Euro Converter Wizard</paragraph>
 <paragraph role="paragraph" id="par_id3149140" xml-lang="en-US" l10n="U" oldref="2"><variable id="eurokonv"><ahelp hid=".uno:EuroConverter">Converts the currency amounts found in $[officename] Calc documents and in fields and tables of $[officename] Writer documents into euros.</ahelp>
 </variable></paragraph>
 <paragraph role="paragraph" id="par_id3145669" xml-lang="en-US" l10n="U" oldref="54">Only closed files are converted. It is possible, however, to use the Euro Converter in an open $[officename] Calc document. In this case, a separate dialog opens. This dialog is described <link href="text/shared/autopi/01150000.xhp" name="at the end of this section">at the end of this section</link>.</paragraph>
diff --git a/helpcontent2/source/text/shared/autopi/01170000.xhp b/helpcontent2/source/text/shared/autopi/01170000.xhp
index 7c28be8667..f1543fdf97 100755
--- a/helpcontent2/source/text/shared/autopi/01170000.xhp
+++ b/helpcontent2/source/text/shared/autopi/01170000.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 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,8 +32,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
 <topic id="textsharedautopi01170000xml" indexer="include">
 <title id="tit" xml-lang="en-US">Address Data Source</title>
@@ -44,6 +44,7 @@
 <section id="adressdatenquelle">
 <bookmark xml-lang="en-US" branch="hid/extensions:TabPage:RID_PAGE_SELECTABTYPE" id="bm_id2237617" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/slot:10934" id="bm_id3581347" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_ABSPILOT" id="bm_id3581348" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:AutoPilotAddressDataSource" id="bm_id6961272" localize="false"/>
 <paragraph role="heading" id="hd_id3147285" xml-lang="en-US" level="1" l10n="U" oldref="2"><link href="text/shared/autopi/01170000.xhp" name="Address Data Source">Address Data Source</link></paragraph>
 <paragraph role="paragraph" id="par_id3153910" xml-lang="en-US" l10n="CHG" oldref="3"><ahelp hid=".">This wizard registers an existing address book as a data source in $[officename].</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/guide/collab.xhp b/helpcontent2/source/text/shared/guide/collab.xhp
index 5611fbcb06..7527178451 100644
--- a/helpcontent2/source/text/shared/guide/collab.xhp
+++ b/helpcontent2/source/text/shared/guide/collab.xhp
@@ -6,7 +6,7 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -47,11 +47,11 @@
 <bookmark_value>collaboration</bookmark_value>
 </bookmark>
   <comment>MW changed the index entries to one level entries.</comment>
-  <paragraph xml-lang="en-US" id="hd_id130008" role="heading" level="1" l10n="NEW"><variable id="collab"><link href="text/shared/guide/collab.xhp">Collaboration</link> 
+  <paragraph xml-lang="en-US" id="hd_id130008" role="heading" level="1" l10n="NEW"><variable id="collab"><link href="text/shared/guide/collab.xhp">Collaboration</link>
 </variable></paragraph>
   <paragraph xml-lang="en-US" id="par_id5821710" role="paragraph" l10n="NEW">In %PRODUCTNAME Writer, Impress, and Draw, only one user at a time can open any document for writing. In Calc, many users can open the same spreadsheet for writing at the same time.</paragraph>
   <comment>Tools - Share Document menu</comment>
-  
+
 <bookmark xml-lang="en-US" branch="hid/.uno:ShareDocument" id="bm_id8779564" localize="false"/>
   <paragraph xml-lang="en-US" id="par_id9590136" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Opens the Share Document dialog where you can enable or disable collaborative sharing of the document.</ahelp></paragraph>
   <comment>Share Document dialog - Share this spreadsheet with other users</comment>
@@ -86,23 +86,23 @@
    </listitem>
   </list>
   <comment>Resolve Conflicts dialog</comment>
-  
+
 <bookmark xml-lang="en-US" branch="hid/HID_SCDLG_CONFLICTS" id="bm_id9671926" localize="false"/>
   <paragraph xml-lang="en-US" id="par_id5800653" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">If the same contents are changed by different users, the Resolve Conflicts dialog opens. For each conflict, decide which changes to keep.</ahelp></paragraph>
   <comment>Keep Mine</comment>
-  
+
 <bookmark xml-lang="en-US" branch="hid/sc:PushButton:RID_SCDLG_CONFLICTS:BTN_KEEPMINE" id="bm_id1640369" localize="false"/>
   <paragraph xml-lang="en-US" id="par_id6263924" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Keeps your change, voids the other change.</ahelp></paragraph>
   <comment>Keep Other</comment>
-  
+
 <bookmark xml-lang="en-US" branch="hid/sc:PushButton:RID_SCDLG_CONFLICTS:BTN_KEEPOTHER" id="bm_id1640360" localize="false"/>
   <paragraph xml-lang="en-US" id="par_id3609118" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Keeps the change of the other user, voids your change.</ahelp></paragraph>
   <comment>Keep All Mine</comment>
-  
+
 <bookmark xml-lang="en-US" branch="hid/sc:PushButton:RID_SCDLG_CONFLICTS:BTN_KEEPALLMINE" id="bm_id1640361" localize="false"/>
   <paragraph xml-lang="en-US" id="par_id7184057" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Keeps all your changes, voids all other changes.</ahelp></paragraph>
   <comment>Keep All Others</comment>
-  
+
 <bookmark xml-lang="en-US" branch="hid/sc:PushButton:RID_SCDLG_CONFLICTS:BTN_KEEPALLOTHERS" id="bm_id1640363" localize="false"/>
   <paragraph xml-lang="en-US" id="par_id786767" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Keeps the changes of all other users, voids your changes.</ahelp></paragraph>
   <paragraph xml-lang="en-US" id="hd_id2934965" role="heading" level="3" l10n="NEW">Saving a shared spreadsheet document</paragraph>
@@ -123,6 +123,7 @@
    </listitem>
   </list>
   <paragraph xml-lang="en-US" id="par_id7186498" role="paragraph" l10n="NEW">When a user successfully saves a shared spreadsheet, the document will be reloaded after the save command, so that the spreadsheet shows the latest version of all changes that got saved by all users. A message shows that "foreign changes have been added" when another user did change some contents.</paragraph>
+
   <paragraph xml-lang="en-US" id="hd_id2871791" role="heading" level="2" l10n="NEW">Collaboration in Writer, Impress, and Draw</paragraph>
   <paragraph xml-lang="en-US" id="par_id2675862" role="paragraph" l10n="NEW">For all modules Writer, Impress, Draw, and for Calc when document sharing is not enabled, a file locking is possible. This file locking is available even when accessing the same document from different operating systems:</paragraph>
   <paragraph xml-lang="en-US" id="par_id7333597" role="paragraph" l10n="NEW">User A opens a document. The following conditions can apply:</paragraph>
@@ -140,10 +141,23 @@
     <paragraph xml-lang="en-US" id="par_id206610" role="paragraph" l10n="NEW">User A sees a dialog that tells the user the document is locked. The dialog offers to open the document in read-only mode, or to open a copy for editing, or to cancel the Open command.</paragraph>
    </listitem>
   </list>
+
+  <paragraph xml-lang="en-US" id="hd_id29349651" role="heading" level="2" l10n="NEW">User access permissions and sharing documents</paragraph>
+  <paragraph xml-lang="en-US" id="par_id11746571" role="paragraph" l10n="NEW">Some conditions must be met on operating systems with a user permission management.</paragraph>
+  <list type="unordered">
+   <listitem>
+    <paragraph xml-lang="en-US" id="par_id25775931" role="paragraph" l10n="NEW">The shared file needs to reside in a location which is accessible by all collaborators.</paragraph>
+   </listitem>
+   <listitem>
+    <paragraph xml-lang="en-US" id="par_id90496531" role="paragraph" l10n="NEW">The file permissions for both the document and the corresponding lock file need to be set so that all collaborators can create, delete, and change the files.</paragraph>
+   </listitem>
+  </list>
+  <paragraph xml-lang="en-US" id="par_id71864981" role="warning" l10n="NEW">Write access also enables other users to (accidentally or deliberately) delete or change a file.</paragraph>
+
   <section id="relatedtopics">
-   
+
    <paragraph xml-lang="en-US" id="par_id4263740" role="paragraph" l10n="NEW"><link href="text/shared/01/01070000.xhp" name="Save As">Save As</link></paragraph>
-   
+
   </section>
  </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/guide/fontwork.xhp b/helpcontent2/source/text/shared/guide/fontwork.xhp
index 8dc43440c8..1dc6550687 100755
--- a/helpcontent2/source/text/shared/guide/fontwork.xhp
+++ b/helpcontent2/source/text/shared/guide/fontwork.xhp
@@ -70,10 +70,10 @@
          <listitem>
 
 	 <bookmark xml-lang="en-US" branch="hid/HID_CTL_FONTWORK_FAVORITES" id="bm_id3156415" localize="false"/>
-<paragraph role="paragraph" id="par_id3149761" xml-lang="en-US" l10n="U" oldref="55"><ahelp hid="." visibility="hidden">Select a Fontwork style and click OK to insert the Fontwork into your document. Double-click the Fontwork in your document to enter text edit mode and change the text.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3149761" xml-lang="en-US" l10n="U" oldref="55"><ahelp hid="." visibility="hidden">Select a Fontwork style and click OK to insert the Fontwork into your document. Double-click or Ctrl+double-click the Fontwork in your document to enter text edit mode and change the text.</ahelp></paragraph>
 
             <paragraph xml-lang="en-US" id="par_idN106A0" role="paragraph" l10n="NEW">In the <emph>Fontwork Gallery</emph> dialog, select a Fontwork style and click OK.</paragraph>
-            <paragraph xml-lang="en-US" id="par_idN10755" role="paragraph" l10n="NEW">The Fontwork object is inserted into your document.</paragraph>
+            <paragraph xml-lang="en-US" id="par_idN10755" role="paragraph" l10n="NEW">The Fontwork object is inserted into your document. Fontwork objects are Custom Shapes. Using the 3D Settings toolbar, you can switch the view at any time from 2D to 3D and back.</paragraph>
          </listitem>
          <listitem>
             <paragraph xml-lang="en-US" id="par_idN106A4" role="paragraph" l10n="NEW">Double-click the object to enter text edit mode.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/import_ms.xhp b/helpcontent2/source/text/shared/guide/import_ms.xhp
index 0618ec04d6..afca74c3b0 100755
--- a/helpcontent2/source/text/shared/guide/import_ms.xhp
+++ b/helpcontent2/source/text/shared/guide/import_ms.xhp
@@ -57,8 +57,9 @@
          <bookmark_value>converters; XML</bookmark_value>
          <bookmark_value>Document Converter Wizard</bookmark_value>
          <bookmark_value>wizards; document converter</bookmark_value>
+	 <bookmark_value>converters; document converter</bookmark_value>
          <bookmark_value>files, see also documents</bookmark_value>
-</bookmark><comment>MW inserted cross-reference "files, see also documents"</comment><comment>MW changed "defaults;..."</comment>
+</bookmark><comment>MW inserted cross-reference "files, see also documents"</comment><comment>MW changed "defaults;..."</comment><comment>ufi added "converters;document converter"</comment>
 <paragraph xml-lang="en-US" id="hd_id3145313" role="heading" level="1" l10n="U" oldref="2"><variable id="import_ms"><link href="text/shared/guide/import_ms.xhp" name="Opening documents saved in other formats">Opening documents saved in other formats</link>
 </variable></paragraph>
 <paragraph role="paragraph" id="par_id3145345" xml-lang="en-US" l10n="U" oldref="3">You can open a document saved in another format by using the following procedure:</paragraph>
diff --git a/helpcontent2/source/text/shared/optionen/01030500.xhp b/helpcontent2/source/text/shared/optionen/01030500.xhp
index 24108d2ac2..2e626a0250 100644
--- a/helpcontent2/source/text/shared/optionen/01030500.xhp
+++ b/helpcontent2/source/text/shared/optionen/01030500.xhp
@@ -5,7 +5,7 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,7 +32,7 @@
  *
  ************************************************************************
  -->
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textsharedoptionen01030500xml" indexer="include" status="PUBLISH">
@@ -47,6 +47,7 @@
 <body>
 <section id="html">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3155132"><bookmark_value>$[officename] Basic scripts in HTML documents</bookmark_value>
+<bookmark_value>HTML;compatibility settings</bookmark_value>
 </bookmark>
 <!-- removed HID OFFMGR:TABPAGE:RID_OFAPAGE_HTMLOPT -->
 <paragraph role="heading" id="hd_id3153821" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01030500.xhp" name="HTML compatibility">HTML compatibility</link></paragraph>