Delete_move_next plugin added.

locale/es_ES/LC_MESSAGES/squirrelmail.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: $Id$\n"
-"POT-Creation-Date: 2002-01-24 14:51+0100\n"
+"POT-Creation-Date: 2002-01-24 14:55+0100\n"
 "PO-Revision-Date: 2002-01-19 12:19CET\n"
 "Last-Translator: Philippe Mingo <philippe@squirrelmail.org>\n"
 "Language-Team: Spanish <squirrelmail-i18n@lists.sourceforge.net>\n"
@@ -3760,6 +3760,10 @@ msgstr "Borrar y Atr
 msgid "Delete & Next"
 msgstr "Borrar y Adelante"
 
+#: squirrelmail/plugins/delete_move_next/setup.php:289
+msgid "delete_move_next:"
+msgstr "Borrar_mover_siguiente:"
+
 #: squirrelmail/plugins/delete_move_next/setup.php:295
 msgid "display at top"
 msgstr "mostrar arriba"
@@ -3767,7 +3771,7 @@ msgstr "mostrar arriba"
 #: squirrelmail/plugins/delete_move_next/setup.php:301
 #: squirrelmail/plugins/delete_move_next/setup.php:313
 msgid "with move option"
-msgstr "movel"
+msgstr "activar mover"
 
 #: squirrelmail/plugins/delete_move_next/setup.php:307
 msgid "display at bottom"

plugins/delete_move_next/README

@@ -0,0 +1,81 @@
+delete_move_next -- Version 3.0
+By Ben Brillat <brillat-sqplugin@mainsheet.org>
+
+This is a modified version of Delete Move Next by Bryan Stalcup <bryan@stalcup.net>
+
+If you read the mail in your inbox starting with the most recent, this
+plugin is meant for you. It adds a set of mail management links across 
+the bottom or top of the email. 
+
+Features
+========
+* Saves you the need to scroll up to go to the previous or next email
+* Allows you to delete the current email and view the next or previous
+  message in step
+* Allows you to move the current email to any mailbox and view the next
+
+
+Description
+===========
+This plugin adds links to the message view for each message.
+The links include "Previous", "Next", "Delete & Previous", and "Delete & 
+Next", which deletes the current email and displays the next email. 
+Also included is a menu to move the current email to any folder and 
+then display the next email. It helps me keep up with my constantly 
+overflowing inbox.
+
+Future Work
+===========
+* You tell me...
+
+
+Limitations (Known bugs)
+========================
+-If you delete or move an email, then use the "Message List" link at the
+ top left of the header, the message list is pulled from cache, and does
+ not reflect the deleted/moved email(s). To view the current list, click
+ the mailbox link in the left-hand navigation bar.
+-"Delete & Prev" or "Delete & Next" can result in strange behavior when
+ deleting the last or next to last message in a mailbox when using any
+ sort order other than 0.  It won't kill anything, you just might arrive
+ at a message other than the one you were expecting to see.
+ If anyone has any suggestions on this one, please let me know.
+
+
+Installation
+============
+See the "INSTALL" file.
+
+Changes
+=======
+See the "CHANGELOG" file.
+New versions are available at:
+http://www.brillat.net/~ben/files/projects/squirrelmail/
+
+Copyright
+=========
+Copyright (C) 2001 Benjamin Brillat
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program ("gpl.txt"); if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+Contact
+=======
+
+Let me know what you think:
+Ben Brillat <brillat-sqplugin@mainsheet.org>
+74 Punch Bowl Trail
+W. Kingston, RI 02892 USA
+
+

plugins/delete_move_next/setup.php

