Updated Hebrew po file.
authorstakadush <stakadush@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Thu, 4 Jul 2002 09:48:43 +0000 (09:48 +0000)
committerstakadush <stakadush@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Thu, 4 Jul 2002 09:48:43 +0000 (09:48 +0000)
A small cosmetic fix to plugins/abook_take/setup.php (lines 159 & 163) - added &nbsp;.

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

locale/he_HE/LC_MESSAGES/squirrelmail.po
plugins/abook_take/setup.php

index 679644e25d6041eb5ebcfa4869e5c992b3a94965..e0f80a4674c666d22a39c8912be984b9ab1f2df9 100644 (file)
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: $Id$\n"
-"POT-Creation-Date: 2002-05-03 13:21+0200\n"
+"POT-Creation-Date: 2002-07-04 12:19+0300\n"
 "PO-Revision-Date: 2002-05-03 13:21+0200\n"
 "Last-Translator: yoav <yoavb@zavit.net.il>\n"
 "Language-Team: HEBREW <squirrelmail-i18n@lists.sourceforge.net>\n"
@@ -18,527 +18,561 @@ msgstr ""
 msgid "Address Book"
 msgstr "ñôø ëúåáåú"
 
-#: squirrelmail/src/addrbook_search.php:98
-#: squirrelmail/src/addrbook_search_html.php:67
-#: squirrelmail/src/addressbook.php:285 squirrelmail/src/vcard.php:85
+#: squirrelmail/src/addrbook_search.php:100
+#: squirrelmail/src/addrbook_search_html.php:90
+#: squirrelmail/src/addressbook.php:305 squirrelmail/src/vcard.php:89
 msgid "Name"
 msgstr "ùí"
 
-#: squirrelmail/src/addrbook_search.php:99
-#: squirrelmail/src/addrbook_search_html.php:68
-#: squirrelmail/src/addressbook.php:286
+#: squirrelmail/src/addrbook_search.php:101
+#: squirrelmail/src/addrbook_search_html.php:91
+#: squirrelmail/src/addressbook.php:306
 msgid "E-mail"
 msgstr "ëúåáú ãåà\"ì"
 
-#: squirrelmail/src/addrbook_search.php:100
-#: squirrelmail/src/addrbook_search_html.php:69
-#: squirrelmail/src/addressbook.php:287
+#: squirrelmail/src/addrbook_search.php:102
+#: squirrelmail/src/addrbook_search_html.php:92
+#: squirrelmail/src/addressbook.php:307
 msgid "Info"
 msgstr "îéãò"
 
-#: squirrelmail/src/addrbook_search.php:103
-#: squirrelmail/src/addrbook_search_html.php:72
+#: squirrelmail/src/addrbook_search.php:105
+#: squirrelmail/src/addrbook_search_html.php:95
 msgid "Source"
 msgstr "î÷åø"
 
-#: squirrelmail/functions/mailbox_display.php:742
-#: squirrelmail/plugins/filters/options.php:120
-#: squirrelmail/src/addrbook_search_html.php:82
-#: squirrelmail/src/compose.php:436 squirrelmail/src/download.php:311
-#: squirrelmail/src/download.php:318
-#: squirrelmail/src/options_highlight.php:330
-#: squirrelmail/src/printer_friendly_bottom.php:96
-#: squirrelmail/src/search.php:351
-msgid "To"
-msgstr "àì"
-
-#: squirrelmail/plugins/filters/options.php:123
-#: squirrelmail/src/addrbook_search_html.php:84
-#: squirrelmail/src/compose.php:443 squirrelmail/src/options_highlight.php:333
-#: squirrelmail/src/search.php:350
-msgid "Cc"
-msgstr "äòú÷éí"
-
-#: squirrelmail/src/addrbook_search_html.php:86
-msgid "Bcc"
-msgstr "äòú÷éí òéååøéí"
-
-#: squirrelmail/src/addrbook_search_html.php:99
-msgid "Use Addresses"
-msgstr "äùúîù áëúåáåú"
-
-#: squirrelmail/src/addrbook_search_html.php:122
-msgid "Address Book Search"
-msgstr "çéôåù áñôø ëúåáåú"
+#: squirrelmail/src/addrbook_search.php:165
+#: squirrelmail/src/addrbook_search.php:261
+#: squirrelmail/src/addrbook_search_html.php:253
+msgid "No persons matching your search was found"
+msgstr "ìà ðîöàå îëåúáéí äîúàéîéí ìúðàé äçéôåù"
 
-#: squirrelmail/src/addrbook_search.php:174
-#: squirrelmail/src/addrbook_search_html.php:131
+#: squirrelmail/src/addrbook_search.php:180
+#: squirrelmail/src/addrbook_search_html.php:162
 msgid "Search for"
 msgstr "çôù àú"
 
-#: squirrelmail/src/addrbook_search.php:180
-#: squirrelmail/src/addrbook_search_html.php:141
+#: squirrelmail/src/addrbook_search.php:187
+#: squirrelmail/src/addrbook_search_html.php:172
 msgid "in"
 msgstr "á"
 
-#: squirrelmail/src/addrbook_search.php:181
-#: squirrelmail/src/addrbook_search_html.php:144
+#: squirrelmail/src/addrbook_search.php:188
+#: squirrelmail/src/addrbook_search_html.php:175
 msgid "All address books"
 msgstr "ëì ñôøé äëúåáåú"
 
-#: squirrelmail/functions/page_header.php:142
-#: squirrelmail/src/addrbook_search.php:192
-#: squirrelmail/src/addrbook_search_html.php:155
-#: squirrelmail/src/search.php:187 squirrelmail/src/search.php:191
-#: squirrelmail/src/search.php:211 squirrelmail/src/search.php:355
-#: squirrelmail/src/search.php:386 squirrelmail/src/search.php:407
-#: squirrelmail/src/search.php:417
+#: squirrelmail/src/addrbook_search.php:202
+#: squirrelmail/src/addrbook_search_html.php:190
+#: squirrelmail/src/search.php:194 squirrelmail/src/search.php:198
+#: squirrelmail/src/search.php:218 squirrelmail/src/search.php:366
+#: squirrelmail/src/search.php:396 squirrelmail/src/search.php:417
+#: squirrelmail/src/search.php:426 squirrelmail/functions/page_header.php:224
 msgid "Search"
 msgstr "çôù"
 
-#: squirrelmail/src/addrbook_search.php:193
-#: squirrelmail/src/addrbook_search_html.php:156
+#: squirrelmail/src/addrbook_search.php:203
+#: squirrelmail/src/addrbook_search_html.php:191
 msgid "List all"
 msgstr "äöâ äëì"
 
-#: squirrelmail/src/addrbook_search.php:214
-#: squirrelmail/src/addrbook_search_html.php:186
+#: squirrelmail/src/addrbook_search.php:205 squirrelmail/src/compose.php:639
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:119
+#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:427
+#: squirrelmail/plugins/squirrelspell/modules/forget_me_not.mod:70
+#: squirrelmail/plugins/newmail/testsound.php:36
+msgid "Close"
+msgstr "ñâåø"
+
+#: squirrelmail/src/addrbook_search.php:226
+#: squirrelmail/src/addrbook_search_html.php:221
 #, c-format
 msgid "Unable to list addresses from %s"
 msgstr "ìà éëåì ìäöéâ ëúåáåú î %s"
 
-#: squirrelmail/src/addrbook_search.php:240
-#: squirrelmail/src/addrbook_search_html.php:211
+#: squirrelmail/src/addrbook_search.php:252
+#: squirrelmail/src/addrbook_search_html.php:246
 msgid "Your search failed with the following error(s)"
 msgstr "äçéôåù ðëùì òí äùâéàåú äáàåú"
 
-#: squirrelmail/src/addrbook_search.php:160
-#: squirrelmail/src/addrbook_search.php:247
-#: squirrelmail/src/addrbook_search_html.php:216
-msgid "No persons matching your search was found"
-msgstr "ìà ðîöàå îëåúáéí äîúàéîéí ìúðàé äçéôåù"
+#: squirrelmail/src/addrbook_search_html.php:81
+#: squirrelmail/src/addrbook_search_html.php:83
+#: squirrelmail/src/addrbook_search_html.php:85
+#: squirrelmail/plugins/mail_fetch/fetch.php:71
+msgid "All"
+msgstr "äëì"
+
+#: squirrelmail/src/addrbook_search_html.php:106
+#: squirrelmail/src/compose.php:464 squirrelmail/src/download.php:401
+#: squirrelmail/src/download.php:410 squirrelmail/src/options_highlight.php:83
+#: squirrelmail/src/options_highlight.php:372
+#: squirrelmail/src/printer_friendly_bottom.php:103
+#: squirrelmail/src/search.php:363
+#: squirrelmail/functions/mailbox_display.php:793
+#: squirrelmail/plugins/filters/options.php:125
+msgid "To"
+msgstr "àì"
+
+#: squirrelmail/src/addrbook_search_html.php:108
+#: squirrelmail/src/compose.php:471 squirrelmail/src/options_highlight.php:86
+#: squirrelmail/src/options_highlight.php:375 squirrelmail/src/search.php:362
+#: squirrelmail/plugins/filters/options.php:128
+msgid "Cc"
+msgstr "äòú÷éí"
+
+#: squirrelmail/src/addrbook_search_html.php:110
+msgid "Bcc"
+msgstr "äòú÷éí òéååøéí"
 
-#: squirrelmail/src/addrbook_search_html.php:229
+#: squirrelmail/src/addrbook_search_html.php:126
+msgid "Use Addresses"
+msgstr "äùúîù áëúåáåú"
+
+#: squirrelmail/src/addrbook_search_html.php:150
+msgid "Address Book Search"
+msgstr "çéôåù áñôø ëúåáåú"
+
+#: squirrelmail/src/addrbook_search_html.php:267
 msgid "Return"
 msgstr "çæåø"
 
-#: squirrelmail/plugins/newmail/testsound.php:33
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:119
-#: squirrelmail/plugins/squirrelspell/modules/check_me.mod:427
-#: squirrelmail/plugins/squirrelspell/modules/forget_me_not.mod:70
-#: squirrelmail/src/addrbook_search.php:195 squirrelmail/src/compose.php:603
-msgid "Close"
-msgstr "ñâåø"
-
-#: squirrelmail/src/addressbook.php:39 squirrelmail/src/addressbook.php:285
+#: squirrelmail/src/addressbook.php:40 squirrelmail/src/addressbook.php:304
+#: squirrelmail/plugins/abook_take/take.php:35
 msgid "Nickname"
 msgstr "ëéðåé"
 
-#: squirrelmail/src/addressbook.php:40
+#: squirrelmail/src/addressbook.php:41
+#: squirrelmail/plugins/abook_take/take.php:37
 msgid "Must be unique"
 msgstr "çééá ìäéåú ééçåãé"
 
-#: squirrelmail/src/addressbook.php:41
+#: squirrelmail/src/addressbook.php:42
+#: squirrelmail/plugins/abook_take/take.php:41
 msgid "E-mail address"
 msgstr "ëúåáú ãåà\"ì"
 
-#: squirrelmail/src/addressbook.php:42
+#: squirrelmail/src/addressbook.php:43
+#: squirrelmail/plugins/abook_take/take.php:60
 msgid "First name"
 msgstr "ùí ôøèé"
 
-#: squirrelmail/src/addressbook.php:43
+#: squirrelmail/src/addressbook.php:44
+#: squirrelmail/plugins/abook_take/take.php:64
 msgid "Last name"
 msgstr "ùí îùôçä"
 
-#: squirrelmail/src/addressbook.php:44
+#: squirrelmail/src/addressbook.php:45
+#: squirrelmail/plugins/abook_take/take.php:68
 msgid "Additional info"
 msgstr "îéãò ðåñó"
 
-#: squirrelmail/src/addressbook.php:58
+#: squirrelmail/src/addressbook.php:61
 msgid "No personal address book is defined. Contact administrator."
 msgstr "ìà äåâãø ñôø ëúåáåú àéùé. öåø ÷ùø òí îðäì äîòøëú."
 
-#: squirrelmail/src/addressbook.php:154
+#: squirrelmail/src/addressbook.php:157
 msgid "You can only edit one address at the time"
 msgstr "áéëåìúê ìòøåê ñôø ëúåáåú àçã áëì ôòí"
 
-#: squirrelmail/src/addressbook.php:168 squirrelmail/src/addressbook.php:170
-#: squirrelmail/src/addressbook.php:200 squirrelmail/src/addressbook.php:202
+#: squirrelmail/src/addressbook.php:171 squirrelmail/src/addressbook.php:175
+#: squirrelmail/src/addressbook.php:208 squirrelmail/src/addressbook.php:212
 msgid "Update address"
 msgstr "òãëï ëúåáú"
 
-#: squirrelmail/functions/display_messages.php:49
-#: squirrelmail/functions/display_messages.php:68
-#: squirrelmail/functions/display_messages.php:85
-#: squirrelmail/functions/display_messages.php:151
-#: squirrelmail/src/addressbook.php:191 squirrelmail/src/addressbook.php:239
+#: squirrelmail/src/addressbook.php:197 squirrelmail/src/addressbook.php:251
+#: squirrelmail/functions/display_messages.php:70
+#: squirrelmail/functions/display_messages.php:89
+#: squirrelmail/functions/display_messages.php:106
+#: squirrelmail/functions/display_messages.php:172
 msgid "ERROR"
 msgstr "ùâéàä"
 
-#: squirrelmail/src/addressbook.php:214
+#: squirrelmail/src/addressbook.php:224
 msgid "Unknown error"
 msgstr "ùâéàä ìà éãåòä"
 
-#: squirrelmail/src/addressbook.php:258 squirrelmail/src/addressbook.php:344
+#: squirrelmail/src/addressbook.php:271 squirrelmail/src/addressbook.php:373
+#: squirrelmail/plugins/abook_take/take.php:73
 msgid "Add address"
 msgstr "äåñó ëúåáú"
 
-#: squirrelmail/src/addressbook.php:270 squirrelmail/src/addressbook.php:326
+#: squirrelmail/src/addressbook.php:285 squirrelmail/src/addressbook.php:351
 msgid "Edit selected"
 msgstr "òøåê ðáçøéí"
 
-#: squirrelmail/src/addressbook.php:272 squirrelmail/src/addressbook.php:328
+#: squirrelmail/src/addressbook.php:287 squirrelmail/src/addressbook.php:353
 msgid "Delete selected"
 msgstr "îç÷ ðáçøéí"
 
-#: squirrelmail/src/addressbook.php:341
+#: squirrelmail/src/addressbook.php:368
+#: squirrelmail/plugins/abook_take/take.php:29
 #, c-format
 msgid "Add to %s"
 msgstr "äåñó ì %s"
 
-#: squirrelmail/src/compose.php:97
+#: squirrelmail/src/compose.php:98
 msgid "Draft Email Saved"
 msgstr "èéåèú ãåà\"ì ðùîøä"
 
-#: squirrelmail/src/compose.php:200 squirrelmail/src/compose.php:244
-#: squirrelmail/src/compose.php:254
+#: squirrelmail/src/compose.php:201 squirrelmail/src/compose.php:245
+#: squirrelmail/src/compose.php:255
 msgid "Could not move/copy file. File not attached"
 msgstr "ìà éëåì ìäòúé÷/ìäòáéø àú ä÷åáõ. ä÷åáõ ìà öåøó."
 
-#: squirrelmail/src/compose.php:431
+#: squirrelmail/src/compose.php:459
 msgid "Original Message"
 msgstr "äåãòä î÷åøéú"
 
-#: squirrelmail/functions/mailbox_display.php:759
-#: squirrelmail/plugins/filters/options.php:129
-#: squirrelmail/src/compose.php:432 squirrelmail/src/download.php:309
-#: squirrelmail/src/download.php:314
-#: squirrelmail/src/options_highlight.php:339
+#: squirrelmail/src/compose.php:460 squirrelmail/src/download.php:399
+#: squirrelmail/src/download.php:406
+#: squirrelmail/src/options_highlight.php:381
 #: squirrelmail/src/options_order.php:40
-#: squirrelmail/src/printer_friendly_bottom.php:101
-#: squirrelmail/src/search.php:348
+#: squirrelmail/src/printer_friendly_bottom.php:117
+#: squirrelmail/src/search.php:360
+#: squirrelmail/functions/mailbox_display.php:813
+#: squirrelmail/plugins/filters/options.php:134
 msgid "Subject"
 msgstr "ðåùà"
 
-#: squirrelmail/functions/mailbox_display.php:744
-#: squirrelmail/plugins/filters/options.php:117
-#: squirrelmail/src/compose.php:433 squirrelmail/src/download.php:98
-#: squirrelmail/src/download.php:310 squirrelmail/src/download.php:316
-#: squirrelmail/src/options_highlight.php:327
+#: squirrelmail/src/compose.php:461 squirrelmail/src/download.php:171
+#: squirrelmail/src/download.php:400 squirrelmail/src/download.php:408
+#: squirrelmail/src/options_highlight.php:80
+#: squirrelmail/src/options_highlight.php:369
 #: squirrelmail/src/options_order.php:38
-#: squirrelmail/src/printer_friendly_bottom.php:95
-#: squirrelmail/src/search.php:349
+#: squirrelmail/src/printer_friendly_bottom.php:99
+#: squirrelmail/src/search.php:361
+#: squirrelmail/functions/mailbox_display.php:796
+#: squirrelmail/plugins/filters/options.php:122
 msgid "From"
 msgstr "îàú"
 
-#: squirrelmail/functions/mailbox_display.php:752
-#: squirrelmail/src/compose.php:434 squirrelmail/src/download.php:312
-#: squirrelmail/src/download.php:320 squirrelmail/src/options_order.php:39
-#: squirrelmail/src/printer_friendly_bottom.php:100
+#: squirrelmail/src/compose.php:462 squirrelmail/src/download.php:402
+#: squirrelmail/src/download.php:412 squirrelmail/src/options_order.php:39
+#: squirrelmail/src/printer_friendly_bottom.php:113
+#: squirrelmail/functions/mailbox_display.php:805
 msgid "Date"
 msgstr "úàøéê"
 
-#: squirrelmail/src/compose.php:595
+#: squirrelmail/src/compose.php:628
 msgid "Draft Saved"
 msgstr "èéåèä ðùîøä"
 
-#: squirrelmail/src/compose.php:598
+#: squirrelmail/src/compose.php:631
 msgid "Your Message has been sent"
 msgstr "äåãòúê ðùìçä"
 
-#: squirrelmail/plugins/listcommands/mailout.php:50
-#: squirrelmail/src/compose.php:614 squirrelmail/src/read_body.php:808
+#: squirrelmail/src/compose.php:650 squirrelmail/src/read_body.php:872
+#: squirrelmail/plugins/listcommands/mailout.php:54
 msgid "From:"
 msgstr "îàú:"
 
-#: squirrelmail/src/compose.php:642 squirrelmail/src/download.php:110
-#: squirrelmail/src/read_body.php:220 squirrelmail/src/read_body.php:825
+#: squirrelmail/src/compose.php:677 squirrelmail/src/download.php:183
+#: squirrelmail/src/read_body.php:220 squirrelmail/src/read_body.php:887
 msgid "To:"
 msgstr "àì:"
 
-#: squirrelmail/src/compose.php:650
+#: squirrelmail/src/compose.php:684
 msgid "CC:"
 msgstr "äòú÷éí:"
 
-#: squirrelmail/src/compose.php:658
+#: squirrelmail/src/compose.php:691
 msgid "BCC:"
 msgstr "äòú÷éí òéååøéí:"
 
-#: squirrelmail/src/compose.php:665 squirrelmail/src/download.php:103
-#: squirrelmail/src/read_body.php:221 squirrelmail/src/read_body.php:779
+#: squirrelmail/src/compose.php:719 squirrelmail/src/download.php:176
+#: squirrelmail/src/read_body.php:221 squirrelmail/src/read_body.php:847
 msgid "Subject:"
 msgstr "ðåùà:"
 
-#: squirrelmail/src/compose.php:727 squirrelmail/src/compose.php:818
+#: squirrelmail/src/compose.php:762 squirrelmail/src/compose.php:858
 msgid "Send"
 msgstr "ùìç"
 
-#: squirrelmail/src/compose.php:733
+#: squirrelmail/src/compose.php:769
 msgid "Attach:"
 msgstr "öøó:"
 
-#: squirrelmail/src/compose.php:738 squirrelmail/src/options_order.php:126
+#: squirrelmail/src/compose.php:772 squirrelmail/src/options_order.php:132
 msgid "Add"
 msgstr "äåñó"
 
-#: squirrelmail/src/compose.php:757
+#: squirrelmail/src/compose.php:791
 msgid "Delete selected attachments"
 msgstr "îç÷ îöåøôéí ðáçøéí"
 
-#: squirrelmail/src/compose.php:787 squirrelmail/src/read_body.php:854
+#: squirrelmail/src/compose.php:824 squirrelmail/src/read_body.php:913
 msgid "Priority"
 msgstr "òãéôåú"
 
+#: squirrelmail/src/compose.php:825 squirrelmail/src/read_body.php:622
+#: squirrelmail/plugins/calendar/functions.php:99
 #: squirrelmail/plugins/administrator/defines.php:201
-#: squirrelmail/plugins/calendar/functions.php:98
-#: squirrelmail/src/compose.php:788 squirrelmail/src/read_body.php:626
 msgid "High"
 msgstr "âáåää"
 
-#: squirrelmail/plugins/calendar/functions.php:97
-#: squirrelmail/src/compose.php:789 squirrelmail/src/read_body.php:639
+#: squirrelmail/src/compose.php:826 squirrelmail/src/read_body.php:635
+#: squirrelmail/plugins/calendar/functions.php:98
 msgid "Normal"
 msgstr "øâéìä"
 
+#: squirrelmail/src/compose.php:827 squirrelmail/src/read_body.php:628
 #: squirrelmail/plugins/administrator/defines.php:198
-#: squirrelmail/src/compose.php:790 squirrelmail/src/read_body.php:632
 msgid "Low"
 msgstr "ðîåëä"
 
-#: squirrelmail/src/compose.php:796
+#: squirrelmail/src/compose.php:833
 msgid "Receipt"
 msgstr "÷áìä"
 
-#: squirrelmail/src/compose.php:798
+#: squirrelmail/src/compose.php:835
 msgid "On read"
 msgstr "á÷øéàä"
 
-#: squirrelmail/src/compose.php:800
+#: squirrelmail/src/compose.php:837
 msgid "On Delivery"
 msgstr "áùìéçä"
 
-#: squirrelmail/src/compose.php:805
-#: squirrelmail/src/options_identities.php:329
+#: squirrelmail/src/compose.php:845
+#: squirrelmail/src/options_identities.php:314
 #: squirrelmail/src/options_personal.php:99
 msgid "Signature"
 msgstr "çúéîä"
 
-#: squirrelmail/functions/page_header.php:136 squirrelmail/src/compose.php:808
-#: squirrelmail/src/compose.php:812 squirrelmail/src/compose.php:816
+#: squirrelmail/src/compose.php:848 squirrelmail/src/compose.php:852
+#: squirrelmail/src/compose.php:856 squirrelmail/functions/page_header.php:218
 msgid "Addresses"
 msgstr "ëúåáåú"
 
-#: squirrelmail/src/compose.php:821
+#: squirrelmail/src/compose.php:861
 msgid "Save Draft"
 msgstr "ùîåø èéåèä"
 
-#: squirrelmail/src/compose.php:840
+#: squirrelmail/src/compose.php:880
 msgid "You have not filled in the \"To:\" field."
 msgstr "ìà îéìàú àú ùãä ä-\"àì\""
 
-#: squirrelmail/src/compose.php:932
+#: squirrelmail/src/compose.php:972
 msgid "said"
 msgstr "àîø"
 
-#: squirrelmail/src/compose.php:935
+#: squirrelmail/src/compose.php:975
 msgid "quote"
 msgstr "öéèåè"
 
