squirrelmail-cvs — SquirrelMail CVS Mailing List

[SM-CVS] SF.net SVN: squirrelmail:[14962] trunk/imap_proxy

[<pdo...@us...>]

Revision: 14962
          http://sourceforge.net/p/squirrelmail/code/14962
Author:   pdontthink
Date:     2022-05-24 01:55:24 +0000 (Tue, 24 May 2022)
Log Message:
-----------
Add regular SASL AUTH PLAIN (to upstream) capability (thanks to Emmanuel Dreyfus) (#484)

Modified Paths:
--------------
    trunk/imap_proxy/include/imapproxy.h
    trunk/imap_proxy/src/config.c
    trunk/imap_proxy/src/imapcommon.c

Modified: trunk/imap_proxy/include/imapproxy.h
===================================================================
--- trunk/imap_proxy/include/imapproxy.h	2022-05-23 00:25:07 UTC (rev 14961)
+++ trunk/imap_proxy/include/imapproxy.h	2022-05-24 01:55:24 UTC (rev 14962)
@@ -311,6 +311,7 @@
     unsigned char login_disabled;             /* login disabled flag */
     char *chroot_directory;                   /* chroot(2) into this dir */
     char *preauth_command;                    /* arbitrary pre-authentication command */
+    char *auth_sasl_mech;                     /* SASL mechanism */
     char *auth_sasl_plain_username;           /* authentication username under SASL PLAIN */
     char *auth_sasl_plain_password;           /* authentication password under SASL PLAIN */
     char *auth_shared_secret;                 /* REQUIRED shared secret in leiu of a user password when using LOGIN command with SASL PLAIN authentication */

Modified: trunk/imap_proxy/src/config.c
===================================================================
--- trunk/imap_proxy/src/config.c	2022-05-23 00:25:07 UTC (rev 14961)
+++ trunk/imap_proxy/src/config.c	2022-05-24 01:55:24 UTC (rev 14962)
@@ -398,6 +398,9 @@
     ADD_TO_TABLE( "preauth_command", SetStringValue,
 		  &PC_Struct.preauth_command, index );
 
+    ADD_TO_TABLE( "auth_sasl_mech", SetStringValue,
+		  &PC_Struct.auth_sasl_mech, index );
+
     ADD_TO_TABLE( "auth_sasl_plain_username", SetStringValue,
 		  &PC_Struct.auth_sasl_plain_username, index );
     

Modified: trunk/imap_proxy/src/imapcommon.c
===================================================================
--- trunk/imap_proxy/src/imapcommon.c	2022-05-23 00:25:07 UTC (rev 14961)
+++ trunk/imap_proxy/src/imapcommon.c	2022-05-24 01:55:24 UTC (rev 14962)
@@ -540,7 +540,7 @@
 
     char EncodedAuthBuf[BUFSIZE];
     char AuthBuf[BUFSIZE];
-    char AuthBufIndex;
+    unsigned int AuthBufIndex;
 
     unsigned int BufLen = BUFSIZE - 1;
     char md5pw[MD5_DIGEST_LENGTH];
@@ -903,11 +903,11 @@
 	    goto fail;
 	}
     }
-    
 
+
     /*
      * If configured to do so, execute SASL PLAIN authentication
-     * using the static authentication username and password from
+     * using the static authorization username and password from
      * configuration (auth_sasl_plain_username/auth_sasl_plain_password).
      *
      * Note that because this means no password is required from
@@ -937,7 +937,7 @@
 
 	/*
 	 * Build SASL AUTH PLAIN string:
-	 * username\0authentication_username\0authentication_password
+	 * authentication_username\0authorization_username\0authorization_password
 	 */
 	char *ptr_username;
 	unsigned int username_size;