@@ -0,0 +1,364 @@
+<?php
+
+/**
+ * setup.php
+ *
+ * delete_move_next
+ *   deletes or moves currently displayed message and displays
+ *   next or previous message.
+ *
+ * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Licensed under the GNU GPL. For full terms see the file COPYING.
+ *
+ * $Id$
+ */
+
+function squirrelmail_plugin_init_delete_move_next() {
+    global $squirrelmail_plugin_hooks;
+    
+    $squirrelmail_plugin_hooks['html_top']['delete_move_next'] = 'delete_move_next_action';
+    $squirrelmail_plugin_hooks['right_main_after_header']['delete_move_next'] = 'delete_move_next_action';
+    $squirrelmail_plugin_hooks['read_body_bottom']['delete_move_next'] = 'delete_move_next_read_b';
+    $squirrelmail_plugin_hooks['read_body_top']['delete_move_next'] = 'delete_move_next_read_t';
+    $squirrelmail_plugin_hooks['options_display_inside']['delete_move_next'] = 'delete_move_next_display_inside';
+    $squirrelmail_plugin_hooks['options_display_save']['delete_move_next'] = 'delete_move_next_display_save';
+    $squirrelmail_plugin_hooks['loading_prefs']['delete_move_next'] = 'delete_move_next_loading_prefs';
+}
+
+
+/*
+ * Warning: this function relies on the internal representation of
+ * of the message cache for the current mailbox. As such, it is fragile
+ * because the underlying implementation can change. I will present it
+ * to the squirrelmail maintainers as a proposed addition to the API,
+ * perhaps even as inline code to sqimap_mailbox_expunge(). In the 
+ * meantime, you have been warned. [alane@geeksrus.net 2001/05/06]
+ */
+function delete_move_del_arr_elem($arr, $index) {
+    $tmp = array();
+    $lim = count($arr);
+    $j = 0;
+    for ($i = 0; $i < $lim; $i++) {
+        if ($i != $index) {
+            $tmp[$j++] = $arr[$i];
+        }
+    }
+    return $tmp;
+}
+
+function delete_move_show_msg_array() {
+    global $msort, $msgs;
+    
+    $keys = array_keys($msort);
+    for ($i = 0; $i < count($keys); $i++) {
+        echo '<p>key ' . $keys[$i] . ' msgid ' . $msgs[$keys[$i]]['ID'] . '</p>';
+    }
+}
+
+
+function delete_move_expunge_from_all($id) {
+    global $msgs, $msort, $sort, $imapConnection, $mailbox;
+    
+    // delete_move_show_msg_array();
+    
+    $delAt = -1;
+    for ($i = 0; $i < count($msort); $i++) {
+        if ($msgs[$i]['ID'] == $id) {
+            $delAt = $i;
+        } elseif ($msgs[$i]['ID'] > $id) {
+            $msgs[$i]['ID']--;
+        }
+    }
+    
+    $msgs = delete_move_del_arr_elem($msgs, $delAt);
+    $msort = delete_move_del_arr_elem($msort, $delAt);
+    
+    if ($sort < 6) {
+        if ($sort % 2) {
+            asort($msort);
+        } else {
+            arsort($msort);
+        }
+    }
+    
+    //  delete_move_show_msg_array();
+    
+    sqimap_mailbox_expunge($imapConnection, $mailbox, true);
+}
+
+function delete_move_next_action() {
+
+    global $PHP_SELF,
+           $delete_id, $move_id;
+
+    if ($delete_id) {
+        delete_move_next_delete();
+    } elseif ($move_id) {
+        delete_move_next_move();
+    }
+
+}
+
+function delete_move_next_read_t() {
+
+    global $delete_move_next_t;
+
+    if($delete_move_next_t == 'on') {
+        delete_move_next_read('top');
+    }
+}
+
+function delete_move_next_read_b() {
+
+    global $delete_move_next_b;
+
+    if ($delete_move_next_b != 'off') {
+        delete_move_next_read('bottom');
+    }
+}
+
+
+function delete_move_next_read($currloc) {
+    global $delete_move_next_formATtop, $delete_move_next_formATbottom,
+           $color, $where, $what, $currentArrayIndex, $passed_id,
+           $urlMailbox, $sort, $startMessage, $delete_id, $move_id,
+           $imapConnection, $auto_expunge, $move_to_trash;
+
+    if (!(($where && $what) || ($currentArrayIndex == -1))) {
+    
+        $next = findNextMessage();
+        $prev = findPreviousMessage();
+        $prev_if_del = $prev;
+        $next_if_del = $next;
+        if ($auto_expunge || $move_to_trash) {
+            if ($prev_if_del > $passed_id) {
+                $prev_if_del--;
+            }
+            if ($next_if_del > $passed_id) {
+                $next_if_del--;
+            }
+        }    
+        
+        $location = get_location();
+        echo "<base href=\"$location/\">" .
+             '<table cols=1 cellspacing=0 width=100% border=0 cellpadding=2>'.
+             '<tr>'.
+                 "<td bgcolor=\"$color[9]\" width=100% align=center><small>";
+    
+        if ($prev > 0) {
+            echo "<a href=\"read_body.php?passed_id=$prev&mailbox=$urlMailbox&sort=$sort&startMessage=$startMessage&show_more=0\">" . _("Previous") . "</A>&nbsp;|&nbsp;";
+        } else {
+            echo _("Previous") . "&nbsp;|&nbsp;";
+        }
+        if ($next > 0) {
+            echo "<a href=\"read_body.php?passed_id=$next&mailbox=$urlMailbox&sort=$sort&startMessage=$startMessage&show_more=0\">" . _("Next") . "</A>&nbsp;|&nbsp;";
+        } else {
+            echo _("Next") . "&nbsp;|&nbsp;";
+        }
+        if ($prev > 0){
+            echo "<a href=\"read_body.php?passed_id=$prev_if_del&mailbox=$urlMailbox&sort=$sort&startMessage=$startMessage&show_more=0&delete_id=$passed_id\">" . _("Delete & Prev") . "</a>" . "&nbsp;|&nbsp;";
+        }
+        else {
+            echo _("Delete & Prev") . "&nbsp;|&nbsp;";
+        }
+        if ($next > 0){
+            echo "<a href=\"read_body.php?passed_id=$next_if_del&mailbox=$urlMailbox&sort=$sort&startMessage=$startMessage&show_more=0&delete_id=$passed_id\">" . _("Delete & Next") . "</a>";
+        } else {
+            echo _("Delete & Next");
+        }
+        echo '</small></td></tr>';
+        
+        if ($next_if_del < 0) {
+            $next_if_del = $prev_if_del;
+        }
+        if (($delete_move_next_formATtop == 'on') && ($currloc == 'top')){
+            if ($next_if_del > 0) {
+                delete_move_next_moveNextForm($next_if_del);
+            } else {
+                delete_move_next_moveRightMainForm();
+            }
+        }
+        if (($delete_move_next_formATbottom != 'off') && ($currloc == 'bottom')){
+            if ($next_if_del > 0) {
+                delete_move_next_moveNextForm($next_if_del);
+            } else {
+                delete_move_next_moveRightMainForm();
+            }
+        }
+        echo '</table>';
+    }
+}
+
+function get_move_target_list() {
+    global $imapConnection;
+    
+    $boxes = sqimap_mailbox_list($imapConnection);
+    for ($i = 0; $i < count($boxes); $i++) {  
+        if (!in_array('noselect', $boxes[$i]['flags'])) {
+            $box = $boxes[$i]['unformatted'];
+            $box2 = str_replace(' ', '&nbsp;', $boxes[$i]['unformatted-disp']);
+            echo "          <option value=\"$box\">$box2\n";
+        }
+    }
+}
+
+function delete_move_next_moveNextForm($next) {
+
+    global $color, $where, $what, $currentArrayIndex, $passed_id,
+           $urlMailbox, $sort, $startMessage, $delete_id, $move_id,
+           $imapConnection;
+
+?>
+   <tr>
+      <form action="<?php echo "read_body.php"?>" method="get">
+      <td bgcolor="<?php echo $color[9] ?>" width=100% align=center><small>
+        <input type="hidden" name="passed_id" value="<?php echo $next ?>">
+        <input type="hidden" name="mailbox" value="<?php echo $urlMailbox ?>">
+        <input type="hidden" name="sort" value="<?php echo $sort ?>">
+        <input type="hidden" name="startMessage" value="<?php echo $startMessage ?>">
+        <input type="hidden" name="show_more" value="0">
+        <input type="hidden" name="move_id" value="<?php echo $passed_id ?>">
+        Move to:
+        <select name="targetMailbox">
+        <?php get_move_target_list(); ?></select>
+       <input type=submit value="Move">
+       </small>
+      </td>
+      </form>
+    </tr>
+
+<?php
+
+}
+
+function delete_move_next_moveRightMainForm() {
+
+    global $color, $where, $what, $currentArrayIndex, $passed_id,
+           $urlMailbox, $sort, $startMessage, $delete_id, $move_id,
+           $imapConnection;
+
+?>
+   <tr>
+      <form action="<?php echo "right_main.php"?>" method="get">
+      <td bgcolor="<?php echo $color[9] ?>" width=100% align=center><small>
+        <input type="hidden" name="mailbox" value="<?php echo $urlMailbox ?>">
+        <input type="hidden" name="sort" value="<?php echo $sort ?>">
+        <input type="hidden" name="startMessage" value="<?php echo $startMessage ?>">
+        <input type="hidden" name="move_id" value="<?php echo $passed_id ?>">
+        Move to:
+        <select name="targetMailbox">
+        <?php get_move_target_list(); ?></select>
+       <input type=submit value="Move">
+       </small>
+      </td>
+      </form>
+    </tr>
+
+<?php
+
+}
+
+
+function delete_move_next_delete() {
+    global $imapConnection, $delete_id, $mailbox, $auto_expunge;
+    
+    sqimap_messages_delete($imapConnection, $delete_id, $delete_id, $mailbox);
+    if ($auto_expunge){
+        delete_move_expunge_from_all($delete_id);
+        // sqimap_mailbox_expunge($imapConnection, $mailbox, true);    
+    }
+}
+
+function delete_move_next_move() {
+    global $imapConnection, $move_id, $targetMailbox, $auto_expunge, $mailbox;
+    
+    // Move message
+    sqimap_messages_copy($imapConnection, $move_id, $move_id, $targetMailbox);
+    sqimap_messages_flag($imapConnection, $move_id, $move_id, 'Deleted');
+    if ($auto_expunge) {
+        delete_move_expunge_from_all($move_id);
+        // sqimap_mailbox_expunge($imapConnection, $mailbox, true);
+    }
+}
+
+function delete_move_next_display_inside() {
+    global $username,$data_dir,
+        $delete_move_next_t, $delete_move_next_formATtop,
+        $delete_move_next_b, $delete_move_next_formATbottom;
+    
+    echo "<tr><td align=right valign=top>\n".
+         _("delete_move_next:") . "</td>\n".
+         "<td><input type=checkbox name=delete_move_next_ti";
+         
+    if ($delete_move_next_t == 'on') {
+        echo " checked";
+    }
+    echo '> <- ' . _("display at top").
+         " <input type=checkbox name=delete_move_next_formATtopi";
+         
+    if ($delete_move_next_formATtop == 'on') {
+        echo ' checked';
+    }
+    echo '> <- ' . _("with move option") . '<br>';    
+    
+    echo '<input type=checkbox name=delete_move_next_bi';
+    if($delete_move_next_b != 'off') {
+        echo ' checked';
+    }
+    echo '> <- ' . _("display at bottom") .
+         '<input type=checkbox name=delete_move_next_formATbottomi';
+         
+    if ($delete_move_next_formATbottom != 'off') {
+        echo ' checked';
+    }
+    echo '> <- ' . _("with move option") . '<br>'.
+         "</td></tr>\n";
+}
+
+function delete_move_next_display_save() {
+
+    global $username,$data_dir,
+           $delete_move_next_ti, $delete_move_next_formATtopi,
+           $delete_move_next_bi, $delete_move_next_formATbottomi;
+    
+    if (isset($delete_move_next_ti)) {
+        setPref($data_dir, $username, 'delete_move_next_t', 'on');
+    } else {
+        setPref($data_dir, $username, 'delete_move_next_t', "off");
+    }
+    
+    if (isset($delete_move_next_formATtopi)) {
+        setPref($data_dir, $username, 'delete_move_next_formATtop', 'on');
+    } else {
+        setPref($data_dir, $username, 'delete_move_next_formATtop', "off");
+    }
+    
+    
+    if (isset($delete_move_next_bi)) {
+        setPref($data_dir, $username, 'delete_move_next_b', 'on');
+    } else {
+        setPref($data_dir, $username, 'delete_move_next_b', "off");
+    }
+    
+    if (isset($delete_move_next_formATbottomi)) {
+        setPref($data_dir, $username, 'delete_move_next_formATbottom', 'on');
+    } else {
+        setPref($data_dir, $username, 'delete_move_next_formATbottom', "off");
+    }
+
+}
+
+
+function delete_move_next_loading_prefs() {
+    global $username,$data_dir,
+           $delete_move_next_t, $delete_move_next_formATtop,
+           $delete_move_next_b, $delete_move_next_formATbottom;
+    
+    $delete_move_next_t = getPref($data_dir, $username, 'delete_move_next_t');
+    $delete_move_next_b = getPref($data_dir, $username, 'delete_move_next_b');
+    $delete_move_next_formATtop = getPref($data_dir, $username, 'delete_move_next_formATtop');
+    $delete_move_next_formATbottom = getPref($data_dir, $username, 'delete_move_next_formATbottom');
+
+}
+
+?>

