Commits

Anonymous committed d9ae150 Merge

CWS-TOOLING: integrate CWS hcshared29

  • Participants
  • Parent commits 5b26a30, 5b4403e

Comments (0)

Files changed (77)

File helpcontent2/source/text/scalc/01/02200000.xhp

 <!--***********************************************************************
  *
  * 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
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************-->
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textscalc0102200000xml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">Sheet</title>
 <filename>/text/scalc/01/02200000.xhp</filename>
 </topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-12-17T13:37:12">converted from old format - fpe</lastedited>
-</history>
 </meta>
 <body>
 <section id="tabellen">
 <embed href="text/scalc/01/02210000.xhp#tabellenauswaehlen"/>
 <paragraph role="heading" id="hd_id3163708" xml-lang="en-US" level="2" l10n="U" oldref="5"><link href="text/scalc/01/02170000.xhp" name="Delete">Delete</link></paragraph>
 <embed href="text/scalc/01/02170000.xhp#tabelleloeschentext"/>
+<paragraph role="heading" id="hd_id3163733308" xml-lang="en-US" level="2" l10n="NEW"><link href="text/shared/01/06140500.xhp" name="Events">Events</link></paragraph>
+<embed href="text/shared/01/06140500.xhp#assignaction"/>
 </body>
 </helpdocument>

File helpcontent2/source/text/scalc/guide/cell_protect.xhp

 <?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.
+ *
+ * Copyright 2000, 2011 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
       <topic id="textscalcguidecell_protectxml" indexer="include" status="PUBLISH">
          <title xml-lang="en-US" id="tit">Protecting Cells from Changes</title>
 </variable></paragraph>
       <paragraph xml-lang="en-US" id="par_id3153368" role="paragraph" l10n="U" oldref="17">In <item type="productname">%PRODUCTNAME</item> Calc you can protect sheets and the document as a whole. You can choose whether the cells are protected against accidental changes, whether the formulas can be viewed from within Calc, whether the cells are visible or whether the cells can be printed.</paragraph>
       <paragraph xml-lang="en-US" id="par_id3145261" role="paragraph" l10n="U" oldref="18">Protection can be provided by means of a password, but it does not have to be. If you have assigned a password, protection can only be removed once the correct password has been entered.</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3148576" role="paragraph" l10n="U" oldref="19">Note that the cell protection for cells with the <emph>Protected</emph> attribute is only effective when you protect the whole table. In the default condition, every cell has the <emph>Protected</emph> attribute. Therefore you must remove the attribute selectively for those cells where the user may make changes. You then protect the whole table and save the document.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3148576" role="paragraph" l10n="U" oldref="19">Note that the cell protection for cells with the <emph>Protected</emph> attribute is only effective when you protect the whole sheet. In the default condition, every cell has the <emph>Protected</emph> attribute. Therefore you must remove the attribute selectively for those cells where the user may make changes. You then protect the whole sheet and save the document.</paragraph>
       <paragraph xml-lang="en-US" id="par_id5974303" role="warning" l10n="NEW">These protection features are just switches to prevent accidental action. The features are not intended to provide any secure protection. For example, by exporting a sheet to another file format, a user may be able to surpass the protection features. There is only one secure protection: the password that you can apply when saving an OpenDocument file. A file that has been saved with a password can be opened only with the same password.</paragraph>
       <list type="ordered">
          <listitem>
             <paragraph xml-lang="en-US" id="par_id3149019" role="listitem" l10n="U" oldref="7">Choose <item type="menuitem">Format - Cells</item> and click the <emph>Cell Protection</emph> tab.</paragraph>
          </listitem>
          <listitem>
-            <paragraph xml-lang="en-US" id="par_id3152985" role="listitem" l10n="U" oldref="9">Select the protection options that you want.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3152985" role="listitem" l10n="U" oldref="9">Select the protection options that you want. All options will be applied only after you protect the sheet from the Tools menu - see below.</paragraph>
+                        <paragraph xml-lang="en-US" id="par_id31529866655" role="listitem" l10n="NEW">Uncheck <emph>Protected</emph> to allow the user to change the currently selected cells.</paragraph>
             <paragraph xml-lang="en-US" id="par_id3152898" role="listitem" l10n="U" oldref="10">Select <emph>Protected</emph> to prevent changes to the contents and the format of a cell. </paragraph>
             <paragraph xml-lang="en-US" id="par_idN1069A" role="listitem" l10n="NEW">Select <emph>Hide formula</emph> to hide and to protect formulas from changes.</paragraph>
             <paragraph xml-lang="en-US" id="par_idN106A1" role="listitem" l10n="NEW">Select <emph>Hide when printing</emph> to hide protected cells in the printed document. The cells are not hidden onscreen.</paragraph>

File helpcontent2/source/text/schart/01/03010000.xhp

  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * Copyright 2000, 2011 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
 <bookmark xml-lang="en-US" branch="hid/CHART2_HID_SCH_TBI_DATA_DELETE_COL" id="bm_id3153959" localize="false"/><comment>delete series</comment><paragraph role="paragraph" id="par_id3153336" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="." visibility="hidden">Deletes the current series or text column. It is not possible to delete the first text column.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/CHART2_HID_SCH_TBI_DATA_SWAP_COL" id="bm_id8501846" localize="false"/><comment>move series right</comment><paragraph role="paragraph" id="par_id4089175" xml-lang="en-US" l10n="CHG"><ahelp hid="." visibility="hidden">Switches the current column with its neighbor at the right.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/CHART2_HID_SCH_TBI_DATA_SWAP_ROW" id="bm_id4469130" localize="false"/><comment>move row down</comment><paragraph role="paragraph" id="par_id3949095" xml-lang="en-US" l10n="CHG"><ahelp hid="." visibility="hidden">Switches the current row with its neighbor below.</ahelp></paragraph><comment>edit fields, see i72361</comment>
+<!--
+<bookmark xml-lang="en-US" branch="hid/CHART2_HID_SCH_TBI_DATA_TOGGLE_DATE_CATEGORIES" id="bm_id990469130" localize="false"/><comment>Categories: Date/Text</comment><paragraph role="paragraph" id="par_id990949095" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">For a category axis that might be a date axis, you can change the formatting of the data from Date to Text.</ahelp></paragraph><comment>see i115840 and 116467</comment>
+ -->
 <bookmark xml-lang="en-US" branch="hid/CHART2_HID_SCH_DATA_SERIES_LABEL" id="bm_id3522446" localize="false"/><paragraph role="paragraph" id="par_id6697286" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enter names for the data series.</ahelp></paragraph>
 </body>
 </helpdocument>

File helpcontent2/source/text/schart/01/04050100.xhp

       <bookmark_value>trend lines in charts</bookmark_value>
       <bookmark_value>mean value lines in charts</bookmark_value>
 </bookmark>
+<comment>only use trend line, not regression curve: i89823</comment>
 <bookmark xml-lang="en-US" branch="hid/.uno:InsertMenuTrendlines" id="bm_id2001709" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id5409405" role="heading" level="1" l10n="CHG"><variable id="regression"><link href="text/schart/01/04050100.xhp">Trend Lines</link>
 </variable></paragraph>
-      <paragraph xml-lang="en-US" id="par_id7272255" role="paragraph" l10n="CHG"><variable id="trendlinestext"><ahelp hid=".">Regression curves, also known as trend lines, can be added to all 2D chart types except for Pie and Stock charts.</ahelp>
+      <paragraph xml-lang="en-US" id="par_id7272255" role="paragraph" l10n="CHG"><variable id="trendlinestext"><ahelp hid=".">Trend lines can be added to all 2D chart types except for Pie and Stock charts.</ahelp>
 </variable></paragraph>
       <embed href="text/schart/01/04030000.xhp#context"/>
       <section id="howtoget">
 <bookmark xml-lang="en-US" branch="hid/.uno:InsertTrendlineEquation" id="bm_id2754600" localize="false"/>
 <paragraph xml-lang="en-US" id="par_id846888" role="paragraph" l10n="NEW"><ahelp hid=".">To show the trend line equation, select the trend line in the chart, right-click to open the context menu, and choose <emph>Insert Trend Line Equation</emph>.</ahelp></paragraph>
       <paragraph xml-lang="en-US" id="par_id8962065" role="paragraph" l10n="CHG">When the chart is in edit mode, %PRODUCTNAME gives you the equation of the trend line and the coefficient of determination R². Click on the trend line to see the information in the status bar.</paragraph>
-      <paragraph xml-lang="en-US" id="par_id1328470" role="note" l10n="NEW">For a category chart (for example a line chart), the regression information is calculated using numbers 1, 2, 3, … as x-values. This is also true if your data series uses other numbers as names for the x-values. For such charts the XY chart type might be more suitable.</paragraph>
-      <paragraph xml-lang="en-US" id="par_id8092593" role="paragraph" l10n="CHG">To show the equation and the coefficient of determination, select the regression curve and choose <item type="menuitem">Format - Format Selection - Equation</item>.</paragraph>
-<paragraph xml-lang="en-US" id="par_id7971434" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Enable Show equation to see the equation of the regression curve.</ahelp></paragraph><comment>hid</comment>
-<paragraph xml-lang="en-US" id="par_id558793" role="paragraph" l10n="CHG"><ahelp hid="." visibility="hidden">Enable Show Coefficient of Determination to see the determination coefficient of the regression curve.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id1328470" role="note" l10n="CHG">For a category chart (for example a line chart), the trend line information is calculated using numbers 1, 2, 3, … as x-values. This is also true if your data series uses other numbers as names for the x-values. For such charts the XY chart type might be more suitable.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id8092593" role="paragraph" l10n="CHG">To show the equation and the coefficient of determination, select the trend line and choose <item type="menuitem">Format - Format Selection - Equation</item>.</paragraph>
+<paragraph xml-lang="en-US" id="par_id7971434" role="paragraph" l10n="CHG"><ahelp hid="." visibility="hidden">Enable Show equation to see the equation of the trend line.</ahelp></paragraph><comment>hid</comment>
+<paragraph xml-lang="en-US" id="par_id558793" role="paragraph" l10n="CHG"><ahelp hid="." visibility="hidden">Enable Show Coefficient of Determination to see the determination coefficient of the trend line.</ahelp></paragraph>
       <paragraph xml-lang="en-US" id="par_id7735221" role="paragraph" l10n="NEW">You can also calculate the parameters using Calc functions as follows.</paragraph>
       <paragraph xml-lang="en-US" id="hd_id5744193" role="heading" level="2" l10n="NEW">The linear regression equation</paragraph>
       <paragraph xml-lang="en-US" id="par_id9251991" role="paragraph" l10n="NEW">The <emph>linear regression</emph> follows the equation <item type="literal">y=m*x+b</item>.</paragraph>
       <paragraph xml-lang="en-US" id="par_id5946531" role="code" l10n="NEW">b = INTERCEPT(Data_Y ;LN(Data_X)) </paragraph>
       <paragraph xml-lang="en-US" id="par_id5649281" role="code" l10n="NEW">r² = RSQ(Data_Y;LN(Data_X)) </paragraph>
       <paragraph xml-lang="en-US" id="hd_id7874080" role="heading" level="2" l10n="NEW">The exponential regression equation</paragraph>
-      <paragraph xml-lang="en-US" id="par_id4679097" role="paragraph" l10n="NEW"> For exponential regression curves a transformation to a linear model takes place. The optimal curve fitting is related to the linear model and the results are interpreted accordingly. </paragraph>
+      <paragraph xml-lang="en-US" id="par_id4679097" role="paragraph" l10n="CHG"> For exponential trend lines a transformation to a linear model takes place. The optimal curve fitting is related to the linear model and the results are interpreted accordingly. </paragraph>
       <paragraph xml-lang="en-US" id="par_id9112216" role="paragraph" l10n="NEW">The exponential regression follows the equation <item type="literal">y=b*exp(a*x)</item> or <item type="literal">y=b*m^x</item>, which is transformed to <item type="literal">ln(y)=ln(b)+a*x</item> or <item type="literal">ln(y)=ln(b)+ln(m)*x</item> respectively.</paragraph>
       <paragraph xml-lang="en-US" id="par_id4416638" role="code" l10n="NEW">a = SLOPE(LN(Data_Y);Data_X) </paragraph>
       <paragraph xml-lang="en-US" id="par_id1039155" role="paragraph" l10n="CHG">The variables for the second variation are calculated as follows:</paragraph>

File helpcontent2/source/text/schart/01/05040201.xhp

 <bookmark_value>Y axes; scaling</bookmark_value>
 </bookmark><comment>mw changed "axes;scaling" to "Y axes, scaling"</comment>
 <paragraph role="heading" id="hd_id3150868" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/schart/01/05040201.xhp" name="Scale">Scale</link></paragraph>
-<paragraph role="paragraph" id="par_id3154013" xml-lang="en-US" l10n="U" oldref="2">Controls the scaling of the Y axis. The X axis can also be scaled here for X-Y charts.</paragraph>
+<paragraph role="paragraph" id="par_id3154013" xml-lang="en-US" l10n="CHG" oldref="2">Controls the scaling of the X or Y axis.</paragraph>
 </section>
 <section id="howtoget">
 <embed href="text/schart/00/00000004.xhp#frtysk"/>
 </section>
