complete the univerbation of E-mail to Email in the ui

it now looks old-fashioned hyphenated

Change-Id: I5b2b905277356c1b986f97de29f82ac1c21b1709
Reviewed-on: https://gerrit.libreoffice.org/66796
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>

cui/inc/strings.hrc

@@ -77,7 +77,7 @@
 #define RID_SVXSTR_HYPERDLG_HLINETTP                NC_("RID_SVXSTR_HYPERDLG_HLINETTP", "Internet")
 #define RID_SVXSTR_HYPERDLG_HLINETTP_HELP           NC_("RID_SVXSTR_HYPERDLG_HLINETTP_HELP", "This is where you create a hyperlink to a Web page or FTP server connection.")
 #define RID_SVXSTR_HYPERDLG_HLMAILTP                NC_("RID_SVXSTR_HYPERDLG_HLMAILTP", "Mail")
-#define RID_SVXSTR_HYPERDLG_HLMAILTP_HELP           NC_("RID_SVXSTR_HYPERDLG_HLMAILTP_HELP", "This is where you create a hyperlink to an e-mail address.")
+#define RID_SVXSTR_HYPERDLG_HLMAILTP_HELP           NC_("RID_SVXSTR_HYPERDLG_HLMAILTP_HELP", "This is where you create a hyperlink to an email address.")
 #define RID_SVXSTR_HYPERDLG_HLDOCTP                 NC_("RID_SVXSTR_HYPERDLG_HLDOCTP", "Document")
 #define RID_SVXSTR_HYPERDLG_HLDOCTP_HELP            NC_("RID_SVXSTR_HYPERDLG_HLDOCTP_HELP", "This is where you create a hyperlink to an existing document or a target within a document.")
 #define RID_SVXSTR_HYPERDLG_HLDOCNTP                NC_("RID_SVXSTR_HYPERDLG_HLDOCNTP", "New Document")

cui/inc/treeopt.hrc

@@ -58,7 +58,7 @@ const std::pair<const char*, sal_uInt16> SID_INET_DLG_RES[] =
 {
     { NC_("SID_INET_DLG_RES", "Internet"), 0 },
     { NC_("SID_INET_DLG_RES", "Proxy"),  RID_SVXPAGE_INET_PROXY },
-    { NC_("SID_INET_DLG_RES", "E-mail"),  RID_SVXPAGE_INET_MAIL }
+    { NC_("SID_INET_DLG_RES", "Email"),  RID_SVXPAGE_INET_MAIL }
 };
 
 const std::pair<const char*, sal_uInt16> SID_SW_EDITOPTIONS_RES[] =
@@ -77,7 +77,7 @@ const std::pair<const char*, sal_uInt16> SID_SW_EDITOPTIONS_RES[] =
     { NC_("SID_SW_EDITOPTIONS_RES", "Comparison"), RID_SW_TP_COMPARISON_OPT  },
     { NC_("SID_SW_EDITOPTIONS_RES", "Compatibility"), RID_SW_TP_OPTCOMPATIBILITY_PAGE     },
     { NC_("SID_SW_EDITOPTIONS_RES", "AutoCaption"), RID_SW_TP_OPTCAPTION_PAGE  },
-    { NC_("SID_SW_EDITOPTIONS_RES", "Mail Merge E-mail"), RID_SW_TP_MAILCONFIG }
+    { NC_("SID_SW_EDITOPTIONS_RES", "Mail Merge Email"), RID_SW_TP_MAILCONFIG }
 };
 
 const std::pair<const char*, sal_uInt16> SID_SW_ONLINEOPTIONS_RES[] =

cui/uiconfig/ui/optemailpage.ui

@@ -23,7 +23,7 @@
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="optemailpage|label2">_E-mail program:</property>
+                <property name="label" translatable="yes" context="optemailpage|label2">_Email program:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">url</property>
               </object>
@@ -164,7 +164,7 @@
       <object class="GtkLabel" id="label1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes" context="optemailpage|label1">Sending Documents as E-mail Attachments</property>