po/squirrelmail.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-01-23 09:37+0100\n"
+"POT-Creation-Date: 2002-01-24 15:07+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,7 +20,7 @@ msgstr ""
 
 #: squirrelmail/src/addrbook_search.php:98
 #: squirrelmail/src/addrbook_search_html.php:66
-#: squirrelmail/src/addressbook.php:285 squirrelmail/src/vcard.php:107
+#: squirrelmail/src/addressbook.php:285 squirrelmail/src/vcard.php:85
 msgid "Name"
 msgstr ""
 
@@ -64,7 +64,7 @@ msgstr ""
 msgid "All address books"
 msgstr ""
 
-#: squirrelmail/functions/page_header.php:124
+#: squirrelmail/functions/page_header.php:128
 #: squirrelmail/src/addrbook_search.php:190
 #: squirrelmail/src/addrbook_search_html.php:150
 #: squirrelmail/src/search.php:45 squirrelmail/src/search.php:124
@@ -181,8 +181,8 @@ msgstr ""
 
 #: squirrelmail/functions/mailbox_display.php:581
 #: squirrelmail/plugins/filters/options.php:97
-#: squirrelmail/src/compose.php:305 squirrelmail/src/download.php:143
-#: squirrelmail/src/download.php:149
+#: squirrelmail/src/compose.php:305 squirrelmail/src/download.php:130
+#: squirrelmail/src/download.php:135
 #: squirrelmail/src/options_highlight.php:334
 #: squirrelmail/src/options_order.php:57
 #: squirrelmail/src/printer_friendly_bottom.php:118