-#: squirrelmail/src/compose.php:935
+#: squirrelmail/src/compose.php:975
 msgid "who"
 msgstr "îé"
 
-#: squirrelmail/src/download.php:31
-msgid "Viewing a text attachment"
-msgstr "îöéâ è÷ñè îöåøó"
-
-#: squirrelmail/src/download.php:34 squirrelmail/src/download.php:36
-#: squirrelmail/src/download.php:72 squirrelmail/src/image.php:31
-#: squirrelmail/src/image.php:35 squirrelmail/src/read_body.php:438
-#: squirrelmail/src/vcard.php:35 squirrelmail/src/vcard.php:39
+#: squirrelmail/src/download.php:32 squirrelmail/src/download.php:34
+#: squirrelmail/src/download.php:102 squirrelmail/src/image.php:26
+#: squirrelmail/src/image.php:30 squirrelmail/src/read_body.php:437
+#: squirrelmail/src/vcard.php:36 squirrelmail/src/vcard.php:40
 msgid "View message"
 msgstr "äöâ äåãòä"
 
-#: squirrelmail/functions/mime.php:788 squirrelmail/src/download.php:41
-#: squirrelmail/src/download.php:77 squirrelmail/src/image.php:44
-#: squirrelmail/src/vcard.php:196
+#: squirrelmail/src/download.php:43
+msgid "Viewing a text attachment"
+msgstr "îöéâ è÷ñè îöåøó"
+
+#: squirrelmail/src/download.php:50 squirrelmail/src/download.php:109
+#: squirrelmail/src/image.php:49 squirrelmail/src/vcard.php:213
+#: squirrelmail/functions/mime.php:863
+#: squirrelmail/plugins/abook_take/setup.php:91
 msgid "Download this as a file"
 msgstr "äåøã ë÷åáõ"
 
-#: squirrelmail/src/download.php:70
+#: squirrelmail/src/download.php:101
 msgid "Viewing a message attachment"
 msgstr "îöéâ îöåøó ìäåãòä"
 
-#: squirrelmail/plugins/calendar/event_create.php:112
-#: squirrelmail/plugins/calendar/event_delete.php:32
-#: squirrelmail/plugins/calendar/event_edit.php:35
-#: squirrelmail/plugins/calendar/event_edit.php:93
-#: squirrelmail/plugins/calendar/event_edit.php:106
-#: squirrelmail/src/download.php:116 squirrelmail/src/read_body.php:816
+#: squirrelmail/src/download.php:137
+msgid "Save to:"
+msgstr "äòáø àì:"
+
+#: squirrelmail/src/download.php:141
+msgid "Extract"
+msgstr ""
+
+#: squirrelmail/src/download.php:156 squirrelmail/src/left_main.php:74
+#: squirrelmail/src/search.php:329 squirrelmail/functions/imap_search.php:217
+#: squirrelmail/functions/mailbox_display.php:717
+#: squirrelmail/functions/page_header.php:192
+#: squirrelmail/plugins/mail_fetch/options.php:172
+#: squirrelmail/plugins/mail_fetch/options.php:290
+#: squirrelmail/plugins/delete_move_next/setup.php:219
+msgid "INBOX"
+msgstr "ãåàø ðëðñ"
+
+#: squirrelmail/src/download.php:189 squirrelmail/src/read_body.php:880
+#: squirrelmail/plugins/calendar/event_create.php:125
+#: squirrelmail/plugins/calendar/event_delete.php:35
+#: squirrelmail/plugins/calendar/event_edit.php:37
+#: squirrelmail/plugins/calendar/event_edit.php:103
+#: squirrelmail/plugins/calendar/event_edit.php:127
 msgid "Date:"
 msgstr "úàøéê:"
 
-#: squirrelmail/src/download.php:124
+#: squirrelmail/src/download.php:197 squirrelmail/src/read_body.php:895
 msgid "Cc:"
 msgstr "äòú÷éí:"
 
-#: squirrelmail/src/download.php:132
+#: squirrelmail/src/download.php:205 squirrelmail/src/read_body.php:905
 msgid "Bcc:"
 msgstr "äòú÷éí òéååøéí:"
 
-#: squirrelmail/src/download.php:149 squirrelmail/src/read_body.php:590
+#: squirrelmail/src/download.php:224 squirrelmail/src/read_body.php:586
 msgid "more"
 msgstr "éåúø"
 
-#: squirrelmail/src/download.php:150 squirrelmail/src/read_body.php:591
+#: squirrelmail/src/download.php:225 squirrelmail/src/read_body.php:587
 msgid "less"
 msgstr "ôçåú"
 
-#: squirrelmail/src/folders_create.php:29
-msgid "Illegal folder name.  Please select a different name."
-msgstr "ùí úé÷éä ìà çå÷é. àðà áçø ùí àçø."
-
-#: squirrelmail/src/folders_create.php:29
-#: squirrelmail/src/folders_delete.php:29
-#: squirrelmail/src/folders_rename_getname.php:23
-msgid "Click here to go back"
-msgstr "ìçõ ëàï ìçæåø àçåøä"
-
-#: squirrelmail/src/folders_delete.php:29
-msgid "You have not selected a folder to delete. Please do so."
-msgstr "ìà áçøú úé÷éä ìîçé÷ä."
-
-#: squirrelmail/functions/page_header.php:138 squirrelmail/src/folders.php:29
-#: squirrelmail/src/left_main.php:241
+#: squirrelmail/src/folders.php:28 squirrelmail/src/left_main.php:754
+#: squirrelmail/functions/page_header.php:220
 msgid "Folders"
 msgstr "úé÷éåú"
 
-#: squirrelmail/src/folders.php:42
+#: squirrelmail/src/folders.php:37
 msgid "Subscribed successfully!"
 msgstr "ðøùîú áäöìçä!"
 
-#: squirrelmail/src/folders.php:44
+#: squirrelmail/src/folders.php:39
 msgid "Unsubscribed successfully!"
 msgstr "áèìú äøùîä áäöìçä!"
 
-#: squirrelmail/src/folders.php:46
+#: squirrelmail/src/folders.php:41
 msgid "Deleted folder successfully!"
 msgstr "úé÷éä ðîç÷ä!"
 
-#: squirrelmail/src/folders.php:48
+#: squirrelmail/src/folders.php:43
 msgid "Created folder successfully!"
 msgstr "äúé÷éä ðåöøä!"
 
-#: squirrelmail/src/folders.php:50
+#: squirrelmail/src/folders.php:45
 msgid "Renamed successfully!"
 msgstr "äùí ùåðä áäöìçä!"
 
-#: squirrelmail/src/folders.php:53 squirrelmail/src/left_main.php:280
+#: squirrelmail/src/folders.php:51 squirrelmail/src/left_main.php:793
 msgid "refresh folder list"
 msgstr "øòðï øùéîú úé÷éåú"
 
-#: squirrelmail/src/folders.php:65
+#: squirrelmail/src/folders.php:64
 msgid "Create Folder"
 msgstr "öåø úé÷éä"
 
-#: squirrelmail/src/folders.php:70
+#: squirrelmail/src/folders.php:71
 msgid "as a subfolder of"
 msgstr "ëúú-úé÷éä ùì"
 
-#: squirrelmail/src/folders.php:74 squirrelmail/src/folders.php:76
+#: squirrelmail/src/folders.php:75 squirrelmail/src/folders.php:77
 msgid "None"
 msgstr "ëìåí"
 
-#: squirrelmail/src/folders.php:98
+#: squirrelmail/src/folders.php:102
 msgid "Let this folder contain subfolders"
 msgstr "àôùø ìúé÷éä æå ìäëéì úú-úé÷éåú"
 
-#: squirrelmail/src/folders.php:101
+#: squirrelmail/src/folders.php:105
 msgid "Create"
 msgstr "öåø"
 
-#: squirrelmail/src/folders.php:136
+#: squirrelmail/src/folders.php:141
 msgid "Rename a Folder"
 msgstr "ùðä ùí úé÷éä"
 
-#: squirrelmail/src/folders.php:142 squirrelmail/src/folders.php:179
+#: squirrelmail/src/folders.php:149 squirrelmail/src/folders.php:190
 msgid "Select a folder"
 msgstr "áçø úé÷éä"
 
-#: squirrelmail/src/folders.php:160
+#: squirrelmail/src/folders.php:168
 msgid "Rename"
 msgstr "ùðä ùí"
 
-#: squirrelmail/src/folders.php:164 squirrelmail/src/folders.php:200
+#: squirrelmail/src/folders.php:172 squirrelmail/src/folders.php:212
 msgid "No folders found"
 msgstr "ìà ðîöàå úé÷éåú"
 
-#: squirrelmail/src/folders.php:172
+#: squirrelmail/src/folders.php:182
 msgid "Delete Folder"
 msgstr "îç÷ úé÷éä"
 
-#: squirrelmail/functions/mailbox_display.php:693
-#: squirrelmail/plugins/filters/options.php:189
-#: squirrelmail/plugins/mail_fetch/options.php:163
-#: squirrelmail/plugins/mail_fetch/options.php:170
-#: squirrelmail/src/folders.php:196 squirrelmail/src/options_highlight.php:76
-#: squirrelmail/src/options_identities.php:341
-#: squirrelmail/src/read_body.php:691
+#: squirrelmail/src/folders.php:208 squirrelmail/src/options_highlight.php:101
+#: squirrelmail/src/options_identities.php:328
+#: squirrelmail/src/read_body.php:729
+#: squirrelmail/functions/mailbox_display.php:739
+#: squirrelmail/plugins/filters/options.php:196
+#: squirrelmail/plugins/mail_fetch/options.php:214
+#: squirrelmail/plugins/mail_fetch/options.php:221
 msgid "Delete"
 msgstr "îç÷"
 
-#: squirrelmail/plugins/listcommands/setup.php:34
-#: squirrelmail/src/folders.php:207 squirrelmail/src/folders.php:226
+#: squirrelmail/src/folders.php:223 squirrelmail/src/folders.php:245
+#: squirrelmail/plugins/listcommands/setup.php:36
 msgid "Unsubscribe"
 msgstr "áèì äøùîä"
 
-#: squirrelmail/plugins/listcommands/setup.php:33
-#: squirrelmail/src/folders.php:207 squirrelmail/src/folders.php:267
+#: squirrelmail/src/folders.php:223 squirrelmail/src/folders.php:286
+#: squirrelmail/plugins/listcommands/setup.php:35
 msgid "Subscribe"
 msgstr "äøùí"
 
-#: squirrelmail/src/folders.php:230
+#: squirrelmail/src/folders.php:249
 msgid "No folders were found to unsubscribe from!"
 msgstr "ìà ðîöàå úé÷éåú ìáéèåì äøùîä îäï!"
 
-#: squirrelmail/src/folders.php:270
+#: squirrelmail/src/folders.php:289
 msgid "No folders were found to subscribe to!"
 msgstr "ìà ðîöàå úé÷éåú ìäøùí àìéäï!"
 
-#: squirrelmail/src/folders_rename_getname.php:23
+#: squirrelmail/src/folders_create.php:29
+msgid "Illegal folder name.  Please select a different name."
+msgstr "ùí úé÷éä ìà çå÷é. àðà áçø ùí àçø."
+
+#: squirrelmail/src/folders_create.php:29
+#: squirrelmail/src/folders_delete.php:29
+#: squirrelmail/src/folders_rename_getname.php:24
+msgid "Click here to go back"
+msgstr "ìçõ ëàï ìçæåø àçåøä"
+
+#: squirrelmail/src/folders_delete.php:29
+msgid "You have not selected a folder to delete. Please do so."
+msgstr "ìà áçøú úé÷éä ìîçé÷ä."
+
+#: squirrelmail/src/folders_rename_getname.php:24
 msgid "You have not selected a folder to rename. Please do so."
 msgstr "ìà áçøú úé÷éä àùø áøöåðê ìùðåú àú ùîä."
 
-#: squirrelmail/src/folders_rename_getname.php:48
+#: squirrelmail/src/folders_rename_getname.php:50
 msgid "Rename a folder"
 msgstr "ùéðåé ùí úé÷éä"
 
-#: squirrelmail/src/folders_rename_getname.php:52
+#: squirrelmail/src/folders_rename_getname.php:55
 msgid "New name:"
 msgstr "ùí çãù:"
 
-#: squirrelmail/functions/options.php:414
-#: squirrelmail/plugins/filters/options.php:173
-#: squirrelmail/plugins/newmail/newmail_opt.php:146
+#: squirrelmail/src/folders_rename_getname.php:62
+#: squirrelmail/src/options_highlight.php:394
+#: squirrelmail/functions/options.php:419
+#: squirrelmail/plugins/filters/options.php:174
 #: squirrelmail/plugins/translate/options.php:160
-#: squirrelmail/src/folders_rename_getname.php:59
-#: squirrelmail/src/options_highlight.php:352
+#: squirrelmail/plugins/newmail/newmail_opt.php:155
 msgid "Submit"
 msgstr "ùìç"
 
-#: squirrelmail/functions/page_header.php:144
-#: squirrelmail/plugins/listcommands/setup.php:37 squirrelmail/src/help.php:91
+#: squirrelmail/src/help.php:90 squirrelmail/functions/page_header.php:226
+#: squirrelmail/plugins/listcommands/setup.php:39
 msgid "Help"
 msgstr "òæøä"
 
-#: squirrelmail/src/help.php:131
+#: squirrelmail/src/help.php:129
 #, c-format
 msgid ""
 "The help has not been translated to %s.  It will be displayed in English "
 "instead."
 msgstr "äòæøä òãééï ìà úåøâîä ì %s. äéà úåöâ áàðâìéú áî÷åí æàú."
 
-#: squirrelmail/src/help.php:137
+#: squirrelmail/src/help.php:135
 msgid "Some or all of the help documents are not present!"
 msgstr "çì÷ àå ëì îîñîëé äòæøä ìà ðîöàå!"
 
@@ -546,85 +580,80 @@ msgstr "
 msgid "Table of Contents"
 msgstr "úåëï òðééðéí"
 
-#: squirrelmail/functions/mailbox_display.php:924
-#: squirrelmail/functions/mailbox_display.php:927
-#: squirrelmail/functions/mailbox_display.php:930
-#: squirrelmail/plugins/delete_move_next/setup.php:166
-#: squirrelmail/plugins/delete_move_next/setup.php:168
 #: squirrelmail/src/help.php:185 squirrelmail/src/help.php:189
-#: squirrelmail/src/read_body.php:725 squirrelmail/src/read_body.php:727
+#: squirrelmail/src/read_body.php:775 squirrelmail/src/read_body.php:777
+#: squirrelmail/functions/mailbox_display.php:978
+#: squirrelmail/functions/mailbox_display.php:981
+#: squirrelmail/functions/mailbox_display.php:984
+#: squirrelmail/plugins/delete_move_next/setup.php:167
+#: squirrelmail/plugins/delete_move_next/setup.php:169
 msgid "Previous"
 msgstr "ä÷åãí"
 
-#: squirrelmail/functions/mailbox_display.php:925
-#: squirrelmail/functions/mailbox_display.php:928
-#: squirrelmail/functions/mailbox_display.php:931
-#: squirrelmail/plugins/delete_move_next/setup.php:171
-#: squirrelmail/plugins/delete_move_next/setup.php:173
 #: squirrelmail/src/help.php:193 squirrelmail/src/help.php:196
-#: squirrelmail/src/read_body.php:731 squirrelmail/src/read_body.php:733
+#: squirrelmail/src/read_body.php:781 squirrelmail/src/read_body.php:783
+#: squirrelmail/functions/mailbox_display.php:979
+#: squirrelmail/functions/mailbox_display.php:982
+#: squirrelmail/functions/mailbox_display.php:985
+#: squirrelmail/plugins/delete_move_next/setup.php:172
+#: squirrelmail/plugins/delete_move_next/setup.php:174
 msgid "Next"
 msgstr "äáà"
 
-#: squirrelmail/src/help.php:219
+#: squirrelmail/src/help.php:217
 msgid "Top"
 msgstr "ìîòìä"
 
-#: squirrelmail/src/image.php:26
+#: squirrelmail/src/image.php:42
 msgid "Viewing an image attachment"
 msgstr "îöéâ úîåðä îöåøôú"
 
-#: squirrelmail/functions/imap_search.php:202
-#: squirrelmail/functions/mailbox_display.php:675
-#: squirrelmail/functions/page_header.php:109
-#: squirrelmail/plugins/delete_move_next/setup.php:218
-#: squirrelmail/plugins/mail_fetch/options.php:137
-#: squirrelmail/plugins/mail_fetch/options.php:214
-#: squirrelmail/src/left_main.php:73 squirrelmail/src/search.php:312
-msgid "INBOX"
-msgstr "ãåàø ðëðñ"
-
-#: squirrelmail/src/left_main.php:97
+#: squirrelmail/src/left_main.php:98 squirrelmail/src/left_main.php:251
+#: squirrelmail/src/left_main.php:326
 msgid "purge"
 msgstr "îç÷"
 
-#: squirrelmail/src/left_main.php:274
+#: squirrelmail/src/left_main.php:787
 msgid "Last Refresh"
 msgstr "øåòðï ìàçøåðä"
 
-#: squirrelmail/src/login.php:102 squirrelmail/src/login.php:156
+#: squirrelmail/src/left_main.php:867
+msgid "Save folder tree"
+msgstr ""
+
+#: squirrelmail/src/login.php:103 squirrelmail/src/login.php:171
 msgid "Login"
 msgstr "ëðéñä"
 
-#: squirrelmail/functions/display_messages.php:143
-#: squirrelmail/src/login.php:124
+#: squirrelmail/src/login.php:133
+#: squirrelmail/functions/display_messages.php:164
 #, c-format
 msgid "%s Logo"
 msgstr "ìåâå ùì %s"
 
-#: squirrelmail/functions/display_messages.php:146
-#: squirrelmail/src/login.php:127
+#: squirrelmail/src/login.php:136
+#: squirrelmail/functions/display_messages.php:167
 #, c-format
 msgid "SquirrelMail version %s"
 msgstr "SquirrelMail âéøñà %s"
 
-#: squirrelmail/functions/display_messages.php:147
-#: squirrelmail/src/login.php:128
+#: squirrelmail/src/login.php:137
+#: squirrelmail/functions/display_messages.php:168
 msgid "By the SquirrelMail Development Team"
 msgstr "ò\"é öååú äôéúåç ùì SquirrelMail"
 
-#: squirrelmail/src/login.php:134
+#: squirrelmail/src/login.php:141
 #, c-format
 msgid "%s Login"
 msgstr "ëðéñä ì-%s"
 
-#: squirrelmail/src/login.php:138
+#: squirrelmail/src/login.php:149
 msgid "Name:"
 msgstr "ùí îùúîù:"
 
-#: squirrelmail/plugins/mail_fetch/options.php:126
-#: squirrelmail/plugins/mail_fetch/options.php:202
-#: squirrelmail/src/login.php:144
+#: squirrelmail/src/login.php:157
+#: squirrelmail/plugins/mail_fetch/options.php:157
+#: squirrelmail/plugins/mail_fetch/options.php:274
 msgid "Password:"
 msgstr "ñéñîà:"
 
@@ -632,12 +661,95 @@ msgstr "
 msgid "<No subject>"
 msgstr ">ììà ðåùà<"
 
-#: squirrelmail/src/move_messages.php:163
-#: squirrelmail/src/move_messages.php:207
-#: squirrelmail/src/move_messages.php:236
+#: squirrelmail/src/move_messages.php:172
+#: squirrelmail/src/move_messages.php:225
+#: squirrelmail/src/move_messages.php:254
 msgid "No messages were selected."
 msgstr "ìà ðáçøå äåãòåú."
 
+#: squirrelmail/src/options.php:136 squirrelmail/src/options.php:285
+msgid "Personal Information"
+msgstr "îéãò àéùé"
+
+#: squirrelmail/src/options.php:142 squirrelmail/src/options.php:293
+msgid "Display Preferences"
+msgstr "àôùøåéåú úöåâä"
+
+#: squirrelmail/src/options.php:148 squirrelmail/src/options.php:301
+#: squirrelmail/src/options_highlight.php:64
+msgid "Message Highlighting"
+msgstr "äãâùú äåãòåú"
+
+#: squirrelmail/src/options.php:154 squirrelmail/src/options.php:309
+msgid "Folder Preferences"
+msgstr "àôùøåéåú úé÷éä"
+
+#: squirrelmail/src/options.php:160 squirrelmail/src/options.php:317
+#: squirrelmail/src/options_order.php:32
+msgid "Index Order"
+msgstr "ñéãåø"
+
+#: squirrelmail/src/options.php:200 squirrelmail/src/options_highlight.php:64
+#: squirrelmail/src/options_identities.php:57
+#: squirrelmail/src/options_order.php:32
+#: squirrelmail/functions/page_header.php:222
+#: squirrelmail/plugins/filters/options.php:71
+#: squirrelmail/plugins/translate/options.php:94
+#: squirrelmail/plugins/newmail/newmail_opt.php:38
+msgid "Options"
+msgstr "àôùøåéåú"
+
+#: squirrelmail/src/options.php:268
+msgid "Successfully Saved Options"
+msgstr "àôùøåéåú ðùîøå áäöìçä"
+
+#: squirrelmail/src/options.php:273
+msgid "Refresh Folder List"
+msgstr "øòðï øùéîú úé÷éåú"
+
+#: squirrelmail/src/options.php:275
+msgid "Refresh Page"
+msgstr "øòðï ãó"
+
+#: squirrelmail/src/options.php:287
+msgid ""
+"This contains personal information about yourself such as your name, your "
+"email address, etc."
+msgstr "ãó æä îëéì äâãøåú àéùéåú ìâáé òöîê ëâåï, ùîê, ëúåáú ãåà\"ì ùìê åë\"å..."
+
+#: squirrelmail/src/options.php:295
+msgid ""
+"You can change the way that SquirrelMail looks and displays information to "
+"you, such as the colors, the language, and other settings."
+msgstr ""
+"áéëåìúê ìùðåú àú äâãøåú äúöåâä ùì úéáú äãåàø ùìê ëâåï öáòéí, ùôä, åòåã..."
+
+#: squirrelmail/src/options.php:303
+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 ""
+"áéëåìúê ìöáåò äåãòåú îñåéîåú áúéáú äãåàø ùìê ìôé ÷øéèøéåðéí ùåðéí (ëâåï ùí "
+"ä"
+"ùåìç, ðåùà ääåãòä åë\"å). àôùøåú æå òåæøú ìäáçéï áãåàø àùø îâéò îîëåúá "
+"î"
+"ñåéí, îëéì ðåùà îñåééí åòåã..."
+
+#: squirrelmail/src/options.php:311
+msgid ""
+"These settings change the way your folders are displayed and manipulated."
+msgstr "äâãøåú àìå îùðåú àú úöåâú äúé÷éåú åäöåøä áä äï îðåäìåú."
+
+#: squirrelmail/src/options.php:319
+msgid ""
+"The order of the message index can be rearranged and changed to contain the "
+"headers in any order you want."
+msgstr ""
+"äöåøä áä äåãòåú îñåãøåú åîãôñåú ðéúðú ìñéãåø îçãù åìùéðåé ëê ùéëéìå àú "
+"ä"
+"ëåúøåú ùáøöåðê ìøàåú."
+
 #: squirrelmail/src/options_display.php:33
 msgid "General Display Options"
 msgstr "äâãøåú úöåâä - ëììé"
@@ -646,9 +758,9 @@ msgstr "
 msgid "Theme"
 msgstr "ðåùà"
 
-#: squirrelmail/plugins/administrator/defines.php:42
 #: squirrelmail/src/options_display.php:52
 #: squirrelmail/src/options_display.php:81
+#: squirrelmail/plugins/administrator/defines.php:42
 msgid "Default"
 msgstr "áøéøú îçãì"
 
