From: lkehresman <lkehresman@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Mon, 24 Jul 2000 16:28:26 +0000 (+0000)
Subject: updated the squirrelmail.po file, fixed some bugs with next/prev
X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=commitdiff_plain;h=7e343a7db5fd4347901ff8fcaf529933dbc29f1c

updated the squirrelmail.po file, fixed some bugs with next/prev


git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@632 7612ce4b-ef26-0410-bec9-ea0150e637f0
---

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index 36a6bdeb..7343bb0c 100644
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -191,11 +191,11 @@
 
       if ($startMessage < $endMessage) {
          echo "<TR BGCOLOR=\"$color[4]\"><TD>";
-         echo "<CENTER>". _("Viewing messages ") ."<B>$startMessage</B>". _(" to ") ."<B>$endMessage</B> ($numMessages total)</CENTER>\n";
+         echo "<CENTER>". _("Viewing messages") ." <B>$startMessage</B> ". _("to") ." <B>$endMessage</B> ($numMessages " . _("total") . ")</CENTER>\n";
          echo "</TD></TR>\n";
       } else if ($startMessage == $endMessage) {
          echo "<TR BGCOLOR=\"$color[4]\"><TD>";
-         echo "<CENTER>". _("Viewing message ") ."<B>$startMessage</B> ($numMessages ". _("total") .")</CENTER>\n";
+         echo "<CENTER>". _("Viewing message") ." <B>$startMessage</B> ($numMessages " . _("total") . ")</CENTER>\n";
          echo "</TD></TR>\n";
       }
 