@@ -192,8 +192,8 @@ msgstr ""
 
 #: squirrelmail/functions/mailbox_display.php:567
 #: squirrelmail/plugins/filters/options.php:85
-#: squirrelmail/src/compose.php:306 squirrelmail/src/download.php:144
-#: squirrelmail/src/download.php:151
+#: squirrelmail/src/compose.php:306 squirrelmail/src/download.php:131
+#: squirrelmail/src/download.php:137
 #: squirrelmail/src/options_highlight.php:322
 #: squirrelmail/src/options_order.php:55
 #: squirrelmail/src/printer_friendly_bottom.php:112
@@ -202,16 +202,16 @@ msgid "From"
 msgstr ""
 
 #: squirrelmail/functions/mailbox_display.php:575
-#: squirrelmail/src/compose.php:307 squirrelmail/src/download.php:146
-#: squirrelmail/src/download.php:155 squirrelmail/src/options_order.php:56
+#: squirrelmail/src/compose.php:307 squirrelmail/src/download.php:133
+#: squirrelmail/src/download.php:141 squirrelmail/src/options_order.php:56
 #: squirrelmail/src/printer_friendly_bottom.php:117
 msgid "Date"
 msgstr ""
 
 #: squirrelmail/functions/mailbox_display.php:565
 #: squirrelmail/plugins/filters/options.php:88
