diff options
| author | Olivier Hallot <olivier.hallot@libreoffice.org> | 2020-07-27 14:11:45 -0300 |
|---|---|---|
| committer | Olivier Hallot <olivier.hallot@libreoffice.org> | 2020-07-27 22:37:42 +0200 |
| commit | 5794edee8b1e7fc990bb0a41462d4aeb382a976f (patch) | |
| tree | 2602e0c71a18c935ac1e2c22b26eaa839dd23a28 /source/text | |
| parent | 09c3906689f2a33490dceb57b47caaa4d22b2060 (diff) | |
Change e-mail to email and E-mail to Email
Change-Id: Ie47ed745f336e44389c8c797967de6af72c9ce8d
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/99526
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
Diffstat (limited to 'source/text')
30 files changed, 98 insertions, 98 deletions
diff --git a/source/text/shared/00/00000002.xhp b/source/text/shared/00/00000002.xhp index 5a9ce270f1..b10de4e6f6 100644 --- a/source/text/shared/00/00000002.xhp +++ b/source/text/shared/00/00000002.xhp @@ -38,7 +38,7 @@ <comment>mw changed "Internet...".</comment> <paragraph id="hd_id3150702" role="heading" level="1" xml-lang="en-US"><link href="text/shared/00/00000002.xhp" name="Glossary of Internet Terms">Glossary of Internet Terms</link></paragraph> -<paragraph id="par_id3155577" role="paragraph" xml-lang="en-US">If you are a newcomer to the Internet, you will be confronted with unfamiliar terms: browser, bookmark, e-mail, homepage, search engine, and many others. To make your first steps easier, this glossary explains some of the more important terminology you may find in the Internet, intranet, mail and news.</paragraph> +<paragraph id="par_id3155577" role="paragraph" xml-lang="en-US">If you are a newcomer to the Internet, you will be confronted with unfamiliar terms: browser, bookmark, email, homepage, search engine, and many others. To make your first steps easier, this glossary explains some of the more important terminology you may find in the Internet, intranet, mail and news.</paragraph> </section> <sort> @@ -201,7 +201,7 @@ <paragraph id="hd_id3153766" role="heading" level="2" xml-lang="en-US">URL</paragraph> -<paragraph id="par_id3152931" role="paragraph" xml-lang="en-US">The Uniform Resource Locator (URL) displays the address of a document or a server in the Internet. The general structure of a URL varies according to type and is generally in the form Service://Hostname:Port/Path/Page#Mark although not all elements are always required. An URL can be a FTP address, a WWW (HTTP) address, a file address or an e-mail address.</paragraph> +<paragraph id="par_id3152931" role="paragraph" xml-lang="en-US">The Uniform Resource Locator (URL) displays the address of a document or a server in the Internet. The general structure of a URL varies according to type and is generally in the form Service://Hostname:Port/Path/Page#Mark although not all elements are always required. An URL can be a FTP address, a WWW (HTTP) address, a file address or an email address.</paragraph> </section> </sort> </body> diff --git a/source/text/shared/00/00000401.xhp b/source/text/shared/00/00000401.xhp index dccbe8148a..68ab3658e9 100644 --- a/source/text/shared/00/00000401.xhp +++ b/source/text/shared/00/00000401.xhp @@ -230,7 +230,7 @@ <image id="img_id4044007" src="cmd/sc_sendmail.png" width="0.566cm" height="0.566cm"><alt id="alt_id4044007" xml-lang="en-US">Icon</alt></image></paragraph> </tablecell> <tablecell> -<paragraph role="paragraph" id="par_idN113C8" xml-lang="en-US">E-mail Document</paragraph> +<paragraph role="paragraph" id="par_idN113C8" xml-lang="en-US">Email Document</paragraph> </tablecell> </tablerow> </table> @@ -290,7 +290,7 @@ </table> </section> <section id="pdf"> -<paragraph role="paragraph" id="par_id3145410" xml-lang="en-US">Choose <emph>File - Send - E-mail as PDF</emph>.</paragraph> +<paragraph role="paragraph" id="par_id3145410" xml-lang="en-US">Choose <emph>File - Send - Email as PDF</emph>.</paragraph> </section> <paragraph role="paragraph" id="par_id3159160" xml-lang="en-US"><variable id="glo">Choose <emph>File - Send - Create Master Document</emph>.</variable></paragraph> <section id="drucken"> diff --git a/source/text/shared/00/00000406.xhp b/source/text/shared/00/00000406.xhp index 2d24d7df04..6b10c6e7df 100644 --- a/source/text/shared/00/00000406.xhp +++ b/source/text/shared/00/00000406.xhp @@ -176,7 +176,7 @@ <paragraph xml-lang="en-US" id="par_id3149280" role="paragraph"><variable id="optionentextdokument">Open a text document, choose <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - %PRODUCTNAME Writer</emph>.</variable></paragraph> <paragraph xml-lang="en-US" id="par_idN10E4F" role="paragraph"><variable id="compatibility">Open a text document, choose <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - %PRODUCTNAME Writer - Compatibility</emph>.</variable></paragraph> <paragraph xml-lang="en-US" id="par_id3148929" role="paragraph"><variable id="laden">Open a text document, choose <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - %PRODUCTNAME Writer - General</emph>.</variable></paragraph> - <paragraph xml-lang="en-US" id="par_idN10F2F" role="paragraph"><variable id="mailmergeemail">Open a text document, choose <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - %PRODUCTNAME Writer - Mail Merge E-mail</emph>.</variable></paragraph> + <paragraph xml-lang="en-US" id="par_idN10F2F" role="paragraph"><variable id="mailmergeemail">Open a text document, choose <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - %PRODUCTNAME Writer - Mail Merge Email</emph>.</variable></paragraph> <paragraph xml-lang="en-US" id="par_id3149825" role="paragraph"><variable id="einfuegenbeschriftung">Open a text document, choose <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - %PRODUCTNAME Writer - AutoCaption</emph>.</variable></paragraph> <paragraph xml-lang="en-US" id="par_id3155333" role="paragraph"><variable id="layout">Open a text document, choose <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - %PRODUCTNAME Writer/%PRODUCTNAME Writer/Web - View</emph>.</variable></paragraph> <paragraph xml-lang="en-US" id="par_id3146316" role="paragraph"><variable id="registerschattencursor">Open a text document, choose <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - %PRODUCTNAME Writer/%PRODUCTNAME Writer/Web - Formatting Aids</emph>.</variable></paragraph> diff --git a/source/text/shared/01/01160000.xhp b/source/text/shared/01/01160000.xhp index 0dbbd114fa..29516b2e7b 100644 --- a/source/text/shared/01/01160000.xhp +++ b/source/text/shared/01/01160000.xhp @@ -36,7 +36,7 @@ <section id="howtoget"> <embed href="text/shared/00/00000401.xhp#senden"/> </section> -<paragraph role="heading" id="hd_id3154398" xml-lang="en-US" level="2"><link href="text/shared/01/01160200.xhp" name="Document as E-mail">E-mail Document</link></paragraph> +<paragraph role="heading" id="hd_id3154398" xml-lang="en-US" level="2"><link href="text/shared/01/01160200.xhp" name="Document as Email">Email Document</link></paragraph> <embed href="text/shared/01/01160200.xhp#versendentext"/><comment>New menu commands, see #i46895 and #i63793</comment><comment>UFI: New commands all have the same Help IDs, but different names</comment> <bookmark xml-lang="en-US" branch="hid/.uno:SendMailDocAsOOo" id="bm_id827967" localize="false"/> <paragraph role="paragraph" id="par_id4546342" xml-lang="en-US"><ahelp hid="." visibility="hidden">Opens a new window in your default email program with the current document as an attachment. The OpenDocument file format is used.</ahelp></paragraph> @@ -44,21 +44,21 @@ <paragraph role="paragraph" id="par_id6845301" xml-lang="en-US"><ahelp hid="." visibility="hidden">Opens a new window in your default email program with the current document as an attachment. The Microsoft file format is used.</ahelp></paragraph> <switch select="appl"> <case select="CALC"> -<paragraph role="heading" id="hd_id8111514" xml-lang="en-US" level="2">E-mail as OpenDocument Spreadsheet</paragraph> +<paragraph role="heading" id="hd_id8111514" xml-lang="en-US" level="2">Email as OpenDocument Spreadsheet</paragraph> <paragraph role="paragraph" id="par_id5917844" xml-lang="en-US">Opens a new window in your default email program with the current document as an attachment. The OpenDocument file format is used.</paragraph> -<paragraph role="heading" id="hd_id5112460" xml-lang="en-US" level="2">E-mail as Microsoft Excel</paragraph> +<paragraph role="heading" id="hd_id5112460" xml-lang="en-US" level="2">Email as Microsoft Excel</paragraph> <paragraph role="paragraph" id="par_id5759453" xml-lang="en-US">Opens a new window in your default email program with the current document as an attachment. The Microsoft Excel file format is used.</paragraph> </case> <case select="IMPRESS"> -<paragraph role="heading" id="hd_id6694540" xml-lang="en-US" level="2">E-mail as OpenDocument Presentation</paragraph> +<paragraph role="heading" id="hd_id6694540" xml-lang="en-US" level="2">Email as OpenDocument Presentation</paragraph> <paragraph role="paragraph" id="par_id7829218" xml-lang="en-US">Opens a new window in your default email program with the current document as an attachment. The OpenDocument file format is used.</paragraph> -<paragraph role="heading" id="hd_id2099063" xml-lang="en-US" level="2">E-mail as Microsoft PowerPoint Presentation</paragraph> +<paragraph role="heading" id="hd_id2099063" xml-lang="en-US" level="2">Email as Microsoft PowerPoint Presentation</paragraph> <paragraph role="paragraph" id="par_id8319650" xml-lang="en-US">Opens a new window in your default email program with the current document as an attachment. The Microsoft PowerPoint file format is used.</paragraph> </case> <case select="WRITER"> -<paragraph role="heading" id="hd_id9657277" xml-lang="en-US" level="2">E-mail as OpenDocument Text</paragraph> +<paragraph role="heading" id="hd_id9657277" xml-lang="en-US" level="2">Email as OpenDocument Text</paragraph> <paragraph role="paragraph" id="par_id9085055" xml-lang="en-US">Opens a new window in your default email program with the current document as an attachment. The OpenDocument file format is used.</paragraph> -<paragraph role="heading" id="hd_id7941831" xml-lang="en-US" level="2">E-mail as Microsoft Word</paragraph> +<paragraph role="heading" id="hd_id7941831" xml-lang="en-US" level="2">Email as Microsoft Word</paragraph> <paragraph role="paragraph" id="par_id5421918" xml-lang="en-US">Opens a new window in your default email program with the current document as an attachment. The Microsoft Word file format is used.</paragraph> </case> </switch> diff --git a/source/text/shared/01/01160200.xhp b/source/text/shared/01/01160200.xhp index 67b34a5b17..d41bcb1770 100644 --- a/source/text/shared/01/01160200.xhp +++ b/source/text/shared/01/01160200.xhp @@ -20,19 +20,19 @@ <meta> <topic id="textshared0101160200xml" indexer="include"> - <title id="tit" xml-lang="en-US">E-mail Document</title> + <title id="tit" xml-lang="en-US">Email Document</title> <filename>/text/shared/01/01160200.xhp</filename> </topic> </meta> <body> <section id="sendemail"> <bookmark xml-lang="en-US" branch="hid/.uno:SendMail" id="bm_id1274021" localize="false"/> -<paragraph role="heading" id="hd_id3150702" xml-lang="en-US" level="1"><link href="text/shared/01/01160200.xhp">E-mail Document</link></paragraph> +<paragraph role="heading" id="hd_id3150702" xml-lang="en-US" level="1"><link href="text/shared/01/01160200.xhp">Email Document</link></paragraph> <paragraph role="paragraph" id="par_id3152823" xml-lang="en-US"><variable id="versendentext"><ahelp hid=".uno:SendMail">Opens a new window in your default email program with the current document as an attachment. The current file format is used.</ahelp></variable> If the document is new and unsaved, the format specified in <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - Load/Save - General</emph> is used.</paragraph> </section> <section id="howtoget"> <embed href="text/shared/00/00000401.xhp#dokument"/> </section> -<paragraph role="note" id="par_id0807200809553672" xml-lang="en-US">If the document is in HTML format, any embedded or linked images will <emph>not</emph> be sent with the e-mail.</paragraph> +<paragraph role="note" id="par_id0807200809553672" xml-lang="en-US">If the document is in HTML format, any embedded or linked images will <emph>not</emph> be sent with the email.</paragraph> </body> </helpdocument> diff --git a/source/text/shared/01/addsignatureline.xhp b/source/text/shared/01/addsignatureline.xhp index 9a4e7db6cc..01c160b9a7 100644 --- a/source/text/shared/01/addsignatureline.xhp +++ b/source/text/shared/01/addsignatureline.xhp @@ -30,7 +30,7 @@ <alt xml-lang="en-US" id="alt_id351526436546031">Signature Line Box</alt> </image> </paragraph> - <paragraph role="paragraph" id="par_id651526423393786" xml-lang="en-US">The signature line displays an horizontal line, a location mark, the name, title and e-mail of signer.</paragraph> + <paragraph role="paragraph" id="par_id651526423393786" xml-lang="en-US">The signature line displays an horizontal line, a location mark, the name, title and email of signer.</paragraph> <section id="howtoget"> <embed href="text/shared/00/00000404.xhp#signatureline"/> </section> @@ -42,7 +42,7 @@ <paragraph role="paragraph" id="par_id701526467979209" xml-lang="en-US"><ahelp hid=".">Enter the title of the signer. The title is displayed in the signature line graphic box.</ahelp></paragraph> <bookmark branch="hid/cui/ui/signatureline/edit_email" id="bm_id44045" localize="false"/> <h2 id="hd_id431526467986157">Email</h2> - <paragraph role="paragraph" id="par_id111526467993387" xml-lang="en-US"><ahelp hid=".">Enter the e-mail of the signer. The email is not displayed in the signature line graphic box, and is be used for the digital signature.</ahelp></paragraph> + <paragraph role="paragraph" id="par_id111526467993387" xml-lang="en-US"><ahelp hid=".">Enter the email of the signer. The email is not displayed in the signature line graphic box, and is be used for the digital signature.</ahelp></paragraph> <bookmark branch="hid/cui/ui/signatureline/checkbox_can_add_comments" id="bm_id12571" localize="false"/> <h2 id="hd_id451526468019876">Signer can add comments</h2> <paragraph role="paragraph" id="par_id531526562791579" xml-lang="en-US"><ahelp hid=".">Enable signer to insert comments in the Sign Signature Line dialog at time of signature.</ahelp></paragraph> diff --git a/source/text/shared/01/ref_pdf_send_as.xhp b/source/text/shared/01/ref_pdf_send_as.xhp index 7895e21716..79aa0678c7 100644 --- a/source/text/shared/01/ref_pdf_send_as.xhp +++ b/source/text/shared/01/ref_pdf_send_as.xhp @@ -22,7 +22,7 @@ <helpdocument version="1.0"> <meta> <topic id="textshared01ref_pdf_send_asxml" indexer="include" status="PUBLISH"> -<title id="tit" xml-lang="en-US">E-mail as PDF</title> +<title id="tit" xml-lang="en-US">Email as PDF</title> <filename>/text/shared/01/ref_pdf_send_as.xhp</filename> </topic> <history> @@ -31,9 +31,9 @@ </meta> <body> <bookmark xml-lang="en-US" branch="hid/.uno:SendMailDocAsPDF" id="bm_id4080921" localize="false"/> -<paragraph role="heading" id="hd_id3146902" xml-lang="en-US" level="1"><variable id="ref_pdf_send_as"><link href="text/shared/01/ref_pdf_send_as.xhp" name="E-mail as PDF">E-mail as PDF</link> +<paragraph role="heading" id="hd_id3146902" xml-lang="en-US" level="1"><variable id="ref_pdf_send_as"><link href="text/shared/01/ref_pdf_send_as.xhp" name="Email as PDF">Email as PDF</link> </variable></paragraph><comment>UFI: name changed with #i46895</comment> -<paragraph role="paragraph" id="par_id3150756" xml-lang="en-US"><variable id="ref_pdf_send_as_text"><ahelp hid=".uno:SendMailDocAsPDF">Shows the Export as PDF dialog, exports the current document to Portable Document Format (PDF), and then opens an e-mail sending window with the PDF as an attachment.</ahelp> +<paragraph role="paragraph" id="par_id3150756" xml-lang="en-US"><variable id="ref_pdf_send_as_text"><ahelp hid=".uno:SendMailDocAsPDF">Shows the Export as PDF dialog, exports the current document to Portable Document Format (PDF), and then opens an email sending window with the PDF as an attachment.</ahelp> </variable><comment>see i70482</comment></paragraph> <section id="howtoget"> <embed href="text/shared/00/00000401.xhp#pdf"/> diff --git a/source/text/shared/02/09070200.xhp b/source/text/shared/02/09070200.xhp index 70f4d86ffa..9858b5574f 100644 --- a/source/text/shared/02/09070200.xhp +++ b/source/text/shared/02/09070200.xhp @@ -29,7 +29,7 @@ <bookmark xml-lang="en-US" branch="hid/cui/ui/hyperlinkmailpage/HyperlinkMailPage" id="bm_id3152918" localize="false"/> <bookmark xml-lang="en-US" branch="hid/cui/ui/hyperlinkmailpage/@@nowidget@@" id="bm_id3152918" localize="false"/> <h1 id="hd_id3147102"><link href="text/shared/02/09070200.xhp" name="Mail">Mail</link></h1> -<paragraph role="paragraph" id="par_id3153049" xml-lang="en-US"><ahelp hid=".">On the <emph>Mail</emph> page in the <link href="text/shared/02/09070000.xhp" name="Hyperlink dialog"><emph>Hyperlink</emph> dialog</link> you can edit hyperlinks for e-mail addresses.</ahelp></paragraph> +<paragraph role="paragraph" id="par_id3153049" xml-lang="en-US"><ahelp hid=".">On the <emph>Mail</emph> page in the <link href="text/shared/02/09070000.xhp" name="Hyperlink dialog"><emph>Hyperlink</emph> dialog</link> you can edit hyperlinks for email addresses.</ahelp></paragraph> </section> <section id="howtoget"> <embed href="text/shared/00/00000403.xhp#hypdiamailnews"/> @@ -37,9 +37,9 @@ <embed href="text/shared/06/shared_cui_screenshots.xhp#hyperlinkmailpage"/> <h2 id="hd_id3153528">Mail</h2> <bookmark xml-lang="en-US" branch="hid/cui/ui/hyperlinkmailpage/receiver" id="bm_id3144438" localize="false"/><h3 id="hd_id3149580">Recipient</h3> -<paragraph role="paragraph" id="par_id3166460" xml-lang="en-US"><ahelp hid=".">Assigns the specified <emph>e-mail address</emph> to the hyperlink.</ahelp> Clicking the new hyperlink in the document will open a new message document, addressed to the receiver specified in the <emph>Recipient</emph> field.</paragraph> +<paragraph role="paragraph" id="par_id3166460" xml-lang="en-US"><ahelp hid=".">Assigns the specified <emph>email address</emph> to the hyperlink.</ahelp> Clicking the new hyperlink in the document will open a new message document, addressed to the receiver specified in the <emph>Recipient</emph> field.</paragraph> <bookmark xml-lang="en-US" branch="hid/cui/ui/hyperlinkmailpage/adressbook" id="bm_id3155449" localize="false"/><h3 id="hd_id3143270">Data Sources</h3> -<paragraph role="paragraph" id="par_id3149514" xml-lang="en-US"><ahelp hid="cui/ui/hyperlinkmailpage/adressbook">Hides or shows the <emph>data source</emph> browser.</ahelp> Drag the receiver's <emph>E-mail</emph> data field from the data source browser into the <emph>Recipient</emph> text field.</paragraph> +<paragraph role="paragraph" id="par_id3149514" xml-lang="en-US"><ahelp hid="cui/ui/hyperlinkmailpage/adressbook">Hides or shows the <emph>data source</emph> browser.</ahelp> Drag the receiver's <emph>Email</emph> data field from the data source browser into the <emph>Recipient</emph> text field.</paragraph> <bookmark xml-lang="en-US" branch="hid/cui/ui/hyperlinkmailpage/subject" id="bm_id3154852" localize="false"/><h3 id="hd_id3153332">Subject</h3> <paragraph role="paragraph" id="par_id3153821" xml-lang="en-US"><ahelp hid="cui/ui/hyperlinkmailpage/subject">Specifies the <emph>subject</emph> that is inserted in the subject line of the new message document.</ahelp></paragraph> <embed href="text/shared/02/09070100.xhp#further_settings"/> diff --git a/source/text/shared/autopi/01110400.xhp b/source/text/shared/autopi/01110400.xhp index f606579cdc..56d0b083d9 100644 --- a/source/text/shared/autopi/01110400.xhp +++ b/source/text/shared/autopi/01110400.xhp @@ -44,8 +44,8 @@ <paragraph role="heading" id="hd_id3155941" xml-lang="en-US" level="3">Author</paragraph> <paragraph role="paragraph" id="par_id3154288" xml-lang="en-US"><ahelp hid="modules/simpress/ui/publishingdialog/authorEntry">Specifies the name of the publication's author.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/modules/simpress/ui/publishingdialog/emailEntry" id="bm_id3145346" localize="false"/> -<paragraph role="heading" id="hd_id3147089" xml-lang="en-US" level="3">E-mail address</paragraph> -<paragraph role="paragraph" id="par_id3166460" xml-lang="en-US"><ahelp hid="modules/simpress/ui/publishingdialog/emailEntry">Specifies the e-mail address.</ahelp></paragraph> +<paragraph role="heading" id="hd_id3147089" xml-lang="en-US" level="3">Email address</paragraph> +<paragraph role="paragraph" id="par_id3166460" xml-lang="en-US"><ahelp hid="modules/simpress/ui/publishingdialog/emailEntry">Specifies the email address.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/modules/simpress/ui/publishingdialog/wwwEntry" id="bm_id3163803" localize="false"/> <paragraph role="heading" id="hd_id3147242" xml-lang="en-US" level="3">Your homepage</paragraph> <paragraph role="paragraph" id="par_id3150355" xml-lang="en-US"><ahelp hid="modules/simpress/ui/publishingdialog/wwwEntry">Specifies your homepage. A hyperlink will be inserted in the publication.</ahelp></paragraph> diff --git a/source/text/shared/explorer/database/menufile.xhp b/source/text/shared/explorer/database/menufile.xhp index 506c4fe2ff..16d5086850 100644 --- a/source/text/shared/explorer/database/menufile.xhp +++ b/source/text/shared/explorer/database/menufile.xhp @@ -42,11 +42,11 @@ <paragraph role="paragraph" id="par_idN105EE" xml-lang="en-US">Exports the selected report or form to a text document. A dynamic report is exported as a copy of the database contents at the time of export.</paragraph> <paragraph role="heading" id="par_idN105F1" xml-lang="en-US" level="2">Send</paragraph> <paragraph role="paragraph" id="par_idN105F5" xml-lang="en-US">Opens a submenu.</paragraph> -<paragraph role="heading" id="par_idN105F8" xml-lang="en-US" level="3">E-mail Document</paragraph> -<paragraph role="paragraph" id="par_idN105FC" xml-lang="en-US">Opens the default e-mail application to send a new e-mail. The current database file is appended as an attachment. You can enter the subject, the recipients and a mail body.</paragraph> +<paragraph role="heading" id="par_idN105F8" xml-lang="en-US" level="3">Email Document</paragraph> +<paragraph role="paragraph" id="par_idN105FC" xml-lang="en-US">Opens the default email application to send a new email. The current database file is appended as an attachment. You can enter the subject, the recipients and a mail body.</paragraph> <bookmark xml-lang="en-US" branch="hid/.uno:DBSendReportAsMail" id="bm_id4928739" localize="false"/> -<paragraph role="heading" id="par_idN105FF" xml-lang="en-US" level="3">Report as E-mail</paragraph> -<paragraph role="paragraph" id="par_idN10603" xml-lang="en-US"><ahelp hid=".">Opens the default e-mail application to send a new e-mail. The selected report is appended as an attachment. You can enter the subject, the recipients and a mail body. A dynamic report is exported as a copy of the database contents at the time of export.</ahelp></paragraph> +<paragraph role="heading" id="par_idN105FF" xml-lang="en-US" level="3">Report as Email</paragraph> +<paragraph role="paragraph" id="par_idN10603" xml-lang="en-US"><ahelp hid=".">Opens the default email application to send a new email. The selected report is appended as an attachment. You can enter the subject, the recipients and a mail body. A dynamic report is exported as a copy of the database contents at the time of export.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/.uno:DBSendReportToWriter" id="bm_id1669362" localize="false"/> <paragraph role="heading" id="par_idN10606" xml-lang="en-US" level="3">Report to Text Document</paragraph> <paragraph role="paragraph" id="par_idN1060A" xml-lang="en-US"><ahelp hid=".">Exports the selected report to a text document. A dynamic report is exported as a copy of the database contents at the time of export.</ahelp></paragraph> diff --git a/source/text/shared/guide/data_tables.xhp b/source/text/shared/guide/data_tables.xhp index d69af41a4d..3e68c6aa6e 100644 --- a/source/text/shared/guide/data_tables.xhp +++ b/source/text/shared/guide/data_tables.xhp @@ -36,7 +36,7 @@ </bookmark><comment>mw changed" database tables;" to "tables in databases;"</comment> <paragraph role="heading" id="par_idN105F9" xml-lang="en-US" level="1"><variable id="data_tables"><link href="text/shared/guide/data_tables.xhp">Working with Tables</link> </variable></paragraph> -<paragraph role="paragraph" id="par_idN10617" xml-lang="en-US">Data is stored in tables. As an example, your system address book that you use for your e-mail addresses is a table of the address book database. Each address is a data record, presented as a row in that table. The data records consist of data fields, for example the first and the last name fields and the e-mail field.</paragraph> +<paragraph role="paragraph" id="par_idN10617" xml-lang="en-US">Data is stored in tables. As an example, your system address book that you use for your email addresses is a table of the address book database. Each address is a data record, presented as a row in that table. The data records consist of data fields, for example the first and the last name fields and the email field.</paragraph> <paragraph role="heading" id="par_idN1061A" xml-lang="en-US" level="2">Creating a New Table With the Table Wizard</paragraph> <paragraph role="paragraph" id="par_idN1061E" xml-lang="en-US">In %PRODUCTNAME you can create a new table using the <link href="text/shared/explorer/database/tablewizard00.xhp">Table Wizard</link>:</paragraph> <list type="ordered"> diff --git a/source/text/shared/guide/digital_signatures.xhp b/source/text/shared/guide/digital_signatures.xhp index 188cd8c148..382b9abc24 100644 --- a/source/text/shared/guide/digital_signatures.xhp +++ b/source/text/shared/guide/digital_signatures.xhp @@ -94,7 +94,7 @@ <note id="par_id2008200911583098">When you load an ODF document, you might see an icon in the status bar and the status field in the dialog that indicates that the document is only partially signed. This status will appear when the signature and certificate are valid, but they were created with a version of OpenOffice.org before 3.2 or StarOffice before 9.2. In versions of OpenOffice.org before 3.0 or StarOffice before 9.0, the document signature was applied to the main contents, pictures and embedded objects only and some contents, like macros, were not signed. In OpenOffice.org 3.0 and StarOffice 9.0 the document signature was applied to most content, including macros. However, the mimetype and the content of the META-INF folder were not signed. And in OpenOffice.org 3.2, StarOffice 9.2, and all versions of LibreOffice all contents, except the signature file itself (META-INF/documentsignatures.xml), are signed.</note> <h2 id="hd_id9354228">Security Warnings</h2> <paragraph xml-lang="en-US" id="par_id2372508" role="paragraph">When you receive a signed document, and the software reports that the signature is valid, this does not mean that you can be absolutely sure that the document is the same that the sender has sent. Signing documents with software certificates is not a perfectly secure method. Numerous ways are possible to circumvent the security features.</paragraph> - <paragraph xml-lang="en-US" id="par_id7953123" role="paragraph">Example: Think about someone who wants to camouflage his identity to be a sender from your bank. He can easily get a certificate using a false name, then send you any signed e-mail pretending he is working for your bank. You will get that e-mail, and the e-mail or the document within has the "valid signed" icon. </paragraph> + <paragraph xml-lang="en-US" id="par_id7953123" role="paragraph">Example: Think about someone who wants to camouflage his identity to be a sender from your bank. He can easily get a certificate using a false name, then send you any signed email pretending he is working for your bank. You will get that email, and the email or the document within has the "valid signed" icon. </paragraph> <paragraph xml-lang="en-US" id="par_id6195257" role="paragraph">Do not trust the icon. Inspect and verify the certificates.</paragraph> <warning id="par_id8635517">The validation of a signature is not a legally binding guarantee of any kind.</warning> <paragraph xml-lang="en-US" id="par_id6075624" role="paragraph">On Windows operating systems, the Windows features of validating a signature are used. On Solaris and Linux systems, files that are supplied by Thunderbird, Mozilla or Firefox are used. You must ensure that the files that are in use within your system are really the original files that were supplied by the original developers. For malevolent intruders, there are numerous ways to replace original files with other files that they supply.</paragraph> diff --git a/source/text/shared/guide/email.xhp b/source/text/shared/guide/email.xhp index 0bdbbeabca..3c7907f491 100644 --- a/source/text/shared/guide/email.xhp +++ b/source/text/shared/guide/email.xhp @@ -24,34 +24,34 @@ <helpdocument version="1.0"> <meta> <topic id="textsharedguideemailxml" indexer="include" status="PUBLISH"> -<title id="tit" xml-lang="en-US">Sending Documents as E-mail</title> +<title id="tit" xml-lang="en-US">Sending Documents as Email</title> <filename>/text/shared/guide/email.xhp</filename> </topic> </meta> <body> <section id="chapter_all"> -<bookmark xml-lang="en-US" branch="index" id="bm_id3153345"><bookmark_value>documents; sending as e-mail</bookmark_value> -<bookmark_value>sending; documents as e-mail</bookmark_value> -<bookmark_value>e-mail attachments</bookmark_value> -<bookmark_value>files; sending as e-mail</bookmark_value> -<bookmark_value>text documents;sending as e-mail</bookmark_value> -<bookmark_value>spreadsheets; sending as e-mail</bookmark_value> -<bookmark_value>drawings; sending as e-mail</bookmark_value> -<bookmark_value>presentations; sending as e-mail</bookmark_value> -<bookmark_value>attachments in e-mails</bookmark_value> +<bookmark xml-lang="en-US" branch="index" id="bm_id3153345"><bookmark_value>documents; sending as email</bookmark_value> +<bookmark_value>sending; documents as email</bookmark_value> +<bookmark_value>email attachments</bookmark_value> +<bookmark_value>files; sending as email</bookmark_value> +<bookmark_value>text documents;sending as email</bookmark_value> +<bookmark_value>spreadsheets; sending as email</bookmark_value> +<bookmark_value>drawings; sending as email</bookmark_value> +<bookmark_value>presentations; sending as email</bookmark_value> +<bookmark_value>attachments in emails</bookmark_value> </bookmark> -<paragraph role="heading" id="hd_id3153345" xml-lang="en-US" level="1"><variable id="email"><link href="text/shared/guide/email.xhp" name="Sending Documents as E-mail">Sending Documents as E-mail</link></variable></paragraph> -<paragraph role="paragraph" id="par_id3154897" xml-lang="en-US">Working in $[officename], you can send the current document as an e-mail attachment.</paragraph> +<paragraph role="heading" id="hd_id3153345" xml-lang="en-US" level="1"><variable id="email"><link href="text/shared/guide/email.xhp" name="Sending Documents as Email">Sending Documents as Email</link></variable></paragraph> +<paragraph role="paragraph" id="par_id3154897" xml-lang="en-US">Working in $[officename], you can send the current document as an email attachment.</paragraph> <list type="ordered"> <listitem> <paragraph role="listitem" id="par_id3147335" xml-lang="en-US">Choose <emph>File - Send - Email Document</emph>.</paragraph> <paragraph role="listitem" id="par_id3153127" xml-lang="en-US">$[officename] opens your default email program.<switchinline select="sys"><caseinline select="UNIX"> If you want to send the current document with another email program, you can select the program to use with <emph>Internet - Email</emph> in the Options dialog box.</caseinline></switchinline></paragraph> </listitem> <listitem> -<paragraph role="listitem" id="par_id3150986" xml-lang="en-US">In your e-mail program, enter the recipient, subject and any text you want to add, then send the e-mail.</paragraph> +<paragraph role="listitem" id="par_id3150986" xml-lang="en-US">In your email program, enter the recipient, subject and any text you want to add, then send the email.</paragraph> </listitem> </list> -<paragraph role="tip" id="par_id3595385" xml-lang="en-US">In case you want to send the e-mail to a recipient who only has software that cannot read the OpenDocument format, you can send the current document in an often used proprietary format.<br/>For a text document, choose <item type="menuitem">File - Send - E-mail as Microsoft Word</item>. For a spreadsheet, choose <item type="menuitem">File - Send - E-mail as Microsoft Excel</item>. And for a presentation, choose <item type="menuitem">File - Send - E-mail as Microsoft PowerPoint</item>. <br/>If you want to send the document as a read-only file, choose <item type="menuitem">File - Send - E-mail as PDF</item>.<br/>These commands do not change your current document. Only a temporary copy is created and sent.</paragraph> +<paragraph role="tip" id="par_id3595385" xml-lang="en-US">In case you want to send the email to a recipient who only has software that cannot read the OpenDocument format, you can send the current document in an often used proprietary format.<br/>For a text document, choose <item type="menuitem">File - Send - Email as Microsoft Word</item>. For a spreadsheet, choose <item type="menuitem">File - Send - Email as Microsoft Excel</item>. And for a presentation, choose <item type="menuitem">File - Send - Email as Microsoft PowerPoint</item>. <br/>If you want to send the document as a read-only file, choose <item type="menuitem">File - Send - Email as PDF</item>.<br/>These commands do not change your current document. Only a temporary copy is created and sent.</paragraph> </section> <embed href="text/shared/00/00000004.xhp#related"/> <embed href="text/shared/guide/doc_save.xhp#doc_save"/> diff --git a/source/text/shared/guide/error_report.xhp b/source/text/shared/guide/error_report.xhp index db71905d66..9f3744a0f1 100644 --- a/source/text/shared/guide/error_report.xhp +++ b/source/text/shared/guide/error_report.xhp @@ -48,7 +48,7 @@ <paragraph id="hd_id3159399" role="heading" level="2" xml-lang="en-US">Sending the Error Report</paragraph> <paragraph id="par_id3150504" role="paragraph" xml-lang="en-US">The Error Report Tool uses the HTTP PUT / SOAP protocol to send the report data. You may optionally enter some descriptive text that will help us to identify the context of the program crash. Then click the <emph>Send</emph> button.</paragraph> <paragraph id="par_id3149670" role="warning" xml-lang="en-US">You will not get an answer to your error report. If you need support, please visit the <link href="text/shared/main0108.xhp">support forum</link> on the Internet.</paragraph> -<paragraph id="par_id3153526" role="paragraph" xml-lang="en-US">You may choose to respond to questions that the developers may have about the reported error. Mark the check box if you want to be contacted by e-mail, should additional information be required. By default this box is not marked, so you will not get any e-mail.</paragraph> +<paragraph id="par_id3153526" role="paragraph" xml-lang="en-US">You may choose to respond to questions that the developers may have about the reported error. Mark the check box if you want to be contacted by email, should additional information be required. By default this box is not marked, so you will not get any email.</paragraph> <paragraph id="hd_id3150792" role="heading" level="2" xml-lang="en-US">What Data is Sent?</paragraph> <paragraph id="par_id3154366" role="paragraph" xml-lang="en-US">The error report consists of several files. The main file contains information about the error type, operating system name and version, memory usage, and the description that you entered. You can click the <emph>Show Report</emph> button on the main dialog of the Error Report Tool to view what will get sent in the main file.</paragraph> diff --git a/source/text/shared/guide/redlining.xhp b/source/text/shared/guide/redlining.xhp index 1878c3454a..4cd60155b9 100644 --- a/source/text/shared/guide/redlining.xhp +++ b/source/text/shared/guide/redlining.xhp @@ -39,7 +39,7 @@ <paragraph xml-lang="en-US" id="par_id3153681" role="paragraph">When several authors are working on the same text or spreadsheet, the review function records and displays who made the various changes. On the final edit of the document, it is then possible to look at each individual change and decide whether it should be accepted or rejected.</paragraph> <paragraph xml-lang="en-US" id="par_id3147008" role="paragraph">For example: You are an editor and are delivering your latest report. But before publication the report must be read by the senior editor and the proofreader, and both will add their changes. The senior editor writes "clarify" after one paragraph and crosses out another entirely. The proofreader corrects the spelling of your document.</paragraph> <paragraph xml-lang="en-US" id="par_id3150774" role="paragraph">The edited document comes back to you, and you can incorporate or ignore the suggestions of the two reviewers.</paragraph> - <paragraph xml-lang="en-US" id="par_id3146957" role="paragraph">Let's say you also e-mailed a copy of the report to a good friend and colleague who has done research on a similar topic in the past. You asked for a few suggestions, and the document is now returned by e-mail with your colleague's suggestions.</paragraph> + <paragraph xml-lang="en-US" id="par_id3146957" role="paragraph">Let's say you also emailed a copy of the report to a good friend and colleague who has done research on a similar topic in the past. You asked for a few suggestions, and the document is now returned by email with your colleague's suggestions.</paragraph> <paragraph xml-lang="en-US" id="par_id3147088" role="paragraph">As all your colleagues and the managers in your company work with $[officename], you can produce a final version of the document from the results you get back.</paragraph> <embed href="text/shared/00/00000004.xhp#related"/> <switch select="appl"> diff --git a/source/text/shared/optionen/01010100.xhp b/source/text/shared/optionen/01010100.xhp index 9885787c28..f06ad003ea 100644 --- a/source/text/shared/optionen/01010100.xhp +++ b/source/text/shared/optionen/01010100.xhp @@ -128,8 +128,8 @@ <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/privateuserpage/email" id="bm_id3149379" localize="false"/> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/businessdatapage/email" id="bm_id3145647" localize="false"/> <bookmark xml-lang="en-US" branch="hid/cui/ui/optuserpage/email" id="bm_id3149410" localize="false"/> -<paragraph role="heading" id="hd_id3150592" xml-lang="en-US" level="3">E-mail</paragraph> -<paragraph role="paragraph" id="par_id3154942" xml-lang="en-US"><ahelp hid=".">Type your e-mail address.</ahelp> For example, my.name@my.provider.com</paragraph> +<paragraph role="heading" id="hd_id3150592" xml-lang="en-US" level="3">Email</paragraph> +<paragraph role="paragraph" id="par_id3154942" xml-lang="en-US"><ahelp hid=".">Type your email address.</ahelp> For example, my.name@my.provider.com</paragraph> </section> <h2 id="hd_id61543592770503">Cryptography</h2> <section id="cryptointro"> diff --git a/source/text/shared/optionen/01020300.xhp b/source/text/shared/optionen/01020300.xhp index 925c709c7a..4f9e014340 100644 --- a/source/text/shared/optionen/01020300.xhp +++ b/source/text/shared/optionen/01020300.xhp @@ -24,23 +24,23 @@ <helpdocument version="1.0"> <meta> <topic id="textsharedoptionen01020300xhp" indexer="exclude" status="PUBLISH"> -<title id="tit" xml-lang="en-US">E-mail</title> +<title id="tit" xml-lang="en-US">Email</title> <filename>/text/shared/optionen/01020300.xhp</filename> </topic> </meta> <body> <section id="email"> -<paragraph role="heading" id="par_idN1054D" xml-lang="en-US" level="1"><link href="text/shared/optionen/01020300.xhp">E-mail</link></paragraph> +<paragraph role="heading" id="par_idN1054D" xml-lang="en-US" level="1"><link href="text/shared/optionen/01020300.xhp">Email</link></paragraph> </section> <bookmark xml-lang="en-US" branch="hid/cui/ui/optemailpage/OptEmailPage" id="bm_id7723015" localize="false"/> <bookmark xml-lang="en-US" branch="hid/cui/ui/optemailpage/@@nowidget@@" id="bm_id7723015" localize="false"/> -<paragraph role="paragraph" id="par_idN1056B" xml-lang="en-US">On UNIX systems, specifies the e-mail program to use when you send the current document as e-mail.</paragraph> +<paragraph role="paragraph" id="par_idN1056B" xml-lang="en-US">On UNIX systems, specifies the email program to use when you send the current document as email.</paragraph> <switch select="sys"> <case select="UNIX"> -<bookmark xml-lang="en-US" branch="hid/cui/ui/optemailpage/url" id="bm_id7723014" localize="false"/><paragraph role="heading" id="par_idN10576" xml-lang="en-US" level="2">E-mail program</paragraph> -<paragraph role="paragraph" id="par_idN1057A" xml-lang="en-US"><ahelp hid="cui/ui/optemailpage/url">Enter the e-mail program path and name.</ahelp></paragraph> +<bookmark xml-lang="en-US" branch="hid/cui/ui/optemailpage/url" id="bm_id7723014" localize="false"/><paragraph role="heading" id="par_idN10576" xml-lang="en-US" level="2">Email program</paragraph> +<paragraph role="paragraph" id="par_idN1057A" xml-lang="en-US"><ahelp hid="cui/ui/optemailpage/url">Enter the email program path and name.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/cui/ui/optemailpage/browse" id="bm_id3655507" localize="false"/><paragraph role="heading" id="par_idN10591" xml-lang="en-US" level="2">Browse</paragraph> -<paragraph role="paragraph" id="par_idN10595" xml-lang="en-US"><ahelp hid="cui/ui/optemailpage/browse">Opens a file dialog to select the e-mail program.</ahelp></paragraph> +<paragraph role="paragraph" id="par_idN10595" xml-lang="en-US"><ahelp hid="cui/ui/optemailpage/browse">Opens a file dialog to select the email program.</ahelp></paragraph> </case> </switch></body> </helpdocument> diff --git a/source/text/shared/optionen/mailmerge.xhp b/source/text/shared/optionen/mailmerge.xhp index e51a1e2780..d87d18c4f8 100644 --- a/source/text/shared/optionen/mailmerge.xhp +++ b/source/text/shared/optionen/mailmerge.xhp @@ -22,7 +22,7 @@ <helpdocument version="1.0"> <meta> <topic id="textsharedoptionenmailmergexhp" indexer="include" status="PUBLISH"> -<title id="tit" xml-lang="en-US">Mail Merge E-mail</title> +<title id="tit" xml-lang="en-US">Mail Merge Email</title> <filename>/text/shared/optionen/mailmerge.xhp</filename> </topic> <history> @@ -33,28 +33,28 @@ <section id="mailmerge"> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mailconfigpage/MailConfigPage" id="bm_id3323771" localize="false"/> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mailconfigpage/@@nowidget@@" id="@@nowidget@@" localize="false"/> -<paragraph role="heading" id="par_idN10554" xml-lang="en-US" level="1"><link href="text/shared/optionen/mailmerge.xhp">Mail Merge E-mail</link></paragraph> -<paragraph role="paragraph" id="par_idN10564" xml-lang="en-US"><ahelp hid=".">Specifies the user information and server settings for when you send form letters as e-mail messages.</ahelp></paragraph> +<paragraph role="heading" id="par_idN10554" xml-lang="en-US" level="1"><link href="text/shared/optionen/mailmerge.xhp">Mail Merge Email</link></paragraph> +<paragraph role="paragraph" id="par_idN10564" xml-lang="en-US"><ahelp hid=".">Specifies the user information and server settings for when you send form letters as email messages.</ahelp></paragraph> </section> <section id="howtoget"> <embed href="text/shared/00/00000406.xhp#mailmergeemail"/> </section> <paragraph role="heading" id="par_idN1057B" xml-lang="en-US" level="2">User information</paragraph> -<paragraph role="paragraph" id="par_idN1057F" xml-lang="en-US">Enter the user information to use when you send e-mail.</paragraph> +<paragraph role="paragraph" id="par_idN1057F" xml-lang="en-US">Enter the user information to use when you send email.</paragraph> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mailconfigpage/displayname" id="bm_id3323770" localize="false"/> <paragraph role="heading" id="par_idN1058A" xml-lang="en-US" level="3">Your name</paragraph> <paragraph role="paragraph" id="par_idN1058E" xml-lang="en-US"><ahelp hid=".">Enter your name.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mailconfigpage/address" id="bm_id5569627" localize="false"/> -<paragraph role="heading" id="par_idN105A5" xml-lang="en-US" level="3">E-mail address</paragraph> -<paragraph role="paragraph" id="par_idN105A9" xml-lang="en-US"><ahelp hid=".">Enter your e-mail address for replies.</ahelp></paragraph> +<paragraph role="heading" id="par_idN105A5" xml-lang="en-US" level="3">Email address</paragraph> +<paragraph role="paragraph" id="par_idN105A9" xml-lang="en-US"><ahelp hid=".">Enter your email address for replies.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mailconfigpage/replytocb" id="bm_id8856166" localize="false"/> -<paragraph role="heading" id="par_idN105C0" xml-lang="en-US" level="3">Send replies to different e-mail address</paragraph> -<paragraph role="paragraph" id="par_idN105C4" xml-lang="en-US"><ahelp hid=".">Uses the e-mail address that you enter in the Reply address text box as the reply-to e-mail address.</ahelp></paragraph> +<paragraph role="heading" id="par_idN105C0" xml-lang="en-US" level="3">Send replies to different email address</paragraph> +<paragraph role="paragraph" id="par_idN105C4" xml-lang="en-US"><ahelp hid=".">Uses the email address that you enter in the Reply address text box as the reply-to email address.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mailconfigpage/replyto" id="bm_id2134769" localize="false"/> <paragraph role="heading" id="par_idN105DB" xml-lang="en-US" level="3">Reply address</paragraph> -<paragraph role="paragraph" id="par_idN105DF" xml-lang="en-US"><ahelp hid=".">Enter the address to use for e-mail replies.</ahelp></paragraph> +<paragraph role="paragraph" id="par_idN105DF" xml-lang="en-US"><ahelp hid=".">Enter the address to use for email replies.</ahelp></paragraph> <paragraph role="heading" id="par_idN105EE" xml-lang="en-US" level="2">Outgoing server (SMTP) settings</paragraph> -<paragraph role="paragraph" id="par_idN105F2" xml-lang="en-US">Specify the server settings for outgoing e-mails.</paragraph> +<paragraph role="paragraph" id="par_idN105F2" xml-lang="en-US">Specify the server settings for outgoing emails.</paragraph> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mailconfigpage/server" id="bm_id7700735" localize="false"/> <paragraph role="heading" id="par_idN105FD" xml-lang="en-US" level="3">Server name</paragraph> <paragraph role="paragraph" id="par_idN10601" xml-lang="en-US"><ahelp hid=".">Enter the SMTP server name.</ahelp></paragraph> @@ -63,10 +63,10 @@ <paragraph role="paragraph" id="par_idN1061C" xml-lang="en-US"><ahelp hid=".">Enter the SMTP port.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mailconfigpage/secure" id="bm_id72634" localize="false"/> <paragraph role="heading" id="par_idN10633" xml-lang="en-US" level="2">Use secure connection</paragraph> -<paragraph role="paragraph" id="par_idN10637" xml-lang="en-US"><ahelp hid=".">When available, uses a secure connection to send e-mails.</ahelp></paragraph> +<paragraph role="paragraph" id="par_idN10637" xml-lang="en-US"><ahelp hid=".">When available, uses a secure connection to send emails.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mailconfigpage/serverauthentication" id="bm_id611896" localize="false"/> <paragraph role="heading" id="par_idN1064E" xml-lang="en-US" level="2">Server Authentication</paragraph> -<paragraph role="paragraph" id="par_idN10652" xml-lang="en-US"><ahelp hid=".">Opens the <link href="text/shared/optionen/serverauthentication.xhp">Server Authentication</link> dialog where you can specify the server authentication settings for secure e-mail.</ahelp></paragraph> +<paragraph role="paragraph" id="par_idN10652" xml-lang="en-US"><ahelp hid=".">Opens the <link href="text/shared/optionen/serverauthentication.xhp">Server Authentication</link> dialog where you can specify the server authentication settings for secure email.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mailconfigpage/test" id="bm_id926847" localize="false"/> <paragraph role="heading" id="par_idN10677" xml-lang="en-US" level="2">Test Settings</paragraph> <paragraph role="paragraph" id="par_idN1067B" xml-lang="en-US"><ahelp hid=".">Opens the <link href="text/shared/optionen/testaccount.xhp">Test Account Settings</link> dialog to test the current settings.</ahelp></paragraph> diff --git a/source/text/shared/optionen/serverauthentication.xhp b/source/text/shared/optionen/serverauthentication.xhp index 0f061730c3..99f89a9392 100644 --- a/source/text/shared/optionen/serverauthentication.xhp +++ b/source/text/shared/optionen/serverauthentication.xhp @@ -30,10 +30,10 @@ <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/authenticationsettingsdialog/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/authenticationsettingsdialog/AuthenticationSettingsDialog" id="bm_id4849086" localize="false"/> <paragraph role="heading" id="par_idN1053E" xml-lang="en-US" level="1"><link href="text/shared/optionen/serverauthentication.xhp">Server Authentication</link></paragraph> -<paragraph role="paragraph" id="par_idN1054E" xml-lang="en-US">On the <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/mailmerge.xhp">%PRODUCTNAME Writer - Mail Merge E-mail</link> tab page, click the <emph>Server Authentication</emph> button to specify the server security settings.</paragraph> +<paragraph role="paragraph" id="par_idN1054E" xml-lang="en-US">On the <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/mailmerge.xhp">%PRODUCTNAME Writer - Mail Merge Email</link> tab page, click the <emph>Server Authentication</emph> button to specify the server security settings.</paragraph> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/authenticationsettingsdialog/authentication" id="bm_id4849085" localize="false"/> <paragraph role="heading" id="par_idN10563" xml-lang="en-US" level="2">The outgoing mail server (SMTP) requires authentication</paragraph> -<paragraph role="paragraph" id="par_idN105BE" xml-lang="en-US"><ahelp hid=".">Enables the authentication that is required to send e-mail by SMTP.</ahelp></paragraph> +<paragraph role="paragraph" id="par_idN105BE" xml-lang="en-US"><ahelp hid=".">Enables the authentication that is required to send email by SMTP.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/authenticationsettingsdialog/separateauthentication" id="bm_id3792535" localize="false"/> <paragraph role="heading" id="par_idN105CD" xml-lang="en-US" level="3">The outgoing mail server (SMTP) requires separate authentication</paragraph> <paragraph role="paragraph" id="par_idN105D2" xml-lang="en-US"><ahelp hid=".">Select if your SMTP server requires a user name and password.</ahelp></paragraph> @@ -45,7 +45,7 @@ <paragraph role="paragraph" id="par_idN10602" xml-lang="en-US"><ahelp hid=".">Enter the password for the user name.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/authenticationsettingsdialog/smtpafterpop" id="bm_id3506881" localize="false"/> <paragraph role="heading" id="par_idN10615" xml-lang="en-US" level="3">The outgoing mail server uses the same authentication as the incoming mail server.</paragraph> -<paragraph role="paragraph" id="par_idN1061A" xml-lang="en-US"><ahelp hid=".">Select if you are required to first read your e-mail before you can send e-mail.</ahelp> This method is also called "SMTP after POP3".</paragraph> +<paragraph role="paragraph" id="par_idN1061A" xml-lang="en-US"><ahelp hid=".">Select if you are required to first read your email before you can send email.</ahelp> This method is also called "SMTP after POP3".</paragraph> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/authenticationsettingsdialog/server" id="bm_id9126255" localize="false"/> <paragraph role="heading" id="par_idN10629" xml-lang="en-US" level="4">Server name</paragraph> <paragraph role="paragraph" id="par_idN1062C" xml-lang="en-US"><ahelp hid=".">Enter the server name of your POP 3 or IMAP mail server.</ahelp></paragraph> diff --git a/source/text/shared/optionen/testaccount.xhp b/source/text/shared/optionen/testaccount.xhp index 9ff89f58ea..9c5cef74a8 100644 --- a/source/text/shared/optionen/testaccount.xhp +++ b/source/text/shared/optionen/testaccount.xhp @@ -30,7 +30,7 @@ <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/testmailsettings/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/testmailsettings/TestMailSettings" id="bm_id3895380" localize="false"/> <paragraph role="heading" id="par_idN10547" xml-lang="en-US" level="1"><link href="text/shared/optionen/testaccount.xhp">Test Account Settings</link></paragraph> -<paragraph role="paragraph" id="par_idN10557" xml-lang="en-US">When you enter settings on the <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/mailmerge.xhp">%PRODUCTNAME Writer - Mail Merge E-mail</link> tab page, you can click the <emph>Test Settings</emph> button to test your settings.</paragraph> +<paragraph role="paragraph" id="par_idN10557" xml-lang="en-US">When you enter settings on the <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/mailmerge.xhp">%PRODUCTNAME Writer - Mail Merge Email</link> tab page, you can click the <emph>Test Settings</emph> button to test your settings.</paragraph> <paragraph role="heading" id="par_idN10574" xml-lang="en-US" level="2">(Results list box)</paragraph> <paragraph role="paragraph" id="par_idN10578" xml-lang="en-US">In the top list box you will see the results of the test session.</paragraph> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/testmailsettings/errors" id="bm_id3895382" localize="false"/> diff --git a/source/text/swriter/01/04090200.xhp b/source/text/swriter/01/04090200.xhp index 7877b2a4bb..c5b2343b92 100644 --- a/source/text/swriter/01/04090200.xhp +++ b/source/text/swriter/01/04090200.xhp @@ -266,7 +266,7 @@ <paragraph xml-lang="en-US" id="par_id3153390" role="tablecontent">user_email</paragraph> </tablecell> <tablecell> - <paragraph xml-lang="en-US" id="par_id3154948" role="tablecontent">E-mail address</paragraph> + <paragraph xml-lang="en-US" id="par_id3154948" role="tablecontent">Email address</paragraph> </tablecell> </tablerow> <tablerow> diff --git a/source/text/swriter/01/mailmerge00.xhp b/source/text/swriter/01/mailmerge00.xhp index daa3b34deb..e4257df380 100644 --- a/source/text/swriter/01/mailmerge00.xhp +++ b/source/text/swriter/01/mailmerge00.xhp @@ -33,7 +33,7 @@ <bookmark xml-lang="en-US" branch="hid/.uno:MailMergeWizard" id="bm_id6627657" localize="false"/> <bookmark xml-lang="en-US" branch="hid/.uno:MergeDialog" id="bm_id9926450" localize="false"/> <paragraph role="heading" id="par_idN10549" xml-lang="en-US" level="1"><link href="text/swriter/01/mailmerge00.xhp">Mail Merge Wizard</link></paragraph> -<paragraph role="paragraph" id="par_idN10559" xml-lang="en-US"><ahelp hid=".">Starts the Mail Merge Wizard to create form letters or send e-mail messages to many recipients.</ahelp></paragraph> +<paragraph role="paragraph" id="par_idN10559" xml-lang="en-US"><ahelp hid=".">Starts the Mail Merge Wizard to create form letters or send email messages to many recipients.</ahelp></paragraph> </section> <section id="howtoget"> <embed href="text/swriter/00/00000406.xhp#mmwizard"/> diff --git a/source/text/swriter/01/mailmerge02.xhp b/source/text/swriter/01/mailmerge02.xhp index 440f211c2c..d7a9924b57 100644 --- a/source/text/swriter/01/mailmerge02.xhp +++ b/source/text/swriter/01/mailmerge02.xhp @@ -37,8 +37,8 @@ </section> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmoutputtypepage/letter" id="bm_id2589190" localize="false"/><paragraph role="heading" id="par_idN10556" xml-lang="en-US" level="2">Letter</paragraph> <paragraph role="paragraph" id="par_idN1055A" xml-lang="en-US"><ahelp hid=".">Creates a printable mail merge document.</ahelp></paragraph> -<paragraph role="heading" id="hd_id6954863" xml-lang="en-US" level="2">E-mail message</paragraph> -<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmoutputtypepage/email" id="bm_id3822443" localize="false"/><paragraph role="paragraph" id="par_idN10561" xml-lang="en-US"><ahelp hid=".">Creates mail merge documents that you can send as an e-mail message or an e-mail attachment.</ahelp></paragraph> +<paragraph role="heading" id="hd_id6954863" xml-lang="en-US" level="2">Email message</paragraph> +<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmoutputtypepage/email" id="bm_id3822443" localize="false"/><paragraph role="paragraph" id="par_idN10561" xml-lang="en-US"><ahelp hid=".">Creates mail merge documents that you can send as an email message or an email attachment.</ahelp></paragraph> <paragraph role="paragraph" id="par_idN10572" xml-lang="en-US">Next step: <link href="text/swriter/01/mailmerge03.xhp" name="Mail Merge Wizard - Addresses">Mail Merge Wizard - Addresses</link></paragraph> <section id="relatedtopics"> <paragraph role="paragraph" id="par_idN10568" xml-lang="en-US"><link href="text/swriter/01/mailmerge00.xhp">Mail Merge Wizard</link> overview</paragraph> diff --git a/source/text/swriter/01/mailmerge03.xhp b/source/text/swriter/01/mailmerge03.xhp index ec1edbacd9..cf72b32731 100644 --- a/source/text/swriter/01/mailmerge03.xhp +++ b/source/text/swriter/01/mailmerge03.xhp @@ -37,7 +37,7 @@ <paragraph role="paragraph" id="par_idN10553" xml-lang="en-US"><ahelp hid=".">Specify the recipients for the mail merge document as well as the layout of the address block.</ahelp></paragraph> </section> <paragraph role="note" id="par_idN10561" xml-lang="en-US">The Mail Merge wizard opens to this page if you start the wizard in a text document that already contains address database fields. If the wizard opens directly to this page, the <emph>Select Address List</emph> button is called <emph>Select Different Address List</emph>.</paragraph> -<paragraph role="note" id="par_idN10556" xml-lang="en-US">The title of this page is <emph>Insert address block</emph> for letters and <emph>Select address list</emph> for e-mail messages.</paragraph> +<paragraph role="note" id="par_idN10556" xml-lang="en-US">The title of this page is <emph>Insert address block</emph> for letters and <emph>Select address list</emph> for email messages.</paragraph> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmaddressblockpage/addresslist" id="bm_id8489028" localize="false"/> <paragraph role="heading" id="par_idN10568" xml-lang="en-US" level="2">Select Address List</paragraph> <paragraph role="paragraph" id="par_idN1056C" xml-lang="en-US"><ahelp hid=".">Opens the <link href="text/swriter/01/mm_seladdlis.xhp">Select Address List</link> dialog, where you can choose a data source for the addresses, add new addresses, or type in a new address list.</ahelp></paragraph> diff --git a/source/text/swriter/01/mm_copyto.xhp b/source/text/swriter/01/mm_copyto.xhp index fc34198bf7..e888d2ee9f 100644 --- a/source/text/swriter/01/mm_copyto.xhp +++ b/source/text/swriter/01/mm_copyto.xhp @@ -26,19 +26,19 @@ <filename>/text/swriter/01/mm_copyto.xhp</filename> </topic> <history> -<created date="2004-07-08T12:47:51">UFI: mail merge e-mail copy to dialog</created> +<created date="2004-07-08T12:47:51">UFI: mail merge email copy to dialog</created> </history> </meta> <body> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/ccdialog/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/ccdialog/CCDialog" id="bm_id2162235" localize="false"/> <paragraph role="heading" id="par_idN10539" xml-lang="en-US" level="1">Copy To</paragraph> -<paragraph role="paragraph" id="par_idN1053D" xml-lang="en-US">Specify additional e-mail recipients for the <link href="text/swriter/01/mm_emailmergeddoc.xhp">mail merge</link> document.</paragraph> +<paragraph role="paragraph" id="par_idN1053D" xml-lang="en-US">Specify additional email recipients for the <link href="text/swriter/01/mm_emailmergeddoc.xhp">mail merge</link> document.</paragraph> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/ccdialog/cc" id="bm_id2162236" localize="false"/> <paragraph role="heading" id="par_idN1054E" xml-lang="en-US" level="2">CC</paragraph> -<paragraph role="paragraph" id="par_idN10552" xml-lang="en-US"><ahelp hid=".">Enter the recipients of e-mail copies, separated by a semicolon (;).</ahelp></paragraph> +<paragraph role="paragraph" id="par_idN10552" xml-lang="en-US"><ahelp hid=".">Enter the recipients of email copies, separated by a semicolon (;).</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/ccdialog/bcc" id="bm_id3037202" localize="false"/> <paragraph role="heading" id="par_idN10555" xml-lang="en-US" level="2">BCC</paragraph> -<paragraph role="paragraph" id="par_idN10559" xml-lang="en-US"><ahelp hid=".">Enter the recipients of e-mail blind copies, separated by a semicolon (;).</ahelp></paragraph> +<paragraph role="paragraph" id="par_idN10559" xml-lang="en-US"><ahelp hid=".">Enter the recipients of email blind copies, separated by a semicolon (;).</ahelp></paragraph> </body> </helpdocument> diff --git a/source/text/swriter/01/mm_cusgrelin.xhp b/source/text/swriter/01/mm_cusgrelin.xhp index ecf7d39c77..2e22c7ffc4 100644 --- a/source/text/swriter/01/mm_cusgrelin.xhp +++ b/source/text/swriter/01/mm_cusgrelin.xhp @@ -33,7 +33,7 @@ <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/addressblockdialog/@@nowidget@@" id="bm_@@nowidget@@" localize="false"/> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/addressblockdialog/AddressBlockDialog" id="bm_id8578143" localize="false"/> <paragraph role="heading" id="par_idN1053C" xml-lang="en-US" level="1">Custom Salutation</paragraph> -<paragraph role="paragraph" id="par_idN10540" xml-lang="en-US">Specify the salutation layout for <link href="text/swriter/01/mailmerge04.xhp">mail merge</link> or <link href="text/swriter/01/mm_emabod.xhp">e-mail merge</link> documents. The name of this dialog is different for female recipients and male recipients.</paragraph> +<paragraph role="paragraph" id="par_idN10540" xml-lang="en-US">Specify the salutation layout for <link href="text/swriter/01/mailmerge04.xhp">mail merge</link> or <link href="text/swriter/01/mm_emabod.xhp">email merge</link> documents. The name of this dialog is different for female recipients and male recipients.</paragraph> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/addressblockdialog/addresses" id="bm_id8578142" localize="false"/> <paragraph role="heading" id="par_idN10551" xml-lang="en-US" level="2">Salutation elements</paragraph> <paragraph role="paragraph" id="par_idN10555" xml-lang="en-US"><ahelp hid=".">Select a field and drag the field to the other list.</ahelp></paragraph> diff --git a/source/text/swriter/01/mm_emabod.xhp b/source/text/swriter/01/mm_emabod.xhp index d4cbc638ef..4c6b64c05a 100644 --- a/source/text/swriter/01/mm_emabod.xhp +++ b/source/text/swriter/01/mm_emabod.xhp @@ -33,10 +33,10 @@ <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmmailbody/MailBodyDialog" id="bm_id495011" localize="false"/> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmmailbody/@@nowidget@@" id="@@nowidget@@" localize="false"/> <paragraph role="heading" id="par_idN1053C" xml-lang="en-US" level="1">E-Mail Message</paragraph> -<paragraph role="paragraph" id="par_idN10540" xml-lang="en-US"><ahelp hid=".">Type the message and the salutation for files that you send as <link href="text/swriter/01/mailmerge08.xhp">e-mail</link> attachments.</ahelp></paragraph> +<paragraph role="paragraph" id="par_idN10540" xml-lang="en-US"><ahelp hid=".">Type the message and the salutation for files that you send as <link href="text/swriter/01/mailmerge08.xhp">email</link> attachments.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmmailbody/greeting" id="bm_id1831110" localize="false"/> -<paragraph role="heading" id="par_idN10554" xml-lang="en-US" level="2">This e-mail should contain a salutation</paragraph> -<paragraph role="paragraph" id="par_idN10558" xml-lang="en-US"><ahelp hid=".">Adds a salutation to the e-mail.</ahelp></paragraph> +<paragraph role="heading" id="par_idN10554" xml-lang="en-US" level="2">This email should contain a salutation</paragraph> +<paragraph role="paragraph" id="par_idN10558" xml-lang="en-US"><ahelp hid=".">Adds a salutation to the email.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmmailbody/personalized" id="bm_id1831111" localize="false"/> <paragraph role="heading" id="par_idN1055B" xml-lang="en-US" level="3">Insert personalized salutation</paragraph> <paragraph role="paragraph" id="par_idN1055F" xml-lang="en-US"><ahelp hid=".">Adds a personalized salutation. To use the default salutation, clear this check box.</ahelp></paragraph> @@ -63,6 +63,6 @@ <paragraph role="paragraph" id="par_idN105AC" xml-lang="en-US"><ahelp hid=".">Select the default greeting to use if a personalized salutation cannot be created.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmmailbody/bodymle" id="bm_id495010" localize="false"/> <paragraph role="heading" id="par_idN105AF" xml-lang="en-US" level="3">Write your message here</paragraph> -<paragraph role="paragraph" id="par_idN105B3" xml-lang="en-US"><ahelp hid=".">Enter the main text of the e-mail.</ahelp></paragraph> +<paragraph role="paragraph" id="par_idN105B3" xml-lang="en-US"><ahelp hid=".">Enter the main text of the email.</ahelp></paragraph> </body> </helpdocument> diff --git a/source/text/swriter/01/mm_emailmergeddoc.xhp b/source/text/swriter/01/mm_emailmergeddoc.xhp index 38e0d7413d..21917bbd6a 100644 --- a/source/text/swriter/01/mm_emailmergeddoc.xhp +++ b/source/text/swriter/01/mm_emailmergeddoc.xhp @@ -20,7 +20,7 @@ <meta> <topic id="swriter01mm_emailmergeddocxml"> - <title id="tit" xml-lang="en-US">Send merged document as e-mail</title> + <title id="tit" xml-lang="en-US">Send merged document as email</title> <filename>/text/swriter/01/mm_emailmergeddoc.xhp</filename> </topic> </meta> @@ -32,15 +32,15 @@ <bookmark xml-lang="en-US" branch="hid/.uno:MailMergeEmailDocuments" id="bm_id201703192214544668" localize="false"/> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmresultemaildialog/@@nowidget@@" id="@@nowidget@@" localize="false"/> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmresultemaildialog/MMResultEmailDialog" id="bm_id201703192214544668" localize="false"/> -<paragraph id="hd_id201703192214041173" role="heading" level="1" xml-lang="en-US"><link href="text/swriter/01/mm_emailmergeddoc.xhp">Send merged document as e-mail</link></paragraph> -<paragraph id="par_id201703192214161498" role="paragraph" xml-lang="en-US"><ahelp hid=".">Sends the mail merge output as e-mail messages to all or some recipients.</ahelp></paragraph> +<paragraph id="hd_id201703192214041173" role="heading" level="1" xml-lang="en-US"><link href="text/swriter/01/mm_emailmergeddoc.xhp">Send merged document as email</link></paragraph> +<paragraph id="par_id201703192214161498" role="paragraph" xml-lang="en-US"><ahelp hid=".">Sends the mail merge output as email messages to all or some recipients.</ahelp></paragraph> </section> -<paragraph id="par_idN10556" role="heading" level="2" xml-lang="en-US">E-mail options</paragraph> +<paragraph id="par_idN10556" role="heading" level="2" xml-lang="en-US">Email options</paragraph> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmresultemaildialog/mailto" id="bm_id5152745" localize="false"/> <paragraph id="par_idN105E8" role="heading" level="3" xml-lang="en-US">To</paragraph> -<paragraph id="par_idN105EC" role="paragraph" xml-lang="en-US"><ahelp hid=".">Select the database field that contains the e-mail address of the recipient.</ahelp></paragraph> +<paragraph id="par_idN105EC" role="paragraph" xml-lang="en-US"><ahelp hid=".">Select the database field that contains the email address of the recipient.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmresultemaildialog/copyto" id="bm_id3541673" localize="false"/> <paragraph id="par_idN105EF" role="heading" level="3" xml-lang="en-US">Copy to</paragraph> @@ -48,16 +48,16 @@ <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmresultemaildialog/subject" id="bm_id5238196" localize="false"/> <paragraph id="par_idN10600" role="heading" level="3" xml-lang="en-US">Subject</paragraph> -<paragraph id="par_idN10604" role="paragraph" xml-lang="en-US"><ahelp hid=".">Enter the subject line for the e-mail messages.</ahelp></paragraph> +<paragraph id="par_idN10604" role="paragraph" xml-lang="en-US"><ahelp hid=".">Enter the subject line for the email messages.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmresultemaildialog/sendas" id="bm_id9405499" localize="false"/> <paragraph id="par_idN10607" role="heading" level="3" xml-lang="en-US">Send as</paragraph> -<paragraph id="par_idN1060B" role="paragraph" xml-lang="en-US"><ahelp hid=".">Select the mail format for the e-mail messages.</ahelp></paragraph> +<paragraph id="par_idN1060B" role="paragraph" xml-lang="en-US"><ahelp hid=".">Select the mail format for the email messages.</ahelp></paragraph> <paragraph id="par_idN1060E" role="note" xml-lang="en-US">The Plain text and HTML message formats are sent in the body of the message, whereas the *.odt, *.doc, and *.pdf formats are sent as attachments.</paragraph> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmresultemaildialog/sendassettings" id="bm_id2954496" localize="false"/> <paragraph id="par_idN10611" role="heading" level="3" xml-lang="en-US">Properties</paragraph> -<paragraph id="par_idN10615" role="paragraph" xml-lang="en-US"><ahelp hid=".">Opens the <link href="text/swriter/01/mm_emabod.xhp">E-Mail Message</link> dialog where you can enter the e-mail message for the mail merge files that are sent as attachments.</ahelp></paragraph> +<paragraph id="par_idN10615" role="paragraph" xml-lang="en-US"><ahelp hid=".">Opens the <link href="text/swriter/01/mm_emabod.xhp">E-Mail Message</link> dialog where you can enter the email message for the mail merge files that are sent as attachments.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmresultemaildialog/attach" id="bm_id8253730" localize="false"/> <paragraph id="par_idN10626" role="heading" level="3" xml-lang="en-US">Name of the attachment</paragraph> @@ -67,7 +67,7 @@ <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmresultemaildialog/sendallrb" id="bm_id8163090" localize="false"/> <paragraph id="par_idN1062D" role="heading" level="3" xml-lang="en-US">Send all documents</paragraph> -<paragraph id="par_idN10631" role="paragraph" xml-lang="en-US"><ahelp hid=".">Select to send e-mails to all recipients.</ahelp></paragraph> +<paragraph id="par_idN10631" role="paragraph" xml-lang="en-US"><ahelp hid=".">Select to send emails to all recipients.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmresultemaildialog/fromrb" id="bm_id941191" localize="false"/> @@ -84,7 +84,7 @@ <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmresultemaildialog/ok" id="bm_id425122" localize="false"/> <paragraph id="par_idN10642" role="heading" level="2" xml-lang="en-US">Send Documents</paragraph> -<paragraph id="par_idN10646" role="paragraph" xml-lang="en-US"><ahelp hid=".">Click to start sending e-mails.</ahelp></paragraph> +<paragraph id="par_idN10646" role="paragraph" xml-lang="en-US"><ahelp hid=".">Click to start sending emails.</ahelp></paragraph> </body> </helpdocument> diff --git a/source/text/swriter/guide/fields_userdata.xhp b/source/text/swriter/guide/fields_userdata.xhp index b8721564d5..bf74c016e5 100644 --- a/source/text/swriter/guide/fields_userdata.xhp +++ b/source/text/swriter/guide/fields_userdata.xhp @@ -207,7 +207,7 @@ <paragraph id="par_id3149806" role="code" xml-lang="en-US">user_email</paragraph> </tablecell> <tablecell> - <paragraph id="par_id3147294" role="paragraph" xml-lang="en-US">E-mail address</paragraph> + <paragraph id="par_id3147294" role="paragraph" xml-lang="en-US">Email address</paragraph> </tablecell> </tablerow> <tablerow> diff --git a/source/text/swriter/guide/form_letters_main.xhp b/source/text/swriter/guide/form_letters_main.xhp index 49c335298c..894d9ffafd 100644 --- a/source/text/swriter/guide/form_letters_main.xhp +++ b/source/text/swriter/guide/form_letters_main.xhp @@ -33,8 +33,8 @@ <paragraph xml-lang="en-US" id="hd_id3159257" role="heading" level="1"><variable id="form_letters"><variable id="form_letters_main"><link href="text/swriter/guide/form_letters_main.xhp" name="Creating a Form Letter">Creating a Form Letter</link> </variable> </variable></paragraph> - <paragraph xml-lang="en-US" id="par_id3150502" role="paragraph">To create a form letter, you need a text document that contains fields for address data, and an address database. Then you combine or merge the address data and the text document to either print the letters or send them by e-mail.</paragraph> - <paragraph xml-lang="en-US" id="par_id0805200801132382" role="note">If the document is in HTML format, any embedded or linked images will not be sent with the e-mail.</paragraph> + <paragraph xml-lang="en-US" id="par_id3150502" role="paragraph">To create a form letter, you need a text document that contains fields for address data, and an address database. Then you combine or merge the address data and the text document to either print the letters or send them by email.</paragraph> + <paragraph xml-lang="en-US" id="par_id0805200801132382" role="note">If the document is in HTML format, any embedded or linked images will not be sent with the email.</paragraph> <paragraph xml-lang="en-US" id="par_idN10653" role="paragraph">The <link href="text/swriter/01/mailmerge00.xhp">Mail Merge Wizard</link> helps you to create form letters.</paragraph> <paragraph xml-lang="en-US" id="par_idN10664" role="heading" level="1">To create a form letter</paragraph> <list type="ordered"> |