summaryrefslogtreecommitdiff
path: root/helpcontent2/source/text/shared/01
diff options
context:
space:
mode:
Diffstat (limited to 'helpcontent2/source/text/shared/01')
-rw-r--r--helpcontent2/source/text/shared/01/01100600.xhp13
-rwxr-xr-xhelpcontent2/source/text/shared/01/02100001.xhp13
-rw-r--r--helpcontent2/source/text/shared/01/02180000.xhp9
-rw-r--r--helpcontent2/source/text/shared/01/03010000.xhp15
-rw-r--r--helpcontent2/source/text/shared/01/04160500.xhp6
-rw-r--r--helpcontent2/source/text/shared/01/05340300.xhp20
-rw-r--r--helpcontent2/source/text/shared/01/06140500.xhp11
-rw-r--r--helpcontent2/source/text/shared/01/digitalsignatures.xhp14
-rw-r--r--helpcontent2/source/text/shared/01/password_dlg.xhp13
-rw-r--r--helpcontent2/source/text/shared/01/ref_pdf_export.xhp27
10 files changed, 89 insertions, 52 deletions
diff --git a/helpcontent2/source/text/shared/01/01100600.xhp b/helpcontent2/source/text/shared/01/01100600.xhp
index 5e05bd2909..f9b55e439d 100644
--- a/helpcontent2/source/text/shared/01/01100600.xhp
+++ b/helpcontent2/source/text/shared/01/01100600.xhp
@@ -56,22 +56,27 @@
<comment>
<paragraph role="heading" id="hd_id31499" xml-lang="en-US" level="2" l10n="NEW">File encryption</paragraph>
<paragraph role="paragraph" id="hd_id31499A" xml-lang="en-US" l10n="NEW">The password to open the current document can be set in the Properties dialog on the Security tab page. You can also set a password to open the document when you save the document. Check the Save with password option on the Save As dialog, and enter the password.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_HID_SECURITYTAB_PASSWORD_TO_OPEN" id="bm_id8295846C" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_SECURITYTAB_PASSWORD_TO_OPEN" id="bm_id8295846C" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLG_PASSWORD_TO_OPEN_MODIFY_PASSWORD_TO_OPEN" id="bm_id31540239" localize="false"/>
<paragraph role="heading" id="par_idN106AA1" xml-lang="en-US" level="3" l10n="NEW">Enter password to open</paragraph>
<paragraph xml-lang="en-US" id="par_id3150502B" role="paragraph" l10n="NEW"><ahelp hid=".">Type a password. A password is case sensitive.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_HID_SECURITYTAB_CONFIRM_PASSWORD_TO_OPEN" id="bm_id8295846D" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_SECURITYTAB_CONFIRM_PASSWORD_TO_OPEN" id="bm_id8295846D" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLG_PASSWORD_TO_OPEN_MODIFY_CONFIRM_PASSWORD_TO_OPEN" id="bm_id092822204190676" localize="false"/>
<paragraph role="heading" id="par_idN106AA2" xml-lang="en-US" level="3" l10n="NEW">Confirm password</paragraph>
<paragraph xml-lang="en-US" id="par_id3151100E" role="paragraph" l10n="NEW"><ahelp hid=".">Re-enter the password.</ahelp></paragraph>
<paragraph role="heading" id="par_idN106A3" xml-lang="en-US" level="2" l10n="NEW">File sharing options</paragraph>
<paragraph role="paragraph" id="hd_id31499F" xml-lang="en-US" l10n="NEW">The password to edit the current document can be set in the Properties dialog on the Security tab page. Currently this option is evaluated for documents in some Microsoft file formats.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_HID_SECURITYTAB_PASSWORD_TO_MODIFY" id="bm_id8295846G" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_SECURITYTAB_PASSWORD_TO_MODIFY" id="bm_id8295846G" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLG_PASSWORD_TO_OPEN_MODIFY_PASSWORD_TO_MODIFY" id="bm_id3151240239" localize="false"/>
<paragraph role="heading" id="par_idN106AA3" xml-lang="en-US" level="3" l10n="NEW">Enter password to allow editing</paragraph>
<paragraph xml-lang="en-US" id="par_id3150502H" role="paragraph" l10n="NEW"><ahelp hid=".">Type a password. A password is case sensitive.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SFX2_HID_SECURITYTAB_CONFIRM_PASSWORD_TO_MODIFY" id="bm_id8295846I" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_SECURITYTAB_CONFIRM_PASSWORD_TO_MODIFY" id="bm_id8295846I" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/HID_DLG_PASSWORD_TO_OPEN_MODIFY_CONFIRM_PASSWORD_TO_MODIFY" id="bm_id0923337190676" localize="false"/>
<paragraph role="heading" id="par_idN106AA4" xml-lang="en-US" level="3" l10n="NEW">Confirm password</paragraph>
<paragraph xml-lang="en-US" id="par_id3151100J" role="paragraph" l10n="NEW"><ahelp hid=".">Re-enter the password.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DLG_PASSWORD_TO_OPEN_MODIFY_FILE_READONLY" id="bm_id09553676" localize="false"/>
</comment>
<bookmark xml-lang="en-US" branch="hid/SFX2_HID_SECURITYTAB_OPEN_FILE_READONLY" id="bm_id8295846" localize="false"/>
diff --git a/helpcontent2/source/text/shared/01/02100001.xhp b/helpcontent2/source/text/shared/01/02100001.xhp
index 71dadfdd8b..c68e45bfdd 100755
--- a/helpcontent2/source/text/shared/01/02100001.xhp
+++ b/helpcontent2/source/text/shared/01/02100001.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="textshared0102100001xml" indexer="include" status="PUBLISH">
<title xml-lang="en-US" id="tit">List of Regular Expressions</title>
@@ -337,6 +337,11 @@
</table>
<paragraph xml-lang="en-US" id="hd_id5311441" role="heading" level="2" l10n="NEW">Examples</paragraph>
+
+<paragraph xml-lang="en-US" id="par_id956834773" role="paragraph" l10n="NEW">e([:digit:])? -- finds 'e' followed by zero or one digit. Note that currently all named character classes like [:digit:] must be enclosed in parentheses.<comment>issue 64368 and 113035</comment></paragraph>
+<paragraph xml-lang="en-US" id="par_id952368773" role="paragraph" l10n="NEW">^([:digit:])$ -- finds lines or cells with exactly one digit.</paragraph>
+
+
<paragraph xml-lang="en-US" id="par_id9568773" role="paragraph" l10n="NEW">You can combine the search terms to form complex searches.</paragraph>
<paragraph xml-lang="en-US" id="hd_id71413" role="heading" level="3" l10n="NEW">To find three-digit numbers alone in a paragraph</paragraph>
<paragraph xml-lang="en-US" id="par_id2924283" role="code" l10n="NEW">^[:digit:]{3}$</paragraph>
diff --git a/helpcontent2/source/text/shared/01/02180000.xhp b/helpcontent2/source/text/shared/01/02180000.xhp
index ec7439049a..a984a1ada5 100644
--- a/helpcontent2/source/text/shared/01/02180000.xhp
+++ b/helpcontent2/source/text/shared/01/02180000.xhp
@@ -60,6 +60,15 @@
<paragraph xml-lang="en-US" id="par_id3143270" role="note" l10n="U" oldref="28">If you are loading a file that contains DDE links, you are prompted to update the links. Decline the update if you do not want to establish a connection to the DDE server.</paragraph>
<bookmark xml-lang="en-US" branch="hid/CUI_HID_LINKDLG_TABLB" id="bm_id4889980" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN10646" role="paragraph" l10n="NEW"><ahelp hid="34869">Double-click a link in the list to open a file dialog where you can select another object for this link.</ahelp></paragraph>
+
+<switch select="sys">
+<case select="WIN">
+<paragraph xml-lang="en-US" id="par_idN1099856" role="warning" l10n="NEW">When you open a file by an URL from the Windows file dialog, Windows will open a local copy of the file, located in the Internet Explorer cache. The %PRODUCTNAME file dialog opens the remote file.</paragraph>
+</case>
+</switch>
+
+
+
<paragraph xml-lang="en-US" id="hd_id3155503" role="heading" level="2" l10n="U" oldref="3">Source file</paragraph>
<paragraph xml-lang="en-US" id="par_id3156152" role="paragraph" l10n="U" oldref="4">Lists the path to the source file.</paragraph>
<paragraph xml-lang="en-US" id="hd_id3155449" role="heading" level="2" l10n="U"
diff --git a/helpcontent2/source/text/shared/01/03010000.xhp b/helpcontent2/source/text/shared/01/03010000.xhp
index 180c4128b3..13d020487f 100644
--- a/helpcontent2/source/text/shared/01/03010000.xhp
+++ b/helpcontent2/source/text/shared/01/03010000.xhp
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,8 +29,8 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textshared0103010000xml" indexer="include" status="PUBLISH">
<title xml-lang="en-US" id="tit">Zoom &amp; View Layout</title>
@@ -60,13 +60,13 @@
<bookmark xml-lang="en-US" branch="hid/SVX_HID_MNU_ZOOM_OPTIMAL" id="bm_id3150498" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3153351" role="heading" level="2" l10n="U"
oldref="20">Optimal</paragraph>
- <paragraph xml-lang="en-US" id="par_id3144760" role="paragraph" l10n="U" oldref="21"><ahelp hid="HID_MNU_ZOOM_OPTIMAL"><switchinline select="appl"><caseinline select="CALC">Resizes the display to fit the width of the selected cell area at the moment the command is started.
+ <paragraph xml-lang="en-US" id="par_id3144760" role="paragraph" l10n="U" oldref="21"><ahelp hid="HID_MNU_ZOOM_OPTIMAL"><switchinline select="appl"><caseinline select="CALC">Resizes the display to fit the width of the selected cell area at the moment the command is started.
</caseinline><defaultinline>Resizes the display to fit the width of the text in the document at .</defaultinline></switchinline></ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXDLG_ZOOM:BTN_WHOLE_PAGE" id="bm_id3150359" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SVX_HID_MNU_ZOOM_WHOLE_PAGE" id="bm_id3150358" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3151210" role="heading" level="2" l10n="CHG"
oldref="22">Fit width and height</paragraph>
- <paragraph xml-lang="en-US" id="par_id3150543" role="paragraph" l10n="U" oldref="25"><ahelp hid="HID_MNU_ZOOM_WHOLE_PAGE"><switchinline select="appl"><caseinline select="CALC">Resizes the display to fit the width and height of the selected cell area at the moment the command is started.
+ <paragraph xml-lang="en-US" id="par_id3150543" role="paragraph" l10n="U" oldref="25"><ahelp hid="HID_MNU_ZOOM_WHOLE_PAGE"><switchinline select="appl"><caseinline select="CALC">Resizes the display to fit the width and height of the selected cell area at the moment the command is started.
</caseinline><defaultinline>Displays the entire page on your screen.</defaultinline></switchinline></ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXDLG_ZOOM:BTN_PAGE_WIDTH" id="bm_id3148797" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SVX_HID_MNU_ZOOM_PAGE_WIDTH" id="bm_id3154140" localize="false"/>
@@ -75,6 +75,7 @@
<paragraph xml-lang="en-US" id="par_id3143231" role="paragraph" l10n="U" oldref="23"><ahelp hid="HID_MNU_ZOOM_PAGE_WIDTH">Displays the complete width of the document page. The top and bottom edges of the page may not be visible.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX_HID_MNU_ZOOM_200" id="bm_id3156280" localize="false"/>
<!-- removed HID SVX:RADIOBUTTON:RID_SVXDLG_ZOOM:BTN_200 -->
+<bookmark xml-lang="en-US" branch="hid/SID_VIEW200" id="bm_id4566280" localize="false"/>
<paragraph xml-lang="en-US" id="par_id3159151" role="paragraph" l10n="CHG" oldref="6"><ahelp hid="." visibility="hidden">Displays the document at two times its actual size.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX_HID_MNU_ZOOM_150" id="bm_id3148676" localize="false"/>
<!-- removed HID SVX:RADIOBUTTON:RID_SVXDLG_ZOOM:BTN_150 -->
@@ -91,6 +92,8 @@
<paragraph xml-lang="en-US" id="par_id3152791" role="paragraph" l10n="CHG" oldref="12"><ahelp hid="." visibility="hidden">Displays the document at 75% of its actual size.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX_HID_MNU_ZOOM_50" id="bm_id3150488" localize="false"/>
<!-- removed HID SVX:RADIOBUTTON:RID_SVXDLG_ZOOM:BTN_50 -->
+<bookmark xml-lang="en-US" branch="hid/SID_VIEW050" id="bm_id765488" localize="false"/>
+
<paragraph xml-lang="en-US" id="par_id3156005" role="paragraph" l10n="CHG" oldref="14"><ahelp hid="." visibility="hidden">Displays the document at half of its actual size.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXDLG_ZOOM:BTN_USER" id="bm_id3147478" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXDLG_ZOOM:ED_USER" id="bm_id3151352" localize="false"/>
diff --git a/helpcontent2/source/text/shared/01/04160500.xhp b/helpcontent2/source/text/shared/01/04160500.xhp
index a0bc05f9d8..a712322b4b 100644
--- a/helpcontent2/source/text/shared/01/04160500.xhp
+++ b/helpcontent2/source/text/shared/01/04160500.xhp
@@ -4,7 +4,7 @@
<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -27,7 +27,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textshared0104160500xml" indexer="include" status="PUBLISH">
@@ -46,7 +46,7 @@
<bookmark xml-lang="en-US" branch="hid/.uno:InsertObjectFloatingFrame" id="bm_id9760166" localize="false"/><!-- HID added by script -->
<bookmark xml-lang="en-US" branch="hid/.uno:InsertObjectFloatingFrame" id="bm_id3153136" localize="false"/>
<paragraph role="heading" id="hd_id3149783" xml-lang="en-US" level="1" l10n="U" oldref="1">Insert Floating Frame</paragraph>
-<paragraph role="paragraph" id="par_id3148410" xml-lang="en-US" l10n="U" oldref="2"><variable id="frameeinfuegentext"><ahelp hid=".uno:InsertObjectFloatingFra">Inserts a floating frame into the current document. Floating frames are used in HTML documents to display the contents of another file. Floating frames are not supported by Netscape Navigator 4.x.</ahelp>
+<paragraph role="paragraph" id="par_id3148410" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="frameeinfuegentext"><ahelp hid=".">Inserts a floating frame into the current document. Floating frames are used in HTML documents to display the contents of another file.</ahelp>
</variable></paragraph>
<section id="howtoget">
<embed href="text/shared/00/00000404.xhp#eiobframe"/>
diff --git a/helpcontent2/source/text/shared/01/05340300.xhp b/helpcontent2/source/text/shared/01/05340300.xhp
index ac9959af27..b953e4c145 100644
--- a/helpcontent2/source/text/shared/01/05340300.xhp
+++ b/helpcontent2/source/text/shared/01/05340300.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="textshared0105340300xml" indexer="include">
<title id="tit" xml-lang="en-US">Alignment</title>
@@ -50,7 +50,7 @@
<embed href="text/shared/00/00040503.xhp#fozelaus"/>
</section>
<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_ALIGNMENT:LB_HORALIGN" id="bm_id3152821" localize="false"/>
-<paragraph role="heading" id="hd_id3153124" xml-lang="en-US" level="3" l10n="U" oldref="54">Horizontal</paragraph>
+<paragraph role="heading" id="hd_id3153124" xml-lang="en-US" level="2" l10n="U" oldref="54">Horizontal</paragraph>
<paragraph role="paragraph" id="par_id3144436" xml-lang="en-US" l10n="U" oldref="55"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_ALIGNMENT_LB_HORALIGN">Select the horizontal alignment option that you want to apply to the cell contents.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3146109" xml-lang="en-US" level="3" l10n="U" oldref="56">Default</paragraph>
<paragraph role="paragraph" id="par_id3166445" xml-lang="en-US" l10n="U" oldref="57">Aligns numbers to the right, and text to the left.</paragraph>
@@ -78,10 +78,10 @@
<paragraph role="heading" id="par_idN1079C" xml-lang="en-US" level="3" l10n="NEW">Filled</paragraph>
<paragraph role="paragraph" id="par_idN107A0" xml-lang="en-US" l10n="NEW">Repeats the cell contents (number and text) until the visible area of the cell is filled. This feature does not work on text that contains line breaks.</paragraph>
<bookmark xml-lang="en-US" branch="hid/cui:MetricField:RID_SVXPAGE_ALIGNMENT:ED_INDENT" id="bm_id3156156" localize="false"/>
-<paragraph role="heading" id="hd_id3158432" xml-lang="en-US" level="3" l10n="U" oldref="41">Indent</paragraph>
+<paragraph role="heading" id="hd_id3158432" xml-lang="en-US" level="2" l10n="U" oldref="41">Indent</paragraph>
<paragraph role="paragraph" id="par_id3153716" xml-lang="en-US" l10n="U" oldref="42"><ahelp hid="SVX:METRICFIELD:RID_SVXPAGE_ALIGNMENT:ED_INDENT">Indents from the left edge of the cell by the amount that you enter.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_ALIGNMENT:LB_VERALIGN" id="bm_id3153332" localize="false"/>
-<paragraph role="heading" id="hd_id3149903" xml-lang="en-US" level="3" l10n="U" oldref="66">Vertical</paragraph>
+<paragraph role="heading" id="hd_id3149903" xml-lang="en-US" level="2" l10n="U" oldref="66">Vertical</paragraph>
<paragraph role="paragraph" id="par_id3148924" xml-lang="en-US" l10n="U" oldref="67"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_ALIGNMENT_LB_VERALIGN">Select the vertical alignment option that you want to apply to the cell contents.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3146848" xml-lang="en-US" level="3" l10n="U" oldref="68">Default</paragraph>
<paragraph role="paragraph" id="par_id3150822" xml-lang="en-US" l10n="U" oldref="69"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_ALIGNMENT_LB_VERALIGN">Aligns the cell contents to the bottom of the cell.</ahelp></paragraph><comment>UFI: removed two help ids</comment>
@@ -105,7 +105,7 @@
</variable></paragraph>
<embed href="text/shared/00/00000007.xhp#objektleiste"/>
<embed href="text/shared/00/00000004.xhp#syvertikalmitte"/>
-<paragraph role="heading" id="hd_id3154154" xml-lang="en-US" level="2" l10n="U" oldref="51">Text Direction</paragraph>
+<paragraph role="heading" id="hd_id3154154" xml-lang="en-US" level="2" l10n="CHG" oldref="51">Text orientation</paragraph>
<paragraph role="paragraph" id="par_id3151380" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid=".uno:AlignVCenter">Sets the text orientation of the cell contents.</ahelp></paragraph>
<switch select="appl">
<case select="CALC"><embed href="text/scalc/guide/text_rotate.xhp#text_rotate"/>
@@ -114,7 +114,7 @@
<bookmark xml-lang="en-US" branch="hid/CUI_HID_ALIGNMENT_CTR_DIAL" id="bm_id3151044" localize="false"/>
<paragraph role="paragraph" id="par_id3147085" xml-lang="en-US" l10n="U" oldref="49"><ahelp hid="HID_ALIGNMENT_CTR_DIAL">Click in the dial to set the text orientation.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/cui:NumericField:RID_SVXPAGE_ALIGNMENT:NF_DEGREES" id="bm_id3155742" localize="false"/>
-<paragraph role="heading" id="hd_id3150449" xml-lang="en-US" level="3" l10n="U" oldref="45">Angle</paragraph>
+<paragraph role="heading" id="hd_id3150449" xml-lang="en-US" level="3" l10n="CHG" oldref="45">Degrees</paragraph>
<paragraph role="paragraph" id="par_id3153194" xml-lang="en-US" l10n="U" oldref="46"><ahelp hid="SVX_NUMERICFIELD_RID_SVXPAGE_ALIGNMENT_NF_DEGREES">Enter the rotation angle for the text in the selected cell(s). A positive number rotates the text to the left and a negative number rotates the text to the right.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/CUI_HID_ALIGNMENT_CTR_BORDER_LOCK" id="bm_id3125865" localize="false"/>
<paragraph role="heading" id="hd_id3150497" xml-lang="en-US" level="3" l10n="U" oldref="75">Reference edge</paragraph>
@@ -140,7 +140,7 @@
<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_ASIAN_VERTICAL" id="bm_id3147441" localize="false"/>
<paragraph role="heading" id="hd_id3152576" xml-lang="en-US" level="3" l10n="CHG" oldref="84">Asian layout mode</paragraph>
<paragraph role="paragraph" id="par_id3150010" xml-lang="en-US" l10n="U" oldref="85">This checkbox is only available if Asian language support is enabled and the text direction is set to vertical. <ahelp hid="SVX_TRISTATEBOX_RID_SVXPAGE_ALIGNMENT_BTN_ASIAN_VERTICAL">Aligns Asian characters one below the other in the selected cell(s). If the cell contains more than one line of text, the lines are converted to text columns that are arranged from right to left. Western characters in the converted text are rotated 90 degrees to the right. Asian characters are not rotated.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3150032" xml-lang="en-US" level="2" l10n="U" oldref="43">Text flow</paragraph>
+<paragraph role="heading" id="hd_id3150032" xml-lang="en-US" level="2" l10n="CHG" oldref="43">Properties</paragraph>
<paragraph role="paragraph" id="par_id3146120" xml-lang="en-US" l10n="U" oldref="44">Determine the text flow in a cell.</paragraph>
<bookmark xml-lang="en-US" branch="hid/cui:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_WRAP" id="bm_id3148577" localize="false"/>
<paragraph role="heading" id="hd_id3145590" xml-lang="en-US" level="3" l10n="CHG" oldref="3">Wrap text automatically</paragraph>
diff --git a/helpcontent2/source/text/shared/01/06140500.xhp b/helpcontent2/source/text/shared/01/06140500.xhp
index 3de74ac52f..4d80ae6b95 100644
--- a/helpcontent2/source/text/shared/01/06140500.xhp
+++ b/helpcontent2/source/text/shared/01/06140500.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
@@ -55,10 +55,15 @@
<paragraph role="note" id="par_id3153662" xml-lang="en-US" l10n="U" oldref="36">A macro that is saved with a document can only be run when that document is opened.</paragraph>
<bookmark xml-lang="en-US" branch="hid/CUI_HID_SVX_MACRO_LB_EVENT" id="bm_id1800286" localize="false"/><paragraph role="paragraph" id="par_idN1061A" xml-lang="en-US" l10n="NEW"><ahelp hid="40000">The big list box lists the events and the assigned macros. After you selected the location in the <emph>Save In</emph> list box, select an event in the big list box. Then click <emph>Assign Macro</emph>.</ahelp></paragraph>
<!-- removed HID SFX2:PUSHBUTTON:TP_CONFIG_EVENT:PB_ASSIGN -->
-<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_EVENTS:PB_ASSIGN" id="bm_id752891" localize="false"/><paragraph role="heading" id="hd_id3159258" xml-lang="en-US" level="2" l10n="CHG" oldref="22">Assign Macro</paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_MACROASSIGN:PB_ASSIGN" id="bm_id755672891" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_EVENTS:PB_ASSIGN" id="bm_id752891" localize="false"/>
+<paragraph role="heading" id="hd_id3159258" xml-lang="en-US" level="2" l10n="CHG" oldref="22">Assign Macro</paragraph>
<paragraph role="paragraph" id="par_id3156152" xml-lang="en-US" l10n="CHG" oldref="23"><ahelp hid="SFX2:PUSHBUTTON:TP_CONFIG_EVENT:PB_ASSIGN">Opens the <link href="text/shared/01/06130000.xhp">Macro Selector</link> to assign a macro to the selected event.</ahelp></paragraph>
<!-- removed HID SFX2:PUSHBUTTON:TP_CONFIG_EVENT:PB_DELETE -->
-<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_EVENTS:PB_DELETE" id="bm_id9109164.00000001" localize="false"/><paragraph role="heading" id="hd_id3154046" xml-lang="en-US" level="2" l10n="CHG" oldref="24">Remove Macro</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_EVENTS:PB_DELETE" id="bm_id9109164.00000001" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:PushButton:RID_SVXPAGE_MACROASSIGN:PB_DELETE" id="bm_id9109164341" localize="false"/>
+<paragraph role="heading" id="hd_id3154046" xml-lang="en-US" level="2" l10n="CHG" oldref="24">Remove Macro</paragraph>
<paragraph role="paragraph" id="par_id3152349" xml-lang="en-US" l10n="U" oldref="35"><ahelp hid="SFX2:PUSHBUTTON:TP_CONFIG_EVENT:PB_DELETE">Deletes the macro assignment for the selected event.</ahelp></paragraph>
<section id="relatedtopics">
<paragraph role="paragraph" id="par_id3159147" xml-lang="en-US" l10n="U" oldref="38"><link href="text/swriter/01/05060700.xhp" name="List of events">List of events</link></paragraph>
diff --git a/helpcontent2/source/text/shared/01/digitalsignatures.xhp b/helpcontent2/source/text/shared/01/digitalsignatures.xhp
index 9b4ff2c6f0..5d98da224d 100644
--- a/helpcontent2/source/text/shared/01/digitalsignatures.xhp
+++ b/helpcontent2/source/text/shared/01/digitalsignatures.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="textshared01digitalsignaturesxhp" indexer="include" status="PUBLISH">
<title xml-lang="en-US" id="tit">Digital Signatures</title>
@@ -56,9 +56,9 @@
<bookmark xml-lang="en-US" branch="hid/XMLSECURITY_HID_XMLSEC_CTRL_SIGNATURESDLG" id="bm_id685445" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN1055F" role="heading" level="2" l10n="NEW">List</paragraph>
<paragraph xml-lang="en-US" id="par_idN10563" role="paragraph" l10n="NEW"><ahelp hid=".">Lists the digital signatures for the current document.</ahelp></paragraph>
- <paragraph xml-lang="en-US" id="par_idN10566" role="paragraph" l10n="NEW">The Signed icon
+ <paragraph xml-lang="en-US" id="par_idN10566" role="paragraph" l10n="NEW">The Signed icon
<image id="img_id4557023" src="xmlsecurity/res/certificate_16.png" width="0.1665in" height="0.1146in"><alt xml-lang="en-US" id="alt_id4557023">Icon</alt>
- </image> indicates a valid digital signature, while the Exclamation mark icon
+ </image> indicates a valid digital signature, while the Exclamation mark icon
<image id="img_id249336" src="xmlsecurity/res/caution_11x16.png" width="0.1665in" height="0.1146in"><alt xml-lang="en-US" id="alt_id249336">Icon</alt>
</image> indicates an invalid digital signature.</paragraph>
<paragraph xml-lang="en-US" id="par_id0821200910573716" role="paragraph" l10n="NEW">See also <link href="text/shared/guide/digital_signatures.xhp">Digital Signatures</link>.</paragraph>
@@ -66,7 +66,7 @@
<paragraph xml-lang="en-US" id="par_idN1056C" role="heading" level="2" l10n="NEW">View Certificate</paragraph>
<paragraph xml-lang="en-US" id="par_idN10570" role="paragraph" l10n="NEW"><ahelp hid=".">Opens the <link href="text/shared/optionen/viewcertificate.xhp">View Certificate</link> dialog.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/padmin:PushButton:RID_PADIALOG:RID_PA_BTN_STD" id="bm_id2279122" localize="false"/>
-<paragraph xml-lang="en-US" id="par_idN10581" role="heading" level="2" l10n="NEW">Add</paragraph>
+<paragraph xml-lang="en-US" id="par_idN10581" role="heading" level="2" l10n="CHG">Sign Document</paragraph>
<paragraph xml-lang="en-US" id="par_idN10585" role="paragraph" l10n="NEW"><ahelp hid=".">Opens the <link href="text/shared/01/selectcertificate.xhp">Select Certificate</link> dialog.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/padmin:PushButton:RID_PADIALOG:RID_PA_BTN_DEL" id="bm_id4170964" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN10596" role="heading" level="2" l10n="NEW">Remove</paragraph>
diff --git a/helpcontent2/source/text/shared/01/password_dlg.xhp b/helpcontent2/source/text/shared/01/password_dlg.xhp
index 9fb107b460..5537361d39 100644
--- a/helpcontent2/source/text/shared/01/password_dlg.xhp
+++ b/helpcontent2/source/text/shared/01/password_dlg.xhp
@@ -43,22 +43,35 @@
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"/>
+
<bookmark xml-lang="en-US" branch="hid/uui:Edit:DLG_UUI_PASSWORD_CRT:ED_PASSWORD_CRT" id="bm_id0928200904183274" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3146857" role="heading" level="2" l10n="U"
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"/>
+
<paragraph xml-lang="en-US" id="hd_id3153029" role="heading" level="2" l10n="U"
oldref="66">Confirm</paragraph>
<paragraph xml-lang="en-US" id="par_id3151100" role="paragraph" l10n="U" oldref="67"><ahelp hid=".">Re-enter the password.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="hd_id3155351" role="heading" level="2" l10n="U"
oldref="68">Undoing password protection</paragraph>
<paragraph xml-lang="en-US" id="par_id3146109" role="paragraph" l10n="CHG" oldref="69">To remove a password, open the document, then save without password.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DLG_PASSWORD_TO_OPEN_MODIFY_MORE" id="bm_id09233676" localize="false"/>
+ <paragraph xml-lang="en-US" id="par_id31323250502" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Click to show or hide the file sharing password options.</ahelp></paragraph>
+
+
</section>
</body>
</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/ref_pdf_export.xhp b/helpcontent2/source/text/shared/01/ref_pdf_export.xhp
index 345add3b07..02029b6b72 100644
--- a/helpcontent2/source/text/shared/01/ref_pdf_export.xhp
+++ b/helpcontent2/source/text/shared/01/ref_pdf_export.xhp
@@ -58,7 +58,7 @@
</section>
<paragraph xml-lang="en-US" id="hd_id746482" role="heading" level="2" l10n="NEW">General<comment>UFI: all on one page because they were intended to shrink to AHID tags with OOo3 anyway. Sadly cws help9s stalled ...</comment></paragraph>
<paragraph xml-lang="en-US" id="hd_id3148520" role="heading" level="2" l10n="CHG"
- oldref="2">Pages</paragraph>
+ oldref="2">Range</paragraph>
<paragraph xml-lang="en-US" id="par_id3154230" role="paragraph" l10n="CHG" oldref="3">Sets the export options for the pages included in the PDF file.</paragraph>
<!-- removed HID filter_RadioButton_RID_PDF_EXPORT_DLG_RB_ALL -->
<bookmark xml-lang="en-US" branch="hid/filter:RadioButton:RID_PDF_TAB_GENER:RB_ALL" id="bm_id1033967" localize="false"/>
@@ -67,7 +67,7 @@
<!-- removed HID filter_RadioButton_RID_PDF_EXPORT_DLG_RB_RANGE -->
<bookmark xml-lang="en-US" branch="hid/filter:RadioButton:RID_PDF_TAB_GENER:RB_RANGE" id="bm_id2618793" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/filter:Edit:RID_PDF_TAB_GENER:ED_PAGES" id="bm_id2676778" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3154673" role="heading" level="2" l10n="U" oldref="6">Range</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3154673" role="heading" level="2" l10n="CHG" oldref="6">Pages</paragraph>
<paragraph xml-lang="en-US" id="par_id3147571" role="paragraph" l10n="U" oldref="7"><ahelp hid="FILTER_EDIT_RID_PDF_EXPORT_DLG_ED_PAGES">Exports the pages you type in the box.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="par_id3145136" role="paragraph" l10n="U" oldref="53">To export a range of pages, use the format 3-6. To export single pages, use the format 7;9;11. If you want, you can export a combination of page ranges and single pages, by using a format like 3-6;8;10;12.</paragraph>
<!-- removed HID filter_RadioButton_RID_PDF_EXPORT_DLG_RB_SELECTION -->
@@ -121,13 +121,17 @@
<paragraph xml-lang="en-US" id="hd_id6585283" role="heading" level="2" l10n="NEW">Submit format</paragraph>
<paragraph xml-lang="en-US" id="par_idN107F8" role="paragraph" l10n="NEW"><ahelp hid=".">Select the format of submitting forms from within the PDF file.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="par_id0901200811454970" role="paragraph" l10n="NEW">Select the format of the data that you will receive from the submitter: FDF (Forms Data Format), PDF, HTML, or XML.</paragraph>
- <paragraph xml-lang="en-US" id="par_idN10807" role="paragraph" l10n="CHG">This setting overrides the control's URL property that you set in the document.</paragraph><comment>insert help id here</comment>
+ <paragraph xml-lang="en-US" id="par_idN10807" role="paragraph" l10n="CHG">This setting overrides the control's URL property that you set in the document.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:CheckBox:RID_PDF_TAB_GENER:CB_ALLOWDUPLICATEFIELDNAMES" id="bm_id3992267" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id1026200909535841" role="heading" level="2" l10n="NEW">Allow duplicate field names</paragraph>
<paragraph xml-lang="en-US" id="par_id102620090953596" role="paragraph" l10n="NEW"><ahelp hid=".">Allows to use the same field name for multiple fields in the generated PDF file. If disabled, field names will be exported using generated unique names.</ahelp></paragraph>
<!-- removed HID filter_CheckBox_RID_PDF_EXPORT_DLG_CB_EXPORTEMPTYPAGES -->
<bookmark xml-lang="en-US" branch="hid/filter:CheckBox:RID_PDF_TAB_GENER:CB_EXPORTEMPTYPAGES" id="bm_id5027619" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3946958" role="heading" level="2" l10n="NEW">Export automatically inserted blank pages</paragraph>
<paragraph xml-lang="en-US" id="par_id8551896" role="paragraph" l10n="NEW"><ahelp hid=".">If switched on, automatically inserted blank pages are being exported to pdf file. This is best if you are printing the pdf file double-sided. Example: In a book a chapter paragraph style is set to always start with an odd numbered page. The previous chapter ends on an odd page. %PRODUCTNAME inserts an even numbered blank page. This option controls whether to export that even numbered page or not.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/filter:CheckBox:RID_PDF_TAB_GENER:CB_EMBEDSTANDARDFONTS" id="bm_id50656619" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3954548" role="heading" level="2" l10n="NEW">Embed standard fonts</paragraph>
+<paragraph xml-lang="en-US" id="par_id853434896" role="paragraph" l10n="NEW"><ahelp hid=".">Normally the 14 standard Postscript fonts are not embedded in a PDF file, because every PDF reader software already contains these fonts. Enable this option to embed the standard fonts that are installed on your system and that are used in the document.</ahelp> Use this option if you expect to have a better looking or more useful standard font than the font that is available in the recipients' PDF reader software.</paragraph>
<bookmark xml-lang="en-US" branch="hid/filter:CheckBox:RID_PDF_TAB_GENER:CB_ADDSTREAM" id="bm_id0804200803552411" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id080420080355360" role="heading" level="2" l10n="NEW">Create hybrid file</paragraph>
<paragraph xml-lang="en-US" id="par_id0804200803553767" role="paragraph" l10n="NEW"><ahelp hid=".">When the <link href="http://extensions.services.openoffice.org/project/pdfimport">PDF Import Extension</link> is installed, this setting enables you to export the document as a .pdf file containing two file formats: PDF and ODF.</ahelp></paragraph>
@@ -239,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>