-#: squirrelmail/src/compose.php:309 squirrelmail/src/download.php:145
-#: squirrelmail/src/download.php:153
+#: squirrelmail/src/compose.php:309 squirrelmail/src/download.php:132
+#: squirrelmail/src/download.php:139
 #: squirrelmail/src/options_highlight.php:325
 #: squirrelmail/src/printer_friendly_bottom.php:113
 #: squirrelmail/src/search.php:119
@@ -255,7 +255,7 @@ msgstr ""
 msgid "Delete selected attachments"
 msgstr ""
 
-#: squirrelmail/functions/page_header.php:118 squirrelmail/src/compose.php:609
+#: squirrelmail/functions/page_header.php:122 squirrelmail/src/compose.php:609
 #: squirrelmail/src/compose.php:613 squirrelmail/src/compose.php:617
 msgid "Addresses"
 msgstr ""
@@ -298,19 +298,19 @@ msgstr ""
 msgid "who"
 msgstr ""
 
-#: squirrelmail/src/download.php:49
+#: squirrelmail/src/download.php:31
 msgid "Viewing a text attachment"
 msgstr ""
 
-#: squirrelmail/src/download.php:52 squirrelmail/src/download.php:54
+#: squirrelmail/src/download.php:34 squirrelmail/src/download.php:36
 #: squirrelmail/src/image.php:31 squirrelmail/src/image.php:35
