hcshared29: merge with DEV300_m97

5 files changed, 200 insertions, 53 deletions

diff --git a/helpcontent2/helpers/update_tree.pl b/helpcontent2/helpers/update_tree.pl
index b2aa53fcb3..27b1a1dbbf 100644
--- a/helpcontent2/helpers/update_tree.pl
+++ b/helpcontent2/helpers/update_tree.pl
@@ -47,9 +47,6 @@ terminate() if ( ! defined $inpath );
 my $destpath = $inpath;
 my $with_lang = $ENV{WITH_LANG};
 
-if ( defined $ENV{COMMON_OUTDIR} && $ENV{COMMON_OUTDIR} ne "" ) {
-    $destpath =~ s/$ENV{OUTPATH}/$ENV{COMMON_OUTDIR}/;
-}
 
 # Always use / directory separators
 $prj =~ s/\\/\//g if defined($prj);
diff --git a/helpcontent2/source/text/shared/01/01130000.xhp b/helpcontent2/source/text/shared/01/01130000.xhp
index 0081203a1e..3e26baa65d 100644
--- a/helpcontent2/source/text/shared/01/01130000.xhp
+++ b/helpcontent2/source/text/shared/01/01130000.xhp
@@ -56,7 +56,7 @@
 </bookmark>
 <bookmark xml-lang="en-US" branch="hid/.uno:Print" 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:OK" id="bm_id0818200912034231" 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>
@@ -100,39 +100,192 @@
 <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>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_LISTBOX_DLG_SVT_PRNDLG_PRINTDLG_LB_NAMES" id="bm_id3147143" localize="false"/>
