diff options
| author | Aleksander Machniak <alec@alec.pl> | 2013-08-01 14:23:43 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2013-08-01 14:23:43 +0200 |
| commit | 9f324e3a1bf3ddac141015746bd015df7e0ee853 (patch) | |
| tree | 7de45616228841cc048cab23e7978a634a83ba9a /plugins | |
| parent | 055c2636639b7296d8fcfc25a82128f70f3da91e (diff) | |
| parent | dda39aab1d8af12d6f2287e4bdeae86b5abfc21b (diff) | |
Merge branch 'master' of github.com:roundcube/roundcubemail
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/managesieve/Changelog | 1 | ||||
| -rw-r--r-- | plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php | 1 | ||||
| -rw-r--r-- | plugins/managesieve/localization/en_US.inc | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/plugins/managesieve/Changelog b/plugins/managesieve/Changelog index daee91a70..60b2f1831 100644 --- a/plugins/managesieve/Changelog +++ b/plugins/managesieve/Changelog @@ -4,6 +4,7 @@ - Support date, currendate and index tests - RFC5260 (#1488120) - Split plugin file into two files - Fix handling of &, <, > characters in scripts/filter names (#1489208) +- Support 'keep' action (#1489226) * version 6.2 [2013-02-17] ----------------------------------------------------------- diff --git a/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php b/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php index e92ba04d6..bbbfa9d91 100644 --- a/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php +++ b/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php @@ -1550,6 +1550,7 @@ class rcube_sieve_engine if (in_array('enotify', $this->exts) || in_array('notify', $this->exts)) { $select_action->add(rcube::Q($this->plugin->gettext('notify')), 'notify'); } + $select_action->add(rcube::Q($this->plugin->gettext('messagekeep')), 'keep'); $select_action->add(rcube::Q($this->plugin->gettext('rulestop')), 'stop'); $select_type = $action['type']; diff --git a/plugins/managesieve/localization/en_US.inc b/plugins/managesieve/localization/en_US.inc index 72bbf9d41..a37ea7db9 100644 --- a/plugins/managesieve/localization/en_US.inc +++ b/plugins/managesieve/localization/en_US.inc @@ -49,6 +49,7 @@ $labels['messagesendcopy'] = 'Send message copy to'; $labels['messagereply'] = 'Reply with message'; $labels['messagedelete'] = 'Delete message'; $labels['messagediscard'] = 'Discard with message'; +$labels['messagekeep'] = 'Keep message in Inbox'; $labels['messagesrules'] = 'For incoming mail:'; $labels['messagesactions'] = '...execute the following actions:'; $labels['add'] = 'Add'; |