Kaydet (Commit) 8b57d07a authored tarafından Caolán McNamara's avatar Caolán McNamara Kaydeden (comit) Adolfo Jayme Barrientos

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: 's avatarAdolfo Jayme Barrientos <fitojb@ubuntu.com>
üst 9a923e1c
......@@ -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")
......
......@@ -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[] =
......
......@@ -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>
......
......@@ -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>
......
......@@ -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")
......
......@@ -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")
......
......@@ -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")
......
......@@ -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">
......
......@@ -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">
......
......@@ -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">
......
......@@ -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">
......
......@@ -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">
......
......@@ -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">
......
......@@ -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 @@