-#: squirrelmail/src/read_body.php:162 squirrelmail/src/vcard.php:51
-#: squirrelmail/src/vcard.php:55
+#: squirrelmail/src/read_body.php:162 squirrelmail/src/vcard.php:35
+#: squirrelmail/src/vcard.php:39
 msgid "View message"
 msgstr ""
 
-#: squirrelmail/functions/mime.php:620 squirrelmail/src/download.php:59
-#: squirrelmail/src/image.php:44 squirrelmail/src/vcard.php:212
+#: squirrelmail/functions/mime.php:620 squirrelmail/src/download.php:41
+#: squirrelmail/src/image.php:44 squirrelmail/src/vcard.php:196
 msgid "Download this as a file"
 msgstr ""
 
@@ -322,7 +322,7 @@ msgstr ""
 msgid "Click here to go back"
 msgstr ""
 
-#: squirrelmail/functions/page_header.php:120 squirrelmail/src/folders.php:29
+#: squirrelmail/functions/page_header.php:124 squirrelmail/src/folders.php:29
 #: squirrelmail/src/left_main.php:234
 msgid "Folders"
 msgstr ""
@@ -432,7 +432,7 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: squirrelmail/functions/page_header.php:126
+#: squirrelmail/functions/page_header.php:130
 #: squirrelmail/plugins/listcommands/setup.php:32 squirrelmail/src/help.php:91
 msgid "Help"
 msgstr ""
@@ -455,6 +455,8 @@ msgstr ""
 #: squirrelmail/functions/mailbox_display.php:735
 #: squirrelmail/functions/mailbox_display.php:738
 #: squirrelmail/functions/mailbox_display.php:741
+#: squirrelmail/plugins/delete_move_next/setup.php:149
+#: squirrelmail/plugins/delete_move_next/setup.php:151
 #: squirrelmail/src/help.php:187 squirrelmail/src/help.php:191
 #: squirrelmail/src/read_body.php:495 squirrelmail/src/read_body.php:497
 msgid "Previous"
@@ -463,6 +465,8 @@ msgstr ""
 #: squirrelmail/functions/mailbox_display.php:736
 #: squirrelmail/functions/mailbox_display.php:739
 #: squirrelmail/functions/mailbox_display.php:742
+#: squirrelmail/plugins/delete_move_next/setup.php:154
+#: squirrelmail/plugins/delete_move_next/setup.php:156
 #: squirrelmail/src/help.php:195 squirrelmail/src/help.php:198
 #: squirrelmail/src/read_body.php:501 squirrelmail/src/read_body.php:503
 msgid "Next"
@@ -512,9 +516,9 @@ msgstr ""
 msgid "Password:"
 msgstr ""
 
-#: squirrelmail/src/move_messages.php:93
-#: squirrelmail/src/move_messages.php:128
-#: squirrelmail/src/move_messages.php:157
+#: squirrelmail/src/move_messages.php:79
+#: squirrelmail/src/move_messages.php:114
+#: squirrelmail/src/move_messages.php:143
 msgid "No messages were selected."
 msgstr ""
 
@@ -773,7 +777,7 @@ msgstr ""
 msgid "Disabled"
 msgstr ""
 
-#: squirrelmail/functions/page_header.php:122
+#: squirrelmail/functions/page_header.php:126
 #: squirrelmail/plugins/filters/options.php:62
 #: squirrelmail/plugins/newmail/newmail_opt.php:34
 #: squirrelmail/plugins/translate/options.php:97
@@ -1202,7 +1206,7 @@ msgstr ""
 msgid "Everywhere"
 msgstr ""
 
-#: squirrelmail/functions/page_header.php:110 squirrelmail/src/signout.php:84
+#: squirrelmail/functions/page_header.php:114 squirrelmail/src/signout.php:84
 msgid "Sign Out"
 msgstr ""
 
@@ -1214,55 +1218,55 @@ msgstr ""
 msgid "Click here to log back in."
 msgstr ""
 
-#: squirrelmail/src/vcard.php:46
+#: squirrelmail/src/vcard.php:30
 msgid "Viewing a Business Card"
 msgstr ""
 
-#: squirrelmail/src/vcard.php:108 squirrelmail/src/vcard.php:169
+#: squirrelmail/src/vcard.php:86 squirrelmail/src/vcard.php:146
 msgid "Title"
 msgstr ""
 