+        <property name="label" translatable="yes" context="optemailpage|label1">Sending Documents as Email Attachments</property>
         <attributes>
           <attribute name="weight" value="bold"/>
         </attributes>

cui/uiconfig/ui/optuserpage.ui

@@ -145,7 +145,7 @@
                     <property name="can_focus">False</property>
                     <property name="no_show_all">True</property>
                     <property name="halign">end</property>
-                    <property name="label" translatable="yes" context="optuserpage|faxft">Fa_x/e-mail:</property>
+                    <property name="label" translatable="yes" context="optuserpage|faxft">Fa_x/email:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">fax</property>
                   </object>

extensions/inc/strings.hrc

@@ -352,7 +352,7 @@
 #define ST_TYPE_PROCEEDINGS                     NC_("ST_TYPE_PROCEEDINGS", "Conference proceedings")
 #define ST_TYPE_TECHREPORT                      NC_("ST_TYPE_TECHREPORT", "Research report")
 #define ST_TYPE_UNPUBLISHED                     NC_("ST_TYPE_UNPUBLISHED", "Unpublished")
-#define ST_TYPE_EMAIL                           NC_("ST_TYPE_EMAIL", "E-mail")
+#define ST_TYPE_EMAIL                           NC_("ST_TYPE_EMAIL", "Email")
 #define ST_TYPE_WWW                             NC_("ST_TYPE_WWW", "WWW document")
 #define ST_TYPE_CUSTOM1                         NC_("ST_TYPE_CUSTOM1", "User-defined1")
 #define ST_TYPE_CUSTOM2                         NC_("ST_TYPE_CUSTOM2", "User-defined2")

include/sfx2/strings.hrc

@@ -235,7 +235,7 @@
 #define STR_PRINT_NEWSIZE                       NC_("STR_PRINT_NEWSIZE", "The page size has been modified.\nShould the new settings be saved\nin the active document?")
 #define STR_PRINT_NEWORISIZE                    NC_("STR_PRINT_NEWORISIZE", "The page size and orientation have been modified.\nWould you like to save the new settings in the\nactive document?")
 #define STR_CANT_CLOSE                          NC_("STR_CANT_CLOSE", "The document cannot be closed because a\n print job is being carried out.")
-#define STR_ERROR_SEND_MAIL                     NC_("STR_ERROR_SEND_MAIL", "An error occurred in sending the message. Possible errors could be a missing user account or a defective setup.\nPlease check the %PRODUCTNAME settings or your e-mail program settings.")
+#define STR_ERROR_SEND_MAIL                     NC_("STR_ERROR_SEND_MAIL", "An error occurred in sending the message. Possible errors could be a missing user account or a defective setup.\nPlease check the %PRODUCTNAME settings or your email program settings.")
 // Error codes look like "MAPI_E_FAILURE" or "1234"
 #define STR_ERROR_SEND_MAIL_CODE                NC_("STR_ERROR_SEND_MAIL_CODE", "An error occurred in sending the message. Possible errors could be a missing user account or a defective setup.\n\nError code is $1")
 #define STR_ERROR_SEND_MAIL_HEADER              NC_("STR_ERROR_SEND_MAIL_HEADER", "Error sending mail")

include/svtools/strings.hrc

@@ -263,7 +263,7 @@
 #define STR_FIELD_HOMETEL                       NC_("STR_FIELD_HOMETEL", "Tel: Home")
 #define STR_FIELD_WORKTEL                       NC_("STR_FIELD_WORKTEL", "Tel: Work")
 #define STR_FIELD_FAX                           NC_("STR_FIELD_FAX", "FAX")
-#define STR_FIELD_EMAIL                         NC_("STR_FIELD_EMAIL", "E-mail")
+#define STR_FIELD_EMAIL                         NC_("STR_FIELD_EMAIL", "Email")
 #define STR_FIELD_URL                           NC_("STR_FIELD_URL", "URL")
 #define STR_FIELD_NOTE                          NC_("STR_FIELD_NOTE", "Note")
 #define STR_FIELD_USER1                         NC_("STR_FIELD_USER1", "User 1")

officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu

@@ -2176,12 +2176,12 @@
       </node>
       <node oor:name=".uno:SendMailDocAsMS" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">E-mail as ~Microsoft Excel...</value>
+          <value xml:lang="en-US">Email as ~Microsoft Excel...</value>
         </prop>
       </node>
       <node oor:name=".uno:SendMailDocAsOOo" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">E-mail as ~OpenDocument Spreadsheet...</value>
+          <value xml:lang="en-US">Email as ~OpenDocument Spreadsheet...</value>
         </prop>
       </node>
       <node oor:name=".uno:ShareDocument" oor:op="replace">

officecfg/registry/data/org/openoffice/Office/UI/DbuCommands.xcu

@@ -500,7 +500,7 @@
       </node>
       <node oor:name=".uno:DBSendReportAsMail" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">Report As E-Mail...</value>
+          <value xml:lang="en-US">Report As Email...</value>
         </prop>
       </node>
       <node oor:name=".uno:DBSendReportToWriter" oor:op="replace">

officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu

@@ -1657,12 +1657,12 @@
       </node>
       <node oor:name=".uno:SendMailDocAsMS" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">E-mail as ~Microsoft PowerPoint Presentation...</value>
+          <value xml:lang="en-US">Email as ~Microsoft PowerPoint Presentation...</value>
         </prop>
       </node>
       <node oor:name=".uno:SendMailDocAsOOo" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">E-mail as ~OpenDocument Presentation...</value>
+          <value xml:lang="en-US">Email as ~OpenDocument Presentation...</value>
         </prop>
       </node>
       <node oor:name=".uno:ZoomMode" oor:op="replace">

officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu

@@ -4947,7 +4947,7 @@
       </node>
       <node oor:name=".uno:SendMailDocAsPDF" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">E-mail as P~DF...</value>
+          <value xml:lang="en-US">Email as P~DF...</value>
         </prop>
       </node>
       <node oor:name=".uno:SendViaBluetooth" oor:op="replace">
@@ -5718,13 +5718,13 @@
       </node>
       <node oor:name=".uno:SendMail" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">E-mail</value>
+          <value xml:lang="en-US">Email</value>
         </prop>
         <prop oor:name="ContextLabel" oor:type="xs:string">
-          <value xml:lang="en-US">~E-mail Document...</value>
+          <value xml:lang="en-US">~Email Document...</value>
         </prop>
         <prop oor:name="TooltipLabel" oor:type="xs:string">
-          <value xml:lang="en-US">Attach to E-mail</value>
+          <value xml:lang="en-US">Attach to Email</value>
         </prop>
         <prop oor:name="Properties" oor:type="xs:int">
           <value>1</value>
@@ -6684,12 +6684,12 @@
       </node>
       <node oor:name=".uno:SendMailDocAsMS" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">E-mail as ~Microsoft Format...</value>
+          <value xml:lang="en-US">Email as ~Microsoft Format...</value>
         </prop>
       </node>
       <node oor:name=".uno:SendMailDocAsOOo" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">E-mail as ~OpenDocument Format...</value>
+          <value xml:lang="en-US">Email as ~OpenDocument Format...</value>
         </prop>
       </node>
       <node oor:name=".uno:TemplateManager" oor:op="replace">

officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu

@@ -744,7 +744,7 @@
       </node>
       <node oor:name=".uno:MailMergeEmailDocuments" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">Send E-Mail Messages</value>
+          <value xml:lang="en-US">Send Email Messages</value>
         </prop>
         <prop oor:name="Properties" oor:type="xs:int">
           <value>1</value>
@@ -2664,12 +2664,12 @@
       </node>
       <node oor:name=".uno:SendMailDocAsMS" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">E-mail as ~Microsoft Word...</value>
+          <value xml:lang="en-US">Email as ~Microsoft Word...</value>
         </prop>
       </node>
       <node oor:name=".uno:SendMailDocAsOOo" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">E-mail as ~OpenDocument Text...</value>
+          <value xml:lang="en-US">Email as ~OpenDocument Text...</value>
         </prop>
       </node>
       <node oor:name=".uno:SelectionModeDefault" oor:op="replace">