-<paragraph role="paragraph" id="par_id3148576" xml-lang="en-US" l10n="U" oldref="79">The Y axis is automatically scaled by $[officename] so that all values are optimally displayed.</paragraph>
+<paragraph role="paragraph" id="par_id3148576" xml-lang="en-US" l10n="CHG" oldref="79">The axes are automatically scaled by $[officename] so that all values are optimally displayed.</paragraph>
 <paragraph role="paragraph" id="par_id3149379" xml-lang="en-US" l10n="U" oldref="3">To achieve specific results, you can manually change the axis scaling. For example, you can display only the top areas of the columns by shifting the zero line upwards.</paragraph>
 <paragraph role="heading" id="hd_id3154730" xml-lang="en-US" level="2" l10n="U" oldref="4">Scale</paragraph>
 <paragraph role="paragraph" id="par_id3149400" xml-lang="en-US" l10n="CHG" oldref="5">You can enter values for subdividing axes in this area. You can automatically set the properties <emph>Minimum, Maximum, Major interval, Minor interval count</emph> and <emph>Reference value</emph>.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/chart2:CheckBox:TP_SCALE:CBX_AUTO_ORIGIN" id="bm_id6670125" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/CHART2_CHECKBOX_TP_SCALE_CBX_AUTO_ORIGIN" id="bm_id1006200803192265" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/chart2:CheckBox:TP_SCALE:CBX_AUTO_ORIGIN" id="bm_id1006200805190759" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/chart2:CheckBox:TP_SCALE:CBX_AUTO_TIME_RESOLUTION" id="bm_id10087605190759" localize="false"/>
 <paragraph role="heading" id="hd_id3166432" xml-lang="en-US" level="3" l10n="U" oldref="62">Automatic</paragraph>
 <paragraph role="paragraph" id="par_id3145389" xml-lang="en-US" l10n="U" oldref="63"><ahelp hid="SCH:CHECKBOX:TP_SCALE:CBX_AUTO_ORIGIN">You must first deselect the <emph>Automatic</emph> option in order to modify the values.</ahelp></paragraph>
 <paragraph role="note" id="par_id3149129" xml-lang="en-US" l10n="U" oldref="64">Disable this feature if you are working with "fixed" values, as it does not permit automatic scaling.</paragraph>
 <paragraph role="heading" id="hd_id3159206" xml-lang="en-US" level="3" l10n="U" oldref="16">Logarithmic scale</paragraph>
 <paragraph role="paragraph" id="par_id3145360" xml-lang="en-US" l10n="CHG" oldref="17"><ahelp hid="SCH:CHECKBOX:TP_SCALE:CBX_LOGARITHM">Specifies that you want the axis to be subdivided logarithmically.</ahelp></paragraph>
 <paragraph role="note" id="par_id3153956" xml-lang="en-US" l10n="U" oldref="61">Use this feature if you are working with values that differ sharply from each other. You can use logarithmic scaling to make the grid lines of the axis equidistant but have values that may increase or decrease.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/chart2:CheckBox:TP_SCALE:CBX_REVERSE" id="bm_id4007080" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/chart2:CheckBox:TP_SCALE:CBX_REVERSE" id="bm_id1024200803164240" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/chart2:CheckBox:TP_SCALE:CBX_REVERSE:Category" id="bm_id4007080" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/chart2:CheckBox:TP_SCALE:CBX_REVERSE:ValueAxis" id="bm_id1024200803164240" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/chart2:CheckBox:TP_SCALE:CBX_REVERSE_MayBeDateAxis" id="bm_id109575190759" localize="false"/>
+
 <paragraph role="heading" id="hd_id9941404" xml-lang="en-US" level="3" l10n="NEW">Reverse direction</paragraph>
 <paragraph role="paragraph" id="par_id5581835" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Defines where the lower and where the higher values are displayed at the axis. The unchecked state is the mathematical direction.</ahelp> That means for Cartesian coordinate systems that the x-axis shows the lower values on the left and the y-axis shows the lower values at the bottom. For polar coordinate systems the mathematical angle axis direction is counterclockwise and the radial axis is from inner to outer.</paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/chart2:ListBox:TP_SCALE:LB_AXIS_TYPE" id="bm_id10022759" localize="false"/>
+<paragraph role="heading" id="hd_id922204" xml-lang="en-US" level="3" l10n="NEW">Type</paragraph>
+<paragraph role="paragraph" id="par_id59225" xml-lang="en-US" l10n="NEW"><ahelp hid=".">For some types of axes, you can select to format an axis as text or date, or to detect the type automatically.</ahelp> For the axis type "Date" you can set the following options.</paragraph>
+<paragraph role="paragraph" id="par_id1159225" xml-lang="en-US" l10n="NEW">Minimum and maximum value to be shown on the ends of the scale.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/chart2:ListBox:TP_SCALE:LB_TIME_RESOLUTION" id="bm_id1344759" localize="false"/>
+<paragraph role="paragraph" id="par_id2259225" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Resolution can be set to show days, months, or years as interval steps.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/chart2:MetricField:TP_SCALE:MT_MAIN_DATE_STEP" id="bm_id2210022759" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/chart2:ListBox:TP_SCALE:LB_MAIN_TIME_UNIT" id="bm_id1033022759" localize="false"/>
+<paragraph role="paragraph" id="par_id3359225" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Major interval can be set to show a certain number of days, months, or years.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/chart2:ListBox:TP_SCALE:LB_HELP_TIME_UNIT" id="bm_id1472759" localize="false"/>
+<paragraph role="paragraph" id="par_id4459225" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Minor interval can be set to show a certain number of days, months, or years.</ahelp></paragraph>
+
 </body>
 </helpdocument>

File helpcontent2/source/text/sdraw/guide/eyedropper.xhp

 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * Copyright 2000, 2011 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************-->
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textsdrawguideeyedropperxml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">Replacing Colors</title>
 <filename>/text/sdraw/guide/eyedropper.xhp</filename>
 </topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-09-05T13:06:01">FPE: Reformatted, removed screenshot
-</lastedited>
-</history>
 </meta>
 <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3147436"><bookmark_value>eyedropper tool</bookmark_value>
 </bookmark>
 <paragraph role="heading" id="hd_id3147436" xml-lang="en-US" level="1" l10n="U" oldref="38"><variable id="eyedropper"><link href="text/sdraw/guide/eyedropper.xhp" name="Replacing Colors">Replacing Colors</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3156286" xml-lang="en-US" l10n="U" oldref="24">You can replace colors in bitmaps with the <emph>Eyedropper</emph> tool.</paragraph>
+<paragraph role="paragraph" id="par_id3156286" xml-lang="en-US" l10n="CHG" oldref="24">You can replace colors in bitmaps with the <emph>Color Replacer</emph> tool.</paragraph>
 <paragraph role="paragraph" id="par_id3154704" xml-lang="en-US" l10n="U" oldref="25">Up to four colors can be replaced at once.</paragraph>
 <paragraph role="paragraph" id="par_id3147344" xml-lang="en-US" l10n="U" oldref="26">You can also use the <emph>Transparency</emph> option to replace the transparent areas of an image with a color.</paragraph>
-<paragraph role="paragraph" id="par_id3148488" xml-lang="en-US" l10n="U" oldref="27">Similarly, you can use the <emph>Eyedropper</emph> to make a color on your image transparent.</paragraph>
-<paragraph role="heading" id="hd_id3150205" xml-lang="en-US" level="2" l10n="U" oldref="28">To replace colors with the Eyedropper tool</paragraph>
+<paragraph role="paragraph" id="par_id3148488" xml-lang="en-US" l10n="CHG" oldref="27">Similarly, you can use the <emph>Color Replacer</emph> to make a color on your image transparent.</paragraph>
+<paragraph role="heading" id="hd_id3150205" xml-lang="en-US" level="2" l10n="CHG" oldref="28">To replace colors with the Color Replacer tool</paragraph>
 <paragraph role="paragraph" id="par_id3154656" xml-lang="en-US" l10n="U" oldref="29">Ensure that the image you are using is a bitmap (for example, BMP, GIF, JPG, or PNG) or a metafile (for example, WMF).</paragraph>
 <list type="ordered">
 <listitem>
-<paragraph role="listitem" id="par_id3150202" xml-lang="en-US" l10n="U" oldref="30">Choose <emph>Tools - Eyedropper</emph>.</paragraph>
+<paragraph role="listitem" id="par_id3150202" xml-lang="en-US" l10n="CHG" oldref="30">Choose <emph>Tools - Color Replacer</emph>.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="listitem" id="par_id3155531" xml-lang="en-US" l10n="U" oldref="31">Click the Eyedropper icon and position the mouse pointer over the color you want to replace in the image. The color appears in the box next to the eyedropper icon.</paragraph>
+<paragraph role="listitem" id="par_id3155531" xml-lang="en-US" l10n="CHG" oldref="31">Click the Color Replacer icon and position the mouse pointer over the color you want to replace in the image. The color appears in the box next to the icon.</paragraph>
 </listitem>
 <listitem>
 <paragraph role="listitem" id="par_id3152985" xml-lang="en-US" l10n="U" oldref="32">Click the color in the image. The color appears in the first <emph>Source color</emph> box and the check box next to the color is selected.</paragraph>
 <paragraph role="listitem" id="par_id3149876" xml-lang="en-US" l10n="U" oldref="36">Click <emph>Replace</emph>.</paragraph>
 </listitem>
 </list>
-<paragraph role="tip" id="par_id3157871" xml-lang="en-US" l10n="U" oldref="37">If you want to expand or contract the color selection area, increase or decrease the tolerance of the <emph>Eyedropper</emph> tool and repeat your selection.</paragraph>
+<paragraph role="tip" id="par_id3157871" xml-lang="en-US" l10n="CHG" oldref="37">If you want to expand or contract the color selection area, increase or decrease the tolerance of the <emph>Color Replacer</emph> tool and repeat your selection.</paragraph>
 <section id="relatedtopics">
 <embed href="text/sdraw/guide/color_define.xhp#color_define"/>
-<paragraph role="paragraph" id="par_id3146878" xml-lang="en-US" l10n="U" oldref="39"><link href="text/shared/01/06030000.xhp" name="Eyedropper">Eyedropper</link></paragraph>
+<paragraph role="paragraph" id="par_id3146878" xml-lang="en-US" l10n="CHG" oldref="39"><link href="text/shared/01/06030000.xhp" name="Color Replacer">Color Replacer</link></paragraph>
 </section>
 </body>
 </helpdocument>

File helpcontent2/source/text/sdraw/main0200.xhp

  ***********************************************************************
  *
  * 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
  *
  ************************************************************************
  -->
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textsdrawmain0200xml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">Toolbars</title>
 <filename>/text/sdraw/main0200.xhp</filename>
 </topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-01-18T10:16:47">converted from old format - fpe</lastedited>
-</history>
 </meta>
 <body>
 <section id="symbolleisten">
 <section id="Section3">
 <embed href="text/sdraw/main0202.xhp#objektleisteznh"/>
 </section>
+<section id="SectionSW6">
+<embed href="text/shared/main0204.xhp#tablebar"/>
+</section>
 <section id="Section4">
 <embed href="text/simpress/main0203.xhp#objektleistetext"/>
 </section>

File helpcontent2/source/text/shared/00/00000200.xhp

 <paragraph role="paragraph" id="par_id14" l10n="NEW" xml-lang="en-US">For GIF files you can set the transparency and the interlaced mode.</paragraph>
 
 <bookmark xml-lang="en-US" branch="hid/svtools:CheckBox:DLG_EXPORT:CB_SAVE_TRANSPARENCY" id="bm_id676692504" localize="false"/>
-<paragraph role="paragraph" id="par_id31456456938" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Specifies whether to save the background of the picture as transparent. Only objects will be visible in the GIF image. Use the Eyedropper to set the transparent color in the picture.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id31456456938" xml-lang="en-US" l10n="CHG"><ahelp hid="." visibility="hidden">Specifies whether to save the background of the picture as transparent. Only objects will be visible in the GIF image. Use the Color Replacer to set the transparent color in the picture.</ahelp></paragraph>
 
 <comment>EPS controls</comment>
 <paragraph role="paragraph" id="par_id15" l10n="NEW" xml-lang="en-US">For EPS files you can set the preview, the color format, the compression, and the version.</paragraph>

File helpcontent2/source/text/shared/00/00000404.xhp

  ***********************************************************************
  *
  * 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
 </meta>
 <body>
 <paragraph role="heading" id="hd_id3156324" xml-lang="en-US" level="1" l10n="U" oldref="1">Insert Menu</paragraph>