-#: squirrelmail/src/vcard.php:109
+#: squirrelmail/src/vcard.php:87
 msgid "Email"
 msgstr ""
 
-#: squirrelmail/src/vcard.php:110 squirrelmail/src/vcard.php:163
+#: squirrelmail/src/vcard.php:88 squirrelmail/src/vcard.php:138
 msgid "Web Page"
 msgstr ""
 
-#: squirrelmail/src/vcard.php:111 squirrelmail/src/vcard.php:172
+#: squirrelmail/src/vcard.php:89 squirrelmail/src/vcard.php:150
 msgid "Organization / Department"
 msgstr ""
 
-#: squirrelmail/src/vcard.php:112 squirrelmail/src/vcard.php:166
+#: squirrelmail/src/vcard.php:90 squirrelmail/src/vcard.php:142
 msgid "Address"
 msgstr ""
 
-#: squirrelmail/src/vcard.php:113 squirrelmail/src/vcard.php:179
+#: squirrelmail/src/vcard.php:91 squirrelmail/src/vcard.php:159
 msgid "Work Phone"
 msgstr ""
 
-#: squirrelmail/src/vcard.php:114 squirrelmail/src/vcard.php:182
+#: squirrelmail/src/vcard.php:92 squirrelmail/src/vcard.php:163
 msgid "Home Phone"
 msgstr ""
 
-#: squirrelmail/src/vcard.php:115 squirrelmail/src/vcard.php:185
+#: squirrelmail/src/vcard.php:93 squirrelmail/src/vcard.php:167
 msgid "Cellular Phone"
 msgstr ""
 
-#: squirrelmail/src/vcard.php:116 squirrelmail/src/vcard.php:188
+#: squirrelmail/src/vcard.php:94 squirrelmail/src/vcard.php:171
 msgid "Fax"
 msgstr ""
 
-#: squirrelmail/src/vcard.php:117 squirrelmail/src/vcard.php:191
+#: squirrelmail/src/vcard.php:95 squirrelmail/src/vcard.php:175
 msgid "Note"
 msgstr ""
 
-#: squirrelmail/src/vcard.php:149
+#: squirrelmail/src/vcard.php:124
 msgid "Add to Addressbook"
 msgstr ""
 
-#: squirrelmail/src/vcard.php:176
+#: squirrelmail/src/vcard.php:155
 msgid "Title & Org. / Dept."
 msgstr ""
 
@@ -1770,11 +1774,11 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: squirrelmail/functions/page_header.php:107
+#: squirrelmail/functions/page_header.php:108
 msgid "Current Folder"
 msgstr ""
 
-#: squirrelmail/functions/page_header.php:116
+#: squirrelmail/functions/page_header.php:120
 msgid "Compose"
 msgstr ""
 
@@ -3583,3 +3587,30 @@ msgstr ""
 #: squirrelmail/plugins/listcommands/setup.php:90
 msgid "Mailinglist options:"
 msgstr ""
+
+#: squirrelmail/plugins/delete_move_next/setup.php:159
+#: squirrelmail/plugins/delete_move_next/setup.php:162
+msgid "Delete & Prev"
+msgstr ""
+
+#: squirrelmail/plugins/delete_move_next/setup.php:165
+#: squirrelmail/plugins/delete_move_next/setup.php:167
+msgid "Delete & Next"
+msgstr ""
+
+#: squirrelmail/plugins/delete_move_next/setup.php:290
+msgid "delete_move_next:"
+msgstr ""
+
+#: squirrelmail/plugins/delete_move_next/setup.php:296
+msgid "display at top"
+msgstr ""
+
+#: squirrelmail/plugins/delete_move_next/setup.php:302
+#: squirrelmail/plugins/delete_move_next/setup.php:314
+msgid "with move option"
+msgstr ""
+
+#: squirrelmail/plugins/delete_move_next/setup.php:308
+msgid "display at bottom"
+msgstr ""

po/xgetpo

@@ -36,5 +36,7 @@ xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \
     -C squirrelmail/plugins/calendar/*.php --output-dir=squirrelmail/po/
 xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \
     -C squirrelmail/plugins/listcommands/*.php --output-dir=squirrelmail/po/
+xgettext --keyword=_ -keyword=N_  --default-domain=squirrelmail -j \
+    -C squirrelmail/plugins/delete_move_next/*.php --output-dir=squirrelmail/po/
 
 cd squirrelmail/po