DEV300: merge masterfix ea9085d6db4c@DEV300ooo/DEV300_m77

author: Jens-Heiner Rechtien <hr@openoffice.org> 2010-04-16 13:29:10 +0200
committer: Jens-Heiner Rechtien <hr@openoffice.org> 2010-04-16 13:29:10 +0200
commit: 5b7f36225468b7bfaf0e4e58a2691ebb8c620f9e (patch)
tree: badf82e16598bd928bae80ffe018154463aafaff /helpcontent2
parent: 90f1ab229c0877820548f22493d2167d46f6da91 (diff)
parent: 502f8c137795134c5c43b0bf32c85fedc3bacd13 (diff)
8 files changed, 133 insertions, 172 deletions
diff --git a/helpcontent2/helpers/update_tree.pl b/helpcontent2/helpers/update_tree.pl
index 018d55c053..b2aa53fcb3 100644
--- a/helpcontent2/helpers/update_tree.pl
+++ b/helpcontent2/helpers/update_tree.pl
@@ -34,10 +34,6 @@ use File::Copy qw/cp mv/;
 use File::Basename;
 use Benchmark;
 
-my $is_win = "false";
-
-$is_win = "true" , if ( defined $ENV{USE_SHELL} && $ENV{USE_SHELL} eq "4nt" );
-
 $t0 = new Benchmark;
 # update the tree files in <platform>/misc/*
 