-<paragraph role="paragraph" id="par_id3153808" xml-lang="en-US" l10n="CHG" oldref="28"><variable id="notiz">Choose <emph>Insert - Comment</emph> (in Writer or Calc)
+<paragraph role="paragraph" id="par_id3153808" xml-lang="en-US" l10n="CHG" oldref="28"><variable id="notiz">Choose <emph>Insert - Comment</emph>
 </variable></paragraph>
 <section id="scannen">
 <paragraph role="paragraph" id="par_id3155619" xml-lang="en-US" l10n="CHG" oldref="71">Choose <emph>Insert - Picture - Scan</emph>
 <section id="sonder">
 <paragraph role="paragraph" id="par_id3143281" xml-lang="en-US" l10n="U" oldref="34">Choose <emph>Insert - Special Character</emph>
 </paragraph>
-<paragraph role="paragraph" id="par_id3149525" xml-lang="en-US" l10n="U" oldref="35"><switchinline select="appl"><caseinline select="DRAW">Choose <emph>Format - Bullets and Numbering - Customize - Character</emph> button 
+<paragraph role="paragraph" id="par_id3149525" xml-lang="en-US" l10n="U" oldref="35"><switchinline select="appl"><caseinline select="DRAW">Choose <emph>Format - Bullets and Numbering - Customize - Character</emph> button
 </caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3152372" xml-lang="en-US" l10n="U" oldref="55"><switchinline select="appl"><caseinline select="IMPRESS">Choose <emph>Format - Bullets and Numbering - Customize - Character</emph> button 
+<paragraph role="paragraph" id="par_id3152372" xml-lang="en-US" l10n="U" oldref="55"><switchinline select="appl"><caseinline select="IMPRESS">Choose <emph>Format - Bullets and Numbering - Customize - Character</emph> button
 </caseinline></switchinline></paragraph>
 <paragraph role="paragraph" id="par_id3156560" xml-lang="en-US" l10n="CHG" oldref="36">Open the <emph>Insert</emph> toolbar, click</paragraph>
 <section id="sysonder">
 </table>
 </section>
 </section>
-<paragraph role="paragraph" id="par_id3150396" xml-lang="en-US" l10n="CHG" oldref="47"><variable id="filterauswahl">Open a file of a type that is unknown to %PRODUCTNAME and that is no text file 
+<paragraph role="paragraph" id="par_id3150396" xml-lang="en-US" l10n="CHG" oldref="47"><variable id="filterauswahl">Open a file of a type that is unknown to %PRODUCTNAME and that is no text file
 </variable></paragraph>
 <section id="hyper">
 <paragraph role="paragraph" id="par_id3150571" xml-lang="en-US" l10n="U" oldref="2">Choose <emph>View - Toolbars - Hyperlink Bar</emph>

File helpcontent2/source/text/shared/00/00000406.xhp

 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F7</paragraph>
       </section>
       <section id="etpip">
-         <paragraph xml-lang="en-US" id="par_id3153320" role="paragraph" l10n="U" oldref="10">Choose <emph>Tools - Eyedropper</emph> ($[officename] Draw and $[officename] Impress)</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153320" role="paragraph" l10n="CHG" oldref="10">Choose <emph>Tools - Color Replacer</emph> ($[officename] Draw and $[officename] Impress)</paragraph>
       </section>
       <paragraph xml-lang="en-US" id="par_idN107E9" role="paragraph" l10n="NEW"><variable id="mediaplayer">Choose <emph>Tools - Media Player</emph>
 </variable></paragraph>

File helpcontent2/source/text/shared/00/00000450.xhp

  ***********************************************************************
  *
  * 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
 </variable></paragraph>
 <paragraph role="paragraph" id="par_id3153244" xml-lang="en-US" l10n="CHG" oldref="57"><variable id="DBAbfragen"><emph>View - Database Objects - Queries</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3147294" xml-lang="en-US" l10n="CHG" oldref="4"><variable id="Typ">In a database file window, choose <emph>Edit - Database - Properties - Advanced Settings</emph> tab 
+<paragraph role="paragraph" id="par_id3147294" xml-lang="en-US" l10n="CHG" oldref="4"><variable id="Typ">In a database file window, choose <emph>Edit - Database - Properties - Advanced Settings</emph> tab
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3159411" xml-lang="en-US" l10n="CHG" oldref="5"><variable id="Datenquelle">In a database file window of type ODBC or Address book, choose Edit - Database - Connection Type 
+<paragraph role="paragraph" id="par_id3159411" xml-lang="en-US" l10n="CHG" oldref="5"><variable id="Datenquelle">In a database file window of type ODBC or Address book, choose Edit - Database - Connection Type
 </variable></paragraph>
 <paragraph role="paragraph" id="par_id3149119" xml-lang="en-US" l10n="U" oldref="6"><variable id="Verzeichnis">Path selection button in various Wizards / <emph>Edit</emph> Buttons for some entries in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Paths</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3154497" xml-lang="en-US" l10n="CHG" oldref="8"><variable id="ODBC">In a database file window of type ODBC, choose Edit - Database - Connection Type 
+<paragraph role="paragraph" id="par_id3154497" xml-lang="en-US" l10n="CHG" oldref="8"><variable id="ODBC">In a database file window of type ODBC, choose Edit - Database - Connection Type
 </variable><comment>see #i56356</comment></paragraph>
-<paragraph role="paragraph" id="par_id3149355" xml-lang="en-US" l10n="CHG" oldref="61"><variable id="ldap">In a database file window of type Address book - LDAP, choose Edit - Database - Properties 
+<paragraph role="paragraph" id="par_id3149355" xml-lang="en-US" l10n="CHG" oldref="61"><variable id="ldap">In a database file window of type Address book - LDAP, choose Edit - Database - Properties
 </variable></paragraph>
 <paragraph role="paragraph" id="par_id3157896" xml-lang="en-US" l10n="CHG" oldref="9"><variable id="JDBC">In a database file window of type JDBC, choose <emph>Edit - Database - Properties</emph>
 </variable></paragraph>
 </variable></paragraph>
 <paragraph role="paragraph" id="par_id3151110" xml-lang="en-US" l10n="CHG" oldref="21"><variable id="SQLStatement">In a database file window, choose <emph>Tools - SQL</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3147209" xml-lang="en-US" l10n="CHG" oldref="22"><variable id="Abfragen">In a database file window, click the <emph>Queries</emph> icon 
+<paragraph role="paragraph" id="par_id3147209" xml-lang="en-US" l10n="CHG" oldref="22"><variable id="Abfragen">In a database file window, click the <emph>Queries</emph> icon
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3153880" xml-lang="en-US" l10n="CHG" oldref="62"><variable id="Tabellen">In a database file window, click the <emph>Tables</emph> icon 
+<paragraph role="paragraph" id="par_id3153880" xml-lang="en-US" l10n="CHG" oldref="62"><variable id="Tabellen">In a database file window, click the <emph>Tables</emph> icon
 </variable></paragraph>
 <section id="tabellehinzu">
 <paragraph role="paragraph" id="par_id3153760" xml-lang="en-US" l10n="CHG" oldref="64"><variable id="tabellenentwurf">In a database file window, click the Tables icon. Choose Insert -<emph> Table Design</emph> or <emph>Edit - Edit</emph>
 </variable></paragraph>
 <paragraph role="paragraph" id="par_id3149579" xml-lang="en-US" l10n="CHG" oldref="24"><variable id="entwab">In a database file window, click the <emph>Queries</emph> icon, then choose <emph>Edit - Edit</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3149902" xml-lang="en-US" l10n="CHG" oldref="25"><variable id="FehlendesElement">In a database file window, click the <emph>Queries</emph> icon, then choose <emph>Edit - Edit</emph>. When referenced fields no longer exist, you see this dialog 
+<paragraph role="paragraph" id="par_id3149902" xml-lang="en-US" l10n="CHG" oldref="25"><variable id="FehlendesElement">In a database file window, click the <emph>Queries</emph> icon, then choose <emph>Edit - Edit</emph>. When referenced fields no longer exist, you see this dialog
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3159166" xml-lang="en-US" l10n="U" oldref="26"><variable id="Joins">Open query design and choose <emph>Insert - New Relation</emph>, or double-click on a connection line between two tables. 
+<paragraph role="paragraph" id="par_id3159166" xml-lang="en-US" l10n="U" oldref="26"><variable id="Joins">Open query design and choose <emph>Insert - New Relation</emph>, or double-click on a connection line between two tables.
 </variable></paragraph>
 <section id="sytabelle">
 <table id="tbl_id3156192">
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="paragraph" id="par_id3150393" xml-lang="en-US" l10n="E">
-<image id="img_id3145606" src="res/sc10714.png" width="0.222inch" height="0.222inch"><alt id="alt_id3145606" xml-lang="en-US">Icon</alt>
+<image id="img_id3145606" src="res/commandimagelist/sc_tablesort.png" width="0.222inch" height="0.222inch"><alt id="alt_id3145606" xml-lang="en-US">Icon</alt>
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
 </section>
 <paragraph role="paragraph" id="par_id3145171" xml-lang="en-US" l10n="CHG" oldref="55"><variable id="allgemein">In a database file window, choose <emph>Edit - Database - Properties</emph>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3159252" xml-lang="en-US" l10n="CHG" oldref="63"><variable id="tabellecopy">Drag and drop a table or a query into the table part of another database file window 
+<paragraph role="paragraph" id="par_id3159252" xml-lang="en-US" l10n="CHG" oldref="63"><variable id="tabellecopy">Drag and drop a table or a query into the table part of another database file window
 </variable></paragraph>
 <paragraph role="paragraph" id="par_id3148560" xml-lang="en-US" l10n="CHG" oldref="66"><variable id="formularneu">In a database file window, choose<emph> Insert - Form</emph>
 </variable></paragraph>

File helpcontent2/source/text/shared/01/01170000.xhp

  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * Copyright 2000, 2011 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
 <section id="beenden">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3154545"><bookmark_value>exiting;$[officename]</bookmark_value>
 </bookmark><comment>mw made "exiting..." a two level entry</comment>
-<bookmark xml-lang="en-US" branch="hid/.uno:Quit" id="bm_id4103526" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:Quit" id="bm_id3155619" localize="false"/><paragraph role="heading" id="hd_id3154545" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/01170000.xhp" name="Exit">Exit</link></paragraph>
-<paragraph role="paragraph" id="par_id3151299" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:Quit">Closes all $[officename] programs and prompts you to save your changes.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3151299" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".">Closes all $[officename] programs and prompts you to save your changes.</ahelp> <switchinline select="sys"><caseinline select="MAC">This command does not exist on Mac OS X systems.</caseinline><defaultinline></defaultinline></switchinline></paragraph>
 </section>
 <section id="howtoget">
   <embed href="text/shared/00/00000401.xhp#beenden"/>

File helpcontent2/source/text/shared/01/01190000.xhp

 <!--***********************************************************************
  *
  * 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
  ************************************************************************-->
 
 
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textshared0101190000xml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">Versions</title>
 <filename>/text/shared/01/01190000.xhp</filename>
 </topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-01-23T14:57:14">converted from old format - fpe</lastedited>
-</history>
 </meta>
 <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id1759697"><bookmark_value>versions;file saving as, restriction</bookmark_value>
 </bookmark>
-<bookmark xml-lang="en-US" branch="hid/.uno:VersionDialog" id="bm_id5051476" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:VersionDialog" id="bm_id3149948" localize="false"/>
 <paragraph role="heading" id="hd_id3143272" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/01190000.xhp" name="Versions">Versions</link></paragraph>
 <paragraph role="paragraph" id="par_id3157898" xml-lang="en-US" l10n="U" oldref="2"><variable id="versionentext"><ahelp hid=".uno:VersionDialog">Saves and organizes multiple versions of the current document in the same file. You can also open, delete, and compare previous versions.</ahelp>
 <bookmark xml-lang="en-US" branch="hid/sfx2:CheckBox:DLG_VERSIONS:CB_SAVEONCLOSE" id="bm_id3145316" localize="false"/>
 <paragraph role="heading" id="hd_id3149514" xml-lang="en-US" level="3" l10n="U" oldref="10">Always save version when closing</paragraph>
 <paragraph role="paragraph" id="par_id3153823" xml-lang="en-US" l10n="U" oldref="11"><ahelp hid="SFX2:CHECKBOX:DLG_VERSIONS:CB_SAVEONCLOSE">If you have made changes to your document, $[officename] automatically saves a new version when you close the document.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id6663823" xml-lang="en-US" l10n="NEW">If you save the document manually, do not change the document after saving, and then close, no new version will be created.</paragraph><comment>issue 12653</comment>
 <bookmark xml-lang="en-US" branch="hid/sfx2:ModalDialog:DLG_VERSIONS" id="bm_id3148642" localize="false"/>
 <paragraph role="heading" id="hd_id3159167" xml-lang="en-US" level="2" l10n="U" oldref="12">Existing versions</paragraph>
 <paragraph role="paragraph" id="par_id3156327" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SFX2:MODALDIALOG:DLG_VERSIONS">Lists the existing versions of the current document, the date and the time they were created, the author and the associated comments.</ahelp></paragraph>

