Merge branch 'master' of https://github.com/mildred/roundcubemail into mildred-master

plugins/archive/archive.php

@@ -199,6 +199,17 @@ class archive extends rcube_plugin
                     case 'sender':
                         $subfolder = $this->sender_subfolder($message->get('from'));
                         break;
+
+                    case 'folderyear':
+                        $subfolder = $rcmail->format_date($message->timestamp, 'Y')
+                            . $delimiter . $mbox;
+                        break;
+
+                    case 'foldermonth':
+                        $subfolder = $rcmail->format_date($message->timestamp, 'Y')
+                            . $delimiter . $rcmail->format_date($message->timestamp, 'm')
+                            . $delimiter . $mbox;
+                        break;
                     }
 
                     // compose full folder path
@@ -414,6 +425,8 @@ class archive extends rcube_plugin
                 $archive_type->add($this->gettext('archivetypetbmonth'), 'tbmonth');
                 $archive_type->add($this->gettext('archivetypesender'), 'sender');
                 $archive_type->add($this->gettext('archivetypefolder'), 'folder');
+                $archive_type->add($this->gettext('archivetypefolderyear'), 'folderyear');
+                $archive_type->add($this->gettext('archivetypefoldermonth'), 'foldermonth');
 
                 $args['blocks']['archive'] = array(
                     'name'    => rcube::Q($this->gettext('settingstitle')),

plugins/archive/localization/en_CA.inc

@@ -24,6 +24,8 @@ $labels['settingstitle'] = 'Archive';
 $labels['archivetype'] = 'Divide archive by';
 $labels['archivetypeyear'] = 'Year (e.g. Archive/2012)';
 $labels['archivetypemonth'] = 'Month (e.g. Archive/2012/06)';
+$labels['archivetypefolderyear'] = 'Year then original folder (e.g. Archives/...)';
+$labels['archivetypefoldermonth'] = 'Month then original folder (e.g. Archives/2012/...)';
 $labels['archivetypefolder'] = 'Original folder';
 $labels['archivetypesender'] = 'Sender email';
 $labels['unkownsender'] = 'unknown';

plugins/archive/localization/en_GB.inc

@@ -26,6 +26,8 @@ $labels['archivetypeyear'] = 'Year (e.g. Archive/2012)';
 $labels['archivetypemonth'] = 'Month (e.g. Archive/2012/06)';
 $labels['archivetypetbmonth'] = 'Month - Thunderbird compatible (e.g. Archive/2012/2012-06)';
 $labels['archivetypefolder'] = 'Original folder';
+$labels['archivetypefolderyear'] = 'Year then original folder (e.g. Archives/...)';
+$labels['archivetypefoldermonth'] = 'Month then original folder (e.g. Archives/2012/...)';
 $labels['archivetypesender'] = 'Sender email';
 $labels['unkownsender'] = 'unknown';
 $labels['readonarchive'] = 'Mark the message as read on archive';

plugins/archive/localization/en_US.inc

@@ -27,6 +27,8 @@ $labels['archivetypeyear'] = 'Year (e.g. Archive/2012)';
 $labels['archivetypemonth'] = 'Month (e.g. Archive/2012/06)';
 $labels['archivetypetbmonth'] = 'Month - Thunderbird compatible (e.g. Archive/2012/2012-06)';
 $labels['archivetypefolder'] = 'Original folder';
+$labels['archivetypefolderyear'] = 'Year then original folder (e.g. Archives/...)';
+$labels['archivetypefoldermonth'] = 'Month then original folder (e.g. Archives/2012/...)';
 $labels['archivetypesender'] = 'Sender email';
 $labels['unkownsender'] = 'unknown';
 $labels['readonarchive'] = 'Mark the message as read on archive';

plugins/archive/localization/fr_FR.inc

@@ -26,6 +26,8 @@ $labels['archivetypeyear'] = 'Année (p. ex. Archives/2012)';
 $labels['archivetypemonth'] = 'Mois (p. ex. Archives/2012/06)';
 $labels['archivetypetbmonth'] = 'Mois – compatible avec Thunderbird (p.ex. Archive/2012/2012-06)';
 $labels['archivetypefolder'] = 'Dossier original';
+$labels['archivetypefolderyear'] = 'Année puis dossier original (p. ex. Archives/...)';
+$labels['archivetypefoldermonth'] = 'Mois puis dossier original (p. ex. Archives/2012/...)';
 $labels['archivetypesender'] = 'Courriel de l’expéditeur';
 $labels['unkownsender'] = 'inconnu';
 $labels['readonarchive'] = 'Marquer le courriel comme lu lors de l’archivage';