-<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"/>
-<paragraph xml-lang="en-US" id="par_id0909200810043626" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Enables the selected 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_CELLS" id="bm_id8608966" localize="false"/>
-<paragraph xml-lang="en-US" id="par_id0909200810043615" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Enables the selected cells 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/sd_ListBox_DLG_PRINTDIALOG_CB_CONTENT" id="bm_id939054" localize="false"/>
-<paragraph xml-lang="en-US" id="par_id0909200810043658" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Select whether you want to print Slides, Handouts, Notes, or Outline.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sd_ListBox_DLG_PRINTDIALOG_CB_SLIDESPERPAGE" id="bm_id6802270" localize="false"/>
-<paragraph xml-lang="en-US" id="par_id0909200810043717" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">For handouts, select the number of slides to print per page of paper.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sd_RadioButton_DLG_PRINTDIALOG_RBT_HORIZONTAL" id="bm_id7987914" localize="false"/>
-<paragraph xml-lang="en-US" id="par_id0909200810043777" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">For handouts, enable to print in a horizontal order first.</ahelp></paragraph>
-<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"/>
+
+
+
+<comment>Writer:</comment>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:PrintPageBackground:CheckBox" id="bm_id1" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id2" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Specifies whether to print colors and objects that are inserted to the background of the page (Format - Page - Background).</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:PrintPicturesAndObjects:CheckBox" id="bm_id3" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id4" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Specifies whether the graphics and drawings or OLE objects of your text document are printed.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:PrintHiddenText:CheckBox" id="bm_id5" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id6" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Enable this option to print text that is marked as hidden.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:PrintTextPlaceholder:CheckBox" id="bm_id7" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id8" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Enable this option to print text placeholders. Disable this option to leave the text placeholders blank in the printout.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:PrintControls:CheckBox" id="bm_id9" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id10" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Specifies whether the form control fields of the text document are printed.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:PrintBlackFonts:CheckBox" id="bm_id11" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id12" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Specifies whether to always print text in black.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:PrintEmptyPages:CheckBox" id="bm_id13" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id14" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">If this option is enabled automatically inserted blank pages are 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.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:PrintAnnotationMode:FixedText" id="bm_id15" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id16" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Specify where to print comments (if any).</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:PrintAnnotationMode:ListBox" id="bm_id17" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id18" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">"Specify where to print comments (if any)."</ahelp></paragraph>
+
+
+<comment>Math:</comment>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:TitleRow:CheckBox" id="bm_id19" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id20" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Specifies whether you want the name of the document to be included in the printout.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:FormulaText:CheckBox" id="bm_id21" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id22" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Specifies whether to include the contents of the Commands window at the bottom of the printout.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:Border:CheckBox" id="bm_id23" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id24" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Applies a thin border to the formula area in the printout.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:PrintFormat:RadioButton:0" id="bm_id25" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id26" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Prints the formula without adjusting the current font size.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:PrintFormat:RadioButton:1" id="bm_id27" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id28" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Adjusts the formula to the page format used in the printout.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:PrintFormat:RadioButton:2" id="bm_id29" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id30" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Reduces or enlarges the size of the printed formula by a specified factor.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:PrintScale:NumericField" id="bm_id31" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id32" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Reduces or enlarges the size of the printed formula by a specified factor.</ahelp></paragraph>
+
+
+<comment>Calc:</comment>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:IsIncludeEmptyPages:CheckBox" id="bm_id33" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id34" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">If checked empty pages that have no cell contents or draw objects are not printed.</ahelp></paragraph>
+
+
+
+<comment>Draw: would be the same as IMPRESS, but we cannot have the same Help ID twice in the same Help file. Even when switched this is not allowed because Help is compiled at compile time, while the appl switch gets evaluated only on run time.
+Moved all DRAW and IMPRESS to default section.</comment>
+<comment>BasicIDE: I doubt if we have a BASIC switch at all, so I moved the two IDs to default part. There they clashed with general IDs, so I removed them. Default text will be shown for BASIC IDE printing.</comment>
+
+<comment>General and Basic and Draw and Impress (at end of default case)</comment>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:PrintPaperFromSetup:CheckBox" id="bm_id35" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id36" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">For printers with multiple trays this 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/.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/.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=".">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"/>
+<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="CHG" oldref="27"><ahelp hid="." visibility="hidden">Prints only the pages or slides that you specify in the <emph>Pages</emph> box.</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/.HelpId:vcl:PrintDialog:JobPage:Copies" id="bm_id3154347" 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="." visibility="hidden">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:OptPage:ToFile" id="bm_id3156955A" 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.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:OptPage:SingleJobs" id="bm_id37" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id38" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Check to not rely on the printer to create collated copies but create a print job for each copy instead.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:OptPage:ToReverse" id="bm_id39" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id40" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Check to print pages in reverse order.</ahelp></paragraph>
+
+<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/.HelpId:vcl:PrintDialog:JobPage: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>
+
+<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/.HelpID:vcl:PrintDialog:JobPage:DetailsBtn" id="bm_id41" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id42" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Show/Hide detailed information of the selected printer.</ahelp></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="." visibility="hidden">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:PrintLeftRightPages:ListBox" id="bm_id43" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id44" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Specify which pages to include in the output.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:PrintProspect:CheckBox" id="bm_id45" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id46" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Select the Brochure option to print the document in brochure format.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:PrintProspectInclude:ListBox" id="bm_id47" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id48" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Select which pages of a brochure to print.</ahelp></paragraph>
+
+<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>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:NUpPage:BorderBox" id="bm_id49" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id50" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Check to draw a border around each page.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:NUpPage:OrderBox" id="bm_id51" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id52" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Select order in which pages are to be printed.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:NUpPage:OrientationBox" id="bm_id53" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id54" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Select the orientation of the paper.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:NUpPage:SheetMarginBox" id="bm_id55" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id56" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Select margin between the printed pages and paper edge.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:NUpPage:PageMarginBox" id="bm_id57" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id58" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Select margin between individual pages on each sheet of paper.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:NUpPage:RowsBox" id="bm_id59" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id60" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Select number of rows.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:NUpPage:ColumnsBox" id="bm_id61" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id62" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Select number of columns.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:NUpPage:PagesPerSheetBox" id="bm_id63" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id64" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Select how many pages to print per sheet of paper.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:NUpPage:PagesPerSheet" id="bm_id65" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id66" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Print multiple pages per sheet of paper.</ahelp></paragraph>
+
+<comment>Impress:</comment>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:PageContentType:ListBox" id="bm_id67" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id68" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Select which parts of the document should be printed.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:SlidesPerPage:ListBox" id="bm_id69" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id70" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Select how many slides to print per page.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:SlidesPerPageOrder:ListBox" id="bm_id71" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id72" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Specify how to arrange slides on the printed page.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:IsPrintName:CheckBox" id="bm_id73" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id74" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Specifies whether to print the page name of a document.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:IsPrintDateTime:CheckBox" id="bm_id75" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id76" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Specifies whether to print the current date and time.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:IsPrintHidden:CheckBox" id="bm_id77" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id78" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Specifies whether to print the pages that are currently hidden.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:Quality:RadioButton:0" id="bm_id79" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id80" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Specifies to print in original colors.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:Quality:RadioButton:1" id="bm_id81" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id82" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Specifies to print colors as grayscale.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:Quality:RadioButton:2" id="bm_id83" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id84" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Specifies to print colors as black and white.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:PageOptions:RadioButton:0" id="bm_id85" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id86" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Specify how to scale slides in the printout.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:PageOptions:RadioButton:1" id="bm_id87" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id88" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Specifies that you do not want to further scale pages when printing.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:PageOptions:RadioButton:2" id="bm_id89" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id90" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Specifies whether to scale down objects that are beyond the margins of the current printer so they fit on the paper in the printer.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.HelpID:vcl:PrintDialog:PageOptions:RadioButton:3" id="bm_id91" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id92" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Specifies that pages are to be printed in tiled format. If the pages or slides are smaller than the paper, several pages or slides will be printed on one page of paper.</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>
@@ -140,12 +293,9 @@
 <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>