@@ -805,8 +917,8 @@ msgstr "
 msgid "Do not use Trash"
 msgstr "àì úùúîù áñì îéçæåø"
 
-#: squirrelmail/plugins/administrator/defines.php:135
 #: squirrelmail/src/options_folder.php:67
+#: squirrelmail/plugins/administrator/defines.php:135
 msgid "Trash Folder"
 msgstr "ñì îéçæåø"
 
@@ -814,8 +926,8 @@ msgstr "
 msgid "Do not use Sent"
 msgstr "àì úùúîù áãåàø éåöà"
 
-#: squirrelmail/plugins/administrator/defines.php:138
 #: squirrelmail/src/options_folder.php:78
+#: squirrelmail/plugins/administrator/defines.php:138
 msgid "Sent Folder"
 msgstr "úé÷éú ãåàø éåöà"
 
@@ -823,8 +935,8 @@ msgstr "
 msgid "Do not use Drafts"
 msgstr "àì úùúîù áèéåèä"
 
-#: squirrelmail/plugins/administrator/defines.php:141
 #: squirrelmail/src/options_folder.php:89
+#: squirrelmail/plugins/administrator/defines.php:141
 msgid "Draft Folder"
 msgstr "úé÷éú èéåèåú"
 
@@ -844,8 +956,8 @@ msgstr "
 msgid "Right"
 msgstr "éîéï"
 
-#: squirrelmail/plugins/administrator/defines.php:45
 #: squirrelmail/src/options_folder.php:111
+#: squirrelmail/plugins/administrator/defines.php:45
 msgid "pixels"
 msgstr "ôé÷ñìéí"
 
@@ -873,18 +985,18 @@ msgstr "
 msgid "Enable Unread Message Notification"
 msgstr "àôùø äåãòä òì äåãòåú çãùåú"
 
-#: squirrelmail/plugins/administrator/defines.php:162
 #: squirrelmail/src/options_folder.php:145
+#: squirrelmail/plugins/administrator/defines.php:162
 msgid "No Notification"
 msgstr "ììà äåãòä"
 
-#: squirrelmail/plugins/administrator/defines.php:163
 #: squirrelmail/src/options_folder.php:146
+#: squirrelmail/plugins/administrator/defines.php:163
 msgid "Only INBOX"
 msgstr "ø÷ áãåàø ðëðñ"
 
-#: squirrelmail/plugins/administrator/defines.php:164
 #: squirrelmail/src/options_folder.php:147
+#: squirrelmail/plugins/administrator/defines.php:164
 msgid "All Folders"
 msgstr "ëì äúé÷éåú"
 
@@ -892,13 +1004,13 @@ msgstr "
 msgid "Unread Message Notification Type"
 msgstr "ñåâ äåãòä òì äåãòä çãùä"
 
-#: squirrelmail/plugins/administrator/defines.php:167
 #: squirrelmail/src/options_folder.php:155
+#: squirrelmail/plugins/administrator/defines.php:167
 msgid "Only Unseen"
 msgstr "ø÷ ìà ðøàä"
 
-#: squirrelmail/plugins/administrator/defines.php:168
 #: squirrelmail/src/options_folder.php:156
+#: squirrelmail/plugins/administrator/defines.php:168
 msgid "Unseen and Total"
 msgstr "ìà ðøàä åñä\"ë"
 
@@ -930,178 +1042,163 @@ msgstr "24 
 msgid "Memory Search"
 msgstr "çéôåù áæëøåï"
 
-#: squirrelmail/plugins/sent_subfolders/setup.php:102
 #: squirrelmail/src/options_folder.php:193
+#: squirrelmail/plugins/sent_subfolders/setup.php:102
 msgid "Disabled"
 msgstr "îáåèì"
 
-#: squirrelmail/functions/page_header.php:140
-#: squirrelmail/plugins/filters/options.php:70
-#: squirrelmail/plugins/newmail/newmail_opt.php:37
-#: squirrelmail/plugins/translate/options.php:94
-#: squirrelmail/src/options.php:198 squirrelmail/src/options_highlight.php:62
-#: squirrelmail/src/options_identities.php:44
-#: squirrelmail/src/options_order.php:31
-msgid "Options"
-msgstr "àôùøåéåú"
-
-#: squirrelmail/src/options.php:146 squirrelmail/src/options.php:297
-#: squirrelmail/src/options_highlight.php:62
-msgid "Message Highlighting"
-msgstr "äãâùú äåãòåú"
-
-#: squirrelmail/plugins/filters/options.php:96
-#: squirrelmail/src/options_highlight.php:66
+#: squirrelmail/src/options_highlight.php:72
+#: squirrelmail/plugins/filters/options.php:100
 msgid "New"
 msgstr "çãù"
 
-#: squirrelmail/plugins/filters/options.php:97
-#: squirrelmail/plugins/filters/spamoptions.php:159
-#: squirrelmail/plugins/mail_fetch/fetch.php:225
-#: squirrelmail/src/options_highlight.php:67
+#: squirrelmail/src/options_highlight.php:73
+#: squirrelmail/plugins/filters/options.php:101
+#: squirrelmail/plugins/filters/spamoptions.php:180
+#: squirrelmail/plugins/mail_fetch/fetch.php:283
 msgid "Done"
 msgstr "ñééí"
 
-#: squirrelmail/plugins/filters/options.php:187
-#: squirrelmail/plugins/filters/spamoptions.php:158
-#: squirrelmail/src/options_highlight.php:74
+#: squirrelmail/src/options_highlight.php:89
+#: squirrelmail/src/options_highlight.php:378
+#: squirrelmail/plugins/filters/options.php:131
+msgid "To or Cc"
+msgstr "àì àå äòú÷éí"
+
+#: squirrelmail/src/options_highlight.php:92
+msgid "subject"
+msgstr "ðåùà"
+
+#: squirrelmail/src/options_highlight.php:99
+#: squirrelmail/plugins/filters/options.php:191
+#: squirrelmail/plugins/filters/spamoptions.php:179
 msgid "Edit"
 msgstr "òøåê"
 
-#: squirrelmail/src/options_highlight.php:87
+#: squirrelmail/src/options_highlight.php:115
 msgid "No highlighting is defined"
 msgstr "ìà äåâãøå äãâùåú"
 
-#: squirrelmail/src/options_highlight.php:259
+#: squirrelmail/src/options_highlight.php:308
 msgid "Identifying name"
 msgstr "ùí îúàø"
 
-#: squirrelmail/src/options_highlight.php:273
+#: squirrelmail/src/options_highlight.php:321
 msgid "Color"
 msgstr "öáò"
 
-#: squirrelmail/src/options_highlight.php:277
+#: squirrelmail/src/options_highlight.php:324
 msgid "Dark Blue"
 msgstr "ëçåì ëää"
 
-#: squirrelmail/src/options_highlight.php:278
+#: squirrelmail/src/options_highlight.php:325
 msgid "Dark Green"
 msgstr "éøå÷ ëää"
 
-#: squirrelmail/src/options_highlight.php:279
+#: squirrelmail/src/options_highlight.php:326
 msgid "Dark Yellow"
 msgstr "öäåá ëää"
 
-#: squirrelmail/src/options_highlight.php:280
+#: squirrelmail/src/options_highlight.php:327
 msgid "Dark Cyan"
 msgstr "úëìú ëää"
 
-#: squirrelmail/src/options_highlight.php:281
+#: squirrelmail/src/options_highlight.php:328
 msgid "Dark Magenta"
 msgstr "àãåí ëää"
 
-#: squirrelmail/src/options_highlight.php:282
+#: squirrelmail/src/options_highlight.php:329
 msgid "Light Blue"
 msgstr "ëçåì áäéø"
 
-#: squirrelmail/src/options_highlight.php:283
+#: squirrelmail/src/options_highlight.php:330
 msgid "Light Green"
 msgstr "éøå÷ áäéø"
 
-#: squirrelmail/src/options_highlight.php:284
+#: squirrelmail/src/options_highlight.php:331
 msgid "Light Yellow"
 msgstr "öäåá áäéø"
 
-#: squirrelmail/src/options_highlight.php:285
+#: squirrelmail/src/options_highlight.php:332
 msgid "Light Cyan"
 msgstr "úëìú áäéø"
 
-#: squirrelmail/src/options_highlight.php:286
+#: squirrelmail/src/options_highlight.php:333
 msgid "Light Magenta"
 msgstr "àãåí áäéø"
 
-#: squirrelmail/src/options_highlight.php:287
+#: squirrelmail/src/options_highlight.php:334
 msgid "Dark Gray"
 msgstr "àôåø ëää"
 
-#: squirrelmail/src/options_highlight.php:288
+#: squirrelmail/src/options_highlight.php:335
 msgid "Medium Gray"
 msgstr "àôåø áéðåðé"
 
-#: squirrelmail/src/options_highlight.php:289
+#: squirrelmail/src/options_highlight.php:336
 msgid "Light Gray"
 msgstr "àôåø áäéø"
 
-#: squirrelmail/src/options_highlight.php:290
+#: squirrelmail/src/options_highlight.php:337
 msgid "White"
 msgstr "ìáï"
 
-#: squirrelmail/src/options_highlight.php:292
+#: squirrelmail/src/options_highlight.php:339
 msgid "Other:"
 msgstr "àçø:"
 
-#: squirrelmail/src/options_highlight.php:294
+#: squirrelmail/src/options_highlight.php:341
 msgid "Ex: 63aa7f"
 msgstr "ìãåâîà: 63aa7f"
 
-#: squirrelmail/plugins/filters/options.php:126
-#: squirrelmail/src/options_highlight.php:336
-msgid "To or Cc"
-msgstr "àì àå äòú÷éí"
-
-#: squirrelmail/src/options_highlight.php:341
+#: squirrelmail/src/options_highlight.php:383
 msgid "Matches"
 msgstr "äúàí ìè÷ñè"
 
-#: squirrelmail/src/options_identities.php:44
+#: squirrelmail/src/options_identities.php:47
+#, c-format
+msgid "Alternate Identity %d"
+msgstr "æäåú îùðéú %d"
+
+#: squirrelmail/src/options_identities.php:57
 msgid "Advanced Identities"
 msgstr "æäåéåú îøåáåú"
 
-#: squirrelmail/src/options_identities.php:55
+#: squirrelmail/src/options_identities.php:63
 msgid "Default Identity"
 msgstr "æäåú áøéøú-îçãì"
 
-#: squirrelmail/src/options_identities.php:66
-#, c-format
-msgid "Alternate Identity %d"
-msgstr "æäåú îùðéú %d"
-
-#: squirrelmail/src/options_identities.php:76
+#: squirrelmail/src/options_identities.php:67
 msgid "Add a New Identity"
 msgstr "äåñó æäåú çãùä"
 
-#: squirrelmail/src/options_identities.php:326
+#: squirrelmail/src/options_identities.php:311
 #: squirrelmail/src/options_personal.php:56
 #: squirrelmail/src/options_personal.php:64
 msgid "Full Name"
 msgstr "ùí îìà"
 
-#: squirrelmail/src/options_identities.php:327
+#: squirrelmail/src/options_identities.php:312
 msgid "E-Mail Address"
 msgstr "ëúåáú ãåà\"ì"
 
-#: squirrelmail/src/options_identities.php:328
+#: squirrelmail/src/options_identities.php:313
 #: squirrelmail/src/options_personal.php:91
 msgid "Reply To"
 msgstr "äùá àì"
 
-#: squirrelmail/src/options_identities.php:336
+#: squirrelmail/src/options_identities.php:321
 msgid "Save / Update"
 msgstr "ùîåø \\ òãëï"
 
-#: squirrelmail/src/options_identities.php:339
+#: squirrelmail/src/options_identities.php:326
 msgid "Make Default"
 msgstr "äôåê ìáøéøú îçãì"
 
-#: squirrelmail/src/options_identities.php:345
+#: squirrelmail/src/options_identities.php:332
 msgid "Move Up"
 msgstr "äòáø ìîòìä"
 
-#: squirrelmail/src/options.php:158 squirrelmail/src/options.php:313
-#: squirrelmail/src/options_order.php:31
-msgid "Index Order"
-msgstr "ñéãåø"
-
 #: squirrelmail/src/options_order.php:37
 msgid "Checkbox"
 msgstr "úéáú áçéøä"
@@ -1110,31 +1207,34 @@ msgstr "
 msgid "Flags"
 msgstr "ñéîåï"
 
-#: squirrelmail/functions/mailbox_display.php:766
 #: squirrelmail/src/options_order.php:42
+#: squirrelmail/functions/mailbox_display.php:820
 msgid "Size"
 msgstr "âåãì"
 
-#: squirrelmail/src/options_order.php:85
+#: squirrelmail/src/options_order.php:87
 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 "áéëåìúê ìùðåú àú äñãø ùì äòîåãåú áúéáú äãåàø. áéëåìúê ìäåñéó, ìäåøéã àå ìäæéæ òîåãåú."
+msgstr ""
+"áéëåìúê ìùðåú àú äñãø ùì äòîåãåú áúéáú äãåàø. áéëåìúê ìäåñéó, ìäåøéã àå "
+"ì"
+"äæéæ òîåãåú."
 
-#: squirrelmail/src/options_order.php:94
+#: squirrelmail/src/options_order.php:98
 msgid "up"
 msgstr "äòìä"
 
-#: squirrelmail/src/options_order.php:96
+#: squirrelmail/src/options_order.php:100
 msgid "down"
 msgstr "äåøã"
 
-#: squirrelmail/src/options_order.php:101
+#: squirrelmail/src/options_order.php:105
 msgid "remove"
 msgstr "äñø"
 
-#: squirrelmail/src/options_order.php:130
+#: squirrelmail/src/options_order.php:136
 msgid "Return to options page"
 msgstr "çæåø ìãó àôùøåéåú"
 
@@ -1159,139 +1259,86 @@ msgstr "(
 msgid "Multiple Identities"
 msgstr "æäåéåú îøåáåú"
 
-#: squirrelmail/src/options_personal.php:120
+#: squirrelmail/src/options_personal.php:121
 msgid "Same as server"
 msgstr "àåúå ãáø ëîå ùøú"
 
-#: squirrelmail/src/options_personal.php:131
+#: squirrelmail/src/options_personal.php:132
 msgid "Timezone Options"
 msgstr "àôùøåéåú àæåø æîï"
 
-#: squirrelmail/src/options_personal.php:136
+#: squirrelmail/src/options_personal.php:137
 msgid "Your current timezone"
 msgstr "àæåø æîï ðåëçé"
 
-#: squirrelmail/src/options_personal.php:143
+#: squirrelmail/src/options_personal.php:145
 msgid "Reply Citation Options"
 msgstr "àôùøåéåú öéèåè îùåá"
 
-#: squirrelmail/src/options_personal.php:148
+#: squirrelmail/src/options_personal.php:150
 msgid "Reply Citation Style"
 msgstr "ñâðåï öéèåè îùåá"
 
-#: squirrelmail/src/options_personal.php:151
+#: squirrelmail/src/options_personal.php:153
 msgid "No Citation"
 msgstr "ììà öéèåè"
 
-#: squirrelmail/src/options_personal.php:152
+#: squirrelmail/src/options_personal.php:154
 msgid "AUTHOR Said"
 msgstr "äîçáø àîø"
 
-#: squirrelmail/src/options_personal.php:153
+#: squirrelmail/src/options_personal.php:155
 msgid "Quote Who XML"
 msgstr ""
 
-#: squirrelmail/src/options_personal.php:154
+#: squirrelmail/src/options_personal.php:156
 msgid "User-Defined"
 msgstr "îåúàí àéùéú"
 
-#: squirrelmail/src/options_personal.php:159
+#: squirrelmail/src/options_personal.php:161
 msgid "User-Defined Citation Start"
 msgstr "äúçìú öéèåè îåúàí àéùéú"
 
-#: squirrelmail/src/options_personal.php:167
+#: squirrelmail/src/options_personal.php:169
 msgid "User-Defined Citation End"
 msgstr "ñéåí öéèåè îåúàí àéùéú"
 
-#: squirrelmail/src/options_personal.php:174
+#: squirrelmail/src/options_personal.php:176
 msgid "Signature Options"
 msgstr "àôùøåéåú çúéîä"
 
-#: squirrelmail/src/options_personal.php:179
+#: squirrelmail/src/options_personal.php:181
 msgid "Use Signature"
 msgstr "äùúîù áçúéîä"
 
-#: squirrelmail/src/options_personal.php:186
+#: squirrelmail/src/options_personal.php:188
 msgid "Prefix Signature with '-- ' Line"
 msgstr "ä÷ãí çúéîä áùåøä ùì '-- '"
 
-#: squirrelmail/src/options.php:134 squirrelmail/src/options.php:281
-msgid "Personal Information"
-msgstr "îéãò àéùé"
-
-#: squirrelmail/src/options.php:140 squirrelmail/src/options.php:289
-msgid "Display Preferences"
-msgstr "àôùøåéåú úöåâä"
-
-#: squirrelmail/src/options.php:152 squirrelmail/src/options.php:305
-msgid "Folder Preferences"
-msgstr "àôùøåéåú úé÷éä"
-
-#: squirrelmail/src/options.php:264
-msgid "Successfully Saved Options"
-msgstr "àôùøåéåú ðùîøå áäöìçä"
-
-#: squirrelmail/src/options.php:269
-msgid "Refresh Folder List"
-msgstr "øòðï øùéîú úé÷éåú"
-
-#: squirrelmail/src/options.php:271
-msgid "Refresh Page"
-msgstr "øòðï ãó"
-
-#: squirrelmail/src/options.php:283
-msgid ""
-"This contains personal information about yourself such as your name, your "
-"email address, etc."
-msgstr "ãó æä îëéì äâãøåú àéùéåú ìâáé òöîê ëâåï, ùîê, ëúåáú ãåà\"ì ùìê åë\"å..."
-
-#: squirrelmail/src/options.php:291
-msgid ""
-"You can change the way that SquirrelMail looks and displays information to "
-"you, such as the colors, the language, and other settings."
-msgstr "áéëåìúê ìùðåú àú äâãøåú äúöåâä ùì úéáú äãåàø ùìê ëâåï öáòéí, ùôä, åòåã..."
-
-#: squirrelmail/src/options.php:299
-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 "áéëåìúê ìöáåò äåãòåú îñåéîåú áúéáú äãåàø ùìê ìôé ÷øéèøéåðéí ùåðéí (ëâåï ùí äùåìç, ðåùà ääåãòä åë\"å). àôùøåú æå òåæøú ìäáçéï áãåàø àùø îâéò îîëåúá îñåéí, îëéì ðåùà îñåééí åòåã..."
-
-#: squirrelmail/src/options.php:307
-msgid ""
-"These settings change the way your folders are displayed and manipulated."
-msgstr "äâãøåú àìå îùðåú àú úöåâú äúé÷éåú åäöåøä áä äï îðåäìåú."
-
-#: squirrelmail/src/options.php:315
-msgid ""
-"The order of the message index can be rearranged and changed to contain the "
-"headers in any order you want."
-msgstr "äöåøä áä äåãòåú îñåãøåú åîãôñåú ðéúðú ìñéãåø îçãù åìùéðåé ëê ùéëéìå àú äëåúøåú ùáøöåðê ìøàåú."
-
-#: squirrelmail/src/printer_friendly_bottom.php:61
+#: squirrelmail/src/printer_friendly_bottom.php:64
 msgid "Message not printable"
 msgstr "ääåãòä ìà ðéúðú ìäãôñä"
 
-#: squirrelmail/src/printer_friendly_bottom.php:90
+#: squirrelmail/src/printer_friendly_bottom.php:93
 #: squirrelmail/src/printer_friendly_main.php:15
-#: squirrelmail/src/printer_friendly_top.php:21
+#: squirrelmail/src/printer_friendly_top.php:22
 msgid "Printer Friendly"
 msgstr "âéøñàú äãôñä"
 
-#: squirrelmail/src/printer_friendly_bottom.php:98
+#: squirrelmail/src/printer_friendly_bottom.php:108
 msgid "CC"
 msgstr "äòú÷éí"
 
-#: squirrelmail/src/printer_friendly_top.php:36
+#: squirrelmail/src/printer_friendly_top.php:38
 msgid "Print"
 msgstr "äãôñ"
 
-#: squirrelmail/src/printer_friendly_top.php:37
+#: squirrelmail/src/printer_friendly_top.php:39
+#: squirrelmail/plugins/newmail/newmail.php:33
 msgid "Close Window"
 msgstr "ñâåø çìåï"
 
-#: squirrelmail/src/read_body.php:155
+#: squirrelmail/src/read_body.php:156
 msgid "View Printable Version"
 msgstr "äöâ âéøñàú äãôñä"
 
@@ -1312,71 +1359,74 @@ msgstr "
 msgid "Read:"
 msgstr "ð÷øà:"
 
-#: squirrelmail/src/read_body.php:427
+#: squirrelmail/src/read_body.php:426
 msgid "Viewing Full Header"
 msgstr "îöéâ ëì äëåúøåú"
 
-#: squirrelmail/src/read_body.php:683
+#: squirrelmail/src/read_body.php:721
 msgid "Message List"
 msgstr "øùéîú äåãòåú"
 
-#: squirrelmail/src/read_body.php:699
+#: squirrelmail/src/read_body.php:743
 msgid "Resume Draft"
 msgstr "äîùê èéåèä"
 
-#: squirrelmail/src/read_body.php:708
+#: squirrelmail/src/read_body.php:758
 msgid "Edit Message as New"
 msgstr "òøåê äåãòä ëçãùä"
 
-#: squirrelmail/functions/mailbox_display.php:682
-#: squirrelmail/src/read_body.php:748
+#: squirrelmail/src/read_body.php:804
+#: squirrelmail/functions/mailbox_display.php:728
 msgid "Forward"
 msgstr "äôõ"
 
-#: squirrelmail/src/read_body.php:757
+#: squirrelmail/src/read_body.php:819
 msgid "Reply"
 msgstr "äùá"
 
-#: squirrelmail/src/read_body.php:766
+#: squirrelmail/src/read_body.php:834
 msgid "Reply All"
 msgstr "äùá ìëì"
 
-#: squirrelmail/src/read_body.php:790 squirrelmail/src/read_body.php:793
+#: squirrelmail/src/read_body.php:855 squirrelmail/src/read_body.php:858
 msgid "View Full Header"
 msgstr "äöâ ëì äëåúøåú"
 
-#: squirrelmail/src/read_body.php:868
+#: squirrelmail/src/read_body.php:926
 msgid "Mailer"
 msgstr "úëðéú ãéååø"
 
-#: squirrelmail/src/read_body.php:918 squirrelmail/src/read_body.php:931
-#: squirrelmail/src/read_body.php:943 squirrelmail/src/read_body.php:968
-#: squirrelmail/src/read_body.php:1012 squirrelmail/src/read_body.php:1028
+#: squirrelmail/src/read_body.php:971 squirrelmail/src/read_body.php:983
+#: squirrelmail/src/read_body.php:994 squirrelmail/src/read_body.php:1016
+#: squirrelmail/src/read_body.php:1058 squirrelmail/src/read_body.php:1073
 msgid "Read receipt"
 msgstr "÷áìä òì ÷øéàä"
 
-#: squirrelmail/src/read_body.php:920 squirrelmail/src/read_body.php:1014
+#: squirrelmail/src/read_body.php:973 squirrelmail/src/read_body.php:1060
 msgid "send"
 msgstr "ùìç"
 
-#: squirrelmail/src/read_body.php:933 squirrelmail/src/read_body.php:945
-#: squirrelmail/src/read_body.php:970 squirrelmail/src/read_body.php:1030
+#: squirrelmail/src/read_body.php:985 squirrelmail/src/read_body.php:996
+#: squirrelmail/src/read_body.php:1018 squirrelmail/src/read_body.php:1075
 msgid "requested"
 msgstr "îáå÷ù"
 