File helpcontent2/source/text/shared/01/02100000.xhp

  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * Copyright 2000, 2011 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
 
 <bookmark xml-lang="en-US" branch="hid/.uno:UpSearch" id="bm_id003" localize="false"/>
 <paragraph xml-lang="en-US" id="par_id00003" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Click to search the next occurrence in upward direction.</ahelp></paragraph>
-
+<bookmark xml-lang="en-US" branch="hid/svx:ComboBox:RID_SVXDLG_SEARCH:ED_SEARCH" id="bm_id3144568621" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXDLG_SEARCH:LB_SEARCH" id="bm_id3147572" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/svx_ComboBox_RID_SVXDLG_SEARCH_ED_SEARCH" id="bm_id2687459" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3152425" role="heading" level="2" l10n="U" oldref="3">Search For</paragraph>
 <case select="IMPRESS">
 </case>
 <default>
-<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_SVXDLG_SEARCH:BTN_SEARCH_ALL" id="bm_id3150439" localize="false"/>
+
 <paragraph xml-lang="en-US" id="hd_id3154299" role="heading" level="2" l10n="U" oldref="66">Find All</paragraph>
-<paragraph xml-lang="en-US" id="par_id3145785" role="paragraph" l10n="CHG" oldref="67"><ahelp hid="SVX:PUSHBUTTON:RID_SVXDLG_SEARCH:BTN_SEARCH_ALL">Finds and selects all instances of the text or the format that you are searching for in the document (only in Writer and Calc documents).</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_id3145785" role="paragraph" l10n="CHG" oldref="67">Finds and selects all instances of the text or the format that you are searching for in the document (only in Writer and Calc documents).</paragraph>
 </default>
 </switch>
-      <bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_SVXDLG_SEARCH:BTN_SEARCH" id="bm_id3153954" localize="false"/>
+<comment>copied text as hidden help, see issue 115137</comment>
+<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_SVXDLG_SEARCH:BTN_SEARCH_ALL" id="bm_id3150439" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id31454242785" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Finds and selects all instances of the text or the format that you are searching for in the document (only in Writer and Calc documents).</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_SVXDLG_SEARCH:BTN_SEARCH" id="bm_id3153954" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3163821" role="heading" level="2" l10n="U"
                  oldref="68">Find</paragraph>
       <paragraph xml-lang="en-US" id="par_id3147436" role="paragraph" l10n="U" oldref="69"><ahelp hid="SVX:PUSHBUTTON:RID_SVXDLG_SEARCH:BTN_SEARCH">Finds and selects the next occurrence of the text or format that you searching for in the document.</ahelp></paragraph>

File helpcontent2/source/text/shared/01/04050000.xhp

          <embed href="text/shared/00/00000404.xhp#notiz"/>
       </section>
       <paragraph xml-lang="en-US" id="hd_id9851680" role="heading" level="2" l10n="NEW">Inserting comments</paragraph>
-      <paragraph xml-lang="en-US" id="par_id1830500" role="paragraph" l10n="NEW">In Writer, the command <item type="menuitem">Insert - Comment</item> or the <switchinline select="sys"><caseinline select="MAC">Command+Option
-</caseinline><defaultinline>Ctrl+Alt</defaultinline></switchinline>+N key combination inserts a comment anchor at the current cursor position. A comment box is shown at the page margin, where you can enter the text of your comment. A line connects anchor and comment box.</paragraph>
+<comment>issue 113019 112000</comment><paragraph xml-lang="en-US" id="par_id1830500" role="paragraph" l10n="CHG">In Writer, the command <item type="menuitem">Insert - Comment</item> or the <switchinline select="sys"><caseinline select="MAC">Command+Option
+</caseinline><defaultinline>Ctrl+Alt</defaultinline></switchinline>+C key combination inserts a comment anchor at the current cursor position. A comment box is shown at the page margin, where you can enter the text of your comment. A line connects anchor and comment box.</paragraph>
       <paragraph xml-lang="en-US" id="par_id0915200910571516" role="paragraph" l10n="NEW">In Calc, Draw, and Impress, the command <item type="menuitem">Insert - Comment</item> inserts a comment.</paragraph>
       <paragraph xml-lang="en-US" id="par_id1831" role="paragraph" l10n="NEW">The author name and the date and time of creating this comment is shown at the bottom of the comment box.</paragraph>
       <paragraph xml-lang="en-US" id="par_id6718649" role="paragraph" l10n="NEW">The comments by different authors get different colors. Choose <item type="menuitem"><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>

File helpcontent2/source/text/shared/01/05100500.xhp

 <?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
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
 <topic id="textshared0105100500xml" indexer="include">
 <title id="tit" xml-lang="en-US">Top</title>
 </meta>
 <body>
 <section id="oben">
-<bookmark xml-lang="en-US" branch="hid/.uno:CellVertTop" id="bm_id5466554" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:CellVertTop" id="bm_id3149048" localize="false"/>
 <paragraph role="heading" id="hd_id3154765" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05100500.xhp" name="Top">Top</link></paragraph>
 <paragraph role="paragraph" id="par_id3151390" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:CellVertTop">Aligns the contents of the cell to the top edge of the cell.</ahelp></paragraph>

File helpcontent2/source/text/shared/01/05100600.xhp

 <?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
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
 <topic id="textshared0105100600xml" indexer="include">
-<title id="tit" xml-lang="en-US">Middle</title>
+<title id="tit" xml-lang="en-US">Center (vertical)</title>
 <filename>/text/shared/01/05100600.xhp</filename>
 </topic>
 </meta>
 <body>
 <section id="mitte">
-<bookmark xml-lang="en-US" branch="hid/.uno:CellVertCenter" id="bm_id4218858" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:CellVertCenter" id="bm_id3154766" localize="false"/>
-<paragraph role="heading" id="hd_id3149874" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05100600.xhp" name="Middle">Middle</link></paragraph>
-<paragraph role="paragraph" id="par_id3149048" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:CellVertCenter">Centers the contents of the cell horizontally in the cell.</ahelp></paragraph>
+<paragraph role="heading" id="hd_id3149874" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/shared/01/05100600.xhp" name="Center (vertical)">Center (vertival)</link></paragraph>
+<paragraph role="paragraph" id="par_id3149048" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".">Centers the contents of the cell between top and bottom of the cell.</ahelp></paragraph>
 </section>
 <section id="howtoget">
 <paragraph role="paragraph" id="par_id3149525" xml-lang="en-US" l10n="U" oldref="121"><variable id="zellemitte">In the context menu of a cell, choose <emph>Cell - Center</emph>

File helpcontent2/source/text/shared/01/05100700.xhp

 <?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
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
 <topic id="textshared0105100700xml" indexer="include">
 <title id="tit" xml-lang="en-US">Bottom</title>
 </meta>
 <body>
 <section id="unten">
-<bookmark xml-lang="en-US" branch="hid/.uno:CellVertBottom" id="bm_id3581992" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:CellVertBottom" id="bm_id3151244" localize="false"/>
 <paragraph role="heading" id="hd_id3150249" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05100700.xhp" name="Bottom">Bottom</link></paragraph>
 <paragraph role="paragraph" id="par_id3154764" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:CellVertBottom">Aligns the contents of the cell to the bottom edge of the cell.</ahelp></paragraph>

File helpcontent2/source/text/shared/01/05210100.xhp

 <!--***********************************************************************
  *
  * 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
  ************************************************************************-->
 
 
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textshared0105210100xml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">Area</title>
 <filename>/text/shared/01/05210100.xhp</filename>
 </topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-12-05T13:20:17">converted from old format - fpe</lastedited>
-</history>
 </meta>
 <body>
 <section id="flaeche">
   <embed href="text/shared/00/00040502.xhp#flaeche2"/>
 </section>
 <paragraph role="heading" id="hd_id3149999" xml-lang="en-US" level="2" l10n="U" oldref="3">Fill</paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:FillStyle" id="bm_id9074448" localize="false"/>
+
 <bookmark xml-lang="en-US" branch="hid/.uno:FillStyle" id="bm_id3154186" localize="false"/>
 <paragraph role="paragraph" id="par_id3154673" xml-lang="en-US" l10n="U" oldref="4"><variable id="sytext"><ahelp hid=".uno:FillStyle">Select the type of fill that you want to apply to the selected drawing object.</ahelp>
 </variable></paragraph>

File helpcontent2/source/text/shared/01/05220000.xhp

 <?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
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
       <topic id="textshared0105220000xml" indexer="include" status="PUBLISH">
          <title xml-lang="en-US" id="tit">Text</title>
 <bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_FULL_WIDTH" id="bm_id3149763" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3155323" role="heading" level="3" l10n="U"
                  oldref="27">Full width</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3150244" role="paragraph" l10n="U" oldref="28"><ahelp hid="SVX_TRISTATEBOX_RID_SVXPAGE_TEXTATTR_TSB_FULL_WIDTH">Anchors the text to the full width of the drawing or text object.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3150244" role="paragraph" l10n="CHG" oldref="28"><ahelp hid=".">Anchors the text to the full width of the drawing object or text object.</ahelp></paragraph>
    </body>
 </helpdocument>

File helpcontent2/source/text/shared/01/06030000.xhp

 <!--***********************************************************************
  *
  * 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
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************-->
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textshared0106030000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Eyedropper</title>
+<title id="tit" xml-lang="en-US">Color Replacer</title>
 <filename>/text/shared/01/06030000.xhp</filename>
 </topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-01-07T12:17:50">converted from old format - fpe</lastedited>
-</history>
 </meta>
 <body>
 <section id="pipette">
-<bookmark xml-lang="en-US" branch="hid/.uno:BmpMask" id="bm_id3758414" localize="false"/><!-- HID added by script -->
 <bookmark xml-lang="en-US" branch="hid/.uno:BmpMask" id="bm_id3085157" localize="false"/>
-<paragraph role="heading" id="hd_id3156324" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/06030000.xhp" name="Eyedropper">Eyedropper</link></paragraph>
-<paragraph role="paragraph" id="par_id3145138" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:BmpMask">Opens the eyedropper dialog, where you can replace colors in bitmap and meta file graphics.</ahelp></paragraph>
+<paragraph role="heading" id="hd_id3156324" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/shared/01/06030000.xhp" name="Color Replacer">Color Replacer</link></paragraph>
+<paragraph role="paragraph" id="par_id3145138" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".uno:BmpMask">Opens the Color Replacer dialog, where you can replace colors in bitmap and meta file graphics.</ahelp></paragraph>
 </section>
 <paragraph role="paragraph" id="par_id3151262" xml-lang="en-US" l10n="U" oldref="24">You can replace up to four different colors at one time.</paragraph>
 <section id="howtoget">
 	</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3145669" xml-lang="en-US" l10n="U" oldref="3">Eyedropper</paragraph>
+<paragraph role="paragraph" id="par_id3145669" xml-lang="en-US" l10n="CHG" oldref="3">Color Replacer</paragraph>
 </tablecell>
 </tablerow>
 </table>
 <bookmark xml-lang="en-US" branch="hid/SVX_HID_BMPMASK_TBI_PIPETTE" id="bm_id3155535" localize="false"/>
 <paragraph role="paragraph" id="par_id3153683" xml-lang="en-US" l10n="CHG" oldref="4"><ahelp hid="." visibility="hidden">Select one of the four source color boxes. Move the mouse pointer over the selected image, and then click the color that you want to replace.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SVX_HID_BMPMASK_CTL_PIPETTE" id="bm_id3147010" localize="false"/>
-<paragraph role="heading" id="hd_id3149827" xml-lang="en-US" level="2" l10n="U" oldref="5">Eyedropper color</paragraph>
-<paragraph role="paragraph" id="par_id3146957" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="HID_BMPMASK_CTL_PIPETTE">Displays the color in the selected image that directly underlies the current mouse pointer position. This features only works if the eyedropper tool is selected.</ahelp></paragraph>
+<paragraph role="heading" id="hd_id3149827" xml-lang="en-US" level="2" l10n="CHG" oldref="5">Color Replacer color</paragraph>
+<paragraph role="paragraph" id="par_id3146957" xml-lang="en-US" l10n="CHG" oldref="6"><ahelp hid=".">Displays the color in the selected image that directly underlies the current mouse pointer position. This features only works if the Color Replacer tool is selected.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_SVXDLG_BMPMASK:BTN_EXEC" id="bm_id3155942" localize="false"/>
 <paragraph role="heading" id="hd_id3154823" xml-lang="en-US" level="2" l10n="U" oldref="7">Replace</paragraph>
 <paragraph role="paragraph" id="par_id3154983" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVX:PUSHBUTTON:RID_SVXDLG_BMPMASK:BTN_EXEC">Replaces the selected source colors in the current image with the colors that you specify in the <emph>Replace with </emph>boxes.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3149819" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SVX:CHECKBOX:RID_SVXDLG_BMPMASK:CBX_4">Select this checkbox to replace the current <emph>Source color</emph> with the color that you specify in the <emph>Replace with </emph>box.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SVX_HID_BMPMASK_CTL_QCOL_1" id="bm_id3157909" localize="false"/>
 <paragraph role="heading" id="hd_id3159116" xml-lang="en-US" level="3" l10n="U" oldref="13">Source color</paragraph>