-<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
 </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:
diff --git a/helpcontent2/source/text/shared/01/password_dlg.xhp b/helpcontent2/source/text/shared/01/password_dlg.xhp
index d45a6806fd..5537361d39 100644
--- a/helpcontent2/source/text/shared/01/password_dlg.xhp
+++ b/helpcontent2/source/text/shared/01/password_dlg.xhp
@@ -43,7 +43,13 @@
                     oldref="63"><link href="text/shared/01/password_dlg.xhp" name="Password">Password</link></paragraph>
          <paragraph xml-lang="en-US" id="par_id3154350" role="paragraph" l10n="U" oldref="64">Assigns a password to prevent users from making unauthorized changes.</paragraph>
          <embed href="text/shared/01/password_main.xhp#password_rules"/>
+
+         <paragraph xml-lang="en-US" id="par_id31222" role="paragraph" l10n="NEW">The open password must be entered to open the file.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id313339" role="paragraph" l10n="NEW">The permission password must be entered to edit the document.</paragraph>
+
+
 <bookmark xml-lang="en-US" branch="hid/sfx2:Edit:DLG_PASSWD:ED_PASSWD_PASSWORD" id="bm_id3152876" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx.Edit.2316.26" id="bm_id3155554" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/SC_HID_PASSWD_TABLE" id="bm_id3154044" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/uui:Edit:DLG_UUI_PASSWORD:ED_PASSWORD" id="bm_id3154099" localize="false"/>
 
@@ -52,6 +58,7 @@
                     oldref="65">Password</paragraph>
          <paragraph xml-lang="en-US" id="par_id3150502" role="paragraph" l10n="CHG" oldref="62"><ahelp hid="HID_PASSWD_TABLE">Type a password. A password is case sensitive.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/sfx2:Edit:DLG_PASSWD:ED_PASSWD_CONFIRM" id="bm_id3149495" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/sfx.Edit.2316.28" id="bm_id3155524" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/SC_HID_PASSWD_DOC" id="bm_id3154863" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/uui:Edit:DLG_UUI_PASSWORD_CRT:ED_PASSWORD_REPEAT" id="bm_id0928200904190676" localize="false"/>
 
diff --git a/helpcontent2/source/text/shared/01/ref_pdf_export.xhp b/helpcontent2/source/text/shared/01/ref_pdf_export.xhp
index 9eac0c77ee..02029b6b72 100644
--- a/helpcontent2/source/text/shared/01/ref_pdf_export.xhp
+++ b/helpcontent2/source/text/shared/01/ref_pdf_export.xhp
@@ -243,18 +243,11 @@
 <paragraph xml-lang="en-US" id="hd_id3168736" role="heading" level="2" l10n="NEW">Open with Internet browser</paragraph>
       <paragraph xml-lang="en-US" id="par_id1909848" role="paragraph" l10n="NEW"><ahelp hid=".">Cross-document links are opened with the Internet browser. The Internet browser must be able to handle the specified file type inside the hyperlink.</ahelp></paragraph>
       <paragraph xml-lang="en-US" id="hd_id3068636" role="heading" level="2" l10n="NEW">Security</paragraph>