officecfg/registry/schema/org/openoffice/Office/Security.xcs

@@ -51,7 +51,7 @@
     </group>
     <group oor:name="HiddenContent">
       <info>
-        <desc>Specifies whether to remove the hidden content when sending the document attached to an e-mail</desc>
+        <desc>Specifies whether to remove the hidden content when sending the document attached to an email</desc>
       </info>
       <prop oor:name="RemoveHiddenContent" oor:type="xs:boolean"
           oor:nillable="false">

officecfg/registry/schema/org/openoffice/Office/Writer.xcs

@@ -745,7 +745,7 @@
       </info>
       <prop oor:name="OutputToLetter" oor:type="xs:boolean" oor:nillable="false">
         <info>
-          <desc>Determines whether the document output is a letter, not an e-mail.</desc>
+          <desc>Determines whether the document output is a letter, not an email.</desc>
           <label>Output as letter</label>
         </info>
         <value>true</value>
@@ -807,8 +807,8 @@
       </prop>
       <prop oor:name="IsEMailGreetingLine" oor:type="xs:boolean" oor:nillable="false">
         <info>
-          <desc>Determines whether an e-mail should have a greeting line.</desc>
-          <label>E-mail greeting line</label>
+          <desc>Determines whether an email should have a greeting line.</desc>
+          <label>Email greeting line</label>
         </info>
         <value>true</value>
       </prop>
@@ -821,8 +821,8 @@
       </prop>
       <prop oor:name="IsEMailIndividualGreetingLine" oor:type="xs:boolean" oor:nillable="false">
         <info>
-          <desc>Determines whether in an e-mail an individual greeting line is used instead of a neutral one.</desc>
-          <label>Use individual greeting line in e-Mail</label>
+          <desc>Determines whether in an email an individual greeting line is used instead of a neutral one.</desc>
+          <label>Use individual greeting line in email</label>
         </info>
         <value>true</value>
       </prop>
@@ -871,13 +871,13 @@
       <prop oor:name="MailDisplayName" oor:type="xs:string">
         <info>
           <desc>Contains the display name of the mail address.</desc>
-          <label>e-Mail Name</label>
+          <label>Email Name</label>
         </info>
       </prop>
       <prop oor:name="MailAddress" oor:type="xs:string">
         <info>
-          <desc>e-Mail address.</desc>
-          <label>e-Mail address</label>
+          <desc>Email address.</desc>
+          <label>Email address</label>
         </info>
       </prop>
       <prop oor:name="IsMailReplyTo" oor:type="xs:boolean">
@@ -972,8 +972,8 @@
       </prop>
       <prop oor:name="EMailSupported" oor:type="xs:boolean">
         <info>
-          <desc>Determines whether e-Mail is supported.</desc>
-          <label>E-Mail supported</label>
+          <desc>Determines whether email is supported.</desc>
+          <label>Email supported</label>
         </info>
       </prop>
       <set oor:name="AddressDataAssignments" oor:node-type="AddressDataAssignment">
@@ -5287,8 +5287,8 @@
           <!-- OldLocation: Soffice.cfg -->
           <!-- UIHints: File  New  BusinessCards  Private -->
           <info>
-            <desc>Specifies your e-mail address.</desc>
-            <label>E-mail</label>
+            <desc>Specifies your email address.</desc>
+            <label>Email</label>
           </info>
         </prop>
       </group>
@@ -5418,7 +5418,7 @@
           <!-- OldLocation: Soffice.cfg -->
           <!-- UIHints: File  New  BusinessCards  Business -->
           <info>
-            <desc>Specifies your e-mail address.</desc>
+            <desc>Specifies your email address.</desc>
             <label>Email</label>
           </info>
         </prop>

officecfg/registry/schema/org/openoffice/UserProfile.xcs

@@ -171,7 +171,7 @@
         <!-- OldLocation: soffice.ini -->
         <!-- UIHints: Tools - Options - General - User Data -->
         <info>
