Merge branch 'master' of github.com:roundcube/roundcubemail

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]
 -----------------------------------------------------------

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'];

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';