-<!-- removed HID filter_CheckBox_RID_PDF_TAB_SECURITY_CB_SEC_ENCRYPT -->
-<paragraph xml-lang="en-US" id="hd_id2480849" role="heading" level="2" l10n="NEW">Encrypt the PDF document</paragraph>
-      <paragraph xml-lang="en-US" id="par_id4181951" role="paragraph" l10n="NEW"><ahelp hid=".">Select to encrypt the PDF document with a password. The PDF file can be opened only when the user enters the correct password.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter:PushButton:RID_PDF_TAB_SECURITY:BTN_USER_PWD" id="bm_id8720358" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id2927335" role="heading" level="2" l10n="NEW">Set open password</paragraph>
-      <paragraph xml-lang="en-US" id="par_id2107303" role="paragraph" l10n="NEW"><ahelp hid=".">Click to open a dialog where you enter the password.</ahelp></paragraph>
-<!-- removed HID filter_CheckBox_RID_PDF_TAB_SECURITY_CB_SEL_PERMISSIONS -->
-<paragraph xml-lang="en-US" id="hd_id4071779" role="heading" level="2" l10n="NEW">Restrict permission</paragraph>
-      <paragraph xml-lang="en-US" id="par_id7844477" role="paragraph" l10n="NEW"><ahelp hid=".">Select to restrict some permissions. The permissions can be changed only when the user enters the correct password.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/filter:PushButton:RID_PDF_TAB_SECURITY:BTN_OWNER_PWD" id="bm_id8016602" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id6478469" role="heading" level="2" l10n="NEW">Set permission password</paragraph>
-      <paragraph xml-lang="en-US" id="par_id9038972" role="paragraph" l10n="NEW"><ahelp hid=".">Click to open a dialog where you enter the password.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:PushButton:RID_PDF_TAB_SECURITY:BTN_PWD" id="bm_id8720358" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id2927335" role="heading" level="2" l10n="NEW">Set passwords</paragraph>
+      <paragraph xml-lang="en-US" id="par_id2107303" role="paragraph" l10n="CHG"><ahelp hid=".">Click to open a dialog where you enter the passwords.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id41123951" role="paragraph" l10n="NEW">You can enter a password to open the file. You can enter an optional password that allows to edit the document.</paragraph>
+
       <paragraph xml-lang="en-US" id="hd_id7985168" role="heading" level="2" l10n="NEW">Printing</paragraph>
 <bookmark xml-lang="en-US" branch="hid/filter:RadioButton:RID_PDF_TAB_SECURITY:RB_PRINT_NONE" id="bm_id1476485" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id876186" role="heading" level="2" l10n="NEW">Not permitted</paragraph>
diff --git a/helpcontent2/source/text/shared/optionen/01040400.xhp b/helpcontent2/source/text/shared/optionen/01040400.xhp
index 5904822866..a0ecb00c15 100644
--- a/helpcontent2/source/text/shared/optionen/01040400.xhp
+++ b/helpcontent2/source/text/shared/optionen/01040400.xhp
@@ -91,7 +91,7 @@
 <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"/>
-<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:PrintHiddenText:CheckBox" id="bm_id342723" localize="false"/>
+<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/.HelpId:vcl:PrintDialog:PrintTextPlaceholder:CheckBox" id="bm_id5788750" localize="false"/>
@@ -124,11 +124,11 @@
 </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"/>
+<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"/>
-<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:PrintEmptyPages:CheckBox" id="bm_id2646871" 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>
 <comment>issue 116009
@@ -146,4 +146,4 @@
          <embed href="text/swriter/guide/print_brochure.xhp#print_brochure"/>
       </section>
    </body>
-</helpdocument>
\ No newline at end of file
+</helpdocument>