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>

8 files changed, 24 insertions, 24 deletions

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>