-          <desc>Specifies the user's e-mail address.</desc>
+          <desc>Specifies the user's email address.</desc>
         </info>
         <value/>
         <!-- JB: Empty default inserted into empty property node. Remove if NIL was intended -->

sd/inc/strings.hrc

@@ -208,7 +208,7 @@
 #define STR_HTMLEXP_CONTENTS                            NC_("STR_HTMLEXP_CONTENTS", "Table of contents")
 #define STR_HTMLEXP_CLICKSTART                          NC_("STR_HTMLEXP_CLICKSTART", "Click here to start")
 #define STR_HTMLEXP_AUTHOR                              NC_("STR_HTMLEXP_AUTHOR", "Author")
-#define STR_HTMLEXP_EMAIL                               NC_("STR_HTMLEXP_EMAIL", "E-mail")
+#define STR_HTMLEXP_EMAIL                               NC_("STR_HTMLEXP_EMAIL", "Email")
 #define STR_HTMLEXP_HOMEPAGE                            NC_("STR_HTMLEXP_HOMEPAGE", "Homepage")
 #define STR_HTMLEXP_INFO                                NC_("STR_HTMLEXP_INFO", "Further information")
 #define STR_HTMLEXP_DOWNLOAD                            NC_("STR_HTMLEXP_DOWNLOAD", "Download presentation")

sfx2/inc/dinfdlg.hrc

@@ -33,7 +33,7 @@ const char* SFX_CB_PROPERTY_STRINGARRAY[] =
     NC_("SFX_CB_PROPERTY_STRINGARRAY", "Division"),
     NC_("SFX_CB_PROPERTY_STRINGARRAY", "Document number"),
     NC_("SFX_CB_PROPERTY_STRINGARRAY", "Editor"),
-    NC_("SFX_CB_PROPERTY_STRINGARRAY", "E-Mail"),
+    NC_("SFX_CB_PROPERTY_STRINGARRAY", "Email"),
     NC_("SFX_CB_PROPERTY_STRINGARRAY", "Forward to"),
     NC_("SFX_CB_PROPERTY_STRINGARRAY", "Group"),
     NC_("SFX_CB_PROPERTY_STRINGARRAY", "Info"),

sfx2/uiconfig/ui/errorfindemaildialog.ui

@@ -4,15 +4,15 @@
   <requires lib="gtk+" version="3.18"/>
   <object class="GtkMessageDialog" id="ErrorFindEmailDialog">
     <property name="can_focus">False</property>
-    <property name="title" translatable="yes" context="errorfindemaildialog|ErrorFindEmailDialog">No e-mail configuration</property>
+    <property name="title" translatable="yes" context="errorfindemaildialog|ErrorFindEmailDialog">No email configuration</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="message_type">error</property>
     <property name="buttons">ok</property>
-    <property name="text" translatable="yes" context="errorfindemaildialog|ErrorFindEmailDialog">%PRODUCTNAME was unable to find a working e-mail configuration.</property>
-    <property name="secondary_text" translatable="yes" context="errorfindemaildialog|ErrorFindEmailDialog">Please save this document locally instead and attach it from within your e-mail client.</property>
+    <property name="text" translatable="yes" context="errorfindemaildialog|ErrorFindEmailDialog">%PRODUCTNAME was unable to find a working email configuration.</property>
+    <property name="secondary_text" translatable="yes" context="errorfindemaildialog|ErrorFindEmailDialog">Please save this document locally instead and attach it from within your email client.</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="messagedialog-vbox">
         <property name="can_focus">False</property>

sw/inc/dbui.hrc

@@ -54,7 +54,7 @@ const std::pair<const char*, int> SA_ADDRESS_HEADER[] =
     { NC_("SA_ADDRESS_HEADER", "Country") ,               MM_PART_COUNTRY         },
     { NC_("SA_ADDRESS_HEADER", "Telephone private") ,     MM_PART_PHONE_PRIVATE   },
     { NC_("SA_ADDRESS_HEADER", "Telephone business") ,    MM_PART_PHONE_BUSINESS  },