diff --git a/functions/strings.php b/functions/strings.php
index a11a6fab..05e155fb 100644
--- a/functions/strings.php
+++ b/functions/strings.php
@@ -180,7 +180,7 @@
 
    function get_location () {
       # This determines the location to forward to relative
-      # to your server.  If this doesn't work correctly for
+      # to your server.  If this doesnt work correctly for
       # you (although it should), you can remove all this 
       # code except the last two lines, and change the header()
       # function to look something like this, customized to
diff --git a/po/squirrelmail.po b/po/squirrelmail.po
index 11432ab0..91dfab8e 100644
--- a/po/squirrelmail.po
+++ b/po/squirrelmail.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-04-28 13:16+0200\n"
+"POT-Creation-Date: 2000-07-24 14:32+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"
@@ -14,747 +14,1059 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: ../src/addrbook_popup.php:12 ../src/addrbook_search.php:12
-#: ../src/addressbook.php:12 ../src/right_main.php:14
+#: src/addrbook_popup.php:30
+msgid "Address Book"
+msgstr ""
+
+#: src/addrbook_search.php:96 src/addrbook_search_html.php:69
+#: src/addressbook.php:307
+msgid "Name"
+msgstr ""
+
+#: src/addrbook_search.php:96 src/addrbook_search_html.php:69
+#: src/addressbook.php:308
+msgid "E-mail"
+msgstr ""
+
+#: src/addrbook_search.php:96 src/addrbook_search_html.php:69
+#: src/addressbook.php:309
+msgid "Info"
+msgstr ""
+
+#: src/addrbook_search.php:99 src/addrbook_search_html.php:72
+msgid "Source"
+msgstr ""
+
+#: functions/auth.php:14 src/addrbook_search.php:130 src/right_main.php:17
 msgid "You must login first."
 msgstr ""
 
-#: ../src/addrbook_popup.php:16 ../src/addrbook_search.php:16
-#: ../src/addressbook.php:16 ../src/right_main.php:18 ../src/webmail.php:12
+#: src/addrbook_search.php:134 src/right_main.php:21 src/webmail.php:27
 msgid "You need a valid user and password to access this page!"
 msgstr ""
 
-#: ../src/addrbook_popup.php:32 ../src/addrbook_search.php:45
-#: ../src/addressbook.php:103
-msgid "Address Book"
+#: src/addrbook_search.php:169 src/addrbook_search.php:253
+#: src/addrbook_search_html.php:201
+msgid "No persons matching your search was found"
 msgstr ""
 
-#: ../src/addrbook_search.php:63
-msgid "Search results will display here"
+#: src/addrbook_search.php:182 src/addrbook_search_html.php:127
+msgid "Search for"
 msgstr ""
 
-#: ../src/addrbook_search.php:74
-msgid "Search for"
+#: src/addrbook_search.php:189 src/addrbook_search_html.php:134
+msgid "in"
 msgstr ""
 
-#: ../src/addrbook_search.php:79
-msgid "Search"
+#: src/addrbook_search.php:191 src/addrbook_search_html.php:137
+msgid "All address books"
 msgstr ""
 
-#: ../src/addrbook_search.php:82
-msgid "Close window"
+#: src/addrbook_search.php:201 src/addrbook_search_html.php:149
+msgid "Search"
 msgstr ""
 
-#: ../src/addrbook_search.php:160
-msgid "Your search failed with the following error(s)"
+#: src/addrbook_search.php:203 src/addrbook_search_html.php:151
+msgid "List all"
 msgstr ""
 
-#: ../src/addrbook_search.php:167
-msgid "No persons matching your search was found"
+#: src/addrbook_search.php:206
+msgid "Close window"
 msgstr ""
 
-#: ../src/addrbook_search.php:178 ../src/addressbook.php:323
-msgid "Name"
+#: src/addrbook_search.php:224 src/addrbook_search_html.php:172
+#, c-format
+msgid "Unable to list addresses from %s"
 msgstr ""
 
-#: ../src/addrbook_search.php:178 ../src/addressbook.php:323
-msgid "E-mail"
+#: src/addrbook_search.php:246 src/addrbook_search_html.php:194
+msgid "Your search failed with the following error(s)"
 msgstr ""
 
-#: ../src/addrbook_search.php:178 ../src/addressbook.php:323
-msgid "Info"
+#: src/addrbook_search_html.php:95
+msgid "Use Addresses"
 msgstr ""
 
-#: ../src/addrbook_search.php:178
-msgid "Source"
+#: src/addrbook_search_html.php:118
+msgid "Address Book Search"
 msgstr ""
 
-#: ../src/addressbook.php:51 ../src/addressbook.php:323
+#: src/addressbook.php:46 src/addressbook.php:306
 msgid "Nickname"
 msgstr ""
 
-#: ../src/addressbook.php:56
+#: src/addressbook.php:51
 msgid "Must be unique"
 msgstr ""
 
-#: ../src/addressbook.php:58
+#: src/addressbook.php:53
 msgid "E-mail address"
 msgstr ""
 
-#: ../src/addressbook.php:63
+#: src/addressbook.php:58
 msgid "First name"
 msgstr ""
 
-#: ../src/addressbook.php:68
+#: src/addressbook.php:63
 msgid "Last name"
 msgstr ""
 
-#: ../src/addressbook.php:73
+#: src/addressbook.php:68
 msgid "Additional info"
 msgstr ""
 
-#: ../src/addressbook.php:97
+#: src/addressbook.php:87
 msgid "No personal address book is defined. Contact administrator."
 msgstr ""
 
-#: ../src/addressbook.php:201
+#: src/addressbook.php:184
 msgid "You can only edit one address at the time"
 msgstr ""
 
-#: ../src/addressbook.php:213 ../src/addressbook.php:216
-#: ../src/addressbook.php:245 ../src/addressbook.php:248
+#: src/addressbook.php:196 src/addressbook.php:199 src/addressbook.php:228
+#: src/addressbook.php:231
 msgid "Update address"
 msgstr ""
 
-#: ../functions/display_messages.php:95 ../functions/display_messages.php:111
-#: ../functions/imap_general.php:102 ../src/addressbook.php:236
-#: ../src/addressbook.php:286
+#: functions/display_messages.php:63 functions/display_messages.php:79
+#: functions/imap_general.php:136 src/addressbook.php:219
+#: src/addressbook.php:269
 msgid "ERROR"
 msgstr ""
 
-#: ../src/addressbook.php:262
+#: src/addressbook.php:245
 msgid "Unknown error"
 msgstr ""
 
-#: ../src/addressbook.php:353
+#: src/addressbook.php:344
 msgid "Edit selected"
 msgstr ""
 
-#: ../src/addressbook.php:355
+#: src/addressbook.php:346
 msgid "Delete selected"
 msgstr ""
 
-#: ../src/addressbook.php:365
+#: src/addressbook.php:356
 #, c-format
 msgid "Add to %s"
 msgstr ""
 
-#: ../src/addressbook.php:368
+#: src/addressbook.php:359
 msgid "Add address"
 msgstr ""
 
-#: ../src/compose.php:56 ../src/compose.php:92
-msgid "No Message"
+#: src/addressbook_csvimport.php:89
+msgid "All the steps required to complete the process are listed below"
 msgstr ""
 
-#: ../src/compose.php:62
-msgid "-------- Original Message ---------\n"
+#: src/addressbook_csvimport.php:93
+msgid "You uploaded a file named: "
 msgstr ""
 
-#: ../src/compose.php:167 ../src/read_body.php:222
-msgid "To:"
+#: src/addressbook_csvimport.php:100
+msgid "Failed to create working copy, Please try again."
 msgstr ""
 
-#: ../src/compose.php:177
-msgid "CC:"
+#: src/addressbook_csvimport.php:102
+msgid "Created working copy, continuing with process..."
 msgstr ""
 
-#: ../src/compose.php:187
-msgid "BCC:"
+#: src/addressbook_csvimport.php:106
+msgid "Displaying a small set of your data."
 msgstr ""
 
-#: ../src/compose.php:200
-msgid "Lookup recipients in addressbook."
+#: src/addressbook_csvimport.php:109
+msgid "Arrange your data to fit the 5 address book fields. "
 msgstr ""
 
-#: ../src/compose.php:206 ../src/read_body.php:198
-msgid "Subject:"
+#: src/addressbook_csvimport.php:109
+msgid ""
+"Do this by inserting the data's field number under the field for which you "
+"wish it to be included into the address book. "
+msgstr ""
+
+#: src/addressbook_csvimport.php:109
+msgid "For example: fields 5, 6, and 7 need to go into the info field 5. "
+msgstr ""
+
+#: src/addressbook_csvimport.php:109
+msgid "The boxes under field 5 would contain 5, 6, and 7 in seperate boxes. "
+msgstr ""
+
+#: src/addressbook_csvimport.php:111
+msgid "Submit Your reorganized data."
+msgstr ""
+
+#: src/addressbook_csvimport.php:116
+msgid "Erase entries and re-enter field numbers."
+msgstr ""
+
+#: src/addressbook_csvimport.php:121
+msgid "View full set of imported records in their new format."
+msgstr ""
+
+#: src/addressbook_csvimport.php:127
+msgid "Omit individual records which are not to be included."
+msgstr ""
+
+#: src/addressbook_csvimport.php:128
+msgid "To the left of each field below the \"Omit\" heading is a checkbox."
+msgstr ""
+
+#: src/addressbook_csvimport.php:129
+msgid "Click this checkbox to omit individual records."
+msgstr ""
+
+#: src/addressbook_csvimport.php:133
+msgid "Final approval. "
+msgstr ""
+
+#: src/addressbook_csvimport.php:134
+msgid "After reviewing the rearranged data for accuracy, click \"Finish\"."
+msgstr ""
+
+#: src/addressbook_csvimport.php:140
+msgid "Upload Completed!"
+msgstr ""
+
+#: src/addressbook_csvimport.php:140
+msgid "Click on the link below to verify your work."
+msgstr ""
+
+#: functions/page_header.php:94 src/addressbook_csvimport.php:141
+msgid "Addresses"
+msgstr ""
+
+#: src/addressbook_csvimport.php:167
+msgid "This table shows your data after uploading it."
+msgstr ""
+
+#: src/addressbook_csvimport.php:171
+msgid "This table shows your data after you reorganized it."
+msgstr ""
+
+#: src/addressbook_csvimport.php:184 src/addressbook_csvimport.php:191
+#: src/addressbook_csvimport.php:198 src/addressbook_csvimport.php:205
+#: src/addressbook_csvimport.php:209 src/addressbook_csvimport.php:221
+msgid "Field Number: "
 msgstr ""
 
-#: ../src/compose.php:227 ../src/compose.php:240
-msgid "Send"
+#: src/addressbook_csvimport.php:227
+msgid "Omit"
 msgstr ""
 
-#: ../src/compose.php:246
-msgid "Attach:"
+#: src/addressbook_csvimport.php:228
+msgid "Nickname:"
 msgstr ""
 
-#: ../src/compose.php:252
-msgid "Add"
+#: src/addressbook_csvimport.php:229
+msgid "First name:"
 msgstr ""
 
-#: ../src/compose.php:265
-msgid "Delete selected attachments"
+#: src/addressbook_csvimport.php:230
+msgid "Last name:"
 msgstr ""
 
-#: ../src/compose.php:289
-msgid "You have not entered a message body."
+#: src/addressbook_csvimport.php:231
+msgid "E-mail address:"
 msgstr ""
 
-#: ../src/compose.php:293
-msgid "You have not filled in the \"To:\" field."
+#: src/addressbook_csvimport.php:232
+msgid "Additional info:"
 msgstr ""
 
-#: ../src/compose.php:297
-msgid "You have not entered a subject."
+#: src/addressbook_csvimport.php:237
+msgid "Move to field"
 msgstr ""
 
-#: ../src/compose.php:327
-msgid "Could not move/copy file. File not attached"
+#: src/addressbook_csvimport.php:237
+msgid "1-5 to include."
 msgstr ""
 
-#: ../src/download.php:25
-msgid "Viewing a plain text attachment"
+#: src/download.php:34
+msgid "Viewing a text attachment"
 msgstr ""
 
-#: ../functions/mime.php:163 ../src/download.php:30
+#: src/download.php:35 src/read_body.php:40
+msgid "View message"
+msgstr ""
+
+#: functions/mime.php:443 src/download.php:40
 msgid "Download this as a file"
 msgstr ""
 
-#: ../functions/page_header.php:61 ../src/folders.php:23
-#: ../src/left_main.php:95
+#: functions/mailbox_display.php:273 src/download.php:101
+msgid "Subject"
+msgstr ""
+
+#: functions/mailbox_display.php:255 src/download.php:102
+msgid "From"
+msgstr ""
+
+#: functions/mailbox_display.php:253 src/download.php:103
+msgid "To"
+msgstr ""
+
+#: functions/mailbox_display.php:264 src/download.php:104
+msgid "Date"
+msgstr ""
+
+#: functions/page_header.php:96 src/folders.php:33 src/left_main.php:119
 msgid "Folders"
 msgstr ""
 
-#: ../src/folders.php:40
+#: src/folders.php:41
+msgid "Subscribed successfully!"
+msgstr ""
+
+#: src/folders.php:43
+msgid "Unsubscribed successfully!"
+msgstr ""
+
+#: src/folders.php:45
+msgid "Deleted folder successfully!"
+msgstr ""
+
+#: src/folders.php:47
+msgid "Created folder successfully!"
+msgstr ""
+
+#: src/folders.php:49
+msgid "Renamed successfully!"
+msgstr ""
+
+#: src/folders.php:51 src/left_main.php:122
+msgid "refresh folder list"
+msgstr ""
+
+#: src/folders.php:68
 msgid "Mailboxes Created Successfully!"
 msgstr ""
 
-#: ../src/folders.php:42 ../src/folders_create.php:55
-#: ../src/folders_delete.php:86 ../src/folders_rename_do.php:54
-#: ../src/folders_subscribe.php:40 ../src/options_submit.php:62
+#: src/folders.php:70
 msgid "Click here"
 msgstr ""
 
-#: ../src/folders.php:44 ../src/folders_create.php:57
-#: ../src/folders_delete.php:88 ../src/folders_rename_do.php:56
-#: ../src/folders_subscribe.php:42 ../src/options_submit.php:64
+#: src/folders.php:72
 msgid "to continue."
 msgstr ""
 
-#: ../src/folders.php:56
+#: src/folders.php:84
 msgid "Special Folder Options"
 msgstr ""
 
-#: ../src/folders.php:59
+#: src/folders.php:87
 msgid ""
 "In order for SquirrelMail to provide the full set of options you need to "
 "create the special folders listed below.  Just click the check box and hit "
 "the create button."
 msgstr ""
 
-#: ../src/folders.php:62
+#: src/folders.php:90
 msgid "Create Sent"
 msgstr ""
 
-#: ../src/folders.php:65
+#: src/folders.php:93
 msgid "Create Trash"
 msgstr ""
 
-#: ../src/folders.php:75
+#: src/folders.php:103
 msgid "Delete Folder"
 msgstr ""
 
-#: ../functions/mailbox_display.php:205 ../src/folders.php:105
-#: ../src/read_body.php:157
+#: functions/mailbox_display.php:240 src/folders.php:139
+#: src/options_highlight.php:64 src/read_body.php:192
 msgid "Delete"
 msgstr ""
 
-#: ../src/folders.php:109 ../src/folders.php:190 ../src/folders.php:219
-#: ../src/folders.php:254
+#: src/folders.php:143 src/folders.php:227
 msgid "No mailboxes found"
 msgstr ""
 
-#: ../src/folders.php:115
+#: src/folders.php:150
 msgid "Create Folder"
 msgstr ""
 
-#: ../src/folders.php:120
+#: src/folders.php:155
 msgid "as a subfolder of"
 msgstr ""
 
-#: ../src/folders.php:158
+#: src/folders.php:193
 msgid "Let this folder contain subfolders"
 msgstr ""
 
-#: ../src/folders.php:166
+#: src/folders.php:203
 msgid "Rename a Folder"
 msgstr ""
 
-#: ../src/folders.php:186
+#: src/folders.php:223
 msgid "Rename"
 msgstr ""
 
-#: ../src/folders.php:196
+#: src/folders.php:236
 msgid "Unsubscribe/Subscribe"
 msgstr ""
 
-#: ../src/folders.php:215
+#: src/folders.php:255
 msgid "Unsubscribe"
 msgstr ""
 
-#: ../src/folders.php:250
+#: src/folders.php:259
+msgid "No folders were found to unsubscribe from!"
+msgstr ""
+
+#: src/folders.php:298
 msgid "Subscribe"
 msgstr ""
 
-#: ../src/folders_create.php:23
+#: src/folders.php:301
+msgid "No folders were found to subscribe to!"
+msgstr ""
+
+#: src/folders_create.php:32
 msgid "Illegal folder name.  Please select a different name."
 msgstr ""
 
-#: ../src/folders_create.php:23
+#: src/folders_create.php:32
 msgid "Click here to go back"
 msgstr ""
 
-#: ../src/folders_create.php:51
-msgid "Folder Created!"
+#: src/folders_rename_getname.php:46
+msgid "Rename a folder"
 msgstr ""
 
-#: ../src/folders_create.php:53
-msgid "The folder has been successfully created."
+#: src/folders_rename_getname.php:50
+msgid "New name:"
 msgstr ""
 
-#: ../src/folders_delete.php:82
-msgid "Folder Deleted!"
+#: src/folders_rename_getname.php:56 src/options_highlight.php:171
+msgid "Submit"
 msgstr ""
 
-#: ../src/folders_delete.php:84
-msgid "The folder has been successfully deleted."
+#: src/help.php:33 src/help.php:43 src/help.php:53 src/help.php:64
+#: src/help.php:74 src/help.php:84 src/help.php:94 src/help.php:104
+msgid ""
+"Your preferred language is not yet translated. English will be substituted "
+"here."
 msgstr ""
 
-#: ../src/folders_rename_do.php:50
-msgid "Folder Renamed!"
+#: src/help.php:113 src/left_help.php:53
+msgid "ERROR: Some or all of the standard English help files ar missing."
 msgstr ""
 
-#: ../src/folders_rename_do.php:52
-msgid "The folder has been successfully renamed."
+#: src/left_help.php:74 src/left_help.php:80
+msgid "$temphed"
 msgstr ""
 
-#: ../src/folders_rename_getname.php:37
-msgid "Rename a folder"
+#: src/left_main.php:95
+msgid "purge"
 msgstr ""
 
-#: ../src/folders_rename_getname.php:41
-msgid "New name:"
+#: src/load_prefs.php:29
+msgid "Theme: "
 msgstr ""
 
-#: ../src/folders_rename_getname.php:47 ../src/options.php:393
-msgid "Submit"
+#: src/load_prefs.php:31
+msgid " was not found."
 msgstr ""
 
-#: ../src/folders_subscribe.php:31
-msgid "Subscribed Successfully!"
+#: src/load_prefs.php:33
+msgid "Exiting abnormally"
 msgstr ""
 
-#: ../src/folders_subscribe.php:33
-msgid "You have been successfully subscribed."
+#: src/login.php:58
+msgid "SquirrelMail Login"
 msgstr ""
 
-#: ../src/folders_subscribe.php:35
-msgid "Unsubscribed Successfully!"
+#: src/login.php:65
+#, c-format
+msgid "SquirrelMail version %s"
 msgstr ""
 
-#: ../src/folders_subscribe.php:37
-msgid "You have been successfully unsubscribed."
+#: src/login.php:67
+msgid "By the SquirrelMail Development Team"
 msgstr ""
 
-#: ../src/left_main.php:71
-msgid "purge"
+#: src/login.php:73
+#, c-format
+msgid "%s Login"
 msgstr ""
 
-#: ../src/left_main.php:98
-msgid "refresh folder list"
+#: src/login.php:81
+msgid "Name:"
 msgstr ""
 
-#: ../src/load_prefs.php:18
-msgid "Theme: "
+#: src/login.php:87
+msgid "Password:"
 msgstr ""
 
-#: ../src/load_prefs.php:20
-msgid " was not found."
+#: src/login.php:96
+msgid "Login"
 msgstr ""
 
-#: ../src/load_prefs.php:22
-msgid "Exiting abnormally"
+#: src/move_messages.php:75 src/move_messages.php:101
+msgid "No messages were selected."
 msgstr ""
 
-#: ../src/login.php:37
-msgid "SquirrelMail Login"
+#: functions/page_header.php:98 src/options.php:45 src/options_display.php:35
+#: src/options_folder.php:38 src/options_highlight.php:53
+#: src/options_personal.php:39
+msgid "Options"
 msgstr ""
 
-#: ../src/login.php:44
-msgid "SquirrelMail version $version<BR>By the SquirrelMail Development Team"
+#: src/options.php:57
+msgid "Successfully saved personal information!"
 msgstr ""
 
-#: ../src/login.php:56
-msgid "Name:"
+#: src/options.php:69
+msgid "Successfully saved display preferences!"
 msgstr ""
 
-#: ../src/login.php:62
-msgid "Password:"
+#: src/options.php:70
+msgid "Refresh Page"
 msgstr ""
 
-#: ../src/login.php:71
-msgid "Login"
+#: src/options.php:90
+msgid "Successfully saved folder preferences!"
 msgstr ""
 
-#: ../src/move_messages.php:74 ../src/move_messages.php:106
-msgid "No messages were selected."
+#: src/options.php:91
+msgid "Refresh Folders"
 msgstr ""
 
-#: ../functions/page_header.php:62 ../src/options.php:37
-msgid "Options"
+#: src/options.php:102 src/options_personal.php:39
+msgid "Personal Information"
 msgstr ""
 
-#: ../src/options.php:46
-msgid "Full Name:"
+#: src/options.php:107
+msgid ""
+"This contains personal information about yourself such as your name, your "
+"email address, etc."
 msgstr ""
 
-#: ../src/options.php:55
-msgid "E-mail address:"
+#: src/options.php:114 src/options_highlight.php:53
+msgid "Message Highlighting"
 msgstr ""
 
-#: ../src/options.php:64
-msgid "Reply-to:"
+#: src/options.php:119
+msgid ""
+"Based upon given criteria, incoming messages can have different background "
+"colors in the message list.  This helps to easily distinguish who the "
+"messages are from, especially for mailing lists."
 msgstr ""
 
-#: ../src/options.php:74
-msgid "Folder path:"
+#: src/options.php:128 src/options_display.php:35
+msgid "Display Preferences"
 msgstr ""
 
-#: ../src/options.php:87
-msgid "Theme:"
+#: src/options.php:133
+msgid ""
+"You can change the way that SquirrelMail looks and displays information to "
+"you, such as the colors, the language, and other settings."
 msgstr ""
 
-#: ../src/options.php:104
-msgid "Language:"
+#: src/options.php:140 src/options_folder.php:38
+msgid "Folder Preferences"
 msgstr ""
 
-#: ../src/options.php:126
+#: src/options.php:145
+msgid ""
+"These settings change the way your folders are displayed and manipulated."
+msgstr ""
+
+#: src/options_display.php:41
+msgid "Theme"
+msgstr ""
+
+#: src/options_display.php:56
+msgid "Language"
+msgstr ""
+
+#: src/options_display.php:74
+msgid "Use Javascript or HTML addressbook?"
+msgstr ""
+
+#: src/options_display.php:76 src/options_display.php:79
+msgid "JavaScript"
+msgstr ""
+
+#: src/options_display.php:77 src/options_display.php:80
+msgid "HTML"
+msgstr ""
+
+#: src/options_display.php:86
+msgid "Number of Messages to Index"
+msgstr ""
+
+#: src/options_display.php:97
+msgid "Wrap incoming text at"
+msgstr ""
+
+#: src/options_display.php:108
+msgid "Size of editor window"
+msgstr ""
+
+#: src/options_display.php:119
+msgid "Width of left folder list"
+msgstr ""
+
+#: src/options_display.php:173
+msgid "Auto refresh folder list"
+msgstr ""
+
+#: src/options_folder.php:46
+msgid "Folder Path"
+msgstr ""
+
+#: src/options_folder.php:59
 msgid "Trash Folder:"
 msgstr ""
 
-#: ../src/options.php:130
+#: src/options_folder.php:63
 msgid "Don't use Trash"
 msgstr ""
 
-#: ../src/options.php:132
+#: src/options_folder.php:65
 msgid "Do not use Trash"
 msgstr ""
 
-#: ../src/options.php:154
+#: src/options_folder.php:87
 msgid "Sent Folder:"
 msgstr ""
 
-#: ../src/options.php:158
+#: src/options_folder.php:91
 msgid "Don't use Sent"
 msgstr ""
 
-#: ../src/options.php:160
+#: src/options_folder.php:93
 msgid "Do not use Sent"
 msgstr ""
 
-#: ../src/options.php:187
-msgid "Number of Messages to Index:"
+#: src/options_folder.php:115
+msgid "Unseen message notification"
 msgstr ""
 
-#: ../src/options.php:200
-msgid "Wrap incoming text at:"
+#: src/options_folder.php:118
+msgid "No notification"
 msgstr ""
 
-#: ../src/options.php:213
-msgid "Size of editor window (in characters):"
+#: src/options_folder.php:119
+msgid "Only INBOX"
 msgstr ""
 
-#: ../src/options.php:226
-msgid "Width of left folder list:"
+#: src/options_folder.php:120
+msgid "All Folders"
 msgstr ""
 
-#: ../src/options.php:283
-msgid "Time between auto refresh of folder list:"
+#: src/options_folder.php:127
+msgid "Unseen message notification type"
 msgstr ""
 
-#: ../src/options.php:378
-msgid "Use a signature?"
+#: src/options_folder.php:130
+msgid "Only unseen"
+msgstr ""
+
+#: src/options_folder.php:131
+msgid "Unseen and Total"
+msgstr ""
+
+#: src/options_highlight.php:57
+msgid "New"
+msgstr ""
+
+#: src/options_highlight.php:58
+msgid "Done"
 msgstr ""
 
-#: ../src/options_submit.php:58
-msgid "Options Saved!"
+#: src/options_highlight.php:64
+msgid "Edit"
 msgstr ""
 
-#: ../src/options_submit.php:60
-msgid "Your options have been saved."
+#: src/options_highlight.php:77
+msgid "No highlighting is defined"
 msgstr ""
 
-#: ../src/read_body.php:90
+#: src/options_highlight.php:115
+msgid "Identifying name"
+msgstr ""
+
+#: src/options_highlight.php:124
+msgid "Color"
+msgstr ""
+
+#: src/options_highlight.php:128
+msgid "Dark Blue"
+msgstr ""
+
+#: src/options_highlight.php:129
+msgid "Dark Green"
+msgstr ""
+
+#: src/options_highlight.php:130
+msgid "Dark Yellow"
+msgstr ""
+
+#: src/options_highlight.php:131
+msgid "Dark Cyan"
+msgstr ""
+
+#: src/options_highlight.php:132
+msgid "Dark Magenta"
+msgstr ""
+
+#: src/options_highlight.php:133
+msgid "Light Blue"
+msgstr ""
+
+#: src/options_highlight.php:134
+msgid "Light Green"
+msgstr ""
+
+#: src/options_highlight.php:135
+msgid "Light Yellow"
+msgstr ""
+
+#: src/options_highlight.php:136
+msgid "Light Cyan"
+msgstr ""
+
+#: src/options_highlight.php:137
+msgid "Light Magenta"
+msgstr ""
+
+#: src/options_highlight.php:138
+msgid "Dark Gray"
+msgstr ""
+
+#: src/options_highlight.php:139
+msgid "Medium Gray"
+msgstr ""
+
+#: src/options_highlight.php:140
+msgid "Light Gray"
+msgstr ""
+
+#: src/options_highlight.php:141
+msgid "White"
+msgstr ""
+
+#: src/options_highlight.php:143
+msgid "Other:"
+msgstr ""
+
+#: src/options_highlight.php:145
+msgid "Ex: 63aa7f"
+msgstr ""
+
+#: src/options_highlight.php:151
+msgid "Match"
+msgstr ""
+
+#: src/options_highlight.php:167
+msgid "Regular Expression"
+msgstr ""
+
+#: src/options_personal.php:45
+msgid "Full Name"
+msgstr ""
+
+#: src/options_personal.php:51
+msgid "E-Mail Address"
+msgstr ""
+
+#: src/options_personal.php:57
+msgid "Reply To"
+msgstr ""
+
+#: src/options_personal.php:63
+msgid "Signature"
+msgstr ""
+
+#: src/options_personal.php:67
+msgid "Use a signature"
+msgstr ""
+
+#: src/options_personal.php:70
+msgid "Use a signature?"
+msgstr ""
+
+#: src/read_body.php:38
+msgid "Viewing full header"
+msgstr ""
+
+#: src/read_body.php:125
 msgid "more"
 msgstr ""
 
-#: ../src/read_body.php:91
+#: src/read_body.php:126
 msgid "less"
 msgstr ""
 
-#: ../src/read_body.php:154
+#: src/read_body.php:189
 msgid "Message List"
 msgstr ""
 
-#: ../functions/mailbox_display.php:171 ../functions/mailbox_display.php:175
-#: ../functions/mailbox_display.php:286 ../functions/mailbox_display.php:290
-#: ../src/read_body.php:168 ../src/read_body.php:170
+#: functions/mailbox_display.php:204 functions/mailbox_display.php:208
+#: functions/mailbox_display.php:321 functions/mailbox_display.php:325
+#: src/read_body.php:203 src/read_body.php:205
 msgid "Previous"
 msgstr ""
 
-#: ../functions/mailbox_display.php:172 ../functions/mailbox_display.php:180
-#: ../functions/mailbox_display.php:287 ../functions/mailbox_display.php:291
-#: ../functions/mailbox_display.php:295 ../src/read_body.php:172
-#: ../src/read_body.php:174
+#: functions/mailbox_display.php:205 functions/mailbox_display.php:213
+#: functions/mailbox_display.php:322 functions/mailbox_display.php:326
+#: functions/mailbox_display.php:330 src/read_body.php:207
+#: src/read_body.php:209
 msgid "Next"
 msgstr ""
 
-#: ../src/read_body.php:180
+#: src/read_body.php:215
 msgid "Forward"
 msgstr ""
 
-#: ../src/read_body.php:183
+#: src/read_body.php:218
 msgid "Reply"
 msgstr ""
 
-#: ../src/read_body.php:186
+#: src/read_body.php:221
 msgid "Reply All"
 msgstr ""
 
-#: ../src/read_body.php:206
+#: src/read_body.php:233
+msgid "Subject:"
+msgstr ""
+
+#: src/read_body.php:237
+msgid "View full header"
+msgstr ""
+
+#: src/read_body.php:242
 msgid "From:"
 msgstr ""
 
-#: ../src/read_body.php:214
+#: src/read_body.php:250
 msgid "Date:"
 msgstr ""
 
-#: ../functions/page_header.php:52 ../src/signout.php:42
-msgid "Sign Out"
+#: src/read_body.php:258
+msgid "To:"
 msgstr ""
 
-#: ../src/signout.php:49
-msgid "You have been successfully signed out."
+#: functions/page_header.php:82 src/signout.php:60
+msgid "Sign Out"
 msgstr ""
 
-#: ../src/signout.php:51
-msgid "Click here to "
+#: src/signout.php:67
+msgid "You have been successfully signed out."
 msgstr ""
 
-#: ../src/signout.php:53
-msgid "log back in."
+#: src/signout.php:70
+msgid "Click here to log back in."
 msgstr ""
 
-#: ../functions/abook_local_file.php:32 ../functions/addressbook.php:72
+#: functions/abook_local_file.php:32 functions/addressbook.php:72
 msgid "Personal address book"
 msgstr ""
 
-#: ../functions/abook_local_file.php:40
+#: functions/abook_local_file.php:40
 msgid "Not a file name"
 msgstr ""
 
-#: ../functions/abook_local_file.php:74
+#: functions/abook_local_file.php:74
 msgid "No such file or directory"
 msgstr ""
 
-#: ../functions/abook_local_file.php:94 ../functions/abook_local_file.php:130
+#: functions/abook_local_file.php:94 functions/abook_local_file.php:130
 msgid "Open failed"
 msgstr ""
 
-#: ../functions/abook_local_file.php:226 ../functions/abook_local_file.php:246
-#: ../functions/abook_local_file.php:269 ../functions/abook_local_file.php:299
-#: ../functions/addressbook.php:251 ../functions/addressbook.php:282
+#: functions/abook_local_file.php:226 functions/abook_local_file.php:246
+#: functions/abook_local_file.php:269 functions/abook_local_file.php:299
+#: functions/addressbook.php:268 functions/addressbook.php:299
 msgid "Addressbook is read-only"
 msgstr ""
 
-#: ../functions/abook_local_file.php:231
+#: functions/abook_local_file.php:231
 #, c-format
 msgid "User '%s' already exist"
 msgstr ""
 
-#: ../functions/abook_local_file.php:250 ../functions/abook_local_file.php:274
-#: ../functions/abook_local_file.php:310
+#: functions/abook_local_file.php:250 functions/abook_local_file.php:274
+#: functions/abook_local_file.php:310
 msgid "Could not lock datafile"
 msgstr ""
 
-#: ../functions/abook_local_file.php:262
+#: functions/abook_local_file.php:262
 msgid "Write to addressbook failed"
 msgstr ""
 
-#: ../functions/abook_local_file.php:304
+#: functions/abook_local_file.php:304
 #, c-format
 msgid "User '%s' does not exist"
 msgstr ""
 
-#: ../functions/addressbook.php:29
+#: functions/addressbook.php:29
 #, c-format
 msgid "Error opening file %s"
 msgstr ""
 
-#: ../functions/addressbook.php:43
+#: functions/addressbook.php:43
 #, c-format
 msgid "Error initializing LDAP server %s:"
 msgstr ""
 
-#: ../functions/addressbook.php:228 ../functions/addressbook.php:309
+#: functions/addressbook.php:245 functions/addressbook.php:326
 msgid "Invalid input data"
 msgstr ""
 
-#: ../functions/addressbook.php:233 ../functions/addressbook.php:314
+#: functions/addressbook.php:250 functions/addressbook.php:331
 msgid "Name is missing"
 msgstr ""
 
-#: ../functions/addressbook.php:237 ../functions/addressbook.php:318
+#: functions/addressbook.php:254 functions/addressbook.php:335
 msgid "E-mail address is missing"
 msgstr ""
 
-#: ../functions/addressbook.php:245
+#: functions/addressbook.php:262
 msgid "Nickname contain illegal characters"
 msgstr ""
 
-#: ../functions/addressbook.php:327
+#: functions/addressbook.php:344
 msgid "Addressbook $bnum is read-only"
 msgstr ""
 
-#: ../functions/display_messages.php:19 ../functions/imap_general.php:110
+#: functions/display_messages.php:19 functions/imap_general.php:144
 msgid "Unknown user or password incorrect."
 msgstr ""
 
-#: ../functions/display_messages.php:19 ../functions/imap_general.php:111
+#: functions/display_messages.php:19 functions/imap_general.php:145
 msgid "Click here to try again"
 msgstr ""
 
-#: ../functions/display_messages.php:31
-msgid "Welcome to $org_name's WebMail system"
-msgstr ""
-
-#: ../functions/display_messages.php:40
-msgid "Running SquirrelMail version $version (c) 1999-2000."
+#: functions/display_messages.php:32
+#, c-format
+msgid "Welcome to %s's WebMail system"
 msgstr ""
 
-#: ../functions/display_messages.php:59
-msgid "Messages Deleted"
+#: functions/display_messages.php:43
+#, c-format
+msgid "Running SquirrelMail version %s (c) 1999-2000."
 msgstr ""
 
-#: ../functions/display_messages.php:61
-msgid "The selected messages were deleted successfully."
+#: functions/display_messages.php:68
+#, c-format
+msgid "Click here to return to %s"
 msgstr ""
 
-#: ../functions/display_messages.php:64 ../functions/display_messages.php:82
-#: ../functions/display_messages.php:100
-msgid "Click here to return to "
+#: functions/imap_general.php:44
+msgid "ERROR : Could not complete request."
 msgstr ""
 
-#: ../functions/display_messages.php:77
-msgid "Messages Moved"
+#: functions/imap_general.php:46
+msgid "Reason Given: "
 msgstr ""
 
-#: ../functions/display_messages.php:79
-msgid "The selected messages were moved successfully."
+#: functions/imap_general.php:51
+msgid "ERROR : Bad or malformed request."
 msgstr ""
 
-#: ../functions/imap_general.php:43
-msgid "ERROR : Could not complete request."
+#: functions/imap_general.php:53
+msgid "Server responded: "
 msgstr ""
 
-#: ../functions/imap_general.php:45
-msgid "Reason Given: "
+#: functions/imap_general.php:86
+#, c-format
+msgid "Error connecting to IMAP server: %s."
 msgstr ""
 
-#: ../functions/imap_general.php:50
-msgid "ERROR : Bad or malformed request."
+#: functions/imap_general.php:99
+#, c-format
+msgid "Bad request: %s"
 msgstr ""
 
-#: ../functions/imap_general.php:52
-msgid "Server responded: "
+#: functions/imap_general.php:157
+#, c-format
+msgid "Unknown error: %s"
 msgstr ""
 
-#: ../functions/imap_messages.php:47 ../functions/imap_messages.php:66
-#: ../functions/imap_messages.php:245 ../functions/imap_messages.php:280
+#: functions/imap_messages.php:51 functions/imap_messages.php:75
+#: functions/imap_messages.php:274 functions/imap_messages.php:309
 msgid "(no subject)"
 msgstr ""
 
-#: ../functions/imap_messages.php:48
+#: functions/imap_messages.php:52
 msgid "Unknown Sender"
 msgstr ""
 
-#: ../functions/imap_messages.php:283
+#: functions/imap_messages.php:312
 msgid "(unknown sender)"
 msgstr ""
 
-#: ../functions/mailbox_display.php:161
-msgid "Viewing messages "
+#: functions/mailbox_display.php:194
+msgid "Viewing messages"
 msgstr ""
 
-#: ../functions/mailbox_display.php:161
-msgid " to "
+#: functions/mailbox_display.php:194
+msgid "to"
 msgstr ""
 
-#: ../functions/mailbox_display.php:165
-msgid "Viewing message "
+#: functions/mailbox_display.php:194 functions/mailbox_display.php:198
+msgid "total"
 msgstr ""
 
-#: ../functions/mailbox_display.php:165
-msgid "total"
+#: functions/mailbox_display.php:198
+msgid "Viewing message"
 msgstr ""
 
-#: ../functions/mailbox_display.php:191
+#: functions/mailbox_display.php:224
 msgid "Move selected to:"
 msgstr ""
 
-#: ../functions/mailbox_display.php:201
+#: functions/mailbox_display.php:236
 msgid "Move"
 msgstr ""
 
-#: ../functions/mailbox_display.php:205
+#: functions/mailbox_display.php:240
 msgid "checked messages"
 msgstr ""
 
-#: ../functions/mailbox_display.php:218
-msgid "To"
-msgstr ""
-
-#: ../functions/mailbox_display.php:220
-msgid "From"
-msgstr ""
-
-#: ../functions/mailbox_display.php:229
-msgid "Date"
-msgstr ""
-
-#: ../functions/mailbox_display.php:238
-msgid "Subject"
+#: functions/mailbox_display.php:287
+msgid "THIS FOLDER IS EMPTY"
 msgstr ""
 
-#: ../functions/mailbox_display.php:252
-msgid "THIS FOLDER IS EMPTY"
+#: functions/mime.php:480
+msgid "download"
 msgstr ""
 
-#: ../functions/page_header.php:54
+#: functions/page_header.php:84
 msgid "Current Folder: "
 msgstr ""
 
-#: ../functions/page_header.php:59
+#: functions/page_header.php:92
 msgid "Compose"
 msgstr ""
 
-#: ../functions/page_header.php:60
-msgid "Addresses"
+#: functions/page_header.php:100
+msgid "Help"
 msgstr ""
 
-#: ../functions/prefs.php:14
+#: functions/prefs.php:14
 msgid "Preference file "
 msgstr ""
 
-#: ../functions/prefs.php:14
+#: functions/prefs.php:14
 msgid " not found.  Exiting abnormally"
 msgstr ""
 
-#: ../functions/prefs.php:37
+#: functions/prefs.php:36 functions/prefs.php:74
 msgid "Preference file, "
 msgstr ""
 
-#: ../functions/prefs.php:37
+#: functions/prefs.php:36 functions/prefs.php:74
 msgid ""
 ", does not exist.  Log out, and log back in to create a default preference "
 "file. "
 msgstr ""
 
-#: ../functions/prefs.php:80
+#: functions/prefs.php:117
 msgid "Error opening "
 msgstr ""
-
-#: ../functions/prefs.php:108
-msgid "Signature file not found."
-msgstr ""
diff --git a/src/download.php b/src/download.php
index 700396e0..6f5c4266 100644
--- a/src/download.php
+++ b/src/download.php
@@ -68,8 +68,6 @@
    $filename = decodeHeader($header->filename);
 
    if (strlen($filename) < 1) {
-      # set some standard suffixes to the filenames if the filename isn't known
-
       if ($type1 == "plain" && $type0 == "text")                  $suffix = "txt";
       else if ($type1 == "richtext" && $type0 == "text")          $suffix = "rtf";
       else if ($type1 == "postscript" && $type0 == "application") $suffix = "ps";