-<paragraph role="paragraph" id="par_id3149903" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="HID_BMPMASK_CTL_QCOL_1">Displays the color in the selected image that you want to replace. To set the source color, click here, click the eyedropper, and then click a color in the selected image.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3149903" xml-lang="en-US" l10n="CHG" oldref="14"><ahelp hid=".">Displays the color in the selected image that you want to replace. To set the source color, click here, click the Color Replacer, and then click a color in the selected image.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/svx:MetricField:RID_SVXDLG_BMPMASK:SP_1" id="bm_id3158431" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/svx:MetricField:RID_SVXDLG_BMPMASK:SP_2" id="bm_id3146848" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/svx:MetricField:RID_SVXDLG_BMPMASK:SP_3" id="bm_id3149516" localize="false"/>

File helpcontent2/source/text/shared/01/06040000.xhp

-<?xml version="1.0" encoding="UTF-8"?>
-<helpdocument version="1.0">
-	
-<!--
-***********************************************************************
+<?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.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************
- -->
+ ************************************************************************ -->
  
-	
 <meta>
-      <topic id="textshared0106040000xml" indexer="include">
-         <title xml-lang="en-US" id="tit">AutoCorrect</title>
-         <filename>/text/shared/01/06040000.xhp</filename>
-      </topic>
-   </meta>
-   <body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3153391"><bookmark_value>AutoCorrect function;switching on and off</bookmark_value>
+<topic id="textshared0106040000xml" indexer="include">
+<title xml-lang="en-US" id="tit">AutoCorrect</title>
+<filename>text/shared/01/06040000.xhp</filename>
+</topic>
+</meta>
+<body>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3153391">
+<bookmark_value>AutoCorrect function;switching on and off</bookmark_value>
+<bookmark_value>AutoComplete, see also AutoCorrect/AutoInput</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/.uno:AutoCorrectDlg" id="bm_id1521736" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:AutoCorrectDlg" id="bm_id3147543" localize="false"/><comment>MW deleted "AutoFormat function;" and changed "AutoCorrect function;"</comment>
-<paragraph xml-lang="en-US" id="hd_id3153391" role="heading" level="1" l10n="U" oldref="1">AutoCorrect</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3150838" role="paragraph" l10n="CHG" oldref="2"><variable id="autoko"><ahelp hid=".uno:AutoCorrectDlg">Sets the options for automatically replacing text as you type.</ahelp>
-</variable></paragraph>
-      <section id="howtoget">
-         <embed href="text/shared/00/00000406.xhp#autokorr"/>
-      </section>
+<bookmark xml-lang="en-US" branch="hid/.uno:AutoCorrectDlg" id="bm_id3147543" localize="false"/><comment>MW deleted "AutoFormat function;" and changed "AutoCorrect function;"</comment><comment>MW added "AutoComplete, see also..."</comment>
+<paragraph id="hd_id3153391" role="heading" xml-lang="en-US" level="1">AutoCorrect</paragraph>
+<paragraph id="par_id3150838" role="paragraph" xml-lang="en-US"><variable id="autoko"><ahelp hid=".uno:AutoCorrectDlg">Sets the options for automatically replacing text as you type.</ahelp></variable></paragraph>
+<section id="howtoget"><embed href="text/shared/00/00000406.xhp#autokorr"/>
+</section>
 <switch select="appl">
 <case select="WRITER"><embed href="text/swriter/guide/auto_off.xhp#auto_off"/>
 </case>
 <case select="CALC"><embed href="text/scalc/guide/auto_off.xhp#auto_off"/>
 </case>
 </switch>
-<paragraph xml-lang="en-US" id="par_id3147261" role="paragraph" l10n="U" oldref="3">The AutoCorrect settings are applied when you press the Spacebar after you enter a word.</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3153394" role="paragraph" l10n="U" oldref="4">To turn on or to turn off the AutoCorrect feature, in $[officename] Calc choose <emph>Tools - Cell Contents - AutoInput</emph>, and in $[officename] Writer choose <emph>Format - AutoCorrect - While Typing</emph>. To apply the AutoCorrect settings to an entire text document, choose <emph>Format - AutoCorrect - Apply</emph>.</paragraph>
-      <embed href="text/shared/01/06040200.xhp#ersetzung"/>
-      <embed href="text/shared/01/06040300.xhp#ausnahmen"/>
-      <embed href="text/shared/01/06040100.xhp#optionen"/>
-      <embed href="text/shared/01/06040400.xhp#typanf"/>
+<paragraph id="par_id3147261" role="paragraph" xml-lang="en-US">The AutoCorrect settings are applied when you press the Spacebar after you enter a word.</paragraph>
+<paragraph id="par_id3153394" role="paragraph" xml-lang="en-US">To turn on or to turn off the AutoCorrect feature, in $[officename] Calc choose <emph>Tools - Cell Contents - AutoInput</emph>, and in $[officename] Writer choose <emph>Format - AutoCorrect - While Typing</emph>. To apply the AutoCorrect settings to an entire text document, choose <emph>Format - AutoCorrect - Apply</emph>.</paragraph><embed href="text/shared/01/06040200.xhp#ersetzung"/><embed href="text/shared/01/06040300.xhp#ausnahmen"/><embed href="text/shared/01/06040100.xhp#optionen"/><embed href="text/shared/01/06040400.xhp#typanf"/>
 <switch select="appl">
-<case select="WRITER"><embed href="text/shared/01/06040600.xhp#worterg"/>
-      <embed href="text/shared/01/06040700.xhp#smarttags"/>
+<case select="WRITER"><embed href="text/shared/01/06040600.xhp#worterg"/><embed href="text/shared/01/06040700.xhp#smarttags"/>
 </case>
 </switch><embed href="text/shared/00/00000001.xhp#zurueck"/>
 <switch select="appl">
 <case select="WRITER">
 <section id="relatedtopics">
-         <paragraph xml-lang="en-US" id="par_id3146137" role="paragraph" l10n="C"><link href="text/swriter/01/05150200.xhp" name="AutoFormat">AutoCorrect</link></paragraph>
-      </section>
+<paragraph id="par_id3146137" role="paragraph" xml-lang="en-US"><link href="text/swriter/01/05150200.xhp" name="AutoFormat">AutoCorrect</link></paragraph>
+</section>
 </case>
 </switch>
 </body>

File helpcontent2/source/text/shared/01/06140500.xhp

 <bookmark xml-lang="en-US" branch="index" id="bm_id3152427"><bookmark_value>customizing; events</bookmark_value>
 <bookmark_value>events; customizing</bookmark_value>
 </bookmark>
-<!-- removed HID HID_CONFIG_EVENT --><paragraph role="heading" id="hd_id3152427" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/06140500.xhp" name="Events">Events</link></paragraph>
-<paragraph role="paragraph" id="par_id3152937" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_CONFIG_EVENT">Assigns macros to program events. The assigned macro runs automatically every time the selected event occurs.</ahelp></paragraph>
+<!-- removed HID HID_CONFIG_EVENT -->
+<bookmark xml-lang="en-US" branch="hid/.uno:TableEvents" id="bm_id1163922275" localize="false"/>
+<paragraph role="heading" id="hd_id3152427" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/06140500.xhp" name="Events">Events</link></paragraph>
+<paragraph role="paragraph" id="par_id3152937" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="assignaction"><ahelp hid=".">Assigns macros to program events. The assigned macro runs automatically every time the selected event occurs.</ahelp></variable></paragraph>
 </section>
 <section id="howtoget">
 <embed href="text/shared/00/00000406.xhp#events"/>
 </section>
+
+<switch select="appl">
+<case select="CALC">
+<paragraph role="note" id="par_id317748820" xml-lang="en-US" l10n="NEW">The dialog box has reduced functionality when called from the Edit-Sheet menu of a spreadsheet.</paragraph>
+</case>
+</switch>
+
+
 <bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_EVENTS:LB_SAVEIN" id="bm_id1163975" localize="false"/><paragraph role="heading" id="par_idN1060A" xml-lang="en-US" level="2" l10n="NEW">Save In</paragraph>
 <paragraph role="paragraph" id="par_idN1060E" xml-lang="en-US" l10n="NEW"><ahelp hid="705547787">Select first where to save the event binding, in the current document or in %PRODUCTNAME.</ahelp></paragraph>
 <paragraph role="note" id="par_id3153662" xml-lang="en-US" l10n="U" oldref="36">A macro that is saved with a document can only be run when that document is opened.</paragraph>

File helpcontent2/source/text/shared/01/extensionupdate.xhp

-<?xml version="1.0" encoding="UTF-8"?>
-<helpdocument version="1.0">
-
-<!--
-***********************************************************************
+<?xml version="1.0" encoding="UTF-8"?><helpdocument version="1.0">
+<!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************
- -->
-
+ ************************************************************************ -->
 
 <meta>
-      <topic id="textshared01extensionupdatexml" indexer="include" status="PUBLISH">
-         <title xml-lang="en-US" id="tit">Extension Update</title>
-         <filename>/text/shared/01/extensionupdate.xhp</filename>
-      </topic>
-   </meta>
-   <body>
+<topic id="textshared01extensionupdatexml" indexer="include" status="PUBLISH">
+<title xml-lang="en-US" id="tit">Extension Update</title>
+<filename>shared/01/extensionupdate.xhp</filename>
+</topic>
+</meta>
+<body>
 <bookmark xml-lang="en-US" branch="hid/DESKTOP_HID_DEPLOYMENT_GUI_UPDATE" id="bm_id5684377" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/DESKTOP_HID_DEPLOYMENT_GUI_UPDATEINSTALL" id="bm_id7576525" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id9688100" role="heading" level="1" l10n="NEW">Extension Update</paragraph>
-      <paragraph xml-lang="en-US" id="par_id5084688" role="paragraph" l10n="CHG"><ahelp hid=".">Click the <emph>Check for Updates</emph> button in the <link href="text/shared/01/packagemanager.xhp">Extension Manager</link> to check for online updates for all installed extensions. To check for online updates for only the selected extension, right-click to open the context menu, then choose <emph>Update</emph>.</ahelp></paragraph>
-      <section id="howtoget">
-         <embed href="text/shared/00/00000406.xhp#packagemanager_eu"/>
-      </section>
-      <paragraph xml-lang="en-US" id="par_id6401257" role="paragraph" l10n="NEW">When you click the Check for Updates button or choose the Update command, the Extension Update dialog is displayed and the check for availability of updates starts immediately.</paragraph>
+<paragraph id="hd_id9688100" role="heading" xml-lang="en-US" level="1">Extension Update</paragraph>
+<paragraph id="par_id5084688" role="paragraph" xml-lang="en-US"><ahelp hid=".">Click the <emph>Check for Updates</emph> button in the <link href="text/shared/01/packagemanager.xhp">Extension Manager</link> to check for online updates for all installed extensions. To check for online updates for only the selected extension, right-click to open the context menu, then choose <emph>Update</emph>.</ahelp></paragraph>
+<section id="howtoget"><embed href="text/shared/00/00000406.xhp#packagemanager_eu"/>
+</section><comment>insert hidden text for Exclude from this update/from all updates/include again, see i115834 - not needed because no Help ID assigned</comment>
+<paragraph id="par_id6401257" role="paragraph" xml-lang="en-US">When you click the <item type="menuitem">Check for Updates</item> button or choose the <item type="menuitem">Update</item> command, the Extension Update dialog is displayed and the check for availability of updates starts immediately.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/desktop:MultiLineEdit:RID_DLG_UPDATE:RID_DLG_UPDATE_DESCRIPTIONS" id="bm_id7764824" localize="false"/>
-<paragraph xml-lang="en-US" id="par_id5841242" role="paragraph" l10n="NEW"><ahelp hid=".">While checking for updates, you see a progress indicator. Wait for some messages to show up in the dialog, or click Cancel to abort the update check.</ahelp></paragraph>
-      <paragraph xml-lang="en-US" id="par_id6794030" role="paragraph" l10n="NEW">If no updates are available, the message in the dialog tells you there are no updates. Close the dialog.</paragraph>
-      <paragraph xml-lang="en-US" id="par_id7096774" role="paragraph" l10n="NEW">If updates are available, the updates can either be installed automatically, or you must respond with some action:</paragraph>
-      <paragraph xml-lang="en-US" id="par_id6420484" role="paragraph" l10n="NEW">The Extension Update dialog may contain entries which are not selectable and hence no automatic update can be performed. </paragraph>
-      <paragraph xml-lang="en-US" id="par_id6986602" role="paragraph" l10n="NEW">Dependencies are not fulfilled (the update needs some more or newer files to be installed).</paragraph>
-      <paragraph xml-lang="en-US" id="par_id616779" role="paragraph" l10n="NEW">Insufficient user rights (the Extension Manager was started from the menu, but shared extensions can only be modified when %PRODUCTNAME does not run, and only by a user with appropriate rights). See <link href="text/shared/01/packagemanager.xhp">Extension Manager</link> for details.</paragraph>
-      <paragraph xml-lang="en-US" id="par_id791039" role="paragraph" l10n="NEW">A manual update is necessary.</paragraph>
+<paragraph id="par_id5841242" role="paragraph" xml-lang="en-US"><ahelp hid=".">While checking for updates, you see a progress indicator. Wait for some messages to show up in the dialog, or click Cancel to abort the update check.</ahelp></paragraph>
+<paragraph id="par_id6794030" role="paragraph" xml-lang="en-US">If no updates are available, the message in the dialog tells you there are no updates. Close the dialog.</paragraph>
+<paragraph id="par_id7096774" role="paragraph" xml-lang="en-US">If updates are available, the updates can either be installed automatically, or you must respond with some action:</paragraph>
+<paragraph id="par_id6420484" role="paragraph" xml-lang="en-US">The Extension Update dialog may contain entries which are not selectable and hence no automatic update can be performed. </paragraph>
+<list type="unordered">
+<listitem>
+<paragraph id="par_id6986602" role="paragraph" xml-lang="en-US">Dependencies are not fulfilled (the update needs some more or newer files to be installed).</paragraph>
+</listitem>
+<listitem>
+<paragraph id="par_id616779" role="paragraph" xml-lang="en-US">Insufficient user rights (the Extension Manager was started from the menu, but shared extensions can only be modified when %PRODUCTNAME does not run, and only by a user with appropriate rights). See <link href="text/shared/01/packagemanager.xhp">Extension Manager</link> for details.</paragraph>
+</listitem>
+<listitem>
+<paragraph id="par_id791039" role="paragraph" xml-lang="en-US">A manual update is necessary.</paragraph>
+</listitem></list>
 <bookmark xml-lang="en-US" branch="hid/desktop:PushButton:RID_DLG_UPDATE:RID_DLG_UPDATE_OK" id="bm_id4799645" localize="false"/>