-#: squirrelmail/src/read_body.php:946 squirrelmail/src/read_body.php:971
-#: squirrelmail/src/read_body.php:1031
+#: squirrelmail/src/read_body.php:996 squirrelmail/src/read_body.php:1018
+#: squirrelmail/src/read_body.php:1075
 msgid "Send read receipt now"
 msgstr "ùìç ÷áìä òì ÷øéàä òëùéå"
 
-#: squirrelmail/src/read_body.php:958
+#: squirrelmail/src/read_body.php:1008
 msgid ""
 "The message sender has requested a response to indicate that you have read "
 "this message. Would you like to send a receipt?"
-msgstr "äùåìç ùì ääåãòä áé÷ù ùúùìç ÷áìä áòú ÷øéàú ääåãòä. äàí áøöåðê ìùìåç àìé ÷áìä ëòú?"
+msgstr ""
+"äùåìç ùì ääåãòä áé÷ù ùúùìç ÷áìä áòú ÷øéàú ääåãòä. äàí áøöåðê ìùìåç àìé ÷áìä "
+"ë"
+"òú?"
 
-#: squirrelmail/functions/auth.php:20 squirrelmail/src/redirect.php:64
-#: squirrelmail/src/redirect.php:86
+#: squirrelmail/src/redirect.php:64 squirrelmail/src/redirect.php:86
+#: squirrelmail/functions/auth.php:20
 msgid "You must be logged in to access this page."
 msgstr "òìéê ìäðëñ ìîòøëú áëãé ìäøàåú ãó æä."
 
@@ -1388,111 +1438,111 @@ msgstr "
 msgid "Contact your administrator for help."
 msgstr "öåø ÷ùø òí îðäì äîòøëú ì÷áìú òæøä."
 
-#: squirrelmail/src/search.php:241
+#: squirrelmail/src/search.php:252
 msgid "edit"
 msgstr "òøåê"
 
-#: squirrelmail/src/search.php:248 squirrelmail/src/search.php:290
+#: squirrelmail/src/search.php:259 squirrelmail/src/search.php:305
 msgid "search"
 msgstr "çéôåù"
 
-#: squirrelmail/src/search.php:251
+#: squirrelmail/src/search.php:262
 msgid "delete"
 msgstr "îç÷"
 
-#: squirrelmail/src/search.php:262
+#: squirrelmail/src/search.php:274
 msgid "Recent Searches"
 msgstr "çéôåùéí àçøåðéí"
 
-#: squirrelmail/src/search.php:282
+#: squirrelmail/src/search.php:297
 msgid "save"
 msgstr "ùîåø"
 
-#: squirrelmail/src/search.php:293
+#: squirrelmail/src/search.php:308
 msgid "forget"
 msgstr "ùëç"
 
-#: squirrelmail/src/search.php:302
+#: squirrelmail/src/search.php:317
 msgid "Current Search"
 msgstr "çéôåù ðåëçé"
 
-#: squirrelmail/src/search.php:346
+#: squirrelmail/src/search.php:358
 msgid "Body"
 msgstr "âåó ääåãòä"
 
-#: squirrelmail/src/search.php:347
+#: squirrelmail/src/search.php:359
 msgid "Everywhere"
 msgstr "ëì äùãåú"
 
-#: squirrelmail/src/search.php:380 squirrelmail/src/search.php:409
+#: squirrelmail/src/search.php:390 squirrelmail/src/search.php:419
 msgid "Search Results"
 msgstr "úåöàåú çéôåù"
 
-#: squirrelmail/src/search.php:400
+#: squirrelmail/src/search.php:410
 msgid "No Messages found"
 msgstr "ìà ðîöàå äåãòåú"
 
-#: squirrelmail/functions/page_header.php:122 squirrelmail/src/signout.php:74
+#: squirrelmail/src/signout.php:76 squirrelmail/functions/page_header.php:205
 msgid "Sign Out"
 msgstr "äúðú÷"
 
-#: squirrelmail/src/signout.php:80
+#: squirrelmail/src/signout.php:79
 msgid "You have been successfully signed out."
 msgstr "äúðú÷ú îäîòøëú áäöìçä."
 
-#: squirrelmail/src/signout.php:82
+#: squirrelmail/src/signout.php:81
 msgid "Click here to log back in."
 msgstr "ìçõ ëàï áëãé ìäúçáø îçãù."
 
-#: squirrelmail/src/vcard.php:30
+#: squirrelmail/src/vcard.php:31
 msgid "Viewing a Business Card"
 msgstr "îöéâ ëøèéñ áé÷åø"
 
-#: squirrelmail/src/vcard.php:86 squirrelmail/src/vcard.php:146
+#: squirrelmail/src/vcard.php:90 squirrelmail/src/vcard.php:160
 msgid "Title"
 msgstr "ëåúøú"
 
-#: squirrelmail/src/vcard.php:87
+#: squirrelmail/src/vcard.php:91
 msgid "Email"
 msgstr "ãåà\"ì"
 
-#: squirrelmail/src/vcard.php:88 squirrelmail/src/vcard.php:138
+#: squirrelmail/src/vcard.php:92 squirrelmail/src/vcard.php:152
 msgid "Web Page"
 msgstr "ãó áéú"
 
-#: squirrelmail/src/vcard.php:89 squirrelmail/src/vcard.php:150
+#: squirrelmail/src/vcard.php:93 squirrelmail/src/vcard.php:164
 msgid "Organization / Department"
 msgstr "àéøâåï \\ îçì÷ä"
 
-#: squirrelmail/src/vcard.php:90 squirrelmail/src/vcard.php:142
+#: squirrelmail/src/vcard.php:94 squirrelmail/src/vcard.php:156
 msgid "Address"
 msgstr "ëúåáú"
 
-#: squirrelmail/src/vcard.php:91 squirrelmail/src/vcard.php:159
+#: squirrelmail/src/vcard.php:95 squirrelmail/src/vcard.php:173
 msgid "Work Phone"
 msgstr "èìôåï áòáåãä"
 
-#: squirrelmail/src/vcard.php:92 squirrelmail/src/vcard.php:163
+#: squirrelmail/src/vcard.php:96 squirrelmail/src/vcard.php:177
 msgid "Home Phone"
 msgstr "èìôåï ááéú"
 
-#: squirrelmail/src/vcard.php:93 squirrelmail/src/vcard.php:167
+#: squirrelmail/src/vcard.php:97 squirrelmail/src/vcard.php:181
 msgid "Cellular Phone"
 msgstr "èìôåï ñìåìøé"
 
-#: squirrelmail/src/vcard.php:94 squirrelmail/src/vcard.php:171
+#: squirrelmail/src/vcard.php:98 squirrelmail/src/vcard.php:185
 msgid "Fax"
 msgstr "ô÷ñ"
 
-#: squirrelmail/src/vcard.php:95 squirrelmail/src/vcard.php:175
+#: squirrelmail/src/vcard.php:99 squirrelmail/src/vcard.php:189
 msgid "Note"
 msgstr "ôú÷"
 
-#: squirrelmail/src/vcard.php:124
+#: squirrelmail/src/vcard.php:129
 msgid "Add to Addressbook"
 msgstr "äåñó ìñôø ëúåáåú"
 
-#: squirrelmail/src/vcard.php:155
+#: squirrelmail/src/vcard.php:169
 msgid "Title & Org. / Dept."
 msgstr "úåàø åàøâåï \\ îçì÷ä"
 
@@ -1622,141 +1672,141 @@ msgstr "
 msgid "Business Card"
 msgstr "ëøèéñ áé÷åø"
 
-#: squirrelmail/functions/date.php:91
-#: squirrelmail/plugins/calendar/calendar.php:49
+#: squirrelmail/functions/date.php:92
+#: squirrelmail/plugins/calendar/calendar.php:59
 msgid "Sunday"
 msgstr "øàùåï"
 
-#: squirrelmail/functions/date.php:94
-#: squirrelmail/plugins/calendar/calendar.php:50
+#: squirrelmail/functions/date.php:95
+#: squirrelmail/plugins/calendar/calendar.php:60
 msgid "Monday"
 msgstr "ùðé"
 
-#: squirrelmail/functions/date.php:97
-#: squirrelmail/plugins/calendar/calendar.php:51
+#: squirrelmail/functions/date.php:98
+#: squirrelmail/plugins/calendar/calendar.php:61
 msgid "Tuesday"
 msgstr "ùìéùé"
 
-#: squirrelmail/functions/date.php:100
-#: squirrelmail/plugins/calendar/calendar.php:52
+#: squirrelmail/functions/date.php:101
+#: squirrelmail/plugins/calendar/calendar.php:62
 msgid "Wednesday"
 msgstr "øáéòé"
 
-#: squirrelmail/functions/date.php:103
-#: squirrelmail/plugins/calendar/calendar.php:53
+#: squirrelmail/functions/date.php:104
+#: squirrelmail/plugins/calendar/calendar.php:63
 msgid "Thursday"
 msgstr "çîéùé"
 
-#: squirrelmail/functions/date.php:106
-#: squirrelmail/plugins/calendar/calendar.php:54
+#: squirrelmail/functions/date.php:107
+#: squirrelmail/plugins/calendar/calendar.php:64
 msgid "Friday"
 msgstr "ùéùé"
 
-#: squirrelmail/functions/date.php:109
-#: squirrelmail/plugins/calendar/calendar.php:55
+#: squirrelmail/functions/date.php:110
+#: squirrelmail/plugins/calendar/calendar.php:65
 msgid "Saturday"
 msgstr "ùáú"
 
-#: squirrelmail/functions/date.php:120
+#: squirrelmail/functions/date.php:121
 msgid "January"
 msgstr "éðåàø"
 
-#: squirrelmail/functions/date.php:123
+#: squirrelmail/functions/date.php:124
 msgid "February"
 msgstr "ôáøåàø"
 
-#: squirrelmail/functions/date.php:126
+#: squirrelmail/functions/date.php:127
 msgid "March"
 msgstr "îøõ"
 
-#: squirrelmail/functions/date.php:129
+#: squirrelmail/functions/date.php:130
 msgid "April"
 msgstr "àôøéì"
 
-#: squirrelmail/functions/date.php:132
+#: squirrelmail/functions/date.php:133
 msgid "May"
 msgstr "îàé"
 
-#: squirrelmail/functions/date.php:135
+#: squirrelmail/functions/date.php:136
 msgid "June"
 msgstr "éåðé"
 
-#: squirrelmail/functions/date.php:138
+#: squirrelmail/functions/date.php:139
 msgid "July"
 msgstr "éåìé"
 
-#: squirrelmail/functions/date.php:141
+#: squirrelmail/functions/date.php:142
 msgid "August"
 msgstr "àåâåñè"
 
-#: squirrelmail/functions/date.php:144
+#: squirrelmail/functions/date.php:145
 msgid "September"
 msgstr "ñôèîáø"
 
-#: squirrelmail/functions/date.php:147
+#: squirrelmail/functions/date.php:148
 msgid "October"
 msgstr "àå÷èåáø"
 
-#: squirrelmail/functions/date.php:150
+#: squirrelmail/functions/date.php:151
 msgid "November"
 msgstr "ðåáîáø"
 
-#: squirrelmail/functions/date.php:153
+#: squirrelmail/functions/date.php:154
 msgid "December"
 msgstr "ãöîáø"
 
-#: squirrelmail/functions/date.php:182
+#: squirrelmail/functions/date.php:183
 msgid "D, F j, Y g:i a"
 msgstr "l, j F, Y a g:i"
 
-#: squirrelmail/functions/date.php:184
+#: squirrelmail/functions/date.php:185
 msgid "D, F j, Y G:i"
 msgstr "l, j F, Y G:i"
 
-#: squirrelmail/functions/date.php:206
+#: squirrelmail/functions/date.php:207
 msgid "g:i a"
 msgstr "a g:i"
 
-#: squirrelmail/functions/date.php:208
+#: squirrelmail/functions/date.php:209
 msgid "G:i"
 msgstr "G:i"
 
-#: squirrelmail/functions/date.php:213
+#: squirrelmail/functions/date.php:214
 msgid "D, g:i a"
 msgstr "l, a g:i"
 
-#: squirrelmail/functions/date.php:215
+#: squirrelmail/functions/date.php:216
 msgid "D, G:i"
 msgstr "l, G:i"
 
-#: squirrelmail/functions/date.php:219
+#: squirrelmail/functions/date.php:220
 msgid "M j, Y"
 msgstr "j M, Y"
 
-#: squirrelmail/functions/db_prefs.php:56
-#: squirrelmail/functions/db_prefs.php:63
-#: squirrelmail/functions/db_prefs.php:126
-#: squirrelmail/functions/db_prefs.php:129
-#: squirrelmail/functions/db_prefs.php:344
+#: squirrelmail/functions/db_prefs.php:52
+#: squirrelmail/functions/db_prefs.php:59
+#: squirrelmail/functions/db_prefs.php:122
+#: squirrelmail/functions/db_prefs.php:125
+#: squirrelmail/functions/db_prefs.php:340
 #, c-format
 msgid "Preference database error (%s). Exiting abnormally"
 msgstr "ùâéàú îñã ðúåðéí ùì ääâãøåú )%s). éåöà áöåøä àáðåøîìéú."
 
-#: squirrelmail/functions/display_messages.php:52
+#: squirrelmail/functions/display_messages.php:73
 #: squirrelmail/functions/imap_general.php:252
 msgid "Unknown user or password incorrect."
 msgstr "ùí îùúîù àå ñéñîà àéðí ðëåðéí."
 
-#: squirrelmail/functions/display_messages.php:54
+#: squirrelmail/functions/display_messages.php:75
 msgid "Click here to try again"
 msgstr "ìçõ ëàï áëãé ìðñåú ùåá"
 
-#: squirrelmail/functions/display_messages.php:75
+#: squirrelmail/functions/display_messages.php:96
 #, c-format
 msgid "Click here to return to %s"
 msgstr "ìçõ ëàï áëãé ìçæåø ì-%s"
 
-#: squirrelmail/functions/display_messages.php:158
+#: squirrelmail/functions/display_messages.php:179
 msgid "Go to the login page"
 msgstr "ìê ìãó äëðéñä"
 
@@ -1765,7 +1815,10 @@ msgstr "
 msgid ""
 "Preference file, %s, does not exist. Log out, and log back in to create a "
 "default preference file."
-msgstr "÷åáõ ääâãøåú, %s, àéðå ÷ééí. äúðú÷, åäëðñ îçãù áëãé ìéöåø ÷åáõ äâãøåú áøéøú îçãì."
+msgstr ""
+"÷åáõ ääâãøåú, %s, àéðå ÷ééí. äúðú÷, åäëðñ îçãù áëãé ìéöåø ÷åáõ äâãøåú áøéøú "
+"î"
+"çãì."
 
 #: squirrelmail/functions/file_prefs.php:162
 #, c-format
@@ -1777,16 +1830,16 @@ msgid "Default preference file not found!"
 msgstr "÷åáõ äâãøåú áøéøú îçãì ìà ðîöà!"
 
 #: squirrelmail/functions/file_prefs.php:166
-#: squirrelmail/functions/file_prefs.php:176
+#: squirrelmail/functions/file_prefs.php:179
 #: squirrelmail/functions/prefs.php:94
 msgid "Please contact your system administrator and report this error."
 msgstr "àðà öåø ÷ùø òí îðäì äîòøëú åãååç òì ùâéàä æå."
 
-#: squirrelmail/functions/file_prefs.php:174
+#: squirrelmail/functions/file_prefs.php:177
 msgid "Could not create initial preference file!"
 msgstr "ìà éëåì ìéöåø ÷åáõ äâãøåú øàùåðé!"
 
-#: squirrelmail/functions/file_prefs.php:175
+#: squirrelmail/functions/file_prefs.php:178
 #, c-format
 msgid "%s should be writable by user %s"
 msgstr "äîùúîù %s æ÷å÷ ìäøùàåú ëúéáä òì %s"
@@ -1799,7 +1852,7 @@ msgstr "
 #: squirrelmail/functions/imap_general.php:163
 #: squirrelmail/functions/imap_messages.php:366
 #: squirrelmail/functions/imap_messages.php:374
-#: squirrelmail/functions/imap_messages.php:567
+#: squirrelmail/functions/imap_messages.php:572
 #: squirrelmail/plugins/filters/filters.php:227
 msgid "ERROR : Could not complete request."
 msgstr "ùâéàä: ìà éëåì ìäùìéí á÷ùä."
@@ -1844,7 +1897,7 @@ msgid "Read data:"
 msgstr "îéãò ð÷øà:"
 
 #: squirrelmail/functions/imap_messages.php:368
-#: squirrelmail/functions/imap_messages.php:569
+#: squirrelmail/functions/imap_messages.php:574
 msgid "Unknown response from IMAP server: "
 msgstr "úùåáä ìà éãåòä îùøú IMAP: "
 
@@ -1853,10 +1906,12 @@ msgid "Unknown message number in reply from server: "
 msgstr "îñôø ìà éãåò ùì äåãòä áúùåáä îäùøú: "
 
 #: squirrelmail/functions/imap_messages.php:396
-#: squirrelmail/functions/imap_messages.php:492
-#: squirrelmail/functions/imap_messages.php:760
-#: squirrelmail/functions/imap_messages.php:824
-#: squirrelmail/functions/mailbox_display.php:1087
+#: squirrelmail/functions/imap_messages.php:497
+#: squirrelmail/functions/imap_messages.php:775
+#: squirrelmail/functions/imap_messages.php:839
+#: squirrelmail/functions/imap_parse.php:183
+#: squirrelmail/functions/imap_parse.php:205
+#: squirrelmail/functions/mailbox_display.php:1141
 msgid "(no subject)"
 msgstr "(ììà ðåùà)"
 
@@ -1864,161 +1919,176 @@ msgstr "(
 msgid "Unknown Sender"
 msgstr "ùåìç ìà éãåò"
 
-#: squirrelmail/functions/imap_messages.php:515
+#: squirrelmail/functions/imap_messages.php:520
 msgid "No To Address"
 msgstr "çñø îëåúá (àì)"
 
-#: squirrelmail/functions/imap_messages.php:827
+#: squirrelmail/functions/imap_messages.php:842
+#: squirrelmail/functions/imap_parse.php:208
 msgid "(unknown sender)"
 msgstr "(ùåìç ìà éãåò)"
 
-#: squirrelmail/functions/imap_search.php:83
+#: squirrelmail/functions/imap_search.php:98
 msgid "No Messages Found"
 msgstr "ìà ðîöàå äåãòåú"
 
-#: squirrelmail/functions/imap_search.php:191
-#: squirrelmail/functions/imap_search.php:199
+#: squirrelmail/functions/imap_search.php:206
+#: squirrelmail/functions/imap_search.php:214
 msgid "Found"
 msgstr "ðîöà"
 
-#: squirrelmail/functions/imap_search.php:191
-#: squirrelmail/functions/imap_search.php:199
+#: squirrelmail/functions/imap_search.php:206
+#: squirrelmail/functions/imap_search.php:214
 msgid "messages"
 msgstr "äåãòåú"
 
-#: squirrelmail/functions/imap_search.php:206
+#: squirrelmail/functions/imap_search.php:221
 msgid "Folder:"
 msgstr "úé÷éä:"
 
-#: squirrelmail/functions/mailbox_display.php:185
+#: squirrelmail/functions/mailbox_display.php:196
 msgid "A"
 msgstr "ò"
 
-#: squirrelmail/functions/mailbox_display.php:568
+#: squirrelmail/functions/mailbox_display.php:274
+msgid ""
+"Thread sorting is not supported by your IMAP server.<br>Please report this "
+"to the system administrator."
+msgstr ""
+
+#: squirrelmail/functions/mailbox_display.php:296
+msgid ""
+"Server-side sorting is not supported by your IMAP server.<br>Please report "
+"this to the system administrator."
+msgstr ""
+
+#: squirrelmail/functions/mailbox_display.php:590
 msgid "THIS FOLDER IS EMPTY"
 msgstr "äúé÷éä øé÷ä"
 
-#: squirrelmail/functions/mailbox_display.php:658
+#: squirrelmail/functions/mailbox_display.php:697
 msgid "Move Selected To:"
 msgstr "äòáø ðáçøåú àì:"
 
-#: squirrelmail/functions/mailbox_display.php:661
+#: squirrelmail/functions/mailbox_display.php:702
 msgid "Transform Selected Messages"
 msgstr "ùðä äåãòåú ðáçøåú"
 
-#: squirrelmail/functions/mailbox_display.php:681
-#: squirrelmail/plugins/delete_move_next/setup.php:244
-#: squirrelmail/plugins/delete_move_next/setup.php:268
+#: squirrelmail/functions/mailbox_display.php:727
+#: squirrelmail/plugins/delete_move_next/setup.php:245
+#: squirrelmail/plugins/delete_move_next/setup.php:269
 msgid "Move"
 msgstr "äòáø"
 
-#: squirrelmail/functions/mailbox_display.php:688
+#: squirrelmail/functions/mailbox_display.php:734
 msgid "Expunge"
 msgstr "îç÷"
 
-#: squirrelmail/functions/mailbox_display.php:689
+#: squirrelmail/functions/mailbox_display.php:735
 msgid "mailbox"
 msgstr "úéáú ãåàø"
 
-#: squirrelmail/functions/mailbox_display.php:691
+#: squirrelmail/functions/mailbox_display.php:737
 msgid "Read"
 msgstr "ð÷øà"
 
-#: squirrelmail/functions/mailbox_display.php:692
+#: squirrelmail/functions/mailbox_display.php:738
 msgid "Unread"
 msgstr "ìà ð÷øà"
 
-#: squirrelmail/functions/mailbox_display.php:701
+#: squirrelmail/functions/mailbox_display.php:747
 msgid "Unthread View"
 msgstr "ììà çìå÷ä ìãôéí"
 
-#: squirrelmail/functions/mailbox_display.php:705
+#: squirrelmail/functions/mailbox_display.php:751
 msgid "Thread View"
 msgstr "çìå÷ä ìãôéí"
 
-#: squirrelmail/functions/mailbox_display.php:820
+#: squirrelmail/functions/mailbox_display.php:874
 msgid "Toggle All"
 msgstr "ñîï äëì"
 
-#: squirrelmail/functions/mailbox_display.php:844
+#: squirrelmail/functions/mailbox_display.php:898
 msgid "Unselect All"
 msgstr "äñø ñéîåï îäëì"
 
-#: squirrelmail/functions/mailbox_display.php:846
+#: squirrelmail/functions/mailbox_display.php:900
 msgid "Select All"
 msgstr "áçø äëì"
 
-#: squirrelmail/functions/mailbox_display.php:863
+#: squirrelmail/functions/mailbox_display.php:917
 #, c-format
 msgid "Viewing Messages: <B>%s</B> to <B>%s</B> (%s total)"
 msgstr "îöéâ äåãòåú: <b>%s</b> òã <b>%s</b> (%s áñä\"ë)"
 
-#: squirrelmail/functions/mailbox_display.php:866
+#: squirrelmail/functions/mailbox_display.php:920
 #, c-format
 msgid "Viewing Message: <B>%s</B> (1 total)"
 msgstr "îöéâ äåãòä: <b>%s</b> (1 áñä\"ë)"
 
-#: squirrelmail/functions/mailbox_display.php:1050
+#: squirrelmail/functions/mailbox_display.php:1104
 msgid "Paginate"
 msgstr "îñôø òîåãéí"
 
-#: squirrelmail/functions/mailbox_display.php:1057
+#: squirrelmail/functions/mailbox_display.php:1111
 msgid "Show All"
 msgstr "äöâ äëì"
 
-#: squirrelmail/functions/mime.php:425
+#: squirrelmail/functions/mime.php:449
 msgid "Error decoding mime structure.  Report this as a bug!"
 msgstr "ùâéàä áôòðåç îáðä ñåâ ÷åáõ. àðà ãååç òì áàâ æä!"
 
