Based on many contributions like Ondrj and Konstantin I release

this patch I would you like you all intl users test ASAP 8-)

functions/i18n.php

@@ -17,15 +17,12 @@
 
 /* Decodes a string to the internal encoding from the given charset */
 function charset_decode ($charset, $string) {
-    global $debug_mime;
 
     /* All HTML special characters are 7 bit and can be replaced first */
     $string = htmlspecialchars ($string);
 
     $charset = strtolower($charset);
 
-    if ($debug_mime) $string = $charset . ':' . $string;
-
     if (ereg('iso-8859-([[:digit:]]+)', $charset, $res)) {
         if ($res[1] == '1') {
             $ret = charset_decode_iso_8859_1 ($string);
@@ -700,10 +697,7 @@ function set_up_language($sm_language, $do_search = false) {
     if ($SetupAlready) {
         return;
     }
-
-    $SetupAlready = 1;
-
-    $charset_headers_sent = FALSE;
+    $SetupAlready = TRUE;
 
     if ($do_search && ! $sm_language && isset($HTTP_ACCEPT_LANGUAGE)) {
         $sm_language = substr($HTTP_ACCEPT_LANGUAGE, 0, 2);
@@ -716,16 +710,21 @@ function set_up_language($sm_language, $do_search = false) {
         $sm_notAlias = $languages[$sm_notAlias]['ALIAS'];
     }
 
-    if (isset($sm_language) && $use_gettext &&
-        $sm_language != '' &&
-        isset($languages[$sm_notAlias]['CHARSET'])) {
-        if ((ini_get('safe_mode') == FALSE) && (getenv('LC_ALL') != $sm_language)) {
-            putenv('LC_ALL=' . $sm_notAlias);
+    if ( isset($sm_language) && 
+         $use_gettext &&
+         $sm_language != '' &&
+         isset($languages[$sm_notAlias]['CHARSET']) ) {
+        bindtextdomain( 'squirrelmail', '../locale/' );
+        textdomain( 'squirrelmail' );         
+        if ( !ini_get('safe_mode') && 
+             getenv( 'LC_ALL' ) != $sm_notAlias ) {
+            putenv( "LC_ALL=$sm_notAlias" );
+            putenv( "LANG=$sm_notAlias" );
+            putenv( "LANGUAGE=$sm_notAlias" );
         }
         setlocale('LC_ALL', $sm_notAlias);
-        bindtextdomain('squirrelmail', '../locale/');
-        textdomain('squirrelmail');
-        header ('Content-Type: text/html; charset=' . $languages[$sm_notAlias]['CHARSET']);
+        $squirrelmail_language = $sm_notAlias;
+        header( 'Content-Type: text/html; charset=' . $languages[$sm_notAlias]['CHARSET'] );
     }
 }
 
@@ -741,156 +740,164 @@ function set_my_charset(){
      * message blindly with the system-wide $default_charset.
      */
     global $data_dir, $username, $default_charset, $languages;
+    
     $my_language = getPref($data_dir, $username, 'language');
-    if (!$my_language) return;
+    if (!$my_language) {
+        return;
+    }
     while (isset($languages[$my_language]['ALIAS'])) {
         $my_language = $languages[$my_language]['ALIAS'];
     }
-    $my_charset=$languages[$my_language]['CHARSET'];
+    $my_charset = $languages[$my_language]['CHARSET'];
     if ($my_charset) {
         $default_charset = $my_charset;
     }
 }
 
-
 /* ------------------------------ main --------------------------- */
 
-global $squirrelmail_language, $languages;
+global $squirrelmail_language, $languages, $use_gettext;
+
 if (! isset($squirrelmail_language)) {
     $squirrelmail_language = '';
 }
 
 /* This array specifies the available languages. */
-$languages['ca']['NAME']    = 'Catalan';
-$languages['ca']['CHARSET'] = 'iso-8859-1';
-$languages['ca_CA']['ALIAS'] = 'ca';
-
-/* PLEASE DON'T TOUCH!!!
-    * Correct locale name, which should be set by setlocale and/or putenv('LC_ALL='...)
-    * is 'cs_CZ' and NOT 'cs', this applies to all locale names, look into docs, if you
-    * don't believe me.  Ondrej Sury, czech and slovak translator.
-    */
+
+// The glibc locale is ca_ES.
+
+$languages['ca_ES']['NAME']    = 'Catalan';
+$languages['ca_ES']['CHARSET'] = 'iso-8859-1';
+$languages['ca']['ALIAS'] = 'ca_ES';
+
 $languages['cs_CZ']['NAME']    = 'Czech';
 $languages['cs_CZ']['CHARSET'] = 'iso-8859-2';
 $languages['cs']['ALIAS']      = 'cs_CZ';
-$languages['cz']['ALIAS']      = 'cs_CZ'; // set up by some ancient versions of IE
 
-$languages['da']['NAME']    = 'Danish';
-$languages['da']['CHARSET'] = 'iso-8859-1';
-$languages['da_DA']['ALIAS'] = 'da';
+// Danish locale is da_DK.
+
+$languages['da_DK']['NAME']    = 'Danish';
+$languages['da_DK']['CHARSET'] = 'iso-8859-1';
+$languages['da']['ALIAS'] = 'da_DK';
+
+$languages['de_DE']['NAME']    = 'Deutsch';
+$languages['de_DE']['CHARSET'] = 'iso-8859-1';
+$languages['de']['ALIAS'] = 'de_DE';
 
-$languages['de']['NAME']    = 'Deutsch';
-$languages['de']['CHARSET'] = 'iso-8859-1';
-$languages['de_DE']['ALIAS'] = 'de';
+// There is no en_EN! There is en_US, en_BR, en_AU, and so forth, 
+// but who cares about !US, right? Right? :)
 
-$languages['en']['NAME']    = 'English';
-$languages['en']['CHARSET'] = 'iso-8859-1';
-$languages['en_EN']['ALIAS'] = 'en';
+$languages['en_US']['NAME']    = 'English';
+$languages['en_US']['CHARSET'] = 'iso-8859-1';
+$languages['en']['ALIAS'] = 'en_US';
 
-$languages['es']['NAME']    = 'Spanish';
-$languages['es']['CHARSET'] = 'iso-8859-1';
-$languages['es_ES']['ALIAS'] = 'es';
+$languages['es_ES']['NAME']    = 'Spanish';
+$languages['es_ES']['CHARSET'] = 'iso-8859-1';
+$languages['es']['ALIAS'] = 'es_ES';
 
-$languages['et']['NAME']    = 'Estonian';
-$languages['et']['CHARSET'] = 'iso-8859-15';
-$languages['et_EE']['ALIAS'] = 'et';
+$languages['et_EE']['NAME']    = 'Estonian';
+$languages['et_EE']['CHARSET'] = 'iso-8859-15';
+$languages['et']['ALIAS'] = 'et_EE';
 
-$languages['fi']['NAME']    = 'Finnish';
-$languages['fi']['CHARSET'] = 'iso-8859-1';
-$languages['fi_FI']['ALIAS'] = 'fi';
+$languages['fi_FI']['NAME']    = 'Finnish';
+$languages['fi_FI']['CHARSET'] = 'iso-8859-1';
+$languages['fi']['ALIAS'] = 'fi_FI';
 
-$languages['fr']['NAME']    = 'French';
-$languages['fr']['CHARSET'] = 'iso-8859-1';
-$languages['fr_FR']['ALIAS'] = 'fr';
+$languages['fr_FR']['NAME']    = 'French';
+$languages['fr_FR']['CHARSET'] = 'iso-8859-1';
+$languages['fr']['ALIAS'] = 'fr_FR';
 
-$languages['hr']['NAME']    = 'Croatian';
-$languages['hr']['CHARSET'] = 'iso-8859-2';
-$languages['hr_HR']['ALIAS'] = 'hr';
+$languages['hr_HR']['NAME']    = 'Croatian';
+$languages['hr_HR']['CHARSET'] = 'iso-8859-2';
+$languages['hr']['ALIAS'] = 'hr_HR';
 
-$languages['hu']['NAME']    = 'Hungarian';
-$languages['hu']['CHARSET'] = 'iso-8859-2';
-$languages['hu_HU']['ALIAS'] = 'hu';
+$languages['hu_HU']['NAME']    = 'Hungarian';
+$languages['hu_HU']['CHARSET'] = 'iso-8859-2';
+$languages['hu']['ALIAS'] = 'hu_HU';
 
-$languages['id']['NAME']    = 'Indonesian';
-$languages['id']['CHARSET'] = 'iso-8859-1';
-$languages['id_ID']['ALIAS'] = 'id';
+$languages['id_ID']['NAME']    = 'Indonesian';
+$languages['id_ID']['CHARSET'] = 'iso-8859-1';
+$languages['id']['ALIAS'] = 'id_ID';
 
-$languages['is']['NAME']    = 'Icelandic';
-$languages['is']['CHARSET'] = 'iso-8859-1';
-$languages['is_IS']['ALIAS'] = 'is';
+$languages['is_IS']['NAME']    = 'Icelandic';
+$languages['is_IS']['CHARSET'] = 'iso-8859-1';
+$languages['is']['ALIAS'] = 'is_IS';
 
-$languages['it']['NAME']    = 'Italian';
-$languages['it']['CHARSET'] = 'iso-8859-1';
-$languages['it_IT']['ALIAS'] = 'it';
+$languages['it_IT']['NAME']    = 'Italian';
+$languages['it_IT']['CHARSET'] = 'iso-8859-1';
+$languages['it']['ALIAS'] = 'it_IT';
 
-$languages['ko']['NAME']    = 'Korean';
-$languages['ko']['CHARSET'] = 'euc-KR';
-$languages['ko_KO']['ALIAS'] = 'ko';
+$languages['ko_KR']['NAME']    = 'Korean';
+$languages['ko_KR']['CHARSET'] = 'euc-KR';
+$languages['ko']['ALIAS'] = 'ko_KR';
 
-$languages['nl']['NAME']    = 'Dutch';
-$languages['nl']['CHARSET'] = 'iso-8859-1';
-$languages['nl_NL']['ALIAS'] = 'nl';
+$languages['nl_NL']['NAME']    = 'Dutch';
+$languages['nl_NL']['CHARSET'] = 'iso-8859-1';
+$languages['nl']['ALIAS'] = 'nl_NL';
 
-$languages['no']['NAME']    = 'Norwegian (Bokmål)';
-$languages['no']['CHARSET'] = 'iso-8859-1';
-$languages['no_NO']['ALIAS'] = 'no';
+$languages['no_NO']['NAME']    = 'Norwegian (Bokmål)';
+$languages['no_NO']['CHARSET'] = 'iso-8859-1';
+$languages['no']['ALIAS'] = 'no_NO';
 $languages['no_NO_ny']['NAME']    = 'Norwegian (Nynorsk)';
 $languages['no_NO_ny']['CHARSET'] = 'iso-8859-1';
 
-$languages['pl']['NAME']    = 'Polish';
-$languages['pl']['CHARSET'] = 'iso-8859-2';
-$languages['pl_PL']['ALIAS'] = 'pl';
+$languages['pl_PL']['NAME']    = 'Polish';
+$languages['pl_PL']['CHARSET'] = 'iso-8859-2';
+$languages['pl']['ALIAS'] = 'pl_PL';
 
-$languages['pt']['NAME'] = 'Portuguese (Portugal)';
-$languages['pt']['CHARSET'] = 'iso-8859-1';
+$languages['pt_PT']['NAME'] = 'Portuguese (Portugal)';
+$languages['pt_PT']['CHARSET'] = 'iso-8859-1';
 $languages['pt_BR']['NAME']    = 'Portuguese (Brazil)';
 $languages['pt_BR']['CHARSET'] = 'iso-8859-1';
-$languages['pt_PT']['ALIAS'] = 'pt';
+$languages['pt']['ALIAS'] = 'pt_PT';
 
-$languages['ru']['NAME']    = 'Russian KOI8-R';
-$languages['ru']['CHARSET'] = 'koi8-r';
-$languages['ru_RU']['ALIAS'] = 'ru';
+$languages['ru_RU']['NAME']    = 'Russian';
+$languages['ru_RU']['CHARSET'] = 'koi8-r';
+$languages['ru']['ALIAS'] = 'ru_RU';
 
 $languages['sr']['NAME']    = 'Serbian';
 $languages['sr']['CHARSET'] = 'iso-8859-2';
-$languages['sr_SR']['ALIAS'] = 'sr';
+$languages['sr_YU']['ALIAS'] = 'sr';
 
-$languages['sv']['NAME']    = 'Swedish';
-$languages['sv']['CHARSET'] = 'iso-8859-1';
-$languages['sv_SV']['ALIAS'] = 'sv';
+$languages['sv_SE']['NAME']    = 'Swedish';
+$languages['sv_SE']['CHARSET'] = 'iso-8859-1';
+$languages['sv']['ALIAS'] = 'sv_SE';
 
-$languages['tr']['NAME']    = 'Turkish';
-$languages['tr']['CHARSET'] = 'iso-8859-9';
-$languages['tr_TR']['ALIAS'] = 'tr';
+$languages['tr_TR']['NAME']    = 'Turkish';
+$languages['tr_TR']['CHARSET'] = 'iso-8859-9';
+$languages['tr']['ALIAS'] = 'tr_TR';
 
-$languages['tw']['NAME']    = 'Taiwan';
-$languages['tw']['CHARSET'] = 'big5';
-$languages['tw_TW']['ALIAS'] = 'tw';
+// it's zh_TW, actually.
+
+$languages['zh_TW']['NAME']    = 'Taiwan';
+$languages['zh_TW']['CHARSET'] = 'big5';
+$languages['tw']['ALIAS'] = 'zh_TW';
 
 $languages['sk_SK']['NAME']     = 'Slovak';
 $languages['sk_SK']['CHARSET']  = 'iso-8859-2';
 $languages['sk']['ALIAS']       = 'sk_SK';
 
-$languages['ro']['NAME']    = 'Romanian';
-$languages['ro']['CHARSET'] = 'iso-8859-2';
-$languages['ro_RO']['ALIAS'] = 'ro';
-
-$languages['th']['NAME']    = 'Thai';
-$languages['th']['CHARSET'] = 'tis-620';
+$languages['ro_RO']['NAME']    = 'Romanian';
+$languages['ro_RO']['CHARSET'] = 'iso-8859-2';
+$languages['ro']['ALIAS'] = 'ro_RO';
 
-$languages['lt']['NAME']    = 'Lithuanian';
-$languages['lt']['CHARSET'] = 'iso-8859-13';
-$languages['lt_LT']['ALIAS'] = 'lt';
+$languages['th_TH']['NAME']    = 'Thai';
+$languages['th_TH']['CHARSET'] = 'tis-620';
+$languages['th']['ALIAS'] = 'th_TH';
 
-$languages['sl']['NAME']    = 'Slovenian';
-$languages['sl']['CHARSET'] = 'iso-8859-2';
+$languages['lt_LT']['NAME']    = 'Lithuanian';
+$languages['lt_LT']['CHARSET'] = 'iso-8859-13';
+$languages['lt']['ALIAS'] = 'lt_LT';
 
-$languages['bg']['NAME']    = 'Bulgarian';
-$languages['bg']['CHARSET'] = 'windows-1251';
+$languages['sl_SI']['NAME']    = 'Slovenian';
+$languages['sl_SI']['CHARSET'] = 'iso-8859-2';
+$languages['sl']['ALIAS'] = 'sl_SI';
 
-global $use_gettext;
+$languages['bg_BG']['NAME']    = 'Bulgarian';
+$languages['bg_BG']['CHARSET'] = 'windows-1251';
+$languages['bg']['ALIAS'] = 'bg_BG';
 
-// Detect whether gettext is installed.
+/* Detect whether gettext is installed. */
 $gettext_flags = 0;
 if (function_exists('_')) {
     $gettext_flags += 1;
@@ -902,16 +909,16 @@ if (function_exists('textdomain')) {
     $gettext_flags += 4;
 }
 
-// If gettext is fully loaded, cool
+/* If gettext is fully loaded, cool */
 if ($gettext_flags == 7) {
     $use_gettext = true;
 }
-// If we can fake gettext, try that
+/* If we can fake gettext, try that */
 elseif ($gettext_flags == 0) {
     $use_gettext = true;
     include_once('../functions/gettext.php');
 } else {
-    // Uh-ho.  A weird install
+    /* Uh-ho.  A weird install */
     if (! $gettext_flags & 1) {
         function _($str) {
             return $str;
@@ -929,5 +936,4 @@ elseif ($gettext_flags == 0) {
     }
 }
 
-
-?>
+?>

po/squirrelmail.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-12-24 14:50+0100\n"
+"POT-Creation-Date: 2001-12-27 09:35+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,164 +18,173 @@ msgstr ""
 msgid "Address Book"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:117
-#: squirrelmail/src/addrbook_search_html.php:84
-#: squirrelmail/src/addressbook.php:317 squirrelmail/src/vcard.php:107
+#: squirrelmail/src/addrbook_search.php:97
+#: squirrelmail/src/addrbook_search_html.php:65
+#: squirrelmail/src/addressbook.php:283 squirrelmail/src/vcard.php:107
 msgid "Name"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:117
-#: squirrelmail/src/addrbook_search_html.php:84
-#: squirrelmail/src/addressbook.php:318
+#: squirrelmail/src/addrbook_search.php:98
+#: squirrelmail/src/addrbook_search_html.php:66
+#: squirrelmail/src/addressbook.php:284
 msgid "E-mail"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:117
-#: squirrelmail/src/addrbook_search_html.php:84
-#: squirrelmail/src/addressbook.php:319
+#: squirrelmail/src/addrbook_search.php:99
+#: squirrelmail/src/addrbook_search_html.php:67
+#: squirrelmail/src/addressbook.php:285
 msgid "Info"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:120
-#: squirrelmail/src/addrbook_search_html.php:87
+#: squirrelmail/src/addrbook_search.php:102
+#: squirrelmail/src/addrbook_search_html.php:70
 msgid "Source"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search_html.php:112
+#: squirrelmail/src/addrbook_search_html.php:97
 msgid "Use Addresses"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search_html.php:131
+#: squirrelmail/src/addrbook_search_html.php:116
 msgid "Address Book Search"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:183
-#: squirrelmail/src/addrbook_search_html.php:141
+#: squirrelmail/src/addrbook_search.php:172
+#: squirrelmail/src/addrbook_search_html.php:125
 msgid "Search for"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:190
-#: squirrelmail/src/addrbook_search_html.php:152
+#: squirrelmail/src/addrbook_search.php:178
+#: squirrelmail/src/addrbook_search_html.php:135
 msgid "in"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:192
-#: squirrelmail/src/addrbook_search_html.php:155
+#: squirrelmail/src/addrbook_search.php:179
+#: squirrelmail/src/addrbook_search_html.php:138
 msgid "All address books"
 msgstr ""
 
 #: squirrelmail/functions/page_header.php:89
-#: squirrelmail/src/addrbook_search.php:202
-#: squirrelmail/src/addrbook_search_html.php:167
+#: squirrelmail/src/addrbook_search.php:189
+#: squirrelmail/src/addrbook_search_html.php:149
 #: squirrelmail/src/search.php:32 squirrelmail/src/search.php:79
 msgid "Search"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:204
-#: squirrelmail/src/addrbook_search_html.php:169
+#: squirrelmail/src/addrbook_search.php:190
+#: squirrelmail/src/addrbook_search_html.php:150
 msgid "List all"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:223
-#: squirrelmail/src/addrbook_search_html.php:192
+#: squirrelmail/src/addrbook_search.php:212
+#: squirrelmail/src/addrbook_search_html.php:175
 #, c-format
 msgid "Unable to list addresses from %s"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:245
-#: squirrelmail/src/addrbook_search_html.php:215
+#: squirrelmail/src/addrbook_search.php:235
+#: squirrelmail/src/addrbook_search_html.php:200
 msgid "Your search failed with the following error(s)"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:171
-#: squirrelmail/src/addrbook_search.php:252
-#: squirrelmail/src/addrbook_search_html.php:219
+#: squirrelmail/src/addrbook_search.php:158
+#: squirrelmail/src/addrbook_search.php:242
+#: squirrelmail/src/addrbook_search_html.php:205
 msgid "No persons matching your search was found"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search_html.php:228
+#: squirrelmail/src/addrbook_search_html.php:218
 msgid "Return"
 msgstr ""
 
-#: squirrelmail/src/addrbook_search.php:207
+#: squirrelmail/src/addrbook_search.php:193
 msgid "Close window"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:66 squirrelmail/src/addressbook.php:316
+#: squirrelmail/src/addressbook.php:38 squirrelmail/src/addressbook.php:283
 msgid "Nickname"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:67
+#: squirrelmail/src/addressbook.php:39
 msgid "Must be unique"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:68
+#: squirrelmail/src/addressbook.php:40
 msgid "E-mail address"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:69
+#: squirrelmail/src/addressbook.php:41
 msgid "First name"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:70
+#: squirrelmail/src/addressbook.php:42
 msgid "Last name"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:71
+#: squirrelmail/src/addressbook.php:43
 msgid "Additional info"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:85
+#: squirrelmail/src/addressbook.php:57
 msgid "No personal address book is defined. Contact administrator."
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:181
+#: squirrelmail/src/addressbook.php:153
 msgid "You can only edit one address at the time"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:193 squirrelmail/src/addressbook.php:196
-#: squirrelmail/src/addressbook.php:225 squirrelmail/src/addressbook.php:228
+#: squirrelmail/src/addressbook.php:167 squirrelmail/src/addressbook.php:169
+#: squirrelmail/src/addressbook.php:199 squirrelmail/src/addressbook.php:201
 msgid "Update address"
 msgstr ""
 
 #: squirrelmail/functions/display_messages.php:20
 #: squirrelmail/functions/display_messages.php:71
 #: squirrelmail/functions/display_messages.php:87
-#: squirrelmail/src/addressbook.php:216 squirrelmail/src/addressbook.php:266
+#: squirrelmail/src/addressbook.php:190 squirrelmail/src/addressbook.php:238
 msgid "ERROR"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:241
+#: squirrelmail/src/addressbook.php:213
 msgid "Unknown error"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:286 squirrelmail/src/addressbook.php:371
+#: squirrelmail/src/addressbook.php:257 squirrelmail/src/addressbook.php:338
 msgid "Add address"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:297 squirrelmail/src/addressbook.php:355
+#: squirrelmail/src/addressbook.php:268 squirrelmail/src/addressbook.php:321
 msgid "Edit selected"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:299 squirrelmail/src/addressbook.php:357
+#: squirrelmail/src/addressbook.php:270 squirrelmail/src/addressbook.php:323
 msgid "Delete selected"
 msgstr ""
 
-#: squirrelmail/src/addressbook.php:368
+#: squirrelmail/src/addressbook.php:335
 #, c-format
 msgid "Add to %s"
 msgstr ""
 
-#: squirrelmail/src/compose.php:116
+#: squirrelmail/src/compose.php:44
+msgid "Draft Email Saved"
+msgstr ""
+
+#: squirrelmail/src/compose.php:136 squirrelmail/src/compose.php:177
+#: squirrelmail/src/compose.php:188
+msgid "Could not move/copy file. File not attached"
+msgstr ""
+
+#: squirrelmail/src/compose.php:312
 msgid "Original Message"
 msgstr ""
 
 #: squirrelmail/functions/mailbox_display.php:563
 #: squirrelmail/plugins/filters/options.php:97
-#: squirrelmail/src/compose.php:117 squirrelmail/src/download.php:137
+#: squirrelmail/src/compose.php:313 squirrelmail/src/download.php:137
 #: squirrelmail/src/download.php:143
 #: squirrelmail/src/options_highlight.php:333
-#: squirrelmail/src/options_order.php:59
+#: squirrelmail/src/options_order.php:57
 #: squirrelmail/src/printer_friendly_bottom.php:97
 #: squirrelmail/src/search.php:71
 msgid "Subject"
@@ -183,18 +192,25 @@ msgstr ""
 
 #: squirrelmail/functions/mailbox_display.php:549
 #: squirrelmail/plugins/filters/options.php:85
-#: squirrelmail/src/compose.php:118 squirrelmail/src/download.php:138
+#: squirrelmail/src/compose.php:314 squirrelmail/src/download.php:138
 #: squirrelmail/src/download.php:145
 #: squirrelmail/src/options_highlight.php:321
-#: squirrelmail/src/options_order.php:57
+#: squirrelmail/src/options_order.php:55
 #: squirrelmail/src/printer_friendly_bottom.php:91
 #: squirrelmail/src/search.php:72
 msgid "From"
 msgstr ""
 
+#: squirrelmail/functions/mailbox_display.php:557
+#: squirrelmail/src/compose.php:315 squirrelmail/src/download.php:140
+#: squirrelmail/src/download.php:149 squirrelmail/src/options_order.php:56
+#: squirrelmail/src/printer_friendly_bottom.php:96
+msgid "Date"
+msgstr ""
+
 #: squirrelmail/functions/mailbox_display.php:547
 #: squirrelmail/plugins/filters/options.php:88
-#: squirrelmail/src/compose.php:119 squirrelmail/src/download.php:139
+#: squirrelmail/src/compose.php:317 squirrelmail/src/download.php:139
 #: squirrelmail/src/download.php:147
 #: squirrelmail/src/options_highlight.php:324
 #: squirrelmail/src/printer_friendly_bottom.php:92
@@ -202,89 +218,80 @@ msgstr ""
 msgid "To"
 msgstr ""
 
-#: squirrelmail/src/compose.php:264 squirrelmail/src/read_body.php:543
+#: squirrelmail/src/compose.php:472 squirrelmail/src/read_body.php:543
 msgid "From:"
 msgstr ""
 
-#: squirrelmail/src/compose.php:289 squirrelmail/src/read_body.php:560
+#: squirrelmail/src/compose.php:499 squirrelmail/src/read_body.php:560
 msgid "To:"
 msgstr ""
 
-#: squirrelmail/src/compose.php:297
+#: squirrelmail/src/compose.php:507
 msgid "CC:"
 msgstr ""
 
-#: squirrelmail/src/compose.php:305
+#: squirrelmail/src/compose.php:515
 msgid "BCC:"
 msgstr ""
 
-#: squirrelmail/src/compose.php:313 squirrelmail/src/read_body.php:518
+#: squirrelmail/src/compose.php:522 squirrelmail/src/read_body.php:518
 msgid "Subject:"
 msgstr ""
 
-#: squirrelmail/src/compose.php:355 squirrelmail/src/compose.php:410
+#: squirrelmail/src/compose.php:572 squirrelmail/src/compose.php:635
 msgid "Send"
 msgstr ""
 
-#: squirrelmail/src/compose.php:361
+#: squirrelmail/src/compose.php:578
 msgid "Attach:"
 msgstr ""
 
-#: squirrelmail/src/compose.php:366 squirrelmail/src/options_order.php:145
+#: squirrelmail/src/compose.php:583 squirrelmail/src/options_order.php:143
 msgid "Add"
 msgstr ""
 
-#: squirrelmail/src/compose.php:381
+#: squirrelmail/src/compose.php:599
 msgid "Delete selected attachments"
 msgstr ""
 
-#: squirrelmail/functions/page_header.php:83 squirrelmail/src/compose.php:403
-#: squirrelmail/src/compose.php:405 squirrelmail/src/compose.php:408
+#: squirrelmail/functions/page_header.php:83 squirrelmail/src/compose.php:624
+#: squirrelmail/src/compose.php:628 squirrelmail/src/compose.php:633
 msgid "Addresses"
 msgstr ""
 
-#: squirrelmail/src/compose.php:413
+#: squirrelmail/src/compose.php:638
 msgid "Save Draft"
 msgstr ""
 
-#: squirrelmail/src/compose.php:419 squirrelmail/src/read_body.php:590
+#: squirrelmail/src/compose.php:644 squirrelmail/src/read_body.php:590
 msgid "Priority"
 msgstr ""
 
-#: squirrelmail/src/compose.php:420 squirrelmail/src/read_body.php:425
+#: squirrelmail/src/compose.php:645 squirrelmail/src/read_body.php:425
 msgid "High"
 msgstr ""
 
-#: squirrelmail/src/compose.php:421 squirrelmail/src/read_body.php:428
+#: squirrelmail/src/compose.php:646 squirrelmail/src/read_body.php:428
 msgid "Normal"
 msgstr ""
 
-#: squirrelmail/src/compose.php:422 squirrelmail/src/read_body.php:432
+#: squirrelmail/src/compose.php:647 squirrelmail/src/read_body.php:432
 msgid "Low"
 msgstr ""
 
-#: squirrelmail/src/compose.php:441
+#: squirrelmail/src/compose.php:669
 msgid "You have not filled in the \"To:\" field."
 msgstr ""
 
-#: squirrelmail/src/compose.php:486
-msgid "Draft Email Saved"
-msgstr ""
-
-#: squirrelmail/src/compose.php:557 squirrelmail/src/compose.php:594
-#: squirrelmail/src/compose.php:601
-msgid "Could not move/copy file. File not attached"
-msgstr ""
-
-#: squirrelmail/src/compose.php:683
+#: squirrelmail/src/compose.php:753
 msgid "said"
 msgstr ""
 
-#: squirrelmail/src/compose.php:686
+#: squirrelmail/src/compose.php:756
 msgid "quote"
 msgstr ""
 
-#: squirrelmail/src/compose.php:686
+#: squirrelmail/src/compose.php:756
 msgid "who"
 msgstr ""
 
@@ -304,13 +311,6 @@ msgstr ""
 msgid "Download this as a file"
 msgstr ""
 
-#: squirrelmail/functions/mailbox_display.php:557
-#: squirrelmail/src/download.php:140 squirrelmail/src/download.php:149
-#: squirrelmail/src/options_order.php:58
-#: squirrelmail/src/printer_friendly_bottom.php:96
-msgid "Date"
-msgstr ""
-
 #: squirrelmail/src/folders_create.php:41
 msgid "Illegal folder name.  Please select a different name."
 msgstr ""
@@ -394,19 +394,19 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: squirrelmail/src/folders.php:213 squirrelmail/src/folders.php:233
+#: squirrelmail/src/folders.php:213 squirrelmail/src/folders.php:232
 msgid "Unsubscribe"
 msgstr ""
 
-#: squirrelmail/src/folders.php:213 squirrelmail/src/folders.php:274
+#: squirrelmail/src/folders.php:213 squirrelmail/src/folders.php:273
 msgid "Subscribe"
 msgstr ""
 
-#: squirrelmail/src/folders.php:237
+#: squirrelmail/src/folders.php:236
 msgid "No folders were found to unsubscribe from!"
 msgstr ""
 
-#: squirrelmail/src/folders.php:277
+#: squirrelmail/src/folders.php:276
 msgid "No folders were found to subscribe to!"
 msgstr ""
 
@@ -924,39 +924,39 @@ msgstr ""
 msgid "Index Order"
 msgstr ""
 
-#: squirrelmail/src/options_order.php:56
+#: squirrelmail/src/options_order.php:54
 msgid "Checkbox"
 msgstr ""
 
-#: squirrelmail/src/options_order.php:60
+#: squirrelmail/src/options_order.php:58
 msgid "Flags"
 msgstr ""
 
 #: squirrelmail/functions/mailbox_display.php:569
-#: squirrelmail/src/options_order.php:61
+#: squirrelmail/src/options_order.php:59
 msgid "Size"
 msgstr ""
 
-#: squirrelmail/src/options_order.php:104
+#: squirrelmail/src/options_order.php:102
 msgid ""
 "The index order is the order that the columns are arranged in the message "
 "index.  You can add, remove, and move columns around to customize them to "
 "fit your needs."
 msgstr ""
 
-#: squirrelmail/src/options_order.php:113
+#: squirrelmail/src/options_order.php:111
 msgid "up"
 msgstr ""
 
-#: squirrelmail/src/options_order.php:115
+#: squirrelmail/src/options_order.php:113
 msgid "down"
 msgstr ""
 
-#: squirrelmail/src/options_order.php:120
+#: squirrelmail/src/options_order.php:118
 msgid "remove"
 msgstr ""
 
-#: squirrelmail/src/options_order.php:149
+#: squirrelmail/src/options_order.php:147
 msgid "Return to options page"
 msgstr ""
 
@@ -1078,7 +1078,7 @@ msgstr ""
 
 #: squirrelmail/src/options.php:281
 msgid ""
-"The order of the message index can be rearanged and changed to contain the "
+"The order of the message index can be rearranged and changed to contain the "
 "headers in any order you want."
 msgstr ""
 
@@ -1148,20 +1148,20 @@ msgstr ""
 msgid "Mailer"
 msgstr ""
 
-#: squirrelmail/functions/auth.php:44 squirrelmail/src/redirect.php:81
-#: squirrelmail/src/redirect.php:85
+#: squirrelmail/functions/auth.php:44 squirrelmail/src/redirect.php:95
+#: squirrelmail/src/redirect.php:99
 msgid "You must be logged in to access this page."
 msgstr ""
 
-#: squirrelmail/functions/auth.php:45 squirrelmail/src/redirect.php:86
+#: squirrelmail/functions/auth.php:45 squirrelmail/src/redirect.php:100
 msgid "Go to the login page"
 msgstr ""
 
-#: squirrelmail/src/redirect.php:106 squirrelmail/src/redirect.php:110
+#: squirrelmail/src/redirect.php:120 squirrelmail/src/redirect.php:124
 msgid "There was an error contacting the mail server."
 msgstr ""
 
-#: squirrelmail/src/redirect.php:111
+#: squirrelmail/src/redirect.php:125
 msgid "Contact your administrator for help."
 msgstr ""
 
@@ -1261,9 +1261,9 @@ msgstr ""
 #: squirrelmail/functions/abook_local_file.php:267
 #: squirrelmail/functions/abook_local_file.php:290
 #: squirrelmail/functions/abook_local_file.php:319
-#: squirrelmail/functions/addressbook.php:349
-#: squirrelmail/functions/addressbook.php:384
-#: squirrelmail/functions/addressbook.php:437
+#: squirrelmail/functions/addressbook.php:348
+#: squirrelmail/functions/addressbook.php:383
+#: squirrelmail/functions/addressbook.php:436
 msgid "Addressbook is read-only"
 msgstr ""
 
@@ -1332,23 +1332,23 @@ msgstr ""
 msgid "Error initializing LDAP server %s:"
 msgstr ""
 
-#: squirrelmail/functions/addressbook.php:327
-#: squirrelmail/functions/addressbook.php:414
+#: squirrelmail/functions/addressbook.php:326
+#: squirrelmail/functions/addressbook.php:413
 msgid "Invalid input data"
 msgstr ""
 
-#: squirrelmail/functions/addressbook.php:331
-#: squirrelmail/functions/addressbook.php:418
+#: squirrelmail/functions/addressbook.php:330
+#: squirrelmail/functions/addressbook.php:417
 msgid "Name is missing"
 msgstr ""
 
-#: squirrelmail/functions/addressbook.php:335
-#: squirrelmail/functions/addressbook.php:422
+#: squirrelmail/functions/addressbook.php:334
+#: squirrelmail/functions/addressbook.php:421
 msgid "E-mail address is missing"
 msgstr ""
 
-#: squirrelmail/functions/addressbook.php:343
-#: squirrelmail/functions/addressbook.php:427
+#: squirrelmail/functions/addressbook.php:342
+#: squirrelmail/functions/addressbook.php:426
 msgid "Nickname contains illegal characters"
 msgstr ""
 
@@ -1592,7 +1592,7 @@ msgid "THIS FOLDER IS EMPTY"
 msgstr ""
 
 #: squirrelmail/functions/mailbox_display.php:493
-msgid "Move selected to:"
+msgid "Move Selected To:"
 msgstr ""
 
 #: squirrelmail/functions/mailbox_display.php:496
@@ -1678,36 +1678,36 @@ msgstr ""
 msgid "Compose"
 msgstr ""
 
-#: squirrelmail/functions/prefs.php:39
+#: squirrelmail/functions/prefs.php:45
 #, c-format
 msgid ""
 "Preference file, %s, does not exist. Log out, and log back in to create a "
 "default preference file."
 msgstr ""
 
-#: squirrelmail/functions/prefs.php:164 squirrelmail/functions/prefs.php:169
+#: squirrelmail/functions/prefs.php:167 squirrelmail/functions/prefs.php:172
 msgid "Error opening "
 msgstr ""
 
-#: squirrelmail/functions/prefs.php:165
+#: squirrelmail/functions/prefs.php:168
 msgid "Default preference file not found!"
 msgstr ""
 
-#: squirrelmail/functions/prefs.php:166 squirrelmail/functions/prefs.php:171
-#: squirrelmail/functions/prefs.php:265
+#: squirrelmail/functions/prefs.php:169 squirrelmail/functions/prefs.php:174
+#: squirrelmail/functions/prefs.php:268
 msgid "Please contact your system administrator and report this error."
 msgstr ""
 
-#: squirrelmail/functions/prefs.php:170
+#: squirrelmail/functions/prefs.php:173
 msgid "Could not create initial preference file!"
 msgstr ""
 
-#: squirrelmail/functions/prefs.php:263
+#: squirrelmail/functions/prefs.php:266
 #, c-format
 msgid "Error creating directory %s."
 msgstr ""
 
-#: squirrelmail/functions/prefs.php:264
+#: squirrelmail/functions/prefs.php:267
 msgid "Could not create hashed directory structure!"
 msgstr ""