-<paragraph xml-lang="en-US" id="par_id757469" role="paragraph" l10n="NEW"><ahelp hid=".">When you click the Install button the Download and Installation dialog is displayed.</ahelp></paragraph>
-      <paragraph xml-lang="en-US" id="par_id5189062" role="paragraph" l10n="NEW">All extensions which can be directly downloaded are downloaded now. The progress is shown in the Download and Installation dialog. If an extension cannot be downloaded, a message is displayed. The operation continues for the remaining extensions.</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3949095" role="paragraph" l10n="NEW">Some extensions may be marked with the phrase "browser based update". These extensions cannot be downloaded by the Extension Manager. A web browser must be opened to download the extension update from a particular web site. That site may require several more user interaction to download the extension. After downloading you must install the extension manually, for example by double-clicking the extension's icon in a file browser.</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3729056" role="paragraph" l10n="NEW">For extensions marked as "browser based update", the Extension Manager will open your web browser on the respective web site. This happens when you close the dialog, after downloading any other extension updates. If there are no extensions which can be directly downloaded then the web browser is started immediately.</paragraph>
-      <paragraph xml-lang="en-US" id="par_id6854457" role="paragraph" l10n="NEW">After the last extension has been downloaded, the installation begins. First all installed extensions for which an update could be downloaded successfully, are removed. Then the updated extensions are installed. If an error occurs, a message that the installation failed is displayed, but the operation proceeds.</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3372295" role="paragraph" l10n="NEW">If all updates have been processed the Download and Installation dialog shows that it has finished. You can abort the download and installation process by clicking the <emph>Abort Update</emph> button.</paragraph>
+<paragraph id="par_id757469" role="paragraph" xml-lang="en-US"><ahelp hid=".">When you click the Install button the Download and Installation dialog is displayed.</ahelp></paragraph>
+<paragraph id="par_id5189062" role="paragraph" xml-lang="en-US">All extensions which can be directly downloaded are downloaded now. The progress is shown in the Download and Installation dialog. If an extension cannot be downloaded, a message is displayed. The operation continues for the remaining extensions.</paragraph>
+<paragraph id="par_id3949095" role="paragraph" xml-lang="en-US">Some extensions may be marked with the phrase "browser based update". These extensions cannot be downloaded by the Extension Manager. A web browser must be opened to download the extension update from a particular web site. That site may require several more user interaction to download the extension. After downloading you must install the extension manually, for example by double-clicking the extension's icon in a file browser.</paragraph>
+<paragraph id="par_id3729056" role="paragraph" xml-lang="en-US">For extensions marked as "browser based update", the Extension Manager will open your web browser on the respective web site. This happens when you close the dialog, after downloading any other extension updates. If there are no extensions which can be directly downloaded then the web browser is started immediately.</paragraph>
+<paragraph id="par_id6854457" role="paragraph" xml-lang="en-US">After the last extension has been downloaded, the installation begins. First all installed extensions for which an update could be downloaded successfully, are removed. Then the updated extensions are installed. If an error occurs, a message that the installation failed is displayed, but the operation proceeds.</paragraph>
+<paragraph id="par_id3372295" role="paragraph" xml-lang="en-US">If all updates have been processed the Download and Installation dialog shows that it has finished. You can abort the download and installation process by clicking the <emph>Abort Update</emph> button.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/desktop:CheckBox:RID_DLG_UPDATE:RID_DLG_UPDATE_ALL" id="bm_id3114108" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id5699942" role="heading" level="2" l10n="NEW">Show all Updates</paragraph>
-      <paragraph xml-lang="en-US" id="par_id641193" role="paragraph" l10n="NEW"><ahelp hid=".">By default, only the downloadable extensions are shown in the dialog. Mark <emph>Show all Updates</emph> to see also other extensions and error messages.</ahelp></paragraph>
-      <section id="relatedtopics">
-         <paragraph xml-lang="en-US" id="par_id7634510" role="paragraph" l10n="NEW"><link href="text/shared/01/packagemanager.xhp">Extension Manager</link></paragraph>
-      </section>
-   </body>
+<paragraph id="hd_id5699942" role="heading" xml-lang="en-US" level="2">Show all Updates</paragraph>
+<paragraph id="par_id641193" role="paragraph" xml-lang="en-US"><ahelp hid=".">By default, only the down-loadable extensions are shown in the dialog. Mark <emph>Show all Updates</emph> to see also other extensions and error messages.</ahelp></paragraph>
+<section id="relatedtopics">
+<paragraph id="par_id7634510" role="paragraph" xml-lang="en-US"><link href="text/shared/01/packagemanager.xhp">Extension Manager</link></paragraph>
+</section>
+</body>
 </helpdocument>

File helpcontent2/source/text/shared/01/grid.xhp

  ***********************************************************************
  *
  * 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
 <paragraph role="heading" id="par_idN1057E" xml-lang="en-US" level="2" l10n="NEW">Display Grid</paragraph>
 <paragraph role="paragraph" id="par_idN10582" xml-lang="en-US" l10n="NEW">Displays or hides grid lines that you can use to align objects such as graphics on a page.</paragraph>
 <paragraph role="heading" id="par_idN10585" xml-lang="en-US" level="2" l10n="NEW">Snap to Grid</paragraph>
-<paragraph role="paragraph" id="par_idN10589" xml-lang="en-US" l10n="NEW">Automatically aligns objects to vertical and horizontal grid lines. To override this feature, hold down the <switchinline select="sys"><caseinline select="MAC">Command key</caseinline><defaultinline>Ctrl key</defaultinline></switchinline> when you drag an object.<comment>UFI: copied from shared\optionen\01050100.xhp</comment></paragraph><comment>UFI removed GridFront help id</comment><paragraph role="heading" id="par_idN105C9" xml-lang="en-US" level="2" l10n="NEW">Grid to Front</paragraph>
+<comment>issue 112000 for new key</comment><paragraph role="paragraph" id="par_idN10589" xml-lang="en-US" l10n="NEW">Automatically aligns objects to vertical and horizontal grid lines. To override this feature, hold down the <switchinline select="sys"><caseinline select="MAC">Option key</caseinline><defaultinline>Alt key</defaultinline></switchinline> when you drag an object.<comment>UFI: copied from shared\optionen\01050100.xhp</comment></paragraph><comment>UFI removed GridFront help id</comment><paragraph role="heading" id="par_idN105C9" xml-lang="en-US" level="2" l10n="NEW">Grid to Front</paragraph>
 <paragraph role="paragraph" id="par_idN105CD" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Displays the grid lines in front of the objects on the slide or page.</ahelp></paragraph>
 <section id="relatedtopics">
 <paragraph role="paragraph" id="par_id4372692" xml-lang="en-US" l10n="NEW">Set the grid color on <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - <link href="text/shared/optionen/01012000.xhp">Appearance</link>.</paragraph>

File helpcontent2/source/text/shared/01/guides.xhp

  ***********************************************************************
  *
  * 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
 <paragraph role="heading" id="par_idN1057B" xml-lang="en-US" level="2" l10n="NEW">Display Guides</paragraph>
 <paragraph role="paragraph" id="par_idN1057F" xml-lang="en-US" l10n="NEW">Displays or hides guides that you can use to align objects on a page.</paragraph>
 <paragraph role="heading" id="par_idN10582" xml-lang="en-US" level="2" l10n="NEW">Snap to Guides</paragraph>
-<paragraph role="paragraph" id="par_idN10586" xml-lang="en-US" l10n="CHG">Automatically aligns objects to vertical and horizontal guides. To override this feature, hold down the <switchinline select="sys"><caseinline select="MAC">Command key</caseinline><defaultinline>Ctrl key </defaultinline></switchinline>when you drag an object.<comment>UFI: test it! copied from shared\01\grid.xhp</comment></paragraph><comment>UFI: removed double help id</comment><paragraph role="heading" id="par_idN105C6" xml-lang="en-US" level="2" l10n="NEW">Guides to Front</paragraph>
+<comment>changed in BetterDefaults_Gridhandling issue 112000</comment><paragraph role="paragraph" id="par_idN10586" xml-lang="en-US" l10n="CHG">Automatically aligns objects to vertical and horizontal guides. To override this feature, hold down the <switchinline select="sys"><caseinline select="MAC">Option key</caseinline><defaultinline>Alt key </defaultinline></switchinline>when you drag an object.<comment>UFI: test it! copied from shared\01\grid.xhp</comment></paragraph><comment>UFI: removed double help id</comment><paragraph role="heading" id="par_idN105C6" xml-lang="en-US" level="2" l10n="NEW">Guides to Front</paragraph>
 <paragraph role="paragraph" id="par_idN105CA" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Displays the guides in front of the objects on the slide or page.</ahelp></paragraph>
 </body>
 </helpdocument>

File helpcontent2/source/text/shared/01/packagemanager.xhp

-<?xml version="1.0" encoding="UTF-8"?>
-<helpdocument version="1.0">
-	
-<!--
-***********************************************************************
+<?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
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************
- -->
- 
-	
+ ************************************************************************ -->
+
 <meta>
 <topic id="textshared01packagemanagerxml" indexer="include">
-<title id="tit" xml-lang="en-US">Extension Manager</title>
-<filename>/text/shared/01/packagemanager.xhp</filename>
+<title xml-lang="en-US" id="tit">Extension Manager</title>
+<filename>shared/01/packagemanager.xhp</filename>
 </topic>
 </meta>
 <body>
 <section id="packagemanager">
-<bookmark xml-lang="en-US" branch="index" id="bm_id2883388"><bookmark_value>UNO components;Extension Manager</bookmark_value>
+<bookmark xml-lang="en-US" branch="index" id="bm_id2883388">
+<bookmark_value>UNO components;Extension Manager</bookmark_value>
 <bookmark_value>extensions;Extension Manager</bookmark_value>
 <bookmark_value>packages, see extensions</bookmark_value>
 </bookmark><comment>MW corrected typos in "UNO components;...", made "Extension Manager" a two level entry and changed the "packages" reference</comment>
 <bookmark xml-lang="en-US" branch="hid/DESKTOP_HID_PACKAGE_MANAGER_MENU_ITEM" id="bm_id307931" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/service:com.sun.star.deployment.ui.PackageManagerDialog" id="bm_id2198553" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/DESKTOP_HID_PACKAGE_MANAGER" id="bm_id828882" localize="false"/>
-<paragraph role="heading" id="par_idN10543" xml-lang="en-US" level="1" l10n="CHG"><link href="text/shared/01/packagemanager.xhp">Extension Manager</link></paragraph><comment>renamed in i69568</comment>
-<paragraph role="paragraph" id="par_idN10553" xml-lang="en-US" l10n="CHG"><ahelp hid="42772">The Extension Manager adds, removes, disables, enables, and updates %PRODUCTNAME extensions.</ahelp></paragraph>
+<paragraph id="par_idN10543" role="heading" xml-lang="en-US" level="1"><link href="text/shared/01/packagemanager.xhp">Extension Manager</link></paragraph><comment>renamed in i69568</comment>
+<paragraph id="par_idN10553" role="paragraph" xml-lang="en-US"><ahelp hid="42772">The Extension Manager adds, removes, disables, enables, and updates %PRODUCTNAME extensions.</ahelp></paragraph>
 </section>
-<section id="howtoget">
-<embed href="text/shared/00/00000406.xhp#packagemanager"/>
+<section id="howtoget"><embed href="text/shared/00/00000406.xhp#packagemanager"/>
 </section>
-<paragraph role="paragraph" id="par_idN10615" xml-lang="en-US" l10n="CHG">The following are examples of %PRODUCTNAME extensions:</paragraph>
+<paragraph id="par_idN10615" role="paragraph" xml-lang="en-US">The following are examples of %PRODUCTNAME extensions:</paragraph>
 <list type="ordered">
 <listitem>
-<paragraph role="paragraph" id="par_idN1061B" xml-lang="en-US" l10n="NEW">UNO components (compiled software modules)</paragraph>
+<paragraph id="par_idN1061B" role="paragraph" xml-lang="en-US">UNO components (compiled software modules)</paragraph>
 </listitem>
 <listitem>
-<paragraph role="paragraph" id="par_idN1061F" xml-lang="en-US" l10n="NEW">Configuration data (for menu commands)</paragraph>
+<paragraph id="par_idN1061F" role="paragraph" xml-lang="en-US">Configuration data (for menu commands)</paragraph>
 </listitem>
 <listitem>
-<paragraph role="paragraph" id="par_idN10623" xml-lang="en-US" l10n="NEW">%PRODUCTNAME Basic libraries</paragraph>
+<paragraph id="par_idN10623" role="paragraph" xml-lang="en-US">%PRODUCTNAME Basic libraries</paragraph>
 </listitem>
 <listitem>
-<paragraph role="paragraph" id="par_idN106E8" xml-lang="en-US" l10n="NEW">%PRODUCTNAME dialog libraries</paragraph>
+<paragraph id="par_idN106E8" role="paragraph" xml-lang="en-US">%PRODUCTNAME dialog libraries</paragraph>
 </listitem>
 <listitem>
-<paragraph role="paragraph" id="par_idN106F5" xml-lang="en-US" l10n="CHG">Extension files (*.oxt files containing one or more extensions of the above listed types)</paragraph>
+<paragraph id="par_idN106F5" role="paragraph" xml-lang="en-US">Extension files (*.oxt files containing one or more extensions of the above listed types)</paragraph>
 </listitem>
 </list>
-<paragraph role="heading" id="hd_id8570513" xml-lang="en-US" level="2" l10n="NEW">Extension Scope</paragraph>
-<paragraph role="paragraph" id="par_idN1068A" xml-lang="en-US" l10n="CHG">Users with administrator or root privileges will see a dialog where they can choose to install extensions "for all users" or "only for me". Normal users without those privileges can install, remove, or modify extensions only for their own use.</paragraph>
+<paragraph id="hd_id8570513" role="heading" xml-lang="en-US" level="2">Extension Scope</paragraph>
+<paragraph id="par_idN1068A" role="paragraph" xml-lang="en-US">Users with administrator or root privileges will see a dialog where they can choose to install extensions "for all users" or "only for me". Normal users without those privileges can install, remove, or modify extensions only for their own use.</paragraph>
 <list type="ordered">
 <listitem>
-<paragraph role="paragraph" id="par_idN10626" xml-lang="en-US" l10n="CHG">A user with root or administrator privileges can install an extension as a shared extension that is available to all users. After selecting an extension, a dialog opens and asks whether to install for the current user or all users.</paragraph>
+<paragraph id="par_idN10626" role="paragraph" xml-lang="en-US">A user with root or administrator privileges can install an extension as a shared extension that is available to all users. After selecting an extension, a dialog opens and asks whether to install for the current user or all users.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="paragraph" id="par_idN1069C" xml-lang="en-US" l10n="CHG">A user without root privileges can only install an extension for own usage. This is called a user extension.</paragraph>
+<paragraph id="par_idN1069C" role="paragraph" xml-lang="en-US">A user without root privileges can only install an extension for own usage. This is called a user extension.</paragraph>
 </listitem>
 </list><comment>UFI: Extension Guide needed. Until we have that guide, I'll add some more info in this file.</comment>
-<paragraph role="heading" id="hd_id3895382" xml-lang="en-US" level="2" l10n="NEW">To install an extension</paragraph>
-<paragraph role="paragraph" id="par_id9143955" xml-lang="en-US" l10n="NEW">An extension is available as a file with the file extension .oxt.</paragraph>
-<paragraph role="paragraph" id="par_id7857905" xml-lang="en-US" l10n="CHG">You can find a collection of extensions on the Web. Click the "Get more extensions here" link in the Extension Manager to open your Web browser and see the <link href="http://extensions.services.openoffice.org/">http://extensions.services.openoffice.org/</link> page.<comment># i78606</comment></paragraph>
-<paragraph role="heading" id="hd_id5016937" xml-lang="en-US" level="3" l10n="NEW">To install a user extension</paragraph>
-<paragraph role="paragraph" id="par_id1856440" xml-lang="en-US" l10n="NEW">Do any of the following:</paragraph>
+<paragraph id="hd_id3895382" role="heading" xml-lang="en-US" level="2">To install an extension</paragraph>
+<paragraph id="par_id9143955" role="paragraph" xml-lang="en-US">An extension is available as a file with the file extension .oxt.</paragraph>
+<paragraph id="par_id7857905" role="paragraph" xml-lang="en-US">You can find a collection of extensions on the Web. Click the "Get more extensions here" link in the Extension Manager to open your Web browser and see the <link href="http://extensions.services.openoffice.org/">http://extensions.services.openoffice.org/</link> page.<comment># i78606</comment></paragraph>
+<paragraph id="hd_id5016937" role="heading" xml-lang="en-US" level="3">To install a user extension</paragraph>
+<paragraph id="par_id1856440" role="paragraph" xml-lang="en-US">Do any of the following:</paragraph>
 <list type="ordered">
 <listitem>
-<paragraph role="paragraph" id="par_id7654347" xml-lang="en-US" l10n="NEW">Double-click the <item type="literal">.oxt</item> file in your system's file browser.</paragraph>
+<paragraph id="par_id7654347" role="paragraph" xml-lang="en-US">Double-click the <item type="literal">.oxt</item> file in your system's file browser.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="paragraph" id="par_id5269020" xml-lang="en-US" l10n="NEW">On a web page, click a hyperlink to an <item type="literal">*.oxt</item> file (if your web browser can be configured to start the Extension Manager for this file type).</paragraph>
+<paragraph id="par_id5269020" role="paragraph" xml-lang="en-US">On a web page, click a hyperlink to an <item type="literal">*.oxt</item> file (if your web browser can be configured to start the Extension Manager for this file type).</paragraph>
 </listitem>
 <listitem>
-<paragraph role="paragraph" id="par_id8714255" xml-lang="en-US" l10n="CHG">Choose <item type="menuitem">Tools - Extension Manager</item> and click <item type="menuitem">Add</item>.</paragraph>
+<paragraph id="par_id8714255" role="paragraph" xml-lang="en-US">Choose <item type="menuitem">Tools - Extension Manager</item> and click <item type="menuitem">Add</item>.</paragraph>
 </listitem>
 </list>
-<paragraph role="heading" id="hd_id3734550" xml-lang="en-US" level="4" l10n="NEW">To install a shared extension in text mode</paragraph>
+<paragraph id="hd_id3734550" role="heading" xml-lang="en-US" level="4">To install a shared extension in text mode (for system administrators)</paragraph>
 <list type="ordered">
 <listitem>
-<paragraph role="paragraph" id="par_id4139225" xml-lang="en-US" l10n="NEW">As an administrator, open a terminal or command shell.</paragraph>
+<paragraph id="par_id4139225" role="paragraph" xml-lang="en-US">As an administrator, open a terminal or command shell.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="paragraph" id="par_id671712" xml-lang="en-US" l10n="NEW">Change to the %PRODUCTNAME<switchinline select="sys"><caseinline select="WIN">\ 
-</caseinline><defaultinline>/</defaultinline></switchinline>program folder.</paragraph>
+<paragraph id="par_id671712" role="paragraph" xml-lang="en-US">Change to the <switchinline select="sys"><caseinline select="WIN">\ 
+</caseinline><defaultinline>/</defaultinline></switchinline>program folder in your installation.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="paragraph" id="par_id4163945" xml-lang="en-US" l10n="NEW">Enter the following command, using the path and file name of your extension:</paragraph>
-<paragraph role="paragraph" id="par_id9581591" xml-lang="en-US" l10n="NEW">
-<item type="literal">unopkg add --shared path_filename.oxt</item>
-</paragraph>
+<paragraph id="par_id4163945" role="paragraph" xml-lang="en-US">Enter the following command, using the path and file name of your extension:</paragraph>
+<paragraph id="par_id9581591" role="paragraph" xml-lang="en-US"><item type="literal">unopkg add --shared path_filename.oxt</item></paragraph>
 </listitem>
 </list>
 <bookmark xml-lang="en-US" branch="hid/DESKTOP_HID_PACKAGE_MANAGER_TREELISTBOX" id="bm_id8800927" localize="false"/>
-<paragraph role="paragraph" id="par_idN106AD" xml-lang="en-US" l10n="CHG"><ahelp hid="42769">Select the extension that you want to remove, enable, or disable. For some extensions, you can also open an Options dialog.</ahelp></paragraph>
-<!-- removed HID desktop_PushButton_RID_DLG_PACKAGE_MANAGER_RID_BTN_ADD -->
-<!-- removed HID 2180354572 -->
-<paragraph role="heading" id="par_idN10639" xml-lang="en-US" level="2" l10n="NEW">Add</paragraph>
-<paragraph role="paragraph" id="par_idN106BA" xml-lang="en-US" l10n="CHG"><ahelp hid="2180256276">Click Add to add an extension.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_idN106BD" xml-lang="en-US" l10n="CHG">A file dialog opens where you can select the extension that you want to add. To copy and to register the selected extension, click Open.</paragraph>
+<paragraph id="par_idN106AD" role="paragraph" xml-lang="en-US"><ahelp hid="42769">Select the extension that you want to remove, enable, or disable. For some extensions, you can also open an Options dialog.</ahelp></paragraph>
+<paragraph id="par_idN10639" role="heading" xml-lang="en-US" level="2">Add</paragraph>
+<paragraph id="par_idN106BA" role="paragraph" xml-lang="en-US"><ahelp hid="2180256276">Click Add to add an extension.</ahelp></paragraph>
+<paragraph id="par_idN106BD" role="paragraph" xml-lang="en-US">A file dialog opens where you can select the extension that you want to add. To copy and to register the selected extension, click Open.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/desktop:MultiLineEdit:RID_DLG_LICENSE:ML_LICENSE" id="bm_id2089297" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/desktop:PushButton:RID_DLG_LICENSE:PB_LICENSE_DOWN" id="bm_id3366801" localize="false"/>
-<paragraph role="paragraph" id="par_id4856410" xml-lang="en-US" l10n="NEW">An extension can show a license dialog. <ahelp hid=".">Read the license. Click the Scroll Down button to scroll down if necessary. Click Accept to continue the installation of the extension.</ahelp></paragraph>
-<!-- removed HID desktop_PushButton_RID_DLG_PACKAGE_MANAGER_RID_BTN_REMOVE -->
+<paragraph id="par_id4856410" role="paragraph" xml-lang="en-US">An extension can show a license dialog. <ahelp hid=".">Read the license. Click the Scroll Down button to scroll down if necessary. Click Accept to continue the installation of the extension.</ahelp></paragraph><comment>insert hidden text for Show License</comment>
 <bookmark xml-lang="en-US" branch="hid/DESKTOP_HID_EXTENSION_MANAGER_LISTBOX_REMOVE" id="bm_id0523200810562584" localize="false"/>
-<paragraph role="heading" id="par_idN10643" xml-lang="en-US" level="2" l10n="NEW">Remove</paragraph>
-<paragraph role="paragraph" id="par_idN106D1" xml-lang="en-US" l10n="CHG"><ahelp hid="2180256277">Select the extension that you want to remove, and then click Remove.</ahelp></paragraph>
+<paragraph id="par_idN10643" role="heading" xml-lang="en-US" level="2">Remove</paragraph>
+<paragraph id="par_idN106D1" role="paragraph" xml-lang="en-US"><ahelp hid="2180256277">Select the extension that you want to remove, and then click Remove.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/DESKTOP_HID_EXTENSION_MANAGER_LISTBOX_DISABLE" id="bm_id0523200810570553" localize="false"/>
-<paragraph role="paragraph" id="par_id0523200810573866" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Enable or disable the extension.</ahelp></paragraph>
-<!-- removed HID desktop_PushButton_RID_DLG_PACKAGE_MANAGER_RID_BTN_ENABLE -->
-<paragraph role="heading" id="par_idN1064D" xml-lang="en-US" level="2" l10n="NEW">Enable</paragraph>
-<paragraph role="paragraph" id="par_idN106DE" xml-lang="en-US" l10n="CHG"><ahelp hid="2180256278">Select the extension that you want to enable, and then click Enable.</ahelp></paragraph>
-<!-- removed HID desktop_PushButton_RID_DLG_PACKAGE_MANAGER_RID_BTN_DISABLE -->
-<paragraph role="heading" id="par_idN10657" xml-lang="en-US" level="2" l10n="NEW">Disable</paragraph>
-<paragraph role="paragraph" id="par_idN106EB" xml-lang="en-US" l10n="CHG"><ahelp hid="2180256279">Select the extension that you want to disable, and then click Disable.</ahelp></paragraph>
-<!-- removed HID desktop_PushButton_RID_DLG_PACKAGE_MANAGER_RID_BTN_CHECK_UPDATES -->
-<!-- removed HID 2180354573 -->
-<paragraph role="heading" id="hd_id4453566" xml-lang="en-US" level="2" l10n="NEW">Update</paragraph>
-<paragraph role="paragraph" id="par_id4129459" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click to check for online updates of all installed extensions. To check for updates of the selected extension only, choose the Update command from the context menu. The check for availability of updates starts immediately.</ahelp> You will see the <link href="text/shared/01/extensionupdate.xhp">Extension Update</link> dialog.</paragraph>
-<!-- removed HID desktop_PushButton_RID_DLG_PACKAGE_MANAGER_RID_BTN_OPTIONS -->
+<paragraph id="par_id0523200810573866" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Enable or disable the extension.</ahelp></paragraph>
+<paragraph id="par_idN1064D" role="heading" xml-lang="en-US" level="2">Enable</paragraph>
+<paragraph id="par_idN106DE" role="paragraph" xml-lang="en-US"><ahelp hid="2180256278">Select the extension that you want to enable, and then click Enable.</ahelp></paragraph>
+<paragraph id="par_idN10657" role="heading" xml-lang="en-US" level="2">Disable</paragraph>
+<paragraph id="par_idN106EB" role="paragraph" xml-lang="en-US"><ahelp hid="2180256279">Select the extension that you want to disable, and then click Disable.</ahelp></paragraph>
+<paragraph id="hd_id4453566" role="heading" xml-lang="en-US" level="2">Update</paragraph>
+<paragraph id="par_id4129459" role="paragraph" xml-lang="en-US"><ahelp hid=".">Click to check for online updates of all installed extensions. To check for updates of the selected extension only, choose the Update command from the context menu. The check for availability of updates starts immediately.</ahelp> You will see the <link href="text/shared/01/extensionupdate.xhp">Extension Update</link> dialog.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/DESKTOP_HID_EXTENSION_MANAGER_LISTBOX_OPTIONS" id="bm_id052320081054360" localize="false"/>
-<paragraph role="heading" id="hd_id4921414" xml-lang="en-US" level="2" l10n="NEW">Options</paragraph>
-<paragraph role="paragraph" id="par_id1439558" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select an installed extension, then click to open the Options dialog for the extension.</ahelp></paragraph>
+<paragraph id="hd_id4921414" role="heading" xml-lang="en-US" level="2">Options</paragraph>
+<paragraph id="par_id1439558" role="paragraph" xml-lang="en-US"><ahelp hid=".">Select an installed extension, then click to open the Options dialog for the extension.</ahelp></paragraph>
+<paragraph id="par_id0103201110331832" role="paragraph" xml-lang="en-US">Some additional commands can appear in the context menu of an extension in the Extension Manager window, depending on the selected extension. You can choose to show the license text again. You can choose to exclude the extension from checking for updates or to include an excluded extension.</paragraph>
 </body>
-</helpdocument>
+</helpdocument>

File helpcontent2/source/text/shared/02/01171300.xhp

 <!--***********************************************************************
  *
  * 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
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************-->
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textshared0201171300xml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">Snap to Grid</title>
 <filename>/text/shared/02/01171300.xhp</filename>
 </topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-02-10T15:58:14">converted from old format - fpe</lastedited>
-</history>
 </meta>
 <body>
 <paragraph role="heading" id="hd_id3151262" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/02/01171300.xhp" name="Snap to Grid">Snap to Grid</link></paragraph>
 </tablecell>
 </tablerow>
 </table>
-
 </section>
 </body>
 </helpdocument>

File helpcontent2/source/text/shared/02/02170000.xhp

 <!--***********************************************************************
  *
  * 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
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************-->
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textshared0202170000xml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">Background color/Paragraph background </title>
 <filename>/text/shared/02/02170000.xhp</filename>
 </topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-06-09T11:43:38">UFI: fix to #112392#
-dedr: reviewed</lastedited>
-</history>
 </meta>
 <body>
 <section id="absatzhintergrund">
-<bookmark xml-lang="en-US" branch="hid/.uno:BackgroundColor" id="bm_id1844627" localize="false"/><!-- HID added by script -->
 <bookmark xml-lang="en-US" branch="hid/.uno:BackgroundColor" id="bm_id3148983" localize="false"/>
-<paragraph role="heading" id="hd_id3154232" xml-lang="en-US" level="1" l10n="U" oldref="1"><switchinline select="appl"><caseinline select="CALC"><link href="text/shared/02/02170000.xhp" name="Background color">Background color</link>
-</caseinline><defaultinline><link href="text/shared/02/02170000.xhp" name="Paragraph background">Paragraph background</link></defaultinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3149140" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="hintergrundfarbetext"><ahelp hid=".uno:BackgroundColor">Click to open a <link href="text/shared/00/00000001.xhp#abreissleiste" name="toolbar">toolbar</link> where you can click a background color for a paragraph. The color is applied to the background of the current paragraph or the selected paragraphs.</ahelp>
+<paragraph role="heading" id="hd_id3154232" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/shared/02/02170000.xhp" name="Background Color">Background Color</link></paragraph>
+<paragraph role="paragraph" id="par_id3149140" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="hintergrundfarbetext"><ahelp hid=".">Click to open a toolbar where you can click a background color for a paragraph. The color is applied to the background of the current paragraph or the selected paragraphs.</ahelp>
 </variable></paragraph>
 </section>
 <embed href="text/shared/guide/background.xhp#background"/>
 <section id="syabsatzhintergrund">
-<switch select="appl">
-<case select="CALC">
 <table id="tbl_id3149177">
 <tablerow>
 <tablecell colspan="" rowspan="">
 </tablecell>
 </tablerow>
 </table>
-
-</case>
-<case select="WRITER">
-<table id="tbl_id3156002">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3149235" xml-lang="en-US" l10n="E">
-<image id="img_id3150943" src="res/commandimagelist/sc_backgroundcolor.png"  ><alt id="alt_id3150943" xml-lang="en-US">Icon</alt>
-	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3153881" xml-lang="en-US" l10n="U" oldref="7">Paragraph Background, or Background Color when in a table in text, frames and inserted graphics</paragraph>
-</tablecell>
-</tablerow>
-</table>
-
-</case>
-<default>
-<table id="tbl_id3149795">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3149578" xml-lang="en-US" l10n="E">
-<image id="img_id3153716" src="res/commandimagelist/sc_backgroundcolor.png"  ><alt id="alt_id3153716" xml-lang="en-US">Icon</alt>
-	</image></paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3153062" xml-lang="en-US" l10n="U" oldref="6">Paragraph Background</paragraph>
-</tablecell>
-</tablerow>
-</table>
-
-</default>
-</switch>
 </section>
 </body>
 </helpdocument>

File helpcontent2/source/text/shared/02/03140000.xhp

 <!--***********************************************************************
  *
  * 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
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************-->
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textshared0203140000xml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">Line Style</title>
 <filename>/text/shared/02/03140000.xhp</filename>
 </topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-01-10T15:32:41">converted from old format - fpe</lastedited>
-</history>
 </meta>
 <body>
 <section id="linienstil">
-<bookmark xml-lang="en-US" branch="hid/.uno:LineStyle" id="bm_id4898355" localize="false"/><!-- HID added by script -->
+
 <bookmark xml-lang="en-US" branch="hid/.uno:LineStyle" id="bm_id3154545" localize="false"/>
 <paragraph role="heading" id="hd_id3146936" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/02/03140000.xhp" name="Line Style">Line Style</link></paragraph>
 <paragraph role="paragraph" id="par_id3155577" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:LineStyle">Click this icon to open the <emph>Line Style</emph> toolbar, where you can modify the border line style.</ahelp></paragraph>

File helpcontent2/source/text/shared/02/03150000.xhp

 <!--***********************************************************************
  *
  * 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
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************-->
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textshared0203150000xml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">Border Color</title>
 <filename>/text/shared/02/03150000.xhp</filename>
 </topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-01-10T15:35:10">converted from old format - fpe</lastedited>
-</history>
 </meta>
 <body>
 <section id="linienfarbe">
-<bookmark xml-lang="en-US" branch="hid/.uno:FrameLineColor" id="bm_id8323001" localize="false"/><!-- HID added by script -->
 <bookmark xml-lang="en-US" branch="hid/.uno:FrameLineColor" id="bm_id3109850" localize="false"/>
 <paragraph role="heading" id="hd_id3154873" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/02/03150000.xhp" name="Border Color">Border Color</link></paragraph>
 <paragraph role="paragraph" id="par_id3163829" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".uno:FrameLineColor">Click the <emph>Line Color (of the border)</emph> icon to open the <emph>Border Color</emph> toolbar, which enables you to change the border color of an object.</ahelp></paragraph>

File helpcontent2/source/text/shared/02/07010000.xhp

  ***********************************************************************
  *
  * 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
  *
  ************************************************************************
  -->
-
-
-		<helpdocument version="1.0">
+<helpdocument version="1.0">
 <meta>
 <topic id="textshared0207010000xml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">Load URL</title>
 <section id="urlladen">
 <bookmark xml-lang="en-US" branch="hid/.uno:OpenUrl" id="bm_id7760961" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:OpenUrl" id="bm_id3151100" localize="false"/><paragraph role="heading" id="hd_id3149119" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/02/07010000.xhp" name="Load URL">Load URL</link></paragraph>
-<paragraph role="paragraph" id="par_id3155364" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".">Loads a document specified by an entered URL. You can type a new URL or select one from the list. %PRODUCTNAME automatically converts file paths into URL notation.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3155364" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".">Loads a document specified by an entered URL. You can type a new URL, edit an URL, or select one from the list. Displays the full path of the current document.</ahelp></paragraph>
 <paragraph role="tip" id="par_idN108C6" xml-lang="en-US" l10n="CHG">Enable Load URL with the Visible Buttons command (click the arrow at the end of the toolbar).<comment>i73505</comment></paragraph>
 </section>
 </body>

File helpcontent2/source/text/shared/02/12100100.xhp

  ***********************************************************************
  *
  * 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
 <bookmark_value>databases; sorting</bookmark_value>
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_DLG_ORDERCRIT" id="bm_id3154788" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:OrderCrit" id="bm_id4798297" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:OrderCrit" id="bm_id3154682" localize="false"/><section id="sortorder">
 <paragraph role="heading" id="hd_id3147000" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="sortierung"><link href="text/shared/02/12100100.xhp" name="Sort Order">Sort Order</link>
 </variable></paragraph>

File helpcontent2/source/text/shared/guide/collab.xhp

-<?xml version="1.0" encoding="UTF-8"?>
-
-
-
-<!--
- ***********************************************************************
+<?xml version="1.0" encoding="UTF-8"?><helpdocument version="1.0">
+<!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
  *
- ************************************************************************
- -->
-
-
-		<helpdocument version="1.0">
+ ************************************************************************ -->
+ 
 <meta>
 <topic id="textsharedguidecollabxml" indexer="include" status="PUBLISH">
 <title xml-lang="en-US" id="tit">Collaboration</title>
-<filename>/text/shared/guide/collab.xhp</filename>
+<filename>text/shared/guide/collab.xhp</filename>
 </topic>
 </meta>
 <body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id4459669"><bookmark_value>sharing documents</bookmark_value>
+<bookmark xml-lang="en-US" branch="index" id="bm_id4459669">
+<bookmark_value>sharing documents</bookmark_value>
 <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>
-</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_value>file locking with collaboration</bookmark_value>
+<bookmark_value>locked documents</bookmark_value>
+</bookmark><comment>MW changed the index entries to one level entries.</comment><comment>MW added two index entries with "lock"</comment>
+<paragraph id="hd_id130008" role="heading" xml-lang="en-US" level="1"><variable id="collab"><link href="text/shared/guide/collab.xhp">Collaboration</link></variable></paragraph>
+<paragraph id="par_id5821710" role="paragraph" xml-lang="en-US">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>
+<paragraph id="par_id9590136" role="paragraph" xml-lang="en-US"><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>
 <bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_SHAREDOCUMENT:CB_SHARE" id="bm_id7900021" localize="false"/>
-  <paragraph xml-lang="en-US" id="par_id2519913" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Enable to share the current document with other users. Disable to use the document unshared. This will invalidate the not yet saved edits that other users applied in the time since you last opened or saved this document.</ahelp></paragraph>
-  <paragraph xml-lang="en-US" id="hd_id6917020" role="heading" level="2" l10n="NEW">Collaboration in Calc</paragraph>
-  <paragraph xml-lang="en-US" id="par_id4411145" role="paragraph" l10n="NEW">In %PRODUCTNAME Calc, document sharing