-#: squirrelmail/functions/mime.php:499
+#: squirrelmail/functions/mime.php:522
 msgid ""
 "Body retrieval error. The reason for this is most probably that the message "
 "is malformed. Please help us making future versions better by submitting "
 "this message to the developers knowledgebase!"
-msgstr "ùâéàä áàçæåø âåó ääåãòä. ÷øåá ìååãàé ùäñáéä ðåáòú îâåó äåãòä îòååú. "
-"àðà òæåø ìðå áùéôåø âøñàåú òúéãéåú ò\"é ùìéçú äåãòä æå ìîàâø äîéãò ùì äîôúçéí!"
+msgstr ""
+"ùâéàä áàçæåø âåó ääåãòä. ÷øåá ìååãàé ùäñáéä ðåáòú îâåó äåãòä îòååú. àðà òæåø "
+"ì"
+"ðå áùéôåø âøñàåú òúéãéåú ò\"é ùìéçú äåãòä æå ìîàâø äîéãò ùì äîôúçéí!"
 
-#: squirrelmail/functions/mime.php:501
+#: squirrelmail/functions/mime.php:524
 msgid "Submit message"
 msgstr "ùìç äåãòä"
 
-#: squirrelmail/functions/mime.php:503
+#: squirrelmail/functions/mime.php:526
 msgid "Command:"
 msgstr "ô÷åãä:"
 
-#: squirrelmail/functions/mime.php:504
+#: squirrelmail/functions/mime.php:527
 msgid "Response:"
 msgstr "úùåáä:"
 
-#: squirrelmail/functions/mime.php:505
-#: squirrelmail/plugins/calendar/event_create.php:118
-#: squirrelmail/plugins/calendar/event_delete.php:38
-#: squirrelmail/plugins/calendar/event_edit.php:101
-#: squirrelmail/plugins/calendar/event_edit.php:114
+#: squirrelmail/functions/mime.php:528
+#: squirrelmail/plugins/calendar/event_create.php:137
+#: squirrelmail/plugins/calendar/event_delete.php:47
+#: squirrelmail/plugins/calendar/event_edit.php:119
+#: squirrelmail/plugins/calendar/event_edit.php:143
 msgid "Message:"
 msgstr "äåãòä:"
 
-#: squirrelmail/functions/mime.php:506
+#: squirrelmail/functions/mime.php:529
 msgid "FETCH line:"
 msgstr "ùåøú FETCH:"
 
-#: squirrelmail/functions/mime.php:791
+#: squirrelmail/functions/mime.php:866
 msgid "Hide Unsafe Images"
 msgstr "äñúø úîåðåú ìà áèåçåú"
 
-#: squirrelmail/functions/mime.php:793
+#: squirrelmail/functions/mime.php:868
 msgid "View Unsafe Images"
 msgstr "äöâ úîåðåú ìà áèåçåú"
 
-#: squirrelmail/functions/mime.php:822
+#: squirrelmail/functions/mime.php:903
 msgid "Attachments"
 msgstr "îöåøôéí"
 
-#: squirrelmail/functions/mime.php:858 squirrelmail/functions/mime.php:936
+#: squirrelmail/functions/mime.php:939 squirrelmail/functions/mime.php:1017
 msgid "download"
 msgstr "äåøã"
 
-#: squirrelmail/functions/mime.php:1662 squirrelmail/functions/mime.php:1969
+#: squirrelmail/functions/mime.php:1746 squirrelmail/functions/mime.php:2064
 msgid "sec_remove_eng.png"
 msgstr ""
 
@@ -2028,27 +2098,27 @@ msgid "Option Type '%s' Not Found"
 msgstr "ìà ðîöàä àôùøåú îñåâ '%s'"
 
 #: squirrelmail/functions/options.php:263
+#: squirrelmail/plugins/calendar/event_delete.php:62
+#: squirrelmail/plugins/calendar/event_edit.php:165
 #: squirrelmail/plugins/administrator/options.php:357
-#: squirrelmail/plugins/calendar/event_delete.php:51
-#: squirrelmail/plugins/calendar/event_edit.php:134
 msgid "Yes"
 msgstr "ëï"
 
 #: squirrelmail/functions/options.php:268
+#: squirrelmail/plugins/calendar/event_delete.php:70
+#: squirrelmail/plugins/calendar/event_edit.php:173
 #: squirrelmail/plugins/administrator/options.php:358
-#: squirrelmail/plugins/calendar/event_delete.php:58
-#: squirrelmail/plugins/calendar/event_edit.php:141
 msgid "No"
 msgstr "ìà"
 
-#: squirrelmail/functions/page_header.php:116
+#: squirrelmail/functions/page_header.php:199
 msgid "Current Folder"
 msgstr "úé÷éä ðåëçéú"
 
-#: squirrelmail/functions/page_header.php:130
-#: squirrelmail/functions/page_header.php:133
-#: squirrelmail/functions/page_header.php:175
-#: squirrelmail/functions/page_header.php:202
+#: squirrelmail/functions/page_header.php:212
+#: squirrelmail/functions/page_header.php:215
+#: squirrelmail/functions/page_header.php:258
+#: squirrelmail/functions/page_header.php:285
 msgid "Compose"
 msgstr "äåãòä çãùä"
 
@@ -2065,23 +2135,30 @@ msgstr "
 msgid ""
 "COMMERCIAL - This list contains servers that are verified spam senders. It "
 "is a pretty reliable list to scan spam from."
-msgstr "îñçøé - øùéîä æå îëéìä ùøúéí äéãåòéí ëùåìçé ãåàø æáì. æåäé øùéîä îäéîðä ìáãé÷ú ãåàø æáì."
+msgstr ""
+"îñçøé - øùéîä æå îëéìä ùøúéí äéãåòéí ëùåìçé ãåàø æáì. æåäé øùéîä îäéîðä "
+"ì"
+"áãé÷ú ãåàø æáì."
 
 #: squirrelmail/plugins/filters/filters.php:562
 msgid ""
 "COMMERCIAL - Servers that are configured (or misconfigured) to allow spam to "
 "be relayed through their system will be banned with this.  Another good one "
 "to use."
-msgstr "îñçøé - ùøúéí àùø îåâãøéí (àå îåâãøéí ìà ðëåï), åîàôùøéí áëê ùìéçú "
-"ãåàø æáì ãøëí."
+msgstr ""
+"îñçøé - ùøúéí àùø îåâãøéí (àå îåâãøéí ìà ðëåï), åîàôùøéí áëê ùìéçú ãåàø æáì "
+"ã"
+"øëí."
 
 #: squirrelmail/plugins/filters/filters.php:570
 msgid ""
 "COMMERCIAL - Dial-up users are often filtered out since they should use "
 "their ISP's mail servers to send mail.  Spammers typically get a dial-up "
 "account and send spam directly from there."
-msgstr "îñçøé - ìòéúéí ÷øåáåú îñððéí äçåöä îùúîùé çéåâ îëéååï ùäí îùúîùéí áùøúé "
-"äãåàø ùì ùøú äàéðèøðè ùìäí."
+msgstr ""
+"îñçøé - ìòéúéí ÷øåáåú îñððéí äçåöä îùúîùé çéåâ îëéååï ùäí îùúîùéí áùøúé "
+"ä"
+"ãåàø ùì ùøú äàéðèøðè ùìäí."
 
 #: squirrelmail/plugins/filters/filters.php:578
 msgid "COMMERCIAL - RBL+ Blackhole entries."
@@ -2099,40 +2176,52 @@ msgstr "
 msgid ""
 "FREE - Osirusoft Relays - Osirusofts list of verified open relays. Seems to "
 "include servers used by abuse@uunet.net auto-replies too."
-msgstr "çéðí - øùåîåú ùì ùøúé ãåàø äôúåçéí ìëåìí, åáëê îàôùøéí ùìéçú ãåàø "
-"àì÷èøåðé ãøëí ìëì àçã (Osirusoft)."
+msgstr ""
+"çéðí - øùåîåú ùì ùøúé ãåàø äôúåçéí ìëåìí, åáëê îàôùøéí ùìéçú ãåàø àì÷èøåðé "
+"ã"
+"øëí ìëì àçã (Osirusoft)."
 
 #: squirrelmail/plugins/filters/filters.php:611
 msgid "FREE - Osirusoft Dialups - Osirusofts Dialup Spam Source list."
-msgstr "çéðí - øùéîä ùì ùøúé çéåâ àùø ìòéúéí ÷øåáåú ùéîùå ëùøúéí ìùìéçú ãåàø æáì (Osirusoft)."
+msgstr ""
+"çéðí - øùéîä ùì ùøúé çéåâ àùø ìòéúéí ÷øåáåú ùéîùå ëùøúéí ìùìéçú ãåàø æáì "
+"(Osirusoft)."
 
 #: squirrelmail/plugins/filters/filters.php:619
 msgid ""
 "FREE - Osirusoft Confirmed Spam Source - Sites that continually spam and "
 "have been manually added after multiple nominations. Use with caution. Seems "
 "to catch abuse auto-replies from some ISPs."
-msgstr "çéðí - øùéîä éãðéú ùì ùøúéí àùø ùåìçéí ãåàø æáì ììà äøó, å÷áìå úìåðåú øáåú. "
-"àðà äùúîùå áøùéîä æå áæäéøåú (Osirusoft)."
+msgstr ""
+"çéðí - øùéîä éãðéú ùì ùøúéí àùø ùåìçéí ãåàø æáì ììà äøó, å÷áìå úìåðåú øáåú. "
+"à"
+"ðà äùúîùå áøùéîä æå áæäéøåú (Osirusoft)."
 
 #: squirrelmail/plugins/filters/filters.php:627
 msgid ""
 "FREE - Osirusoft Smart Hosts - List of hosts that are secure but relay for "
 "other mail servers that are not secure."
-msgstr "çéðí - øùéîä ùì ùøúéí áèåçéí àùø îàùøéí ùéîåù áùøúé äãåàø ùìäí "
-"ìùøúéí àùø àéðí áèåçéí (Osirusoft)."
+msgstr ""
+"çéðí - øùéîä ùì ùøúéí áèåçéí àùø îàùøéí ùéîåù áùøúé äãåàø ùìäí ìùøúéí àùø "
+"à"
+"éðí áèåçéí (Osirusoft)."
 
 #: squirrelmail/plugins/filters/filters.php:635
 msgid ""
 "FREE - Osirusoft Spamware Developers - It is believed that these are IP "
 "ranges of companies that are known to produce spam software. Seems to catch "
 "abuse auto-replies from some ISPs."
-msgstr "çéðí - øùéîä ùì ëúåáåú IP àùø ëáéëåì îùîùåú çáøåú àùø ùåìçåú ãåàø æáì (Osirusoft)."
+msgstr ""
+"çéðí - øùéîä ùì ëúåáåú IP àùø ëáéëåì îùîùåú çáøåú àùø ùåìçåú ãåàø æáì "
+"(Osirusoft)."
 
 #: squirrelmail/plugins/filters/filters.php:643
 msgid ""
 "FREE - Osirusoft Unconfirmed OptIn Servers - List of listservers that opt "
 "users in without confirmation."
-msgstr "çéðí - øùéîä ùì ùøúé øùéîåú úôåöä àùø îåñéôéí àìéäí îùúîùéí ììà á÷ùú àéùåø (Osirusoft)."
+msgstr ""
+"çéðí - øùéîä ùì ùøúé øùéîåú úôåöä àùø îåñéôéí àìéäí îùúîùéí ììà á÷ùú àéùåø "
+"(Osirusoft)."
 
 #: squirrelmail/plugins/filters/filters.php:651
 msgid ""
@@ -2148,7 +2237,8 @@ msgstr "
 msgid ""
 "FREE - ORDB was born when ORBS went off the air. It seems to have fewer "
 "false positives than ORBS did though."
-msgstr "çéðí - ORDB ðåìãä ëàùø ORBS éøãä îäàååéø. áëì-æàú ðøàä ùéù ìäí éåúø èòåéåú."
+msgstr ""
+"çéðí - ORDB ðåìãä ëàùø ORBS éøãä îäàååéø. áëì-æàú ðøàä ùéù ìäí éåúø èòåéåú."
 
 #: squirrelmail/plugins/filters/filters.php:675
 msgid "FREE - Five-Ten-sg.com - Direct SPAM sources."
@@ -2160,7 +2250,10 @@ msgstr "
 
 #: squirrelmail/plugins/filters/filters.php:691
 msgid "FREE - Five-Ten-sg.com - Bulk mailers that do not use confirmed opt-in."
-msgstr "çéðí - Five-Ten-sg.com - øùéîä ùì ùåìçé ãåàø áëîåéåú àùø àéðí îùúîùéí áá÷ùú àéùåø."
+msgstr ""
+"çéðí - Five-Ten-sg.com - øùéîä ùì ùåìçé ãåàø áëîåéåú àùø àéðí îùúîùéí áá÷ùú "
+"à"
+"éùåø."
 
 #: squirrelmail/plugins/filters/filters.php:699
 msgid "FREE - Five-Ten-sg.com - Other misc. servers."
@@ -2183,8 +2276,12 @@ msgid ""
 "FREE - Dorkslayers appears to include only really bad open relays outside "
 "the US to avoid being sued. Interestingly enough, their website recommends "
 "you NOT use their service."
-msgstr "çéðí - ðøàä ,ùáëãé ìîðåò úáéòåú, ãåø÷ñìééøñ ëåììéí ø÷ ùøúéí àùø éåùáéí îçåõ ìàøä\"á "
-"åîùîùéí ëúçðú îîñø ôúåçä. ìîøáä äôìà, äàúø ùìäí îîìéõ ìà ìäúùîù áùéøåú ùìäí."
+msgstr ""
+"çéðí - ðøàä ,ùáëãé ìîðåò úáéòåú, ãåø÷ñìééøñ ëåììéí ø÷ ùøúéí àùø éåùáéí îçåõ "
+"ì"
+"àøä\"á åîùîùéí ëúçðú îîñø ôúåçä. ìîøáä äôìà, äàúø ùìäí îîìéõ ìà ìäúùîù "
+"á"
+"ùéøåú ùìäí."
 
 #: squirrelmail/plugins/filters/filters.php:739
 msgid "FREE - SPAMhaus - A list of well-known SPAM sources."
@@ -2195,8 +2292,10 @@ msgstr "
 msgid ""
 "FREE, for now - SPAMCOP - An interesting solution that lists servers that "
 "have a very high spam to legit email ratio (85% or more)."
-msgstr "çéðí, áéðúééí - SPAMCOP - ôúøåï îòðééï ùì øùéîåú ùøúéí ùéù ìäí éçñ "
-"âáåä áéï ãåàø ìà çå÷é (SPAM) ìãåàø çå÷é (85% àå éåúø)."
+msgstr ""
+"çéðí, áéðúééí - SPAMCOP - ôúøåï îòðééï ùì øùéîåú ùøúéí ùéù ìäí éçñ âáåä áéï "
+"ã"
+"åàø ìà çå÷é (SPAM) ìãåàø çå÷é (85% àå éåúø)."
 
 #: squirrelmail/plugins/filters/filters.php:755
 msgid "FREE - dev.null.dk - I don't have any detailed info on this list."
@@ -2204,11 +2303,17 @@ msgstr "
 
 #: squirrelmail/plugins/filters/filters.php:763
 msgid "FREE - visi.com - Relay Stop List. Very conservative OpenRelay List."
-msgstr "çéðí - visi.com - øùéîú òöéøú îîñø. øùéîä îàåã ùîøðéú ùì ùøúéí äîùîùéí ëúçðåú îîñø ôúåçåú."
+msgstr ""
+"çéðí - visi.com - øùéîú òöéøú îîñø. øùéîä îàåã ùîøðéú ùì ùøúéí äîùîùéí "
+"ë"
+"úçðåú îîñø ôúåçåú."
 
 #: squirrelmail/plugins/filters/filters.php:771
 msgid "FREE - 2mbit.com Open Relays - Another list of Open Relays."
-msgstr "çéðí - 2mbit.com úçðåú îîñø ôúåçåú - òåã øùéîä ùì ùøúéí äîùîùéí ëúçðåú îîñø ôúåçåú."
+msgstr ""
+"çéðí - 2mbit.com úçðåú îîñø ôúåçåú - òåã øùéîä ùì ùøúéí äîùîùéí ëúçðåú îîñø "
+"ô"
+"úåçåú."
 
 #: squirrelmail/plugins/filters/filters.php:779
 msgid "FREE - 2mbit.com SPAM Source - List of Direct SPAM Sources."
@@ -2216,20 +2321,24 @@ msgstr "
 
 #: squirrelmail/plugins/filters/filters.php:787
 msgid "FREE - 2mbit.com SPAM ISPs - List of SPAM-friendly ISPs."
-msgstr "çéðí - 2mbit.com ñô÷é ùøåúé àéðèøðè - øùéîä ùì ñô÷é àéðèøðè àùø îàùøéí SPAM."
+msgstr ""
+"çéðí - 2mbit.com ñô÷é ùøåúé àéðèøðè - øùéîä ùì ñô÷é àéðèøðè àùø îàùøéí SPAM."
 
 #: squirrelmail/plugins/filters/filters.php:795
 msgid ""
 "FREE - Leadmon DUL - Another list of Dial-up or otherwise dynamically "
 "assigned IPs."
-msgstr "çéðí - Leadmon DUL - òåã øùéîä ùì çéåâ àå áàåôï àçø IPéí äîå÷ðéí áàåôï ãéðîé."
+msgstr ""
+"çéðí - Leadmon DUL - òåã øùéîä ùì çéåâ àå áàåôï àçø IPéí äîå÷ðéí áàåôï ãéðîé."
 
 #: squirrelmail/plugins/filters/filters.php:803
 msgid ""
 "FREE - Leadmon SPAM Source - List of IPs Leadmon.net has received SPAM "
 "directly from."
-msgstr "çéðí - Leadmon SPAM Source - øùéîä ùì IPéí àùø Leadmon.net "
-"÷éáìå SPAM éùéøåú îäí."
+msgstr ""
+"çéðí - Leadmon SPAM Source - øùéîä ùì IPéí àùø Leadmon.net ÷éáìå SPAM éùéøåú "
+"î"
+"äí."
 
 #: squirrelmail/plugins/filters/filters.php:811
 msgid ""
@@ -2242,15 +2351,19 @@ msgstr "
 msgid ""
 "FREE - Leadmon Open Relays - Single Stage Open Relays that are not listed on "
 "other active RBLs."
-msgstr "çéðí - Leadmon Open Relays - úçðåú îîñø ôúåçåú áòìåú ùìá àçã, àùø "
-"àéðï øùåîåú àöì RBLéí ôòéìéí àçøéí."
+msgstr ""
+"çéðí - Leadmon Open Relays - úçðåú îîñø ôúåçåú áòìåú ùìá àçã, àùø àéðï "
+"ø"
+"ùåîåú àöì RBLéí ôòéìéí àçøéí."
 
 #: squirrelmail/plugins/filters/filters.php:827
 msgid ""
 "FREE - Leadmon Multi-stage - Multi-Stage Open Relays that are not listed on "
 "other active RBLs and that have sent SPAM to Leadmon.net."
-msgstr "çéðí - Leadmon Multi-stage - úçðåú îîñø ôúåçåú îøåáåú ùìáéí, àùø àéðï "
-"øùåîåú àöì RBLéí àçøéí, åùìçå SPAM ì-Leadmon.net."
+msgstr ""
+"çéðí - Leadmon Multi-stage - úçðåú îîñø ôúåçåú îøåáåú ùìáéí, àùø àéðï øùåîåú "
+"à"
+"öì RBLéí àçøéí, åùìçå SPAM ì-Leadmon.net."
 
 #: squirrelmail/plugins/filters/filters.php:835
 msgid ""
@@ -2258,76 +2371,91 @@ msgid ""
 "direct SPAM from IPs in netblocks where the entire block has no DNS "
 "mappings. It's a list of BLOCKS of IPs being used by people who have SPAMmed "
 "Leadmon.net."
-msgstr "çéðí - Leadmon SpamBlock - àúøéí áøùéîä æå ùìçå SPAM éùéøåú àì Leadmon.net "
-"î-IPéí á÷áåöåú øùú, ëàùø ìëì ä÷áåöä àéï îéôåé DNS. æåäéà øùéîä ùì ÷áåöåú ùì IPéí àùø "
-"ðîöàéí áùéîåù ò\"é àðùéí àùø ùìçå SPAM àì Leadmon.net."
+msgstr ""
+"çéðí - Leadmon SpamBlock - àúøéí áøùéîä æå ùìçå SPAM éùéøåú àì Leadmon.net î-"
+"IPéí á÷áåöåú øùú, ëàùø ìëì ä÷áåöä àéï îéôåé DNS. æåäéà øùéîä ùì ÷áåöåú ùì "
+"IPéí àùø ðîöàéí áùéîåù ò\"é àðùéí àùø ùìçå SPAM àì Leadmon.net."
 
 #: squirrelmail/plugins/filters/filters.php:843
 msgid ""
 "FREE, for now - Not Just Another Blacklist - Both Open Relays and Direct "
 "SPAM Sources."
-msgstr "çéðí, ìòú òúä - ìà òåã øùéîä ùçåøä - âí úçðåú îîñø ôúåçåú åâí "
-"î÷åøåú éùéøéí ùì SPAM."
+msgstr ""
+"çéðí, ìòú òúä - ìà òåã øùéîä ùçåøä - âí úçðåú îîñø ôúåçåú åâí î÷åøåú éùéøéí "
+"ù"
+"ì SPAM."
 
 #: squirrelmail/plugins/filters/filters.php:851
 msgid "FREE, for now - Not Just Another Blacklist - Dial-up IPs."
 msgstr "çéðí, ìòú òúä - ìà òåã øùéîä ùçåøä - IPéí ùì çéåâ."
 
+#: squirrelmail/plugins/filters/filters.php:859
+msgid "FREE - Distributed Sender Boycott List - Confirmed Relays"
+msgstr ""
+
+#: squirrelmail/plugins/filters/filters.php:867
+msgid "FREE - Distributed Sender Boycott List - Confirmed Multi-stage Relays"
+msgstr ""
+
+#: squirrelmail/plugins/filters/filters.php:875
+msgid "FREE - Distributed Sender Boycott List - UN-Confirmed Relays"
+msgstr ""
+
 #: squirrelmail/plugins/filters/options.php:60
 msgid "Saved Scan type"
 msgstr "ñåâ ñøé÷ä ùîåøä"
 
-#: squirrelmail/plugins/filters/options.php:70
+#: squirrelmail/plugins/filters/options.php:71
 msgid "Message Filtering"
 msgstr "îéåï äåãòåú"
 
-#: squirrelmail/plugins/filters/options.php:77
-#: squirrelmail/plugins/filters/spamoptions.php:105
+#: squirrelmail/plugins/filters/options.php:80
+#: squirrelmail/plugins/filters/spamoptions.php:115
 msgid "What to Scan:"
 msgstr "ñøå÷ àú:"
 
-#: squirrelmail/plugins/filters/options.php:83
-#: squirrelmail/plugins/filters/spamoptions.php:111
+#: squirrelmail/plugins/filters/options.php:87
+#: squirrelmail/plugins/filters/spamoptions.php:122
 msgid "All messages"
 msgstr "ëì ääåãòåú"
 
-#: squirrelmail/plugins/filters/options.php:88
-#: squirrelmail/plugins/filters/spamoptions.php:116
+#: squirrelmail/plugins/filters/options.php:92
+#: squirrelmail/plugins/filters/spamoptions.php:127
 msgid "Only unread messages"
 msgstr "ø÷ äåãòåú çãùåú"
 
-#: squirrelmail/plugins/filters/options.php:91
-#: squirrelmail/plugins/filters/spamoptions.php:149
+#: squirrelmail/plugins/filters/options.php:95
+#: squirrelmail/plugins/filters/spamoptions.php:168
 msgid "Save"
 msgstr "ùîåø"
 
