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

1 files changed, 19 insertions, 16 deletions

diff --git a/helpcontent2/source/text/shared/01/03010000.xhp b/helpcontent2/source/text/shared/01/03010000.xhp
index ab69c7b996..13d020487f 100644
--- a/helpcontent2/source/text/shared/01/03010000.xhp
+++ b/helpcontent2/source/text/shared/01/03010000.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="textshared0103010000xml" indexer="include" status="PUBLISH">
          <title xml-lang="en-US" id="tit">Zoom &amp; View Layout</title>
@@ -44,7 +44,7 @@
          <bookmark_value>screen; scaling</bookmark_value>
          <bookmark_value>pages; scaling</bookmark_value>
 </bookmark><comment>mw deleted "scaling;"</comment>
-<bookmark xml-lang="en-US" branch="hid/SID_ATTR_ZOOM" id="bm_id2031101" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:Zoom" id="bm_id2031101" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:Zoom" id="bm_id3153321" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3154682" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/01/03010000.xhp">Zoom &amp; View Layout</link></paragraph>
          <paragraph xml-lang="en-US" id="par_id3149578" role="paragraph" l10n="U" oldref="2"><variable id="massstabtext"><ahelp hid=".uno:Zoom">Reduces or enlarges the screen display of %PRODUCTNAME.</ahelp>
@@ -57,40 +57,43 @@
       <paragraph xml-lang="en-US" id="hd_id3149669" role="heading" level="2" l10n="U" oldref="3">Zoom factor</paragraph>
       <paragraph xml-lang="en-US" id="par_id3154389" role="paragraph" l10n="CHG" oldref="4">Set the zoom factor at which to display the current document and all documents of the same type that you open thereafter.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXDLG_ZOOM:BTN_OPTIMAL" id="bm_id3145606" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_MNU_ZOOM_OPTIMAL" id="bm_id3150498" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SVX_HID_MNU_ZOOM_OPTIMAL" id="bm_id3150498" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3153351" role="heading" level="2" l10n="U"
                  oldref="20">Optimal</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3144760" role="paragraph" l10n="U" oldref="21"><ahelp hid="HID_MNU_ZOOM_OPTIMAL"><switchinline select="appl"><caseinline select="CALC">Resizes the display to fit the width of the selected cell area at the moment the command is started. 
+      <paragraph xml-lang="en-US" id="par_id3144760" role="paragraph" l10n="U" oldref="21"><ahelp hid="HID_MNU_ZOOM_OPTIMAL"><switchinline select="appl"><caseinline select="CALC">Resizes the display to fit the width of the selected cell area at the moment the command is started.
 </caseinline><defaultinline>Resizes the display to fit the width of the text in the document at .</defaultinline></switchinline></ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXDLG_ZOOM:BTN_WHOLE_PAGE" id="bm_id3150359" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_MNU_ZOOM_WHOLE_PAGE" id="bm_id3150358" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SVX_HID_MNU_ZOOM_WHOLE_PAGE" id="bm_id3150358" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3151210" role="heading" level="2" l10n="CHG"
                  oldref="22">Fit width and height</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3150543" role="paragraph" l10n="U" oldref="25"><ahelp hid="HID_MNU_ZOOM_WHOLE_PAGE"><switchinline select="appl"><caseinline select="CALC">Resizes the display to fit the width and height of the selected cell area at the moment the command is started. 
+      <paragraph xml-lang="en-US" id="par_id3150543" role="paragraph" l10n="U" oldref="25"><ahelp hid="HID_MNU_ZOOM_WHOLE_PAGE"><switchinline select="appl"><caseinline select="CALC">Resizes the display to fit the width and height of the selected cell area at the moment the command is started.
 </caseinline><defaultinline>Displays the entire page on your screen.</defaultinline></switchinline></ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXDLG_ZOOM:BTN_PAGE_WIDTH" id="bm_id3148797" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_MNU_ZOOM_PAGE_WIDTH" id="bm_id3154140" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SVX_HID_MNU_ZOOM_PAGE_WIDTH" id="bm_id3154140" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3152771" role="heading" level="2" l10n="CHG"
                  oldref="24">Fit width</paragraph>
       <paragraph xml-lang="en-US" id="par_id3143231" role="paragraph" l10n="U" oldref="23"><ahelp hid="HID_MNU_ZOOM_PAGE_WIDTH">Displays the complete width of the document page. The top and bottom edges of the page may not be visible.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_MNU_ZOOM_200" id="bm_id3156280" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SVX_HID_MNU_ZOOM_200" id="bm_id3156280" localize="false"/>
 <!-- removed HID SVX:RADIOBUTTON:RID_SVXDLG_ZOOM:BTN_200 -->
+<bookmark xml-lang="en-US" branch="hid/SID_VIEW200" id="bm_id4566280" localize="false"/>
 <paragraph xml-lang="en-US" id="par_id3159151" role="paragraph" l10n="CHG" oldref="6"><ahelp hid="." visibility="hidden">Displays the document at two times its actual size.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_MNU_ZOOM_150" id="bm_id3148676" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SVX_HID_MNU_ZOOM_150" id="bm_id3148676" localize="false"/>
 <!-- removed HID SVX:RADIOBUTTON:RID_SVXDLG_ZOOM:BTN_150 -->
 <paragraph xml-lang="en-US" id="par_id3145173" role="paragraph" l10n="CHG" oldref="8"><ahelp hid="." visibility="hidden">Displays the document at one and a half times its actual size.</ahelp></paragraph>
       <section id="hdrt">
-<bookmark xml-lang="en-US" branch="hid/HID_MNU_ZOOM_100" id="bm_id3149560" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SID_VIEW100" id="bm_id3159252" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SVX_HID_MNU_ZOOM_100" id="bm_id3149560" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:View100" id="bm_id3159252" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXDLG_ZOOM:BTN_100" id="bm_id051420080349501" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3153106" role="heading" level="2" l10n="U" oldref="9">100 %</paragraph>
          <paragraph xml-lang="en-US" id="par_id3147353" role="paragraph" l10n="U" oldref="10"><ahelp hid="SVX:RADIOBUTTON:RID_SVXDLG_ZOOM:BTN_100">Displays the document at its actual size.</ahelp></paragraph>
       </section>
-<bookmark xml-lang="en-US" branch="hid/HID_MNU_ZOOM_75" id="bm_id3159199" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SVX_HID_MNU_ZOOM_75" id="bm_id3159199" localize="false"/>
 <!-- removed HID SVX:RADIOBUTTON:RID_SVXDLG_ZOOM:BTN_75 -->
 <paragraph xml-lang="en-US" id="par_id3152791" role="paragraph" l10n="CHG" oldref="12"><ahelp hid="." visibility="hidden">Displays the document at 75% of its actual size.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_MNU_ZOOM_50" id="bm_id3150488" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/SVX_HID_MNU_ZOOM_50" id="bm_id3150488" localize="false"/>
 <!-- removed HID SVX:RADIOBUTTON:RID_SVXDLG_ZOOM:BTN_50 -->
+<bookmark xml-lang="en-US" branch="hid/SID_VIEW050" id="bm_id765488" localize="false"/>
+
 <paragraph xml-lang="en-US" id="par_id3156005" role="paragraph" l10n="CHG" oldref="14"><ahelp hid="." visibility="hidden">Displays the document at half of its actual size.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXDLG_ZOOM:BTN_USER" id="bm_id3147478" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXDLG_ZOOM:ED_USER" id="bm_id3151352" localize="false"/>