-    { NC_("SA_ADDRESS_HEADER", "E-mail Address") ,        MM_PART_E_MAIL          },
+    { NC_("SA_ADDRESS_HEADER", "Email Address") ,        MM_PART_E_MAIL          },
     { NC_("SA_ADDRESS_HEADER", "Gender"),                 MM_PART_GENDER          }
 };
 

sw/inc/strings.hrc

@@ -719,7 +719,7 @@
 #define STR_AUTH_TYPE_PROCEEDINGS               NC_("STR_AUTH_TYPE_PROCEEDINGS", "Conference proceedings")
 #define STR_AUTH_TYPE_TECHREPORT                NC_("STR_AUTH_TYPE_TECHREPORT", "Research report")
 #define STR_AUTH_TYPE_UNPUBLISHED               NC_("STR_AUTH_TYPE_UNPUBLISHED", "Unpublished")
-#define STR_AUTH_TYPE_EMAIL                     NC_("STR_AUTH_TYPE_EMAIL", "E-mail")
+#define STR_AUTH_TYPE_EMAIL                     NC_("STR_AUTH_TYPE_EMAIL", "Email")
 #define STR_AUTH_TYPE_WWW                       NC_("STR_AUTH_TYPE_WWW", "WWW document")
 #define STR_AUTH_TYPE_CUSTOM1                   NC_("STR_AUTH_TYPE_CUSTOM1", "User-defined1")
 #define STR_AUTH_TYPE_CUSTOM2                   NC_("STR_AUTH_TYPE_CUSTOM2", "User-defined2")
@@ -822,7 +822,7 @@
 #define STR_FILTER_CSV                          NC_("STR_FILTER_CSV", "Text Comma Separated (*.csv)")
 #define STR_FILTER_MDB                          NC_("STR_FILTER_MDB", "Microsoft Access (*.mdb;*.mde)")
 #define STR_FILTER_ACCDB                        NC_("STR_FILTER_ACCDB", "Microsoft Access 2007 (*.accdb,*.accde)")
-#define ST_CONFIGUREMAIL                        NC_("ST_CONFIGUREMAIL", "In order to be able to send mail merge documents by e-mail, %PRODUCTNAME requires information about the e-mail account to be used.\n\nDo you want to enter e-mail account information now?")
+#define ST_CONFIGUREMAIL                        NC_("ST_CONFIGUREMAIL", "In order to be able to send mail merge documents by email, %PRODUCTNAME requires information about the email account to be used.\n\nDo you want to enter email account information now?")
 #define ST_FILTERNAME                           NC_("ST_FILTERNAME", "%PRODUCTNAME Address List (.csv)")
 
 #define ST_STARTING                             NC_("ST_STARTING", "Select Starting Document")
@@ -929,7 +929,7 @@
 #define FLD_EU_TELPRIV                          NC_("FLD_EU_TELPRIV", "Tel. (Home)")
 #define FLD_EU_TELFIRMA                         NC_("FLD_EU_TELFIRMA", "Tel. (Work)")
 #define FLD_EU_FAX                              NC_("FLD_EU_FAX", "FAX")
-#define FLD_EU_EMAIL                            NC_("FLD_EU_EMAIL", "E-mail")
+#define FLD_EU_EMAIL                            NC_("FLD_EU_EMAIL", "Email")
 #define FLD_EU_STATE                            NC_("FLD_EU_STATE", "State")
 #define FLD_PAGEREF_OFF                         NC_("FLD_PAGEREF_OFF", "off")
 #define FLD_PAGEREF_ON                          NC_("FLD_PAGEREF_ON", "on")
@@ -1352,7 +1352,7 @@
 
 #define STR_BUSINESS_CARDS                      NC_("labeldialog|cards", "Business Cards")
 
-#define STR_MAILCONFIG_DLG_TITLE                NC_("STR_MAILCONFIG_DLG_TITLE", "E-mail settings")
+#define STR_MAILCONFIG_DLG_TITLE                NC_("STR_MAILCONFIG_DLG_TITLE", "Email settings")
 
 #endif
 

sw/uiconfig/swriter/ui/businessdatapage.ui