-#: squirrelmail/plugins/filters/options.php:110
+#: squirrelmail/plugins/filters/options.php:115
 msgid "Match:"
 msgstr "ìôé ùãä:"
 
-#: squirrelmail/plugins/filters/options.php:132
+#: squirrelmail/plugins/filters/options.php:137
 msgid "Header"
 msgstr "ëåúøåú"
 
-#: squirrelmail/plugins/filters/options.php:139
+#: squirrelmail/plugins/filters/options.php:143
 msgid "Contains:"
 msgstr "îëéì:"
 
-#: squirrelmail/plugins/delete_move_next/setup.php:240
-#: squirrelmail/plugins/delete_move_next/setup.php:264
-#: squirrelmail/plugins/filters/options.php:151
+#: squirrelmail/plugins/filters/options.php:153
+#: squirrelmail/plugins/delete_move_next/setup.php:241
+#: squirrelmail/plugins/delete_move_next/setup.php:265
 msgid "Move to:"
 msgstr "äòáø àì:"
 
-#: squirrelmail/plugins/filters/options.php:193
+#: squirrelmail/plugins/filters/options.php:202
 msgid "Down"
 msgstr "ìîèä"
 
-#: squirrelmail/plugins/filters/options.php:199
+#: squirrelmail/plugins/filters/options.php:208
 msgid "Up"
 msgstr "ìîòìä"
 
-#: squirrelmail/plugins/filters/options.php:202
+#: squirrelmail/plugins/filters/options.php:213
 #, c-format
 msgid "If <b>%s</b> contains <b>%s</b> then move to <b>%s</b>"
 msgstr "àí <b>%s</b> îëéì <b>%s</b> àæ úòáéø àú ääåãòä ì-<b>%s</b>"
@@ -2340,7 +2468,10 @@ msgstr "
 msgid ""
 "Filtering enables messages with different criteria to be automatically "
 "filtered into different folders for easier organization."
-msgstr "áòæøú îéåï äåãòåú ðéúï ìäòáéø äåãòåú àåèåîèéú ìúåê úé÷éåú îñåééîåú, ìôé ÷øéèøéåðéí äîöåééðéí îøàù."
+msgstr ""
+"áòæøú îéåï äåãòåú ðéúï ìäòáéø äåãòåú àåèåîèéú ìúåê úé÷éåú îñåééîåú, ìôé "
+"÷"
+"øéèøéåðéí äîöåééðéí îøàù."
 
 #: squirrelmail/plugins/filters/setup.php:136
 msgid "SPAM Filters"
@@ -2352,68 +2483,75 @@ msgid ""
 "junk email in your INBOX and move it to another folder (like Trash)."
 msgstr "áòæøú îñððé ãåàø áéëåìúê ìçñåí ùøúéí àùø éãåòéí ëùåìçé ãåàø æáì."
 
-#: squirrelmail/plugins/filters/spamoptions.php:57
+#: squirrelmail/plugins/filters/spamoptions.php:59
 msgid "Spam Filtering"
 msgstr "ñéðåï ãåàø æáì (SPAM)"
 
-#: squirrelmail/plugins/filters/spamoptions.php:62
+#: squirrelmail/plugins/filters/spamoptions.php:66
 msgid "WARNING! Tell your admin to set the SpamFilters_YourHop variable"
 msgstr "àæäøä! úâéã ìîðäì äîòøëú ìäâãéø àú äîùúðä SpamFilters_YourHop"
 
-#: squirrelmail/plugins/filters/spamoptions.php:84
+#: squirrelmail/plugins/filters/spamoptions.php:90
 msgid "Move spam to:"
 msgstr "äòáø ãåàø æáì ì:"
 
-#: squirrelmail/plugins/filters/spamoptions.php:102
+#: squirrelmail/plugins/filters/spamoptions.php:111
 msgid ""
 "Moving spam directly to the trash may not be a good idea at first, since "
 "messages from friends and mailing lists might accidentally be marked as "
 "spam. Whatever folder you set this to, make sure that it gets cleaned out "
 "periodically, so that you don't have an excessively large mailbox hanging "
 "around."
-msgstr "ìà îåîìõ ìäòáéø ãåàø æáì éùéøåú ìñì äîéçæåø, áâìì ùäåãòåú"
-"îçáøéí åøùéîåú úôåöä éëåìåú áèòåú ìäéåú îñåîðåú ëãåàø æáì. ðà ìãàåâ ìäòáéø "
-"àú ãåàø äæáì ìúé÷éä àùø îúð÷ä àåèåîèéú áëãé ìîðåò òìéä áâåãì úéáú äãåàø ùìê."
+msgstr ""
+"ìà îåîìõ ìäòáéø ãåàø æáì éùéøåú ìñì äîéçæåø, áâìì ùäåãòåúîçáøéí åøùéîåú "
+"ú"
+"ôåöä éëåìåú áèòåú ìäéåú îñåîðåú ëãåàø æáì. ðà ìãàåâ ìäòáéø àú ãåàø äæáì "
+"ì"
+"úé÷éä àùø îúð÷ä àåèåîèéú áëãé ìîðåò òìéä áâåãì úéáú äãåàø ùìê."
 
-#: squirrelmail/plugins/filters/spamoptions.php:122
+#: squirrelmail/plugins/filters/spamoptions.php:134
 msgid ""
 "The more messages you scan, the longer it takes.  I would suggest that you "
 "scan only new messages.  If you make a change to your filters, I would set "
 "it to scan all messages, then go view my INBOX, then come back and set it to "
 "scan only new messages.  That way, your new spam filters will be applied and "
 "you'll scan even the spam you read with the new filters."
-msgstr "ëëì ùîñôø ääåãòåú äðñø÷åú âãåì éåúø, ëê æîï äñøé÷ä ìå÷ç éåúø æîï. "
-"îåîìõ ìñøå÷ ø÷ äåãòåú çãùåú. áî÷øä åðòùä ùéðåééí áîñððéí, îåîìõ ìäâãéø ìîñðï "
-"ìáãå÷ àú ëì ääåãòä, ìàçø îëï ììëú ìãåàø ðëðñ, åìàçø îëï ìäâéãø àú äîñðï îçãù "
-"ìáãå÷ ø÷ ãåàø çãù. áöåøä æå, éåâãø äîñðï äçãù åâí äãåàø äéùï éáã÷ ðâãå."
-
-#: squirrelmail/plugins/filters/spamoptions.php:160
+msgstr ""
+"ëëì ùîñôø ääåãòåú äðñø÷åú âãåì éåúø, ëê æîï äñøé÷ä ìå÷ç éåúø æîï. îåîìõ "
+"ì"
+"ñøå÷ ø÷ äåãòåú çãùåú. áî÷øä åðòùä ùéðåééí áîñððéí, îåîìõ ìäâãéø ìîñðï ìáãå÷ "
+"à"
+"ú ëì ääåãòä, ìàçø îëï ììëú ìãåàø ðëðñ, åìàçø îëï ìäâéãø àú äîñðï îçãù ìáãå÷ "
+"ø"
+"÷ ãåàø çãù. áöåøä æå, éåâãø äîñðï äçãù åâí äãåàø äéùï éáã÷ ðâãå."
+
+#: squirrelmail/plugins/filters/spamoptions.php:181
 #, c-format
 msgid "Spam is sent to <b>%s</b>"
 msgstr "ãåàø æáì ðùìç ì: <b>%s</b>"
 
-#: squirrelmail/plugins/filters/spamoptions.php:160
+#: squirrelmail/plugins/filters/spamoptions.php:181
 msgid "[<i>not set yet</i>]"
 msgstr "[<i>òãééï ìà äåâãø</i>]"
 
-#: squirrelmail/plugins/filters/spamoptions.php:162
+#: squirrelmail/plugins/filters/spamoptions.php:183
 #, c-format
 msgid "Spam scan is limited to <b>%s</b>"
 msgstr "ñøé÷ú ãåàø æáì îåâáìú ì: <b>%s</b>"
 
-#: squirrelmail/plugins/filters/spamoptions.php:162
+#: squirrelmail/plugins/filters/spamoptions.php:183
 msgid "New Messages Only"
 msgstr "äåãòåú çãùåú áìáã"
 
-#: squirrelmail/plugins/filters/spamoptions.php:162
+#: squirrelmail/plugins/filters/spamoptions.php:183
 msgid "All Messages"
 msgstr "ëì ääåãòåú"
 
-#: squirrelmail/plugins/filters/spamoptions.php:172
+#: squirrelmail/plugins/filters/spamoptions.php:194
 msgid "ON"
 msgstr "ôåòì"
 
-#: squirrelmail/plugins/filters/spamoptions.php:174
+#: squirrelmail/plugins/filters/spamoptions.php:196
 msgid "OFF"
 msgstr "ëáåé"
 
@@ -2425,21 +2563,22 @@ msgstr "
 msgid ""
 "Here you may set up how your personal dictionary is stored, edit it, or "
 "choose which languages should be available to you when spell-checking."
-msgstr "áéëåìúê ìäâãéø àú äîéìåï äàéùé ùìê, ìòøåïê àåúå, àå ìáçåø àú ñôú äîéìåï."
+msgstr ""
+"áéëåìúê ìäâãéø àú äîéìåï äàéùé ùìê, ìòøåïê àåúå, àå ìáçåø àú ñôú äîéìåï."
 
 #: squirrelmail/plugins/squirrelspell/setup.php:77
 msgid "Check Spelling"
 msgstr "áãå÷ àéåú"
 
-#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:54
+#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:58
 msgid "Back to &quot;SpellChecker Options&quot; page"
 msgstr "áçæøä ìãó &quot;àôùøåéåú áåã÷ àéåú&quot;"
 
-#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:356
+#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:361
 msgid "ATTENTION:"
 msgstr "ùéí ìá:"
 
-#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:357
+#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:362
 msgid ""
 "SquirrelSpell was unable to decrypt your personal dictionary. This is most "
 "likely due to the fact that you have changed your mailbox password. In order "
@@ -2449,108 +2588,52 @@ msgid ""
 "got mangled and is no longer valid. You will have to delete it and start "
 "anew. This is also true if you don't remember your old password -- without "
 "it, the encrypted data is no longer accessible."
-msgstr "SquirrelSpell ìà äöìéç ìôòðç àú äîéìåï äàéùé ùìê. øåá äñéëåééí ùæä "
-"áâìì ùùéðú àú äñéñîà ùìê. áëãé ìäîùéê, òìééê ìñô÷ àú äñéñîà äéùðä ùìê "
-"òì-îðú ù-SquirrelSpell éåëì ìôòðç àú äîéìåï äàéùé ùìê. äåà éåöôï îçãù áòæøú "
-"äñéñîà äçãùä ùìê.<br>àí ìà äöôðú àú äîéìåï ùìê, àæ ëðøàä ùäåà äåùçú åàéðå æîéï éåúø. "
-"òìééê ìîçå÷ àåúå åäúçéì îçãù. æä âí ðëåï áî÷øä åùëçú àú äñéñîà ùìê -- ììà äñéñîà "
-"äéùðä äîéãò äîåöôï àéðå æîéï."
-
-#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:363
+msgstr ""
+"SquirrelSpell ìà äöìéç ìôòðç àú äîéìåï äàéùé ùìê. øåá äñéëåééí ùæä áâìì "
+"ù"
+"ùéðú àú äñéñîà ùìê. áëãé ìäîùéê, òìééê ìñô÷ àú äñéñîà äéùðä ùìê òì-îðú ù-"
+"SquirrelSpell éåëì ìôòðç àú äîéìåï äàéùé ùìê. äåà éåöôï îçãù áòæøú äñéñîà "
+"ä"
+"çãùä ùìê.<br>àí ìà äöôðú àú äîéìåï ùìê, àæ ëðøàä ùäåà äåùçú åàéðå æîéï "
+"é"
+"åúø. òìééê ìîçå÷ àåúå åäúçéì îçãù. æä âí ðëåï áî÷øä åùëçú àú äñéñîà ùìê -- "
+"ì"
+"ìà äñéñîà äéùðä äîéãò äîåöôï àéðå æîéï."
+
+#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:369
 msgid "Delete my dictionary and start a new one"
 msgstr "îç÷ àú äîéìåï ùìé åäúçì çãù."
 
-#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:364
+#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:370
 msgid "Decrypt my dictionary with my old password:"
 msgstr "ôòðç àú äîéìåï ùìé áòæøú äñéñîà äéùðä ùìé."
 
-#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:368
+#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:376
 msgid "Proceed"
 msgstr "äú÷ãí"
 
-#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:374
+#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:383
 msgid "You must make a choice"
 msgstr "òìééê ìáçåø àçú îäàôùøåéåú"
 
-#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:375
+#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:384
 msgid ""
 "You can either delete your dictionary or type in the old password. Not both."
 msgstr "áéëåìúê ìîçå÷ àú äîéìåï äéùï àå ìä÷ìéã àú ñéñîàúê äéùðä. ìà ùðéäí."
 
-#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:376
+#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:385
 msgid "This will delete your personal dictionary file. Proceed?"
 msgstr "äàí àúä áèåç ùáøöåðê ìîçå÷ àú äîéìåï äàéùé äéùï ùìê?"
 
-#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:385
-#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:388
+#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:394
+#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:397
 msgid "Error Decrypting Dictionary"
 msgstr "ùâéàä áôòðåç äîéìåï"
 
-#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:506
+#: squirrelmail/plugins/squirrelspell/sqspell_functions.php:515
 msgid "Cute."
 msgstr "çîåã."
 
-#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod:33
-msgid "Your personal dictionary was erased."
-msgstr "äîéìåï äàéùé ùìê ðîç÷."
-
-#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod:34
-#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod:47
-msgid "Dictionary Erased"
-msgstr "îéìåï ðîç÷"
-
-#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod:41
-msgid ""
-"Your personal dictionary was erased. Please close this window and click "
-"\"Check Spelling\" button again to start your spellcheck over."
-msgstr "äîéìåï äàéùé ùìê ðîç÷. àðà ñâåø çìåï æä åìçõ ùåá òì äëôúåø "
-"\"áãå÷ àéåú\" áëãé ìäúçéì îçãù àú áãé÷ú äàéåú."
-
-#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod:45
-#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod:77
-msgid "Close this Window"
-msgstr "ñâåø çìåï æä"
-
-#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod:70
-msgid ""
-"Your personal dictionary was re-encrypted successfully. Now return to the "
-"&quot;SpellChecker options&quot; menu and make your selection again."
-msgstr "äîéìåï äàéùé ùìê äåöôï îçãù áäöìçä. ëòú çæåø ìúôøéè &quot;àôùøåéåú áåã÷ äàéåú&quot; "
-"åáöò àú áçéøúê áùðéú."
-
-#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod:72
-msgid "Successful Re-encryption"
-msgstr "äöôðä îçãù îåöìçú"
-
-#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod:75
-msgid ""
-"Your personal dictionary was re-encrypted successfully. Please close this "
-"window and click \"Check Spelling\" button again to start your spellcheck "
-"over."
-msgstr "äîéìåï äàéùé ùìê äåöôï îçãù áäöìçä. àðà ñâåø çìåï æä åìçõ òì \"áãå÷ àéåú\" ùåá"
-"áëãé ìäúçéì îçãù àú áãé÷ú äàéåú."
-
-#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod:79
-msgid "Dictionary re-encrypted"
-msgstr "îéìåï äåöôï ùåá"
-
-#: squirrelmail/plugins/squirrelspell/modules/crypto.mod:39
-msgid ""
-"Your personal dictionary has been <strong>encrypted</strong> and is now "
-"stored in an <strong>encrypted format</strong>."
-msgstr "äîéìåï äàéùé ùìê <strong>äåöôï</strong> åäåà îàåçñï ëòú <strong>áöåøä îàåáèçú</strong>."
-
-#: squirrelmail/plugins/squirrelspell/modules/crypto.mod:54
-msgid ""
-"Your personal dictionary has been <strong>decrypted</strong> and is now "
-"stored as <strong>clear text</strong>."
-msgstr "äîéìåï äàéùé ùìê <strong>ôåòðç</strong> åäåà îàåçñï ëòú <strong>áöåøä øâéìä</strong>."
-
-#: squirrelmail/plugins/squirrelspell/modules/crypto.mod:65
-#: squirrelmail/plugins/squirrelspell/modules/enc_setup.mod:76
-msgid "Personal Dictionary Crypto Settings"
-msgstr "äâãøåú äöôðä ìîéìåï àéùé"
-
 #: squirrelmail/plugins/squirrelspell/modules/check_me.mod:115
 #, c-format
 msgid "I tried to execute '%s', but it returned:"
@@ -2665,6 +2748,75 @@ msgstr "
 msgid "No errors found"
 msgstr "ìà ðîöàå ùâéàåú"
 
+#: squirrelmail/plugins/squirrelspell/modules/crypto.mod:39
+msgid ""
+"Your personal dictionary has been <strong>encrypted</strong> and is now "
+"stored in an <strong>encrypted format</strong>."
+msgstr ""
+"äîéìåï äàéùé ùìê <strong>äåöôï</strong> åäåà îàåçñï ëòú <strong>áöåøä "
+"î"
+"àåáèçú</strong>."
+
+#: squirrelmail/plugins/squirrelspell/modules/crypto.mod:54
+msgid ""
+"Your personal dictionary has been <strong>decrypted</strong> and is now "
+"stored as <strong>clear text</strong>."
+msgstr ""
+"äîéìåï äàéùé ùìê <strong>ôåòðç</strong> åäåà îàåçñï ëòú <strong>áöåøä øâéìä</"
+"strong>."
+
+#: squirrelmail/plugins/squirrelspell/modules/crypto.mod:65
+#: squirrelmail/plugins/squirrelspell/modules/enc_setup.mod:76
+msgid "Personal Dictionary Crypto Settings"
+msgstr "äâãøåú äöôðä ìîéìåï àéùé"
+
+#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod:33
+msgid "Your personal dictionary was erased."
+msgstr "äîéìåï äàéùé ùìê ðîç÷."
+
+#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod:34
+#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod:47
+msgid "Dictionary Erased"
+msgstr "îéìåï ðîç÷"
+
+#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod:41
+msgid ""
+"Your personal dictionary was erased. Please close this window and click "
+"\"Check Spelling\" button again to start your spellcheck over."
+msgstr "äîéìåï äàéùé ùìê ðîç÷. àðà ñâåø çìåï æä åìçõ ùåá òì äëôúåø \"áãå÷ àéåú\" áëãé ìäúçéì îçãù àú áãé÷ú äàéåú."
+
+#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod:45
+#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod:77
+msgid "Close this Window"
+msgstr "ñâåø çìåï æä"
+
+#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod:70
+msgid ""
+"Your personal dictionary was re-encrypted successfully. Now return to the "
+"&quot;SpellChecker options&quot; menu and make your selection again."
+msgstr ""
+"äîéìåï äàéùé ùìê äåöôï îçãù áäöìçä. ëòú çæåø ìúôøéè &quot;àôùøåéåú áåã÷ "
+"ä"
+"àéåú&quot; åáöò àú áçéøúê áùðéú."
+
+#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod:72
+msgid "Successful Re-encryption"
+msgstr "äöôðä îçãù îåöìçú"
+
+#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod:75
+msgid ""
+"Your personal dictionary was re-encrypted successfully. Please close this "
+"window and click \"Check Spelling\" button again to start your spellcheck "
+"over."
+msgstr ""
+"äîéìåï äàéùé ùìê äåöôï îçãù áäöìçä. àðà ñâåø çìåï æä åìçõ òì \"áãå÷ àéåú\" "
+"ù"
+"åááëãé ìäúçéì îçãù àú áãé÷ú äàéåú."
+
+#: squirrelmail/plugins/squirrelspell/modules/crypto_badkey.mod:79
+msgid "Dictionary re-encrypted"
+msgstr "îéìåï äåöôï ùåá"
+
 #: squirrelmail/plugins/squirrelspell/modules/edit_dic.mod:28
 #: squirrelmail/plugins/squirrelspell/modules/forget_me.mod:77
 msgid "Personal Dictionary"
@@ -2719,12 +2871,18 @@ msgid ""
 "unaccessible, since it can no longer be decrypted. If you change your "
 "mailbox password, SquirrelSpell will recognize it and prompt you for your "
 "old password in order to re-encrypt the dictionary with a new key.</p>"
-msgstr "<p>äîéìåï äàéùé ùìê ðîöà ëòú <strong>áîöá îåöôï</strong>. æä "
-"òåæø ìùîåø òì äôøèéåú ùìê áî÷øä åäîéìåï ðâðá. ëøâò äåà îåöôï áòæøú äñéñîà "
-"ùì úéáú äãåàø ùìê, îä ùî÷ùä òì îé ùøåöä ìøàåú àú äîéãò äîàåçñï áîéìåï äàéùé ùìê.</p> "
-"<p><strong>ùéí ìá:</strong> àí ùëçú àú äñéñîà ùìê, äîéìåï äàéùé éäôê ììà æîéï, îëéååï "
-"ùìà ðéúï ìôòðç àú ä÷éãåã. áî÷øä åúùðä àú ñéñîàú äãåàø ùìê, SquirrelMail éæää æàú "
-"åéá÷ù îîê ìäëðéñ àú äñéñîà äéùðä áëãé ìäöôéï àú äîéìåï áòæøú äñéñîà äçãùä.</p>"
+msgstr ""
+"<p>äîéìåï äàéùé ùìê ðîöà ëòú <strong>áîöá îåöôï</strong>. æä òåæø ìùîåø òì "
+"ä"
+"ôøèéåú ùìê áî÷øä åäîéìåï ðâðá. ëøâò äåà îåöôï áòæøú äñéñîà ùì úéáú äãåàø "
+"ù"
+"ìê, îä ùî÷ùä òì îé ùøåöä ìøàåú àú äîéãò äîàåçñï áîéìåï äàéùé ùìê.</p> "
+"<p><strong>ùéí ìá:</strong> àí ùëçú àú äñéñîà ùìê, äîéìåï äàéùé éäôê ììà "
+"æ"
+"îéï, îëéååï ùìà ðéúï ìôòðç àú ä÷éãåã. áî÷øä åúùðä àú ñéñîàú äãåàø ùìê, "
+"SquirrelMail éæää æàú åéá÷ù îîê ìäëðéñ àú äñéñîà äéùðä áëãé ìäöôéï àú äîéìåï "
+"á"
+"òæøú äñéñîà äçãùä.</p>"
 
 #: squirrelmail/plugins/squirrelspell/modules/enc_setup.mod:52
 msgid ""
@@ -2751,14 +2909,23 @@ msgid ""
 "change your mailbox password but you still have the old password at hand, "
 "you will be able to enter the old key to re-encrypt the dictionary with the "
 "new value.</p>"
