summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUwe Fischer <ufi@openoffice.org>2011-01-19 10:08:33 +0100
committerUwe Fischer <ufi@openoffice.org>2011-01-19 10:08:33 +0100
commit90b71fc068674f1a8fa7b960a7c9363cfc2e2722 (patch)
tree9bc3b18fbcef3bcfd6bc81f3c2fd5f69e25ede6e
parentf9068cb3bf53d52579a847b06bf73eaa2e14954a (diff)
hcshared29: final
-rwxr-xr-xhelpcontent2/source/text/scalc/guide/cell_protect.xhp15
-rw-r--r--helpcontent2/source/text/schart/01/03010000.xhp6
-rwxr-xr-xhelpcontent2/source/text/sdraw/guide/eyedropper.xhp25
-rwxr-xr-xhelpcontent2/source/text/shared/00/00000200.xhp2
-rw-r--r--helpcontent2/source/text/shared/00/00000406.xhp2
-rw-r--r--helpcontent2/source/text/shared/01/01170000.xhp7
-rw-r--r--helpcontent2/source/text/shared/01/01190000.xhp10
-rw-r--r--helpcontent2/source/text/shared/01/02100000.xhp14
-rw-r--r--helpcontent2/source/text/shared/01/06030000.xhp23
-rw-r--r--helpcontent2/source/text/shared/01/extensionupdate.xhp83
-rw-r--r--helpcontent2/source/text/shared/01/packagemanager.xhp122
-rw-r--r--helpcontent2/source/text/shared/02/07010000.xhp8
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/01013000.xhp9
-rw-r--r--helpcontent2/source/text/shared/optionen/01040400.xhp22
-rw-r--r--helpcontent2/source/text/swriter/01/05060201.xhp12
15 files changed, 169 insertions, 191 deletions
diff --git a/helpcontent2/source/text/scalc/guide/cell_protect.xhp b/helpcontent2/source/text/scalc/guide/cell_protect.xhp
index 73f47392d5..1582ea1a25 100755
--- a/helpcontent2/source/text/scalc/guide/cell_protect.xhp
+++ b/helpcontent2/source/text/scalc/guide/cell_protect.xhp
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * Copyright 2000, 2011 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
@@ -29,8 +29,8 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textscalcguidecell_protectxml" indexer="include" status="PUBLISH">
<title xml-lang="en-US" id="tit">Protecting Cells from Changes</title>
@@ -52,7 +52,7 @@
</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>
@@ -62,7 +62,8 @@
<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>
diff --git a/helpcontent2/source/text/schart/01/03010000.xhp b/helpcontent2/source/text/schart/01/03010000.xhp
index f329660a9d..4b12e22871 100644
--- a/helpcontent2/source/text/schart/01/03010000.xhp
+++ b/helpcontent2/source/text/schart/01/03010000.xhp
@@ -7,7 +7,7 @@
*
* 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
*
@@ -87,7 +87,9 @@
<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</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>
diff --git a/helpcontent2/source/text/sdraw/guide/eyedropper.xhp b/helpcontent2/source/text/sdraw/guide/eyedropper.xhp
index 89e7d03834..9ba1d60946 100755
--- a/helpcontent2/source/text/sdraw/guide/eyedropper.xhp
+++ b/helpcontent2/source/text/sdraw/guide/eyedropper.xhp
@@ -4,8 +4,8 @@
<!--***********************************************************************
*
* 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
*
@@ -27,18 +27,13 @@
* 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>
@@ -50,18 +45,18 @@
</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>
@@ -79,10 +74,10 @@
<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>
diff --git a/helpcontent2/source/text/shared/00/00000200.xhp b/helpcontent2/source/text/shared/00/00000200.xhp
index 4079f9f663..f4683c0b9c 100755
--- a/helpcontent2/source/text/shared/00/00000200.xhp
+++ b/helpcontent2/source/text/shared/00/00000200.xhp
@@ -94,7 +94,7 @@
<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>
diff --git a/helpcontent2/source/text/shared/00/00000406.xhp b/helpcontent2/source/text/shared/00/00000406.xhp
index d16dda5565..46e6d48b79 100644
--- a/helpcontent2/source/text/shared/00/00000406.xhp
+++ b/helpcontent2/source/text/shared/00/00000406.xhp
@@ -97,7 +97,7 @@
</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>
diff --git a/helpcontent2/source/text/shared/01/01170000.xhp b/helpcontent2/source/text/shared/01/01170000.xhp
index 3872acfeb2..63008c09b0 100644
--- a/helpcontent2/source/text/shared/01/01170000.xhp
+++ b/helpcontent2/source/text/shared/01/01170000.xhp
@@ -6,8 +6,8 @@
***********************************************************************
*
* 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
*
@@ -43,9 +43,8 @@
<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"/>
diff --git a/helpcontent2/source/text/shared/01/01190000.xhp b/helpcontent2/source/text/shared/01/01190000.xhp
index 840e9b5a4b..1d6fa87952 100644
--- a/helpcontent2/source/text/shared/01/01190000.xhp
+++ b/helpcontent2/source/text/shared/01/01190000.xhp
@@ -4,7 +4,7 @@
<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,22 +29,17 @@
************************************************************************-->
-
+
<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>
@@ -64,6 +59,7 @@
<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>
diff --git a/helpcontent2/source/text/shared/01/02100000.xhp b/helpcontent2/source/text/shared/01/02100000.xhp
index c2c98db9bc..227fa3f74d 100644
--- a/helpcontent2/source/text/shared/01/02100000.xhp
+++ b/helpcontent2/source/text/shared/01/02100000.xhp
@@ -6,7 +6,7 @@
*
* 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
*
@@ -61,7 +61,7 @@
<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>
@@ -167,12 +167,16 @@ Ext help text not found within switches. Solution: Keep switched text for normal
<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>
diff --git a/helpcontent2/source/text/shared/01/06030000.xhp b/helpcontent2/source/text/shared/01/06030000.xhp
index 95b238d223..3e7ac6f694 100644
--- a/helpcontent2/source/text/shared/01/06030000.xhp
+++ b/helpcontent2/source/text/shared/01/06030000.xhp
@@ -4,7 +4,7 @@
<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -27,24 +27,19 @@
* 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">
@@ -64,7 +59,7 @@
</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>
@@ -72,8 +67,8 @@
<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>
@@ -87,7 +82,7 @@
<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"/>
diff --git a/helpcontent2/source/text/shared/01/extensionupdate.xhp b/helpcontent2/source/text/shared/01/extensionupdate.xhp
index 9876e465b0..4889648988 100644
--- a/helpcontent2/source/text/shared/01/extensionupdate.xhp
+++ b/helpcontent2/source/text/shared/01/extensionupdate.xhp
@@ -1,8 +1,5 @@
-<?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.
*
@@ -27,49 +24,49 @@
* <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>
-
-
-<comment>insert hidden text for Exclude from this update/from all updates/include again, see i115834</comment>
-
- <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> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/packagemanager.xhp b/helpcontent2/source/text/shared/01/packagemanager.xhp
index 4de07e8fbc..e3db16ed62 100644
--- a/helpcontent2/source/text/shared/01/packagemanager.xhp
+++ b/helpcontent2/source/text/shared/01/packagemanager.xhp
@@ -1,8 +1,5 @@
-<?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.
*
@@ -27,124 +24,109 @@
* <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>
-
-<comment>insert hidden text for Show License</comment>
-
-
-<!-- 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> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/02/07010000.xhp b/helpcontent2/source/text/shared/02/07010000.xhp
index 5e454f36a8..c4f41ce291 100644
--- a/helpcontent2/source/text/shared/02/07010000.xhp
+++ b/helpcontent2/source/text/shared/02/07010000.xhp
@@ -6,7 +6,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -30,9 +30,7 @@
*
************************************************************************
-->
-
-
- <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>
@@ -43,7 +41,7 @@
<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>
diff --git a/helpcontent2/source/text/shared/optionen/01013000.xhp b/helpcontent2/source/text/shared/optionen/01013000.xhp
index 56a2539d91..afaf6419c3 100755
--- a/helpcontent2/source/text/shared/optionen/01013000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01013000.xhp
@@ -6,8 +6,8 @@
***********************************************************************
*
* 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
*
@@ -64,8 +64,9 @@
</caseinline><defaultinline><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_ACCESSIBILITYCONFIG_CB_ACCESSIBILITY_TOOL">Allows you to use assistive tools, such as external screen readers, Braille devices or speech recognition input devices. The Java Runtime Environment must be installed on your computer before you can enable assistive support.</ahelp></defaultinline></switchinline></paragraph>
<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_TEXTSELECTION" id="bm_id3155342" localize="false"/><paragraph role="heading" id="hd_id3154047" xml-lang="en-US" level="3" l10n="U" oldref="27">Use text selection cursor in read-only text document</paragraph>
<paragraph role="paragraph" id="par_id3149164" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_ACCESSIBILITYCONFIG_CB_TEXTSELECTION">Displays cursor in read-only documents.</ahelp></paragraph>
-<!-- removed HID SVX_CHECKBOX_RID_SVXPAGE_ACCESSIBILITYCONFIG_CB_SYSTEM_FONT --><paragraph role="heading" id="hd_id3150669" xml-lang="en-US" level="3" l10n="U" oldref="21">Use system font for user interface</paragraph>
-<paragraph role="paragraph" id="par_id3153665" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_ACCESSIBILITYCONFIG_CB_SYSTEM_FONT">Displays fonts in menus, dialogs, and other user interface elements using the system font settings.</ahelp></paragraph>
+<comment>
+issue 103084 <!-- removed HID SVX_CHECKBOX_RID_SVXPAGE_ACCESSIBILITYCONFIG_CB_SYSTEM_FONT -->
+</comment>
<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_ANIMATED_GRAPHICS" id="bm_id3153627" localize="false"/><paragraph role="heading" id="hd_id3147531" xml-lang="en-US" level="3" l10n="U" oldref="15">Allow animated graphics</paragraph>
<paragraph role="paragraph" id="par_id3145069" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_ACCESSIBILITYCONFIG_CB_ANIMATED_GRAPHICS">Previews animated graphics, such as GIF images, in <item type="productname">%PRODUCTNAME</item>.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_ANIMATED_TEXTS" id="bm_id3152812" localize="false"/><paragraph role="heading" id="hd_id3147264" xml-lang="en-US" level="3" l10n="U" oldref="17">Allow animated text</paragraph>
diff --git a/helpcontent2/source/text/shared/optionen/01040400.xhp b/helpcontent2/source/text/shared/optionen/01040400.xhp
index 7f95106337..5904822866 100644
--- a/helpcontent2/source/text/shared/optionen/01040400.xhp
+++ b/helpcontent2/source/text/shared/optionen/01040400.xhp
@@ -70,7 +70,7 @@
<paragraph xml-lang="en-US" id="par_id3155628" role="paragraph" l10n="U" oldref="4">Specifies which document contents are to be printed. </paragraph>
<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTPRINT_PAGE:CB_PGRF" id="bm_id3145674" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:PrintPicturesAndObjects:CheckBox" id="bm_id3145675" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3156156" role="heading" level="2" l10n="U" oldref="5">Graphics</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3156156" role="heading" level="2" l10n="CHG" oldref="5">Pictures and objects</paragraph>
<paragraph xml-lang="en-US" id="par_id3153824" role="paragraph" l10n="U" oldref="6"><ahelp hid="sw:CheckBox:TP_OPTPRINT_PAGE:CB_PGRF">Specifies whether the graphics of your text document are printed.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTPRINT_PAGE:CB_PTAB" id="bm_id3148564" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3150771" role="heading" level="2" l10n="U" oldref="7">Tables</paragraph>
@@ -80,10 +80,11 @@
<paragraph xml-lang="en-US" id="par_id3149457" role="paragraph" l10n="U" oldref="10"><ahelp hid="sw:CheckBox:TP_OPTPRINT_PAGE:CB_PDRAW">Specifies whether graphics created with $[officename] drawing functions are printed.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTPRINT_PAGE:CB_CTRLFLD" id="bm_id3151210" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:PrintControls:CheckBox" id="bm_id3151211" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3153525" role="heading" level="2" l10n="U" oldref="11">Controls</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3153525" role="heading" level="2" l10n="CHG" oldref="11">Form controls</paragraph>
<paragraph xml-lang="en-US" id="par_id3158408" role="paragraph" l10n="CHG" oldref="12"><ahelp hid="sw:CheckBox:TP_OPTPRINT_PAGE:CB_CTRLFLD">Specifies whether the form control fields of the text document are printed.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:PrintPageBackground:CheckBox" id="bm_id3154684" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3153968" role="heading" level="2" l10n="U" oldref="13">Background</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTPRINT_PAGE:CB_BACKGROUND" id="bm_id3999210" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153968" role="heading" level="2" l10n="CHG" oldref="13">Page background</paragraph>
<paragraph xml-lang="en-US" id="par_id3159150" role="paragraph" l10n="CHG" oldref="14"><ahelp hid=".">Specifies whether to include colors and objects that are inserted to the background of the page (Format - Page - Background) in the printed document.</ahelp><comment>UFI: fixes #i21977#</comment></paragraph>
<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTPRINT_PAGE:CB_BLACK_FONT" id="bm_id3144760" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:PrintBlackFonts:CheckBox" id="bm_id3144761" localize="false"/>
@@ -94,6 +95,7 @@
<paragraph xml-lang="en-US" id="hd_id8004394" role="heading" level="2" l10n="NEW">Hidden text</paragraph>
<paragraph xml-lang="en-US" id="par_id2021546" role="paragraph" l10n="NEW"><ahelp hid=".">Enable this option to print text that is marked as hidden.</ahelp> The following hidden text is printed: text that is formatted as hidden by <link href="text/shared/01/05020200.xhp">Format - Character - Font Effects - Hidden</link>, and the text fields <link href="text/swriter/01/04090003.xhp">Hidden text and Hidden paragraphs</link>.<comment>UFI: sorry, due to a bug no links allowed in extended help text</comment></paragraph>
<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:PrintTextPlaceholder:CheckBox" id="bm_id5788750" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sw_CheckBox_TP_OPTPRINT_PAGE_CB_TEXT_PLACEHOLDER" id="bm_id9393722" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id2623981" role="heading" level="2" l10n="NEW">Text placeholder</paragraph>
<paragraph xml-lang="en-US" id="par_id7242042" role="paragraph" l10n="NEW"><ahelp hid=".">Enable this option to print text placeholders. Disable this option to leave the text placeholders blank in the printout.</ahelp><link href="text/swriter/01/04090003.xhp">Text placeholders</link> are fields.</paragraph>
<paragraph xml-lang="en-US" id="hd_id3151115" role="heading" level="2" l10n="U" oldref="15">Pages</paragraph>
@@ -104,18 +106,22 @@
<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTPRINT_PAGE:CB_RIGHTP" id="bm_id3147213" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3152885" role="heading" level="2" l10n="U" oldref="19">Right pages (not for HTML documents)</paragraph>
<paragraph xml-lang="en-US" id="par_id3150103" role="paragraph" l10n="U" oldref="20"><ahelp hid="sw:CheckBox:TP_OPTPRINT_PAGE:CB_RIGHTP">Specifies whether to print all right (odd numbered) pages of the document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTPRINT_PAGE:CB_REVERSE" id="bm_id3153142" localize="false"/>
+<comment>
+ <bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTPRINT_PAGE:CB_REVERSE" id="bm_id3153142" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3148577" role="heading" level="2" l10n="U" oldref="21">Reversed</paragraph>
<paragraph xml-lang="en-US" id="par_id3150486" role="paragraph" l10n="U" oldref="22"><ahelp hid="sw:CheckBox:TP_OPTPRINT_PAGE:CB_REVERSE">Specifies whether to reverse the printing order. The last page of the document will then be the first one printed.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTPRINT_PAGE:CB_PROSPECT" id="bm_id3155306" localize="false"/>
+</comment>
+ <bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTPRINT_PAGE:CB_PROSPECT" id="bm_id3155306" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3147318" role="heading" level="2" l10n="U" oldref="23">Brochure</paragraph>
<paragraph xml-lang="en-US" id="par_id3155417" role="paragraph" l10n="U" oldref="24"><ahelp hid="sw:CheckBox:TP_OPTPRINT_PAGE:CB_PROSPECT">Select the<emph> Brochure </emph>option to print your document in brochure format.</ahelp> The brochure format is as follows in $[officename] Writer:</paragraph>
<section id="brochure">
<paragraph xml-lang="en-US" id="par_id3149410" role="paragraph" l10n="CHG" oldref="25">If you print a document in portrait on a landscape page, two opposing sides in a brochure will be printed next to each other. If you have a printer with double-sided printing capability, you can create an entire brochure from your document without having to collate the pages later. If you have a printer that only has single-sided printing capability, you can achieve this effect by first printing the front pages with the "Front sides / right pages /odd pages" option marked, then re-inserting the entire paper stack in your printer and printing all the back pages with the "Back pages / left pages / even pages" option marked.</paragraph>
</section>
+<comment>
<bookmark xml-lang="en-US" branch="hid/sw_CheckBox_TP_OPTPRINT_PAGE_CB_PROSPECT_RTL" id="bm_id8632770" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id9475386" role="heading" level="2" l10n="NEW">Right to left</paragraph>
<paragraph xml-lang="en-US" id="par_id7894222" role="paragraph" l10n="NEW"><ahelp hid=".">Check to print the pages of the brochure in the correct order for a right-to-left script.</ahelp></paragraph>
+</comment>
<paragraph xml-lang="en-US" id="hd_id3149300" role="heading" level="2" l10n="U" oldref="26">Comments</paragraph>
<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_NO" id="bm_id3157847" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:PrintAnnotationMode:ListBox" id="bm_id3157848" localize="false"/>
@@ -124,11 +130,13 @@
<bookmark xml-lang="en-US" branch="hid/sw_CheckBox_TP_OPTPRINT_PAGE_CB_PRINTEMPTYPAGES" id="bm_id2646870" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:PrintEmptyPages:CheckBox" id="bm_id2646871" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id4188055" role="heading" level="2" l10n="NEW">Print automatically inserted blank pages</paragraph>
- <paragraph xml-lang="en-US" id="par_id8295541" role="paragraph" l10n="CHG"><ahelp hid=".">If this option is enabled, automatically-inserted blank pages are being printed. This is best if you are printing double-sided. For example, in a book, a "chapter" paragraph style has been set to always start with an odd numbered page. If the previous chapter ends on an odd page, %PRODUCTNAME inserts an even numbered blank page. This option controls whether to print that even numbered page or not.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_id8295541" role="paragraph" l10n="CHG"><ahelp hid=".">If this option is enabled, automatically-inserted blank pages are being printed. This is best if you are printing double-sided. For example, in a book, a "chapter" paragraph style has been set to always start with an odd numbered page. If the previous chapter ends on an odd page, %PRODUCTNAME inserts an even numbered blank page. This option controls whether to print that even numbered page or not.</ahelp></paragraph>
+<comment>issue 116009
<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTPRINT_PAGE:CB_SINGLEJOBS" id="bm_id3153713" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3145642" role="heading" level="2" l10n="CHG" oldref="47">Create single print jobs</paragraph>
<paragraph xml-lang="en-US" id="par_id3147338" role="paragraph" l10n="U" oldref="48"><ahelp hid="sw:CheckBox:TP_OPTPRINT_PAGE:CB_SINGLEJOBS">Specifies that each new print job will begin on a new page even if you are using a duplex printer.</ahelp> If this field is not checked then it is possible that the first page of the second copy is printed on the reverse side of the last page of the first copy, especially if there are an odd number of pages.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTPRINT_PAGE:CB_PAPERFROMSETUP" id="bm_id3149107" localize="false"/>
+</comment>
+ <bookmark xml-lang="en-US" branch="hid/sw:CheckBox:TP_OPTPRINT_PAGE:CB_PAPERFROMSETUP" id="bm_id3149107" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3156384" role="heading" level="2" l10n="U" oldref="41">Paper tray from printer settings</paragraph>
<paragraph xml-lang="en-US" id="par_id3146316" role="paragraph" l10n="U" oldref="37"><ahelp hid="sw:CheckBox:TP_OPTPRINT_PAGE:CB_PAPERFROMSETUP">For printers with multiple trays, the "Paper tray from printer settings" option specifies whether the paper tray used is specified by the system settings of the printer.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_OPTPRINT_PAGE:LB_FAX" id="bm_id3155336" localize="false"/>
diff --git a/helpcontent2/source/text/swriter/01/05060201.xhp b/helpcontent2/source/text/swriter/01/05060201.xhp
index 6bdbad8484..1e24f54aa5 100644
--- a/helpcontent2/source/text/swriter/01/05060201.xhp
+++ b/helpcontent2/source/text/swriter/01/05060201.xhp
@@ -4,7 +4,7 @@
<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -27,7 +27,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textswriter0105060201xml" indexer="include" status="PUBLISH">
@@ -260,8 +260,8 @@
</table>
<bookmark xml-lang="en-US" branch="hid/SVX_HID_CONTDLG_PIPETTE" id="bm_id3145092" localize="false"/>
-<paragraph role="heading" id="hd_id3153212" xml-lang="en-US" level="2" l10n="U" oldref="42">Eyedropper</paragraph>
-<paragraph role="paragraph" id="par_id3145098" xml-lang="en-US" l10n="U" oldref="43"><ahelp hid="HID_CONTDLG_PIPETTE">Selects the parts of the bitmap that are the same color. Click here, and then click a color in the bitmap. To increase the color range that is selected, increase the value in the <emph>Tolerance </emph>box.</ahelp></paragraph>
+<paragraph role="heading" id="hd_id3153212" xml-lang="en-US" level="2" l10n="CHG" oldref="42">Color Replacer</paragraph>
+<paragraph role="paragraph" id="par_id3145098" xml-lang="en-US" l10n="U" oldref="43"><ahelp hid="HID_CONTDLG_PIPETTE">Selects the parts of the bitmap that are the same color. Click here, and then click a color in the bitmap. To increase the color range that is selected, increase the value in the <emph>Tolerance</emph> box.</ahelp></paragraph>
<table id="tbl_id3146880">
<tablerow>
<tablecell colspan="" rowspan="">
@@ -270,14 +270,14 @@
</image></paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3149381" xml-lang="en-US" l10n="U" oldref="44">Eyedropper</paragraph>
+<paragraph role="paragraph" id="par_id3149381" xml-lang="en-US" l10n="CHG" oldref="44">Color Replacer</paragraph>
</tablecell>
</tablerow>
</table>
<bookmark xml-lang="en-US" branch="hid/svx:MetricField:RID_SVXDLG_CONTOUR:MTF_TOLERANCE" id="bm_id3154729" localize="false"/>
<paragraph role="heading" id="hd_id3149398" xml-lang="en-US" level="2" l10n="U" oldref="45">Tolerance</paragraph>
-<paragraph role="paragraph" id="par_id3154735" xml-lang="en-US" l10n="U" oldref="47"><ahelp hid="SVX:METRICFIELD:RID_SVXDLG_CONTOUR:MTF_TOLERANCE">Enter the color tolerance for the eyedropper as a percentage. To increase the color range that the eyedropper selects, enter a high percentage.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3154735" xml-lang="en-US" l10n="CHG" oldref="47"><ahelp hid=".">Enter the color tolerance for the Color Replacer as a percentage. To increase the color range that the Color Replacer selects, enter a high percentage.</ahelp></paragraph>
<section id="relatedtopics">
<embed href="text/swriter/guide/wrap.xhp#wrap"/>
</section>