@@ -102,7 +102,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">1</property>
-                <property name="label" translatable="yes" context="businessdatapage|faxft">Homepage/e-mail:</property>
+                <property name="label" translatable="yes" context="businessdatapage|faxft">Homepage/email:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">url</property>
               </object>

sw/uiconfig/swriter/ui/ccdialog.ui

@@ -127,7 +127,7 @@
                       <object class="GtkLabel" id="label4">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes" context="ccdialog|label4">Note: Separate e-mail addresses with a semicolon (;).</property>
+                        <property name="label" translatable="yes" context="ccdialog|label4">Note: Separate email addresses with a semicolon (;).</property>
                         <property name="use_underline">True</property>
                         <property name="xalign">0</property>
                       </object>

sw/uiconfig/swriter/ui/mailconfigpage.ui

@@ -93,7 +93,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">end</property>
-                    <property name="label" translatable="yes" context="mailconfigpage|address_label">_E-mail address:</property>
+                    <property name="label" translatable="yes" context="mailconfigpage|address_label">_Email address:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">address</property>
                   </object>
@@ -104,7 +104,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="replytocb">
-                    <property name="label" translatable="yes" context="mailconfigpage|replytocb">Send replies to _different e-mail address</property>
+                    <property name="label" translatable="yes" context="mailconfigpage|replytocb">Send replies to _different email address</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>

sw/uiconfig/swriter/ui/mmmailbody.ui

@@ -5,7 +5,7 @@
   <object class="GtkDialog" id="MailBodyDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes" context="mmmailbody|MailBodyDialog">E-Mail Message</property>
+    <property name="title" translatable="yes" context="mmmailbody|MailBodyDialog">Email Message</property>
     <property name="type_hint">dialog</property>
     <child>
       <placeholder/>
@@ -135,7 +135,7 @@
                 <property name="row_spacing">6</property>
                 <child>
                   <object class="GtkCheckButton" id="greeting">
-                    <property name="label" translatable="yes" context="mmmailbody|greeting">This e-mail should contain a salutation</property>
+                    <property name="label" translatable="yes" context="mmmailbody|greeting">This email should contain a salutation</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>

sw/uiconfig/swriter/ui/mmoutputtypepage.ui

@@ -59,7 +59,7 @@
                     <property name="vexpand">True</property>
                     <property name="xalign">0</property>
                     <property name="yalign">0</property>
-                    <property name="label" translatable="yes" context="mmoutputtypepage|emailft">Send e-mail messages to a group of recipients. The e-mail messages can contain a salutation. The e-mail messages can be personalized for each recipient.</property>
+                    <property name="label" translatable="yes" context="mmoutputtypepage|emailft">Send email messages to a group of recipients. The email messages can contain a salutation. The email messages can be personalized for each recipient.</property>
                     <property name="wrap">True</property>
                     <property name="max_width_chars">72</property>
                   </object>
@@ -91,7 +91,7 @@
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="email">
-                        <property name="label" translatable="yes" context="mmoutputtypepage|email">_E-mail message</property>
+                        <property name="label" translatable="yes" context="mmoutputtypepage|email">_Email message</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>

sw/uiconfig/swriter/ui/mmresultemaildialog.ui

@@ -15,7 +15,7 @@
   <object class="GtkDialog" id="MMResultEmailDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes" context="mmresultemaildialog|MMResultEmailDialog">E-Mail merged document</property>
+    <property name="title" translatable="yes" context="mmresultemaildialog|MMResultEmailDialog">Email merged document</property>
     <property name="modal">True</property>
     <property name="default_width">0</property>
     <property name="default_height">0</property>
@@ -273,7 +273,7 @@
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="mmresultemaildialog|label2">E-Mail options</property>
+                <property name="label" translatable="yes" context="mmresultemaildialog|label2">Email options</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>

sw/uiconfig/swriter/ui/mmsendmails.ui

@@ -8,7 +8,7 @@
     <property name="hexpand">True</property>
     <property name="vexpand">True</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes" context="mmsendmails|SendMailsDialog">Sending E-mail messages</property>
