summaryrefslogtreecommitdiff
path: root/cui
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2019-01-23 11:59:37 +0000
committerAdolfo Jayme Barrientos <fitojb@ubuntu.com>2019-02-07 06:02:58 +0100
commit8b57d07a64e03db32b5383f58a40c1509392cd24 (patch)
treedc23ae43eba0f8eeccda6b00b80627c7a4d9385c /cui
parent9a923e1ce53753bb8538054fd1658a67ca0ff354 (diff)
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>
Diffstat (limited to 'cui')
-rw-r--r--cui/inc/strings.hrc2
-rw-r--r--cui/inc/treeopt.hrc4
-rw-r--r--cui/uiconfig/ui/optemailpage.ui4
-rw-r--r--cui/uiconfig/ui/optuserpage.ui2
4 files changed, 6 insertions, 6 deletions
diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 0359680e678d..9278d9e818b4 100644
--- a/cui/inc/strings.hrc
+++ b/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")
diff --git a/cui/inc/treeopt.hrc b/cui/inc/treeopt.hrc
index 824e0fd369e8..a7f271a016c6 100644
--- a/cui/inc/treeopt.hrc
+++ b/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[] =
diff --git a/cui/uiconfig/ui/optemailpage.ui b/cui/uiconfig/ui/optemailpage.ui
index 02544d91483a..497e99a99d92 100644
--- a/cui/uiconfig/ui/optemailpage.ui
+++ b/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>
diff --git a/cui/uiconfig/ui/optuserpage.ui b/cui/uiconfig/ui/optuserpage.ui
index 70c79798cd6c..b6a481701aa3 100644
--- a/cui/uiconfig/ui/optuserpage.ui
+++ b/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>