From de14ec6aa0dd41f6d414da93bf83b52783e48632 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak <alec@alec.pl> Date: Wed, 04 May 2016 02:53:12 -0400 Subject: [PATCH] Merge branch 'for-1.3' --- plugins/managesieve/localization/en_US.inc | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/plugins/managesieve/localization/en_US.inc b/plugins/managesieve/localization/en_US.inc index 906ffe8..c15193d 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 email addresses:'; +$labels['vacationaddr'] = 'My e-mail 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 email addresses'; +$labels['vacation.addresses'] = 'My e-mail addresses'; $labels['vacation.interval'] = 'Reply interval'; $labels['vacation.after'] = 'Put vacation rule after'; $labels['vacation.saving'] = 'Saving data...'; @@ -191,6 +191,14 @@ $labels['ariasummaryfiltersetslist'] = 'List of filter sets'; $labels['filterstitle'] = 'Edit incoming mail filters'; $labels['vacationtitle'] = 'Edit out-of-office rule'; +$labels['message'] = 'Message'; +$labels['duplicate'] = 'is duplicate'; +$labels['notduplicate'] = 'is not duplicate'; +$labels['duplicate.handle'] = 'handle:'; +$labels['duplicate.header'] = 'header:'; +$labels['duplicate.uniqueid'] = 'identifier:'; +$labels['duplicate.seconds'] = 'timeout (seconds):'; +$labels['duplicate.last'] = 'relative to the last execution'; $messages = array(); $messages['filterunknownerror'] = 'Unknown server error.'; @@ -199,6 +207,7 @@ $messages['filterdeleted'] = 'Filter deleted successfully.'; $messages['filtersaved'] = 'Filter saved successfully.'; $messages['filtersaveerror'] = 'Unable to save filter. Server error occurred.'; +$messages['filterformerror'] = 'Filter form contains errors.'; $messages['filterdeleteconfirm'] = 'Do you really want to delete selected filter?'; $messages['ruledeleteconfirm'] = 'Are you sure, you want to delete selected rule?'; $messages['actiondeleteconfirm'] = 'Are you sure, you want to delete selected action?'; @@ -228,5 +237,6 @@ $messages['saveerror'] = 'Unable to save data. Server error occurred.'; $messages['vacationsaved'] = 'Vacation data saved successfully.'; $messages['emptyvacationbody'] = 'Body of vacation message is required!'; +$messages['duplicate.conflict.err'] = 'Both header and unique identifier are not alowed.'; ?> -- Gitblit v1.9.1