-msgstr "<p>äîéìåï äàéùé ùìê ðîöà ëòú <strong>áîöá øâéì</strong>. àí áøöåðê "
-"ìäâï òì ôøèéåú äîéìåï äàéùé ùìê áî÷øä ùäåà ðâðá, òìééê ìäöéôðå. ëàùø áîöá îåöôï, "
-"úëåìú ä÷åáõ ðøàú îòååúú, å÷ùä ìôòðåç ììà äîôúç (ùäåà ñéñîàú úéáú äãåàø ùìê).</p> "
-"<p><strong>ùéí ìá:</strong> àí äéðê îçìéè ùáøöåðê ìäöôéï àú äîéìåï äàéùé ùìê, "
-"òìééê ìæëåø ùäåà îåöôï áòæøú ñéñîàú úéáú äãåàø ùìê. áî÷øä åùëçú àú äñéñîà "
-"åîðäì äîòøëú ùéðä àåúä, äîéìåï äàéùé ùìê éäéä çñø ùéîåù åéäéä òìééê ìäúçéì îçãù. "
-"áëì àåôï, áî÷øä åîðäì äîòøëú ùéðä àú äñéñîà ùìê, åäéðê æåëø àú äñéñîà äéùðä, "
-"éäéä áéëåìúê ìä÷ìéã àú äñéñîà äéùðä åìäöôéï îçãù àú äîéìåï áòæøú äñéñîà äçãùä.</p>"
+msgstr ""
+"<p>äîéìåï äàéùé ùìê ðîöà ëòú <strong>áîöá øâéì</strong>. àí áøöåðê ìäâï òì "
+"ô"
+"øèéåú äîéìåï äàéùé ùìê áî÷øä ùäåà ðâðá, òìééê ìäöéôðå. ëàùø áîöá îåöôï, "
+"ú"
+"ëåìú ä÷åáõ ðøàú îòååúú, å÷ùä ìôòðåç ììà äîôúç (ùäåà ñéñîàú úéáú äãåàø ùìê)."
+"</p> <p><strong>ùéí ìá:</strong> àí äéðê îçìéè ùáøöåðê ìäöôéï àú äîéìåï "
+"ä"
+"àéùé ùìê, òìééê ìæëåø ùäåà îåöôï áòæøú ñéñîàú úéáú äãåàø ùìê. áî÷øä åùëçú "
+"à"
+"ú äñéñîà åîðäì äîòøëú ùéðä àåúä, äîéìåï äàéùé ùìê éäéä çñø ùéîåù åéäéä "
+"ò"
+"ìééê ìäúçéì îçãù. áëì àåôï, áî÷øä åîðäì äîòøëú ùéðä àú äñéñîà ùìê, åäéðê "
+"æ"
+"åëø àú äñéñîà äéùðä, éäéä áéëåìúê ìä÷ìéã àú äñéñîà äéùðä åìäöôéï îçãù àú "
+"ä"
+"îéìåï áòæøú äñéñîà äçãùä.</p>"
 
 #: squirrelmail/plugins/squirrelspell/modules/enc_setup.mod:70
 msgid ""
@@ -2793,8 +2960,8 @@ msgid ""
 "message:"
 msgstr "àðà áçø áàéæä îéìåï áøöåðê ìäùúîù ìáãé÷ú äàéåú ùì äåãòä æå:"
 
-#: squirrelmail/plugins/calendar/calendar.php:113
 #: squirrelmail/plugins/squirrelspell/modules/init.mod:53
+#: squirrelmail/plugins/calendar/calendar.php:125
 msgid "Go"
 msgstr "ìê"
 
@@ -2807,8 +2974,10 @@ msgstr "
 msgid ""
 "Settings adjusted to: <strong>%s</strong> with <strong>%s</strong> as "
 "default dictionary."
-msgstr "äâãøåú äåúàîå ì: <strong>%s</strong> òí <strong>%s</strong> ëîéìåï "
-"áøéøú äîçãì."
+msgstr ""
+"äâãøåú äåúàîå ì: <strong>%s</strong> òí <strong>%s</strong> ëîéìåï áøéøú "
+"ä"
+"îçãì."
 
 #: squirrelmail/plugins/squirrelspell/modules/lang_change.mod:79
 #, c-format
@@ -2823,8 +2992,7 @@ msgstr "
 msgid ""
 "Please check any available international dictionaries which you would like "
 "to use when spellchecking:"
-msgstr "àðà ñîï àú ëì äîéìåðéí äáéðìàåîééí ùáøöåðê ìäùúîù "
-"ááãé÷ àéåú:"
+msgstr "àðà ñîï àú ëì äîéìåðéí äáéðìàåîééí ùáøöåðê ìäùúîù ááãé÷ àéåú:"
 
 #: squirrelmail/plugins/squirrelspell/modules/lang_setup.mod:32
 msgid "Make this dictionary my default selection:"
@@ -3215,121 +3383,137 @@ msgstr "
 msgid "Latin"
 msgstr "ìèéðéú"
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:37
+#: squirrelmail/plugins/newmail/newmail.php:20
+msgid "New Mail"
+msgstr "ãåàø çãù"
+
+#: squirrelmail/plugins/newmail/newmail.php:26
+msgid "SquirrelMail Notice:"
+msgstr "äåãòú SquirrelMail:"
+
+#: squirrelmail/plugins/newmail/newmail.php:31
+msgid "You have new mail!"
+msgstr "éù ìê ãåàø çãù!"
+
+#: squirrelmail/plugins/newmail/newmail_opt.php:38
 msgid "New Mail Notification"
 msgstr "äåãòä òì ãåàø çãù"
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:41
+#: squirrelmail/plugins/newmail/newmail_opt.php:44
 msgid ""
 "Select <b>Enable Media Playing</b> to turn on playing a media file when "
 "unseen mail is in your folders. When enabled, you can specify the media file "
 "to play in the provided file box."
-msgstr "áëãé ìäôòéì ðéâåï ÷åáõ îãéä ëàùø éù ãåàø çãù áçø áàôùøåú "
-"<b>àôùø ðéâåï îãéä</b>. áéëåìúê ìöééï àú ÷åáõ äîãéä ùéðåâï."
+msgstr ""
+"áëãé ìäôòéì ðéâåï ÷åáõ îãéä ëàùø éù ãåàø çãù áçø áàôùøåú <b>àôùø ðéâåï îãéä</"
+"b>. áéëåìúê ìöééï àú ÷åáõ äîãéä ùéðåâï."
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:45
+#: squirrelmail/plugins/newmail/newmail_opt.php:48
 msgid ""
 "The <b>Check all boxes, not just INBOX</b> option will check ALL of your "
 "folders for unseen mail, not just the inbox for notification."
-msgstr "áëãé ìáãå÷ ãåàø çãù áëì äúé÷éåú åìà ø÷ áúéáú äãåàø äðëðñ, ñîï àú äàôùøåú "
+msgstr ""
+"áëãé ìáãå÷ ãåàø çãù áëì äúé÷éåú åìà ø÷ áúéáú äãåàø äðëðñ, ñîï àú äàôùøåú "
 "<b>áãå÷ àú ëì äúé÷éåú, ìà ø÷ àú úéáú äãåàø äðëðñ</b>."
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:47
+#: squirrelmail/plugins/newmail/newmail_opt.php:51
 msgid ""
 "Selecting the <b>Show popup</b> option will enable the showing of a popup "
 "window when unseen mail is in your folders (requires JavaScript)."
-msgstr "àí áøöåðê ùéôúç çìåï ÷èï äîåãéò òì äåãòåú çãùåú áçø áàôùøåú "
-"<b>ëùéù äåãòåú çãùåú äöâ çìåï ÷èï</b> (îöøéê JavaScript)"
+msgstr ""
+"àí áøöåðê ùéôúç çìåï ÷èï äîåãéò òì äåãòåú çãùåú áçø áàôùøåú <b>ëùéù äåãòåú "
+"ç"
+"ãùåú äöâ çìåï ÷èï</b> (îöøéê JavaScript)"
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:49
+#: squirrelmail/plugins/newmail/newmail_opt.php:54
 msgid ""
 "Use the <b>Check RECENT</b> to only check for messages that are recent. "
 "Recent messages are those that have just recently showed up and have not "
 "been \"viewed\" or checked yet.  This can prevent being continuously annoyed "
 "by sounds or popups for unseen mail."
-msgstr "áçø áàôùøåú <b>ñôåø ø÷ äåãòåú ùäâéòå ìàçøåðä</b> áëãé ìáãå÷ ø÷ äåãòåú ùäâéòå ìàçøåðä. "
-"äåãòåú àùø äâéòå ìàçøåðä äï äåãòåú àùø äâéòå ìôðé æîï ÷öø àê ìà ð÷øàå àå ñåîðå òãééï. "
-"àôùøåú æå îåðòú äèøãä øöåôä ùì öìéìéí åçìåðåú àùø ðôúçéí áâìì ãåàø ùìà ð÷øà."
-
-#: squirrelmail/plugins/newmail/newmail_opt.php:51
+msgstr ""
+"áçø áàôùøåú <b>ñôåø ø÷ äåãòåú ùäâéòå ìàçøåðä</b> áëãé ìáãå÷ ø÷ äåãòåú ùäâéòå "
+"ì"
+"àçøåðä. äåãòåú àùø äâéòå ìàçøåðä äï äåãòåú àùø äâéòå ìôðé æîï ÷öø àê ìà "
+"ð"
+"÷øàå àå ñåîðå òãééï. àôùøåú æå îåðòú äèøãä øöåôä ùì öìéìéí åçìåðåú àùø "
+"ð"
+"ôúçéí áâìì ãåàø ùìà ð÷øà."
+
+#: squirrelmail/plugins/newmail/newmail_opt.php:57
 msgid ""
 "Selecting the <b>Change title</b> option will change the title in some "
 "browsers to let you know when you have new mail (requires JavaScript, and "
 "only works in IE but you won't see errors with other browsers).  This will "
 "always tell you if you have new mail, even if you have <b>Check RECENT</b> "
 "enabled."
-msgstr "äàôùøåú <b>ùðä ëåúøú áãôãôðéí ðúîëéí</b> úùðä àú ëåúøú äçìåï ùì äãôãôï "
-"ëàùø îâéò ãåàø çãù (àôùøåú æå îöøéëä JavaScript åãôãôï àéðèøðè à÷ñôìåøø, àê ìà "
-"éåôéòå äåãòåú ùâéàä áãôãôðéí àçøéí). àôùøåú æå úåãéò úîéã òì ãåàø çãù, àôéìå àí ñåîðä "
-"äàôùøåú <b>ñôåø ø÷ äåãòåú ùäâéòå ìàçøåðä</b>."
-
-#: squirrelmail/plugins/newmail/newmail_opt.php:55
+msgstr ""
+"äàôùøåú <b>ùðä ëåúøú áãôãôðéí ðúîëéí</b> úùðä àú ëåúøú äçìåï ùì äãôãôï ëàùø "
+"î"
+"âéò ãåàø çãù (àôùøåú æå îöøéëä JavaScript åãôãôï àéðèøðè à÷ñôìåøø, àê ìà "
+"é"
+"åôéòå äåãòåú ùâéàä áãôãôðéí àçøéí). àôùøåú æå úåãéò úîéã òì ãåàø çãù, àôéìå "
+"à"
+"í ñåîðä äàôùøåú <b>ñôåø ø÷ äåãòåú ùäâéòå ìàçøåðä</b>."
+
+#: squirrelmail/plugins/newmail/newmail_opt.php:61
 msgid ""
 "Select from the list of <b>server files</b> the media file to play when new "
 "mail arrives.  Selecting <b>local media</b> will play the file specified in "
 "the <b>local media file</b> box to play from the local computer.  If no file "
 "is specified, the system will use a default from the server."
-msgstr "áçø îäøùéîä ùì <b>÷áöé äùøú</b> àú ÷åáõ äîãéä ùáøöåðê ùéðâï "
-"ëàùø îâéò ãåàø çãù. áçéøú äàôùøåú <b>÷åáõ îãéä î÷åîé</b> éðâï àú ä÷åáõ "
-"àùø éáçø îäîçùá ùìê. àí ìà ðáçø ùåí ÷åáõ äîòøëú úùúîù á÷åáõ áøéøú äîçãì."
+msgstr ""
+"áçø îäøùéîä ùì <b>÷áöé äùøú</b> àú ÷åáõ äîãéä ùáøöåðê ùéðâï ëàùø îâéò ãåàø "
+"ç"
+"ãù. áçéøú äàôùøåú <b>÷åáõ îãéä î÷åîé</b> éðâï àú ä÷åáõ àùø éáçø îäîçùá ùìê. "
+"à"
+"í ìà ðáçø ùåí ÷åáõ äîòøëú úùúîù á÷åáõ áøéøú äîçãì."
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:67
+#: squirrelmail/plugins/newmail/newmail_opt.php:74
 msgid "Enable Media Playing"
 msgstr "àôùø ðéâåï îãéä"
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:76
+#: squirrelmail/plugins/newmail/newmail_opt.php:84
 msgid "Check all boxes, not just INBOX"
 msgstr "áãå÷ àú ëì äúéáåú, ìà ø÷ àú úéáú äãåàø äðëðñ"
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:84
+#: squirrelmail/plugins/newmail/newmail_opt.php:93
 msgid "Count only messages that are RECENT"
 msgstr "ñôåø ø÷ äåãòåú ùäâéòå ìàçøåðä"
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:92
+#: squirrelmail/plugins/newmail/newmail_opt.php:102
 msgid "Change title on supported browsers."
 msgstr "ùðä ëåúøú áãôãôðéí ðúîëéí."
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:92
-#: squirrelmail/plugins/newmail/newmail_opt.php:100
+#: squirrelmail/plugins/newmail/newmail_opt.php:102
+#: squirrelmail/plugins/newmail/newmail_opt.php:111
 msgid "requires JavaScript to work"
 msgstr "áëãé ìòáåã ðçåõ JavaScript"
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:100
+#: squirrelmail/plugins/newmail/newmail_opt.php:111
 msgid "Show popup window on new mail"
 msgstr "ëùéù äåãòåú çãùåú äöâ çìåï ÷èï"
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:104
+#: squirrelmail/plugins/newmail/newmail_opt.php:115
 msgid "Select server file:"
 msgstr "áçø ÷åáõ ùøú:"
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:106
+#: squirrelmail/plugins/newmail/newmail_opt.php:118
 msgid "(local media)"
 msgstr "(îãéä î÷åîéú)"
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:123
+#: squirrelmail/plugins/newmail/newmail_opt.php:135
 msgid "Try"
 msgstr "ðñä"
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:131
+#: squirrelmail/plugins/newmail/newmail_opt.php:143
 msgid "Local Media File:"
 msgstr "÷åáõ îãéä î÷åîé:"
 
-#: squirrelmail/plugins/newmail/newmail_opt.php:137
+#: squirrelmail/plugins/newmail/newmail_opt.php:147
 msgid "Current File:"
 msgstr "÷åáõ ðåëçé:"
 
-#: squirrelmail/plugins/newmail/newmail.php:20
-msgid "New Mail"
-msgstr "ãåàø çãù"
-
-#: squirrelmail/plugins/newmail/newmail.php:27
-msgid "SquirrelMail Notice:"
-msgstr "äåãòú SquirrelMail:"
-
-#: squirrelmail/plugins/newmail/newmail.php:31
-msgid "You have new mail!"
-msgstr "éù ìê ãåàø çãù!"
-
 #: squirrelmail/plugins/newmail/setup.php:78
 msgid "NewMail Options"
 msgstr "àôùøåéåú ãåàø çãù"
@@ -3338,8 +3522,8 @@ msgstr "
 msgid ""
 "This configures settings for playing sounds and/or showing popup windows "
 "when new mail arrives."
-msgstr "áàôùøåúê ìäâãéø ðéâðåï öìéìéí å\\àå ôúéçú çìåï ÷èï áî÷øä "
-"ùîâéò ãåàø çãù."
+msgstr ""
+"áàôùøåúê ìäâãéø ðéâðåï öìéìéí å\\àå ôúéçú çìåï ÷èï áî÷øä ùîâéò ãåàø çãù."
 
 #: squirrelmail/plugins/newmail/setup.php:129
 msgid "New Mail Notification options saved"
@@ -3355,11 +3539,11 @@ msgstr "%s 
 msgid "%s New Message"
 msgstr "%s äåãòä çãùä"
 
-#: squirrelmail/plugins/newmail/testsound.php:24
+#: squirrelmail/plugins/newmail/testsound.php:25
 msgid "Test Sound"
 msgstr "áãå÷ öìéìéí"
 
-#: squirrelmail/plugins/newmail/testsound.php:30
+#: squirrelmail/plugins/newmail/testsound.php:33
 msgid "Loading the sound..."
 msgstr "èåòï àú äöìéì..."
 
@@ -3543,230 +3727,253 @@ msgstr "
 msgid "Command failed "
 msgstr "ô÷åãä ðëùìä "
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:54
+#: squirrelmail/plugins/mail_fetch/fetch.php:58
 msgid "Remote POP server Fetching Mail"
 msgstr "îåùê ãåàø îùøú POP3 îøåç÷"
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:63
+#: squirrelmail/plugins/mail_fetch/fetch.php:68
 msgid "Select Server:"
 msgstr "áçø ùøú:"
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:65
-msgid "All"
-msgstr "äëì"
-
-#: squirrelmail/plugins/mail_fetch/fetch.php:78
+#: squirrelmail/plugins/mail_fetch/fetch.php:85
 msgid "Password for"
 msgstr "ñéñîà áùáéì"
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:85
+#: squirrelmail/plugins/mail_fetch/fetch.php:95
 msgid "Fetch Mail"
 msgstr "îùåê ãåàø"
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:117
+#: squirrelmail/plugins/mail_fetch/fetch.php:130
 msgid "Fetching from "
 msgstr "îåùê î-"
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:124
-#: squirrelmail/plugins/mail_fetch/fetch.php:184
+#: squirrelmail/plugins/mail_fetch/fetch.php:140
+#: squirrelmail/plugins/mail_fetch/fetch.php:200
+#: squirrelmail/plugins/mail_fetch/fetch.php:206
 msgid "Oops, "
 msgstr "àåôñ, "
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:128
+#: squirrelmail/plugins/mail_fetch/fetch.php:144
 msgid "Opening IMAP server"
 msgstr "ôåúç ùøú IMAP"
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:131
+#: squirrelmail/plugins/mail_fetch/fetch.php:147
 msgid "Opening POP server"
 msgstr "ôåúç ùøú POP"
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:134
+#: squirrelmail/plugins/mail_fetch/fetch.php:150
+#: squirrelmail/plugins/mail_fetch/fetch.php:214
 #: squirrelmail/plugins/mail_fetch/setup.php:123
 msgid "Login Failed:"
 msgstr "ëðéñä ùâåéä:"
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:151
+#: squirrelmail/plugins/mail_fetch/fetch.php:167
 msgid "Login OK: No new messages"
 msgstr "ëðéñä àåùøä: àéï äåãòåú çãùåú"
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:156
+#: squirrelmail/plugins/mail_fetch/fetch.php:172
 msgid "Login OK: Inbox EMPTY"
 msgstr "ëðéñä àåùøä: úéáú ãåàø ðëðñ øé÷ä"
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:161
+#: squirrelmail/plugins/mail_fetch/fetch.php:177
 msgid "Login OK: Inbox contains ["
 msgstr "ëðéñä àåùøä: úéáú ãåàø ðëðñ îëéìä ["
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:161
+#: squirrelmail/plugins/mail_fetch/fetch.php:177
 msgid "] messages"
 msgstr "] äåãòåú"
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:164
+#: squirrelmail/plugins/mail_fetch/fetch.php:180
 msgid "Fetching UIDL..."
 msgstr "îåùê UIDL..."
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:169
+#: squirrelmail/plugins/mail_fetch/fetch.php:185
 #: squirrelmail/plugins/mail_fetch/setup.php:154
 msgid "Server does not support UIDL."
 msgstr "ùøú ìà úåîê á UIDL."
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:172
+#: squirrelmail/plugins/mail_fetch/fetch.php:188
 msgid "Leaving Mail on Server..."
 msgstr "îùàéø àú äãåàø òì äùøú..."
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:174
+#: squirrelmail/plugins/mail_fetch/fetch.php:190
 msgid "Deleting messages from server..."
 msgstr "îåç÷ äåãòåú îäùøú..."
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:178
+#: squirrelmail/plugins/mail_fetch/fetch.php:194
 msgid "Fetching message "
 msgstr "îåùê äåãòä "
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:201
-msgid "Message appended to mailbox"
-msgstr "äåãòä öåøôä ìúéáú äãåàø"
-
-#: squirrelmail/plugins/mail_fetch/fetch.php:205
-msgid "Message "
-msgstr "äåãòä "
+#: squirrelmail/plugins/mail_fetch/fetch.php:202
+msgid "Server error...Disconnect"
+msgstr ""
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:205
-msgid " deleted from Remote Server!"
-msgstr " ðîç÷ä îùøú îøåç÷!"
+#: squirrelmail/plugins/mail_fetch/fetch.php:204
+msgid "Re-connect from dead connectoin"
+msgstr ""
 
 #: squirrelmail/plugins/mail_fetch/fetch.php:207
-msgid "Delete failed:"
-msgstr "îçé÷ä ðëùìä:"
+#: squirrelmail/plugins/mail_fetch/fetch.php:215
+#: squirrelmail/plugins/mail_fetch/fetch.php:245
+#: squirrelmail/plugins/mail_fetch/fetch.php:268
+#: squirrelmail/plugins/mail_fetch/fetch.php:279
+msgid "Saving UIDL"
+msgstr "ùåîø UIDL"
+
+#: squirrelmail/plugins/mail_fetch/fetch.php:220
+msgid "Re-fetching message "
+msgstr "îåùê äåãòä "
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:212
+#: squirrelmail/plugins/mail_fetch/fetch.php:239
+#: squirrelmail/plugins/mail_fetch/fetch.php:261
 #: squirrelmail/plugins/mail_fetch/setup.php:185
 msgid "Error Appending Message!"
 msgstr "ùâéàä áöéøåó ääåãòä!"
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:216
+#: squirrelmail/plugins/mail_fetch/fetch.php:240
+#: squirrelmail/plugins/mail_fetch/fetch.php:262
+#: squirrelmail/plugins/mail_fetch/fetch.php:274
 msgid "Closing POP"
 msgstr "ñåâø àú ä-POP"
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:218
+#: squirrelmail/plugins/mail_fetch/fetch.php:242
+#: squirrelmail/plugins/mail_fetch/fetch.php:264
+#: squirrelmail/plugins/mail_fetch/fetch.php:276
 msgid "Logging out from IMAP"
 msgstr "îúðú÷ îùøú IMAP"
 
-#: squirrelmail/plugins/mail_fetch/fetch.php:221
-msgid "Saving UIDL"
-msgstr "ùåîø UIDL"
+#: squirrelmail/plugins/mail_fetch/fetch.php:249
+msgid "Message appended to mailbox"
+msgstr "äåãòä öåøôä ìúéáú äãåàø"
 
-#: squirrelmail/plugins/mail_fetch/options.php:105
+#: squirrelmail/plugins/mail_fetch/fetch.php:254
+msgid "Message "
+msgstr "äåãòä "
+
+#: squirrelmail/plugins/mail_fetch/fetch.php:254
+msgid " deleted from Remote Server!"
+msgstr " ðîç÷ä îùøú îøåç÷!"
+
+#: squirrelmail/plugins/mail_fetch/fetch.php:256
+msgid "Delete failed:"
+msgstr "îçé÷ä ðëùìä:"
+
+#: squirrelmail/plugins/mail_fetch/options.php:108
 msgid "Remote POP server settings"
 msgstr "äâãøåú ùøú POP îøåç÷"
 
-#: squirrelmail/plugins/mail_fetch/options.php:107
+#: squirrelmail/plugins/mail_fetch/options.php:115
 msgid ""
 "You should be aware that the encryption used to store your password is not "
 "perfectly secure.  However, if you are using pop, there is inherently no "
 "encryption anyway. Additionally, the encryption that we do to save it on the "
 "server can be undone by a hacker reading the source to this file."
-msgstr "òìééê ìäéåú îåãò ìëê ùääöôðä äðîöàú áùéîåù áëãé ìäöôéï àú ñéñîàúê "
-"àéððä áèåçä ìçìåèéï. ìîøåú æàú, àí äéðê îùúîù á-POP, àéï äöôðä áëì î÷øä. "
-"áðåñó, ëì ôåøõ àùø é÷øà àú ä÷åã ùì ÷åáõ æä éåëì ìôòðç àú ääöôðä ùàðå îùúîùéí "
-"áä áëãé ìäöôéï àú ñéñîàúê òì äùøú."
-
-#: squirrelmail/plugins/mail_fetch/options.php:109
+msgstr ""
+"òìééê ìäéåú îåãò ìëê ùääöôðä äðîöàú áùéîåù áëãé ìäöôéï àú ñéñîàúê àéððä "
+"á"
+"èåçä ìçìåèéï. ìîøåú æàú, àí äéðê îùúîù á-POP, àéï äöôðä áëì î÷øä. áðåñó, ëì "
+"ô"
+"åøõ àùø é÷øà àú ä÷åã ùì ÷åáõ æä éåëì ìôòðç àú ääöôðä ùàðå îùúîùéí áä áëãé "
+"ì"
+"äöôéï àú ñéñîàúê òì äùøú."
+
+#: squirrelmail/plugins/mail_fetch/options.php:120
 msgid "If you leave password empty, it will be required when you fetch mail."
 msgstr "áî÷øä åúùàéø àú äñéñîà øé÷ä, äéà úãøù ëàùø úðñä ìäáéà àú äãåàø."
 