@@ -998,6 +998,91 @@
 
 
     /*
+     * If configured to do so, use SASL PLAIN instead of IMAP LOGIN to authenticate
+     */
+    else if ( PC_Struct.auth_sasl_mech
+	&& !strcmp( PC_Struct.auth_sasl_mech, "plain" ) )
+    {
+	/*
+	 * Build SASL AUTH PLAIN string:
+	 * username\0username\0password
+	 */
+	char *ptr_username;
+	unsigned int username_size;
+	char *ptr_password;
+	unsigned int password_size;
+	unsigned int total_size;
+
+	/*
+	 * But first, if username is enclosed in quotes, skip the
+	 * first one and overwrite the second with \0 (with pointer
+	 * math for our use below, since we are still working on
+	 * the original Username)
+	 */
+	ptr_username = Username;
+	username_size = strlen( Username );
+	if ( *ptr_username == '"' && *(ptr_username + username_size - 1) == '"' )
+	{
+	    ++ptr_username;
+	    username_size = username_size - 2;
+	}
+
+	/*
+	 * Same with password
+	 */
+	ptr_password = Password;
+	password_size = strlen( Password );
+	if ( *ptr_password == '"' && *(ptr_password + password_size - 1) == '"' )
+	{
+	    ++ptr_password;
+	    password_size = password_size - 2;
+	}
+
+	/*
+	 * Make sure output buffer is big enough ( +3 for three \0 )
+	 */
+	total_size = username_size + username_size + password_size + 3;
+	if ( total_size > BufLen ) {
+	    syslog( LOG_INFO,
+		    "LOGIN: '%s' (%s:%s) failed: PLAIN AUTH needs %d bytes; BUFSIZE is only %d",
+		    Username, ClientAddr, portstr, total_size, BufLen );
+	    goto fail;
+	}
+
+	/*
+	 * Prepare the buffer
+	 */
+	AuthBufIndex = 0;
+
+	memcpy( AuthBuf + AuthBufIndex, ptr_username, username_size );
+	AuthBufIndex += username_size;
+	AuthBuf[AuthBufIndex++] = '\0';
+
+	memcpy( AuthBuf + AuthBufIndex, ptr_username, username_size );
+	AuthBufIndex += username_size;
+	AuthBuf[AuthBufIndex++] = '\0';
+
+	memcpy( AuthBuf + AuthBufIndex, ptr_password, password_size );
+	AuthBufIndex += password_size;
+	AuthBuf[AuthBufIndex++] = '\0';
+
+	EVP_EncodeBlock( EncodedAuthBuf, AuthBuf, AuthBufIndex );
+
+	snprintf( SendBuf, BufLen, "A0001 AUTHENTICATE PLAIN %s\r\n", EncodedAuthBuf );
+
+	/* syslog( LOG_INFO, "sending auth plain '%s'", EncodedAuthBuf ); */
+
+	if ( IMAP_Write( Server.conn, SendBuf, strlen(SendBuf) ) == -1 )
+	{
+	    syslog( LOG_INFO,
+		    "LOGIN: '%s' (%s:%s) failed: IMAP_Write() failed attempting to send AUTHENTICATE command to IMAP server: %s",
+		    Username, ClientAddr, portstr, strerror( errno ) );
+	    goto fail;
+	}
+    }
+    
+
+    /*
      * Otherwise, send a normal login command off to the IMAP server.
      *
      * ... but login command has to treat literal passwords differently:

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[SM-CVS] SF.net SVN: squirrelmail:[14961] trunk/squirrelmail/functions/mime.php

[<pdo...@us...>]

Revision: 14961
          http://sourceforge.net/p/squirrelmail/code/14961
Author:   pdontthink
Date:     2022-05-23 00:25:07 +0000 (Mon, 23 May 2022)
Log Message:
-----------
Greatly fix the plaintext display of messages that do not have a text part. Patch from Alexey Shpakovsky (#496)

Modified Paths:
--------------
    trunk/squirrelmail/functions/mime.php

Modified: trunk/squirrelmail/functions/mime.php
===================================================================
--- trunk/squirrelmail/functions/mime.php	2022-05-23 00:19:51 UTC (rev 14960)
+++ trunk/squirrelmail/functions/mime.php	2022-05-23 00:25:07 UTC (rev 14961)
@@ -396,18 +396,38 @@
          */
 
         if ($body_message->header->type1 == 'html') {
-            if ($show_html_default <> 1) {
+            // Do we need to make an HTML part viewable as non-HTML plain text?
+            if ($show_html_default != 1) {
                 $entity_conv = array('&nbsp;' => ' ',
-                                     '<p>'    => "\n",
-                                     '<P>'    => "\n",
-                                     '<br>'   => "\n",
-                                     '<BR>'   => "\n",
-                                     '<br />' => "\n",
-                                     '<BR />' => "\n",
+                                     // These are better done by regex (below)
+                                     // '<p>'    => "\n",
+                                     // '<P>'    => "\n",
+                                     // '<br>'   => "\n",
+                                     // '<BR>'   => "\n",
+                                     // '<br />' => "\n",
+                                     // '<BR />' => "\n",
+                                     // '<tr>'   => "\n",
+                                     // '<div>'  => "\n",
                                      '&gt;'   => '>',
-                                     '&lt;'   => '<');
+                                     '&lt;'   => '<',
+                                     '&amp;'   => '&',
+                                     '&copy;'   => '©');
+                // first, completely remove <style> tags as they aren't useful in this context
+                $body = preg_replace('/<style.*>.*<\/style.*>/isU', '', $body);
+                // emulate how newlines are treated as spaces in HTML
+                $body = preg_replace('/(\r|\n)+/', ' ', $body);
+                // now replace the tags listed just above
                 $body = strtr($body, $entity_conv);
+                // <p>, <br>, <tr> and <div> are best replaced by a newline
+                $body = preg_replace('/<(p|br|tr|div).*>/isU', "\n", $body);
+                // remove the rest of the HTML tags
                 $body = strip_tags($body);
+                // condense multiple spaces into one
+                $body = preg_replace('/[ \t]+/', ' ', $body);
+                // trim each line
+                $body = preg_replace('/ *\n */', "\n", $body);
+                // allow maximum two newlines
+                $body = preg_replace('/\n\n\n+/', "\n\n", $body);
                 $body = trim($body);
                 translateText($body, $wrap_at,
                         $body_message->header->getParameter('charset'));

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[SM-CVS] SF.net SVN: squirrelmail:[14960] branches/SM-1_4-STABLE/squirrelmail/ functions/mime.php

[<pdo...@us...>]

Revision: 14960
          http://sourceforge.net/p/squirrelmail/code/14960
Author:   pdontthink
Date:     2022-05-23 00:19:51 +0000 (Mon, 23 May 2022)
Log Message:
-----------
Greatly fix the plaintext display of messages that do not have a text part. Patch from Alexey Shpakovsky (#496)

Modified Paths:
--------------
    branches/SM-1_4-STABLE/squirrelmail/functions/mime.php

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/mime.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/mime.php	2022-05-22 22:30:12 UTC (rev 14959)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/mime.php	2022-05-23 00:19:51 UTC (rev 14960)
@@ -348,18 +348,38 @@
          */
 
         if ($body_message->header->type1 == 'html') {
-            if ($show_html_default <> 1) {
+            // Do we need to make an HTML part viewable as non-HTML plain text?
+            if ($show_html_default != 1) {
                 $entity_conv = array('&nbsp;' => ' ',
-                                     '<p>'    => "\n",
-                                     '<P>'    => "\n",
-                                     '<br>'   => "\n",
-                                     '<BR>'   => "\n",
-                                     '<br />' => "\n",
-                                     '<BR />' => "\n",
+                                     // These are better done by regex (below)
+                                     // '<p>'    => "\n",
+                                     // '<P>'    => "\n",
+                                     // '<br>'   => "\n",
+                                     // '<BR>'   => "\n",
+                                     // '<br />' => "\n",
+                                     // '<BR />' => "\n",
+                                     // '<tr>'   => "\n",
+                                     // '<div>'  => "\n",
                                      '&gt;'   => '>',
-                                     '&lt;'   => '<');
+                                     '&lt;'   => '<',
+                                     '&amp;'   => '&',
+                                     '&copy;'   => '©');
+                // first, completely remove <style> tags as they aren't useful in this context
+                $body = preg_replace('/<style.*>.*<\/style.*>/isU', '', $body);
+                // emulate how newlines are treated as spaces in HTML
+                $body = preg_replace('/(\r|\n)+/', ' ', $body);
+                // now replace the tags listed just above
                 $body = strtr($body, $entity_conv);
+                // <p>, <br>, <tr> and <div> are best replaced by a newline
+                $body = preg_replace('/<(p|br|tr|div).*>/isU', "\n", $body);
+                // remove the rest of the HTML tags
                 $body = strip_tags($body);
+                // condense multiple spaces into one
+                $body = preg_replace('/[ \t]+/', ' ', $body);
+                // trim each line
+                $body = preg_replace('/ *\n */', "\n", $body);
+                // allow maximum two newlines
+                $body = preg_replace('/\n\n\n+/', "\n\n", $body);
                 $body = trim($body);
                 translateText($body, $wrap_at,
                         $body_message->header->getParameter('charset'));

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[SM-CVS] SF.net SVN: squirrelmail:[14959] trunk/squirrelmail/functions/ imap_general.php

[<pdo...@us...>]

Revision: 14959
          http://sourceforge.net/p/squirrelmail/code/14959
Author:   pdontthink
Date:     2022-05-22 22:30:12 +0000 (Sun, 22 May 2022)
Log Message:
-----------
Fix: Login mechanisms other than "login" were broken if server returned untagged data before login response (#2854)

Modified Paths:
--------------
    trunk/squirrelmail/functions/imap_general.php

Modified: trunk/squirrelmail/functions/imap_general.php
===================================================================
--- trunk/squirrelmail/functions/imap_general.php	2022-05-22 22:15:28 UTC (rev 14958)
+++ trunk/squirrelmail/functions/imap_general.php	2022-05-22 22:30:12 UTC (rev 14959)
@@ -908,6 +908,11 @@
                     $read=sqimap_fgets($imap_stream);
                 }
             }
+            // IMAP server might return some untagged info before
+            // the tagged login command response - skip over that
+            while ($read[0] === '*') {
+                $read = sqimap_fgets($imap_stream);
+            }
             $results=explode(" ",$read,3);
             $response=$results[1];
             $message=$results[2];
@@ -936,7 +941,7 @@
          * credentials and use that as the authorization identity.
          */
         $tag=sqimap_session_id(false);
-        $sasl = (isset($sqimap_capabilities['SASL-IR']) && $sqimap_capabilities['SASL-IR']) ? true : false;
+        $sasl = sqimap_capability($imap_stream, 'SASL-IR');
         if(!empty($authz)) {
             $auth = base64_encode("$username\0$authz\0$password");
         } else {
@@ -957,6 +962,11 @@
                 $read = sqimap_fgets($imap_stream);
             }
         }
+        // IMAP server might return some untagged info before
+        // the tagged login command response - skip over that
+        while ($read[0] === '*') {
+            $read = sqimap_fgets($imap_stream);
+        }
         $results=explode(" ",$read,3);
         $response=$results[1];
         $message=$results[2];

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[SM-CVS] SF.net SVN: squirrelmail:[14958] branches/SM-1_4-STABLE/squirrelmail/ functions/imap_general.php

[<pdo...@us...>]

Revision: 14958
          http://sourceforge.net/p/squirrelmail/code/14958
Author:   pdontthink
Date:     2022-05-22 22:15:28 +0000 (Sun, 22 May 2022)
Log Message:
-----------
Fix: Login mechanisms other than "login" were broken if server returned untagged data before login response (#2854)

Modified Paths:
--------------
    branches/SM-1_4-STABLE/squirrelmail/functions/imap_general.php

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/imap_general.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/imap_general.php	2022-05-22 20:32:06 UTC (rev 14957)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/imap_general.php	2022-05-22 22:15:28 UTC (rev 14958)
@@ -568,6 +568,11 @@
                     $read=sqimap_fgets($imap_stream);
                 }
             }
+            // IMAP server might return some untagged info before
+            // the tagged login command response - skip over that
+            while ($read[0] === '*') {
+                $read = sqimap_fgets($imap_stream);
+            }
             $results=explode(" ",$read,3);
             $response=$results[1];
             $message=$results[2];
@@ -618,7 +623,7 @@
          * credentials and use that as the authorization identity.
          */
         $tag=sqimap_session_id(false);
-        $sasl = (isset($sqimap_capabilities['SASL-IR']) && $sqimap_capabilities['SASL-IR']) ? true : false;
+        $sasl = sqimap_capability($imap_stream, 'SASL-IR');
         if(!empty($authz)) {
             $auth = base64_encode("$username\0$authz\0$password");
         } else {
@@ -639,6 +644,11 @@
                 $read = sqimap_fgets($imap_stream);
             }
         }
+        // IMAP server might return some untagged info before
+        // the tagged login command response - skip over that
+        while ($read[0] === '*') {
+            $read = sqimap_fgets($imap_stream);
+        }
         $results=explode(" ",$read,3);
         $response=$results[1];
         $message=$results[2];

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[SM-CVS] SF.net SVN: squirrelmail:[14957] trunk/squirrelmail

[<pdo...@us...>]

Revision: 14957
          http://sourceforge.net/p/squirrelmail/code/14957
Author:   pdontthink
Date:     2022-05-22 20:32:06 +0000 (Sun, 22 May 2022)
Log Message:
-----------
Add option to folder prefs for marking deleted messages as read

Modified Paths:
--------------
    trunk/squirrelmail/functions/imap_messages.php
    trunk/squirrelmail/include/load_prefs.php
    trunk/squirrelmail/include/options/folder.php

Modified: trunk/squirrelmail/functions/imap_messages.php
===================================================================
--- trunk/squirrelmail/functions/imap_messages.php	2022-05-22 20:16:41 UTC (rev 14956)
+++ trunk/squirrelmail/functions/imap_messages.php	2022-05-22 20:32:06 UTC (rev 14957)
@@ -68,7 +68,9 @@
  */
 function sqimap_msgs_list_delete($imap_stream, $mailbox, $id, $bypass_trash=false) {
     // FIXME: Remove globals by introducing an associative array with properties as 4th argument as replacement for the $bypass_trash variable.
-    global $move_to_trash, $trash_folder;
+    global $move_to_trash, $trash_folder, $mark_as_read_upon_delete;
+    if ($mark_as_read_upon_delete)
+        sqimap_toggle_flag($imap_stream, $id, '\\Seen', true, true);
     if (($move_to_trash == true) && ($bypass_trash != true) &&
         (sqimap_mailbox_exists($imap_stream, $trash_folder) &&  ($mailbox != $trash_folder)) ) {
         /**

Modified: trunk/squirrelmail/include/load_prefs.php
===================================================================
--- trunk/squirrelmail/include/load_prefs.php	2022-05-22 20:16:41 UTC (rev 14956)
+++ trunk/squirrelmail/include/load_prefs.php	2022-05-22 20:32:06 UTC (rev 14957)
@@ -78,6 +78,9 @@
 $save_as_draft =
     getPref($data_dir, $username, 'save_as_draft', $default_save_as_draft);
 
+$mark_as_read_upon_delete =
+    getPref($data_dir, $username, 'mark_as_read_upon_delete', FALSE);
+
 if ($default_unseen_type == '') {
     $default_unseen_type = 1;
 }

Modified: trunk/squirrelmail/include/options/folder.php
===================================================================
--- trunk/squirrelmail/include/options/folder.php	2022-05-22 20:16:41 UTC (rev 14956)
+++ trunk/squirrelmail/include/options/folder.php	2022-05-22 20:32:06 UTC (rev 14957)
@@ -105,6 +105,14 @@
     );
 
     $optvals[SMOPT_GRP_SPCFOLDER][] = array(
+        'name'    => 'mark_as_read_upon_delete',
+        'caption' => _("Mark Deleted Messages as Read"),
+        'type'    => SMOPT_TYPE_BOOLEAN,
+        'refresh' => SMOPT_REFRESH_NONE
+    );
+
+//TODO: Arguably, this should go in Compose preferences, not here
+    $optvals[SMOPT_GRP_SPCFOLDER][] = array(
         'name'    => 'save_reply_with_orig',
         'caption' => _("Save Replies with Original Message"),
         'type'    => SMOPT_TYPE_BOOLEAN,

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[SM-CVS] SF.net SVN: squirrelmail:[14956] branches/SM-1_4-STABLE/squirrelmail

[<pdo...@us...>]

Revision: 14956
          http://sourceforge.net/p/squirrelmail/code/14956
Author:   pdontthink
Date:     2022-05-22 20:16:41 +0000 (Sun, 22 May 2022)
Log Message:
-----------
Add option to folder prefs for marking deleted messages as read

Modified Paths:
--------------
    branches/SM-1_4-STABLE/squirrelmail/functions/imap_messages.php
    branches/SM-1_4-STABLE/squirrelmail/include/load_prefs.php
    branches/SM-1_4-STABLE/squirrelmail/include/options/folder.php

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/imap_messages.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/imap_messages.php	2022-05-22 18:57:29 UTC (rev 14955)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/imap_messages.php	2022-05-22 20:16:41 UTC (rev 14956)
@@ -71,8 +71,10 @@
  *
  */
 function sqimap_msgs_list_delete($imap_stream, $mailbox, $id) {
-    global $move_to_trash, $trash_folder, $uid_support;
+    global $move_to_trash, $trash_folder, $uid_support, $mark_as_read_upon_delete;
     $msgs_id = sqimap_message_list_squisher($id);
+    if ($mark_as_read_upon_delete)
+        sqimap_toggle_flag($imap_stream, $id, '\\Seen', true, true);
     if (($move_to_trash == true) && (sqimap_mailbox_exists($imap_stream, $trash_folder) && ($mailbox != $trash_folder))) {
         /**
          * turn off internal error handling (third argument = false) and

Modified: branches/SM-1_4-STABLE/squirrelmail/include/load_prefs.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/include/load_prefs.php	2022-05-22 18:57:29 UTC (rev 14955)
+++ branches/SM-1_4-STABLE/squirrelmail/include/load_prefs.php	2022-05-22 20:16:41 UTC (rev 14956)
@@ -87,6 +87,9 @@
 $save_as_draft =
     getPref($data_dir, $username, 'save_as_draft', $default_save_as_draft);
 
+$mark_as_read_upon_delete =
+    getPref($data_dir, $username, 'mark_as_read_upon_delete', FALSE);
+
 if ($default_unseen_type == '') {
     $default_unseen_type = 1;
 }
@@ -130,7 +133,6 @@
 
 $show_num = getPref($data_dir, $username, 'show_num', 15 );
 
-$wrap_at = getPref( $data_dir, $username, 'wrap_at', 86 );
 if ($wrap_at < 15) { $wrap_at = 15; }
 
 $left_size = getPref($data_dir, $username, 'left_size');

Modified: branches/SM-1_4-STABLE/squirrelmail/include/options/folder.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/include/options/folder.php	2022-05-22 18:57:29 UTC (rev 14955)
+++ branches/SM-1_4-STABLE/squirrelmail/include/options/folder.php	2022-05-22 20:16:41 UTC (rev 14956)
@@ -97,6 +97,12 @@
         'posvals' => $sent_folder_values,
         'save'    => 'save_option_sent_folder'
     );
+    $optvals[SMOPT_GRP_SPCFOLDER][] = array(
+        'name'    => 'mark_as_read_upon_delete',
+        'caption' => _("Mark Deleted Messages as Read"),
+        'type'    => SMOPT_TYPE_BOOLEAN,
+        'refresh' => SMOPT_REFRESH_NONE
+    );
 
     /*** Load the General Options into the array ***/
     $optgrps[SMOPT_GRP_FOLDERLIST] = _("Folder List Options");

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[SM-CVS] SF.net SVN: squirrelmail:[14955] branches/SM-1_4-STABLE/squirrelmail/ functions/db_prefs.php

[<pdo...@us...>]

Revision: 14955
          http://sourceforge.net/p/squirrelmail/code/14955
Author:   pdontthink
Date:     2022-05-22 18:57:29 +0000 (Sun, 22 May 2022)
Log Message:
-----------
Correct global config name

Modified Paths:
--------------
    branches/SM-1_4-STABLE/squirrelmail/functions/db_prefs.php

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/db_prefs.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/db_prefs.php	2022-05-22 18:55:29 UTC (rev 14954)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/db_prefs.php	2022-05-22 18:57:29 UTC (rev 14955)
@@ -35,17 +35,17 @@
  *                                 internal database information from being
  *                                 exposed. This should be enabled only for
  *                                 debugging purposes.
- *    string $identifier_quote_char By default, SquirrelMail will quote
- *                                  table and field names in database
- *                                  queries with what it thinks is the
- *                                  appropriate quote character for the
- *                                  database type being used (backtick
- *                                  for MySQL (and thus MariaDB), double
- *                                  quotes for all others), but you can
- *                                  override the character used by
- *                                  putting it here, or tell SquirrelMail
- *                                  NOT to quote identifiers by setting
- *                                  this to "none"
+ *    string $db_identifier_quote_char By default, SquirrelMail will quote
+ *                                     table and field names in database
+ *                                     queries with what it thinks is the
+ *                                     appropriate quote character for the
+ *                                     database type being used (backtick
+ *                                     for MySQL (and thus MariaDB), double
+ *                                     quotes for all others), but you can
+ *                                     override the character used by
+ *                                     putting it here, or tell SquirrelMail
+ *                                     NOT to quote identifiers by setting
+ *                                     this to "none"
  *
  * @copyright 1999-2022 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
@@ -170,7 +170,7 @@
     }
 
     function open() {
-        global $prefs_dsn, $prefs_table, $use_pdo, $identifier_quote_char;
+        global $prefs_dsn, $prefs_table, $use_pdo, $db_identifier_quote_char;
         global $prefs_user_field, $prefs_key_field, $prefs_val_field;
 
         if(isset($this->dbh)) {
@@ -184,15 +184,15 @@
         }
 
         // figure out identifier quoting
-        if (empty($identifier_quote_char)) {
+        if (empty($db_identifier_quote_char)) {
             if ($this->db_type == SMDB_MYSQL)
                 $this->identifier_quote_char = '`';
             else
                 $this->identifier_quote_char = '"';
-        } else if ($identifier_quote_char === 'none')
+        } else if ($db_identifier_quote_char === 'none')
             $this->identifier_quote_char = '';
         else
-            $this->identifier_quote_char = $identifier_quote_char;
+            $this->identifier_quote_char = $db_identifier_quote_char;
 
         if (!empty($prefs_table)) {
             $this->table = $prefs_table;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[SM-CVS] SF.net SVN: squirrelmail:[14954] trunk/squirrelmail/functions/db_prefs.php

[<pdo...@us...>]

Revision: 14954
          http://sourceforge.net/p/squirrelmail/code/14954
Author:   pdontthink
Date:     2022-05-22 18:55:29 +0000 (Sun, 22 May 2022)
Log Message:
-----------
Implement SQL identifier quoting in all cases (alleviates issue double-quoting user field under PGSQL, #177)

Modified Paths:
--------------
    trunk/squirrelmail/functions/db_prefs.php

Modified: trunk/squirrelmail/functions/db_prefs.php
===================================================================
--- trunk/squirrelmail/functions/db_prefs.php	2022-05-22 18:40:05 UTC (rev 14953)
+++ trunk/squirrelmail/functions/db_prefs.php	2022-05-22 18:55:29 UTC (rev 14954)
@@ -35,17 +35,17 @@
  *                                 internal database information from being
  *                                 exposed. This should be enabled only for
  *                                 debugging purposes.
- *    string $pdo_identifier_quote_char By default, SquirrelMail will quote
- *                                      table and field names in database
- *                                      queries with what it thinks is the
- *                                      appropriate quote character for the
- *                                      database type being used (backtick
- *                                      for MySQL (and thus MariaDB), double
- *                                      quotes for all others), but you can
- *                                      override the character used by
- *                                      putting it here, or tell SquirrelMail
- *                                      NOT to quote identifiers by setting
- *                                      this to "none"
+ *    string $db_identifier_quote_char By default, SquirrelMail will quote
+ *                                     table and field names in database
+ *                                     queries with what it thinks is the
+ *                                     appropriate quote character for the
+ *                                     database type being used (backtick
+ *                                     for MySQL (and thus MariaDB), double
+ *                                     quotes for all others), but you can
+ *                                     override the character used by
+ *                                     putting it here, or tell SquirrelMail
+ *                                     NOT to quote identifiers by setting
+ *                                     this to "none"
  *
  * @copyright 1999-2022 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
@@ -245,7 +245,7 @@
      *
      */
     function open() {
-        global $prefs_dsn, $prefs_table, $use_pdo, $pdo_identifier_quote_char;
+        global $prefs_dsn, $prefs_table, $use_pdo, $db_identifier_quote_char;
         global $prefs_user_field, $prefs_key_field, $prefs_val_field;
         global $prefs_user_size, $prefs_key_size, $prefs_val_size;
 
@@ -268,16 +268,16 @@
             $this->db_type = SMDB_PGSQL;
         }
 
-        // figure out identifier quoting (only used for PDO, though we could change that)
-        if (empty($pdo_identifier_quote_char)) {
+        // figure out identifier quoting
+        if (empty($db_identifier_quote_char)) {
             if ($this->db_type == SMDB_MYSQL)
                 $this->identifier_quote_char = '`';
             else
                 $this->identifier_quote_char = '"';
-        } else if ($pdo_identifier_quote_char === 'none')
+        } else if ($db_identifier_quote_char === 'none')
             $this->identifier_quote_char = '';
         else
-            $this->identifier_quote_char = $pdo_identifier_quote_char;
+            $this->identifier_quote_char = $db_identifier_quote_char;
 
         if (!empty($prefs_table)) {
             $this->table = $prefs_table;
@@ -285,14 +285,6 @@
         if (!empty($prefs_user_field)) {
             $this->user_field = $prefs_user_field;
         }
-
-        // the default user field is "user", which in PostgreSQL
-        // is an identifier and causes errors if not escaped
-        //
-        if ($this->db_type == SMDB_PGSQL) {
-           $this->user_field = '"' . $this->user_field . '"';
-        }
-
         if (!empty($prefs_key_field)) {
             $this->key_field = $prefs_key_field;
         }
@@ -459,11 +451,17 @@
                 $this->failQuery();
             }
         } else {
-            $query = sprintf("DELETE FROM %s WHERE %s='%s' AND %s='%s'",
+            $query = sprintf("DELETE FROM %s%s%s WHERE %s%s%s='%s' AND %s%s%s='%s'",
+                             $this->identifier_quote_char,
                              $this->table,
+                             $this->identifier_quote_char,
+                             $this->identifier_quote_char,
                              $this->user_field,
+                             $this->identifier_quote_char,
                              $this->dbh->quoteString($user),
+                             $this->identifier_quote_char,
                              $this->key_field,
+                             $this->identifier_quote_char,
                              $this->dbh->quoteString($key));
 
             $res = $this->dbh->simpleQuery($query);
@@ -552,12 +550,20 @@
                     $this->failQuery();
                 }
             } else {
-                $query = sprintf("REPLACE INTO %s (%s, %s, %s) ".
+                $query = sprintf("REPLACE INTO %s%s%s (%s%s%s, %s%s%s, %s%s%s) ".
                                  "VALUES('%s','%s','%s')",
+                                 $this->identifier_quote_char,
                                  $this->table,
+                                 $this->identifier_quote_char,
+                                 $this->identifier_quote_char,
                                  $this->user_field,
+                                 $this->identifier_quote_char,
+                                 $this->identifier_quote_char,
                                  $this->key_field,
+                                 $this->identifier_quote_char,
+                                 $this->identifier_quote_char,
                                  $this->val_field,
+                                 $this->identifier_quote_char,
                                  $this->dbh->quoteString($user),
                                  $this->dbh->quoteString($key),
                                  $this->dbh->quoteString($value));
@@ -615,11 +621,17 @@
                 }
             } else {
                 $this->dbh->simpleQuery("BEGIN TRANSACTION");
-                $query = sprintf("DELETE FROM %s WHERE %s='%s' AND %s='%s'",
+                $query = sprintf("DELETE FROM %s%s%s WHERE %s%s%s='%s' AND %s%s%s='%s'",
+                                 $this->identifier_quote_char,
                                  $this->table,
+                                 $this->identifier_quote_char,
+                                 $this->identifier_quote_char,
                                  $this->user_field,
+                                 $this->identifier_quote_char,
                                  $this->dbh->quoteString($user),
+                                 $this->identifier_quote_char,
                                  $this->key_field,
+                                 $this->identifier_quote_char,
                                  $this->dbh->quoteString($key));
                 $res = $this->dbh->simpleQuery($query);
                 if (DB::isError($res)) {
@@ -626,11 +638,19 @@
                     $this->dbh->simpleQuery("ROLLBACK TRANSACTION");
                     $this->failQuery($res);
                 }
-                $query = sprintf("INSERT INTO %s (%s, %s, %s) VALUES ('%s', '%s', '%s')",
+                $query = sprintf("INSERT INTO %s%s%s (%s%s%s, %s%s%s, %s%s%s) VALUES ('%s', '%s', '%s')",
+                                 $this->identifier_quote_char,
                                  $this->table,
+                                 $this->identifier_quote_char,
+                                 $this->identifier_quote_char,
                                  $this->user_field,
+                                 $this->identifier_quote_char,
+                                 $this->identifier_quote_char,
                                  $this->key_field,
+                                 $this->identifier_quote_char,
+                                 $this->identifier_quote_char,
                                  $this->val_field,
+                                 $this->identifier_quote_char,
                                  $this->dbh->quoteString($user),
                                  $this->dbh->quoteString($key),
                                  $this->dbh->quoteString($value));
@@ -672,21 +692,35 @@
                     $this->failQuery();
                 }
             } else {
-                $query = sprintf("DELETE FROM %s WHERE %s='%s' AND %s='%s'",
+                $query = sprintf("DELETE FROM %s%s%s WHERE %s%s%s='%s' AND %s%s%s='%s'",
+                                 $this->identifier_quote_char,
                                  $this->table,
+                                 $this->identifier_quote_char,
+                                 $this->identifier_quote_char,
                                  $this->user_field,
+                                 $this->identifier_quote_char,
                                  $this->dbh->quoteString($user),
+                                 $this->identifier_quote_char,
                                  $this->key_field,
+                                 $this->identifier_quote_char,
                                  $this->dbh->quoteString($key));
                 $res = $this->dbh->simpleQuery($query);
                 if (DB::isError($res)) {
                     $this->failQuery($res);
                 }
-                $query = sprintf("INSERT INTO %s (%s, %s, %s) VALUES ('%s', '%s', '%s')",
+                $query = sprintf("INSERT INTO %s%s%s (%s%s%s, %s%s%s, %s%s%s) VALUES ('%s', '%s', '%s')",
+                                 $this->identifier_quote_char,
                                  $this->table,
+                                 $this->identifier_quote_char,
+                                 $this->identifier_quote_char,
                                  $this->user_field,
+                                 $this->identifier_quote_char,
+                                 $this->identifier_quote_char,
                                  $this->key_field,
+                                 $this->identifier_quote_char,
+                                 $this->identifier_quote_char,
                                  $this->val_field,
+                                 $this->identifier_quote_char,
                                  $this->dbh->quoteString($user),
                                  $this->dbh->quoteString($key),
                                  $this->dbh->quoteString($value));
@@ -736,12 +770,20 @@
                 $prefs_cache[$row['prefkey']] = $row['prefval'];
             }
         } else {
-            $query = sprintf("SELECT %s as prefkey, %s as prefval FROM %s ".
-                             "WHERE %s = '%s'",
+            $query = sprintf("SELECT %s%s%s as prefkey, %s%s%s as prefval FROM %s%s%s ".
+                             "WHERE %s%s%s = '%s'",
+                             $this->identifier_quote_char,
                              $this->key_field,
+                             $this->identifier_quote_char,
+                             $this->identifier_quote_char,
                              $this->val_field,
+                             $this->identifier_quote_char,
+                             $this->identifier_quote_char,
                              $this->table,
+                             $this->identifier_quote_char,
+                             $this->identifier_quote_char,
                              $this->user_field,
+                             $this->identifier_quote_char,
                              $this->dbh->quoteString($user));
             $res = $this->dbh->query($query);
             if (DB::isError($res)) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[SM-CVS] SF.net SVN: squirrelmail:[14953] branches/SM-1_4-STABLE/squirrelmail/ functions/db_prefs.php

[<pdo...@us...>]

Revision: 14953
          http://sourceforge.net/p/squirrelmail/code/14953
Author:   pdontthink
Date:     2022-05-22 18:40:05 +0000 (Sun, 22 May 2022)
Log Message:
-----------
Implement SQL identifier quoting in all cases (alleviates issue double-quoting user field under PGSQL, #177)

Modified Paths:
--------------
    branches/SM-1_4-STABLE/squirrelmail/functions/db_prefs.php

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/db_prefs.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/db_prefs.php	2022-05-22 18:03:08 UTC (rev 14952)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/db_prefs.php	2022-05-22 18:40:05 UTC (rev 14953)
@@ -35,17 +35,17 @@
  *                                 internal database information from being
  *                                 exposed. This should be enabled only for
  *                                 debugging purposes.
- *    string $pdo_identifier_quote_char By default, SquirrelMail will quote
- *                                      table and field names in database
- *                                      queries with what it thinks is the
- *                                      appropriate quote character for the
- *                                      database type being used (backtick
- *                                      for MySQL (and thus MariaDB), double
- *                                      quotes for all others), but you can
- *                                      override the character used by
- *                                      putting it here, or tell SquirrelMail
- *                                      NOT to quote identifiers by setting
- *                                      this to "none"
+ *    string $identifier_quote_char By default, SquirrelMail will quote
+ *                                  table and field names in database
+ *                                  queries with what it thinks is the
+ *                                  appropriate quote character for the
+ *                                  database type being used (backtick
+ *                                  for MySQL (and thus MariaDB), double
+ *                                  quotes for all others), but you can
+ *                                  override the character used by
+ *                                  putting it here, or tell SquirrelMail
+ *                                  NOT to quote identifiers by setting
+ *                                  this to "none"
  *
  * @copyright 1999-2022 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
@@ -170,7 +170,7 @@
     }
 
     function open() {
-        global $prefs_dsn, $prefs_table, $use_pdo, $pdo_identifier_quote_char;
+        global $prefs_dsn, $prefs_table, $use_pdo, $identifier_quote_char;
         global $prefs_user_field, $prefs_key_field, $prefs_val_field;
 
         if(isset($this->dbh)) {
@@ -183,16 +183,16 @@
             $this->db_type = SMDB_PGSQL;
         }
 
-        // figure out identifier quoting (only used for PDO, though we could change that)
-        if (empty($pdo_identifier_quote_char)) {
+        // figure out identifier quoting
+        if (empty($identifier_quote_char)) {
             if ($this->db_type == SMDB_MYSQL)
                 $this->identifier_quote_char = '`';
             else
                 $this->identifier_quote_char = '"';
-        } else if ($pdo_identifier_quote_char === 'none')
+        } else if ($identifier_quote_char === 'none')
             $this->identifier_quote_char = '';
         else
-            $this->identifier_quote_char = $pdo_identifier_quote_char;
+            $this->identifier_quote_char = $identifier_quote_char;
 
         if (!empty($prefs_table)) {
             $this->table = $prefs_table;
@@ -201,13 +201,6 @@
             $this->user_field = $prefs_user_field;
         }
 
-        // the default user field is "user", which in PostgreSQL
-        // is an identifier and causes errors if not escaped
-        //
-        if ($this->db_type == SMDB_PGSQL) {
-           $this->user_field = '"' . $this->user_field . '"';
-        }
-
         if (!empty($prefs_key_field)) {
             $this->key_field = $prefs_key_field;
         }
@@ -342,11 +335,17 @@
                 $this->failQuery();
             }
         } else {
-            $query = sprintf("DELETE FROM %s WHERE %s='%s' AND %s='%s'",
+            $query = sprintf("DELETE FROM %s%s%s WHERE %s%s%s='%s' AND %s%s%s='%s'",
+                             $this->identifier_quote_char,
                              $this->table,
+                             $this->identifier_quote_char,
+                             $this->identifier_quote_char,
                              $this->user_field,
+                             $this->identifier_quote_char,
                              $this->dbh->quoteString($user),
+                             $this->identifier_quote_char,
                              $this->key_field,
+                             $this->identifier_quote_char,
                              $this->dbh->quoteString($key));
 
             $res = $this->dbh->simpleQuery($query);
@@ -382,12 +381,20 @@
                     $this->failQuery();
                 }
             } else {
-                $query = sprintf("REPLACE INTO %s (%s, %s, %s) ".
+                $query = sprintf("REPLACE INTO %s%s%s (%s%s%s, %s%s%s, %s%s%s) ".
                                  "VALUES('%s','%s','%s')",
+                                 $this->identifier_quote_char,
                                  $this->table,
+                                 $this->identifier_quote_char,
+                                 $this->identifier_quote_char,
                                  $this->user_field,
+                                 $this->identifier_quote_char,
+                                 $this->identifier_quote_char,
                                  $this->key_field,
+                                 $this->identifier_quote_char,
+                                 $this->identifier_quote_char,
                                  $this->val_field,
+                                 $this->identifier_quote_char,
                                  $this->dbh->quoteString($user),
                                  $this->dbh->quoteString($key),
                                  $this->dbh->quoteString($value));
@@ -445,11 +452,17 @@
                 }
             } else {
                 $this->dbh->simpleQuery("BEGIN TRANSACTION");
-                $query = sprintf("DELETE FROM %s WHERE %s='%s' AND %s='%s'",
+                $query = sprintf("DELETE FROM %s%s%s WHERE %s%s%s='%s' AND %s%s%s='%s'",
+                                 $this->identifier_quote_char,
                                  $this->table,
+                                 $this->identifier_quote_char,
+                                 $this->identifier_quote_char,
                                  $this->user_field,
+                                 $this->identifier_quote_char,
                                  $this->dbh->quoteString($user),
+                                 $this->identifier_quote_char,
                                  $this->key_field,
+                                 $this->identifier_quote_char,
                                  $this->dbh->quoteString($key));
                 $res = $this->dbh->simpleQuery($query);
                 if (DB::isError($res)) {
@@ -456,11 +469,19 @@
                     $this->dbh->simpleQuery("ROLLBACK TRANSACTION");
                     $this->failQuery($res);
                 }
-                $query = sprintf("INSERT INTO %s (%s, %s, %s) VALUES ('%s', '%s', '%s')",
+                $query = sprintf("INSERT INTO %s%s%s (%s%s%s, %s%s%s, %s%s%s) VALUES ('%s', '%s', '%s')",
+                                 $this->identifier_quote_char,
                                  $this->table,
+                                 $this->identifier_quote_char,
+                                 $this->identifier_quote_char,
                                  $this->user_field,
+                                 $this->identifier_quote_char,
+                                 $this->identifier_quote_char,
                                  $this->key_field,
+                                 $this->identifier_quote_char,
+                                 $this->identifier_quote_char,
                                  $this->val_field,
+                                 $this->identifier_quote_char,
                                  $this->dbh->quoteString($user),
                                  $this->dbh->quoteString($key),
                                  $this->dbh->quoteString($value));
@@ -502,21 +523,35 @@
                     $this->failQuery();
                 }
             } else {
-                $query = sprintf("DELETE FROM %s WHERE %s='%s' AND %s='%s'",
+                $query = sprintf("DELETE FROM %s%s%s WHERE %s%s%s='%s' AND %s%s%s='%s'",
+                                 $this->identifier_quote_char,
                                  $this->table,
+                                 $this->identifier_quote_char,
+                                 $this->identifier_quote_char,
                                  $this->user_field,
+                                 $this->identifier_quote_char,
                                  $this->dbh->quoteString($user),
+                                 $this->identifier_quote_char,
                                  $this->key_field,
+                                 $this->identifier_quote_char,
                                  $this->dbh->quoteString($key));
                 $res = $this->dbh->simpleQuery($query);
                 if (DB::isError($res)) {
                     $this->failQuery($res);
                 }
-                $query = sprintf("INSERT INTO %s (%s, %s, %s) VALUES ('%s', '%s', '%s')",
+                $query = sprintf("INSERT INTO %s%s%s (%s%s%s, %s%s%s, %s%s%s) VALUES ('%s', '%s', '%s')",
+                                 $this->identifier_quote_char,
                                  $this->table,
+                                 $this->identifier_quote_char,
+                                 $this->identifier_quote_char,
                                  $this->user_field,
+                                 $this->identifier_quote_char,
+                                 $this->identifier_quote_char,
                                  $this->key_field,
+                                 $this->identifier_quote_char,
+                                 $this->identifier_quote_char,
                                  $this->val_field,
+                                 $this->identifier_quote_char,
                                  $this->dbh->quoteString($user),
                                  $this->dbh->quoteString($key),
                                  $this->dbh->quoteString($value));
@@ -558,12 +593,20 @@
                 $prefs_cache[$row['prefkey']] = $row['prefval'];
             }
         } else {
-            $query = sprintf("SELECT %s as prefkey, %s as prefval FROM %s ".
-                             "WHERE %s = '%s'",
+            $query = sprintf("SELECT %s%s%s as prefkey, %s%s%s as prefval FROM %s%s%s ".
+                             "WHERE %s%s%s = '%s'",
+                             $this->identifier_quote_char,
                              $this->key_field,
+                             $this->identifier_quote_char,
+                             $this->identifier_quote_char,
                              $this->val_field,
+                             $this->identifier_quote_char,
+                             $this->identifier_quote_char,
                              $this->table,
+                             $this->identifier_quote_char,
+                             $this->identifier_quote_char,
                              $this->user_field,
+                             $this->identifier_quote_char,
                              $this->dbh->quoteString($user));
             $res = $this->dbh->query($query);
             if (DB::isError($res)) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[SM-CVS] SF.net SVN: squirrelmail:[14952] trunk/squirrelmail/class/deliver/ Deliver.class.php

[<pdo...@us...>]

Revision: 14952
          http://sourceforge.net/p/squirrelmail/code/14952
Author:   pdontthink
Date:     2022-05-22 18:03:08 +0000 (Sun, 22 May 2022)
Log Message:
-----------
Fix PHP notice when property doesn't exist (#2863)

Modified Paths:
--------------
    trunk/squirrelmail/class/deliver/Deliver.class.php

Modified: trunk/squirrelmail/class/deliver/Deliver.class.php
===================================================================
--- trunk/squirrelmail/class/deliver/Deliver.class.php	2022-05-22 17:42:51 UTC (rev 14951)
+++ trunk/squirrelmail/class/deliver/Deliver.class.php	2022-05-22 18:03:08 UTC (rev 14952)
@@ -741,7 +741,7 @@
             /* RFC 2298 */
             $header[] = 'Disposition-Notification-To: '.$dnt. $rn;
         }
-        if ($rfc822_header->dsn) {
+        if (isset($rfc822_header->dsn) && $rfc822_header->dsn) {
             $dsn = $rfc822_header->getAddr_s('dsn');
             $header[] = 'Return-Receipt-To: '.$dsn. $rn;
         }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[SM-CVS] SF.net SVN: squirrelmail:[14951] trunk/squirrelmail/src/read_body.php

[<pdo...@us...>]

Revision: 14951
          http://sourceforge.net/p/squirrelmail/code/14951
Author:   pdontthink
Date:     2022-05-22 17:42:51 +0000 (Sun, 22 May 2022)
Log Message:
-----------
Fix: When "Return To Message List After Move" is off, deleting message from message view screen was broken (#2863)

Modified Paths:
--------------
    trunk/squirrelmail/src/read_body.php

Modified: trunk/squirrelmail/src/read_body.php
===================================================================
--- trunk/squirrelmail/src/read_body.php	2022-05-22 15:44:41 UTC (rev 14950)
+++ trunk/squirrelmail/src/read_body.php	2022-05-22 17:42:51 UTC (rev 14951)
@@ -653,6 +653,8 @@
             $oTemplate->assign('move_delete_form_action', $base_uri.'src/read_body.php');
         $oTemplate->assign('delete_form_extra', addHidden('mailbox', $aMailbox['NAME'])."\n" .
                                                 addHidden('msg[0]', $passed_id)."\n" .
+                                                // only need when $return_to_message_list_after_move is off
+                                                addHidden('passed_id', ($next >= 0 ? $next : $prev))."\n" .
                                                 addHidden('startMessage', $startMessage)."\n" );
         if (!(isset($passed_ent_id) && $passed_ent_id)) {
             $oTemplate->assign('can_be_moved', true);
@@ -941,6 +943,13 @@
 }
 
 /**
+ * or delete button... why is handleMessageListForm (per above) conditional anway?
+ */
+if ( sqgetGlobalVar('delete', $ignore, SQ_POST) ) {
+    $sError = handleMessageListForm($imapConnection,$aMailbox);
+}
+
+/**
  * or move button... why is handleMessageListForm (per above) conditional anway?
  */
 if ( sqgetGlobalVar('moveButton', $ignore, SQ_POST) ) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[SM-CVS] SF.net SVN: squirrelmail:[14950] trunk/squirrelmail/functions/ imap_messages.php

[<pdo...@us...>]

Revision: 14950
          http://sourceforge.net/p/squirrelmail/code/14950
Author:   pdontthink
Date:     2022-05-22 15:44:41 +0000 (Sun, 22 May 2022)
Log Message:
-----------
Fix bug where could not toggle flag (delete, etc) a single message

Modified Paths:
--------------
    trunk/squirrelmail/functions/imap_messages.php

Modified: trunk/squirrelmail/functions/imap_messages.php
===================================================================
--- trunk/squirrelmail/functions/imap_messages.php	2022-04-25 21:28:55 UTC (rev 14949)
+++ trunk/squirrelmail/functions/imap_messages.php	2022-05-22 15:44:41 UTC (rev 14950)
@@ -17,7 +17,8 @@
 /**
  * Copy a set of messages ($id) to another mailbox ($mailbox)
  * @param int $imap_stream The resource ID for the IMAP socket
- * @param string $id The list of messages to copy
+ * @param  mixed $id Normally an array which is a list with message UIDs to be copied
+ *                   or a string range such as "1:*" or a simple integer
  * @param string $mailbox The destination to copy to
  * @param bool $handle_errors Show error messages in case of a NO, BAD or BYE response
  * @return bool If the copy completed without errors
@@ -59,7 +60,8 @@
  * Deletes a message and move it to trash or expunge the mailbox
  * @param  resource imap connection
  * @param  string $mailbox mailbox, used for checking if it concerns the trash_folder
- * @param  array $id list with uid's
+ * @param  mixed $id Normally an array which is a list with message UIDs to be deleted
+ *                   or a string range such as "1:*" or a simple integer
  * @param  bool   $bypass_trash (since 1.5.0) skip copy to trash
  * @return array  $aMessageList array with messages containing the new flags and UID @see parseFetch
  * @since 1.4.0
@@ -83,7 +85,7 @@
  * Set a flag on the provided uid list
  * @param  resource imap connection
  * @param  mixed $id Normally an array which is a list with message UIDs to be flagged
- *                   or a string range such as "1:*"
+ *                   or a string range such as "1:*" or a simple integer
  * @param  string $flag Flags to set/unset flags can be i.e.'\Seen', '\Answered', '\Seen \Answered'
  * @param  bool   $set  add (true) or remove (false) the provided flag
  * @param  bool   $handle_errors Show error messages in case of a NO, BAD or BYE response
@@ -93,11 +95,15 @@
     $msgs_id = sqimap_message_list_squisher($id);
     $set_string = ($set ? '+' : '-');
 
+    /*
+    * We need to return the data in the same order as the caller supplied
+    * in $id, but IMAP servers are free to return responses in
+    * whatever order they wish... So we need to re-sort manually
+    */
     $aMessageList = array();
-    // TODO: There doesn't seem to be a reason to set up $aMessageList anyway because an empty array for each message doesn't add anything to the parseFetch() return value, so this code block could be simply deleted:
-    if (!is_string($id)) {
-        for ($i=0; $i<sizeof($id); $i++) {
-            $aMessageList["$id[$i]"] = array();
+    if (is_array($id)) {
+        for ($i=0; $i<count($id); $i++) {
+            $aMessageList[$id[$i]] = array();
         }
     }
 
@@ -607,7 +613,7 @@
         */
         if ($bUidFetch) {
             for ($i = 0; $i < sizeof($msg_list); $i++) {
-                $aMessageList["$msg_list[$i]"] = array();
+                $aMessageList[$msg_list[$i]] = array();
             }
         }
     } else {
@@ -638,8 +644,10 @@
 /**
  * Parses a fetch response, currently it can hande FLAGS, HEADERS, RFC822.SIZE, INTERNALDATE and UID
  * @param array    $aResponse Imap response
- * @param array    $aMessageList Placeholder array for results. The keys of the
- *                 placeholder array should be the UID so we can reconstruct the order.
+ * @param array    $aMessageList Placeholder array for results. The keys of this
+ *                               placeholder array should be the UID so we can
+ *                               reconstruct the order (OPTIONAL; this array will
+ *                               be built for the return value fresh if not given)
  * @return array   $aMessageList associative array with messages. Key is the UID, value is an associative array
  * @author Marc Groot Koerkamp
  */
@@ -794,6 +802,7 @@
             $msgi = "$unique_id";
             $aMsg['UID'] = $unique_id;
        } else {
+//FIXME: under what circumstances does this happen? We can't use an empty string as an array index in the line just below, so we need to use something else here
             $msgi = '';
        }
        $aMessageList[$msgi] = $aMsg;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[SM-CVS] SF.net SVN: squirrelmail:[14949] trunk/squirrelmail/functions/ page_header.php

[<pdo...@us...>]

Revision: 14949
          http://sourceforge.net/p/squirrelmail/code/14949
Author:   pdontthink
Date:     2022-04-25 21:28:55 +0000 (Mon, 25 Apr 2022)
Log Message:
-----------
Cause message subject to show in page title when message view is loaded in its own window/tab

Modified Paths:
--------------
    trunk/squirrelmail/functions/page_header.php

Modified: trunk/squirrelmail/functions/page_header.php
===================================================================
--- trunk/squirrelmail/functions/page_header.php	2022-04-25 06:08:34 UTC (rev 14948)
+++ trunk/squirrelmail/functions/page_header.php	2022-04-25 21:28:55 UTC (rev 14949)
@@ -181,6 +181,13 @@
         if (!empty($output)) trigger_error('A plugin on the "generic_header" hook has attempted to output directly to the browser', E_USER_ERROR);
     }
 
+    // Add message subject to page title (should only have an effect when loaded in its own browser window/tab)
+    // TODO: For search page, could add " - Search: $what" or something like that
+    global $message;
+    if (!empty($message) && !empty($message->rfc822_header) && !empty($message->rfc822_header->subject))
+        // decodeHeader() should already encode the output, so no sm_encode_html_special_chars()
+        $title .= ' - ' . decodeHeader($message->rfc822_header->subject);
+
     $header_tags .= $xtra;
     $oTemplate->assign('page_title', $title);
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[SM-CVS] SF.net SVN: squirrelmail:[14948] branches/SM-1_4-STABLE/squirrelmail/ functions/page_header.php

[<pdo...@us...>]

Revision: 14948
          http://sourceforge.net/p/squirrelmail/code/14948
Author:   pdontthink
Date:     2022-04-25 06:08:34 +0000 (Mon, 25 Apr 2022)
Log Message:
-----------
Cause message subject to show in page title when message view is loaded in its own window/tab

Modified Paths:
--------------
    branches/SM-1_4-STABLE/squirrelmail/functions/page_header.php

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/page_header.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/page_header.php	2022-04-13 22:41:54 UTC (rev 14947)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/page_header.php	2022-04-25 06:08:34 UTC (rev 14948)
@@ -122,6 +122,13 @@
         do_hook('generic_header');
     }
 
+    // Add message subject to page title (should only have an effect when loaded in its own browser window/tab)
+    // TODO: For search page, could add " - Search: $what" or something like that
+    global $message;
+    if (!empty($message) && !empty($message->rfc822_header) && !empty($message->rfc822_header->subject))
+        // decodeHeader() should already encode the output, so no sm_encode_html_special_chars()
+        $title .= ' - ' . decodeHeader($message->rfc822_header->subject);
+
     echo "\n<title>$title</title>$xtra\n";
 
     // output <script> tags as needed (use array_unique so

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[SM-CVS] SF.net SVN: squirrelmail:[14947] trunk/squirrelmail/class/deliver/ Deliver_SMTP.class.php

[<pdo...@us...>]

Revision: 14947
          http://sourceforge.net/p/squirrelmail/code/14947
Author:   pdontthink
Date:     2022-04-13 22:41:54 +0000 (Wed, 13 Apr 2022)
Log Message:
-----------
Add proper RFC 3461 DSN functionality (previously we relied only on the Return-Receipt-To header)

Modified Paths:
--------------
    trunk/squirrelmail/class/deliver/Deliver_SMTP.class.php

Modified: trunk/squirrelmail/class/deliver/Deliver_SMTP.class.php
===================================================================
--- trunk/squirrelmail/class/deliver/Deliver_SMTP.class.php	2022-04-13 22:38:32 UTC (rev 14946)
+++ trunk/squirrelmail/class/deliver/Deliver_SMTP.class.php	2022-04-13 22:41:54 UTC (rev 14947)
@@ -346,7 +346,17 @@
         for ($i = 0, $cnt = count($to); $i < $cnt; $i++) {
             if (!$to[$i]->host) $to[$i]->host = $domain;
             if (strlen($to[$i]->mailbox)) {
-                fputs($stream, 'RCPT TO:<'.$to[$i]->mailbox.'@'.$to[$i]->host.">\r\n");
+                // Ask for DSN if user has requested such and remote server supports it
+                if ($rfc822_header->dsn && array_key_exists('DSN',$this->ehlo)) {
+                    // TODO: Make the DSN parameters configurable by admin? user?
+                    fputs($stream, 'RCPT TO:<'.$to[$i]->mailbox.'@'.$to[$i]->host."> NOTIFY=SUCCESS,DELAY,FAILURE\r\n");
+                    // Retry without DSN fields for cranky MTAs
+                    if ($this->errorCheck($tmp, $stream)) {
+                        fputs($stream, 'RCPT TO:<'.$to[$i]->mailbox.'@'.$to[$i]->host.">\r\n");
+                    }
+                }
+                else
+                    fputs($stream, 'RCPT TO:<'.$to[$i]->mailbox.'@'.$to[$i]->host.">\r\n");
                 $tmp = fgets($stream, 1024);
                 if ($this->errorCheck($tmp, $stream)) {
                     return(0);
@@ -357,7 +367,17 @@
         for ($i = 0, $cnt = count($cc); $i < $cnt; $i++) {
             if (!$cc[$i]->host) $cc[$i]->host = $domain;
             if (strlen($cc[$i]->mailbox)) {
-                fputs($stream, 'RCPT TO:<'.$cc[$i]->mailbox.'@'.$cc[$i]->host.">\r\n");
+                // Ask for DSN if user has requested such and remote server supports it
+                if ($rfc822_header->dsn && array_key_exists('DSN',$this->ehlo)) {
+                    // TODO: Make the DSN parameters configurable by admin? user?
+                    fputs($stream, 'RCPT TO:<'.$cc[$i]->mailbox.'@'.$cc[$i]->host."> NOTIFY=SUCCESS,DELAY,FAILURE\r\n");
+                    // Retry without DSN fields for cranky MTAs
+                    if ($this->errorCheck($tmp, $stream)) {
+                        fputs($stream, 'RCPT TO:<'.$cc[$i]->mailbox.'@'.$cc[$i]->host.">\r\n");
+                    }
+                }
+                else
+                    fputs($stream, 'RCPT TO:<'.$cc[$i]->mailbox.'@'.$cc[$i]->host.">\r\n");
                 $tmp = fgets($stream, 1024);
                 if ($this->errorCheck($tmp, $stream)) {
                     return(0);
@@ -368,7 +388,17 @@
         for ($i = 0, $cnt = count($bcc); $i < $cnt; $i++) {
             if (!$bcc[$i]->host) $bcc[$i]->host = $domain;
             if (strlen($bcc[$i]->mailbox)) {
-                fputs($stream, 'RCPT TO:<'.$bcc[$i]->mailbox.'@'.$bcc[$i]->host.">\r\n");
+                // Ask for DSN if user has requested such and remote server supports it
+                if ($rfc822_header->dsn && array_key_exists('DSN',$this->ehlo)) {
+                    // TODO: Make the DSN parameters configurable by admin? user?
+                    fputs($stream, 'RCPT TO:<'.$bcc[$i]->mailbox.'@'.$bcc[$i]->host."> NOTIFY=SUCCESS,DELAY,FAILURE\r\n");
+                    // Retry without DSN fields for cranky MTAs
+                    if ($this->errorCheck($tmp, $stream)) {
+                        fputs($stream, 'RCPT TO:<'.$bcc[$i]->mailbox.'@'.$bcc[$i]->host.">\r\n");
+                    }
+                }
+                else
+                    fputs($stream, 'RCPT TO:<'.$bcc[$i]->mailbox.'@'.$bcc[$i]->host.">\r\n");
                 $tmp = fgets($stream, 1024);
                 if ($this->errorCheck($tmp, $stream)) {
                     return(0);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[SM-CVS] SF.net SVN: squirrelmail:[14946] trunk/squirrelmail

[<pdo...@us...>]

Revision: 14946
          http://sourceforge.net/p/squirrelmail/code/14946
Author:   pdontthink
Date:     2022-04-13 22:38:32 +0000 (Wed, 13 Apr 2022)
Log Message:
-----------
Sort out DSN functionality

Modified Paths:
--------------
    trunk/squirrelmail/class/deliver/Deliver.class.php
    trunk/squirrelmail/class/mime/Rfc822Header.class.php
    trunk/squirrelmail/src/compose.php
    trunk/squirrelmail/src/read_body.php

Modified: trunk/squirrelmail/class/deliver/Deliver.class.php
===================================================================
--- trunk/squirrelmail/class/deliver/Deliver.class.php	2022-04-13 21:38:27 UTC (rev 14945)
+++ trunk/squirrelmail/class/deliver/Deliver.class.php	2022-04-13 22:38:32 UTC (rev 14946)
@@ -741,6 +741,10 @@
             /* RFC 2298 */
             $header[] = 'Disposition-Notification-To: '.$dnt. $rn;
         }
+        if ($rfc822_header->dsn) {
+            $dsn = $rfc822_header->getAddr_s('dsn');
+            $header[] = 'Return-Receipt-To: '.$dsn. $rn;
+        }
         if ($rfc822_header->priority) {
             switch($rfc822_header->priority)
             {

Modified: trunk/squirrelmail/class/mime/Rfc822Header.class.php
===================================================================
--- trunk/squirrelmail/class/mime/Rfc822Header.class.php	2022-04-13 21:38:27 UTC (rev 14945)
+++ trunk/squirrelmail/class/mime/Rfc822Header.class.php	2022-04-13 22:38:32 UTC (rev 14946)
@@ -122,10 +122,10 @@
      */
     var $dnt = '';
     /**
-     * Delivery notification (DR)
+     * Address for requesting message delivery status notification (DSN)
      * @var mixed
      */
-    var $drnt = '';
+    var $dsn = '';
     /**
      * @var mixed
      */
@@ -289,7 +289,7 @@
                 break;
             case 'return-receipt-to':
                 $value = $this->stripComments($value);
-                $this->drnt = $this->parseAddress($value);
+                $this->dsn = $this->parseAddress($value);
                 break;
             case 'mime-version':
                 $value = $this->stripComments($value);

Modified: trunk/squirrelmail/src/compose.php
===================================================================
--- trunk/squirrelmail/src/compose.php	2022-04-13 21:38:27 UTC (rev 14945)
+++ trunk/squirrelmail/src/compose.php	2022-04-13 22:38:32 UTC (rev 14946)
@@ -946,7 +946,7 @@
 
                 // Remember the receipt settings
                 $request_mdn = $mdn_user_support && !empty($orig_header->dnt) ? '1' : '0';
-                $request_dr = $mdn_user_support && !empty($orig_header->drnt) ? '1' : '0';
+                $request_dr = $mdn_user_support && !empty($orig_header->dsn) ? '1' : '0';
 
                 /* remember the references and in-reply-to headers in case of an reply */
 //FIXME: it would be better to fiddle with headers inside of the message object or possibly when delivering the message to its destination (drafts folder?); is this possible?
@@ -1771,10 +1771,9 @@
 
     /* Receipt: On Delivery */
     if (!empty($request_dr)) {
-//FIXME: it would be better to fiddle with headers inside of the message object or possibly when delivering the message to its destination; is this possible?
-        $rfc822_header->more_headers['Return-Receipt-To'] = $from_addr;
-    } elseif (isset($rfc822_header->more_headers['Return-Receipt-To'])) {
-        unset($rfc822_header->more_headers['Return-Receipt-To']);
+        $rfc822_header->dsn = $rfc822_header->parseAddress($from_addr,true);
+    } elseif (isset($rfc822_header->dsn)) {
+        unset($rfc822_header->dsn);
     }
 
     /* multipart messages */

Modified: trunk/squirrelmail/src/read_body.php
===================================================================
--- trunk/squirrelmail/src/read_body.php	2022-04-13 21:38:27 UTC (rev 14945)
+++ trunk/squirrelmail/src/read_body.php	2022-04-13 22:38:32 UTC (rev 14946)
@@ -145,7 +145,10 @@
         $content_type->properties['charset']=$default_charset;
     }
     $rfc822_header->content_type = $content_type;
-    $rfc822_header->to[] = $header->dnt;
+    if (!empty($header->dnt))
+        $rfc822_header->to[] = $header->dnt;
+    else
+        $rfc822_header->to[] = $header->dsn;
     $rfc822_header->subject = _("Read:") . ' ' . decodeHeader($header->subject,true,false);
 
     $idents = get_identities();
@@ -410,7 +413,9 @@
 
     if ($default_use_mdn) {
         if ($mdn_user_support) {
-            if ($header->dnt) {
+            // We are generous to the sender because DSNs are commonly ignored by servers and
+            // technically offering a return receipt in the MUA for a DSN is overstepping the RFCs
+            if ($header->dnt || $header->dnt) {
                 $mdn_url = $PHP_SELF;
                 $mdn_url = set_url_var($mdn_url, 'mailbox', urlencode($mailbox));
                 $mdn_url = set_url_var($mdn_url, 'passed_id', $passed_id);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[SM-CVS] SF.net SVN: squirrelmail:[14945] branches/SM-1_4-STABLE/squirrelmail/class /deliver/Deliver_SMTP.class.php

[<pdo...@us...>]

Revision: 14945
          http://sourceforge.net/p/squirrelmail/code/14945
Author:   pdontthink
Date:     2022-04-13 21:38:27 +0000 (Wed, 13 Apr 2022)
Log Message:
-----------
Add proper RFC 3461 DSN functionality (previously we relied only on the Return-Receipt-To header)

Modified Paths:
--------------
    branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver_SMTP.class.php

Modified: branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver_SMTP.class.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver_SMTP.class.php	2022-04-13 20:08:39 UTC (rev 14944)
+++ branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver_SMTP.class.php	2022-04-13 21:38:27 UTC (rev 14945)
@@ -340,7 +340,17 @@
         for ($i = 0, $cnt = count($to); $i < $cnt; $i++) {
             if (!$to[$i]->host) $to[$i]->host = $domain;
             if (strlen($to[$i]->mailbox)) {
-                fputs($stream, 'RCPT TO:<'.$to[$i]->mailbox.'@'.$to[$i]->host.">\r\n");
+                // Ask for DSN if user has requested such and remote server supports it
+                if ($rfc822_header->dsn && array_key_exists('DSN',$this->ehlo)) {
+                    // TODO: Make the DSN parameters configurable by admin? user?
+                    fputs($stream, 'RCPT TO:<'.$to[$i]->mailbox.'@'.$to[$i]->host."> NOTIFY=SUCCESS,DELAY,FAILURE\r\n");
+                    // Retry without DSN fields for cranky MTAs
+                    if ($this->errorCheck($tmp, $stream)) {
+                        fputs($stream, 'RCPT TO:<'.$to[$i]->mailbox.'@'.$to[$i]->host.">\r\n");
+                    }
+                }
+                else
+                    fputs($stream, 'RCPT TO:<'.$to[$i]->mailbox.'@'.$to[$i]->host.">\r\n");
                 $tmp = fgets($stream, 1024);
                 if ($this->errorCheck($tmp, $stream)) {
                     return(0);
@@ -351,7 +361,17 @@
         for ($i = 0, $cnt = count($cc); $i < $cnt; $i++) {
             if (!$cc[$i]->host) $cc[$i]->host = $domain;
             if (strlen($cc[$i]->mailbox)) {
-                fputs($stream, 'RCPT TO:<'.$cc[$i]->mailbox.'@'.$cc[$i]->host.">\r\n");
+                // Ask for DSN if user has requested such and remote server supports it
+                if ($rfc822_header->dsn && array_key_exists('DSN',$this->ehlo)) {
+                    // TODO: Make the DSN parameters configurable by admin? user?
+                    fputs($stream, 'RCPT TO:<'.$cc[$i]->mailbox.'@'.$cc[$i]->host."> NOTIFY=SUCCESS,DELAY,FAILURE\r\n");
+                    // Retry without DSN fields for cranky MTAs
+                    if ($this->errorCheck($tmp, $stream)) {
+                        fputs($stream, 'RCPT TO:<'.$cc[$i]->mailbox.'@'.$cc[$i]->host.">\r\n");
+                    }
+                }
+                else
+                    fputs($stream, 'RCPT TO:<'.$cc[$i]->mailbox.'@'.$cc[$i]->host.">\r\n");
                 $tmp = fgets($stream, 1024);
                 if ($this->errorCheck($tmp, $stream)) {
                     return(0);
@@ -362,7 +382,17 @@
         for ($i = 0, $cnt = count($bcc); $i < $cnt; $i++) {
             if (!$bcc[$i]->host) $bcc[$i]->host = $domain;
             if (strlen($bcc[$i]->mailbox)) {
-                fputs($stream, 'RCPT TO:<'.$bcc[$i]->mailbox.'@'.$bcc[$i]->host.">\r\n");
+                // Ask for DSN if user has requested such and remote server supports it
+                if ($rfc822_header->dsn && array_key_exists('DSN',$this->ehlo)) {
+                    // TODO: Make the DSN parameters configurable by admin? user?
+                    fputs($stream, 'RCPT TO:<'.$bcc[$i]->mailbox.'@'.$bcc[$i]->host."> NOTIFY=SUCCESS,DELAY,FAILURE\r\n");
+                    // Retry without DSN fields for cranky MTAs
+                    if ($this->errorCheck($tmp, $stream)) {
+                        fputs($stream, 'RCPT TO:<'.$bcc[$i]->mailbox.'@'.$bcc[$i]->host.">\r\n");
+                    }
+                }
+                else
+                    fputs($stream, 'RCPT TO:<'.$bcc[$i]->mailbox.'@'.$bcc[$i]->host.">\r\n");
                 $tmp = fgets($stream, 1024);
                 if ($this->errorCheck($tmp, $stream)) {
                     return(0);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[SM-CVS] SF.net SVN: squirrelmail:[14944] branches/SM-1_4-STABLE/squirrelmail

[<pdo...@us...>]

Revision: 14944
          http://sourceforge.net/p/squirrelmail/code/14944
Author:   pdontthink
Date:     2022-04-13 20:08:39 +0000 (Wed, 13 Apr 2022)
Log Message:
-----------
Separate DNT and DSN

Modified Paths:
--------------
    branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver.class.php
    branches/SM-1_4-STABLE/squirrelmail/class/mime/Rfc822Header.class.php
    branches/SM-1_4-STABLE/squirrelmail/src/compose.php
    branches/SM-1_4-STABLE/squirrelmail/src/read_body.php

Modified: branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver.class.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver.class.php	2022-04-05 02:12:15 UTC (rev 14943)
+++ branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver.class.php	2022-04-13 20:08:39 UTC (rev 14944)
@@ -739,6 +739,10 @@
             /* RFC 2298 */
             $header[] = 'Disposition-Notification-To: '.$dnt. $rn;
         }
+        if ($rfc822_header->dsn) {
+            $dsn = $rfc822_header->getAddr_s('dsn');
+            $header[] = 'Return-Receipt-To: '.$dsn. $rn;
+        }
         if ($rfc822_header->priority) {
             switch($rfc822_header->priority)
             {

Modified: branches/SM-1_4-STABLE/squirrelmail/class/mime/Rfc822Header.class.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/class/mime/Rfc822Header.class.php	2022-04-05 02:12:15 UTC (rev 14943)
+++ branches/SM-1_4-STABLE/squirrelmail/class/mime/Rfc822Header.class.php	2022-04-13 20:08:39 UTC (rev 14944)
@@ -122,6 +122,10 @@
     /**
      * @var mixed
      */
+    var $dsn = '';
+    /**
+     * @var mixed
+     */
     var $encoding = '';
     /**
      * @var mixed
@@ -266,11 +270,14 @@
                 $this->references = $value;
                 break;
             case 'x-confirm-reading-to':
-            case 'return-receipt-to':
             case 'disposition-notification-to':
                 $value = $this->stripComments($value);
                 $this->dnt = $this->parseAddress($value);
                 break;
+            case 'return-receipt-to':
+                $value = $this->stripComments($value);
+                $this->dsn = $this->parseAddress($value);
+                break;
             case 'mime-version':
                 $value = $this->stripComments($value);
                 $value = str_replace(' ', '', $value);

Modified: branches/SM-1_4-STABLE/squirrelmail/src/compose.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/src/compose.php	2022-04-05 02:12:15 UTC (rev 14943)
+++ branches/SM-1_4-STABLE/squirrelmail/src/compose.php	2022-04-13 20:08:39 UTC (rev 14944)
@@ -1726,7 +1726,7 @@
 
     /* Receipt: On Delivery */
     if (isset($request_dr) && $request_dr) {
-        $rfc822_header->more_headers['Return-Receipt-To'] = $from_mail;
+        $rfc822_header->dsn = $rfc822_header->parseAddress($from_mail,true);
     }
 
     /* multipart messages */

Modified: branches/SM-1_4-STABLE/squirrelmail/src/read_body.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/src/read_body.php	2022-04-05 02:12:15 UTC (rev 14943)
+++ branches/SM-1_4-STABLE/squirrelmail/src/read_body.php	2022-04-13 20:08:39 UTC (rev 14944)
@@ -184,7 +184,10 @@
         $content_type->properties['charset']=$default_charset;
     }
     $rfc822_header->content_type = $content_type;
-    $rfc822_header->to[] = $header->dnt;
+    if (!empty($header->dnt))
+        $rfc822_header->to[] = $header->dnt;
+    else
+        $rfc822_header->to[] = $header->dsn;
     $rfc822_header->subject = _("Read:") . ' ' . decodeHeader($header->subject, true, false);
 
     // FIXME: use identity.php from SM 1.5. Change this also in compose.php
@@ -465,7 +468,9 @@
     }
     if ($default_use_mdn) {
         if ($mdn_user_support) {
-            if ($header->dnt) {
+            // We are generous to the sender because DSNs are commonly ignored by servers and
+            // technically offering a return receipt in the MUA for a DSN is overstepping the RFCs
+            if ($header->dnt || $header->dsn) {
                 if ($message->is_mdnsent) {
                     $env[_("Read receipt")] = _("sent");
                 } else {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[SM-CVS] SF.net SVN: squirrelmail:[14943] branches/SM-1_4-STABLE/squirrelmail/ functions/mailbox_display.php

[<pdo...@us...>]

Revision: 14943
          http://sourceforge.net/p/squirrelmail/code/14943
Author:   pdontthink
Date:     2022-04-05 02:12:15 +0000 (Tue, 05 Apr 2022)
Log Message:
-----------
Fix deprecation notice when variable is null

Modified Paths:
--------------
    branches/SM-1_4-STABLE/squirrelmail/functions/mailbox_display.php

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/mailbox_display.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/mailbox_display.php	2022-03-21 20:39:37 UTC (rev 14942)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/mailbox_display.php	2022-04-05 02:12:15 UTC (rev 14943)
@@ -1335,7 +1335,8 @@
 function getMbxList($imapConnection) {
     global $lastTargetMailbox;
     echo  '         &nbsp;<tt><select name="targetMailbox">';
-    echo sqimap_mailbox_option_list($imapConnection, array(strtolower($lastTargetMailbox)) );
+    echo sqimap_mailbox_option_list($imapConnection,
+                                    isset($lastTargetMailbox) ? array(strtolower($lastTargetMailbox)) : array());
     echo '         </select></tt>&nbsp;';
 }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[SM-CVS] SF.net SVN: squirrelmail:[14942] trunk/squirrelmail/functions/ imap_messages.php

[<pdo...@us...>]

Revision: 14942
          http://sourceforge.net/p/squirrelmail/code/14942
Author:   pdontthink
Date:     2022-03-21 20:39:37 +0000 (Mon, 21 Mar 2022)
Log Message:
-----------
Add ability for plugins to request additional header fields in the message list lookup

Modified Paths:
--------------
    trunk/squirrelmail/functions/imap_messages.php

Modified: trunk/squirrelmail/functions/imap_messages.php
===================================================================
--- trunk/squirrelmail/functions/imap_messages.php	2022-03-21 20:00:51 UTC (rev 14941)
+++ trunk/squirrelmail/functions/imap_messages.php	2022-03-21 20:39:37 UTC (rev 14942)
@@ -581,6 +581,10 @@
     $aHeaderFields = array('Date', 'To', 'Cc', 'From', 'Subject', 'X-Priority', 'Content-Type'),
     $aFetchItems = array('FLAGS', 'RFC822.SIZE', 'INTERNALDATE')) {
 
+    global $extra_small_header_fields;
+    if (!empty($extra_small_header_fields))
+        $aHeaderFields = array_merge($aHeaderFields, $extra_small_header_fields);
+
     $aMessageList = array();
 
     /**

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[SM-CVS] SF.net SVN: squirrelmail:[14941] branches/SM-1_4-STABLE/squirrelmail/ functions/imap_messages.php

[<pdo...@us...>]

Revision: 14941
          http://sourceforge.net/p/squirrelmail/code/14941
Author:   pdontthink
Date:     2022-03-21 20:00:51 +0000 (Mon, 21 Mar 2022)
Log Message:
-----------
Add ability for plugins to request additional header fields in the message list lookup

Modified Paths:
--------------
    branches/SM-1_4-STABLE/squirrelmail/functions/imap_messages.php

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/imap_messages.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/imap_messages.php	2022-02-28 20:19:39 UTC (rev 14940)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/imap_messages.php	2022-03-21 20:00:51 UTC (rev 14941)
@@ -725,7 +725,7 @@
  */
 function sqimap_get_small_header_list($imap_stream, $msg_list, $show_num=false) {
     global $squirrelmail_language, $color, $data_dir, $username, $imap_server_type;
-    global $uid_support, $allow_server_sort;
+    global $uid_support, $allow_server_sort, $extra_small_header_fields;
     /* Get the small headers for each message in $msg_list */
     $maxmsg = sizeof($msg_list);
     if ($show_num != '999999') {
@@ -747,9 +747,9 @@
 
     $internaldate = getPref($data_dir, $username, 'internal_date_sort', SMPREF_ON);
     if ($internaldate) {
-        $query = "FETCH $msgs_str (FLAGS UID RFC822.SIZE INTERNALDATE BODY.PEEK[HEADER.FIELDS (Date To Cc From Subject X-Priority Importance Priority Content-Type)])";
+        $query = "FETCH $msgs_str (FLAGS UID RFC822.SIZE INTERNALDATE BODY.PEEK[HEADER.FIELDS (Date To Cc From Subject X-Priority Importance Priority Content-Type $extra_small_header_fields)])";
     } else {
-        $query = "FETCH $msgs_str (FLAGS UID RFC822.SIZE BODY.PEEK[HEADER.FIELDS (Date To Cc From Subject X-Priority Importance Priority Content-Type)])";
+        $query = "FETCH $msgs_str (FLAGS UID RFC822.SIZE BODY.PEEK[HEADER.FIELDS (Date To Cc From Subject X-Priority Importance Priority Content-Type $extra_small_header_fields)])";
     }
     $read_list = sqimap_run_command_list ($imap_stream, $query, true, $response, $message, $uid_support);
     $i = 0;
@@ -793,6 +793,7 @@
         $read = substr($read,$i+1);
         $i_len = strlen($read);
         $i = 0;
+        $extra_small_header_field_values = array();
         while ($i < $i_len && $i !== false) {
             /* get argument */
             $read = trim(substr($read,$i));
@@ -897,7 +898,9 @@
                                     $type[1] = 'plain';
                                 }
                                 break;
-                            default: break;
+                            default:
+                                $extra_small_header_field_values[$field] = $value;
+                                break;
                             }
                         }
                     }
@@ -955,6 +958,8 @@
         $messages[$msgi]['FLAG_ANSWERED'] = $flag_answered;
         $messages[$msgi]['FLAG_SEEN'] = $flag_seen;
         $messages[$msgi]['FLAG_FLAGGED'] = $flag_flagged;
+        foreach ($extra_small_header_field_values as $field => $value)
+            $messages[$msgi][strtoupper($field)] = $value;
 
         /* non server sort stuff */
         if (!$allow_server_sort) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[SM-CVS] SF.net SVN: squirrelmail:[14940] trunk/squirrelmail/functions/ page_header.php

[<pdo...@us...>]

Revision: 14940
          http://sourceforge.net/p/squirrelmail/code/14940
Author:   pdontthink
Date:     2022-02-28 20:19:39 +0000 (Mon, 28 Feb 2022)
Log Message:
-----------
Fix whacky theme name logic, though it's still needlessly complex and should not be using 'none' when no theme is chosen...

Modified Paths:
--------------
    trunk/squirrelmail/functions/page_header.php

Modified: trunk/squirrelmail/functions/page_header.php
===================================================================
--- trunk/squirrelmail/functions/page_header.php	2022-02-28 18:35:13 UTC (rev 14939)
+++ trunk/squirrelmail/functions/page_header.php	2022-02-28 20:19:39 UTC (rev 14940)
@@ -95,7 +95,13 @@
 
     $used_fontset = (!empty($chosen_fontset) ? $chosen_fontset : $default_fontset);
     $used_fontsize = (!empty($chosen_fontsize) ? $chosen_fontsize : $default_fontsize);
-    $used_theme = !isset($chosen_theme) && $user_theme_default != 'none' && is_dir($chosen_theme) && is_readable($chosen_theme)?  $user_themes[$user_theme_default]['PATH'].'/default.css' : $chosen_theme_path;
+    if (!empty($chosen_theme) && is_dir($chosen_theme) && is_readable($chosen_theme))
+        $used_theme = $chosen_theme_path;
+    else if ($user_theme_default != 'none')
+        $used_theme = $user_themes[$user_theme_default]['PATH'];
+    else
+        $used_theme = 'none';
+
     
     /**
      * Stylesheets are loaded in the following order:
@@ -115,14 +121,13 @@
     $aUserStyles = array();
 
     // 2. Option user-defined stylesheet from preferences.
-    if (!empty($used_theme) && $used_theme != 'none') {
+    if ($used_theme != 'none') {
+//FIXME: rid ourselves of "none" strings!  I didn't do it here because I think the problem is that the theme itself should never be "none" (? well, what else would it be?  if "none" theme is actually OK, then is there a constant to use below instead of a hard-coded string?)
         /**
          * All styles (except "none" - ugh) just point to a directory,
          * so we need to include all .css files in that directory.
          */
-//FIXME: rid ourselves of "none" strings!  I didn't do it here because I think the problem is that the theme itself should never be "none" (? well, what else would it be?  if "none" theme is actually OK, then is there a constant to use below in stead of a hard-coded string?)
-        $styles = $used_theme == 'none' ? array()
-                : list_files($used_theme, '.css');
+        $styles = list_files($used_theme, '.css');
         foreach ($styles as $sheet) { 
             $aUserStyles[] = $used_theme .'/'.$sheet;
         }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[SM-CVS] SF.net SVN: squirrelmail:[14939] trunk/squirrelmail/plugins/administrator/ options.php

[<pdo...@us...>]

Revision: 14939
          http://sourceforge.net/p/squirrelmail/code/14939
Author:   pdontthink
Date:     2022-02-28 18:35:13 +0000 (Mon, 28 Feb 2022)
Log Message:
-----------
Syntax fix (thanks to Andrew Sachen)

Modified Paths:
--------------
    trunk/squirrelmail/plugins/administrator/options.php

Modified: trunk/squirrelmail/plugins/administrator/options.php
===================================================================
--- trunk/squirrelmail/plugins/administrator/options.php	2022-01-18 08:12:15 UTC (rev 14938)
+++ trunk/squirrelmail/plugins/administrator/options.php	2022-02-28 18:35:13 UTC (rev 14939)
@@ -120,7 +120,7 @@
                     } else {
                         // Number or function call
                         $mode = 'N';
-                        $value = $line[$j[;
+                        $value = $line[$j];
                     }
                 }
                 break;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[SM-CVS] SF.net SVN: squirrelmail:[14938] trunk

[<pdo...@us...>]

Revision: 14938
          http://sourceforge.net/p/squirrelmail/code/14938
Author:   pdontthink
Date:     2022-01-18 08:12:15 +0000 (Tue, 18 Jan 2022)
Log Message:
-----------
Happy New Year

Modified Paths:
--------------
    trunk/decode/eastasia/big5.php
    trunk/decode/eastasia/cp874.php
    trunk/decode/eastasia/cp949.php
    trunk/decode/eastasia/euc_cn.php
    trunk/decode/eastasia/euc_jp.php
    trunk/decode/eastasia/euc_kr.php
    trunk/decode/eastasia/euc_tw.php
    trunk/decode/eastasia/gb18030.php
    trunk/decode/eastasia/gb2312.php
    trunk/decode/eastasia/iso_2022_cn.php
    trunk/decode/eastasia/iso_2022_jp.php
    trunk/decode/eastasia/iso_2022_jp_2.php
    trunk/decode/eastasia/iso_2022_kr.php
    trunk/decode/eastasia/iso_2022_support.php
    trunk/decode/eastasia/shift_jis.php
    trunk/decode/ms-apple/cp10000.php
    trunk/decode/ms-apple/cp10006.php
    trunk/decode/ms-apple/cp10007.php
    trunk/decode/ms-apple/cp10017.php
    trunk/decode/ms-apple/cp10029.php
    trunk/decode/ms-apple/cp10079.php
    trunk/decode/ms-apple/cp10081.php
    trunk/decode/x-mac/x_mac_arabic.php
    trunk/decode/x-mac/x_mac_ce.php
    trunk/decode/x-mac/x_mac_chinsimp.php
    trunk/decode/x-mac/x_mac_chintrad.php
    trunk/decode/x-mac/x_mac_croatian.php
    trunk/decode/x-mac/x_mac_cyrillic.php
    trunk/decode/x-mac/x_mac_devanagari.php
    trunk/decode/x-mac/x_mac_farsi.php
    trunk/decode/x-mac/x_mac_greek.php
    trunk/decode/x-mac/x_mac_gujarati.php
    trunk/decode/x-mac/x_mac_gurmukhi.php
    trunk/decode/x-mac/x_mac_hebrew.php
    trunk/decode/x-mac/x_mac_icelandic.php
    trunk/decode/x-mac/x_mac_roman.php
    trunk/decode/x-mac/x_mac_romanian.php
    trunk/decode/x-mac/x_mac_thai.php
    trunk/decode/x-mac/x_mac_turkish.php
    trunk/decode/x-mac/x_mac_ukrainian.php
    trunk/documentation/admin/Makefile
    trunk/documentation/admin/admin.sgml
    trunk/documentation/devel/Makefile
    trunk/documentation/devel/devel.sgml
    trunk/documentation/translator/Makefile
    trunk/documentation/translator/translator.sgml
    trunk/documentation/user/Makefile
    trunk/documentation/user/user.sgml
    trunk/imap_proxy/README
    trunk/imap_proxy/copyright
    trunk/imap_proxy/include/common.h
    trunk/imap_proxy/include/imapproxy.h
    trunk/imap_proxy/scripts/imapproxy-bsd.init
    trunk/imap_proxy/scripts/imapproxy-linux.init
    trunk/imap_proxy/scripts/pimpdaddy
    trunk/imap_proxy/scripts/rc.pimpdaddy
    trunk/imap_proxy/src/becomenonroot.c
    trunk/imap_proxy/src/config.c
    trunk/imap_proxy/src/hash.c
    trunk/imap_proxy/src/icc.c
    trunk/imap_proxy/src/imapcommon.c
    trunk/imap_proxy/src/logging.c
    trunk/imap_proxy/src/main.c
    trunk/imap_proxy/src/pimpstat.c
    trunk/imap_proxy/src/request.c
    trunk/imap_proxy/src/select.c
    trunk/imap_proxy/src/threads.c
    trunk/locales/independent_strings.txt
    trunk/locales/locale/ar/LC_MESSAGES/plugins/address_add.po
    trunk/locales/locale/ar/setup.php
    trunk/locales/locale/bg_BG/LC_MESSAGES/change_pass.po
    trunk/locales/locale/bg_BG/LC_MESSAGES/plugins/address_add.po
    trunk/locales/locale/bg_BG/LC_MESSAGES/squirrelmail.po
    trunk/locales/locale/bg_BG/setup.php
    trunk/locales/locale/bn_BD/LC_MESSAGES/abook_import_export.po
    trunk/locales/locale/bn_BD/LC_MESSAGES/advanced_settings.po
    trunk/locales/locale/bn_BD/LC_MESSAGES/archive_mail.po
    trunk/locales/locale/bn_BD/LC_MESSAGES/askuserinfo.po
    trunk/locales/locale/bn_BD/LC_MESSAGES/calendar.po
    trunk/locales/locale/bn_BD/LC_MESSAGES/captcha.po
    trunk/locales/locale/bn_BD/LC_MESSAGES/censor.po
    trunk/locales/locale/bn_BD/LC_MESSAGES/change_sqlpass.po
    trunk/locales/locale/bn_BD/LC_MESSAGES/check_quota.po
    trunk/locales/locale/bn_BD/LC_MESSAGES/compatibility.po
    trunk/locales/locale/bn_BD/LC_MESSAGES/compose_extras.po
    trunk/locales/locale/bn_BD/LC_MESSAGES/contactclean.po
    trunk/locales/locale/bn_BD/LC_MESSAGES/cookie_warning.po
    trunk/locales/locale/bn_BD/LC_MESSAGES/custom_charset.po
    trunk/locales/locale/bn_BD/LC_MESSAGES/debugger.po
    trunk/locales/locale/bn_BD/LC_MESSAGES/empty_folders.po
    trunk/locales/locale/bn_BD/LC_MESSAGES/expire.po
    trunk/locales/locale/bn_BD/LC_MESSAGES/folder_settings.po
    trunk/locales/locale/bn_BD/LC_MESSAGES/folder_sizes.po
    trunk/locales/locale/bn_BD/LC_MESSAGES/forum.po
    trunk/locales/locale/bn_BD/LC_MESSAGES/html_mail.po
    trunk/locales/locale/bn_BD/LC_MESSAGES/japanese_input.po
    trunk/locales/locale/bn_BD/LC_MESSAGES/ldapquery.po
    trunk/locales/locale/bn_BD/LC_MESSAGES/limit_languages.po
    trunk/locales/locale/bn_BD/LC_MESSAGES/local_autorespond_forward.po
    trunk/locales/locale/bn_BD/LC_MESSAGES/lockout.po
    trunk/locales/locale/bn_BD/LC_MESSAGES/login_alias.po
    trunk/locales/locale/bn_BD/LC_MESSAGES/mark_read.po
    trunk/locales/locale/bn_BD/LC_MESSAGES/mini.po
    trunk/locales/locale/bn_BD/LC_MESSAGES/msg_flags.po
    trunk/locales/locale/bn_BD/LC_MESSAGES/multilogin.po
    trunk/locales/locale/bn_BD/LC_MESSAGES/naguser.po
    trunk/locales/locale/bn_BD/LC_MESSAGES/newuser_wiz.po
    trunk/locales/locale/bn_BD/LC_MESSAGES/plugins
    trunk/locales/locale/bn_BD/LC_MESSAGES/proon.po
    trunk/locales/locale/bn_BD/LC_MESSAGES/qmailadmin_login.po
    trunk/locales/locale/bn_BD/LC_MESSAGES/quicksave.po
    trunk/locales/locale/bn_BD/LC_MESSAGES/reply_buttons.po
    trunk/locales/locale/bn_BD/LC_MESSAGES/restrict_senders.po
    trunk/locales/locale/bn_BD/LC_MESSAGES/rootly_news.po
    trunk/locales/locale/bn_BD/LC_MESSAGES/same_ip.po
    trunk/locales/locale/bn_BD/LC_MESSAGES/sasql.po
    trunk/locales/locale/bn_BD/LC_MESSAGES/select_language.po
    trunk/locales/locale/bn_BD/LC_MESSAGES/serversidefilter.po
    trunk/locales/locale/bn_BD/LC_MESSAGES/show_ssl_link.po
    trunk/locales/locale/bn_BD/LC_MESSAGES/smallcal.po
    trunk/locales/locale/bn_BD/LC_MESSAGES/spam_buttons.po
    trunk/locales/locale/bn_BD/LC_MESSAGES/squirrelmail.po
    trunk/locales/locale/bn_BD/LC_MESSAGES/templates.po
    trunk/locales/locale/bn_BD/LC_MESSAGES/unsafe_image_rules.po
    trunk/locales/locale/bn_BD/LC_MESSAGES/vacation_local.po
    trunk/locales/locale/bn_BD/LC_MESSAGES/verify_reply_to.po
    trunk/locales/locale/bn_BD/LC_MESSAGES/web_search.po
    trunk/locales/locale/bn_BD/LC_MESSAGES/yelp.po
    trunk/locales/locale/bn_BD/setup.php
    trunk/locales/locale/bn_IN/LC_MESSAGES/squirrelmail.po
    trunk/locales/locale/bn_IN/setup.php
    trunk/locales/locale/ca_ES/LC_MESSAGES/plugins/address_add.po
    trunk/locales/locale/ca_ES/LC_MESSAGES/plugins/attachment_doc.po
    trunk/locales/locale/ca_ES/LC_MESSAGES/plugins/disk_quota.po
    trunk/locales/locale/ca_ES/LC_MESSAGES/squirrelmail.po
    trunk/locales/locale/ca_ES/LC_MESSAGES/view_as_html.po
    trunk/locales/locale/ca_ES/setup.php
    trunk/locales/locale/cs_CZ/LC_MESSAGES/abook_import_export.po
    trunk/locales/locale/cs_CZ/LC_MESSAGES/calendar.po
    trunk/locales/locale/cs_CZ/LC_MESSAGES/check_quota.po
    trunk/locales/locale/cs_CZ/LC_MESSAGES/compatibility.po
    trunk/locales/locale/cs_CZ/LC_MESSAGES/extra/ldifimport.po
    trunk/locales/locale/cs_CZ/LC_MESSAGES/folder_sizes.po
    trunk/locales/locale/cs_CZ/LC_MESSAGES/local_autorespond_forward.po
    trunk/locales/locale/cs_CZ/LC_MESSAGES/msg_flags.po
    trunk/locales/locale/cs_CZ/LC_MESSAGES/plugins/address_add.po
    trunk/locales/locale/cs_CZ/LC_MESSAGES/plugins/attachment_doc.po
    trunk/locales/locale/cs_CZ/LC_MESSAGES/plugins/avelsieve.po
    trunk/locales/locale/cs_CZ/LC_MESSAGES/plugins/bounce.po
    trunk/locales/locale/cs_CZ/LC_MESSAGES/plugins/change_ldappass.po
    trunk/locales/locale/cs_CZ/LC_MESSAGES/plugins/junkfolder.po
    trunk/locales/locale/cs_CZ/LC_MESSAGES/plugins/preview_pane.po
    trunk/locales/locale/cs_CZ/LC_MESSAGES/plugins/quota_usage.po
    trunk/locales/locale/cs_CZ/LC_MESSAGES/plugins/show_user_and_ip.po
    trunk/locales/locale/cs_CZ/LC_MESSAGES/plugins/useracl.po
    trunk/locales/locale/cs_CZ/LC_MESSAGES/plugins/vkeyboard.po
    trunk/locales/locale/cs_CZ/LC_MESSAGES/proon.po
    trunk/locales/locale/cs_CZ/LC_MESSAGES/squirrelmail.po
    trunk/locales/locale/cs_CZ/LC_MESSAGES/vacation_local.po
    trunk/locales/locale/cs_CZ/LC_MESSAGES/view_as_html.po
    trunk/locales/locale/cs_CZ/setup.php
    trunk/locales/locale/cy_GB/LC_MESSAGES/plugins/address_add.po
    trunk/locales/locale/cy_GB/LC_MESSAGES/squirrelmail.po
    trunk/locales/locale/cy_GB/setup.php
    trunk/locales/locale/da_DK/LC_MESSAGES/plugins/address_add.po
    trunk/locales/locale/da_DK/LC_MESSAGES/plugins/twc_weather.po
    trunk/locales/locale/da_DK/LC_MESSAGES/squirrelmail.po
    trunk/locales/locale/da_DK/LC_MESSAGES/view_as_html.po
    trunk/locales/locale/da_DK/setup.php
    trunk/locales/locale/de_DE/LC_MESSAGES/abook_import_export.po
    trunk/locales/locale/de_DE/LC_MESSAGES/archive_mail.po
    trunk/locales/locale/de_DE/LC_MESSAGES/askuserinfo.po
    trunk/locales/locale/de_DE/LC_MESSAGES/autocomplete.po
    trunk/locales/locale/de_DE/LC_MESSAGES/calendar.po
    trunk/locales/locale/de_DE/LC_MESSAGES/change_pass.po
    trunk/locales/locale/de_DE/LC_MESSAGES/change_sqlpass.po
    trunk/locales/locale/de_DE/LC_MESSAGES/check_quota.po
    trunk/locales/locale/de_DE/LC_MESSAGES/compatibility.po
    trunk/locales/locale/de_DE/LC_MESSAGES/custom_from.po
    trunk/locales/locale/de_DE/LC_MESSAGES/empty_folders.po
    trunk/locales/locale/de_DE/LC_MESSAGES/expire.po
    trunk/locales/locale/de_DE/LC_MESSAGES/extra/auto_cc.po
    trunk/locales/locale/de_DE/LC_MESSAGES/extra/left_css.po
    trunk/locales/locale/de_DE/LC_MESSAGES/extra/show_headers.po
    trunk/locales/locale/de_DE/LC_MESSAGES/extra/timeout_user.po
    trunk/locales/locale/de_DE/LC_MESSAGES/extra/username.po
    trunk/locales/locale/de_DE/LC_MESSAGES/folder_sizes.po
    trunk/locales/locale/de_DE/LC_MESSAGES/japanese_input.po
    trunk/locales/locale/de_DE/LC_MESSAGES/ldapquery.po
    trunk/locales/locale/de_DE/LC_MESSAGES/limit_languages.po
    trunk/locales/locale/de_DE/LC_MESSAGES/local_autorespond_forward.po
    trunk/locales/locale/de_DE/LC_MESSAGES/login_alias.po
    trunk/locales/locale/de_DE/LC_MESSAGES/mark_read.po
    trunk/locales/locale/de_DE/LC_MESSAGES/naguser.po
    trunk/locales/locale/de_DE/LC_MESSAGES/newuser_wiz.po
    trunk/locales/locale/de_DE/LC_MESSAGES/plugins/abook_group.po
    trunk/locales/locale/de_DE/LC_MESSAGES/plugins/address_add.po
    trunk/locales/locale/de_DE/LC_MESSAGES/plugins/admin_add.po
    trunk/locales/locale/de_DE/LC_MESSAGES/plugins/amavisnewsql.po
    trunk/locales/locale/de_DE/LC_MESSAGES/plugins/attachment_doc.po
    trunk/locales/locale/de_DE/LC_MESSAGES/plugins/change_ldappass.po
    trunk/locales/locale/de_DE/LC_MESSAGES/plugins/change_merakpass.po
    trunk/locales/locale/de_DE/LC_MESSAGES/plugins/change_passwd.po
    trunk/locales/locale/de_DE/LC_MESSAGES/plugins/file_manager.po
    trunk/locales/locale/de_DE/LC_MESSAGES/plugins/gpg.po
    trunk/locales/locale/de_DE/LC_MESSAGES/plugins/gzip.po
    trunk/locales/locale/de_DE/LC_MESSAGES/plugins/image_buttons.po
    trunk/locales/locale/de_DE/LC_MESSAGES/plugins/junkfolder.po
    trunk/locales/locale/de_DE/LC_MESSAGES/plugins/notes.po
    trunk/locales/locale/de_DE/LC_MESSAGES/plugins/online_users.po
    trunk/locales/locale/de_DE/LC_MESSAGES/plugins/rewrap.po
    trunk/locales/locale/de_DE/LC_MESSAGES/plugins/show_user_and_ip.po
    trunk/locales/locale/de_DE/LC_MESSAGES/plugins/taglines.po
    trunk/locales/locale/de_DE/LC_MESSAGES/plugins/vpopmail.po
    trunk/locales/locale/de_DE/LC_MESSAGES/reply_buttons.po
    trunk/locales/locale/de_DE/LC_MESSAGES/restrict_senders.po
    trunk/locales/locale/de_DE/LC_MESSAGES/select_language.po
    trunk/locales/locale/de_DE/LC_MESSAGES/select_range.po
    trunk/locales/locale/de_DE/LC_MESSAGES/serversidefilter.po
    trunk/locales/locale/de_DE/LC_MESSAGES/show_ssl_link.po
    trunk/locales/locale/de_DE/LC_MESSAGES/spam_buttons.po
    trunk/locales/locale/de_DE/LC_MESSAGES/squirrelmail.po
    trunk/locales/locale/de_DE/LC_MESSAGES/startup_folder.po
    trunk/locales/locale/de_DE/LC_MESSAGES/templates.po
    trunk/locales/locale/de_DE/LC_MESSAGES/unsafe_image_rules.po
    trunk/locales/locale/de_DE/LC_MESSAGES/vacation_local.po
    trunk/locales/locale/de_DE/LC_MESSAGES/verify_reply_to.po
    trunk/locales/locale/de_DE/LC_MESSAGES/view_as_html.po
    trunk/locales/locale/de_DE/setup.php
    trunk/locales/locale/el_GR/LC_MESSAGES/ldapquery.po
    trunk/locales/locale/el_GR/LC_MESSAGES/plugins/address_add.po
    trunk/locales/locale/el_GR/LC_MESSAGES/plugins/avelsieve.po
    trunk/locales/locale/el_GR/LC_MESSAGES/plugins/change_ldappass.po
    trunk/locales/locale/el_GR/LC_MESSAGES/plugins/gzip.po
    trunk/locales/locale/el_GR/LC_MESSAGES/plugins/junkfolder.po
    trunk/locales/locale/el_GR/LC_MESSAGES/plugins/preview_pane.po
    trunk/locales/locale/el_GR/LC_MESSAGES/plugins/show_user_and_ip.po
    trunk/locales/locale/el_GR/LC_MESSAGES/plugins/twc_weather.po
    trunk/locales/locale/el_GR/LC_MESSAGES/plugins/useracl.po
    trunk/locales/locale/el_GR/LC_MESSAGES/squirrelmail.po
    trunk/locales/locale/el_GR/setup.php
    trunk/locales/locale/en_GB/LC_MESSAGES/squirrelmail.po
    trunk/locales/locale/en_GB/setup.php
    trunk/locales/locale/es_ES/LC_MESSAGES/askuserinfo.po
    trunk/locales/locale/es_ES/LC_MESSAGES/change_pass.po
    trunk/locales/locale/es_ES/LC_MESSAGES/contactclean.po
    trunk/locales/locale/es_ES/LC_MESSAGES/plugins/abook_group.po
    trunk/locales/locale/es_ES/LC_MESSAGES/plugins/address_add.po
    trunk/locales/locale/es_ES/LC_MESSAGES/plugins/attachment_doc.po
    trunk/locales/locale/es_ES/LC_MESSAGES/plugins/change_ldappass.po
    trunk/locales/locale/es_ES/LC_MESSAGES/plugins/change_merakpass.po
    trunk/locales/locale/es_ES/LC_MESSAGES/plugins/disk_quota.po
    trunk/locales/locale/es_ES/LC_MESSAGES/serversidefilter.po
    trunk/locales/locale/es_ES/LC_MESSAGES/squirrelmail.po
    trunk/locales/locale/es_ES/LC_MESSAGES/view_as_html.po
    trunk/locales/locale/es_ES/setup.php
    trunk/locales/locale/et_EE/LC_MESSAGES/plugins/address_add.po
    trunk/locales/locale/et_EE/setup.php
    trunk/locales/locale/eu_ES/LC_MESSAGES/squirrelmail.po
    trunk/locales/locale/eu_ES/setup.php
    trunk/locales/locale/fa_IR/LC_MESSAGES/captcha.po
    trunk/locales/locale/fa_IR/LC_MESSAGES/plugins/notes.po
    trunk/locales/locale/fa_IR/LC_MESSAGES/plugins/quota_usage.po
    trunk/locales/locale/fa_IR/LC_MESSAGES/qmailadmin_login.po
    trunk/locales/locale/fa_IR/LC_MESSAGES/squirrelmail.po
    trunk/locales/locale/fa_IR/setup.php
    trunk/locales/locale/fi_FI/LC_MESSAGES/plugins/address_add.po
    trunk/locales/locale/fi_FI/LC_MESSAGES/plugins/attachment_doc.po
    trunk/locales/locale/fi_FI/LC_MESSAGES/plugins/avelsieve.po
    trunk/locales/locale/fi_FI/LC_MESSAGES/squirrelmail.po
    trunk/locales/locale/fi_FI/setup.php
    trunk/locales/locale/fo_FO/LC_MESSAGES/folder_settings.po
    trunk/locales/locale/fo_FO/LC_MESSAGES/html_mail.po
    trunk/locales/locale/fo_FO/LC_MESSAGES/plugins/address_add.po
    trunk/locales/locale/fo_FO/LC_MESSAGES/squirrelmail.po
    trunk/locales/locale/fo_FO/setup.php
    trunk/locales/locale/fr_FR/LC_MESSAGES/archive_mail.po
    trunk/locales/locale/fr_FR/LC_MESSAGES/calendar.po
    trunk/locales/locale/fr_FR/LC_MESSAGES/change_pass.po
    trunk/locales/locale/fr_FR/LC_MESSAGES/change_sqlpass.po
    trunk/locales/locale/fr_FR/LC_MESSAGES/check_quota.po
    trunk/locales/locale/fr_FR/LC_MESSAGES/empty_folders.po
    trunk/locales/locale/fr_FR/LC_MESSAGES/folder_sizes.po
    trunk/locales/locale/fr_FR/LC_MESSAGES/local_autorespond_forward.po
    trunk/locales/locale/fr_FR/LC_MESSAGES/mark_read.po
    trunk/locales/locale/fr_FR/LC_MESSAGES/plugins/address_add.po
    trunk/locales/locale/fr_FR/LC_MESSAGES/plugins/amavisnewsql.po
    trunk/locales/locale/fr_FR/LC_MESSAGES/plugins/attachment_doc.po
    trunk/locales/locale/fr_FR/LC_MESSAGES/plugins/avelsieve.po
    trunk/locales/locale/fr_FR/LC_MESSAGES/plugins/change_passwd.po
    trunk/locales/locale/fr_FR/LC_MESSAGES/plugins/chg_sasl_passwd.po
    trunk/locales/locale/fr_FR/LC_MESSAGES/plugins/disk_quota.po
    trunk/locales/locale/fr_FR/LC_MESSAGES/plugins/file_manager.po
    trunk/locales/locale/fr_FR/LC_MESSAGES/plugins/online_users.po
    trunk/locales/locale/fr_FR/LC_MESSAGES/plugins/preview_pane.po
    trunk/locales/locale/fr_FR/LC_MESSAGES/plugins/quota_usage.po
    trunk/locales/locale/fr_FR/LC_MESSAGES/plugins/show_user_and_ip.po
    trunk/locales/locale/fr_FR/LC_MESSAGES/plugins/twc_weather.po
    trunk/locales/locale/fr_FR/LC_MESSAGES/quicksave.po
    trunk/locales/locale/fr_FR/LC_MESSAGES/spam_buttons.po
    trunk/locales/locale/fr_FR/LC_MESSAGES/squirrelmail.po
    trunk/locales/locale/fr_FR/LC_MESSAGES/vacation_local.po
    trunk/locales/locale/fr_FR/LC_MESSAGES/view_as_html.po
    trunk/locales/locale/fr_FR/LC_MESSAGES/yelp.po
    trunk/locales/locale/fr_FR/setup.php
    trunk/locales/locale/fy/LC_MESSAGES/advanced_settings.po
    trunk/locales/locale/fy/LC_MESSAGES/archive_mail.po
    trunk/locales/locale/fy/LC_MESSAGES/askuserinfo.po
    trunk/locales/locale/fy/LC_MESSAGES/autocomplete.po
    trunk/locales/locale/fy/LC_MESSAGES/calendar.po
    trunk/locales/locale/fy/LC_MESSAGES/change_pass.po
    trunk/locales/locale/fy/LC_MESSAGES/change_sqlpass.po
    trunk/locales/locale/fy/LC_MESSAGES/check_quota.po
    trunk/locales/locale/fy/LC_MESSAGES/compatibility.po
    trunk/locales/locale/fy/LC_MESSAGES/compose_extras.po
    trunk/locales/locale/fy/LC_MESSAGES/contactclean.po
    trunk/locales/locale/fy/LC_MESSAGES/cookie_warning.po
    trunk/locales/locale/fy/LC_MESSAGES/custom_charset.po
    trunk/locales/locale/fy/LC_MESSAGES/custom_from.po
    trunk/locales/locale/fy/LC_MESSAGES/debugger.po
    trunk/locales/locale/fy/LC_MESSAGES/empty_folders.po
    trunk/locales/locale/fy/LC_MESSAGES/expire.po
    trunk/locales/locale/fy/LC_MESSAGES/extra/auto_cc.po
    trunk/locales/locale/fy/LC_MESSAGES/extra/block_sender.po
    trunk/locales/locale/fy/LC_MESSAGES/extra/canadian_weather.po
    trunk/locales/locale/fy/LC_MESSAGES/extra/courier_vacation.po
    trunk/locales/locale/fy/LC_MESSAGES/extra/got_hotmail.po
    trunk/locales/locale/fy/LC_MESSAGES/extra/ip_restrict.po
    trunk/locales/locale/fy/LC_MESSAGES/extra/left_css.po
    trunk/locales/locale/fy/LC_MESSAGES/extra/show_headers.po
    trunk/locales/locale/fy/LC_MESSAGES/extra/timeout_user.po
    trunk/locales/locale/fy/LC_MESSAGES/extra/tmda.po
    trunk/locales/locale/fy/LC_MESSAGES/extra/tmdatools.po
    trunk/locales/locale/fy/LC_MESSAGES/extra/user_special_mailboxes.po
    trunk/locales/locale/fy/LC_MESSAGES/extra/username.po
    trunk/locales/locale/fy/LC_MESSAGES/extra/vacation.po
    trunk/locales/locale/fy/LC_MESSAGES/extra/windows.po
    trunk/locales/locale/fy/LC_MESSAGES/folder_settings.po
    trunk/locales/locale/fy/LC_MESSAGES/folder_sizes.po
    trunk/locales/locale/fy/LC_MESSAGES/forum.po
    trunk/locales/locale/fy/LC_MESSAGES/html_mail.po
    trunk/locales/locale/fy/LC_MESSAGES/ldapquery.po
    trunk/locales/locale/fy/LC_MESSAGES/limit_languages.po
    trunk/locales/locale/fy/LC_MESSAGES/login_alias.po
    trunk/locales/locale/fy/LC_MESSAGES/mark_read.po
    trunk/locales/locale/fy/LC_MESSAGES/mini.po
    trunk/locales/locale/fy/LC_MESSAGES/multilogin.po
    trunk/locales/locale/fy/LC_MESSAGES/naguser.po
    trunk/locales/locale/fy/LC_MESSAGES/newuser_wiz.po
    trunk/locales/locale/fy/LC_MESSAGES/plugins/abook_group.po
    trunk/locales/locale/fy/LC_MESSAGES/plugins/address_add.po
    trunk/locales/locale/fy/LC_MESSAGES/plugins/admin_add.po
    trunk/locales/locale/fy/LC_MESSAGES/plugins/amavisnewsql.po
    trunk/locales/locale/fy/LC_MESSAGES/plugins/annotatemore.po
    trunk/locales/locale/fy/LC_MESSAGES/plugins/attachment_doc.po
    trunk/locales/locale/fy/LC_MESSAGES/plugins/avelsieve.po
    trunk/locales/locale/fy/LC_MESSAGES/plugins/bayesspam.po
    trunk/locales/locale/fy/LC_MESSAGES/plugins/block_attach.po
    trunk/locales/locale/fy/LC_MESSAGES/plugins/bounce.po
    trunk/locales/locale/fy/LC_MESSAGES/plugins/change_ldappass.po
    trunk/locales/locale/fy/LC_MESSAGES/plugins/change_merakpass.po
    trunk/locales/locale/fy/LC_MESSAGES/plugins/change_passwd.po
    trunk/locales/locale/fy/LC_MESSAGES/plugins/chg_sasl_passwd.po
    trunk/locales/locale/fy/LC_MESSAGES/plugins/cpanel_pw_changer.po
    trunk/locales/locale/fy/LC_MESSAGES/plugins/cpanel_vacation.po
    trunk/locales/locale/fy/LC_MESSAGES/plugins/disk_quota.po
    trunk/locales/locale/fy/LC_MESSAGES/plugins/extract.po
    trunk/locales/locale/fy/LC_MESSAGES/plugins/file_manager.po
    trunk/locales/locale/fy/LC_MESSAGES/plugins/gpg.po
    trunk/locales/locale/fy/LC_MESSAGES/plugins/gzip.po
    trunk/locales/locale/fy/LC_MESSAGES/plugins/image_buttons.po
    trunk/locales/locale/fy/LC_MESSAGES/plugins/junkfolder.po
    trunk/locales/locale/fy/LC_MESSAGES/plugins/ldap_abook.po
    trunk/locales/locale/fy/LC_MESSAGES/plugins/mail_alias.po
    trunk/locales/locale/fy/LC_MESSAGES/plugins/notes.po
    trunk/locales/locale/fy/LC_MESSAGES/plugins/online_users.po
    trunk/locales/locale/fy/LC_MESSAGES/plugins/quota_usage.po
    trunk/locales/locale/fy/LC_MESSAGES/plugins/sent_confirmation.po
    trunk/locales/locale/fy/LC_MESSAGES/plugins/show_user_and_ip.po
    trunk/locales/locale/fy/LC_MESSAGES/plugins/useracl.po
    trunk/locales/locale/fy/LC_MESSAGES/plugins/vacation.po
    trunk/locales/locale/fy/LC_MESSAGES/plugins/virus_scan.po
    trunk/locales/locale/fy/LC_MESSAGES/plugins/vpopmail.po
    trunk/locales/locale/fy/LC_MESSAGES/proon.po
    trunk/locales/locale/fy/LC_MESSAGES/qmailadmin_login.po
    trunk/locales/locale/fy/LC_MESSAGES/quicksave.po
    trunk/locales/locale/fy/LC_MESSAGES/reply_buttons.po
    trunk/locales/locale/fy/LC_MESSAGES/restrict_senders.po
    trunk/locales/locale/fy/LC_MESSAGES/sasql.po
    trunk/locales/locale/fy/LC_MESSAGES/select_language.po
    trunk/locales/locale/fy/LC_MESSAGES/select_range.po
    trunk/locales/locale/fy/LC_MESSAGES/serversidefilter.po
    trunk/locales/locale/fy/LC_MESSAGES/show_ssl_link.po
    trunk/locales/locale/fy/LC_MESSAGES/smallcal.po
    trunk/locales/locale/fy/LC_MESSAGES/smime.po
    trunk/locales/locale/fy/LC_MESSAGES/spam_buttons.po
    trunk/locales/locale/fy/LC_MESSAGES/squirrelmail.po
    trunk/locales/locale/fy/LC_MESSAGES/startup_folder.po
    trunk/locales/locale/fy/LC_MESSAGES/templates.po
    trunk/locales/locale/fy/LC_MESSAGES/unsafe_image_rules.po
    trunk/locales/locale/fy/LC_MESSAGES/vacation_local.po
    trunk/locales/locale/fy/LC_MESSAGES/vadmin.po
    trunk/locales/locale/fy/LC_MESSAGES/verify_reply_to.po
    trunk/locales/locale/fy/LC_MESSAGES/view_as_html.po
    trunk/locales/locale/fy/LC_MESSAGES/web_search.po
    trunk/locales/locale/fy/LC_MESSAGES/yelp.po
    trunk/locales/locale/fy/setup.php
    trunk/locales/locale/he_IL/LC_MESSAGES/plugins/address_add.po
    trunk/locales/locale/he_IL/LC_MESSAGES/squirrelmail.po
    trunk/locales/locale/he_IL/LC_MESSAGES/view_as_html.po
    trunk/locales/locale/he_IL/setup.php
    trunk/locales/locale/hr_HR/LC_MESSAGES/plugins/address_add.po
    trunk/locales/locale/hr_HR/LC_MESSAGES/squirrelmail.po
    trunk/locales/locale/hr_HR/setup.php
    trunk/locales/locale/hu_HU/LC_MESSAGES/askuserinfo.po
    trunk/locales/locale/hu_HU/LC_MESSAGES/change_pass.po
    trunk/locales/locale/hu_HU/LC_MESSAGES/check_quota.po
    trunk/locales/locale/hu_HU/LC_MESSAGES/compatibility.po
    trunk/locales/locale/hu_HU/LC_MESSAGES/folder_sizes.po
    trunk/locales/locale/hu_HU/LC_MESSAGES/local_autorespond_forward.po
    trunk/locales/locale/hu_HU/LC_MESSAGES/plugins/address_add.po
    trunk/locales/locale/hu_HU/LC_MESSAGES/plugins/attachment_doc.po
    trunk/locales/locale/hu_HU/LC_MESSAGES/plugins/show_user_and_ip.po
    trunk/locales/locale/hu_HU/LC_MESSAGES/squirrelmail.po
    trunk/locales/locale/hu_HU/setup.php
    trunk/locales/locale/id_ID/LC_MESSAGES/askuserinfo.po
    trunk/locales/locale/id_ID/LC_MESSAGES/autocomplete.po
    trunk/locales/locale/id_ID/LC_MESSAGES/change_pass.po
    trunk/locales/locale/id_ID/LC_MESSAGES/compatibility.po
    trunk/locales/locale/id_ID/LC_MESSAGES/cookie_warning.po
    trunk/locales/locale/id_ID/LC_MESSAGES/custom_from.po
    trunk/locales/locale/id_ID/LC_MESSAGES/extra/auto_cc.po
    trunk/locales/locale/id_ID/LC_MESSAGES/extra/timeout_user.po
    trunk/locales/locale/id_ID/LC_MESSAGES/folder_sizes.po
    trunk/locales/locale/id_ID/LC_MESSAGES/plugins/abook_group.po
    trunk/locales/locale/id_ID/LC_MESSAGES/plugins/address_add.po
    trunk/locales/locale/id_ID/LC_MESSAGES/plugins/admin_add.po
    trunk/locales/locale/id_ID/LC_MESSAGES/plugins/attachment_doc.po
    trunk/locales/locale/id_ID/LC_MESSAGES/plugins/change_passwd.po
    trunk/locales/locale/id_ID/LC_MESSAGES/plugins/gzip.po
    trunk/locales/locale/id_ID/LC_MESSAGES/plugins/online_users.po
    trunk/locales/locale/id_ID/LC_MESSAGES/plugins/quota_usage.po
    trunk/locales/locale/id_ID/LC_MESSAGES/select_language.po
    trunk/locales/locale/id_ID/LC_MESSAGES/select_range.po
    trunk/locales/locale/id_ID/LC_MESSAGES/squirrelmail.po
    trunk/locales/locale/id_ID/LC_MESSAGES/view_as_html.po
    trunk/locales/locale/id_ID/setup.php
    trunk/locales/locale/is_IS/LC_MESSAGES/plugins/address_add.po
    trunk/locales/locale/is_IS/LC_MESSAGES/select_range.po
    trunk/locales/locale/is_IS/LC_MESSAGES/squirrelmail.po
    trunk/locales/locale/is_IS/setup.php
    trunk/locales/locale/it_IT/LC_MESSAGES/abook_import_export.po
    trunk/locales/locale/it_IT/LC_MESSAGES/advanced_settings.po
    trunk/locales/locale/it_IT/LC_MESSAGES/archive_mail.po
    trunk/locales/locale/it_IT/LC_MESSAGES/askuserinfo.po
    trunk/locales/locale/it_IT/LC_MESSAGES/calendar.po
    trunk/locales/locale/it_IT/LC_MESSAGES/captcha.po
    trunk/locales/locale/it_IT/LC_MESSAGES/censor.po
    trunk/locales/locale/it_IT/LC_MESSAGES/change_pass.po
    trunk/locales/locale/it_IT/LC_MESSAGES/change_sqlpass.po
    trunk/locales/locale/it_IT/LC_MESSAGES/check_quota.po
    trunk/locales/locale/it_IT/LC_MESSAGES/compatibility.po
    trunk/locales/locale/it_IT/LC_MESSAGES/compose_extras.po
    trunk/locales/locale/it_IT/LC_MESSAGES/contactclean.po
    trunk/locales/locale/it_IT/LC_MESSAGES/cookie_warning.po
    trunk/locales/locale/it_IT/LC_MESSAGES/custom_charset.po
    trunk/locales/locale/it_IT/LC_MESSAGES/debugger.po
    trunk/locales/locale/it_IT/LC_MESSAGES/empty_folders.po
    trunk/locales/locale/it_IT/LC_MESSAGES/expire.po
    trunk/locales/locale/it_IT/LC_MESSAGES/folder_settings.po
    trunk/locales/locale/it_IT/LC_MESSAGES/folder_sizes.po
    trunk/locales/locale/it_IT/LC_MESSAGES/forum.po
    trunk/locales/locale/it_IT/LC_MESSAGES/html_mail.po
    trunk/locales/locale/it_IT/LC_MESSAGES/japanese_input.po
    trunk/locales/locale/it_IT/LC_MESSAGES/limit_languages.po
    trunk/locales/locale/it_IT/LC_MESSAGES/local_autorespond_forward.po
    trunk/locales/locale/it_IT/LC_MESSAGES/lockout.po
    trunk/locales/locale/it_IT/LC_MESSAGES/multilogin.po
    trunk/locales/locale/it_IT/LC_MESSAGES/newuser_wiz.po
    trunk/locales/locale/it_IT/LC_MESSAGES/plugins/abook_group.po
    trunk/locales/locale/it_IT/LC_MESSAGES/plugins/address_add.po
    trunk/locales/locale/it_IT/LC_MESSAGES/plugins/amavisnewsql.po
    trunk/locales/locale/it_IT/LC_MESSAGES/plugins/avelsieve.po
    trunk/locales/locale/it_IT/LC_MESSAGES/plugins/bayesspam.po
    trunk/locales/locale/it_IT/LC_MESSAGES/plugins/change_ldappass.po
    trunk/locales/locale/it_IT/LC_MESSAGES/plugins/gpg.po
    trunk/locales/locale/it_IT/LC_MESSAGES/plugins/quota_usage.po
    trunk/locales/locale/it_IT/LC_MESSAGES/plugins/twc_weather.po
    trunk/locales/locale/it_IT/LC_MESSAGES/squirrelmail.po
    trunk/locales/locale/it_IT/LC_MESSAGES/vacation_local.po
    trunk/locales/locale/it_IT/LC_MESSAGES/view_as_html.po
    trunk/locales/locale/it_IT/setup.php
    trunk/locales/locale/ja_JP/LC_MESSAGES/archive_mail.po
    trunk/locales/locale/ja_JP/LC_MESSAGES/askuserinfo.po
    trunk/locales/locale/ja_JP/LC_MESSAGES/compatibility.po
    trunk/locales/locale/ja_JP/LC_MESSAGES/cookie_warning.po
    trunk/locales/locale/ja_JP/LC_MESSAGES/custom_charset.po
    trunk/locales/locale/ja_JP/LC_MESSAGES/debugger.po
    trunk/locales/locale/ja_JP/LC_MESSAGES/html_mail.po
    trunk/locales/locale/ja_JP/LC_MESSAGES/mini.po
    trunk/locales/locale/ja_JP/LC_MESSAGES/plugins/admin_add.po
    trunk/locales/locale/ja_JP/LC_MESSAGES/plugins/chg_sasl_passwd.po
    trunk/locales/locale/ja_JP/LC_MESSAGES/plugins/gzip.po
    trunk/locales/locale/ja_JP/LC_MESSAGES/plugins/online_users.po
    trunk/locales/locale/ja_JP/LC_MESSAGES/plugins/rewrap.po
    trunk/locales/locale/ja_JP/LC_MESSAGES/plugins/taglines.po
    trunk/locales/locale/ja_JP/LC_MESSAGES/reply_buttons.po
    trunk/locales/locale/ja_JP/LC_MESSAGES/select_language.po
    trunk/locales/locale/ja_JP/LC_MESSAGES/select_range.po
    trunk/locales/locale/ja_JP/LC_MESSAGES/serversidefilter.po
    trunk/locales/locale/ja_JP/LC_MESSAGES/show_ssl_link.po
    trunk/locales/locale/ja_JP/LC_MESSAGES/smallcal.po
    trunk/locales/locale/ja_JP/LC_MESSAGES/spam_buttons.po
    trunk/locales/locale/ja_JP/LC_MESSAGES/squirrelmail.po
    trunk/locales/locale/ja_JP/LC_MESSAGES/view_as_html.po
    trunk/locales/locale/ja_JP/LC_MESSAGES/web_search.po
    trunk/locales/locale/ja_JP/setup.php
    trunk/locales/locale/ka/LC_MESSAGES/squirrelmail.po
    trunk/locales/locale/ka/setup.php
    trunk/locales/locale/km/LC_MESSAGES/abook_import_export.po
    trunk/locales/locale/km/LC_MESSAGES/advanced_settings.po
    trunk/locales/locale/km/LC_MESSAGES/archive_mail.po
    trunk/locales/locale/km/LC_MESSAGES/askuserinfo.po
    trunk/locales/locale/km/LC_MESSAGES/autocomplete.po
    trunk/locales/locale/km/LC_MESSAGES/calendar.po
    trunk/locales/locale/km/LC_MESSAGES/captcha.po
    trunk/locales/locale/km/LC_MESSAGES/censor.po
    trunk/locales/locale/km/LC_MESSAGES/change_pass.po
    trunk/locales/locale/km/LC_MESSAGES/change_sqlpass.po
    trunk/locales/locale/km/LC_MESSAGES/check_quota.po
    trunk/locales/locale/km/LC_MESSAGES/compatibility.po
    trunk/locales/locale/km/LC_MESSAGES/compose_extras.po
    trunk/locales/locale/km/LC_MESSAGES/contactclean.po
    trunk/locales/locale/km/LC_MESSAGES/cookie_warning.po
    trunk/locales/locale/km/LC_MESSAGES/custom_charset.po
    trunk/locales/locale/km/LC_MESSAGES/custom_from.po
    trunk/locales/locale/km/LC_MESSAGES/debugger.po
    trunk/locales/locale/km/LC_MESSAGES/empty_folders.po
    trunk/locales/locale/km/LC_MESSAGES/expire.po
    trunk/locales/locale/km/LC_MESSAGES/extra/auto_cc.po
    trunk/locales/locale/km/LC_MESSAGES/extra/block_sender.po
    trunk/locales/locale/km/LC_MESSAGES/extra/canadian_weather.po
    trunk/locales/locale/km/LC_MESSAGES/extra/courier_vacation.po
    trunk/locales/locale/km/LC_MESSAGES/extra/got_hotmail.po
    trunk/locales/locale/km/LC_MESSAGES/extra/ip_restrict.po
    trunk/locales/locale/km/LC_MESSAGES/extra/left_css.po
    trunk/locales/locale/km/LC_MESSAGES/extra/show_headers.po
    trunk/locales/locale/km/LC_MESSAGES/extra/timeout_user.po
    trunk/locales/locale/km/LC_MESSAGES/extra/tmda.po
    trunk/locales/locale/km/LC_MESSAGES/extra/tmdatools.po
    trunk/locales/locale/km/LC_MESSAGES/extra/user_special_mailboxes.po
    trunk/locales/locale/km/LC_MESSAGES/extra/username.po
    trunk/locales/locale/km/LC_MESSAGES/extra/vacation.po
    trunk/locales/locale/km/LC_MESSAGES/extra/windows.po
    trunk/locales/locale/km/LC_MESSAGES/folder_settings.po
    trunk/locales/locale/km/LC_MESSAGES/folder_sizes.po
    trunk/locales/locale/km/LC_MESSAGES/forum.po
    trunk/locales/locale/km/LC_MESSAGES/html_mail.po
    trunk/locales/locale/km/LC_MESSAGES/japanese_input.po
    trunk/locales/locale/km/LC_MESSAGES/ldapquery.po
    trunk/locales/locale/km/LC_MESSAGES/limit_languages.po
    trunk/locales/locale/km/LC_MESSAGES/local_autorespond_forward.po
    trunk/locales/locale/km/LC_MESSAGES/lockout.po
    trunk/locales/locale/km/LC_MESSAGES/login_alias.po
    trunk/locales/locale/km/LC_MESSAGES/mark_read.po
    trunk/locales/locale/km/LC_MESSAGES/mini.po
    trunk/locales/locale/km/LC_MESSAGES/msg_flags.po
    trunk/locales/locale/km/LC_MESSAGES/multilogin.po
    trunk/locales/locale/km/LC_MESSAGES/naguser.po
    trunk/locales/locale/km/LC_MESSAGES/newuser_wiz.po
    trunk/locales/locale/km/LC_MESSAGES/plugins/abook_group.po
    trunk/locales/locale/km/LC_MESSAGES/plugins/address_add.po
    trunk/locales/locale/km/LC_MESSAGES/plugins/admin_add.po
    trunk/locales/locale/km/LC_MESSAGES/plugins/amavisnewsql.po
    trunk/locales/locale/km/LC_MESSAGES/plugins/annotatemore.po
    trunk/locales/locale/km/LC_MESSAGES/plugins/attachment_doc.po
    trunk/locales/locale/km/LC_MESSAGES/plugins/avelsieve.po
    trunk/locales/locale/km/LC_MESSAGES/plugins/bayesspam.po
    trunk/locales/locale/km/LC_MESSAGES/plugins/block_attach.po
    trunk/locales/locale/km/LC_MESSAGES/plugins/bounce.po
    trunk/locales/locale/km/LC_MESSAGES/plugins/change_ldappass.po
    trunk/locales/locale/km/LC_MESSAGES/plugins/change_merakpass.po
    trunk/locales/locale/km/LC_MESSAGES/plugins/change_passwd.po
    trunk/locales/locale/km/LC_MESSAGES/plugins/chg_sasl_passwd.po
    trunk/locales/locale/km/LC_MESSAGES/plugins/cpanel_pw_changer.po
    trunk/locales/locale/km/LC_MESSAGES/plugins/cpanel_vacation.po
    trunk/locales/locale/km/LC_MESSAGES/plugins/disk_quota.po
    trunk/locales/locale/km/LC_MESSAGES/plugins/extract.po
    trunk/locales/locale/km/LC_MESSAGES/plugins/file_manager.po
    trunk/locales/locale/km/LC_MESSAGES/plugins/gpg.po
    trunk/locales/locale/km/LC_MESSAGES/plugins/gzip.po
    trunk/locales/locale/km/LC_MESSAGES/plugins/image_buttons.po
    trunk/locales/locale/km/LC_MESSAGES/plugins/junkfolder.po
    trunk/locales/locale/km/LC_MESSAGES/plugins/ldap_abook.po
    trunk/locales/locale/km/LC_MESSAGES/plugins/mail_alias.po
    trunk/locales/locale/km/LC_MESSAGES/plugins/notes.po
    trunk/locales/locale/km/LC_MESSAGES/plugins/online_users.po
    trunk/locales/locale/km/LC_MESSAGES/plugins/preview_pane.po
    trunk/locales/locale/km/LC_MESSAGES/plugins/quota_usage.po
    trunk/locales/locale/km/LC_MESSAGES/plugins/rewrap.po
    trunk/locales/locale/km/LC_MESSAGES/plugins/sent_confirmation.po
    trunk/locales/locale/km/LC_MESSAGES/plugins/show_user_and_ip.po
    trunk/locales/locale/km/LC_MESSAGES/plugins/spamrule.po
    trunk/locales/locale/km/LC_MESSAGES/plugins/taglines.po
    trunk/locales/locale/km/LC_MESSAGES/plugins/twc_weather.po
    trunk/locales/locale/km/LC_MESSAGES/plugins/useracl.po
    trunk/locales/locale/km/LC_MESSAGES/plugins/vacation.po
    trunk/locales/locale/km/LC_MESSAGES/plugins/virus_scan.po
    trunk/locales/locale/km/LC_MESSAGES/plugins/vkeyboard.po
    trunk/locales/locale/km/LC_MESSAGES/plugins/vpopmail.po
    trunk/locales/locale/km/LC_MESSAGES/proon.po
    trunk/locales/locale/km/LC_MESSAGES/qmailadmin_login.po
    trunk/locales/locale/km/LC_MESSAGES/quicksave.po
    trunk/locales/locale/km/LC_MESSAGES/reply_buttons.po
    trunk/locales/locale/km/LC_MESSAGES/restrict_senders.po
    trunk/locales/locale/km/LC_MESSAGES/rootly_news.po
    trunk/locales/locale/km/LC_MESSAGES/same_ip.po
    trunk/locales/locale/km/LC_MESSAGES/sasql.po
    trunk/locales/locale/km/LC_MESSAGES/select_language.po
    trunk/locales/locale/km/LC_MESSAGES/select_range.po
    trunk/locales/locale/km/LC_MESSAGES/serversidefilter.po
    trunk/locales/locale/km/LC_MESSAGES/show_ssl_link.po
    trunk/locales/locale/km/LC_MESSAGES/smallcal.po
    trunk/locales/locale/km/LC_MESSAGES/smime.po
    trunk/locales/locale/km/LC_MESSAGES/spam_buttons.po
    trunk/locales/locale/km/LC_MESSAGES/squirrelmail.po
    trunk/locales/locale/km/LC_MESSAGES/startup_folder.po
    trunk/locales/locale/km/LC_MESSAGES/templates.po
    trunk/locales/locale/km/LC_MESSAGES/unsafe_image_rules.po
    trunk/locales/locale/km/LC_MESSAGES/vacation_local.po
    trunk/locales/locale/km/LC_MESSAGES/vadmin.po
    trunk/locales/locale/km/LC_MESSAGES/verify_reply_to.po
    trunk/locales/locale/km/LC_MESSAGES/view_as_html.po
    trunk/locales/locale/km/LC_MESSAGES/web_search.po
    trunk/locales/locale/km/LC_MESSAGES/yelp.po
    trunk/locales/locale/km/setup.php
    trunk/locales/locale/ko_KR/LC_MESSAGES/change_pass.po
    trunk/locales/locale/ko_KR/LC_MESSAGES/plugins/address_add.po
    trunk/locales/locale/ko_KR/LC_MESSAGES/squirrelmail.po
    trunk/locales/locale/ko_KR/setup.php
    trunk/locales/locale/lt_LT/LC_MESSAGES/abook_import_export.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/advanced_settings.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/archive_mail.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/askuserinfo.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/autocomplete.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/calendar.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/change_pass.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/change_sqlpass.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/compatibility.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/compose_extras.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/contactclean.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/cookie_warning.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/custom_charset.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/custom_from.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/debugger.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/empty_folders.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/expire.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/extra/auto_cc.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/extra/block_sender.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/extra/courier_vacation.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/extra/got_hotmail.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/extra/left_css.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/extra/show_headers.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/extra/timeout_user.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/extra/tmda.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/extra/tmdatools.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/extra/user_special_mailboxes.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/extra/username.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/extra/vacation.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/extra/windows.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/folder_settings.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/folder_sizes.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/html_mail.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/japanese_input.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/ldapquery.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/limit_languages.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/login_alias.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/mark_read.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/mini.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/multilogin.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/naguser.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/newuser_wiz.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/plugins/address_add.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/plugins/admin_add.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/plugins/amavisnewsql.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/plugins/attachment_doc.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/plugins/block_attach.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/plugins/bounce.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/plugins/change_ldappass.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/plugins/change_merakpass.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/plugins/change_passwd.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/plugins/chg_sasl_passwd.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/plugins/disk_quota.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/plugins/extract.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/plugins/file_manager.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/plugins/gpg.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/plugins/gzip.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/plugins/image_buttons.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/plugins/junkfolder.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/plugins/ldap_abook.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/plugins/online_users.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/plugins/preview_pane.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/plugins/quota_usage.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/plugins/rewrap.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/plugins/sent_confirmation.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/plugins/show_user_and_ip.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/plugins/taglines.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/plugins/twc_weather.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/plugins/useracl.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/plugins/virus_scan.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/plugins/vkeyboard.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/proon.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/qmailadmin_login.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/quicksave.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/reply_buttons.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/restrict_senders.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/sasql.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/select_language.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/select_range.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/serversidefilter.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/show_ssl_link.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/smallcal.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/smime.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/spam_buttons.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/squirrelmail.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/startup_folder.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/templates.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/unsafe_image_rules.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/vacation_local.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/vadmin.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/verify_reply_to.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/view_as_html.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/web_search.po
    trunk/locales/locale/lt_LT/LC_MESSAGES/yelp.po
    trunk/locales/locale/lt_LT/setup.php
    trunk/locales/locale/lv_LV/LC_MESSAGES/change_pass.po
    trunk/locales/locale/lv_LV/LC_MESSAGES/plugins/avelsieve.po
    trunk/locales/locale/lv_LV/LC_MESSAGES/squirrelmail.po
    trunk/locales/locale/lv_LV/setup.php
    trunk/locales/locale/mk/LC_MESSAGES/squirrelmail.po
    trunk/locales/locale/mk/setup.php
    trunk/locales/locale/ms_MY/LC_MESSAGES/plugins/address_add.po
    trunk/locales/locale/ms_MY/LC_MESSAGES/squirrelmail.po
    trunk/locales/locale/ms_MY/setup.php
    trunk/locales/locale/nb_NO/LC_MESSAGES/plugins/address_add.po
    trunk/locales/locale/nb_NO/LC_MESSAGES/plugins/attachment_doc.po
    trunk/locales/locale/nb_NO/LC_MESSAGES/plugins/chg_sasl_passwd.po
    trunk/locales/locale/nb_NO/LC_MESSAGES/plugins/quota_usage.po
    trunk/locales/locale/nb_NO/LC_MESSAGES/plugins/show_user_and_ip.po
    trunk/locales/locale/nb_NO/LC_MESSAGES/qmailadmin_login.po
    trunk/locales/locale/nb_NO/LC_MESSAGES/smallcal.po
    trunk/locales/locale/nb_NO/LC_MESSAGES/squirrelmail.po
    trunk/locales/locale/nb_NO/LC_MESSAGES/view_as_html.po
    trunk/locales/locale/nb_NO/setup.php
    trunk/locales/locale/nl_NL/LC_MESSAGES/advanced_settings.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/archive_mail.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/askuserinfo.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/autocomplete.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/calendar.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/change_pass.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/change_sqlpass.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/check_quota.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/compatibility.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/compose_extras.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/contactclean.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/cookie_warning.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/custom_charset.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/custom_from.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/debugger.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/empty_folders.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/expire.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/extra/auto_cc.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/extra/block_sender.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/extra/canadian_weather.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/extra/courier_vacation.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/extra/got_hotmail.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/extra/ip_restrict.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/extra/left_css.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/extra/show_headers.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/extra/timeout_user.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/extra/tmda.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/extra/tmdatools.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/extra/user_special_mailboxes.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/extra/username.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/extra/vacation.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/extra/windows.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/folder_settings.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/folder_sizes.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/forum.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/html_mail.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/ldapquery.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/limit_languages.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/login_alias.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/mark_read.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/mini.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/multilogin.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/naguser.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/newuser_wiz.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/plugins/abook_group.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/plugins/address_add.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/plugins/admin_add.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/plugins/amavisnewsql.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/plugins/annotatemore.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/plugins/attachment_doc.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/plugins/avelsieve.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/plugins/bayesspam.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/plugins/block_attach.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/plugins/bounce.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/plugins/change_ldappass.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/plugins/change_merakpass.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/plugins/change_passwd.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/plugins/chg_sasl_passwd.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/plugins/cpanel_pw_changer.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/plugins/cpanel_vacation.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/plugins/disk_quota.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/plugins/extract.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/plugins/file_manager.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/plugins/gpg.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/plugins/gzip.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/plugins/image_buttons.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/plugins/junkfolder.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/plugins/ldap_abook.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/plugins/mail_alias.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/plugins/notes.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/plugins/online_users.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/plugins/quota_usage.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/plugins/sent_confirmation.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/plugins/show_user_and_ip.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/plugins/useracl.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/plugins/vacation.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/plugins/virus_scan.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/plugins/vpopmail.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/proon.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/qmailadmin_login.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/quicksave.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/reply_buttons.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/restrict_senders.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/sasql.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/select_language.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/select_range.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/serversidefilter.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/show_ssl_link.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/smallcal.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/smime.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/spam_buttons.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/squirrelmail.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/startup_folder.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/templates.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/unsafe_image_rules.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/vacation_local.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/vadmin.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/verify_reply_to.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/view_as_html.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/web_search.po
    trunk/locales/locale/nl_NL/LC_MESSAGES/yelp.po
    trunk/locales/locale/nl_NL/setup.php
    trunk/locales/locale/nn_NO/LC_MESSAGES/abook_import_export.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/advanced_settings.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/archive_mail.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/askuserinfo.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/autocomplete.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/calendar.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/change_pass.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/change_sqlpass.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/check_quota.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/compatibility.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/compose_extras.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/contactclean.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/cookie_warning.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/custom_charset.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/custom_from.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/debugger.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/empty_folders.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/extra/auto_cc.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/extra/block_sender.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/extra/courier_vacation.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/extra/got_hotmail.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/extra/left_css.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/extra/show_headers.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/extra/windows.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/folder_settings.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/folder_sizes.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/html_mail.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/japanese_input.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/ldapquery.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/limit_languages.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/login_alias.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/mark_read.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/mini.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/multilogin.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/naguser.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/newuser_wiz.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/plugins/abook_group.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/plugins/address_add.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/plugins/admin_add.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/plugins/amavisnewsql.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/plugins/attachment_doc.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/plugins/avelsieve.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/plugins/bayesspam.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/plugins/block_attach.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/plugins/bounce.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/plugins/change_ldappass.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/plugins/change_merakpass.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/plugins/change_passwd.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/plugins/chg_sasl_passwd.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/plugins/cpanel_pw_changer.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/plugins/cpanel_vacation.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/plugins/disk_quota.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/plugins/extract.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/plugins/file_manager.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/plugins/image_buttons.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/plugins/junkfolder.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/plugins/ldap_abook.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/plugins/mail_alias.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/plugins/notes.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/plugins/online_users.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/plugins/preview_pane.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/plugins/quota_usage.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/plugins/rewrap.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/plugins/sent_confirmation.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/plugins/show_user_and_ip.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/plugins/taglines.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/plugins/twc_weather.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/plugins/useracl.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/plugins/vacation.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/plugins/virus_scan.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/plugins/vkeyboard.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/plugins/vpopmail.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/proon.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/qmailadmin_login.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/quicksave.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/reply_buttons.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/restrict_senders.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/sasql.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/select_language.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/select_range.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/serversidefilter.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/show_ssl_link.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/smallcal.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/smime.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/spam_buttons.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/squirrelmail.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/startup_folder.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/templates.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/unsafe_image_rules.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/vacation_local.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/verify_reply_to.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/view_as_html.po
    trunk/locales/locale/nn_NO/LC_MESSAGES/web_search.po
    trunk/locales/locale/nn_NO/setup.php
    trunk/locales/locale/pl_PL/LC_MESSAGES/change_pass.po
    trunk/locales/locale/pl_PL/LC_MESSAGES/check_quota.po
    trunk/locales/locale/pl_PL/LC_MESSAGES/plugins/address_add.po
    trunk/locales/locale/pl_PL/LC_MESSAGES/plugins/attachment_doc.po
    trunk/locales/locale/pl_PL/LC_MESSAGES/plugins/change_ldappass.po
    trunk/locales/locale/pl_PL/LC_MESSAGES/plugins/file_manager.po
    trunk/locales/locale/pl_PL/LC_MESSAGES/select_range.po
    trunk/locales/locale/pl_PL/LC_MESSAGES/squirrelmail.po
    trunk/locales/locale/pl_PL/LC_MESSAGES/view_as_html.po
    trunk/locales/locale/pl_PL/setup.php
    trunk/locales/locale/pt_BR/LC_MESSAGES/abook_import_export.po
    trunk/locales/locale/pt_BR/LC_MESSAGES/archive_mail.po
    trunk/locales/locale/pt_BR/LC_MESSAGES/change_pass.po
    trunk/locales/locale/pt_BR/LC_MESSAGES/plugins/abook_group.po
    trunk/locales/locale/pt_BR/LC_MESSAGES/plugins/address_add.po
    trunk/locales/locale/pt_BR/LC_MESSAGES/plugins/attachment_doc.po
    trunk/locales/locale/pt_BR/LC_MESSAGES/plugins/disk_quota.po
    trunk/locales/locale/pt_BR/LC_MESSAGES/plugins/gpg.po
    trunk/locales/locale/pt_BR/LC_MESSAGES/plugins/twc_weather.po
    trunk/locales/locale/pt_BR/LC_MESSAGES/squirrelmail.po
    trunk/locales/locale/pt_BR/LC_MESSAGES/unsafe_image_rules.po
    trunk/locales/locale/pt_BR/setup.php
    trunk/locales/locale/pt_PT/LC_MESSAGES/askuserinfo.po
    trunk/locales/locale/pt_PT/LC_MESSAGES/change_pass.po
    trunk/locales/locale/pt_PT/LC_MESSAGES/plugins/address_add.po
    trunk/locales/locale/pt_PT/LC_MESSAGES/plugins/avelsieve.po
    trunk/locales/locale/pt_PT/LC_MESSAGES/squirrelmail.po
    trunk/locales/locale/pt_PT/LC_MESSAGES/unsafe_image_rules.po
    trunk/locales/locale/pt_PT/LC_MESSAGES/view_as_html.po
    trunk/locales/locale/pt_PT/setup.php
    trunk/locales/locale/ro_RO/LC_MESSAGES/advanced_settings.po
    trunk/locales/locale/ro_RO/LC_MESSAGES/askuserinfo.po
    trunk/locales/locale/ro_RO/LC_MESSAGES/censor.po
    trunk/locales/locale/ro_RO/LC_MESSAGES/check_quota.po
    trunk/locales/locale/ro_RO/LC_MESSAGES/plugins/address_add.po
    trunk/locales/locale/ro_RO/LC_MESSAGES/reply_buttons.po
    trunk/locales/locale/ro_RO/LC_MESSAGES/same_ip.po
    trunk/locales/locale/ro_RO/LC_MESSAGES/squirrelmail.po
    trunk/locales/locale/ro_RO/setup.php
    trunk/locales/locale/ru_RU/LC_MESSAGES/custom_charset.po
    trunk/locales/locale/ru_RU/LC_MESSAGES/plugins/abook_group.po
    trunk/locales/locale/ru_RU/LC_MESSAGES/plugins/address_add.po
    trunk/locales/locale/ru_RU/LC_MESSAGES/plugins/attachment_doc.po
    trunk/locales/locale/ru_RU/LC_MESSAGES/sasql.po
    trunk/locales/locale/ru_RU/LC_MESSAGES/serversidefilter.po
    trunk/locales/locale/ru_RU/LC_MESSAGES/squirrelmail.po
    trunk/locales/locale/ru_RU/setup.php
    trunk/locales/locale/ru_UA/LC_MESSAGES/plugins/address_add.po
    trunk/locales/locale/ru_UA/LC_MESSAGES/squirrelmail.po
    trunk/locales/locale/ru_UA/setup.php
    trunk/locales/locale/si_LK/LC_MESSAGES/squirrelmail.po
    trunk/locales/locale/si_LK/setup.php
    trunk/locales/locale/sk_SK/LC_MESSAGES/plugins/address_add.po
    trunk/locales/locale/sk_SK/LC_MESSAGES/squirrelmail.po
    trunk/locales/locale/sk_SK/setup.php
    trunk/locales/locale/sl_SI/LC_MESSAGES/plugins/address_add.po
    trunk/locales/locale/sl_SI/LC_MESSAGES/squirrelmail.po
    trunk/locales/locale/sl_SI/setup.php
    trunk/locales/locale/sr_YU/LC_MESSAGES/plugins/address_add.po
    trunk/locales/locale/sr_YU/LC_MESSAGES/squirrelmail.po
    trunk/locales/locale/sr_YU/setup.php
    trunk/locales/locale/sv_SE/LC_MESSAGES/abook_import_export.po
    trunk/locales/locale/sv_SE/LC_MESSAGES/archive_mail.po
    trunk/locales/locale/sv_SE/LC_MESSAGES/askuserinfo.po
    trunk/locales/locale/sv_SE/LC_MESSAGES/autocomplete.po
    trunk/locales/locale/sv_SE/LC_MESSAGES/change_pass.po
    trunk/locales/locale/sv_SE/LC_MESSAGES/change_sqlpass.po
    trunk/locales/locale/sv_SE/LC_MESSAGES/check_quota.po
    trunk/locales/locale/sv_SE/LC_MESSAGES/compatibility.po
    trunk/locales/locale/sv_SE/LC_MESSAGES/compose_extras.po
    trunk/locales/locale/sv_SE/LC_MESSAGES/cookie_warning.po
    trunk/locales/locale/sv_SE/LC_MESSAGES/custom_charset.po
    trunk/locales/locale/sv_SE/LC_MESSAGES/custom_from.po
    trunk/locales/locale/sv_SE/LC_MESSAGES/debugger.po
    trunk/locales/locale/sv_SE/LC_MESSAGES/empty_folders.po
    trunk/locales/locale/sv_SE/LC_MESSAGES/expire.po
    trunk/locales/locale/sv_SE/LC_MESSAGES/extra/auto_cc.po
    trunk/locales/locale/sv_SE/LC_MESSAGES/extra/block_sender.po
    trunk/locales/locale/sv_SE/LC_MESSAGES/extra/courier_vacation.po
    trunk/locales/locale/sv_SE/LC_MESSAGES/extra/got_hotmail.po
    trunk/locales/locale/sv_SE/LC_MESSAGES/extra/left_css.po
    trunk/locales/locale/sv_SE/LC_MESSAGES/extra/show_headers.po
    trunk/locales/locale/sv_SE/LC_MESSAGES/extra/timeout_user.po
    trunk/locales/locale/sv_SE/LC_MESSAGES/extra/tmda.po
    trunk/locales/locale/sv_SE/LC_MESSAGES/extra/tmdatools.po
    trunk...
 
[truncated message content]