+    <property name="title" translatable="yes" context="mmsendmails|SendMailsDialog">Sending Email messages</property>
     <property name="type_hint">dock</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -145,7 +145,7 @@
                                 <property name="hexpand">True</property>
                                 <property name="xalign">0</property>
                                 <property name="yalign">0</property>
-                                <property name="label" translatable="yes" context="mmsendmails|transferstatus">%1 of %2 e-mails sent</property>
+                                <property name="label" translatable="yes" context="mmsendmails|transferstatus">%1 of %2 emails sent</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -196,7 +196,7 @@
                             <property name="hexpand">True</property>
                             <property name="xalign">0</property>
                             <property name="yalign">0</property>
-                            <property name="label" translatable="yes" context="mmsendmails|errorstatus">E-mails not sent: %1</property>
+                            <property name="label" translatable="yes" context="mmsendmails|errorstatus">Emails not sent: %1</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>

sw/uiconfig/swriter/ui/privateuserpage.ui

@@ -102,7 +102,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes" context="privateuserpage|faxft">Homepage/e-mail:</property>
+                <property name="label" translatable="yes" context="privateuserpage|faxft">Homepage/email:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">url</property>
               </object>

sw/uiconfig/swriter/ui/testmailsettings.ui

@@ -221,7 +221,7 @@
               <object class="GtkLabel" id="label8">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="testmailsettings|label8">%PRODUCTNAME is testing the e-mail account settings...</property>
+                <property name="label" translatable="yes" context="testmailsettings|label8">%PRODUCTNAME is testing the email account settings...</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>

sw/uiconfig/swriter/ui/warnemaildialog.ui

@@ -4,7 +4,7 @@
   <requires lib="gtk+" version="3.18"/>
   <object class="GtkMessageDialog" id="WarnEmailDialog">
     <property name="can_focus">False</property>
-    <property name="title" translatable="yes" context="warnemaildialog|WarnEmailDialog">E-Mails could not be sent</property>
+    <property name="title" translatable="yes" context="warnemaildialog|WarnEmailDialog">Emails could not be sent</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
     <property name="default_width">0</property>
@@ -13,7 +13,7 @@
     <property name="skip_taskbar_hint">True</property>
     <property name="message_type">warning</property>
     <property name="buttons">ok</property>
-    <property name="text" translatable="yes" context="warnemaildialog|WarnEmailDialog">E-mails could not be sent</property>
+    <property name="text" translatable="yes" context="warnemaildialog|WarnEmailDialog">Emails could not be sent</property>
     <property name="secondary_text" translatable="yes" context="warnemaildialog|WarnEmailDialog">The following error occurred:</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="messagedialog-vbox">

wizards/com/sun/star/wizards/common/strings.hrc

@@ -182,7 +182,7 @@ RID_FAXWIZARDDIALOG_START_41    =       NC_("RID_FAXWIZARDDIALOG_START_41", "To:
 RID_FAXWIZARDDIALOG_START_42    =       NC_("RID_FAXWIZARDDIALOG_START_42", "From:")
 RID_FAXWIZARDDIALOG_START_43    =       NC_("RID_FAXWIZARDDIALOG_START_43", "Fax:")
 RID_FAXWIZARDDIALOG_START_44    =       NC_("RID_FAXWIZARDDIALOG_START_44", "Tel:")
-RID_FAXWIZARDDIALOG_START_45    =       NC_("RID_FAXWIZARDDIALOG_START_45", "E-mail:")
+RID_FAXWIZARDDIALOG_START_45    =       NC_("RID_FAXWIZARDDIALOG_START_45", "Email:")
 RID_FAXWIZARDDIALOG_START_46    =       NC_("RID_FAXWIZARDDIALOG_START_46", "This template consists of")
 RID_FAXWIZARDDIALOG_START_47    =       NC_("RID_FAXWIZARDDIALOG_START_47", "page")
 RID_FAXWIZARDDIALOG_START_48    =       NC_("RID_FAXWIZARDDIALOG_START_48", "Please inform us if transmission errors occur.")