-#: squirrelmail/plugins/mail_fetch/options.php:113
+#: squirrelmail/plugins/mail_fetch/options.php:127
 msgid "Encrypt passwords (informative only)"
 msgstr "äöôï ñéñîàåú (àéðôåøîèéáé áìáã)"
 
-#: squirrelmail/plugins/mail_fetch/options.php:119
-#: squirrelmail/plugins/mail_fetch/options.php:146
+#: squirrelmail/plugins/mail_fetch/options.php:136
+#: squirrelmail/plugins/mail_fetch/options.php:192
 msgid "Add Server"
 msgstr "äåñó ùøú"
 
-#: squirrelmail/plugins/mail_fetch/options.php:123
-#: squirrelmail/plugins/mail_fetch/options.php:196
+#: squirrelmail/plugins/mail_fetch/options.php:145
+#: squirrelmail/plugins/mail_fetch/options.php:262
 msgid "Server:"
 msgstr "ùøú:"
 
-#: squirrelmail/plugins/mail_fetch/options.php:124
-#: squirrelmail/plugins/mail_fetch/options.php:198
+#: squirrelmail/plugins/mail_fetch/options.php:149
+#: squirrelmail/plugins/mail_fetch/options.php:266
 msgid "Alias:"
 msgstr "ëéðåé:"
 
-#: squirrelmail/plugins/mail_fetch/options.php:125
-#: squirrelmail/plugins/mail_fetch/options.php:200
+#: squirrelmail/plugins/mail_fetch/options.php:153
+#: squirrelmail/plugins/mail_fetch/options.php:270
 msgid "Username:"
 msgstr "ùí îùúîù:"
 
-#: squirrelmail/plugins/mail_fetch/options.php:127
-#: squirrelmail/plugins/mail_fetch/options.php:204
+#: squirrelmail/plugins/mail_fetch/options.php:161
+#: squirrelmail/plugins/mail_fetch/options.php:278
 msgid "Store in Folder:"
 msgstr "àçñï áúé÷éä:"
 
-#: squirrelmail/plugins/mail_fetch/options.php:143
-#: squirrelmail/plugins/mail_fetch/options.php:224
+#: squirrelmail/plugins/mail_fetch/options.php:180
+#: squirrelmail/plugins/mail_fetch/options.php:303
 msgid "Leave Mail on Server"
 msgstr "äùàø ãåàø òì äùøú"
 
-#: squirrelmail/plugins/mail_fetch/options.php:144
-#: squirrelmail/plugins/mail_fetch/options.php:226
+#: squirrelmail/plugins/mail_fetch/options.php:184
+#: squirrelmail/plugins/mail_fetch/options.php:310
 msgid "Check mail during login"
 msgstr "áãå÷ ãåàø áëðéñä"
 
-#: squirrelmail/plugins/mail_fetch/options.php:145
-#: squirrelmail/plugins/mail_fetch/options.php:228
+#: squirrelmail/plugins/mail_fetch/options.php:188
+#: squirrelmail/plugins/mail_fetch/options.php:317
 msgid "Check mail during folder refresh"
 msgstr "áãå÷ ãåàø áøòðåï úé÷éä"
 
-#: squirrelmail/plugins/mail_fetch/options.php:152
-#: squirrelmail/plugins/mail_fetch/options.php:229
+#: squirrelmail/plugins/mail_fetch/options.php:201
+#: squirrelmail/plugins/mail_fetch/options.php:322
 msgid "Modify Server"
 msgstr "òãëï ùøú"
 
-#: squirrelmail/plugins/mail_fetch/options.php:156
+#: squirrelmail/plugins/mail_fetch/options.php:207
 msgid "Server Name:"
 msgstr "ùí ùøú:"
 
-#: squirrelmail/plugins/mail_fetch/options.php:162
-#: squirrelmail/plugins/mail_fetch/options.php:185
+#: squirrelmail/plugins/mail_fetch/options.php:213
+#: squirrelmail/plugins/mail_fetch/options.php:244
 msgid "Modify"
 msgstr "òãëï"
 
-#: squirrelmail/plugins/mail_fetch/options.php:166
+#: squirrelmail/plugins/mail_fetch/options.php:217
 msgid "No-one server in use. Try to add."
 msgstr "ìà ðîöà àó ùøú àçã áùéîåù. ðñä ìäåñéó."
 
-#: squirrelmail/plugins/mail_fetch/options.php:172
-#: squirrelmail/plugins/mail_fetch/options.php:187
-#: squirrelmail/plugins/mail_fetch/options.php:234
+#: squirrelmail/plugins/mail_fetch/options.php:224
+#: squirrelmail/plugins/mail_fetch/options.php:247
+#: squirrelmail/plugins/mail_fetch/options.php:332
 msgid "Fetching Servers"
 msgstr "îåùê ùøúéí"
 
-#: squirrelmail/plugins/mail_fetch/options.php:176
+#: squirrelmail/plugins/mail_fetch/options.php:230
 msgid "Confirm Deletion of a Server"
 msgstr "àùø îçé÷ú ùøú"
 
-#: squirrelmail/plugins/mail_fetch/options.php:180
+#: squirrelmail/plugins/mail_fetch/options.php:236
 msgid "Selected Server:"
 msgstr "ùøú ðáçø:"
 
-#: squirrelmail/plugins/mail_fetch/options.php:181
+#: squirrelmail/plugins/mail_fetch/options.php:237
 msgid "Confirm delete of selected server?"
 msgstr "îàùø îçé÷ú ùøú ðáçø?"
 
-#: squirrelmail/plugins/mail_fetch/options.php:182
+#: squirrelmail/plugins/mail_fetch/options.php:238
 msgid "Confirm Delete"
 msgstr "àùø îçé÷ä"
 
-#: squirrelmail/plugins/mail_fetch/options.php:191
+#: squirrelmail/plugins/mail_fetch/options.php:253
 msgid "Mofify a Server"
 msgstr "òãëï ùøú"
 
-#: squirrelmail/plugins/mail_fetch/options.php:237
+#: squirrelmail/plugins/mail_fetch/options.php:338
 msgid "Undefined Function"
 msgstr "ôåð÷öéä ìà îåâãøú"
 
-#: squirrelmail/plugins/mail_fetch/options.php:239
+#: squirrelmail/plugins/mail_fetch/options.php:339
 msgid "Hey! Wath do You are looking for?"
 msgstr ""
 
@@ -3825,150 +4032,151 @@ msgstr "
 msgid "Base Sent Folder"
 msgstr ""
 
-#: squirrelmail/plugins/calendar/calendar.php:75
+#: squirrelmail/plugins/calendar/calendar.php:86
 msgid "TODAY"
 msgstr "äéåí"
 
-#: squirrelmail/plugins/calendar/day.php:79
+#: squirrelmail/plugins/calendar/day.php:89
 msgid "ADD"
 msgstr "äåñó"
 
-#: squirrelmail/plugins/calendar/day.php:93
+#: squirrelmail/plugins/calendar/day.php:108
 msgid "EDIT"
 msgstr "òøåê"
 
-#: squirrelmail/plugins/calendar/day.php:95
+#: squirrelmail/plugins/calendar/day.php:110
 msgid "DEL"
 msgstr "îç÷"
 
-#: squirrelmail/plugins/calendar/event_create.php:31
+#: squirrelmail/plugins/calendar/event_create.php:33
 msgid "Start time:"
 msgstr "æîï äúçìä:"
 
-#: squirrelmail/plugins/calendar/event_create.php:41
-#: squirrelmail/plugins/calendar/event_edit.php:59
+#: squirrelmail/plugins/calendar/event_create.php:44
+#: squirrelmail/plugins/calendar/event_edit.php:63
 msgid "Length:"
 msgstr "àåøê:"
 
-#: squirrelmail/plugins/calendar/event_create.php:47
-#: squirrelmail/plugins/calendar/event_edit.php:65
-#: squirrelmail/plugins/calendar/event_edit.php:97
-#: squirrelmail/plugins/calendar/event_edit.php:110
+#: squirrelmail/plugins/calendar/event_create.php:51
+#: squirrelmail/plugins/calendar/event_edit.php:70
+#: squirrelmail/plugins/calendar/event_edit.php:111
+#: squirrelmail/plugins/calendar/event_edit.php:135
 msgid "Priority:"
 msgstr "òãéôåú:"
 
-#: squirrelmail/plugins/calendar/event_create.php:53
-#: squirrelmail/plugins/calendar/event_create.php:116
-#: squirrelmail/plugins/calendar/event_delete.php:36
-#: squirrelmail/plugins/calendar/event_edit.php:71
-#: squirrelmail/plugins/calendar/event_edit.php:99
-#: squirrelmail/plugins/calendar/event_edit.php:112
+#: squirrelmail/plugins/calendar/event_create.php:58
+#: squirrelmail/plugins/calendar/event_create.php:133
+#: squirrelmail/plugins/calendar/event_delete.php:43
+#: squirrelmail/plugins/calendar/event_edit.php:77
+#: squirrelmail/plugins/calendar/event_edit.php:115
+#: squirrelmail/plugins/calendar/event_edit.php:139
 msgid "Title:"
 msgstr "ëåúøú:"
 
-#: squirrelmail/plugins/calendar/event_create.php:61
+#: squirrelmail/plugins/calendar/event_create.php:70
 msgid "Set Event"
 msgstr "öåø àøåò"
 
-#: squirrelmail/plugins/calendar/event_create.php:111
+#: squirrelmail/plugins/calendar/event_create.php:122
 msgid "Event Has been added!"
 msgstr "àøåò äåñó!"
 
-#: squirrelmail/plugins/calendar/event_create.php:114
-#: squirrelmail/plugins/calendar/event_delete.php:34
-#: squirrelmail/plugins/calendar/event_edit.php:49
-#: squirrelmail/plugins/calendar/event_edit.php:95
+#: squirrelmail/plugins/calendar/event_create.php:129
+#: squirrelmail/plugins/calendar/event_delete.php:39
+#: squirrelmail/plugins/calendar/event_edit.php:52
+#: squirrelmail/plugins/calendar/event_edit.php:107
+#: squirrelmail/plugins/calendar/event_edit.php:131
 msgid "Time:"
 msgstr "æîï:"
 
-#: squirrelmail/plugins/calendar/event_create.php:121
-#: squirrelmail/plugins/calendar/event_delete.php:91
-#: squirrelmail/plugins/calendar/event_edit.php:189
-#: squirrelmail/plugins/calendar/functions.php:23
+#: squirrelmail/plugins/calendar/event_create.php:142
+#: squirrelmail/plugins/calendar/event_delete.php:104
+#: squirrelmail/plugins/calendar/event_edit.php:227
+#: squirrelmail/plugins/calendar/functions.php:24
 msgid "Day View"
 msgstr "úöåâú éåí"
 
-#: squirrelmail/plugins/calendar/event_delete.php:31
+#: squirrelmail/plugins/calendar/event_delete.php:32
 msgid "Do you really want to delete this event?"
 msgstr "äàí áøöåðê ìîçå÷ àøåò æä?"
 
-#: squirrelmail/plugins/calendar/event_delete.php:89
+#: squirrelmail/plugins/calendar/event_delete.php:102
 msgid "Event deleted!"
 msgstr "àøåò ðîç÷!"
 
-#: squirrelmail/plugins/calendar/event_delete.php:97
+#: squirrelmail/plugins/calendar/event_delete.php:110
 msgid "Nothing to delete!"
 msgstr "àéï îä ìîçå÷!"
 
-#: squirrelmail/plugins/calendar/event_edit.php:79
+#: squirrelmail/plugins/calendar/event_edit.php:87
 msgid "Update Event"
 msgstr "òãëï àøåò"
 
-#: squirrelmail/plugins/calendar/event_edit.php:91
+#: squirrelmail/plugins/calendar/event_edit.php:100
 msgid "Do you really want to change this event from:"
 msgstr "äàí áøöåðê ìùðåú àøåò æä î:"
 
-#: squirrelmail/plugins/calendar/event_edit.php:104
+#: squirrelmail/plugins/calendar/event_edit.php:123
 msgid "to:"
 msgstr "ì:"
 
-#: squirrelmail/plugins/calendar/event_edit.php:187
+#: squirrelmail/plugins/calendar/event_edit.php:222
 msgid "Event updated!"
 msgstr "àøåò òåãëï!"
 
-#: squirrelmail/plugins/calendar/functions.php:21
+#: squirrelmail/plugins/calendar/functions.php:22
 msgid "Month View"
 msgstr "úöåâä çåãùéú"
 
-#: squirrelmail/plugins/calendar/functions.php:34
+#: squirrelmail/plugins/calendar/functions.php:35
 msgid "0 min."
 msgstr "0 ã÷åú"
 
-#: squirrelmail/plugins/calendar/functions.php:35
+#: squirrelmail/plugins/calendar/functions.php:36
 msgid "15 min."
 msgstr "15 ã÷åú"
 
-#: squirrelmail/plugins/calendar/functions.php:36
+#: squirrelmail/plugins/calendar/functions.php:37
 msgid "35 min."
 msgstr "35 ã÷åú"
 
-#: squirrelmail/plugins/calendar/functions.php:37
+#: squirrelmail/plugins/calendar/functions.php:38
 msgid "45 min."
 msgstr "45 ã÷åú"
 
-#: squirrelmail/plugins/calendar/functions.php:38
+#: squirrelmail/plugins/calendar/functions.php:39
 msgid "1 hr."
 msgstr "ùòä"
 
-#: squirrelmail/plugins/calendar/functions.php:39
+#: squirrelmail/plugins/calendar/functions.php:40
 msgid "1.5 hr."
 msgstr "ùòä åçöé"
 
-#: squirrelmail/plugins/calendar/functions.php:40
+#: squirrelmail/plugins/calendar/functions.php:41
 msgid "2 hr."
 msgstr "ùòúééí"
 
-#: squirrelmail/plugins/calendar/functions.php:41
+#: squirrelmail/plugins/calendar/functions.php:42
 msgid "2.5 hr."
 msgstr "ùòúééí åçöé"
 
-#: squirrelmail/plugins/calendar/functions.php:42
+#: squirrelmail/plugins/calendar/functions.php:43
 msgid "3 hr."
 msgstr "3 ùòåú"
 
-#: squirrelmail/plugins/calendar/functions.php:43
+#: squirrelmail/plugins/calendar/functions.php:44
 msgid "3.5 hr."
 msgstr "3 åçöé ùòåú"
 
-#: squirrelmail/plugins/calendar/functions.php:44
+#: squirrelmail/plugins/calendar/functions.php:45
 msgid "4 hr."
 msgstr "4 ùòåú"
 
-#: squirrelmail/plugins/calendar/functions.php:45
+#: squirrelmail/plugins/calendar/functions.php:46
 msgid "5 hr."
 msgstr "5 ùòåú"
 
-#: squirrelmail/plugins/calendar/functions.php:46
+#: squirrelmail/plugins/calendar/functions.php:47
 msgid "6 hr."
 msgstr "6 ùòåú"
 
@@ -3976,82 +4184,88 @@ msgstr "6 
 msgid "Calendar"
 msgstr "ìåç ùðä"
 
-#: squirrelmail/plugins/listcommands/mailout.php:19
+#: squirrelmail/plugins/listcommands/mailout.php:22
 msgid "Mailinglist"
 msgstr "øùéîú úôåöä"
 
-#: squirrelmail/plugins/listcommands/mailout.php:25
+#: squirrelmail/plugins/listcommands/mailout.php:29
 #, c-format
 msgid ""
 "This will send a message to %s requesting help for this list. You will "
 "receive an emailed response at the address below."
-msgstr "àôùøåú æå úùìç äåãòä ì-%s áá÷ùä ìòæøä òí øùéîä æå. úùåáä úùìç "
-"ìëúåáú äãåà\"ì äøùåîä îèä."
+msgstr ""
+"àôùøåú æå úùìç äåãòä ì-%s áá÷ùä ìòæøä òí øùéîä æå. úùåáä úùìç ìëúåáú äãåà\"ì "
+"ä"
+"øùåîä îèä."
 
-#: squirrelmail/plugins/listcommands/mailout.php:28
+#: squirrelmail/plugins/listcommands/mailout.php:32
 #, c-format
 msgid ""
 "This will send a message to %s requesting that you will be subscribed to "
 "this list. You will be subscribed with the address below."
-msgstr "àôùøåú æå úùìç äåãòä ì-%s áá÷ùä ìöøó àåúê ìøùéîä æå. ëúåáú äãåà\"ì äøùåîä "
-"îèä úöåøó ìøùéîä."
+msgstr ""
+"àôùøåú æå úùìç äåãòä ì-%s áá÷ùä ìöøó àåúê ìøùéîä æå. ëúåáú äãåà\"ì äøùåîä "
+"î"
+"èä úöåøó ìøùéîä."
 
-#: squirrelmail/plugins/listcommands/mailout.php:31
+#: squirrelmail/plugins/listcommands/mailout.php:35
 #, c-format
 msgid ""
 "This will send a message to %s requesting that you will be unsubscribed from "
 "this list. It will try to unsubscribe the adress below."
-msgstr "àôùøåú æå úùìç äåãòä ì-%s áá÷ùä ìáéèåì ääøùîä ìøùéîä æå. ääøùîä úáåèì "
-"ìëúåáú äøùåîä îèä."
+msgstr ""
+"àôùøåú æå úùìç äåãòä ì-%s áá÷ùä ìáéèåì ääøùîä ìøùéîä æå. ääøùîä úáåèì ìëúåáú "
+"ä"
+"øùåîä îèä."
 
-#: squirrelmail/plugins/listcommands/mailout.php:79
+#: squirrelmail/plugins/listcommands/mailout.php:83
 msgid "Send Mail"
 msgstr "ùìç ãåàø"
 
-#: squirrelmail/plugins/listcommands/setup.php:31
+#: squirrelmail/plugins/listcommands/setup.php:33
 msgid "Post to List"
 msgstr "ùìç ìøùéîä"
 
-#: squirrelmail/plugins/listcommands/setup.php:32
+#: squirrelmail/plugins/listcommands/setup.php:34
 msgid "Reply to List"
 msgstr "äùá ìøùéîä"
 
-#: squirrelmail/plugins/listcommands/setup.php:35
+#: squirrelmail/plugins/listcommands/setup.php:37
 msgid "List Archives"
 msgstr "äöâ àøëéåðéí"
 
-#: squirrelmail/plugins/listcommands/setup.php:36
+#: squirrelmail/plugins/listcommands/setup.php:38
 msgid "Contact Listowner"
 msgstr "öåø ÷ùø òí îðäì äøùéîä"
 
-#: squirrelmail/plugins/listcommands/setup.php:113
+#: squirrelmail/plugins/listcommands/setup.php:115
 msgid "Mailing List:"
 msgstr "øùéîú úôåöä"
 
-#: squirrelmail/plugins/delete_move_next/setup.php:176
-#: squirrelmail/plugins/delete_move_next/setup.php:179
+#: squirrelmail/plugins/delete_move_next/setup.php:177
+#: squirrelmail/plugins/delete_move_next/setup.php:180
 msgid "Delete & Prev"
 msgstr "îç÷ åä÷åãí"
 
-#: squirrelmail/plugins/delete_move_next/setup.php:182
-#: squirrelmail/plugins/delete_move_next/setup.php:184
+#: squirrelmail/plugins/delete_move_next/setup.php:183
+#: squirrelmail/plugins/delete_move_next/setup.php:185
 msgid "Delete & Next"
 msgstr "îç÷ åäáà"
 
-#: squirrelmail/plugins/delete_move_next/setup.php:305
+#: squirrelmail/plugins/delete_move_next/setup.php:306
 msgid "Delete/Move/Next Buttons:"
 msgstr "ëôúåøé îç÷/äòáø/äáà:"
 
-#: squirrelmail/plugins/delete_move_next/setup.php:311
+#: squirrelmail/plugins/delete_move_next/setup.php:313
 msgid "Display at top"
 msgstr "äöâ ìîòìä"
 
-#: squirrelmail/plugins/delete_move_next/setup.php:317
-#: squirrelmail/plugins/delete_move_next/setup.php:329
+#: squirrelmail/plugins/delete_move_next/setup.php:319
+#: squirrelmail/plugins/delete_move_next/setup.php:331
 msgid "with move option"
 msgstr "òí àôùøåéåú äòáøä"
 
-#: squirrelmail/plugins/delete_move_next/setup.php:323
+#: squirrelmail/plugins/delete_move_next/setup.php:325
 msgid "Display at bottom"
 msgstr "äöâ áúçúéú"
 
@@ -4360,15 +4574,15 @@ msgstr ""
 msgid "Theme Path"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/options.php:418
+#: squirrelmail/plugins/administrator/options.php:420
 msgid "Plugins"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/options.php:480
+#: squirrelmail/plugins/administrator/options.php:482
 msgid "Change Settings"
 msgstr ""
 
-#: squirrelmail/plugins/administrator/options.php:531
+#: squirrelmail/plugins/administrator/options.php:510
 msgid "Config file can't be opened. Please check config.php."
 msgstr ""
 
@@ -4389,3 +4603,35 @@ msgstr ""
 #: squirrelmail/po/independent_strings.txt:19
 msgid "Undelivered Message Headers"
 msgstr ""
+
+#: squirrelmail/plugins/abook_take/setup.php:109
+msgid "Take Address"
+msgstr "äåñó ëúåáú"
+
+#: squirrelmail/plugins/abook_take/setup.php:140
+msgid "Address Book Take"
+msgstr "äåñó ìñôø ëúåáåú"
+
+#: squirrelmail/plugins/abook_take/setup.php:146
+msgid "Left aligned"
+msgstr "îåöîã ìùîàì"
+
+#: squirrelmail/plugins/abook_take/setup.php:150
+msgid "Centered"
+msgstr "îîåøëæ"
+
+#: squirrelmail/plugins/abook_take/setup.php:154
+msgid "Right aligned"
+msgstr "îåöîã ìéîéï"
+
+#: squirrelmail/plugins/abook_take/setup.php:155
+msgid "on the Read screen"
+msgstr "áîñê ä÷øéàä"
+
+#: squirrelmail/plugins/abook_take/setup.php:159
+msgid "Hide the box"
+msgstr "äñúø àú ä÷åôñà"
+
+#: squirrelmail/plugins/abook_take/setup.php:163
+msgid "Try to verify addresses"
+msgstr "ðñä ìååãà ëúåáú ãåà\"ì"
index f14ad2bdd5c1e9284ec8501c7f1223d3dbbf39ac..2f45a70470b0225001cc47897b65eaa0a0043a37 100755 (executable)
@@ -156,11 +156,11 @@ function abook_take_options()
           '<input type="checkbox" name="abook_take_abook_take_hide"';
           if ($abook_take_hide)
             echo ' checked';
-          echo '>' . _("Hide the box") . '<br>' .
+          echo '>&nbsp;' . _("Hide the box") . '<br>' .
           '<input type=checkbox name="abook_take_abook_take_verify"';
           if ($abook_take_verify)
             echo ' checked';
-          echo '>' . _("Try to verify addresses") . '</td></tr>';
+          echo '>&nbsp;' . _("Try to verify addresses") . '</td></tr>';
 }