summaryrefslogtreecommitdiff
path: root/sw/uiconfig/swriter
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 /sw/uiconfig/swriter
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 'sw/uiconfig/swriter')
-rw-r--r--sw/uiconfig/swriter/ui/businessdatapage.ui2
-rw-r--r--sw/uiconfig/swriter/ui/ccdialog.ui2
-rw-r--r--sw/uiconfig/swriter/ui/mailconfigpage.ui4
-rw-r--r--sw/uiconfig/swriter/ui/mmmailbody.ui4
-rw-r--r--sw/uiconfig/swriter/ui/mmoutputtypepage.ui4
-rw-r--r--sw/uiconfig/swriter/ui/mmresultemaildialog.ui4
-rw-r--r--sw/uiconfig/swriter/ui/mmsendmails.ui6
-rw-r--r--sw/uiconfig/swriter/ui/privateuserpage.ui2
-rw-r--r--sw/uiconfig/swriter/ui/testmailsettings.ui2
-rw-r--r--sw/uiconfig/swriter/ui/warnemaildialog.ui4
10 files changed, 17 insertions, 17 deletions
diff --git a/sw/uiconfig/swriter/ui/businessdatapage.ui b/sw/uiconfig/swriter/ui/businessdatapage.ui
index 25d6ad7cfdc7..56f4ecf8c52a 100644
--- a/sw/uiconfig/swriter/ui/businessdatapage.ui
+++ b/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>
diff --git a/sw/uiconfig/swriter/ui/ccdialog.ui b/sw/uiconfig/swriter/ui/ccdialog.ui
index 46572bf960b3..d18a5540abfe 100644
--- a/sw/uiconfig/swriter/ui/ccdialog.ui
+++ b/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>
diff --git a/sw/uiconfig/swriter/ui/mailconfigpage.ui b/sw/uiconfig/swriter/ui/mailconfigpage.ui
index ad04b27062a1..f87777c683da 100644
--- a/sw/uiconfig/swriter/ui/mailconfigpage.ui
+++ b/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>
diff --git a/sw/uiconfig/swriter/ui/mmmailbody.ui b/sw/uiconfig/swriter/ui/mmmailbody.ui
index 421b5ac12dbf..c6358f9c245a 100644
--- a/sw/uiconfig/swriter/ui/mmmailbody.ui
+++ b/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>
diff --git a/sw/uiconfig/swriter/ui/mmoutputtypepage.ui b/sw/uiconfig/swriter/ui/mmoutputtypepage.ui
index 4c231ae31a47..e5b1a366be91 100644
--- a/sw/uiconfig/swriter/ui/mmoutputtypepage.ui
+++ b/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>
diff --git a/sw/uiconfig/swriter/ui/mmresultemaildialog.ui b/sw/uiconfig/swriter/ui/mmresultemaildialog.ui
index 5f10bf7dd4aa..8360912b7c8c 100644
--- a/sw/uiconfig/swriter/ui/mmresultemaildialog.ui
+++ b/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>
diff --git a/sw/uiconfig/swriter/ui/mmsendmails.ui b/sw/uiconfig/swriter/ui/mmsendmails.ui
index d24a23a789ce..d69fc1629592 100644
--- a/sw/uiconfig/swriter/ui/mmsendmails.ui
+++ b/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>
diff --git a/sw/uiconfig/swriter/ui/privateuserpage.ui b/sw/uiconfig/swriter/ui/privateuserpage.ui
index d300e879399f..a5dbecad03dd 100644
--- a/sw/uiconfig/swriter/ui/privateuserpage.ui
+++ b/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>
diff --git a/sw/uiconfig/swriter/ui/testmailsettings.ui b/sw/uiconfig/swriter/ui/testmailsettings.ui
index 9f568fd703a2..0260856e0504 100644
--- a/sw/uiconfig/swriter/ui/testmailsettings.ui
+++ b/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>
diff --git a/sw/uiconfig/swriter/ui/warnemaildialog.ui b/sw/uiconfig/swriter/ui/warnemaildialog.ui
index 706080e4713a..bdf3bd048efe 100644
--- a/sw/uiconfig/swriter/ui/warnemaildialog.ui
+++ b/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">