source/text/shared/00/00000406.xhp | 6 +--
source/text/swriter/01/01150000.xhp | 58 ++++++++++++++++++++++--------------
2 files changed, 39 insertions(+), 25 deletions(-)
New commits:
commit 0b8b6b25fd76e0bf13929b0d45d8c611e6e28646
Author: Gabor Kelemen <kelem...@gnome.hu>
Date: Mon Jan 23 01:05:30 2017 +0100
tdf#102930 Update Mail Merge dialog help page
Sync content to current UI, update bookmarks and ahelps
There are many MM pages, this is just one of them.
Change-Id: I273d5cb9d77ea5f9b3f7de23f6384fef09d607f3
Reviewed-on: https://gerrit.libreoffice.org/33410
Reviewed-by: Gabor Kelemen <kelem...@ubuntu.com>
Tested-by: Gabor Kelemen <kelem...@ubuntu.com>
diff --git a/source/text/swriter/01/01150000.xhp
b/source/text/swriter/01/01150000.xhp
index b020c4a..7d52e5a 100644
--- a/source/text/swriter/01/01150000.xhp
+++ b/source/text/swriter/01/01150000.xhp
@@ -28,8 +28,11 @@
<filename>/text/swriter/01/01150000.xhp</filename>
</topic>
</meta>
-<body><comment>UFI: removed help ids</comment><paragraph role="heading"
id="hd_id3150757" xml-lang="en-US" level="1" l10n="CHG" oldref="1">Mail
Merge<comment>UFI: due to CJ, this old dialog stays and can be accessed through
Tools-Configure-Menus. </comment><comment>UFI: now this is the default dialog
again, when you just print a doc with a database field.</comment></paragraph>
-<paragraph role="paragraph" id="par_id3151187" xml-lang="en-US" l10n="U"
oldref="2"><variable id="serienbrieftext"><ahelp hid=".uno:MergeDialog">Opens
the <emph>Mail Merge</emph> dialog, which helps you in printing and saving form
letters.</ahelp>
+<body>
+<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/mailmerge/MailmergeDialog" id="bm_id3149687"
localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:MergeDialog" id="bm_id3149687"
localize="false"/>
+<paragraph role="heading" id="hd_id3150757" xml-lang="en-US" level="1"
l10n="CHG" oldref="1">Mail Merge</paragraph>
+<paragraph role="paragraph" id="par_id3151187" xml-lang="en-US" l10n="U"
oldref="2"><variable id="serienbrieftext"><ahelp hid=".">The <emph>Mail
Merge</emph> dialog helps you in printing and saving form letters.</ahelp>
</variable></paragraph>
<section id="howtoget">
<embed href="text/swriter/00/00000401.xhp#serienbrief"/>
@@ -37,42 +40,53 @@
<paragraph role="paragraph" id="par_id3154102" xml-lang="en-US">During
printing, the database information replaces the corresponding database fields
(placeholders). For more information about inserting database fields refer to
the <link href="text/swriter/01/04090006.xhp"
name="Database"><emph>Database</emph></link> tab page under <emph>Insert -
Field - More Fields</emph>.</paragraph><comment>db browser explorer</comment>
<bookmark xml-lang="en-US" branch="hid/DBACCESS_HID_TLB_TREELISTBOX"
id="bm_id5399029" localize="false"/><paragraph role="paragraph"
id="par_id8186895" xml-lang="en-US" l10n="NEW"><ahelp hid="."
visibility="hidden">Select a database and table.</ahelp></paragraph><comment>db
browser records</comment>
-<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/mailmerge/singledocument" id="bm_id7246620"
localize="false"/><paragraph role="paragraph" id="par_id3101901"
xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Click to create
one big document containing all data records.</ahelp></paragraph><comment>save
as individual documents</comment>
-<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/mailmerge/individualdocuments" id="bm_id6964323"
localize="false"/><paragraph role="paragraph" id="par_id5345011"
xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Click to create
one document for every one data record.</ahelp></paragraph><comment>generate
file name from database</comment>
-<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mailmerge/generate"
id="bm_id6631672" localize="false"/><paragraph role="paragraph"
id="par_id5631580" xml-lang="en-US" l10n="NEW"><ahelp hid="."
visibility="hidden">Generate each file name from data contained in a
database.</ahelp><comment>UFI: sorry, spec doc has no more info about the
specifics</comment></paragraph><comment>file format</comment>
-<bookmark xml-lang="en-US" branch="hid/modules/swriter/mailmerge/fileformat"
id="bm_id8452711" localize="false"/><paragraph role="paragraph"
id="par_id8992889" xml-lang="en-US" l10n="NEW"><ahelp hid="."
visibility="hidden">Select the file format.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3154482" xml-lang="en-US" level="2"
l10n="U" oldref="5">Records</paragraph>
<paragraph role="paragraph" id="par_id3154565" xml-lang="en-US" l10n="U"
oldref="6">Determines the number of records for printing the form letter. One
letter will be printed for each record.</paragraph>
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mailmerge/all"
id="bm_id3149685" localize="false"/><paragraph role="heading" id="hd_id3155896"
xml-lang="en-US" level="3" l10n="U" oldref="7">All</paragraph>
<paragraph role="paragraph" id="par_id3149691" xml-lang="en-US" l10n="U"
oldref="8"><ahelp hid="modules/swriter/ui/mailmerge/all">Processes all the
records from the database.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mailmerge/selected"
id="bm_id3143279" localize="false"/><paragraph role="heading" id="hd_id3155186"
xml-lang="en-US" level="3" l10n="U" oldref="9">Selected records</paragraph>
<paragraph role="paragraph" id="par_id3149483" xml-lang="en-US" l10n="U"
oldref="10"><ahelp hid="modules/swriter/ui/mailmerge/selected">Processes only
the marked records from the database. This option is only available when you
have previously marked the necessary records in the
database.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mailmerge/rbfrom"
id="bm_id3149097" localize="false"/><paragraph role="heading" id="hd_id3149819"
xml-lang="en-US" level="3" l10n="U" oldref="23">From</paragraph>
-<paragraph role="paragraph" id="par_id3149104" xml-lang="en-US" l10n="U"
oldref="24"><ahelp hid="modules/swriter/ui/mailmerge/rbfrom">Specifies which
records to include in your form letter.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mailmerge/rbfrom"
id="bm_id3149097" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mailmerge/from"
id="bm_id3148978" localize="false"/><paragraph role="heading" id="hd_id3151260"
xml-lang="en-US" level="3" l10n="U" oldref="11">From:</paragraph>
-<paragraph role="paragraph" id="par_id3149034" xml-lang="en-US" l10n="U"
oldref="12"><ahelp hid="modules/swriter/ui/mailmerge/from">Specifies the number
of the first record to be printed.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3149034" xml-lang="en-US" l10n="U"
oldref="12"><ahelp hid=".">Specify the number of the first record to be
printed.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mailmerge/to"
id="bm_id3153643" localize="false"/><paragraph role="heading" id="hd_id3153631"
xml-lang="en-US" level="3" l10n="U" oldref="25">To:</paragraph>
-<paragraph role="paragraph" id="par_id3145758" xml-lang="en-US" l10n="U"
oldref="26"><ahelp hid="modules/swriter/ui/mailmerge/to">Specifies the number
of the last record to be printed.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3145758" xml-lang="en-US" l10n="U"
oldref="26"><ahelp hid="modules/swriter/ui/mailmerge/to">Specify the number of
the last record to be printed.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3152772" xml-lang="en-US" level="2"
l10n="U" oldref="13">Output</paragraph>
<paragraph role="paragraph" id="par_id3155138" xml-lang="en-US" l10n="U"
oldref="14">Determines whether to send your form letters to a printer or save
them to a file.</paragraph>
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mailmerge/printer"
id="bm_id3150497" localize="false"/><paragraph role="heading" id="hd_id3150485"
xml-lang="en-US" level="3" l10n="U" oldref="15">Printer</paragraph>
<paragraph role="paragraph" id="par_id3149167" xml-lang="en-US" l10n="U"
oldref="16"><ahelp hid="modules/swriter/ui/mailmerge/printer">Prints the form
letters.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mailmerge/file"
id="bm_id3145785" localize="false"/><paragraph role="heading" id="hd_id3145773"
xml-lang="en-US" level="3" l10n="U" oldref="39">File</paragraph>
<paragraph role="paragraph" id="par_id3155910" xml-lang="en-US" l10n="U"
oldref="40"><ahelp hid="modules/swriter/ui/mailmerge/file">Saves the form
letters in files.</ahelp></paragraph>
-<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/mailmerge/singlejobs" id="bm_id3151383"
localize="false"/><paragraph role="heading" id="hd_id3151371" xml-lang="en-US"
level="3" l10n="U" oldref="35">Single print jobs</paragraph>
-<paragraph role="paragraph" id="par_id3155858" xml-lang="en-US" l10n="U"
oldref="36"><ahelp hid="modules/swriter/ui/mailmerge/singlejobs">Prints each
form letter individually with the selected printer.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mailmerge/path"
id="bm_id3150122" localize="false"/><paragraph role="heading" id="hd_id3150111"
xml-lang="en-US" level="3" l10n="U" oldref="41">Path</paragraph>
+
+<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/mailmerge/singledocument" id="bm_id7246620"
localize="false"/>
+<paragraph role="heading" id="hd_id3150109" xml-lang="en-US" level="3">Save as
single document</paragraph>
+<paragraph role="paragraph" id="par_id3101901" xml-lang="en-US"
l10n="NEW"><ahelp hid=".">Create one big document containing all data
records.</ahelp></paragraph><comment>save as individual documents</comment>
+
+<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/mailmerge/individualdocuments" id="bm_id6964323"
localize="false"/>
+<paragraph role="heading" id="hd_id3150110" xml-lang="en-US" level="3">Save as
individual documents</paragraph>
+<paragraph role="paragraph" id="par_id5345011" xml-lang="en-US"
l10n="NEW"><ahelp hid=".">Create one document for every one data
record.</ahelp></paragraph>
+
+<paragraph role="heading" id="hd_id3145263" xml-lang="en-US"
level="3">Generate file name from database</paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mailmerge/generate"
id="bm_id6631672" localize="false"/>
+<paragraph role="paragraph" id="par_id5631580" xml-lang="en-US"
l10n="NEW"><ahelp hid=".">Generate each file name from data contained in a
database.</ahelp></paragraph>
+
+<paragraph role="heading" id="hd_id3150108" xml-lang="en-US"
level="3">Field</paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mailmerge/field"
id="bm_id3147747" localize="false"/>
+<paragraph role="paragraph" id="par_id3149829" xml-lang="en-US" l10n="U"
oldref="46"><ahelp hid="modules/swriter/ui/mailmerge/field">Uses the content of
the selected database field as the file name for the form
letter.</ahelp></paragraph>
+
+
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mailmerge/path"
id="bm_id3150122" localize="false"/>
+<paragraph role="heading" id="hd_id3150111" xml-lang="en-US" level="3"
l10n="U" oldref="41">Path</paragraph>
<paragraph role="paragraph" id="par_id3150687" xml-lang="en-US" l10n="U"
oldref="42"><ahelp hid="modules/swriter/ui/mailmerge/path">Specifies the path
to store the form letters.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mailmerge/pathpb"
id="bm_id3147423" localize="false"/><paragraph role="heading" id="hd_id3147412"
xml-lang="en-US" level="3" l10n="U" oldref="43">...</paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mailmerge/pathpb"
id="bm_id3147423" localize="false"/>
+<paragraph role="heading" id="hd_id3147412" xml-lang="en-US" level="3"
l10n="U" oldref="43">...</paragraph>
<paragraph role="paragraph" id="par_id3149553" xml-lang="en-US" l10n="U"
oldref="44"><ahelp hid="modules/swriter/ui/mailmerge/pathpb">Opens the<emph>
Select Path </emph>dialog.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3145263" xml-lang="en-US" level="3"
l10n="U" oldref="49">Generate file name from</paragraph>
-<paragraph role="paragraph" id="par_id3150547" xml-lang="en-US" l10n="U"
oldref="50">Specifies how the file name is generated.</paragraph>
-<!-- removed HID SW:RADIOBUTTON:DLG_MAILMERGE:RB_COLUMN -->
-<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mailmerge/field"
id="bm_id3147747" localize="false"/><paragraph role="heading" id="hd_id3150561"
xml-lang="en-US" level="4" l10n="U" oldref="45">Database field</paragraph>
-<paragraph role="paragraph" id="par_id3149829" xml-lang="en-US" l10n="U"
oldref="46"><ahelp hid="modules/swriter/ui/mailmerge/field">Uses the content of
the selected data field as the file name for the form
letter.</ahelp></paragraph>
-<!-- removed HID SW:RADIOBUTTON:DLG_MAILMERGE:RB_FILENAME -->
-<!-- removed HID SW:EDIT:DLG_MAILMERGE:ED_FILENAME --><paragraph
role="heading" id="hd_id3149848" xml-lang="en-US" level="4" l10n="U"
oldref="47">Manual setting</paragraph>
-<paragraph role="paragraph" id="par_id3153289" xml-lang="en-US" l10n="U"
oldref="48"><ahelp hid="SW:EDIT:DLG_MAILMERGE:ED_FILENAME">Creates the file
name based on the text you enter, followed by a serial
number.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/mailmerge/fileformat" id="bm_id8452711"
localize="false"/>
+<paragraph role="heading" id="hd_id3150112" xml-lang="en-US" level="3">File
format</paragraph>
+<paragraph role="paragraph" id="par_id8992889" xml-lang="en-US"
l10n="NEW"><ahelp hid=".">Select the file format to store the resulting
document.</ahelp></paragraph>
+
<embed href="text/shared/00/00000004.xhp#related"/>
<embed href="text/swriter/guide/form_letters_main.xhp#form_letters"/>
<embed href="text/swriter/01/mailmerge00.xhp#mailmerge"/>
commit e46d808eaeb8b704205738de88bfc3b3964e8df1
Author: Gabor Kelemen <kelem...@gnome.hu>
Date: Sun Jan 22 22:30:52 2017 +0100
Tools - Customize - Menu tab is Menus nowadays
Change-Id: Id3869b626214d75262ada41f2b413d65bee6532b
Reviewed-on: https://gerrit.libreoffice.org/33409
Reviewed-by: Gabor Kelemen <kelem...@ubuntu.com>
Tested-by: Gabor Kelemen <kelem...@ubuntu.com>
diff --git a/source/text/shared/00/00000406.xhp
b/source/text/shared/00/00000406.xhp
index e97e133..072d8e3 100644
--- a/source/text/shared/00/00000406.xhp
+++ b/source/text/shared/00/00000406.xhp
@@ -111,11 +111,11 @@
</variable></paragraph>
<paragraph xml-lang="en-US" id="par_id3148672" role="paragraph"
l10n="CHG" oldref="15"><variable id="anpassen">Choose <emph>Tools -
Customize</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3147230" role="paragraph"
l10n="CHG" oldref="16"><variable id="menue">Choose <emph>Tools - Customize -
Menu</emph> tab
+ <paragraph xml-lang="en-US" id="par_id3147230" role="paragraph"
l10n="CHG" oldref="16"><variable id="menue">Choose <emph>Tools - Customize -
Menus</emph> tab
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_idN108E9" role="paragraph"
l10n="NEW"><variable id="menuenew">Choose <emph>Tools - Customize - Menu</emph>
tab, click <emph>New</emph>
+ <paragraph xml-lang="en-US" id="par_idN108E9" role="paragraph"
l10n="NEW"><variable id="menuenew">Choose <emph>Tools - Customize -
Menus</emph> tab, click <emph>New</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_idN10919" role="paragraph"
l10n="NEW"><variable id="menuemove">Choose <emph>Tools - Customize -
Menu</emph> tab, click <emph>Menu - Move</emph>
+ <paragraph xml-lang="en-US" id="par_idN10919" role="paragraph"
l10n="NEW"><variable id="menuemove">Choose <emph>Tools - Customize -
Menus</emph> tab, click <emph>Menu - Move</emph>
</variable></paragraph>
<paragraph xml-lang="en-US" id="par_id3145171" role="paragraph"
l10n="CHG" oldref="129"><variable id="tastatur">Choose <emph>Tools - Customize
- Keyboard</emph> tab (a document must be opened)
</variable></paragraph>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
