diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2007-04-02 14:51:30 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2007-04-02 14:51:30 +0000 |
| commit | 22f425888c19f3e41295f54d25b02958a5a4bb2f (patch) | |
| tree | 836a345eeacf039a21521a5490ded0cde7b050a3 | |
| parent | INTEGRATION: CWS hcshared08 (1.4.190); FILE MERGED (diff) | |
| download | help-22f425888c19f3e41295f54d25b02958a5a4bb2f.tar.gz help-22f425888c19f3e41295f54d25b02958a5a4bb2f.zip | |
INTEGRATION: CWS hcshared08 (1.6.190); FILE MERGED
2007/01/31 14:17:36 ufi 1.6.190.1: some changes
| -rwxr-xr-x | helpcontent2/source/text/swriter/01/mailmerge08.xhp | 14 | ||||
| -rw-r--r-- | helpcontent2/source/text/swriter/02/18010000.xhp | 82 |
2 files changed, 54 insertions, 42 deletions
diff --git a/helpcontent2/source/text/swriter/01/mailmerge08.xhp b/helpcontent2/source/text/swriter/01/mailmerge08.xhp index 2a3de0d5b8..2e74eb8f5e 100755 --- a/helpcontent2/source/text/swriter/01/mailmerge08.xhp +++ b/helpcontent2/source/text/swriter/01/mailmerge08.xhp @@ -1,13 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> -<!--*********************************************************************** +<!-- + *********************************************************************** * * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: mailmerge08.xhp,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: rt $ $Date: 2005-09-08 02:10:22 $ + * last change: $Author: rt $ $Date: 2007-04-02 15:50:55 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -32,7 +33,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA * - ************************************************************************--> + ************************************************************************ + --> <helpdocument version="1.0"> <meta> @@ -42,7 +44,7 @@ </topic> <history> <created date="2004-07-07T14:35:12">UFI: Mail Merge Wizard page 8</created> -<lastedited date="2005-02-16T11:10:27">DEDR: Reviewed</lastedited> +<lastedited date="2007-01-31T14:35:40">DEDR: Reviewed</lastedited> </history> </meta> <body> @@ -59,7 +61,7 @@ <paragraph role="paragraph" id="par_idN10583" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Saves the current document.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/sw_RadioButton_DLG_MM_OUTPUT_PAGE_RB_SAVEMERGEDDOC" id="bm_id5630664" localize="false"/> <paragraph role="heading" id="par_idN10586" xml-lang="en-US" level="2" l10n="NEW">Save merged document</paragraph> -<paragraph role="paragraph" id="par_idN1058A" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Saves the merged document as a separate file for each recipient.</ahelp></paragraph> +<paragraph role="paragraph" id="par_idN1058A" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Saves the merged document.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/sw_RadioButton_DLG_MM_OUTPUT_PAGE_RB_SAVEASONE" id="bm_id7217627" localize="false"/> <paragraph role="heading" id="par_idN1058D" xml-lang="en-US" level="3" l10n="NEW">Save as single document</paragraph> <paragraph role="paragraph" id="par_idN10591" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Saves the merged document as a single file.</ahelp></paragraph> diff --git a/helpcontent2/source/text/swriter/02/18010000.xhp b/helpcontent2/source/text/swriter/02/18010000.xhp index 06cab343da..1c24f674be 100644 --- a/helpcontent2/source/text/swriter/02/18010000.xhp +++ b/helpcontent2/source/text/swriter/02/18010000.xhp @@ -1,13 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> -<!--*********************************************************************** +<!-- + *********************************************************************** * * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: 18010000.xhp,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: rt $ $Date: 2005-09-08 02:22:06 $ + * last change: $Author: rt $ $Date: 2007-04-02 15:51:30 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -32,7 +33,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA * - ************************************************************************--> + ************************************************************************ + --> <helpdocument version="1.0"> <meta> @@ -42,7 +44,7 @@ </topic> <history> <created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created> -<lastedited date="2005-02-15T10:10:50">converted from old format - fpe</lastedited> +<lastedited date="2007-01-18T11:35:58">converted from old format - fpe</lastedited> </history> </meta> <body> @@ -57,55 +59,63 @@ <paragraph role="heading" id="hd_id3143272" xml-lang="en-US" level="2" l10n="CHG" oldref="9"><link href="text/swriter/01/04150000.xhp" name="Insert Table">Table</link></paragraph> <embed href="text/swriter/01/04150000.xhp#tabelletext"/> <embed href="text/swriter/00/00000404.xhp#sytabelle"/> +<paragraph role="heading" id="hd_id3150115" xml-lang="en-US" level="2" l10n="CHG" oldref="18"><link href="text/swriter/01/04020000.xhp" name="Insert Section">Section</link></paragraph> +<embed href="text/swriter/01/04020000.xhp#bereich"/> +<embed href="text/swriter/00/00000404.xhp#sybereich"/> <paragraph role="heading" id="hd_id3154572" xml-lang="en-US" level="2" l10n="U" oldref="7"><link href="text/swriter/01/04130000.xhp" name="Insert Frame Manually">Insert Frame Manually</link></paragraph> <embed href="text/swriter/01/04130000.xhp#syrahmentext"/> <embed href="text/swriter/00/00000404.xhp#syrahmen"/> -<paragraph role="heading" id="hd_id3149098" xml-lang="en-US" level="2" l10n="CHG" oldref="10"><link href="text/swriter/01/04190000.xhp" name="Insert Document">File</link></paragraph> -<embed href="text/swriter/01/04190000.xhp#datei"/> -<embed href="text/swriter/00/00000404.xhp#syeinfdatei"/> -<paragraph role="heading" id="hd_id3155174" xml-lang="en-US" level="2" l10n="U" oldref="8"><link href="text/shared/01/04140000.xhp" name="From File">From File</link></paragraph> -<embed href="text/shared/01/04140000.xhp#grafiktext"/> -<embed href="text/shared/00/00000404.xhp#sygrafik"/> -<embed href="text/shared/01/moviesound.xhp#moviesound"/> +<paragraph role="heading" id="hd_id3151341" xml-lang="en-US" level="2" l10n="NEW"><link href="text/shared/01/04160500.xhp" name="Floating Frame">Floating Frame</link></paragraph> +<embed href="text/shared/01/04160500.xhp#frameeinfuegentext"/> +<embed href="text/shared/00/00000404.xhp#syframe"/> <paragraph role="heading" id="hd_id3148974" xml-lang="en-US" level="2" l10n="U" oldref="11"><link href="text/swriter/01/04030000.xhp" name="Insert Footnote Directly">Insert Footnote Directly</link></paragraph> <embed href="text/swriter/01/04030000.xhp#fussnoteein"/> <embed href="text/swriter/00/00000404.xhp#syfussnoteein"/> <paragraph role="heading" id="hd_id3152773" xml-lang="en-US" level="2" l10n="U" oldref="17"><link href="text/swriter/01/04030000.xhp" name="Insert Endnote Directly">Insert Endnote Directly</link></paragraph> <embed href="text/swriter/01/04030000.xhp#endnotetext"/> <embed href="text/swriter/00/00000404.xhp#syendnoteein"/> -<paragraph role="heading" id="hd_id3145780" xml-lang="en-US" level="2" l10n="U" oldref="12"><link href="text/shared/01/04100000.xhp" name="Insert Special Character">Insert Special Character</link></paragraph> +<paragraph role="heading" id="par_idN10777" xml-lang="en-US" level="2" l10n="CHG"><link href="text/shared/01/04050000.xhp">Note</link></paragraph> +<paragraph role="paragraph" id="par_idN10863" xml-lang="en-US" l10n="NEW">Inserts a note at the current cursor position.</paragraph> +<paragraph role="heading" id="hd_id3145262" xml-lang="en-US" level="2" l10n="CHG" oldref="16"><link href="text/swriter/01/04040000.xhp" name="Bookmark">Bookmark</link></paragraph> +<embed href="text/swriter/01/04040000.xhp#textmarkeein"/> +<embed href="text/swriter/00/00000404.xhp#sytextmarke"/><comment>UFI: "insert cross reference" here</comment> +<paragraph role="heading" id="hd_id3149098" xml-lang="en-US" level="2" l10n="CHG" oldref="10"><link href="text/swriter/01/04190000.xhp" name="Insert Document">File</link></paragraph> +<embed href="text/swriter/01/04190000.xhp#datei"/> +<embed href="text/swriter/00/00000404.xhp#syeinfdatei"/> +<paragraph role="heading" id="par_idN10772" xml-lang="en-US" level="2" l10n="NEW"><link href="text/swriter/01/02120000.xhp" name="AutoText">AutoText</link></paragraph> +<embed href="text/swriter/01/02120000.xhp#autotexttext"/> +<paragraph role="heading" id="hd_id3145780" xml-lang="en-US" level="2" l10n="CHG" oldref="12"><link href="text/shared/01/04100000.xhp" name="Special Character">Special Character</link></paragraph> <embed href="text/shared/01/04100000.xhp#sonder"/> <embed href="text/shared/00/00000404.xhp#sysonder"/> +<paragraph role="heading" id="par_idN10759" xml-lang="en-US" level="2" l10n="CHG"><link href="text/swriter/01/04090000.xhp">Insert Fields</link></paragraph> +<paragraph role="paragraph" id="par_idN1077E" xml-lang="en-US" l10n="NEW">Inserts a field at the current cursor position. </paragraph> +<embed href="text/swriter/00/00000404.xhp#syfeldbefehl"/> +<paragraph role="heading" id="par_idN10768" xml-lang="en-US" level="2" l10n="CHG"><link href="text/shared/02/01170000.xhp">Controls</link></paragraph> +<paragraph role="paragraph" id="par_idN107ED" xml-lang="en-US" l10n="CHG">The Controls icon opens a toolbar with the tools that you need to create an interactive form.</paragraph> +<embed href="text/shared/02/01170000.xhp#syformular"/> +<paragraph role="heading" id="hd_id3155174" xml-lang="en-US" level="2" l10n="U" oldref="8"><link href="text/shared/01/04140000.xhp" name="From File">From File</link></paragraph> +<embed href="text/shared/01/04140000.xhp#grafiktext"/> +<embed href="text/shared/00/00000404.xhp#sygrafik"/> +<embed href="text/shared/01/moviesound.xhp#moviesound"/> +<embed href="text/shared/00/00000404.xhp#symoviesound"/> <paragraph role="heading" id="par_idN106F4" xml-lang="en-US" level="2" l10n="NEW"><link href="text/shared/01/04160300.xhp" name="Insert Formula">Formula</link></paragraph> <embed href="text/shared/01/04160300.xhp#starmath"/> <embed href="text/shared/00/00000404.xhp#systarmath"/> -<paragraph role="heading" id="hd_id3150115" xml-lang="en-US" level="2" l10n="CHG" oldref="18"><link href="text/swriter/01/04020000.xhp" name="Insert Section">Section</link></paragraph> -<embed href="text/swriter/01/04020000.xhp#bereich"/> -<embed href="text/swriter/00/00000404.xhp#sybereich"/> -<paragraph role="heading" id="hd_id3155861" xml-lang="en-US" level="2" l10n="CHG" oldref="15"><link href="text/swriter/01/04120100.xhp" name="Insert Index Marker">Entry</link></paragraph> -<embed href="text/swriter/01/04120100.xhp#eintrag"/> -<embed href="text/swriter/00/00000404.xhp#syeintrag"/> -<paragraph role="heading" id="par_idN10759" xml-lang="en-US" level="2" l10n="NEW"><link href="text/swriter/01/04090000.xhp">Insert Field</link></paragraph> -<paragraph role="paragraph" id="par_idN1077E" xml-lang="en-US" l10n="NEW">Inserts a field at the current cursor position. </paragraph> -<embed href="text/swriter/00/00000404.xhp#syfeldbefehl"/> <paragraph role="heading" id="par_idN10769" xml-lang="en-US" level="2" l10n="NEW"><link href="text/shared/01/04160100.xhp" name="Insert Chart">Chart</link></paragraph> <embed href="text/shared/01/04160100.xhp#autoformatdiagrammtext"/> <embed href="text/shared/00/00000404.xhp#systarchart"/> -<bookmark xml-lang="en-US" branch="hid/FN_INSERT_OBJ_CTRL" id="bm_id8535791" localize="false"/> -<bookmark xml-lang="en-US" branch="hid/.uno:InsertObjCtrl" id="bm_id3521835" localize="false"/> -<paragraph role="heading" id="par_idN10789" xml-lang="en-US" level="2" l10n="NEW">Insert Object</paragraph> -<paragraph role="paragraph" id="par_idN107C5" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <emph>Insert Object</emph> toolbar.</ahelp></paragraph> -<paragraph role="heading" id="par_idN10768" xml-lang="en-US" level="2" l10n="NEW"><link href="text/shared/02/01170000.xhp">Form Controls</link></paragraph> -<paragraph role="paragraph" id="par_idN107ED" xml-lang="en-US" l10n="NEW">The Form Controls icon opens a toolbar with the tools that you need to create an interactive form.</paragraph> -<embed href="text/shared/02/01170000.xhp#syformular"/> +<paragraph role="heading" id="hd_id1586962" xml-lang="en-US" level="2" l10n="NEW"><link href="text/shared/01/04150100.xhp" name="OLE Object">OLE Object</link></paragraph><comment>UFI: this may be called "Insert Object" in UI, but is not the removed "Insert Object" bar</comment><embed href="text/shared/01/04150100.xhp#ole"/> +<embed href="text/shared/00/00000404.xhp#syole"/> +<paragraph role="heading" id="hd_id666524" xml-lang="en-US" level="2" l10n="NEW"><link href="text/shared/01/04150200.xhp" name="Plug-in">Plug-in</link></paragraph> +<embed href="text/shared/01/04150200.xhp#plugin"/> +<embed href="text/shared/00/00000404.xhp#syplugin"/> +<paragraph role="heading" id="hd_id4737388" xml-lang="en-US" level="2" l10n="NEW"><link href="text/shared/01/04150300.xhp" name="Applet">Applet</link></paragraph> +<embed href="text/shared/01/04150300.xhp#applet"/> +<embed href="text/shared/00/00000404.xhp#syapplet"/> <paragraph role="heading" id="par_idN1076D" xml-lang="en-US" level="2" l10n="NEW"><link href="text/swriter/01/04120200.xhp">Insert Index</link></paragraph> <paragraph role="paragraph" id="par_idN10814" xml-lang="en-US" l10n="NEW">Inserts an index or a table of contents at the current cursor position.</paragraph> -<paragraph role="paragraph" id="par_idN10772" xml-lang="en-US" l10n="NEW"><link href="text/swriter/01/02120000.xhp" name="AutoText">AutoText</link></paragraph> -<embed href="text/swriter/01/02120000.xhp#autotexttext"/> -<paragraph role="heading" id="par_idN10777" xml-lang="en-US" level="2" l10n="NEW">Insert Note</paragraph> -<paragraph role="paragraph" id="par_idN10863" xml-lang="en-US" l10n="NEW">Inserts a note at the current cursor position.</paragraph> -<paragraph role="heading" id="hd_id3145262" xml-lang="en-US" level="2" l10n="U" oldref="16"><link href="text/swriter/01/04040000.xhp" name="Insert Bookmark">Insert Bookmark</link></paragraph> -<embed href="text/swriter/01/04040000.xhp#textmarkeein"/> -<embed href="text/swriter/00/00000404.xhp#sytextmarke"/> +<paragraph role="heading" id="hd_id3155861" xml-lang="en-US" level="2" l10n="CHG" oldref="15"><link href="text/swriter/01/04120100.xhp" name="Insert Index Marker">Entry</link></paragraph> +<embed href="text/swriter/01/04120100.xhp#eintrag"/> +<embed href="text/swriter/00/00000404.xhp#syeintrag"/> </body> </helpdocument> |