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

Revision: 12324
          
http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=12324&view=rev
Author:   jervfors
Date:     2007-03-07 14:00:04 -0800 (Wed, 07 Mar 2007)

Log Message:
-----------
Adding two missing settings (since 1.4.6 RC 1) and preparing the template for 
release.

Modified Paths:
--------------
    branches/SM-1_4-STABLE/squirrelmail/plugins/administrator/defines.php
    branches/SM-1_4-STABLE/squirrelmail/po/squirrelmail.pot

Modified: branches/SM-1_4-STABLE/squirrelmail/plugins/administrator/defines.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/plugins/administrator/defines.php       
2007-03-07 21:56:05 UTC (rev 12323)
+++ branches/SM-1_4-STABLE/squirrelmail/plugins/administrator/defines.php       
2007-03-07 22:00:04 UTC (rev 12324)
@@ -1,11 +1,12 @@
 <?php
+
 /**
  * Administrator plugin - Option definitions
  *
- * @version $Id$
  * @author Philippe Mingo
- * @copyright (c) 1999-2006 The SquirrelMail Project Team
+ * @copyright &copy; 1999-2007 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @version $Id$
  * @package plugins
  * @subpackage administrator
  */
@@ -106,7 +107,9 @@
                                                                    'courier' 
=> _("Courier IMAP server"),
                                                                    'macosx' => 
_("Mac OS X Mailserver"),
                                                                    
'hmailserver' => _("hMailServer IMAP server"),
+                                                                   'mercury32' 
=> _("Mercury/32 IMAP server"),
                                                                    'bincimap' 
=> _("Binc IMAP server"),
+                                                                   'dovecot' 
=> _("Dovecot IMAP server"),
                                                                    'other' => 
_("Not one of the above servers") ) ),
                  '$optional_delimiter' => array( 'name' => _("IMAP Folder 
Delimiter"),
                                                  'type' => SMOPT_TYPE_STRING,
@@ -126,10 +129,10 @@
                  '$useSendmail' => array( 'name' => _("Use Sendmail Binary"),
                                           'type' => SMOPT_TYPE_BOOLEAN,
                                           'comment' => _("Choose 
&quot;no&quot; for SMTP") ),
-                 '$sendmail_args' => array( 'name' => _("Sendmail Arguments"),
+                 '$sendmail_path' => array( 'name' => _("Sendmail Path"),
                                             'type' => SMOPT_TYPE_STRING,
                                             'size' => 40 ),
-                 '$sendmail_path' => array( 'name' => _("Sendmail Path"),
+                 '$sendmail_args' => array( 'name' => _("Sendmail Arguments"),
                                             'type' => SMOPT_TYPE_STRING,
                                             'size' => 40 ),
                  '$smtpServerAddress' => array( 'name' => _("SMTP Server 
Address"),
@@ -254,7 +257,7 @@
                                            'type' => SMOPT_TYPE_HIDDEN ),
                  '$config_location_base' => array( 'name' => _("Location 
base"),
                                                    'type' => SMOPT_TYPE_STRING,
-                                                   'size' => 40,               
                
+                                                   'size' => 40,
                                                    'default' => '' ),
                  /* --------------------------------------------------------*/
                  'Group5' => array( 'name' => _("Message of the Day"),
@@ -262,7 +265,7 @@
                  '$motd' => array( 'name' => _("Message of the Day"),
                                    'type' => SMOPT_TYPE_TEXTAREA,
                                    'size' => 40 ),
-                 /* --------------------------------------------------------*/
+                 /* ---- Database settings ---- */
                  'Group6' => array( 'name' => _("Database"),
                                     'type' => SMOPT_TYPE_TITLE ),
                  '$addrbook_dsn' => array( 'name' => _("Address book DSN"),
@@ -347,7 +350,6 @@
                                             'type' => SMOPT_TYPE_INTEGER,
                                             'default' => 0,
                                             'comment' => _("Use index number 
of theme") ),
-                 /* ---- Group8 is for plugins ---- */
                  /* --------------------------------------------------------*/
                  '$config_use_color' => array( 'name' => '',
                                                'type' => SMOPT_TYPE_HIDDEN ),
@@ -356,5 +358,3 @@
                  /* --------------------------------------------------------*/
 
                );
-
-?>

Modified: branches/SM-1_4-STABLE/squirrelmail/po/squirrelmail.pot
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/po/squirrelmail.pot     2007-03-07 
21:56:05 UTC (rev 12323)
+++ branches/SM-1_4-STABLE/squirrelmail/po/squirrelmail.pot     2007-03-07 
22:00:04 UTC (rev 12324)
@@ -1,5 +1,5 @@
 # LANGUAGE (xx_XX) SquirrelMail Translation
-# Copyright (c) 1999-2006 The SquirrelMail Project Team
+# Copyright (c) 1999-2007 The SquirrelMail Project Team
 # This file is distributed under the same license as the SquirrelMail package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: SquirrelMail VERSION\n"
 "Report-Msgid-Bugs-To: 
squirrelmail-i18n-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@xxxxxxxxxxxxxxxx\n"
-"POT-Creation-Date: 2006-12-03 23:04+0100\n"
+"POT-Creation-Date: 2007-03-07 22:53+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE 
<squirrelmail-i18n-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@xxxxxxxxxxxxxxxx>\n"
@@ -176,15 +176,27 @@
 msgid "Could not move/copy file. File not attached"
 msgstr ""
 
-msgid "Draft Saved"
+msgid "Your draft has been saved."
 msgstr ""
 
-msgid "Your Message has been sent."
+msgid "Your mail has been sent."
 msgstr ""
 
 msgid "From:"
 msgstr ""
 
+msgid "To:"
+msgstr ""
+
+msgid "Cc:"
+msgstr ""
+
+msgid "Bcc:"
+msgstr ""
+
+msgid "Subject:"
+msgstr ""
+
 msgid "Send"
 msgstr ""
 
@@ -239,6 +251,9 @@
 msgid "Error: Draft folder %s does not exist."
 msgstr ""
 
+msgid "Message not sent."
+msgstr ""
+
 msgid "Server replied:"
 msgstr ""
 
@@ -1859,9 +1874,15 @@
 msgid "hMailServer IMAP server"
 msgstr ""
 
+msgid "Mercury/32 IMAP server"
+msgstr ""
+
 msgid "Binc IMAP server"
 msgstr ""
 
+msgid "Dovecot IMAP server"
+msgstr ""
+
 msgid "Not one of the above servers"
 msgstr ""
 
@@ -1889,10 +1910,10 @@
 msgid "Choose &quot;no&quot; for SMTP"
 msgstr ""
 
-msgid "Sendmail Arguments"
+msgid "Sendmail Path"
 msgstr ""
 
-msgid "Sendmail Path"
+msgid "Sendmail Arguments"
 msgstr ""
 
 msgid "SMTP Server Address"
@@ -2389,11 +2410,6 @@
 msgid "COMMERCIAL - RBL+ Dial-up entries."
 msgstr ""
 
-msgid ""
-"FREE - ORDB was born when ORBS went off the air. It seems to have fewer "
-"false positives than ORBS did though."
-msgstr ""
-
 msgid "FREE - Five-Ten-sg.com - Direct SPAM sources."
 msgstr ""
 
@@ -3790,9 +3806,6 @@
 msgid "Arabic"
 msgstr ""
 
-msgid "Chinese (Simplified)"
-msgstr ""
-
 msgid "Delivery error report"
 msgstr ""
 


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

-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV