From 1da8ffd52bb2611327be58fd4038266c825dc064 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak <alec@alec.pl> Date: Mon, 25 Apr 2016 02:57:52 -0400 Subject: [PATCH] Use "email" over "e-mail" consistently (#5212) --- program/localization/en_US/messages.inc | 8 ++++---- plugins/managesieve/localization/en_US.inc | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/managesieve/localization/en_US.inc b/plugins/managesieve/localization/en_US.inc index 0940923..906ffe8 100644 --- a/plugins/managesieve/localization/en_US.inc +++ b/plugins/managesieve/localization/en_US.inc @@ -56,7 +56,7 @@ $labels['del'] = 'Delete'; $labels['sender'] = 'Sender'; $labels['recipient'] = 'Recipient'; -$labels['vacationaddr'] = 'My e-mail addresses:'; +$labels['vacationaddr'] = 'My email addresses:'; $labels['vacationdays'] = 'How often send messages (in days):'; $labels['vacationinterval'] = 'How often send messages:'; $labels['vacationreason'] = 'Message body (vacation reason):'; @@ -174,7 +174,7 @@ $labels['vacation.status'] = 'Status'; $labels['vacation.on'] = 'On'; $labels['vacation.off'] = 'Off'; -$labels['vacation.addresses'] = 'My e-mail addresses'; +$labels['vacation.addresses'] = 'My email addresses'; $labels['vacation.interval'] = 'Reply interval'; $labels['vacation.after'] = 'Put vacation rule after'; $labels['vacation.saving'] = 'Saving data...'; diff --git a/program/localization/en_US/messages.inc b/program/localization/en_US/messages.inc index 88db211..a3f7095 100644 --- a/program/localization/en_US/messages.inc +++ b/program/localization/en_US/messages.inc @@ -54,7 +54,7 @@ $messages['savingresponse'] = 'Saving response text...'; $messages['deleteresponseconfirm'] = 'Do you really want to delete this response text?'; $messages['addedsuccessfully'] = 'Contact added successfully to address book.'; -$messages['contactexists'] = 'A contact with the same e-mail address already exists.'; +$messages['contactexists'] = 'A contact with the same email address already exists.'; $messages['contactnameexists'] = 'A contact with the same name already exists.'; $messages['blockedimages'] = 'To protect your privacy, remote images are blocked in this message.'; $messages['encryptedmessage'] = 'This is an encrypted message and can not be displayed. Sorry!'; @@ -92,7 +92,7 @@ $messages['noemailwarning'] = 'Please enter a valid email address.'; $messages['nonamewarning'] = 'Please enter a name.'; $messages['nopagesizewarning'] = 'Please enter a page size.'; -$messages['nosenderwarning'] = 'Please enter sender e-mail address.'; +$messages['nosenderwarning'] = 'Please enter sender email address.'; $messages['norecipientwarning'] = 'Please enter at least one recipient.'; $messages['nosubjectwarning'] = 'The "Subject" field is empty. Would you like to enter one now?'; $messages['nobodywarning'] = 'Send this message without text?'; @@ -150,7 +150,7 @@ $messages['importmessagesuccess'] = 'Successfully imported $nr messages'; $messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file'; $messages['opnotpermitted'] = 'Operation not permitted!'; -$messages['nofromaddress'] = 'Missing e-mail address in selected identity.'; +$messages['nofromaddress'] = 'Missing email address in selected identity.'; $messages['editorwarning'] = 'Switching editor type may cause text formatting to be lost. Do you wish to continue?'; $messages['httpreceivedencrypterror'] = 'A fatal configuration error occurred. Contact your administrator immediately. <b>Your message can not be sent.</b>'; $messages['smtpconnerror'] = 'SMTP Error ($code): Connection to server failed.'; @@ -159,7 +159,7 @@ $messages['smtptoerror'] = 'SMTP Error ($code): Failed to add recipient "$to" ($msg).'; $messages['smtprecipientserror'] = 'SMTP Error: Unable to parse recipients list.'; $messages['smtperror'] = 'SMTP Error: $msg'; -$messages['emailformaterror'] = 'Invalid e-mail address: $email'; +$messages['emailformaterror'] = 'Invalid email address: $email'; $messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.'; $messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max.'; $messages['internalerror'] = 'An internal error occurred. Please try again.'; -- Gitblit v1.9.1