@@ -79,9 +75,7 @@ if ( ! defined $prj ) {
         {
             $source_dir = $ENV{LOCALIZESDF};
         }
-        if( $is_win eq "false" ) { $source_dir =~ s/\/auxiliary\/localize.sdf$// ; }
-        else { $source_dir =~ s/\\auxiliary\\localize.sdf$// ; }
- 
+        $source_dir =~ s/\/auxiliary\/localize.sdf$// ;
     }
     #else {die "ERROR: The env variables TRYSDF LOCALIZATION_FOUND LOCALIZESDF not found ... something is wrong!\n";}
 
@@ -102,8 +96,7 @@ if ( ! defined $prj ) {
     {
         $source_dir = $ENV{LOCALIZESDF};
     }
-    if( $is_win eq "false" ) { $source_dir =~ s/\/auxiliary\/localize.sdf$// ; }
-    else { $source_dir =~ s/\\auxiliary\\localize.sdf$// ; }
+    $source_dir =~ s/\/auxiliary\/localize.sdf$// ;
     #else {die "ERROR: The env variables TRYSDF LOCALIZATION_FOUND LOCALIZESDF not found ... something is wrong!\n";}
 
 }
@@ -343,7 +336,6 @@ sub read_loc {
     print "\n\nReading localized titles...";
     $/ = "\n";
     my $path = "$source_dir/text";
-    $path =~ s/\//\\/g , if $is_win eq "true";
     print " in $source_dir/text\n";
     @files = `find $source_dir/text -name localize.sdf`;
     for my $fname (@files) {
diff --git a/helpcontent2/source/auxiliary/makefile.mk b/helpcontent2/source/auxiliary/makefile.mk
index 1155e80369..29a085070e 100644
--- a/helpcontent2/source/auxiliary/makefile.mk
+++ b/helpcontent2/source/auxiliary/makefile.mk
@@ -38,11 +38,7 @@ TREEFILES  = \
 ALLTAR : aux_dirs $(COMMONMISC)$/treefiles.done $(COMMONBIN)$/helpimg.ilst
 
 .IF "$(WITH_LANG)"!=""
-.IF "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
 t_aux_langdirs:=$(shell @find ./ -name "*.cfg" | sed "s/\.\/\///" | sed "s/\.\///" )
-.ELSE           # "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
-t_aux_langdirs:=$(subst,./, $(shell @$(FIND) ./ -name "*.cfg"))
-.ENDIF          # "$(GUI)"=="UNX" || "$(USE_SHELL)"!="4nt"
 
 aux_langdirs:=$(uniq $(t_aux_langdirs:d:d))
 
diff --git a/helpcontent2/source/text/shared/01/01130000.xhp b/helpcontent2/source/text/shared/01/01130000.xhp
index 265dc1ca14..4491cc709b 100644
--- a/helpcontent2/source/text/shared/01/01130000.xhp
+++ b/helpcontent2/source/text/shared/01/01130000.xhp
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
 ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,8 +29,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
       <topic id="textshared0101130000xml" indexer="include">
          <title xml-lang="en-US" id="tit">Print</title>
@@ -39,77 +39,70 @@
    </meta>
    <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3154621"><bookmark_value>printing; documents</bookmark_value>
-      <bookmark_value>documents; printing</bookmark_value>
-      <bookmark_value>text documents; printing</bookmark_value>
-      <bookmark_value>spreadsheets; printing</bookmark_value>
-      <bookmark_value>presentations; print menu</bookmark_value>
-      <bookmark_value>drawings; printing</bookmark_value>
-      <bookmark_value>choosing printers</bookmark_value>
-      <bookmark_value>printers; choosing</bookmark_value>
-      <bookmark_value>print area selection</bookmark_value>
-      <bookmark_value>selecting; print areas</bookmark_value>
-      <bookmark_value>pages; selecting one to print</bookmark_value>
-      <bookmark_value>printing; selections</bookmark_value>
-      <bookmark_value>printing; copies</bookmark_value>
-      <bookmark_value>copies; printing</bookmark_value>
-      <bookmark_value>spoolfiles with Xprinter</bookmark_value>
-</bookmark><comment>MW deleted "selections;"</comment>
+<bookmark_value>documents; printing</bookmark_value>
+<bookmark_value>text documents; printing</bookmark_value>
+<bookmark_value>spreadsheets; printing</bookmark_value>
+<bookmark_value>presentations; print menu</bookmark_value>
+<bookmark_value>drawings; printing</bookmark_value>
+<bookmark_value>choosing printers</bookmark_value>
+<bookmark_value>printers; choosing</bookmark_value>
+<bookmark_value>print area selection</bookmark_value>
+<bookmark_value>selecting; print areas</bookmark_value>
+<bookmark_value>pages; selecting one to print</bookmark_value>
+<bookmark_value>printing; selections</bookmark_value>
+<bookmark_value>printing; copies</bookmark_value>
+<bookmark_value>copies; printing</bookmark_value>
+<bookmark_value>spoolfiles with Xprinter</bookmark_value>
+</bookmark>
 <bookmark xml-lang="en-US" branch="hid/SID_PRINTDOC" id="bm_id1076258" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:Print" id="bm_id3147273" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:OK" id="bm_id0818200912034231" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:TabPages" id="bm_id0818200901305445" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_PRINTDLG" id="bm_id081820090410118" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3154621" role="heading" level="1" l10n="U" oldref="1">Print</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3146946" role="paragraph" l10n="U" oldref="2"><variable id="druckentext"><ahelp hid=".uno:Print">Prints the current document, selection, or the pages that you specify. You can also set the print options for the current document.</ahelp>
+<paragraph xml-lang="en-US" id="par_id3146946" role="paragraph" l10n="U" oldref="2"><variable id="druckentext"><ahelp hid=".uno:Print">Prints the current document, selection, or the pages that you specify. You can also set the print options for the current document.</ahelp>
 </variable> The printing options can vary according to the printer and the operating system that you use.</paragraph>
       <section id="howtoget">
          <embed href="text/shared/00/00000401.xhp#drucken"/>
       </section>
-      <paragraph xml-lang="en-US" id="par_id0818200912284853" role="paragraph" l10n="NEW">The Print dialog consists of three main parts: A preview with navigation buttons, several tab pages with control elements specific to the current document type, and the Print, Cancel, and Help buttons. </paragraph>
-      <paragraph xml-lang="en-US" id="par_id0818200901193992" role="paragraph" l10n="NEW">If you just want to know how to print your document, click any of the following links.</paragraph>
-      <paragraph xml-lang="en-US" id="par_id0818200912531416" role="paragraph" l10n="NEW">
-         <emph>Printing text documents:</emph>
-      </paragraph>
+<paragraph xml-lang="en-US" id="par_id0818200912284853" role="paragraph" l10n="NEW">The Print dialog consists of three main parts: A preview with navigation buttons, several tab pages with control elements specific to the current document type, and the Print, Cancel, and Help buttons. </paragraph>
+<paragraph xml-lang="en-US" id="par_id0818200901193992" role="paragraph" l10n="NEW">If you just want to know how to print your document, click any of the following links.</paragraph>
+<paragraph xml-lang="en-US" id="par_id0818200912531416" role="paragraph" l10n="NEW"><emph>Printing text documents:</emph></paragraph>
       <embed href="text/swriter/guide/print_brochure.xhp#print_brochure"/>
       <embed href="text/swriter/guide/print_preview.xhp#print_preview"/>
       <embed href="text/swriter/guide/print_small.xhp#print_small"/>
       <embed href="text/swriter/guide/printing_order.xhp#printing_order"/>
       <embed href="text/swriter/guide/printer_tray.xhp#printer_tray"/>
-      <paragraph xml-lang="en-US" id="par_id0818200912531487" role="paragraph" l10n="NEW">
-         <emph>Printing spreadsheets:</emph>
-      </paragraph>
+<paragraph xml-lang="en-US" id="par_id0818200912531487" role="paragraph" l10n="NEW"><emph>Printing spreadsheets:</emph></paragraph>
       <embed href="text/scalc/guide/printranges.xhp#printranges"/>
       <embed href="text/scalc/guide/print_details.xhp#print_details"/>
       <embed href="text/scalc/guide/print_exact.xhp#print_exact"/>
       <embed href="text/scalc/guide/print_landscape.xhp#print_landscape"/>
       <embed href="text/scalc/guide/print_title_row.xhp#print_title_row"/>
-      <paragraph xml-lang="en-US" id="par_id0818200912531410" role="paragraph" l10n="NEW">
-         <emph>Printing presentations:</emph>
-      </paragraph>
+<paragraph xml-lang="en-US" id="par_id0818200912531410" role="paragraph" l10n="NEW"><emph>Printing presentations:</emph></paragraph>
       <embed href="text/simpress/guide/printing.xhp#printing"/>
       <embed href="text/simpress/guide/print_tofit.xhp#print_tofit"/>
-      <paragraph xml-lang="en-US" id="par_id0818200912531449" role="paragraph" l10n="NEW">
-         <emph>General printing:</emph>
-      </paragraph>
+<paragraph xml-lang="en-US" id="par_id0818200912531449" role="paragraph" l10n="NEW"><emph>General printing:</emph></paragraph>
       <embed href="text/shared/guide/print_faster.xhp#print_faster"/>
       <embed href="text/shared/guide/print_blackwhite.xhp#print_blackwhite"/>
       <embed href="text/shared/guide/pageformat_max.xhp#pageformat_max"/>
-      <paragraph xml-lang="en-US" id="par_id0818200912284952" role="note" l10n="NEW">The settings that you define in the Print dialog are valid only for the current print job that you start by clicking the Print button. <comment>is this true for Printer Settings, too?</comment>If you want to change some options permanently, open Tools - Options - %PRODUCTNAME (application name) - Print.</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3156080" role="paragraph" l10n="CHG" oldref="41"><switchinline select="appl"><caseinline select="WRITER">To set the default <item type="productname">%PRODUCTNAME</item> printer options for text documents, choose <link href="text/shared/optionen/01040400.xhp" name="Tools - Options - Writer - Print"><emph>Tools - Options - %PRODUCTNAME Writer - Print</emph></link>. 
+<paragraph xml-lang="en-US" id="par_id0818200912284952" role="note" l10n="NEW">The settings that you define in the Print dialog are valid only for the current print job that you start by clicking the Print button. <comment>is this true for Printer Settings, too?</comment>If you want to change some options permanently, open Tools - Options - %PRODUCTNAME (application name) - Print.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3156080" role="paragraph" l10n="CHG" oldref="41"><switchinline select="appl"><caseinline select="WRITER">To set the default <item type="productname">%PRODUCTNAME</item> printer options for text documents, choose <link href="text/shared/optionen/01040400.xhp" name="Tools - Options - Writer - Print"><emph>Tools - Options - %PRODUCTNAME Writer - Print</emph></link>.
 </caseinline></switchinline></paragraph>
-      <paragraph xml-lang="en-US" id="par_idN1099E" role="paragraph" l10n="NEW"><switchinline select="appl"><caseinline select="CALC">To set the default <item type="productname">%PRODUCTNAME</item> printer options for spreadsheet documents, choose <link href="text/shared/optionen/01060700.xhp" name="Tools - Options - Calc - Print"><emph>Tools - Options - %PRODUCTNAME Calc - Print</emph></link>. 
+<paragraph xml-lang="en-US" id="par_idN1099E" role="paragraph" l10n="NEW"><switchinline select="appl"><caseinline select="CALC">To set the default <item type="productname">%PRODUCTNAME</item> printer options for spreadsheet documents, choose <link href="text/shared/optionen/01060700.xhp" name="Tools - Options - Calc - Print"><emph>Tools - Options - %PRODUCTNAME Calc - Print</emph></link>.
 </caseinline></switchinline></paragraph>
-      <paragraph xml-lang="en-US" id="par_idN109CD" role="paragraph" l10n="NEW"><switchinline select="appl"><caseinline select="IMPRESS">To set the default <item type="productname">%PRODUCTNAME</item>printer options for presentation documents, choose <link href="text/shared/optionen/01070400.xhp" name="Tools - Options - Impress - Print"><emph>Tools - Options - %PRODUCTNAME Impress - Print</emph></link>. 
+<paragraph xml-lang="en-US" id="par_idN109CD" role="paragraph" l10n="NEW"><switchinline select="appl"><caseinline select="IMPRESS">To set the default <item type="productname">%PRODUCTNAME</item>printer options for presentation documents, choose <link href="text/shared/optionen/01070400.xhp" name="Tools - Options - Impress - Print"><emph>Tools - Options - %PRODUCTNAME Impress - Print</emph></link>.
 </caseinline></switchinline></paragraph>
-      <paragraph xml-lang="en-US" id="par_id0818200901194137" role="note" l10n="NEW">Press Shift+F1 or choose <item type="menuitem">Help - What's This?</item> and point to any control element in the Print dialog to see an extended help text.</paragraph>
-      <paragraph xml-lang="en-US" id="hd_id0818200912284914" role="heading" level="2" l10n="NEW">Preview</paragraph>
-      <paragraph xml-lang="en-US" id="par_id081820091228505" role="paragraph" l10n="NEW">The preview shows how each sheet of paper will look. You can browse through all sheets of paper with the buttons below the preview.</paragraph><comment>insert controls with hidden help here</comment>
+<paragraph xml-lang="en-US" id="par_id0818200901194137" role="note" l10n="NEW">Press Shift+F1 or choose <item type="menuitem">Help - What's This?</item> and point to any control element in the Print dialog to see an extended help text.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id0818200912284914" role="heading" level="2" l10n="NEW">Preview</paragraph>
+<paragraph xml-lang="en-US" id="par_id081820091228505" role="paragraph" l10n="NEW">The preview shows how each sheet of paper will look. You can browse through all sheets of paper with the buttons below the preview.</paragraph><comment>insert controls with hidden help here</comment>
 <paragraph xml-lang="en-US" id="hd_id0818200912285056" role="heading" level="2" l10n="NEW">General</paragraph>
-      <paragraph xml-lang="en-US" id="par_id0818200912285064" role="paragraph" l10n="NEW">On the General tab page, you find the most important control elements for printing. You can define which contents of your document are to be printed. You can select the printer and open the printer settings dialog.</paragraph>
+<paragraph xml-lang="en-US" id="par_id0818200912285064" role="paragraph" l10n="NEW">On the General tab page, you find the most important control elements for printing. You can define which contents of your document are to be printed. You can select the printer and open the printer settings dialog.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/SVTOOLS_LISTBOX_DLG_SVT_PRNDLG_PRINTDLG_LB_NAMES" id="bm_id3147143" localize="false"/>
-<paragraph xml-lang="en-US" id="par_id3149511" role="paragraph" l10n="CHG" oldref="4"><ahelp hid="SVTOOLS_LISTBOX_DLG_SVT_PRNDLG_PRINTDLG_LB_NAMES">The list box shows the installed printers. Click the printer to use for the current print job. Click the Printer details button to see some information about the selected printer. Click the Properties button to change some of the printer properties.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_PUSHBUTTON_DLG_SVT_PRNDLG_PRINTDLG_BTN_PROPERTIES" id="bm_id3150693" localize="false"/>
-<paragraph xml-lang="en-US" id="par_id3156113" role="paragraph" l10n="CHG" oldref="16"><ahelp hid="." visibility="hidden">Opens the printer properties dialog.</ahelp>The printer properties vary according to the printer that you select.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:JobPage:PrinterList" id="bm_id3147144" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3149511" role="paragraph" l10n="CHG" oldref="4"><ahelp hid=".">The list box shows the installed printers. Click the printer to use for the current print job. Click the Printer details button to see some information about the selected printer. Click the Properties button to change some of the printer properties.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:JobPage:Properties" id="bm_id3150693" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3156113" role="paragraph" l10n="CHG" oldref="16"><ahelp hid="." visibility="hidden">Opens the printer properties dialog. The printer properties vary according to the printer that you select.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/svtools_RadioButton_DLG_SVT_PRNDLG_PRINTDLG_RBT_ALL_SHEETS" id="bm_id5816827" localize="false"/>
 <paragraph xml-lang="en-US" id="par_id0909200810043691" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Enables all sheets to be printed. In the "Print range" area of the dialog, you can restrict this output to some given pages.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/svtools_RadioButton_DLG_SVT_PRNDLG_PRINTDLG_RBT_SELECTED_SHEETS" id="bm_id6644489" localize="false"/>
@@ -125,40 +118,41 @@
 <bookmark xml-lang="en-US" branch="hid/sd_RadioButton_DLG_PRINTDIALOG_RBT_VERTICAL" id="bm_id939359" localize="false"/>
 <paragraph xml-lang="en-US" id="par_id0909200810043750" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">For handouts, enable to print in a vertical order first.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SVTOOLS_RADIOBUTTON_DLG_SVT_PRNDLG_PRINTDLG_RBT_ALL" id="bm_id3149956" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:PrintContent:RadioButton:0" id="bm_id3149957" localize="false"/>
 <paragraph xml-lang="en-US" id="par_id3149164" role="paragraph" l10n="U" oldref="25"><ahelp hid="." visibility="hidden">Prints the entire document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_RADIOBUTTON_DLG_SVT_PRNDLG_PRINTDLG_RBT_PAGES" id="bm_id3148924" localize="false"/>
-<paragraph xml-lang="en-US" id="par_id3152944" role="paragraph" l10n="U" oldref="27"><ahelp hid="." visibility="hidden">Prints only the pages that you specify in the <emph>Pages </emph>box.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:PrintContent:RadioButton:1" id="bm_id3148924" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3152944" role="paragraph" l10n="U" oldref="27"><ahelp hid="." visibility="hidden">Prints only the pages that you specify in the <emph>Pages</emph> box.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SVTOOLS_EDIT_DLG_SVT_PRNDLG_PRINTDLG_EDT_PAGES" id="bm_id3155629" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:PageRange:Edit" id="bm_id0818200903284799" localize="false"/>
-<paragraph xml-lang="en-US" id="par_id3146848" role="paragraph" l10n="U" oldref="28"><ahelp hid="SVTOOLS_EDIT_DLG_SVT_PRNDLG_PRINTDLG_EDT_PAGES">To print a range of pages, use a format like 3-6. To print single pages, use a format like 7;9;11. You can print a combination of page ranges and single pages, by using a format like 3-6;8;10;12.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_RADIOBUTTON_DLG_SVT_PRNDLG_PRINTDLG_RBT_SELECTION" id="bm_id3149902" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3146848" role="paragraph" l10n="U" oldref="28"><ahelp hid=".">To print a range of pages, use a format like 3-6. To print single pages, use a format like 7;9;11. You can print a combination of page ranges and single pages, by using a format like 3-6;8;10;12.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:PrintContent:RadioButton:2" id="bm_id3149902" localize="false"/>
 <paragraph xml-lang="en-US" id="par_id3150244" role="paragraph" l10n="U" oldref="30"><ahelp hid="." visibility="hidden">Prints only the selected area(s) or object(s) in the current document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_NUMERICFIELD_DLG_SVT_PRNDLG_PRINTDLG_NUM_COPIES" id="bm_id3154347" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:JobPage:Copies" id="bm_id3154347" localize="false"/>
 <paragraph xml-lang="en-US" id="par_id3145069" role="paragraph" l10n="U" oldref="34"><ahelp hid="." visibility="hidden">Enter the number of copies that you want to print.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_CHECKBOX_DLG_SVT_PRNDLG_PRINTDLG_CBX_COLLATE" id="bm_id3148663" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:JobPage:Collate" id="bm_id3148663" localize="false"/>
 <paragraph xml-lang="en-US" id="par_id3150865" role="paragraph" l10n="U" oldref="36"><ahelp hid="." visibility="hidden">Preserves the page order of the original document.</ahelp></paragraph>
-      <paragraph xml-lang="en-US" id="hd_id0818200912285074" role="heading" level="2" l10n="NEW">%PRODUCTNAME Writer / Calc / Impress / Draw / Math</paragraph>
-      <paragraph xml-lang="en-US" id="par_id0818200912285019" role="paragraph" l10n="NEW">The tab page with the same name as the current application can be used to define the contents, color, size, and pages to be printed. You define settings that are specific to the current document type.</paragraph>
-      <paragraph xml-lang="en-US" id="hd_id0818200912285112" role="heading" level="2" l10n="NEW">Page Layout</paragraph>
-      <paragraph xml-lang="en-US" id="par_id0818200912285150" role="paragraph" l10n="NEW">The Page Layout tab page can be used to save some sheets of paper by printing several pages onto each sheet of paper. You define the arrangement and size of output pages on the physical paper.</paragraph>
-      <paragraph xml-lang="en-US" id="par_id0818200904164735" role="paragraph" l10n="NEW">Change the arrangement of pages to be printed on every sheet of paper. The preview shows how every final sheet of paper will look.</paragraph>
-      <paragraph xml-lang="en-US" id="par_id0818200904102987" role="paragraph" l10n="NEW">For some document types, you can choose to print a brochure.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id0818200912285074" role="heading" level="2" l10n="NEW">%PRODUCTNAME Writer / Calc / Impress / Draw / Math</paragraph>
+<paragraph xml-lang="en-US" id="par_id0818200912285019" role="paragraph" l10n="NEW">The tab page with the same name as the current application can be used to define the contents, color, size, and pages to be printed. You define settings that are specific to the current document type.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id0818200912285112" role="heading" level="2" l10n="NEW">Page Layout</paragraph>
+<paragraph xml-lang="en-US" id="par_id0818200912285150" role="paragraph" l10n="NEW">The Page Layout tab page can be used to save some sheets of paper by printing several pages onto each sheet of paper. You define the arrangement and size of output pages on the physical paper.</paragraph>
+<paragraph xml-lang="en-US" id="par_id0818200904164735" role="paragraph" l10n="NEW">Change the arrangement of pages to be printed on every sheet of paper. The preview shows how every final sheet of paper will look.</paragraph>
+<paragraph xml-lang="en-US" id="par_id0818200904102987" role="paragraph" l10n="NEW">For some document types, you can choose to print a brochure.</paragraph>
       <embed href="text/swriter/guide/print_brochure.xhp#print_brochure"/>
 <bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:PrintProspectRTL:ListBox" id="bm_id0818200903241442" localize="false"/>
 <paragraph xml-lang="en-US" id="par_id0818200904102910" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">For brochure printing, you can select a left-to-right order of pages or a right-to-left order.</ahelp></paragraph>
-      <paragraph xml-lang="en-US" id="hd_id0818200912285138" role="heading" level="2" l10n="NEW">Options</paragraph>
-      <paragraph xml-lang="en-US" id="par_id0818200912285146" role="paragraph" l10n="NEW">On the Options tab page you can set some additional options for the current print job. Here you can specify to print to a file instead of printing on a printer.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id0818200912285138" role="heading" level="2" l10n="NEW">Options</paragraph>
+<paragraph xml-lang="en-US" id="par_id0818200912285146" role="paragraph" l10n="NEW">On the Options tab page you can set some additional options for the current print job. Here you can specify to print to a file instead of printing on a printer.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/SVTOOLS_CHECKBOX_DLG_SVT_PRNDLG_PRINTDLG_CBX_FILEPRINT" id="bm_id3156955" localize="false"/>
 <paragraph xml-lang="en-US" id="par_id3150772" role="paragraph" l10n="CHG" oldref="18"><ahelp hid="." visibility="hidden">Prints to a file instead of to a printer. When this option is enabled, the Print button is renamed to Print to file...</ahelp></paragraph>
-      <paragraph xml-lang="en-US" id="hd_id0819200910481678" role="heading" level="2" l10n="NEW"><switchinline select="sys"><caseinline select="UNIX">Unix hints 
+<paragraph xml-lang="en-US" id="hd_id0819200910481678" role="heading" level="2" l10n="NEW"><switchinline select="sys"><caseinline select="UNIX">Unix hints
 </caseinline></switchinline><comment>are these still needed?</comment></paragraph>
-      <paragraph xml-lang="en-US" id="par_id3157320" role="paragraph" l10n="U" oldref="47"><switchinline select="sys"><caseinline select="UNIX">If you want, you can use the STAR_SPOOL_DIR environment variable to specify the directory where the Xprinter spoolfiles are saved. For example: 
+<paragraph xml-lang="en-US" id="par_id3157320" role="paragraph" l10n="U" oldref="47"><switchinline select="sys"><caseinline select="UNIX">If you want, you can use the STAR_SPOOL_DIR environment variable to specify the directory where the Xprinter spoolfiles are saved. For example:
 </caseinline></switchinline></paragraph>
-      <paragraph xml-lang="en-US" id="par_id3154330" role="paragraph" l10n="U" oldref="48"><switchinline select="sys"><caseinline select="UNIX">setenv STAR_SPOOL_DIR /usr/local/tmp (in the csh/tcsh) or 
+<paragraph xml-lang="en-US" id="par_id3154330" role="paragraph" l10n="U" oldref="48"><switchinline select="sys"><caseinline select="UNIX">setenv STAR_SPOOL_DIR /usr/local/tmp (in the csh/tcsh) or
 </caseinline></switchinline></paragraph>
-      <paragraph xml-lang="en-US" id="par_id3150768" role="paragraph" l10n="U" oldref="49"><switchinline select="sys"><caseinline select="UNIX">export STAR_SPOOL_DIR=/usr/local/tmp (in the sh/bash) 
+<paragraph xml-lang="en-US" id="par_id3150768" role="paragraph" l10n="U" oldref="49"><switchinline select="sys"><caseinline select="UNIX">export STAR_SPOOL_DIR=/usr/local/tmp (in the sh/bash)
 </caseinline></switchinline></paragraph>
-      <paragraph xml-lang="en-US" id="par_id3150449" role="paragraph" l10n="U" oldref="50"><switchinline select="sys"><caseinline select="UNIX">You can also use the <link href="text/shared/guide/spadmin.xhp" name="spadmin printer setup program">spadmin printer setup program</link> to specify additional printer options. 
+<paragraph xml-lang="en-US" id="par_id3150449" role="paragraph" l10n="U" oldref="50"><switchinline select="sys"><caseinline select="UNIX">You can also use the <link href="text/shared/guide/spadmin.xhp" name="spadmin printer setup program">spadmin printer setup program</link> to specify additional printer options.
 </caseinline></switchinline></paragraph>
-   </body>
+</body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/optionen/01040400.xhp b/helpcontent2/source/text/shared/optionen/01040400.xhp
index d9d780506d..bfc17e6196 100644
--- a/helpcontent2/source/text/shared/optionen/01040400.xhp
+++ b/helpcontent2/source/text/shared/optionen/01040400.xhp
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
 ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,8 +29,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
       <topic id="textsharedoptionen01040400xml" indexer="include" status="PUBLISH">
          <title xml-lang="en-US" id="tit">Print</title>
@@ -40,120 +40,99 @@
    <body>
       <section id="drucken">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3156156"><bookmark_value>pictures; printing</bookmark_value>
-         <bookmark_value>tables in text; printing</bookmark_value>
-         <bookmark_value>drawings; printing in text documents </bookmark_value>
-         <bookmark_value>controls; printing</bookmark_value>
-         <bookmark_value>backgrounds; printing</bookmark_value>
-         <bookmark_value>printing; elements in text documents</bookmark_value>
-         <bookmark_value>text documents; print settings</bookmark_value>
-         <bookmark_value>printing; text always in black</bookmark_value>
-         <bookmark_value>black printing in Calc</bookmark_value>
-         <bookmark_value>printing; left/right pages</bookmark_value>
-         <bookmark_value>even/odd pages;printing</bookmark_value>
-         <bookmark_value>printing; text in reverse order</bookmark_value>
-         <bookmark_value>reversing printing order</bookmark_value>
-         <bookmark_value>brochures; printing several</bookmark_value>
-         <bookmark_value>printing; brochures</bookmark_value>
-         <bookmark_value>comments; printing in text</bookmark_value>
-         <bookmark_value>printing; creating individual jobs</bookmark_value>
-         <bookmark_value>faxes;selecting a fax machine</bookmark_value>
+<bookmark_value>tables in text; printing</bookmark_value>
+<bookmark_value>drawings; printing in text documents </bookmark_value>
+<bookmark_value>controls; printing</bookmark_value>
+<bookmark_value>backgrounds; printing</bookmark_value>
+<bookmark_value>printing; elements in text documents</bookmark_value>
+<bookmark_value>text documents; print settings</bookmark_value>
+<bookmark_value>printing; text always in black</bookmark_value>
+<bookmark_value>black printing in Calc</bookmark_value>
+<bookmark_value>printing; left/right pages</bookmark_value>
+<bookmark_value>even/odd pages;printing</bookmark_value>
+<bookmark_value>printing; text in reverse order</bookmark_value>
+<bookmark_value>reversing printing order</bookmark_value>
+<bookmark_value>brochures; printing several</bookmark_value>
+<bookmark_value>printing; brochures</bookmark_value>
+<bookmark_value>comments; printing in text</bookmark_value>
+<bookmark_value>printing; creating individual jobs</bookmark_value>
+<bookmark_value>faxes;selecting a fax machine</bookmark_value>
 </bookmark><comment>mw made "fax machine selection" a two level entry</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_OPTPRINT_PAGE" id="bm_id3153750" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3156414" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01040400.xhp" name="Print">Print</link></paragraph>
-         <paragraph xml-lang="en-US" id="par_id3152801" role="paragraph" l10n="U" oldref="2"><ahelp hid="HID_OPTPRINT_PAGE">Specifies print settings within a text or HTML document.</ahelp></paragraph>
-      </section>
+<paragraph xml-lang="en-US" id="par_id3152801" role="paragraph" l10n="U" oldref="2"><ahelp hid="HID_OPTPRINT_PAGE">Specifies print settings within a text or HTML document.</ahelp></paragraph>
+</section>
       <section id="howtoget">
          <embed href="text/shared/00/00000406.xhp#drucken1"/>
       </section>
-      <paragraph xml-lang="en-US" id="par_id3153542" role="note" l10n="CHG" oldref="44">The print settings defined on this tab page apply to all subsequent print jobs, until you change the settings again. If you want to change the settings for the current print job only, use the <emph>File - Print</emph> dialog.</paragraph>
-      <paragraph xml-lang="en-US" id="hd_id3156330" role="heading" level="1" l10n="U" oldref="3">Contents</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3155628" role="paragraph" l10n="U" oldref="4">Specifies which document contents are to be printed. </paragraph>
+<paragraph xml-lang="en-US" id="par_id3153542" role="note" l10n="CHG" oldref="44">The print settings defined on this tab page apply to all subsequent print jobs, until you change the settings again. If you want to change the settings for the current print job only, use the <emph>File - Print</emph> dialog.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3156330" role="heading" level="2" l10n="U" oldref="3">Contents</paragraph>
+<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"/>
-<paragraph xml-lang="en-US" id="hd_id3156156" role="heading" level="1" l10n="U" oldref="5">Graphics</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/.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="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="1" l10n="U" oldref="7">Tables</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3148943" role="paragraph" l10n="U" oldref="8"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PTAB">Specifies whether the tables of the text document are printed.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3150771" role="heading" level="2" l10n="U" oldref="7">Tables</paragraph>
+<paragraph xml-lang="en-US" id="par_id3148943" role="paragraph" l10n="U" oldref="8"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PTAB">Specifies whether the tables of the text document are printed.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PDRAW" id="bm_id3154923" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3149294" role="heading" level="1" l10n="U" oldref="9">Drawings (not for HTML documents)</paragraph>
-      <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>
+<paragraph xml-lang="en-US" id="hd_id3149294" role="heading" level="2" l10n="U" oldref="9">Drawings (not for HTML documents)</paragraph>
+<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"/>
-<paragraph xml-lang="en-US" id="hd_id3153525" role="heading" level="1" l10n="U"
-                 oldref="11">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/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_BACKGROUND" id="bm_id3154684" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3153968" role="heading" level="1" l10n="U"
-                 oldref="13">Background</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3159150" role="paragraph" l10n="CHG" oldref="14"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_BACKGROUND">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/.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="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>
+      <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"/>
-<paragraph xml-lang="en-US" id="hd_id3150868" role="heading" level="1" l10n="U"
-                 oldref="40">Print black</paragraph>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:PrintBlackFonts:CheckBox" id="bm_id3144761" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150868" role="heading" level="2" l10n="U" oldref="40">Print black</paragraph>
       <paragraph xml-lang="en-US" id="par_id3149562" role="paragraph" l10n="U" oldref="42"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_BLACK_FONT">Specifies whether to always print text in black.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/sw_CheckBox_TP_OPTPRINT_PAGE_CB_HIDDEN_TEXT" id="bm_id342722" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id8004394" role="heading" level="1" l10n="NEW">Hidden text</paragraph>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:PrintHiddenText:CheckBox" id="bm_id342723" localize="false"/>
+<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/sw_CheckBox_TP_OPTPRINT_PAGE_CB_TEXT_PLACEHOLDER" id="bm_id5788750" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id2623981" role="heading" level="1" l10n="NEW">Text placeholder</paragraph>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:PrintTextPlaceholder:CheckBox" id="bm_id5788750" 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="1" l10n="U"
-                 oldref="15">Pages</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3151115" role="heading" level="2" l10n="U" oldref="15">Pages</paragraph>
       <paragraph xml-lang="en-US" id="par_id3145365" role="paragraph" l10n="U" oldref="16">Defines the print order for $[officename] Writer documents with multiple pages.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_LEFTP" id="bm_id3148618" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3150874" role="heading" level="1" l10n="U"
-                 oldref="17">Left pages (not for HTML documents)</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3150874" role="heading" level="2" l10n="U" oldref="17">Left pages (not for HTML documents)</paragraph>
       <paragraph xml-lang="en-US" id="par_id3149665" role="paragraph" l10n="U" oldref="18"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_LEFTP">Specifies whether to print all left (even numbered) pages of the document.</ahelp></paragraph>
 <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="1" l10n="U"
-                 oldref="19">Right pages (not for HTML documents)</paragraph>
+<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"/>
-<paragraph xml-lang="en-US" id="hd_id3148577" role="heading" level="1" l10n="U"
-                 oldref="21">Reversed</paragraph>
+<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"/>
-<paragraph xml-lang="en-US" id="hd_id3147318" role="heading" level="1" l10n="U"
-                 oldref="23">Brochure</paragraph>
+<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>
 <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="1" l10n="NEW">Right to left</paragraph>
+<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>
-      <paragraph xml-lang="en-US" id="hd_id3149300" role="heading" level="2" l10n="U"
-                 oldref="26">Comments</paragraph>
+      <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"/>
-<paragraph xml-lang="en-US" id="hd_id3150095" role="heading" level="1" l10n="U"
-                 oldref="28">None</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3151320" role="paragraph" l10n="U" oldref="29"><ahelp hid="SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_NO">Specifies that comments in your document are not printed.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_ONLY" id="bm_id3153948" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3155601" role="heading" level="3" l10n="U"
-                 oldref="30">Comments only</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3146988" role="paragraph" l10n="U" oldref="31"><ahelp hid="SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_ONLY">Specifies that comments in your document are printed, but not the actual text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_END" id="bm_id3154272" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3153839" role="heading" level="1" l10n="U"
-                 oldref="32">End of document</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3146789" role="paragraph" l10n="U" oldref="33"><ahelp hid="SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_END">Specifies that comments are printed at the end of the document, after the actual text. </ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_PAGEEND" id="bm_id3157868" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3155066" role="heading" level="1" l10n="U"
-                 oldref="34">End of page</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3154360" role="paragraph" l10n="U" oldref="35"><ahelp hid="SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_PAGEEND">Specifies that comments are printed on an extra page that follows each page containing comments.</ahelp></paragraph>
-      <paragraph xml-lang="en-US" id="hd_id3148916" role="heading" level="2" l10n="U"
-                 oldref="45">Other</paragraph>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:PrintAnnotationMode:ListBox" id="bm_id3157848" localize="false"/>
+      <paragraph xml-lang="en-US" id="par_id3151320" role="paragraph" l10n="U" oldref="29"><ahelp hid=".">Specifies whether comments in your document are printed.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3148916" role="heading" level="2" l10n="U" oldref="45">Other</paragraph>
 <bookmark xml-lang="en-US" branch="hid/sw_CheckBox_TP_OPTPRINT_PAGE_CB_PRINTEMPTYPAGES" id="bm_id2646870" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id4188055" role="heading" level="1" l10n="NEW">Print automatically inserted blank pages</paragraph>
+<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>
 <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="1" l10n="CHG"
-                 oldref="47">Create single print jobs</paragraph>
+<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"/>
-<paragraph xml-lang="en-US" id="hd_id3156384" role="heading" level="1" l10n="U"
-                 oldref="41">Paper tray from printer settings</paragraph>
+<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"/>
-<paragraph xml-lang="en-US" id="hd_id3147362" role="heading" level="1" l10n="U"
-                 oldref="38">Fax</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3147362" role="heading" level="2" l10n="U" oldref="38">Fax</paragraph>
       <paragraph xml-lang="en-US" id="par_id3154703" role="paragraph" l10n="U" oldref="39"><ahelp hid="SW:LISTBOX:TP_OPTPRINT_PAGE:LB_FAX">If you have installed fax software on your computer and wish to fax directly from the text document, select the desired fax machine.</ahelp></paragraph>
       <section id="relatedtopics">
          <embed href="text/swriter/guide/print_brochure.xhp#print_brochure"/>
diff --git a/helpcontent2/source/text/shared/optionen/01070400.xhp b/helpcontent2/source/text/shared/optionen/01070400.xhp
index e47753f1f2..916fd64080 100755
--- a/helpcontent2/source/text/shared/optionen/01070400.xhp
+++ b/helpcontent2/source/text/shared/optionen/01070400.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
@@ -63,11 +63,11 @@
 </section><comment>removed contents-to-print section for impress, i85723</comment><paragraph role="heading" id="hd_id3150486" xml-lang="en-US" level="2" l10n="U" oldref="13">Print</paragraph>
 <paragraph role="paragraph" id="par_id3153092" xml-lang="en-US" l10n="CHG" oldref="14">Defines additional elements to be printed on the page margin.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:TP_PRINT_OPTIONS:CBX_PAGENAME" id="bm_id3148645" localize="false"/><paragraph role="heading" id="hd_id3150104" xml-lang="en-US" level="3" l10n="U" oldref="15">Page name</paragraph>
-<paragraph role="paragraph" id="par_id3154146" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SD:CHECKBOX:TP_PRINT_OPTIONS:CBX_PAGENAME">Specifies whether to print the page name of a document.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3154146" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SD:CHECKBOX:TP_PRINT_OPTIONS:CBX_PAGENAME">Specifies whether to print the page name.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:TP_PRINT_OPTIONS:CBX_DATE" id="bm_id3152598" localize="false"/><paragraph role="heading" id="hd_id3147214" xml-lang="en-US" level="3" l10n="U" oldref="17">Date</paragraph>
 <paragraph role="paragraph" id="par_id3152938" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SD:CHECKBOX:TP_PRINT_OPTIONS:CBX_DATE">Specifies whether to print the current date.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:TP_PRINT_OPTIONS:CBX_TIME" id="bm_id3159345" localize="false"/><paragraph role="heading" id="hd_id3149301" xml-lang="en-US" level="3" l10n="U" oldref="19">Time</paragraph>
-<paragraph role="paragraph" id="par_id3156285" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SD:CHECKBOX:TP_PRINT_OPTIONS:CBX_TIME">Specifies wither to print the current time.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3156285" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SD:CHECKBOX:TP_PRINT_OPTIONS:CBX_TIME">Specifies whether to print the current time.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:TP_PRINT_OPTIONS:CBX_HIDDEN_PAGES" id="bm_id3148457" localize="false"/><paragraph role="heading" id="hd_id3154097" xml-lang="en-US" level="3" l10n="U" oldref="23">Hidden pages</paragraph>
 <paragraph role="paragraph" id="par_id3154792" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SD:CHECKBOX:TP_PRINT_OPTIONS:CBX_HIDDEN_PAGES">Specifies whether to print the pages that are currently hidden from the presentation.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3154686" xml-lang="en-US" level="2" l10n="U" oldref="43">Quality</paragraph>
diff --git a/helpcontent2/source/text/shared/optionen/01090100.xhp b/helpcontent2/source/text/shared/optionen/01090100.xhp
index 8264b5c1ee..f80e459371 100755
--- a/helpcontent2/source/text/shared/optionen/01090100.xhp
+++ b/helpcontent2/source/text/shared/optionen/01090100.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
@@ -60,12 +60,12 @@
   <embed href="text/shared/00/00000406.xhp#formeinst"/>
 </section>
 <paragraph role="heading" id="hd_id3159234" xml-lang="en-US" level="2" l10n="U" oldref="2">Print options</paragraph>
-<bookmark xml-lang="en-US" branch="hid/STARMATH_CHECKBOX_RID_PRINTOPTIONPAGE_CB_TITLEROW" id="bm_id3153528" localize="false"/><paragraph role="heading" id="hd_id3156410" xml-lang="en-US" level="3" l10n="U" oldref="4">Title row</paragraph>
+<bookmark xml-lang="en-US" branch="hid/STARMATH_CHECKBOX_RID_PRINTOPTIONPAGE_CB_TITLEROW" id="bm_id3153528" localize="false"/><paragraph role="heading" id="hd_id3156410" xml-lang="en-US" level="3" l10n="U" oldref="4">Title</paragraph>
 <paragraph role="paragraph" id="par_id3156347" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="STARMATH_CHECKBOX_RID_PRINTOPTIONPAGE_CB_TITLEROW">Specifies whether you want the name of the document to be included in the printout.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/STARMATH_CHECKBOX_RID_PRINTOPTIONPAGE_CB_EQUATION_TEXT" id="bm_id3146798" localize="false"/><paragraph role="heading" id="hd_id3166410" xml-lang="en-US" level="3" l10n="U" oldref="6">Formula text</paragraph>
 <paragraph role="paragraph" id="par_id3155449" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="STARMATH_CHECKBOX_RID_PRINTOPTIONPAGE_CB_EQUATION_TEXT">Specifies whether to include the contents of the <emph>Commands</emph> window at the bottom of the printout.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/STARMATH_CHECKBOX_RID_PRINTOPTIONPAGE_CB_FRAME" id="bm_id3154515" localize="false"/><paragraph role="heading" id="hd_id3154046" xml-lang="en-US" level="3" l10n="U" oldref="8">Border</paragraph>
-<paragraph role="paragraph" id="par_id3149516" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="STARMATH_CHECKBOX_RID_PRINTOPTIONPAGE_CB_FRAME">Applies a thin border to the formula area in the printout.</ahelp><emph>Title row</emph> and <emph>Formula text</emph> are only set down by a frame if the corresponding check box is active.</paragraph>
+<paragraph role="paragraph" id="par_id3149516" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid=".">Applies a thin border to the formula area in the printout.</ahelp> <emph>Title</emph> and <emph>Formula text</emph> are only set down by a frame if the corresponding check box is active.</paragraph>
 <paragraph role="heading" id="hd_id3153822" xml-lang="en-US" level="2" l10n="U" oldref="10">Print format</paragraph>
 <bookmark xml-lang="en-US" branch="hid/STARMATH_RADIOBUTTON_RID_PRINTOPTIONPAGE_RB_ORIGINAL_SIZE" id="bm_id3151246" localize="false"/><paragraph role="heading" id="hd_id3150503" xml-lang="en-US" level="3" l10n="U" oldref="12">Original size</paragraph>
 <paragraph role="paragraph" id="par_id3153627" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="STARMATH_RADIOBUTTON_RID_PRINTOPTIONPAGE_RB_ORIGINAL_SIZE">Prints the formula without adjusting the current font size.</ahelp> It is possible that with large formulas a part of the command text is cut off.</paragraph>
diff --git a/helpcontent2/source/text/simpress/guide/printing.xhp b/helpcontent2/source/text/simpress/guide/printing.xhp
index c8441c3c31..fd1b6bb6a3 100755
--- a/helpcontent2/source/text/simpress/guide/printing.xhp
+++ b/helpcontent2/source/text/simpress/guide/printing.xhp
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
 ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,8 +29,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
       <topic id="textsimpressguideprintingxml" indexer="include" status="PUBLISH">
          <title xml-lang="en-US" id="tit">Printing Presentations</title>
@@ -124,7 +124,7 @@
             <paragraph xml-lang="en-US" id="par_id3157875" role="listitem" l10n="U" oldref="14">Choose <emph>File - Print</emph>.</paragraph>
          </listitem>
          <listitem>
-            <paragraph xml-lang="en-US" id="par_id3150746" role="listitem" l10n="U" oldref="16">In the <emph>Range and Copies</emph> area, click <emph>Slides</emph>.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3150746" role="listitem" l10n="U" oldref="16">In the <emph>Range and copies</emph> area, click <emph>Slides</emph>.</paragraph>
          </listitem>
          <listitem>
             <paragraph xml-lang="en-US" id="par_id3154561" role="listitem" l10n="CHG" oldref="17">Enter the slide numbers you want to print, and click <emph>OK</emph>.</paragraph>
diff --git a/helpcontent2/util/target.pmk b/helpcontent2/util/target.pmk
index b597a516e9..ba39195439 100755
--- a/helpcontent2/util/target.pmk
+++ b/helpcontent2/util/target.pmk
@@ -37,7 +37,7 @@ JAVA_LIBRARY_PATH= -Djava.library.path=$(SOLARSHAREDBIN)
 $(LINKALLTARGETS) : $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/$$(@:b:s/_/./:e:s/.//)/$i) $(subst,LANGUAGE,$$(@:b:s/_/./:e:s/.//) $(LINKADDEDDEPS)) $(COMMONMISC)$/xhp_changed.flag $(PRJ)$/helpers$/hid.lst
     $(HELPLINKER) @$(mktmp -mod $(LINKNAME) -hid $(PRJ)$/helpers$/hid.lst -src $(COMMONMISC) -sty $(PRJ)$/source$/auxiliary$/embed.xsl -zipdir $(MISC)$/ziptmp$(@:b) -idxcaption $(PRJ)$/source$/auxiliary$/idxcaption.xsl -idxcontent $(PRJ)$/source$/auxiliary$/idxcontent.xsl -lang {$(subst,$(LINKNAME)_, $(@:b))} $(subst,LANGUAGE,{$(subst,$(LINKNAME)_, $(@:b))} $(LINKADDEDFILES)) $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/{$(subst,$(LINKNAME)_, $(@:b))}/$i) -o $@)
 .IF "$(SOLAR_JAVA)" == "TRUE"
-    $(JAVAI) $(JAVA_LIBRARY_PATH) -cp "$(my_cp)" com.sun.star.help.HelpIndexerTool -lang $(@:b:s/_/./:e:s/.//) -mod $(LINKNAME) -zipdir $(MISC)$/ziptmp$(@:b) -o $@ -checkcfsname _0
+    $(JAVAI) $(JAVAIFLAGS) $(JAVA_LIBRARY_PATH) -cp "$(my_cp)" com.sun.star.help.HelpIndexerTool -lang $(@:b:s/_/./:e:s/.//) -mod $(LINKNAME) -zipdir $(MISC)$/ziptmp$(@:b) -o $@ -checkcfsname _0
 .ELSE
     -$(RM) $(MISC)$/ziptmp$(@:b)$/content/*.*
     -$(RM) $(MISC)$/ziptmp$(@:b)$/caption/*.*
author	Jens-Heiner Rechtien <hr@openoffice.org>	2010-04-16 13:29:10 +0200
committer	Jens-Heiner Rechtien <hr@openoffice.org>	2010-04-16 13:29:10 +0200
commit	5b7f36225468b7bfaf0e4e58a2691ebb8c620f9e (patch)
tree	badf82e16598bd928bae80ffe018154463aafaff /helpcontent2
parent	90f1ab229c0877820548f22493d2167d46f6da91 (diff)
parent	502f8c137795134c5c43b0bf32c85fedc3bacd13 (diff)